[Rt-commit] r4428 - in rtir/branches/1.9-EXPERIMENTAL: .
html/Callbacks/RTIR/Elements/Header html/RTIR
html/RTIR/Elements html/RTIR/Incident
html/RTIR/Incident/Elements html/RTIR/Prefs html/RTIR/Report
html/RTIR/Reporting html/RTIR/Reporting/Elements
html/RTIR/Search html/RTIR/Search/Elements html/RTIR/Tools
lib/RT lib/RT/Action
ruz at bestpractical.com
ruz at bestpractical.com
Fri Jan 20 21:18:14 EST 2006
Author: ruz
Date: Fri Jan 20 21:18:11 2006
New Revision: 4428
Modified:
rtir/branches/1.9-EXPERIMENTAL/ (props changed)
rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm
rtir/branches/1.9-EXPERIMENTAL/html/Callbacks/RTIR/Elements/Header/Head
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ChildSummary
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/DueIncidents
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/Header
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MakeClicky
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/NewReports
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowChildren
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowDates
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowIncidents
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/SimpleSearch
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/Tabs
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Edit.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Elements/Create
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/ShowChildren.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Prefs/Home.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/Elements/SLASummary
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/Elements/SLASummaryText
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/index.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Traceroute.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html
rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ResolveChildren.pm
rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueCorrespond.pm
rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueIncident.pm
rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueReopen.pm
rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueToNow.pm
rtir/branches/1.9-EXPERIMENTAL/lib/RT/IR.pm
Log:
r613 at cubic-pc: cubic | 2006-01-20 15:27:06 +0300
* config handling patch
Modified: rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm Fri Jan 20 21:18:11 2006
@@ -113,8 +113,8 @@
# Default formats for RTIR search results
Set($RTIRSearchResultFormats, {
- ReportDefault => qq{'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ ReportDefault => q{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
'__CustomField.{_RTIR_State}__/TITLE:State',
__LastUpdatedRelative__,
__CreatedRelative__,
@@ -126,8 +126,8 @@
__DueRelative__,
__TimeLeft__},
- InvestigationDefault => qq{'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ InvestigationDefault => q{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
'__CustomField.{_RTIR_State}__/TITLE:State',
__LastUpdatedRelative__,
__CreatedRelative__,
@@ -139,8 +139,8 @@
__DueRelative__,
__TimeLeft__},
- BlockDefault => qq{'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ BlockDefault => q{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
'__CustomField.{_RTIR_State}__/TITLE:State',
__LastUpdatedRelative__,
__CreatedRelative__,
@@ -152,8 +152,8 @@
__DueRelative__,
__TimeLeft__},
- IncidentDefault => qq{'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ IncidentDefault => q{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
'__CustomField.{_RTIR_State}__/TITLE:State',
__LastUpdatedRelative__,
__CreatedRelative__,
@@ -165,66 +165,66 @@
__TimeLeft__},
Merge => qq{___RTIR_Radio__,
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
__Requestors__,
__OwnerName__,
__CreatedRelative__,
__DueRelative__},
LinkChildren => qq{___RTIR_Check__,
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
__Requestors__,
__OwnerName__,
__CreatedRelative__,
__DueRelative__},
LinkIncident => qq{___RTIR_Radio__,
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
__OwnerName__,
__CreatedRelative__
},
RejectReports, qq{___RTIR_Check__,
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
__Requestors__,__OwnerName__,__CreatedRelative__,__DueRelative__},
BulkReply => qq{___RTIR_Check__,
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
__Requestors__,__OwnerName__,__CreatedRelative__,__DueRelative__},
- DueIncidents => qq{'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ DueIncidents => qq{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
'__OwnerName__',
'__Priority__',
'__DueRelative__',
},
- NewReports => qq{'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ NewReports => qq{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
'__Requestors__',
'__OwnerName__',
'__DueRelative__',
},
- ChildReport => qq{'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ ChildReport => qq{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
'<I>__CustomField.{_RTIR_State}__</I>/TITLE:State',
__DueRelative__,
},
- ChildInvestigation => qq{'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ ChildInvestigation => qq{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
'<I>__CustomField.{_RTIR_State}__</I>/TITLE:State',
__DueRelative__,
},
- ChildBlock => qq{'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
- '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
+ ChildBlock => qq{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
'<I>__CustomField.{_RTIR_State}__</I>/TITLE:State',
__DueRelative__,
},
Modified: rtir/branches/1.9-EXPERIMENTAL/html/Callbacks/RTIR/Elements/Header/Head
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/Callbacks/RTIR/Elements/Header/Head (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/Callbacks/RTIR/Elements/Header/Head Fri Jan 20 21:18:11 2006
@@ -15,4 +15,4 @@
%# GNU General Public License for more details.
%#
%# END LICENSE BLOCK
-<link rel="stylesheet" href="<%$RT::WebPath%>/RTIR/NoAuth/webrtir.css" type="text/css">
+<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/RTIR/NoAuth/webrtir.css" type="text/css">
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html Fri Jan 20 21:18:11 2006
@@ -55,7 +55,7 @@
% $m->abort();
% }
-<form action="<% $RT::WebPath %>/RTIR/Create.html" method="post" enctype="multipart/form-data">
+<form action="<% RT->Config->Get('WebPath') %>/RTIR/Create.html" method="post" enctype="multipart/form-data">
<input type="hidden" name="id" value="new" />
<input type="hidden" name="Queue" value="<% $QueueObj->Name %>" />
<input type="hidden" name="Status" value="<% $Status || 'open' %>" />
@@ -172,7 +172,7 @@
TicketObj => $TicketObj,
QueueObj => $QueueObj,
Name => 'HowReported',
- Default => $ARGS{'HowReported-Value'} || $RT::_RTIR_HowReported_default &>
+ Default => $ARGS{'HowReported-Value'} || RT->Config->Get('_RTIR_HowReported_default') &>
</td>
<td class="labeltop">
<%loc("Reporter Type")%>:
@@ -182,7 +182,7 @@
TicketObj => $TicketObj,
QueueObj => $QueueObj,
Name => 'ReporterType',
- Default => $ARGS{'ReporterType-Value'} || $RT::_RTIR_ReporterType_default, &>
+ Default => $ARGS{'ReporterType-Value'} || RT->Config->Get('_RTIR_ReporterType_default'), &>
</td>
</tr>
</table>
@@ -198,7 +198,7 @@
TicketObj => $TicketObj,
QueueObj => $QueueObj,
Name => 'IP',
- Default => $ARGS{'IP-Value'} || $RT::_RTIR_IP_default, &>
+ Default => $ARGS{'IP-Value'} || RT->Config->Get('_RTIR_IP_default'), &>
</td>
</tr>
<tr>
@@ -209,7 +209,7 @@
<& /RTIR/Elements/EditRTIRField,
TicketObj => $TicketObj,
QueueObj => $QueueObj, Name => 'Netmask',
- Default => $ARGS{'Netmask-Value'} || $RT::_RTIR_Netmask_default, &>
+ Default => $ARGS{'Netmask-Value'} || RT->Config->Get('_RTIR_Netmask_default'), &>
</td>
</tr>
<tr>
@@ -220,7 +220,7 @@
<& /RTIR/Elements/EditRTIRField,
TicketObj => $TicketObj,
QueueObj => $QueueObj, Name => 'Port',
- Default => $ARGS{'Port-Value'} || $RT::_RTIR_Netmask_default, &>
+ Default => $ARGS{'Port-Value'} || RT->Config->Get('_RTIR_Netmask_default'), &>
</td>
</tr>
<tr>
@@ -231,7 +231,7 @@
<& /RTIR/Elements/EditRTIRField,
TicketObj => $TicketObj,
QueueObj => $QueueObj, Name => 'WhereBlocked',
- Default => $ARGS{'WhereBlocked-Value'} || $RT::_RTIR_WhereBlocked_default, &>
+ Default => $ARGS{'WhereBlocked-Value'} || RT->Config->Get('_RTIR_WhereBlocked_default'), &>
</td>
</tr>
% }
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html Fri Jan 20 21:18:11 2006
@@ -41,8 +41,8 @@
<tr>
<td valign="top" colspan="2">
<& /Widgets/TitleBoxStart, title => loc("The Basics"),
- title_href =>"$RT::WebPath/RTIR/Edit.html?id=".$Ticket->Id,
- title_class=> 'inverse' &>
+ title_href => RT->Config->Get('WebPath') ."/RTIR/Edit.html?id=".$Ticket->Id,
+ title_class => 'inverse' &>
<table>
<tr>
@@ -137,8 +137,8 @@
<td valign="top" width="50%">
<br />
<& /Widgets/TitleBoxStart, title => loc('People'),
- title_href =>"$RT::WebPath/RTIR/Edit.html?id=".$Ticket->Id,
- title_class=> 'inverse' &>
+ title_href => RT->Config->Get('WebPath') ."/RTIR/Edit.html?id=". $Ticket->Id,
+ title_class => 'inverse' &>
<& /RTIR/Elements/ShowPeople, Ticket => $Ticket &>
<& /Widgets/TitleBoxEnd &>
<br />
@@ -146,8 +146,8 @@
<td>
<br />
<& /Widgets/TitleBoxStart, title => loc("Dates"),
- title_href =>"$RT::WebPath/RTIR/Edit.html?id=".$Ticket->Id,
- title_class=> 'inverse',
+ title_href => RT->Config->Get('WebPath') ."/RTIR/Edit.html?id=". $Ticket->Id,
+ title_class => 'inverse',
color => "#663366" &>
<& /RTIR/Elements/ShowDates, Ticket => $Ticket &>
<& /Widgets/TitleBoxEnd &>
@@ -168,7 +168,7 @@
Ticket => $Ticket,
Collapsed => $ARGS{'Collapsed'},
ShowHeaders => $ARGS{'ShowHeaders'},
- UpdatePath => "$RT::WebPath/RTIR/Update.html",
+ UpdatePath => RT->Config->Get('WebPath') ."/RTIR/Update.html",
&>
<%INIT>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html Fri Jan 20 21:18:11 2006
@@ -225,7 +225,7 @@
push (@results, loc("State changed from [_1] to [_2]", $oldstate, $newstate));
}
-if( $ARGS{'SaveChanges'} && $RT::DisplayAfterEdit ) {
+if( $ARGS{'SaveChanges'} && RT->Config->Get('DisplayAfterEdit') ) {
$m->comp("/RTIR/Display.html", results => [@results], %ARGS);
$m->abort;
}
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ChildSummary
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ChildSummary (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ChildSummary Fri Jan 20 21:18:11 2006
@@ -36,15 +36,15 @@
% $i++;
% my ($t) = $m->comp("/RTIR/Elements/Type", Ticket => $Ticket->Id);
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>" >
-<td><b><a href="<%$RT::WebPath%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%></a></b></td>
-<td><b><a href="<%$RT::WebPath%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Subject%></a></b></td>
+<td><b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%></a></b></td>
+<td><b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Subject%></a></b></td>
<td><& "/RTIR/Elements/ShowRTIRField", Ticket => $Ticket, Name => 'State' &>
<td><%$Ticket->Priority%></td>
% if ($Type eq 'Incident') {
-<td align="right"><a href="<%$RT::WebPath%>/RTIR/Display.html?Child=<%$Ticket->Id%>&id=<%$ticket%>">[<%loc("Link")%>]</a></td>
+<td align="right"><a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?Child=<%$Ticket->Id%>&id=<%$ticket%>">[<%loc("Link")%>]</a></td>
% } elsif ($Type eq $t) {
% if ($ticket ne $Ticket->Id) {
-<td align="right"><a href="<%$RT::WebPath%>/RTIR/Merge.html?id=<%$ticket%>&SelectedTicket=<%$Ticket->Id%>">[<%loc("Merge")%>]</a></td>
+<td align="right"><a href="<%RT->Config->Get('WebPath')%>/RTIR/Merge.html?id=<%$ticket%>&SelectedTicket=<%$Ticket->Id%>">[<%loc("Merge")%>]</a></td>
% } else {
<td> </td>
% }
@@ -58,15 +58,15 @@
% }
<tr>
<td colspan="5">
-[<a href="<%$RT::WebPath%>/RTIR/Search/Refine.html?Queue=<%$Queue%><%$QueryString%>"><%loc("Refine Search")%></a>]
+[<a href="<%RT->Config->Get('WebPath')%>/RTIR/Search/Refine.html?Queue=<%$Queue%><%$QueryString%>"><%loc("Refine Search")%></a>]
% if ($Type eq 'Incident') {
% if ($Queue) {
-[<a href="<%$RT::WebPath%>/RTIR/Incident/LinkChildren.html?Queue=<%$Queue%>&Query=Content LIKE '<%$q%>'&id=<%$ticket%>"><%loc("Bulk Link")%></a>]
+[<a href="<%RT->Config->Get('WebPath')%>/RTIR/Incident/LinkChildren.html?Queue=<%$Queue%>&Query=Content LIKE '<%$q%>'&id=<%$ticket%>"><%loc("Bulk Link")%></a>]
% }
% if ($Queue eq 'Investigations' and $lookuptype eq 'email') {
-<br />[<a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$ticket%>&Requestors=<%$q%>&Queue=Investigations"><%loc("Launch new: [_1]", $q)%></a>]
+<br />[<a href="<%RT->Config->Get('WebPath')%>/RTIR/Create.html?Incident=<%$ticket%>&Requestors=<%$q%>&Queue=Investigations"><%loc("Launch new: [_1]", $q)%></a>]
% } elsif ($Queue eq 'Blocks' and $lookuptype eq 'ip') {
-<br />[<a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$ticket%>&Queue=Blocks&IP-Value=<%$q%>"><%loc("New Block: [_1]", $q)%></a>]
+<br />[<a href="<%RT->Config->Get('WebPath')%>/RTIR/Create.html?Incident=<%$ticket%>&Queue=Blocks&IP-Value=<%$q%>"><%loc("New Block: [_1]", $q)%></a>]
% }
% }
</td>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/DueIncidents
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/DueIncidents (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/DueIncidents Fri Jan 20 21:18:11 2006
@@ -32,7 +32,7 @@
</&>
<%INIT>
-$ARGS{'Format'} ||= $RT::RTIRSearchResultFormats->{'DueIncidents'};
+$ARGS{'Format'} ||= RT->Config->Get('RTIRSearchResultFormats')->{'DueIncidents'};
$ARGS{'Rows'} ||= 10;
my $Query = "Queue = 'Incidents'";
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/Header
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/Header (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/Header Fri Jan 20 21:18:11 2006
@@ -21,4 +21,4 @@
%# inclusion in the work.
%#
%#
-<& /Elements/Header, URL => $RT::WebPath."/RTIR/index.html", %ARGS &>
+<& /Elements/Header, URL => RT->Config->Get('WebPath')."/RTIR/index.html", %ARGS &>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary Fri Jan 20 21:18:11 2006
@@ -36,20 +36,20 @@
% $i++;
% my ($t) = $m->comp("/RTIR/Elements/Type", Ticket => $Ticket->Id);
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>" >
-<td><b><a href="<%$RT::WebPath%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%></a></b></td>
-<td><b><a href="<%$RT::WebPath%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Subject%></a></b></td>
+<td><b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%></a></b></td>
+<td><b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Subject%></a></b></td>
<td><& "/RTIR/Elements/ShowRTIRField", Ticket => $Ticket, Name => 'State' &>
</td>
<td><%$Ticket->Priority%></td>
<td align="right">
% if ($Type eq 'Report' or $Type eq 'Investigation' or $Type eq 'Block') {
-<a href="<%$RT::WebPath%>/RTIR/Display.html?Child=<%$ticket%>&id=<%$Ticket->Id%>">[<%loc("Link")%>]</a>
+<a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?Child=<%$ticket%>&id=<%$Ticket->Id%>">[<%loc("Link")%>]</a>
% } elsif ($ticket and $Type eq $t) {
% if ($ticket ne $Ticket->Id) {
-<a href="<%$RT::WebPath%>/RTIR/Merge.html?id=<%$ticket%>&SelectedTicket=<%$Ticket->Id%>">[<%loc("Merge")%>]</a>
+<a href="<%RT->Config->Get('WebPath')%>/RTIR/Merge.html?id=<%$ticket%>&SelectedTicket=<%$Ticket->Id%>">[<%loc("Merge")%>]</a>
% }
% }
-<a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Investigations">[<%loc("Investigate")%>]</a>
+<a href="<%RT->Config->Get('WebPath')%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Investigations">[<%loc("Investigate")%>]</a>
</td>
</tr>
% }
@@ -60,9 +60,9 @@
<tr>
<td colspan="5">
% if ($Type eq 'Report' or $Type eq 'Investigation' or $Type eq 'Block') {
-[<a href="<%$RT::WebPath%>/RTIR/Create.html?Child=<%$ticket%>&Queue=Incidents"><b>New</b></a>]
+[<a href="<%RT->Config->Get('WebPath')%>/RTIR/Create.html?Child=<%$ticket%>&Queue=Incidents"><b>New</b></a>]
% }
-[<a href="<%$RT::WebPath%>/RTIR/Search/Results.html?Queue=Incidents<%$QueryString%>"><%loc("Refine Search")%></a>]
+[<a href="<%RT->Config->Get('WebPath')%>/RTIR/Search/Results.html?Queue=Incidents<%$QueryString%>"><%loc("Refine Search")%></a>]
</td>
</tr>
</table>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MakeClicky
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MakeClicky (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MakeClicky Fri Jan 20 21:18:11 2006
@@ -4,9 +4,10 @@
$ticket => undef
</%args>
<%once>
-use Regexp::Common qw /URI net/;
+use Regexp::Common qw(URI net);
use URI::URL;
+my $web_path = RT->Config->Get('WebPath');
my $url_params_once;
my $incident;
my $left = '\b';
@@ -14,19 +15,17 @@
#my $left = qr[[\w\b\.\,<(\[]];
#my $right = qr[[\w\b\.\,>)\]]];
-my %cb =
- (
+my %cb = (
default => sub {
my ($type,$value) = @_;
-# $type = substr $type,1;
- return qq[<a href="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}q=${value}">$value</a>];
+ return qq{<a href="$web_path/RTIR/Tools/Lookup.html?${url_params_once}q=${value}">$value</a>};
},
ip =>
sub {
my ($type,$value) = @_;
- my $result = qq[<a href="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=ip&q=${value}">$value</a>];
+ my $result = qq[<a href="$web_path/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=ip&q=${value}">$value</a>];
if ($incident) {
- $result .= qq[ [<a href="$RT::WebPath/RTIR/Create.html?Incident=$incident&Queue=Blocks&IP-Value=$value">Block</a>] ];
+ $result .= qq[ [<a href="$web_path/RTIR/Create.html?Incident=$incident&Queue=Blocks&IP-Value=$value">Block</a>] ];
}
return $result;
},
@@ -44,9 +43,9 @@
"$a.$b.$c.$d";
};
my $result;
- $result = qq[$value <a href="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=ip&q=$host">($host)</a>];
+ $result = qq[$value <a href="$web_path/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=ip&q=$host">($host)</a>];
if ($incident) {
- $result .= qq[[<a href="$RT::WebPath/RTIR/Create.html?Incident=$incident&Queue=Blocks&IP-Value=$host">Block</a>] ];
+ $result .= qq[[<a href="$web_path/RTIR/Create.html?Incident=$incident&Queue=Blocks&IP-Value=$host">Block</a>] ];
}
return $result;
},
@@ -54,14 +53,14 @@
sub {
my ($type,$value) = @_;
my ($pre,$post) = split /@/,$value,2;
- my $result = qq[<a href="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=email&q=$value">$value</a> ];
+ my $result = qq[<a href="$web_path/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=email&q=$value">$value</a> ];
if ($incident) {
if ($r->uri =~ /Lookup.html$/) {
$result .= qq[<input type="checkbox" name="Requestorbox-$value" unchecked />];
}
- $result .= qq[[<a href="$RT::WebPath/RTIR/Create.html?Incident=$incident&Queue=Investigations&Requestors=$value">Investigate to</a>] ];
+ $result .= qq[[<a href="$web_path/RTIR/Create.html?Incident=$incident&Queue=Investigations&Requestors=$value">Investigate to</a>] ];
}
- $result .= qq[<a href="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=host&q=$post">($post)</a>];
+ $result .= qq[<a href="$web_path/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=host&q=$post">($post)</a>];
},
url =>
sub {
@@ -69,17 +68,17 @@
my $uri = URI::URL->new($value);
my $host = $uri->host;
return qq[<a target="new" href="$value">$value</a> ].
- qq[<a href="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=host&q=$host">($host)</a>];
+ qq[<a href="$web_path/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=host&q=$host">($host)</a>];
},
noc =>
sub {
my ($type,$value) = @_;
- return qq[<a href="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=handle&q=$value">$value</a>];
+ return qq[<a href="$web_path/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=handle&q=$value">$value</a>];
},
host =>
sub {
my ($type,$value) = @_;
- my $result = qq[<a href="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=host&q=$value">$value</a>];
+ my $result = qq[<a href="$web_path/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=host&q=$value">$value</a>];
return $result;
},
);
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/NewReports
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/NewReports (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/NewReports Fri Jan 20 21:18:11 2006
@@ -23,7 +23,7 @@
%#
%# END LICENSE BLOCK
<& /Widgets/TitleBoxStart,
- title_href =>"$RT::WebPath/RTIR/Search/Results.html?Queue=$Queue$QueryString",
+ title_href => RT->Config->Get('WebPath') ."/RTIR/Search/Results.html?Queue=$Queue$QueryString",
title_class=> 'inverse',
title => $title,
bodyclass=> '' &>
@@ -35,13 +35,13 @@
Rows => 10,
&>
-<a href="<%$RT::WebPath%>/RTIR/Report/BulkReject.html">[<%loc("Bulk Reject")%>]</a>
+<a href="<%RT->Config->Get('WebPath')%>/RTIR/Report/BulkReject.html">[<%loc("Bulk Reject")%>]</a>
<& /Widgets/TitleBoxEnd &>
<%INIT>
-$Format = $RT::RTIRSearchResultFormats->{'NewReports'};
+$Format = RT->Config->Get('RTIRSearchResultFormats')->{'NewReports'};
$Query = $m->comp('/RTIR/Elements/NewQuery',
Queue => $Queue,
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowChildren
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowChildren (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowChildren Fri Jan 20 21:18:11 2006
@@ -62,7 +62,7 @@
my @possible_states = $m->comp("/RTIR/Elements/States", Queue => $Queue, Inactive => 1 );
my ($Type) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
-$Format ||= $RT::RTIRSearchResultFormats->{'Child' . $Type};
+$Format ||= RT->Config->Get('RTIRSearchResultFormats')->{'Child' . $Type};
if ($Delete) {
$Format = "___RTIR_Check__, " . $Format;
}
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowDates
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowDates (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowDates Fri Jan 20 21:18:11 2006
@@ -44,9 +44,9 @@
<td class="labeltop"><&|/l&>Due</&>:</td>
<td class="value">
<% $Ticket->DueObj->AsString %>
-% if ($RT::OverdueAfter) {
+% if (RT->Config->Get('OverdueAfter')) {
<br />
- [<a href="Display.html?Due_Date=now%20%2B%20<%$RT::OverdueAfter%>%20days&id=<%$Ticket->Id%>"><%loc("Set to [_1] days from now", $RT::OverdueAfter)%></a>]
+ [<a href="Display.html?Due_Date=now%20%2B%20<%RT->Config->Get('OverdueAfter')%>%20days&id=<%$Ticket->Id%>"><%loc("Set to [_1] days from now", RT->Config->Get('OverdueAfter'))%></a>]
% }
</td>
</tr>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowIncidents
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowIncidents (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowIncidents Fri Jan 20 21:18:11 2006
@@ -25,7 +25,7 @@
% while (my $incident = $incidents->Next) {
% $count++;
% my $State = $m->scomp("/RTIR/Elements/ShowRTIRField", Ticket => $incident, Name => 'State');
-<a href="<%$RT::WebPath%>/RTIR/Display.html?id=<%$incident->Id%>"><%$incident->Id%>: <%$incident->Subject%></a> <i>(<%$State%>)</i>
+<a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?id=<%$incident->Id%>"><%$incident->Id%>: <%$incident->Subject%></a> <i>(<%$State%>)</i>
% if ($depth < 8) {
<& /RTIR/Elements/ShowIncidents, Ticket => $incident, depth => ($depth+1) &>
% }
@@ -36,8 +36,8 @@
% if ($depth == 1) {
% if ($Ticket->Owner == $session{'CurrentUser'}->id) {
-<b><a href="<%$RT::WebPath%>/RTIR/Incident/LinkToIncident.html?id=<% $Ticket->Id %>">[Link]</a></b>
-<b><a href="<%$RT::WebPath%>/RTIR/Create.html?Child=<%$Ticket->Id%>&Queue=Incidents">[New]</a></b>
+<b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Incident/LinkToIncident.html?id=<% $Ticket->Id %>">[Link]</a></b>
+<b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Create.html?Child=<%$Ticket->Id%>&Queue=Incidents">[New]</a></b>
% }
% }
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/SimpleSearch
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/SimpleSearch (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/SimpleSearch Fri Jan 20 21:18:11 2006
@@ -21,7 +21,7 @@
%#
%#
%# END LICENSE BLOCK
-<form action="<% $RT::WebPath %>/RTIR/index.html">
+<form action="<% RT->Config->Get('WebPath') %>/RTIR/index.html">
<input type="hidden" name="NewSearch" value="1" />
<input type="hidden" name="Queue" value="Incidents" />
<input size="12" name="q" accesskey="0" />
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/Tabs
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/Tabs (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/Tabs Fri Jan 20 21:18:11 2006
@@ -33,7 +33,7 @@
current_tab => $current_tab,
current_subtab => $current_subtab,
title => $Title,
- AppName => $RT::rtirname,
+ AppName => RT->Config->Get('rtirname'),
&>
<%INIT>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html Fri Jan 20 21:18:11 2006
@@ -38,7 +38,7 @@
<& /Elements/ListActions, actions => \@results &>
-<form action="<%$RT::WebPath%>/RTIR/Incident/BulkAbandon.html" method="post">
+<form action="<%RT->Config->Get('WebPath')%>/RTIR/Incident/BulkAbandon.html" method="post">
<input type="hidden" name="Status" value="<% $Status %>" />
<%perl>
@@ -186,12 +186,12 @@
$Queue => 'Incidents'
$BaseQuery => $m->comp( '/RTIR/Elements/BaseQuery', Queue => $Queue );
$Query => $m->comp( '/RTIR/Elements/NewQuery', Queue => $Queue, Inactive => 1 );
-$Format => $RT::RTIRSearchResultFormats->{'RejectReports'};
+$Format => RT->Config->Get('RTIRSearchResultFormats')->{'RejectReports'};
$Rows => 50
$Page => 1
$OrderBy => 'id'
$Order => 'ASC'
-$BaseURL => $RT::WebPath . "/RTIR/Report/BulkAbandon.html"
+$BaseURL => RT->Config->Get('WebPath') . "/RTIR/Report/BulkAbandon.html"
$current_tab => 'RTIR/Incident/BulkAbandon.html'
@SelectedTickets => ()
@ReplyToAll => ()
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html Fri Jan 20 21:18:11 2006
@@ -39,7 +39,7 @@
<table border="0" cellpadding="0" cellspacing="2" width="100%"><tr><td valign="top" width="50%">
<& /Widgets/TitleBoxStart, title => loc('Incident #[_1]', $Ticket->Id),
- title_href =>"$RT::WebPath/RTIR/Edit.html?id=".$Ticket->Id,
+ title_href => RT->Config->Get('WebPath') ."/RTIR/Edit.html?id=".$Ticket->Id,
title_class=> 'inverse' &>
<table>
@@ -110,15 +110,15 @@
<& /Widgets/TitleBoxStart,
title => loc('Incident Reports'),
- title_href => "$RT::WebPath/RTIR/Incident/ShowChildren.html?Queue=Incident%20Reports&id=".$Ticket->Id,
+ title_href => RT->Config->Get('WebPath') ."/RTIR/Incident/ShowChildren.html?Queue=Incident%20Reports&id=".$Ticket->Id,
titleright => '',
title_class=> 'inverse', color=> "#336633",
&>
% if ($Ticket->CurrentUserHasRight('ModifyTicket')) {
<table width="100%"><tr><td align="right"><font size="-1">
- | <a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Incident%20Reports"><%loc('New')%></a>
- | <a href="<%$RT::WebPath%>/RTIR/Incident/LinkChildren.html?id=<%$Ticket->Id%>&Queue=Incident%20Reports"><%loc("Link")%></a> |
+ | <a href="<%RT->Config->Get('WebPath')%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Incident%20Reports"><%loc('New')%></a>
+ | <a href="<%RT->Config->Get('WebPath')%>/RTIR/Incident/LinkChildren.html?id=<%$Ticket->Id%>&Queue=Incident%20Reports"><%loc("Link")%></a> |
</font></td></tr></table>
% }
@@ -126,21 +126,21 @@
Ticket => $Ticket,
Queue => 'Incident Reports',
Rows => 8,
- FullList => $RT::WebPath."/RTIR/Incident/ShowChildren.html?Queue=Incident%20Reports&id=".$Ticket->id,
+ FullList => RT->Config->Get('WebPath')."/RTIR/Incident/ShowChildren.html?Queue=Incident%20Reports&id=".$Ticket->id,
&>
<& /Widgets/TitleBoxEnd &>
</td></tr><tr><td valign="top" width="50%">
<& /Widgets/TitleBoxStart, title => loc('Investigations'),
- title_href => "$RT::WebPath/RTIR/Incident/ShowChildren.html?Queue=Investigations&id=".$Ticket->Id,
+ title_href => RT->Config->Get('WebPath') ."/RTIR/Incident/ShowChildren.html?Queue=Investigations&id=".$Ticket->Id,
title_class=> 'inverse',
titleright => '', color=> "#336633" &>
% if ($Ticket->CurrentUserHasRight('ModifyTicket')) {
<table width="100%"><tr><td align="right"><font size="-1">
- | <a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Investigations"><%loc('Launch')%></a>
- | <a href="<%$RT::WebPath%>/RTIR/Incident/LinkChildren.html?id=<%$Ticket->Id%>&Queue=Investigations"><%loc("Link")%></a> |
+ | <a href="<%RT->Config->Get('WebPath')%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Investigations"><%loc('Launch')%></a>
+ | <a href="<%RT->Config->Get('WebPath')%>/RTIR/Incident/LinkChildren.html?id=<%$Ticket->Id%>&Queue=Investigations"><%loc("Link")%></a> |
</font></td></tr></table>
% }
@@ -148,20 +148,20 @@
Ticket => $Ticket,
Queue => 'Investigations',
Rows => 8,
- FullList => $RT::WebPath."/RTIR/Incident/ShowChildren.html?Queue=Investigations&id=".$Ticket->id,
+ FullList => RT->Config->Get('WebPath')."/RTIR/Incident/ShowChildren.html?Queue=Investigations&id=".$Ticket->id,
&>
</td><td valign="top" width="50%">
<& /Widgets/TitleBoxStart, title => loc('Blocks'),
- title_href => "$RT::WebPath/RTIR/Incident/ShowChildren.html?Queue=Blocks&id=".$Ticket->Id,
+ title_href => RT->Config->Get('WebPath') ."/RTIR/Incident/ShowChildren.html?Queue=Blocks&id=".$Ticket->Id,
title_class=> 'inverse',
titleright => '', color=> "#336633" &>
% if ($Ticket->CurrentUserHasRight('ModifyTicket')) {
<table width="100%"><tr><td align="right"><font size="-1">
- | <a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Blocks"><%loc('New')%></a>
- | <a href="<%$RT::WebPath%>/RTIR/Incident/LinkChildren.html?id=<%$Ticket->Id%>&Queue=Blocks>"><%loc("Link")%></a> |
+ | <a href="<%RT->Config->Get('WebPath')%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Blocks"><%loc('New')%></a>
+ | <a href="<%RT->Config->Get('WebPath')%>/RTIR/Incident/LinkChildren.html?id=<%$Ticket->Id%>&Queue=Blocks>"><%loc("Link")%></a> |
</font></td></tr></table>
% }
@@ -169,7 +169,7 @@
Ticket => $Ticket,
Queue => 'Blocks',
Rows => 8,
- FullList => $RT::WebPath."/RTIR/Incident/ShowChildren.html?Queue=Blocks&id=".$Ticket->id,
+ FullList => RT->Config->Get('WebPath')."/RTIR/Incident/ShowChildren.html?Queue=Blocks&id=".$Ticket->id,
&>
<& /Widgets/TitleBoxEnd &>
@@ -177,7 +177,7 @@
</td></tr><tr><td colspan="2">
<& /Widgets/TitleBoxStart, title => loc("Dates"),
- title_href =>"$RT::WebPath/RTIR/Edit.html?id=".$Ticket->Id,
+ title_href => RT->Config->Get('WebPath') ."/RTIR/Edit.html?id=".$Ticket->Id,
title_class=> 'inverse',
color => "#663366" &>
<& /RTIR/Elements/ShowDates, Ticket => $Ticket &>
@@ -194,7 +194,7 @@
Ticket => $Ticket,
Collapsed => $ARGS{'Collapsed'},
ShowHeaders => $ARGS{'ShowHeaders'},
- UpdatePath => "$RT::WebPath/RTIR/Update.html",
+ UpdatePath => RT->Config->Get('WebPath') ."RTIR/Update.html",
&>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Edit.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Edit.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Edit.html Fri Jan 20 21:18:11 2006
@@ -160,7 +160,7 @@
push (@results, loc("State changed from [_1] to [_2]", $oldstate, $newstate));
}
-if( $ARGS{'SaveChanges'} && $RT::DisplayAfterEdit ) {
+if( $ARGS{'SaveChanges'} && RT->Config->Get('DisplayAfterEdit') ) {
$m->comp("/RTIR/Incident/Display.html", results => [@results], %ARGS);
$m->abort;
}
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Elements/Create
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Elements/Create (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Elements/Create Fri Jan 20 21:18:11 2006
@@ -33,7 +33,7 @@
<& /RTIR/Elements/EditRTIRField,
QueueObj => $QueueObj,
Name => 'Description',
- Default => $RT::_RTIR_Description_default,
+ Default => RT->Config->Get('_RTIR_Description_default'),
Cols => 40,
&></td></tr>
@@ -42,7 +42,7 @@
<& /RTIR/Elements/EditRTIRField,
QueueObj => $QueueObj,
Name => 'Constituency',
- Default => $RT::_RTIR_Constituency_default,
+ Default => RT->Config->Get('_RTIR_Constituency_default'),
Rows => 1,
&></td></tr>
@@ -51,7 +51,7 @@
<& /RTIR/Elements/EditRTIRField,
QueueObj => $QueueObj,
Name => 'Function',
- Default => $RT::_RTIR_Function_default,
+ Default => RT->Config->Get('_RTIR_Function_default'),
Rows => 1,
&></td></tr>
@@ -60,7 +60,7 @@
<& /RTIR/Elements/EditRTIRField,
QueueObj => $QueueObj,
Name => 'Classification',
- Default => $RT::_RTIR_Classification_default,
+ Default => RT->Config->Get('_RTIR_Classification_default'),
Rows => 1,
&></td></tr>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html Fri Jan 20 21:18:11 2006
@@ -53,7 +53,7 @@
my $IncidentObj = LoadTicket($id);
my $SubmitCaption = loc("Link selected with Incident #[_1]", $IncidentObj->id);
-$Format = $RT::RTIRSearchResultFormats->{'LinkChildren'};
+$Format = RT->Config->Get('RTIRSearchResultFormats')->{'LinkChildren'};
my $TicketObj = new RT::Ticket($session{'CurrentUser'});
$TicketObj->Load($id);
@@ -104,7 +104,7 @@
<%ARGS>
$id => undef
$Queue => undef
-$BaseURL => $RT::WebPath . "/RTIR/Incident/LinkChildren.html"
+$BaseURL => RT->Config->Get('WebPath') . "/RTIR/Incident/LinkChildren.html"
$Status => 'open',
$BaseQuery => undef
$Query => undef
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html Fri Jan 20 21:18:11 2006
@@ -40,7 +40,7 @@
QueryString => $QueryString,
&>
-<form action="<%$RT::WebPath%>/RTIR/Incident/Display.html" method="post">
+<form action="<%RT->Config->Get('WebPath')%>/RTIR/Incident/Display.html" method="post">
<input type="hidden" name="Child" value="<%$id%>" />
<& /RTIR/Search/Elements/ShowResults,
@@ -57,7 +57,7 @@
<hr>
<%INIT>
-$Format = $RT::RTIRSearchResultFormats->{'LinkIncident'};
+$Format = RT->Config->Get('RTIRSearchResultFormats')->{'LinkIncident'};
my ($Type) = $m->comp('/RTIR/Elements/Type', Queue => 'Incidents');
@@ -98,7 +98,7 @@
<%ARGS>
$id => undef
-$BaseURL => $RT::WebPath . "/RTIR/Incident/LinkToIncident.html"
+$BaseURL => RT->Config->Get('WebPath') . "/RTIR/Incident/LinkToIncident.html"
$BaseQuery => undef
$Query => undef
$Format => undef
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html Fri Jan 20 21:18:11 2006
@@ -153,10 +153,10 @@
<%ARGS>
$id => undef
$All => 0
-$BaseURL => $RT::WebPath . "/RTIR/Incident/Reply.html?DefaultStatus=stalled&id=$id"
+$BaseURL => RT->Config->Get('WebPath') . "/RTIR/Incident/Reply.html?DefaultStatus=stalled&id=$id"
$BaseQuery => undef
$Query => "CF.{_RTIR_State} = 'open' AND MemberOf = $id";
-$Format => $RT::RTIRSearchResultFormats->{'BulkReply'};
+$Format => RT->Config->Get('RTIRSearchResultFormats')->{'BulkReply'};
$HideResults => 0
$Rows => 50
$Page => 1
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/ShowChildren.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/ShowChildren.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/ShowChildren.html Fri Jan 20 21:18:11 2006
@@ -46,7 +46,7 @@
Ticket => $Incident,
Queue => $Queue,
States => [@States],
- FullList => $RT::WebPath."/RTIR/Incident/ShowChildren.html?Queue=$Queue&id=".$Incident->id,
+ FullList => RT->Config->Get('WebPath')."/RTIR/Incident/ShowChildren.html?Queue=$Queue&id=".$Incident->id,
Delete => $delete,
ShowHeader => 1,
ShowStatesSelector => 1,
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html Fri Jan 20 21:18:11 2006
@@ -46,7 +46,7 @@
% $m->abort();
% }
-<form action="<%$RT::WebPath%>/RTIR/Merge.html" method="post">
+<form action="<%RT->Config->Get('WebPath')%>/RTIR/Merge.html" method="post">
<input type="hidden" name="id" value="<%$Ticket->id%>" />
<input type="hidden" name="<%$Ticket->Id%>-MergeInto" />
@@ -54,7 +54,7 @@
Queue => $Queue,
Query => $Query,
QueryString => $QueryString,
- BaseURL => $RT::WebPath."/RTIR/Merge.html?id=$id&",
+ BaseURL => RT->Config->Get('WebPath')."/RTIR/Merge.html?id=$id&",
Format => $Format,
&>
@@ -64,7 +64,7 @@
</form>
<%INIT>
-$Format = $RT::RTIRSearchResultFormats->{'Merge'};
+$Format = RT->Config->Get('RTIRSearchResultFormats')->{'Merge'};
my $Ticket = LoadTicket($id);
my $Queue = $Ticket->QueueObj->Name;
@@ -119,6 +119,6 @@
$OrderBy => 'id'
$Order => 'ASC'
$id => undef
-$BaseURL => $RT::WebPath . '/RTIR/Merge.html'
+$BaseURL => RT->Config->Get('WebPath') . '/RTIR/Merge.html'
$current_tab => 'RTIR/Merge.html'
</%ARGS>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Prefs/Home.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Prefs/Home.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Prefs/Home.html Fri Jan 20 21:18:11 2006
@@ -28,7 +28,7 @@
my %seen;
my @items;
-foreach my $comp ( grep !$seen{$_}++, @$RT::RTIR_HomepageComponents ) {
+foreach my $comp ( grep !$seen{$_}++, @RT->Config->Get('RTIR_HomepageComponents') ) {
use Data::Dumper;
#$RT::Logger->error( Dumper($comp, $m->fetch_comp($comp)) );
my $desc;
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html Fri Jan 20 21:18:11 2006
@@ -38,7 +38,7 @@
<& /Elements/ListActions, actions => \@results &>
-<form action="<%$RT::WebPath%>/RTIR/Report/BulkReject.html" method="post">
+<form action="<%RT->Config->Get('WebPath')%>/RTIR/Report/BulkReject.html" method="post">
<input type="hidden" name="Status" value="<% $Status %>" />
<& /RTIR/Search/Elements/ShowResults,
@@ -172,12 +172,12 @@
$BaseQuery => $m->comp( '/RTIR/Elements/BaseQuery', Queue => $Queue )
$Query => $m->comp( '/RTIR/Elements/NewQuery', Queue => $Queue )
$Status => 'rejected'
-$Format => $RT::RTIRSearchResultFormats->{'RejectReports'};
+$Format => RT->Config->Get('RTIRSearchResultFormats')->{'RejectReports'};
$Rows => 50
$Page => 1
$OrderBy => 'id'
$Order => 'ASC'
-$BaseURL => $RT::WebPath . "/RTIR/Report/BulkReject.html?"
+$BaseURL => RT->Config->Get('WebPath') . "/RTIR/Report/BulkReject.html?"
$current_tab => 'RTIR/Report/BulkReject.html'
@SelectedTickets => ()
$BulkRejectAndReturn => 0
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/Elements/SLASummary
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/Elements/SLASummary (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/Elements/SLASummary Fri Jan 20 21:18:11 2006
@@ -69,7 +69,7 @@
$unresolved_count = 0;
# get the number of seconds for the service level
-my $sla = $RT::SLA->{$service_level} * 60;
+my $sla = RT->Config->Get('SLA')->{$service_level} * 60;
foreach my $key ( keys %$class_tix ) {
my $t = $class_tix->{$key};
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/Elements/SLASummaryText
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/Elements/SLASummaryText (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/Elements/SLASummaryText Fri Jan 20 21:18:11 2006
@@ -39,7 +39,7 @@
$unresolved_count = 0;
# get the number of seconds for the service level
-my $sla = $RT::SLA->{$service_level} * 60;
+my $sla = RT->Config->Get('SLA')->{$service_level} * 60;
foreach my $key ( keys %$class_tix ) {
my $t = $class_tix->{$key};
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/index.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/index.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Reporting/index.html Fri Jan 20 21:18:11 2006
@@ -37,7 +37,7 @@
<& /RTIR/Elements/EditRTIRField,
QueueObj => $QueueObj,
Name => 'Constituency',
- Default => $RT::_RTIR_Constituency_default,
+ Default => RT->Config->Get('_RTIR_Constituency_default'),
Rows => 1 &>
</td>
</tr>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults Fri Jan 20 21:18:11 2006
@@ -14,7 +14,7 @@
%# this would do well as a Callback
<div align="right">
-<a href="<%$RT::WebPath%>/RTIR/Report/BulkReject.html?Queue=<%$Queue|u%>&<% $QueryString %>"><&|/l&>Bulk Reject</&></a><br />
+<a href="<%RT->Config->Get('WebPath')%>/RTIR/Report/BulkReject.html?Queue=<%$Queue|u%>&<% $QueryString %>"><&|/l&>Bulk Reject</&></a><br />
</div>
% }
@@ -46,7 +46,7 @@
$Page => 1
$OrderBy => $session{'CurrentSearchHash'}->{'OrderBy'} || 'id'
$Order => $session{'CurrentSearchHash'}->{'Order'} || 'ASC'
-$BaseURL => $RT::WebPath."/Search/Results.html?"
+$BaseURL => RT->Config->Get('WebPath')."/Search/Results.html?"
$ShowNavigation => 0
$AllowSorting => 1
$ShowEmpty => 0
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html Fri Jan 20 21:18:11 2006
@@ -74,7 +74,7 @@
my $title = loc("Results");
my ($Type) = $m->comp( '/RTIR/Elements/Type', Queue => $Queue );
-$Format ||= $RT::RTIRSearchResultFormats->{ $Type . 'Default' };
+$Format ||= RT->Config->Get('RTIRSearchResultFormats')->{ $Type . 'Default' };
my $QueryString = $m->comp( '/Elements/QueryString',
BaseQuery => $BaseQuery,
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html Fri Jan 20 21:18:11 2006
@@ -225,8 +225,8 @@
# }}}
my $max_age;
- if ($RT::RTIR_OldestRelatedTickets) {
- $max_age = 0 - $RT::RTIR_OldestRelatedTickets;
+ if (RT->Config->Get('RTIR_OldestRelatedTickets')) {
+ $max_age = 0 - RT->Config->Get('RTIR_OldestRelatedTickets');
} else {
$max_age = -60;
}
@@ -258,11 +258,11 @@
$TicketObj = LoadTicket($ticket);
}
-my $Format = $RT::RTIRSearchResultFormats->{$TicketType . 'Default'};
+my $Format = RT->Config->Get('RTIRSearchResultFormats')->{$TicketType . 'Default'};
</%init>
<%args>
-$servers => $RT::whois
+$servers => RT->Config->Get('whois')
$server => undef
$handparse => 1
$q => undef
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html Fri Jan 20 21:18:11 2006
@@ -481,7 +481,7 @@
$incidentid => undef
$TemplateName => 'Correspondence'
$Requestors => undef
-$servers => $RT::whois
+$servers => RT->Config->Get('whois')
$server => undef
$Title => loc("Scripted Action: Create Incidents and Investigations")
$current_tab => "RTIR/Tools/ScriptedAction.html";
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Traceroute.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Traceroute.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Traceroute.html Fri Jan 20 21:18:11 2006
@@ -41,7 +41,7 @@
}
my $title = loc("Traceroute to '[_1]'.", $q);
-my $cmd = $RT::TracerouteCommand || '/usr/sbin/traceroute';
+my $cmd = RT->Config->Get('TracerouteCommand') || '/usr/sbin/traceroute';
Abort("Couldn't find '$cmd' or run it's not executable") unless -f $cmd && -x _;
tied(%session)->release_all_locks;
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html Fri Jan 20 21:18:11 2006
@@ -155,11 +155,11 @@
$Subject = $Ticket->Subject;
}
-my $replystring = lc($RT::ReplyString);
+my $replystring = lc(RT->Config->Get('ReplyString'));
if ( $Action eq 'Respond' &&
$replystring &&
lc(substr($Subject, 0, length($replystring))) ne $replystring) {
- $Subject = $RT::ReplyString . " " . $Subject;
+ $Subject = RT->Config->Get('ReplyString') . " " . $Subject;
}
$CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ResolveChildren.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ResolveChildren.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ResolveChildren.pm Fri Jan 20 21:18:11 2006
@@ -82,7 +82,7 @@
." OR Queue = 'Blocks'"
.") AND MemberOf = " . $self->TicketObj->Id
."AND (".
- . join " AND ", map "Status != '$_'", @RT::InactiveStatus;
+ . join " AND ", map "Status != '$_'", RT->Config->Get('InactiveStatus');
.")";
my $members = new RT::Tickets( $self->TransactionObj->CurrentUser );
Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueCorrespond.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueCorrespond.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueCorrespond.pm Fri Jan 20 21:18:11 2006
@@ -80,7 +80,7 @@
my $date = RT::Date->new($RT::SystemUser);
$date->SetToNow;
- $date->AddDays($RT::OverdueAfter);
+ $date->AddDays(RT->Config->Get('OverdueAfter'));
my $due = $bizhours->first_after($date->Unix);
$date->Set(Format => 'unix', Value => $due);
Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueIncident.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueIncident.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueIncident.pm Fri Jan 20 21:18:11 2006
@@ -93,7 +93,7 @@
." OR Queue = 'Blocks'"
.") AND MemberOf = " . $incident->Id
." AND ("
- . join( " OR ", map "Status = '$_'", @RT::ActiveStatus )
+ . join( " OR ", map "Status = '$_'", RT->Config->Get('ActiveStatus') )
.")";
my $children = new RT::Tickets($self->CurrentUser);
$children->FromSQL( $query );
Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueReopen.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueReopen.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueReopen.pm Fri Jan 20 21:18:11 2006
@@ -79,8 +79,8 @@
my $bh = RT::IR::BusinessHours();
# Set the defaults from the RTIR_Config.pm file
- $SLAObj->SetInHoursDefault( $RT::SLA_Reopen_InHours );
- $SLAObj->SetOutOfHoursDefault( $RT::SLA_Reopen_OutOfHours );
+ $SLAObj->SetInHoursDefault( RT->Config->Get('SLA_Reopen_InHours') );
+ $SLAObj->SetOutOfHoursDefault( RT->Config->Get('SLA_Reopen_OutOfHours') );
$SLAObj->SetBusinessHours( $bh );
Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueToNow.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueToNow.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueToNow.pm Fri Jan 20 21:18:11 2006
@@ -82,8 +82,8 @@
my $SLAObj = RT::IR::SLAInit();
# Set the defaults from the RTIR_Config.pm file
- $SLAObj->SetInHoursDefault($RT::SLA_Response_InHours);
- $SLAObj->SetOutOfHoursDefault($RT::SLA_Response_OutOfHours);
+ $SLAObj->SetInHoursDefault(RT->Config->Get('SLA_Response_InHours'));
+ $SLAObj->SetOutOfHoursDefault(RT->Config->Get('SLA_Response_OutOfHours'));
# set the Business::Hours
my $bh = RT::IR::BusinessHours();
Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/IR.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/IR.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/IR.pm Fri Jan 20 21:18:11 2006
@@ -54,8 +54,8 @@
sub BusinessHours {
my $bizhours = new Business::Hours;
- if ($RT::BusinessHours) {
- $bizhours->business_hours(%$RT::BusinessHours);
+ if (RT->Config->Get('BusinessHours')) {
+ $bizhours->business_hours(%RT->Config->Get('BusinessHours'));
}
return $bizhours;
@@ -73,21 +73,21 @@
sub SLAInit {
- my $class = $RT::SLAModule || 'Business::SLA';
+ my $class = RT->Config->Get('SLAModule') || 'Business::SLA';
my $SLAObj = $class->new();
my $bh = RT::IR::BusinessHours();
- $SLAObj->SetInHoursDefault($RT::_RTIR_SLA_inhours_default);
- $SLAObj->SetOutOfHoursDefault($RT::_RTIR_SLA_outofhours_default);
+ $SLAObj->SetInHoursDefault(RT->Config->Get('_RTIR_SLA_inhours_default'));
+ $SLAObj->SetOutOfHoursDefault(RT->Config->Get('_RTIR_SLA_outofhours_default'));
$SLAObj->SetBusinessHours($bh);
- foreach my $key (keys %$RT::SLA) {
- if ($RT::SLA->{$key} =~ /^\d+$/) {
- $SLAObj->Add($key, ( BusinessMinutes => $RT::SLA->{$key} ));
+ foreach my $key (keys %RT->Config->Get('SLA')) {
+ if (RT->Config->Get('SLA')->{$key} =~ /^\d+$/) {
+ $SLAObj->Add($key, ( BusinessMinutes => RT->Config->Get('SLA')->{$key} ));
} else {
- $SLAObj->Add($key, %{$RT::SLA->{$key}} );
+ $SLAObj->Add($key, %{RT->Config->Get('SLA')->{$key}} );
}
}
More information about the Rt-commit
mailing list