From 55fee97d580be993e3043ce57a70f1ef11070c43 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 29 Jun 2010 12:47:50 +0000
Subject: [PATCH] fix about layout, add mysql auth type to defaults.inc.php
 delete a space or some shit in adduser.php

git-svn-id: http://www.observium.org/svn/observer/trunk@1279 61d68cd4-352d-0410-923a-c4978735b2b8
---
 adduser.php               |  2 ++
 html/pages/about.php      | 16 +++++++---------
 includes/defaults.inc.php |  3 +++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/adduser.php b/adduser.php
index af7d7c09e..87f8de48d 100755
--- a/adduser.php
+++ b/adduser.php
@@ -5,6 +5,8 @@ include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
+print_r($config);
+
 if (file_exists('html/includes/authentication/' . $config['auth_mechanism'] . '.inc.php'))
 {
   include('html/includes/authentication/' . $config['auth_mechanism'] . '.inc.php');
diff --git a/html/pages/about.php b/html/pages/about.php
index a919b8fb2..dc0ea2116 100644
--- a/html/pages/about.php
+++ b/html/pages/about.php
@@ -1,7 +1,7 @@
 <div style="margin: 10px;">
   <h3>ObserverNMS <?php echo($config['version']);?></h3>
 
-    <div style="float: right; padding: 0px; max-width: 50%">
+    <div style="float: right; padding: 0px; width: 49%">
     <?php print_optionbar_start(NULL); ?>
     <h3>License</h3>
     <pre>ObserverNMS Network Management and Monitoring System
@@ -61,7 +61,7 @@ along with this program.  If not, see <a href="http://www.gnu.org/licenses/">htt
 
     echo("
 
-<table width=100% cellpadding=5 cellspacing=0>
+<table width=95% cellpadding=5 cellspacing=0>
 <tr>
     <td width=45%><img src='images/icons/device.png' class='optionicon'> <b>Devices</b></td><td align=right>$stat_devices</td>
     <td width=45%><img src='images/icons/port.png' class='optionicon'> <b>Ports</b></td><td align=right>$stat_ports</td>
@@ -124,7 +124,7 @@ print_optionbar_end(); ?>
     
      </div>
 
-<div style="float: left; padding: 0px; max-width: 50%">
+<div style="float: left; padding: 0px; width: 49%">
 
     <?php
 
@@ -152,12 +152,11 @@ print_optionbar_start(NULL);
 echo("
 <h3>Versions</h3>
 <table width=100% cellpadding=3 cellspacing=0 border=0>
-<tr valign=top><td width=20%><b>ObserverNMS</b></td><td width=25%>$observer_version</td>
-    <td><b>Apache</b></td><td>$apache_version</td></tr>
-<tr valign=top><td><b>PHP</b></td><td>$php_version</td>
-    <td><b>MySQL</b></td><td>$mysql_version</td></tr>
+<tr valign=top><td width=150><b>ObserverNMS</b></td><td>$observer_version</td></tr>
+<tr valign=top><td><b>Apache</b></td><td>$apache_version</td></tr>
+<tr valign=top><td><b>PHP</b></td><td>$php_version</td></tr>
+<tr valign=top><td><b>MySQL</b></td><td>$mysql_version</td></tr>
 </table>
-
 ");
 
 print_optionbar_end();
@@ -193,4 +192,3 @@ print_optionbar_end();
 
 
 </div>
-
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index c7d0a5aa1..909f609de 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -95,7 +95,10 @@ $config['ignore_mount_optical']   = 1; # Ignore mounted optical discs
 $config['device_traffic_iftype']  = array('/loopback/','/other/','/tunnel/','/virtual/','/mpls/');
 $config['device_traffic_descr']   = array('/loopback/','/vlan/','/tunnel/','/:\d+/');
 
+# Authentication
+
 $config['allow_unauth_graphs']	  = 0; ## Allow graphs to be viewed by anyone
+$config['auth_mechanism']         = "mysql";   # Auth Type.
 
 # Sensors