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

Timestamp:

Feb 14, 2010, 1:03:51 PM (16 years ago)

Author:

eugene

Message:

add distribution pages, simplify menu def files

File:

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

trunk/ippMonitor/raw/ipp.php

@@ -283 +283 @@
   if (! $project) { $project = "none"; }
 
-  $file = fopen ($source, "r");
-
+  // hardwire this name based on the configuration (use ipp.php.in)
   global $DBHOST;
   $HOST = $_SERVER['SERVER_NAME'];
@@ -291 +290 @@
   echo "<table class=menu cellspacing=0px>\n";
 
+  menulines ($source, $root, $append, $project);
+
+  echo '</table></td><td class="body" valign=top>', "\n\n";
+}
+
+function menulines ($source, $root, $append, $project) {
+
+  $file = fopen ($source, "r");
+
+  // loop over the lines in the file and generate lines in the menu
   while ($line = fgetcsv ($file, 1024, "|")) {
+    if (ereg ('^[:blank:]*#', $line[0])) continue;
+    if (count($line) < 2) continue;
+
+    if (count($line) == 2) {
+      $value = trim($line[0]);
+      if ($value == "input") {
+        $value = trim($line[1]);
+        menulines ($value, $root, $append, $project);
+      }
+      continue;
+    }
     if (count($line) != 5) continue;
-    if (ereg ('^[:blank:]*#', $line[0])) continue;
 
     $type = trim($line[2]);
@@ -333 +352 @@
   }
   fclose ($file);
-  echo '</table></td><td class="body" valign=top>', "\n\n";
 }
 
@@ -430 +448 @@
   }
   if ($value == "") { return $where; }
-
-  global $restricted;
-  $restricted = 1;
-
   if ($where) { 
     $where = $where . " AND";