mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move authenticate to a little later, update CHANGELOG for VMware support, minor cleanups, prettify message- and errorboxes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1979 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-26 19:28:39 +00:00
parent 7454791074
commit 7ffefc0d57
12 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -20,6 +20,7 @@ SVN 0.10-current
* Add support for Ingrasys iPoMan 1200 series PDUs * Add support for Ingrasys iPoMan 1200 series PDUs
* Add support for Socomec Net Vision UPS systems * Add support for Socomec Net Vision UPS systems
* Add support for ServerTech Sentry3 power systems * Add support for ServerTech Sentry3 power systems
* Add support for VMWare ESX hosts, and listing their virtual machines
* MySQL and nginx application pollers * MySQL and nginx application pollers
* Add support for IPMI polling on servers * Add support for IPMI polling on servers
* Add a new discovery parameter to only discover new devices, this can be run every 5 minutes * Add a new discovery parameter to only discover new devices, this can be run every 5 minutes

14
html/includes/authenticate.inc.php
View File

@@ -6,15 +6,22 @@ session_start();
// Preflight checks // Preflight checks
if (!is_dir($config['rrd_dir'])) if (!is_dir($config['rrd_dir']))
{
echo("<div class='errorbox'>RRD Log Directory is missing ({$config['rrd_dir']}). Graphing may fail.</div>"); echo("<div class='errorbox'>RRD Log Directory is missing ({$config['rrd_dir']}). Graphing may fail.</div>");
}
if (!is_dir($config['temp_dir'])) if (!is_dir($config['temp_dir']))
{
echo("<div class='errorbox'>Temp Directory is missing ({$config['tmp_dir']}). Graphing may fail.</div>"); echo("<div class='errorbox'>Temp Directory is missing ({$config['tmp_dir']}). Graphing may fail.</div>");
}
if (!is_writable($config['temp_dir'])) if (!is_writable($config['temp_dir']))
{
echo("<div class='errorbox'>Temp Directory is not writable ({$config['tmp_dir']}). Graphing may fail.</div>"); echo("<div class='errorbox'>Temp Directory is not writable ({$config['tmp_dir']}). Graphing may fail.</div>");
}
if (isset($_GET['logout']) && $_SESSION['authenticated']) { if (isset($_GET['logout']) && $_SESSION['authenticated'])
{
mysql_query("INSERT INTO authlog (`user`,`address`,`result`) VALUES ('" . $_SESSION['username'] . "', '".$_SERVER["REMOTE_ADDR"]."', 'logged out')"); mysql_query("INSERT INTO authlog (`user`,`address`,`result`) VALUES ('" . $_SESSION['username'] . "', '".$_SERVER["REMOTE_ADDR"]."', 'logged out')");
unset($_SESSION); unset($_SESSION);
session_destroy(); session_destroy();
@@ -24,7 +31,8 @@ if (isset($_GET['logout']) && $_SESSION['authenticated']) {
$auth_message = "Logged Out"; $auth_message = "Logged Out";
} }
if (isset($_GET['username']) && isset($_GET['password'])){ if (isset($_GET['username']) && isset($_GET['password']))
{
$_SESSION['username'] = mres($_GET['username']); $_SESSION['username'] = mres($_GET['username']);
$_SESSION['password'] = mres($_GET['password']); $_SESSION['password'] = mres($_GET['password']);
} elseif (isset($_POST['username']) && isset($_POST['password'])) { } elseif (isset($_POST['username']) && isset($_POST['password'])) {
@@ -46,7 +54,7 @@ if (file_exists('includes/authentication/' . $config['auth_mechanism'] . '.inc.p
} }
else else
{ {
echo("<div class='errorbox'>ERROR: no valid auth_mechanism defined</div>"); print_error('ERROR: no valid auth_mechanism defined!');
exit(); exit();
} }

4
html/includes/functions.inc.php
View File

@@ -334,12 +334,12 @@ function humanspeed($speed)
function print_error($text) function print_error($text)
{ {
echo('<table class="errorbox" cellpadding="3"><tr><td><img src="/images/15/exclamation.png" align="absmiddle"> '.$text.'</td></tr></table>'); echo('<div class="errorbox"><img src="/images/15/exclamation.png" align="absmiddle"> '.$text.'</div>');
} }
function print_message($text) function print_message($text)
{ {
echo('<table class="messagebox" cellpadding="3"><tr><td><img src="/images/16/tick.png" align="absmiddle"> '.$text.'</td></tr></table>'); echo('<div class="messagebox"><img src="/images/16/tick.png" align="absmiddle"> '.$text.'</div>');
} }
function devclass($device) function devclass($device)

9
html/index.php
View File

@@ -23,7 +23,6 @@ include("../includes/defaults.inc.php");
include("../config.php"); include("../config.php");
include("../includes/functions.php"); include("../includes/functions.php");
include("includes/functions.inc.php"); include("includes/functions.inc.php");
include("includes/authenticate.inc.php");
$start = utime(); $start = utime();
$now = time(); $now = time();
@@ -81,13 +80,15 @@ function popUp(URL)
<script type="text/javascript" src="js/overlib.js"></script> <script type="text/javascript" src="js/overlib.js"></script>
<div id="center"> <div id="center">
<?php
<?php include("includes/".$config['web_header']); ?> include("includes/authenticate.inc.php");
include("includes/".$config['web_header']);
<?php if ($_SESSION['authenticated']) {include("includes/print-menubar.php"); } else {echo('<hr color="#444444" />'); } ?> if ($_SESSION['authenticated']) { include("includes/print-menubar.php"); } else { echo('<hr color="#444444" />'); }
?>
<div class="clearer"></div> <div class="clearer"></div>
<div class="content-mat" style="border: 1px none #fcc;"> <div class="content-mat" style="border: 1px none #fcc;">
<div id="content" style="border: 1px none #ccc; min-height:650px;"> <div id="content" style="border: 1px none #ccc; min-height:650px;">
<div style="margin: 7px;"></div> <div style="margin: 7px;"></div>