Index: trunk/ippMonitor/def/autocode.php
===================================================================
--- trunk/ippMonitor/def/autocode.php	(revision 10963)
+++ trunk/ippMonitor/def/autocode.php	(revision 13566)
@@ -27,9 +27,6 @@
 
 // get the result table count
-if ($WHERE) {
-  $sql = "SELECT count(*) FROM $TABLE WHERE $WHERE";
-} else {
-  $sql = "SELECT count(*) FROM $TABLE";
-}
+$sql = "SELECT count(*) FROM $TABLE $WHERE";
+
 $qry = $db->query($sql);
 if (DB::iserror($db)) {
@@ -53,9 +50,5 @@
 
 // query the database
-if ($WHERE) {
-  $sql = "SELECT $FIELDS FROM $TABLE WHERE $WHERE LIMIT $dTABLE OFFSET $rowStart";
-} else {
-  $sql = "SELECT $FIELDS FROM $TABLE LIMIT $dTABLE OFFSET $rowStart";
-}
+$sql = "SELECT $FIELDS FROM $TABLE $WHERE LIMIT $dTABLE OFFSET $rowStart";
 
 $qry = $db->query($sql);
@@ -67,34 +60,6 @@
 // ** HEAD CODE **
 
-if ($rowStart > 0) {
-  $value = 0;
-  $link = "$FILE" . "?" . $ID['link'] . "&from=$value";
-  echo "<a width=10 class=\"button\" href=\"$link\">&#60&#60</a>\n";
-} else {
-  echo "&#60&#60\n";
-}
-if ($rowStart >= $dTABLE) {
-  $value = $rowStart - $dTABLE;
-  $link = "$FILE" . "?" . $ID['link'] . "&from=$value";
-  echo "<a class=\"button\" href=\"$link\">&#60</a>\n";
-} else {
-  echo "&#60\n";
-}
-
-if ($rowLast < $rowTotal) {
-  $value = $rowStart + $dTABLE;
-  $link = "$FILE" . "?" . $ID['link'] . "&from=$value";
-  echo "<a class=\"button\" href=\"$link\">&#62</a>\n";
-} else {
-  echo "&#62\n";
-}
-
-if ($rowLast < $rowTotal) {
-  $value = $rowTotal - $dTABLE;
-  $link = "$FILE" . "?" . $ID['link'] . "&from=$value";
-  echo "<a class=\"button\" href=\"$link\">&#62&#62</a>\n";
-} else {
-  echo "&#62&#62\n";
-}
+// ** BUTTON RESTRICTIONS **
+navigate_buttons ($rowStart, $rowLast, $dTABLE, $rowTotal, $buttonLink, $ID, '$FILE');
 
 echo "&nbsp; : &nbsp; or enter start row: <input type=\"text\" name=\"from\" size=\"5\" value=\"$rowStart\">\n";
@@ -104,5 +69,4 @@
 echo "<tr>\n";
 // ** TABLE HEADER **
-// echo "<th class=list> FIELD </th>\n";
 echo "</tr>\n";
 
@@ -117,8 +81,9 @@
   // $link = "$FILE" . "?expID=" . $row[0] . "&" . $ID['link'];
 
+  $class = "list";
+  // ** TD CLASS **
+
   echo "<tr>\n";
   // ** TABLE DATA **
-  // echo "<td class=list><a href=\"$link\"> $row[0] </a></td>\n";
-  // echo "<td class=list> $row[1] </td>\n";
   echo "</tr>\n";
 }