Changeset 34047 for branches/eam_branches/ipp-20120601/ippMonitor/def/autocode.php

Timestamp:

Jun 20, 2012, 12:21:48 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120601/ippMonitor

Files:

• . (modified) (1 prop)
• def/autocode.php (modified) (2 diffs)

branches/eam_branches/ipp-20120601/ippMonitor/def/autocode.php

@@ -28 +28 @@
 // ** TABLE RESTRICTIONS **
 
+// Note: the restriction is now moved AFTER the count query
+// unless the RESTRICT_COUNT keyword is used
 if ($restricted == 0) {
-  if ("$UNRESTRICTED" != "none") {
-    $WHERE = "$WHERE $UNRESTRICTED";
+  if ("$RESTRICT_COUNT" != "none") {
+    $WHERE = "$WHERE $RESTRICT_COUNT";
   }
 }
@@ -56 +58 @@
   menu_end();
 }
+
+// Restrict the query if it is necessary
+if ($restricted == 0) {
+  if ( ("$UNRESTRICTED" != "none") && ("$RESTRICT_COUNT" == "none") ) {
+    $WHERE = "$WHERE $UNRESTRICTED";
+  }
+}
+
 // set up the row counter variables
 if ($ID['from']) {