Changeset 27840 for branches/simtest_nebulous_branches/ippMonitor/raw/ipp.php

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippMonitor/raw/ipp.php (modified) (6 diffs)

branches/simtest_nebulous_branches/ippMonitor/raw/ipp.php

@@ -17 +17 @@
     echo "Username: <input type=\"text\" name=\"username\"><br>\n";
   }
-  echo 'Password: <input type="text" name="password"><br>', "\n";
+  echo 'Password: <input type="password" name="password"><br>', "\n";
   echo '<input type="submit" name="login" value="login">', "\n";
   echo '</form>', "\n\n";
@@ -283 +283 @@
   if (! $project) { $project = "none"; }
 
-  $file = fopen ($source, "r");
-
+  // these are defined in site.php
+  global $DBHOST;
+  global $WWWHOST;
+
+  echo "<p style=\"font-size:50%\">host: $WWWHOST, db: $DBHOST</p>\n";
   echo "<table class=page cellspacing=10px><tr><td valign=top>\n";
   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]);
@@ -330 +353 @@
   }
   fclose ($file);
-  echo '</table></td><td class="body" valign=top>', "\n\n";
 }
 
@@ -427 +449 @@
   }
   if ($value == "") { return $where; }
+
+  global $restricted;
+  $restricted = 1;
+
   if ($where) { 
     $where = $where . " AND"; 
@@ -644 +670 @@
 // expect image supplied with key=name
 // this function should define matching hidden inputs in the form
-function insert_image ($rule) {
+function insert_image ($rule, $size) {
 
   if ($_SERVER[REQUEST_METHOD] == 'GET') { 
@@ -659 +685 @@
 
   if ($basename && $camera && $rule) {
-    echo "<img src=\"getimage.php?name=$basename&rule=$rule&camera=$camera&class_id=$class_id\">\n";
+    echo "<a href=\"showimage.php?name=$basename&rule=$rule&camera=$camera&class_id=$class_id\">\n";
+    echo "<img $size src=\"getimage.php?name=$basename&rule=$rule&camera=$camera&class_id=$class_id\">\n";
+    echo "</a>\n";
   }
 }