From d7bdf4c6f379851969b3d14abb0f909d6156556e Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 17 Mar 2008 22:31:05 +0000
Subject: [PATCH] Fix some errors, make the interfaces errors script a little
 better

git-svn-id: http://www.observium.org/svn/observer/trunk@168 61d68cd4-352d-0410-923a-c4978735b2b8
---
 check-errors.php               | 14 ++++++++------
 html/pages/device/dev-edit.inc |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/check-errors.php b/check-errors.php
index fba17ab35d..b822f59f72 100755
--- a/check-errors.php
+++ b/check-errors.php
@@ -4,25 +4,27 @@
 include("config.php");
 include("includes/functions.php");
 
+## Check all of our interface RRD files for errors
+
 if($argv[1]) { $where = "AND `interface_id` = '$argv[1]'"; }
 
 $interface_query = mysql_query("SELECT * FROM `interfaces` AS I, `devices` AS D WHERE I.device_id = D.device_id $where");
 while ($interface = mysql_fetch_array($interface_query)) {
   $errors = interface_errors($interface);
   mysql_query("UPDATE `interfaces` SET in_errors = '" . $errors['in'] . "', out_errors = '" . $errors['out'] . "' WHERE interface_id = '" . $interface['interface_id'] . "'");
-
-  if($errors['in'] > '100' || $errors['out'] > '100') { $errored[] = $interface['hostname'] . " - " . $interface['ifAlias'] . " - " . $errors['in'] . " - " . $errors['out']; }
-
+  if($errors['in'] > '100' || $errors['out'] > '100') { $errored[] = $interface['hostname'] . " - " . $interface['ifDescr'] . " - " . $interface['ifAlias'] . " - " . $errors['in'] . " - " . $errors['out']; }
 }
 
-if($errored) {
+
+if($errored) { ## If there are errored interfaces
   $i=0;
   $msg = "Interfaces with errors : \n\n";
   foreach ($errored as $int) {
-    $msg .= "$int\n";
+    $msg .= "$int\n";  ## Add a line to the report email warning about them
     $i++;
   }
-
+  
+  ## Send the alert email
   mail($config['email_default'], "Observer detected errors on $i interfaces", $msg, $config['email_headers']);
 
 }
diff --git a/html/pages/device/dev-edit.inc b/html/pages/device/dev-edit.inc
index 19e09f2237..c3c6e0535c 100644
--- a/html/pages/device/dev-edit.inc
+++ b/html/pages/device/dev-edit.inc
@@ -34,7 +34,7 @@ echo("<table cellpadding=0 cellspacing=0><tr><td>
   <table width='200' border='0'>
     <tr>
       <td width='300'><div align='right'>Description</div></td>
-      <td colspan='3'><input name='descr' width='50'>$descr</textarea></td>
+      <td colspan='3'><input name='descr' width='50'>$descr</input></td>
     </tr>
    <tr>
       <td>