Changeset 939

Timestamp:

02/01/2006 02:37:31 PM (3 years ago)

Author:

dmorton

Message:

1.0 Branch: ref #264, [938] : initialize variables each time through the loop in case they are blank.

Files:

• branches/1.0/scripts/send-quarantine-digests.pl (modified) (2 diffs)

branches/1.0/scripts/send-quarantine-digests.pl

@@ -290 +290 @@
                 $rowcount = 0;
                 while (@row = $sth->fetchrow_array()) {
+                    $token = $received_date = $score = $sender = $subject = "";
                     $token = $1 if $row[0] =~  /^([a-zA-Z0-9]+)$/si; # untaint
                     $received_date = $1 if $row[1] =~ /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})$/si; # untaint
@@ -295 +296 @@
                     $sender = $1 if $row[3] =~ /^(.+\@.+\..+)$/si; # untaint
                     $subject = $1 if $row[4] =~ /^(.*)$/si; # untaint
-                    if ($subject eq "") {
-                        $subject = "(no subject)";
-                    }
+        if ($received_date eq "") {
+          $received_date = "(no received_date)";
+        }
+        if ($score eq "") {
+          $score = "(no score)";
+        }
+        if ($sender eq "") {
+          $sender = "(no sender)";
+        }
+        if ($subject eq "") {
+          $subject = "(no subject)";
+        }
                     
                     $vars{'list'}[$report_count]{$report_element}[$rowcount]{'token'} =  $token;