From 177d482f446625e05e26f332a4dfb20d8ca37d4c Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 19 Jul 2010 11:27:47 +0000
Subject: [PATCH] some prettier access denied pages, and updated about

git-svn-id: http://www.observium.org/svn/observer/trunk@1433 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/pages/about.inc.php    | 19 +++----------------
 html/pages/device.inc.php   |  2 +-
 html/pages/settings.inc.php |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/html/pages/about.inc.php b/html/pages/about.inc.php
index 488ef8b04..1a9a4508b 100644
--- a/html/pages/about.inc.php
+++ b/html/pages/about.inc.php
@@ -39,10 +39,7 @@ along with this program.  If not, see <a href="http://www.gnu.org/licenses/">htt
     $stat_diskio = mysql_result(mysql_query("SELECT COUNT(*) FROM `ucd_diskio`"),0);
     $stat_processors = mysql_result(mysql_query("SELECT COUNT(*) FROM `processors`"),0);
     $stat_memory = mysql_result(mysql_query("SELECT COUNT(*) FROM `mempools`"),0);
-    $stat_temp = mysql_result(mysql_query("SELECT COUNT(*) FROM `temperature`"),0);
-    $stat_fanspeeds = mysql_result(mysql_query("SELECT COUNT(*) FROM `fanspeed`"),0);
-    $stat_volt = mysql_result(mysql_query("SELECT COUNT(*) FROM `voltage`"),0);
-    $stat_amp = mysql_result(mysql_query("SELECT COUNT(*) FROM `current`"),0);
+    $stat_sensors = mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors`"),0);
     $stat_hz = mysql_result(mysql_query("SELECT COUNT(*) FROM `frequency`"),0);
     $stat_humid = mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE sensor_class='humidity'"),0);
     $stat_toner = mysql_result(mysql_query("SELECT COUNT(*) FROM `toner`"),0);
@@ -95,12 +92,8 @@ along with this program.  If not, see <a href="http://www.gnu.org/licenses/">htt
     <td><img src='images/icons/eventlog.png' class='optionicon'> <b>Eventlog Entries</b></td><td align=right>$stat_events</td>
 </tr>
 <tr>
-    <td ><img src='images/icons/temperatures.png' class='optionicon'> <b>Temperatures</b></td><td align=right>$stat_temp</td>
-    <td><img src='images/icons/fanspeeds.png' class='optionicon'> <b>Fanspeeds</b></td><td align=right>$stat_fanspeeds</td>
-</tr>
-<tr>
-    <td ><img src='images/icons/voltages.png' class='optionicon'> <b>Voltage</b></td><td align=right>$stat_volt</td>
-    <td><img src='images/icons/current.png' class='optionicon'> <b>Current</b></td><td align=right>$stat_amp</td>
+    <td ><img src='images/icons/sensors.png' class='optionicon'> <b>Sensors</b></td><td align=right>$stat_sensors</td>
+    <td ><img src='images/icons/humidity.png' class='optionicon'> <b>Humidity</b></td><td align=right>$stat_humid</td>
 </tr>
 
 <tr>
@@ -108,12 +101,6 @@ along with this program.  If not, see <a href="http://www.gnu.org/licenses/">htt
     <td><img src='images/icons/toner.png' class='optionicon'> <b>Toner</b></td><td align=right>$stat_toner</td>
 </tr>
 
-<tr>
-    <td ><img src='images/icons/humidity.png' class='optionicon'> <b>Humidity</b></td><td align=right>$stat_humid</td>
-    <td><!--<img src='images/icons/toner.png' class='optionicon'> <b>Toner</b></td><td align=right>$stat_toner--></td>
-</tr>
-
-
 </table>
 ");
 
diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index 3966fd915..3da7a1bfa 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -236,6 +236,6 @@ echo("</div>
 ");
 }
 
-} else { include("includes/error-no-perm-dev.inc.php"); }
+} else { include("includes/error-no-perm.inc.php"); }
 ?>
 
diff --git a/html/pages/settings.inc.php b/html/pages/settings.inc.php
index 512237152..b98958f66 100644
--- a/html/pages/settings.inc.php
+++ b/html/pages/settings.inc.php
@@ -8,7 +8,7 @@ echo("</pre>");
 
 } else {
 
-echo "<div class='errorbox'>Insufficient permissions to view this page.</div>";
+  include("includes/error-no-perm.inc.php");
 
 }