Changeset 30579 for branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.php

Timestamp:

Feb 11, 2011, 2:49:34 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.php (modified) (2 diffs)

branches/eam_branches/ipp-20101205/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) {