Changeset 18970 for trunk/ippMonitor/raw/ipp.php

Timestamp:

Aug 8, 2008, 9:01:19 AM (18 years ago)

Author:

eugene

Message:

various updates

File:

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

trunk/ippMonitor/raw/ipp.php

@@ -310 +310 @@
   // add a sort key?
   $sortKey = "";
-  if ($_SERVER[REQUEST_METHOD] == 'GET') { 
-    $sortKey = "&sort=" . $_GET['sort']; 
-  } else {
-    $sortKey = "&sort=" . $_POST['sort'];
-  }
-  if ($_SERVER[REQUEST_METHOD] == 'GET') { 
-    $sortKey = "&rsort=" . $_GET['rsort']; 
-  } else {
-    $sortKey = "&rsort=" . $_POST['rsort'];
+  // try sort forward
+  if ($_SERVER[REQUEST_METHOD] == 'GET') { 
+    $sortVal = $_GET['sort']; 
+  } else {
+    $sortVal = $_POST['sort'];
+  }
+  if ($sortVal != "") {
+    $sortKey = "&sort=" . $sortVal;
+  }
+  // try sort reverse
+  if ($sortKey == "") {
+    if ($_SERVER[REQUEST_METHOD] == 'GET') { 
+      $sortKey = $_GET['rsort']; 
+    } else {
+      $sortKey = $_POST['rsort'];
+    }
+    if ($sortVal != "") {
+      $sortKey = "&rsort=" . $sortVal;
+    }
   }
 
@@ -502 +512 @@
 
   if ($_SERVER[REQUEST_METHOD] == 'GET') { 
-    $up   = $_GET['sort']; 
-    $down = $_GET['rsort']; 
-  } else {
-    $up   = $_POST['sort']; 
-    $down = $_POST['rsort']; 
+    $up   = $_GET['rsort']; 
+    $down = $_GET['sort']; 
+    $from = $_GET['from']; 
+  } else {
+    $up   = $_POST['rsort']; 
+    $down = $_POST['sort']; 
+    $from = $_POST['from']; 
+  }
+
+  // down button link
+  $link = "$baselink" . "&sort=$value";
+  if ($from != "") {
+    $link = $link . "&from=$from";
+  }
+  if ($down == $value) {
+    echo "<a href=\"$link\"><img src=\"down_sel.png\"></a>";
+  } else {
+    echo "<a href=\"$link\"><img src=\"down.png\"></a>";
   }
 
   // up button link
-  $link = "$baselink" . "&sort=$value";
+  $link = "$baselink" . "&rsort=$value";
+  if ($from != "") {
+    $link = $link . "&from=$from";
+  }
   if ($up == $value) {
     echo "<a href=\"$link\"><img src=\"up_sel.png\"></a>";
   } else {
     echo "<a href=\"$link\"><img src=\"up.png\"></a>";
-  }
-
-  // down button link
-  $link = "$baselink" . "&rsort=$value";
-  if ($down == $value) {
-    echo "<a href=\"$link\"><img src=\"down_sel.png\"></a>";
-  } else {
-    echo "<a href=\"$link\"><img src=\"down.png\"></a>";
   }