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

Timestamp:

Feb 24, 2010, 1:33:57 PM (16 years ago)

Author:

eugene

Message:

various improvements

File:

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

trunk/ippMonitor/raw/ipp.php

@@ -283 +283 @@
   if (! $project) { $project = "none"; }
 
-  // hardwire this name based on the configuration (use ipp.php.in)
+  // these are defined in site.php
   global $DBHOST;
-  $HOST = $_SERVER['SERVER_NAME'];
-  echo "<p style=\"font-size:50%\">host: $HOST, db: $DBHOST</p>\n";
+  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";
@@ -448 +449 @@
   }
   if ($value == "") { return $where; }
+
+  global $restricted;
+  $restricted = 1;
+
   if ($where) { 
     $where = $where . " AND"; 
@@ -680 +685 @@
 
   if ($basename && $camera && $rule) {
+    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";
   }
 }