[Rt-commit] r9508 - in rtir/branches/2.3-EXPERIMENTAL: .

[sartak at bestpractical.com]

Author: sartak
Date: Tue Oct 30 16:08:25 2007
New Revision: 9508

Modified:
   rtir/branches/2.3-EXPERIMENTAL/   (props changed)
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html

Log:
 r44439 at onn:  sartak | 2007-10-30 16:07:56 -0400
 Substitute _ADDR_ and _IP_ in the message box


Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html	Tue Oct 30 16:08:25 2007
@@ -309,14 +309,19 @@
 
     # if the subject contains _ADDR_ or _IP_ we will substitute
     my $original_subject = $ARGS{'Subject'};
+    my $original_content = $ARGS{'Content'};
 
     foreach my $key ( keys %$addrhash ) {
         my $addr = $addrhash->{$key}->{'Address'};
         my $ip = $addrhash->{$key}->{'IP'};
 
         $ARGS{'Subject'} = $original_subject;
-        $ARGS{'Subject'} =~ s/_ADDR_/$addr/g;
-        $ARGS{'Subject'} =~ s/_IP_/$ip/g;
+        $ARGS{'Content'} = $original_content;
+
+        for (qw/Subject Content/) {
+            $ARGS{$_} =~ s/_ADDR_/$addr/g;
+            $ARGS{$_} =~ s/_IP_/$ip/g;
+        }
 
         if ( $addr eq loc("ADDRESS_UNKNOWN") ) {
             # create an unlinked incident report