Changeset 30586 for branches/czw_branch/20101203/ippMonitor/raw/ipp.php

Timestamp:

Feb 11, 2011, 4:29:48 PM (15 years ago)

Author:

watersc1

Message:

Trying to merge back into trunk.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ippMonitor/raw/ipp.php (modified) (2 diffs)

branches/czw_branch/20101203/ippMonitor/raw/ipp.php

@@ -390 +390 @@
   if ($sortKey == "") {
     if ($_SERVER[REQUEST_METHOD] == 'GET') { 
-      $sortKey = $_GET['rsort']; 
+      $sortVal = $_GET['rsort']; 
     } else {
-      $sortKey = $_POST['rsort'];
+      $sortVal = $_POST['rsort'];
     }
     if ($sortVal != "") {
@@ -529 +529 @@
     $value = $_POST[$htmlkey];
   }
+  # a search restriction may include an SQL wild-card.  we have to mangle these so that the http 
+  # does not get converted to a special character
+  $value = preg_replace ('|%|', '%25', $value);
   if ($value != "") {
     if ($line) {