mclemens
/
tsmmonitor2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reformatted/beautified most files

This commit is contained in:
Michael Clemens 2009-05-18 11:37:07 +00:00
parent 75611f3f8f
commit 5624331190
15 changed files with 1337 additions and 1346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
admin.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**
* *
@ -42,19 +42,17 @@ if ($_POST["css"] != "") {
?> ?>
<?php if ($_SESSION["logindata"]["loggedin"]) { ?> <?php if ($_SESSION["logindata"]["loggedin"]) { ?>
<tr> <tr>
<td colspan="2" id="head"><a class='navheader' href="admin.php"><img src="images/PollDTitleAdmin.gif" border=0></img></a></td> <td colspan="2" id="head"><a class='navheader' href="admin.php"><img src="images/PollDTitleAdmin.gif" border=0></img></a></td>
</tr> </tr>
<tr> <tr>
<td id="tnleft"></td> <td id="tnleft"></td>
<td id="tnright"> <td id="tnright"></td>
</td>
<?php } ?> <?php } ?>
</tr> </tr>
<tr> <tr>
<?php if ($_SESSION["logindata"]["loggedin"]) { ?> <?php if ($_SESSION["logindata"]["loggedin"]) { ?>
<!-- Start left cik navigation menu --> <!-- Start left navigation menu -->
<td id="menue"> <td id="menue">
<div class="menuelinks"> <div class="menuelinks">
<?php echo $tsmmonitor->getMenu( $tsmmonitor->adminmenu, "admin.php?q=".$tsmmonitor->GETVars['qq']."&m=".$tsmmonitor->GETVars['menu'], "admin" ); ?> <?php echo $tsmmonitor->getMenu( $tsmmonitor->adminmenu, "admin.php?q=".$tsmmonitor->GETVars['qq']."&m=".$tsmmonitor->GETVars['menu'], "admin" ); ?>
@ -62,13 +60,12 @@ if ($_POST["css"] != "") {
<br> <br>
<img src="/images/trans.gif" alt="" width="150" height="1" border="0"><br> <img src="/images/trans.gif" alt="" width="150" height="1" border="0"><br>
</td> </td>
<!-- End left cik navigation menu --> <!-- End left navigation menu -->
<?php } ?> <?php } ?>
<td id="content"> <td id="content">
<?php <?php
// main content, right of menu
// main content, right of menu if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass"]) && $tsmmonitor->GETVars['qq'] != "logout" && $_SESSION["logindata"]["loggedin"]) {
if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass"]) && $tsmmonitor->GETVars['qq'] != "logout" && $_SESSION["logindata"]["loggedin"]) {
if ($tsmmonitor->GETVars['qq'] != "" && $tsmmonitor->GETVars['qq'] != "overview") { if ($tsmmonitor->GETVars['qq'] != "" && $tsmmonitor->GETVars['qq'] != "overview") {
// show overview page // show overview page
@ -166,7 +163,7 @@ if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass"
echo "<table class='zebra'>"; echo "<table class='zebra'>";
echo "<tr><th>Key</th><th>Value</th></tr>"; echo "<tr><th>Key</th><th>Value</th></tr>";
foreach ($sqlresth as $col) { foreach ($sqlresth as $col) {
echo "TEST: ".$col['Field']." -> $colval<br>\n"; echo "TEST: ".$col['Field']." -> $colval<br>\n";
if ($col['Field'] != "id") { if ($col['Field'] != "id") {
if ($i == 0) { if ($i == 0) {
echo "<tr class='d0'>"; echo "<tr class='d0'>";
@ -290,7 +287,7 @@ echo "TEST: ".$col['Field']." -> $colval<br>\n";
} }
} }
} }
} else { } else {
if (isset($_SESSION["logindata"])) { if (isset($_SESSION["logindata"])) {
$errormsg = "Login failed!"; $errormsg = "Login failed!";
} else { } else {
@ -301,16 +298,16 @@ echo "TEST: ".$col['Field']." -> $colval<br>\n";
$_SESSION=array(); $_SESSION=array();
include_once "includes/login.php"; include_once "includes/login.php";
} }
$_SESSION['from'] = $tsmmonitor->GETVars['qq']; $_SESSION['from'] = $tsmmonitor->GETVars['qq'];
session_write_close(void); session_write_close(void);
?> ?>
</td>
</tr>
</tr> <?php if ($_SESSION["logindata"]["loggedin"]) include_once "includes/footer.php"; ?>
<?php if ($_SESSION["logindata"]["loggedin"]) include_once "includes/footer.php"; ?> </table>
</table>
</div> </div>
</body> </body>

6
includes/adodb.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**
* *

6
includes/config.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**
* *

6
includes/footer.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**
* *

8
includes/global.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**
* *
@ -36,7 +36,7 @@
The defaults in this file are not meant to be altered by users! The defaults in this file are not meant to be altered by users!
See include/config.php for user configurable database settings. See include/config.php for user configurable database settings.
*/ */
// ** Default database settings ** // // ** Default database settings ** //
$db_type = 'mysql'; $db_type = 'mysql';

44
includes/login.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -16,9 +16,9 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
<form action="<?php echo $_SERVER['PHP_SELF']."?q=".$qq."&m=".$menu; ?>" method="post"> <form action="<?php echo $_SERVER['PHP_SELF']."?q=".$qq."&m=".$menu; ?>" method="post">
*/ */
/** /**
* *
@ -40,23 +40,23 @@ if ($isAdmin) {
?> ?>
<form action="<?php echo $_SERVER['PHP_SELF']; if ($GETVars['qq'] != 'logout'){ echo '?q='.$GETVars['qq'].'&m='.$GETVars['menu']; } ?>" method="post"> <form action="<?php echo $_SERVER['PHP_SELF']; if ($GETVars['qq'] != 'logout'){ echo '?q='.$GETVars['qq'].'&m='.$GETVars['menu']; } ?>" method="post">
<br> <br>
<br> <br>
<br> <br>
<br> <br>
<table class='login'> <table class='login'>
<tr> <tr>
<td colspan="2" id="head"><a class='navheader' ><img src="<?php echo $headerimage ?>" border=0></img></a></td> <td colspan="2" id="head"><a class='navheader' ><img src="<?php echo $headerimage ?>" border=0></img></a></td>
</tr> </tr>
<tr><th colspan="2"><?php echo $errormsg ?></th></tr> <tr><th colspan="2"><?php echo $errormsg ?></th></tr>
<tr><td>Username:</td><td><input name="loginname"></td></tr> <tr><td>Username:</td><td><input name="loginname"></td></tr>
<tr><td>Password:</td><td><input name="loginpasswort" type=password></td></tr> <tr><td>Password:</td><td><input name="loginpasswort" type=password></td></tr>
<tr><td colspan="2"><input type=submit name=submit value="Login"></td></tr> <tr><td colspan="2"><input type=submit name=submit value="Login"></td></tr>
</table> </table>
<br> <br>
<br> <br>
<br> <br>
<br> <br>
<br> <br>
<br> <br>
</form> </form>

78
includes/overview.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**
* *
@ -32,43 +32,43 @@
?> ?>
<table width=90% cellspacing="3" cellpadding="3"> <table width=90% cellspacing="3" cellpadding="3">
<tr><td colspan="3" height='15px'></td></tr> <tr><td colspan="3" height='15px'></td></tr>
<tr><th colspan="3" align='center'>Quick Overview for Server <?php echo $server; ?></th></tr> <tr><th colspan="3" align='center'>Quick Overview for Server <?php echo $server; ?></th></tr>
<tr><td colspan="3" height='15px'></td></tr> <tr><td colspan="3" height='15px'></td></tr>
<tr> <tr>
<td width='48%' valign='top'> <td width='48%' valign='top'>
<table class='zebra'> <table class='zebra'>
<tr><th colspan="2">Health Status</th></tr> <tr><th colspan="2">Health Status</th></tr>
<?php echo $tsmmonitor->getOverviewRows($tsmmonitor->configarray["infoboxarray"]["healthdata"]); ?> <?php echo $tsmmonitor->getOverviewRows($tsmmonitor->configarray["infoboxarray"]["healthdata"]); ?>
</table> </table>
</td> </td>
<td width='4%'> <td width='4%'>
</td> </td>
<td width='48%' valign='top'> <td width='48%' valign='top'>
<table class='zebra'> <table class='zebra'>
<tr><th colspan="2">TSM Database</th></tr> <tr><th colspan="2">TSM Database</th></tr>
<?php //echo getOverviewRows(getInfobox("database")); ?> <?php //echo getOverviewRows(getInfobox("database")); ?>
<?php echo $tsmmonitor->getOverviewRows($tsmmonitor->configarray["infoboxarray"]["database"]); ?> <?php echo $tsmmonitor->getOverviewRows($tsmmonitor->configarray["infoboxarray"]["database"]); ?>
</table> </table>
</td> </td>
</tr> </tr>
<tr><td colspan="3" height='20px'></td></tr> <tr><td colspan="3" height='20px'></td></tr>
<tr> <tr>
<td width='48%' valign='top'> <td width='48%' valign='top'>
<table class='zebra'> <table class='zebra'>
<tr><th colspan="2">Total Data</th></tr> <tr><th colspan="2">Total Data</th></tr>
<?php //echo getOverviewRows(getInfobox("totaldata")); ?> <?php //echo getOverviewRows(getInfobox("totaldata")); ?>
<?php echo $tsmmonitor->getOverviewRows($tsmmonitor->configarray["infoboxarray"]["totaldata"]); ?> <?php echo $tsmmonitor->getOverviewRows($tsmmonitor->configarray["infoboxarray"]["totaldata"]); ?>
</table> </table>
</td> </td>
<td width='4%'> <td width='4%'>
</td> </td>
<td width='48%' valign='top'> <td width='48%' valign='top'>
<table class='zebra'> <table class='zebra'>
<tr><th colspan="2">Schedule Status</th></tr> <tr><th colspan="2">Schedule Status</th></tr>
<?php //echo getOverviewRows(getInfobox("schedules")); ?> <?php //echo getOverviewRows(getInfobox("schedules")); ?>
<?php echo $tsmmonitor->getOverviewRows($tsmmonitor->configarray["infoboxarray"]["schedules"]); ?> <?php echo $tsmmonitor->getOverviewRows($tsmmonitor->configarray["infoboxarray"]["schedules"]); ?>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>

13
includes/page_head.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
*************************************************************************/ *************************************************************************/
/** /**
* *
@ -31,13 +31,12 @@ if ($_POST["css"] != "") $_SESSION['stylesheet'] = $_POST["css"];
if ($_POST["tabletype"] != "") $_SESSION["tabletype"] = $_POST["tabletype"]; if ($_POST["tabletype"] != "") $_SESSION["tabletype"] = $_POST["tabletype"];
if ($_POST["DebugMode"] != "") $_SESSION["debug"] = $_POST["DebugMode"]; if ($_POST["DebugMode"] != "") $_SESSION["debug"] = $_POST["DebugMode"];
$adodb->setDebug($_SESSION["debug"]); $adodb->setDebug($_SESSION["debug"]);
//if ($_SESSION['stylesheet'] == "") $_SESSION['stylesheet'] = "style_classic.css";
?> ?>
<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"> <!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">
<!-- Begin: page_head.php --> <!-- Begin: page_head.php -->
<html> <html>
<head> <head>
<title>TSM Monitor</title> <title>TSM Monitor</title>
<meta http-equiv='content-type' content='text/html; charset=ISO-8859-1'> <meta http-equiv='content-type' content='text/html; charset=ISO-8859-1'>
<link rel='shortcut icon' href='images/favicon.ico' type='image/x-icon'> <link rel='shortcut icon' href='images/favicon.ico' type='image/x-icon'>
@ -81,9 +80,9 @@ $adodb->setDebug($_SESSION["debug"]);
// --> // -->
</script> </script>
</meta> </meta>
</head> </head>
<body> <body>
<div id="inhalt"> <div id="inhalt">
<table cellspacing="4" cellpadding="2" border="0" id="design"> <table cellspacing="4" cellpadding="2" border="0" id="design">
<!-- End: page_head.php --> <!-- End: page_head.php -->

12
includes/pdf.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**
@ -57,7 +57,6 @@ class PDF extends FPDF
* Header - generates page header * Header - generates page header
* *
*/ */
function Header() function Header()
{ {
//Print the table header if necessary //Print the table header if necessary
@ -88,7 +87,6 @@ class PDF extends FPDF
* TableHeader * TableHeader
* *
*/ */
function TableHeader() function TableHeader()
{ {
$this->SetFont('Arial','B',6); $this->SetFont('Arial','B',6);
@ -107,7 +105,6 @@ class PDF extends FPDF
* *
* @param unknown $date * @param unknown $date
*/ */
function Row($data) function Row($data)
{ {
$this->SetX($this->TableX); $this->SetX($this->TableX);
@ -129,7 +126,6 @@ class PDF extends FPDF
* @param string $width * @param string $width
* @param string $align * @param string $align
*/ */
function CalcWidths($width,$align) function CalcWidths($width,$align)
{ {
//Compute the widths of the columns //Compute the widths of the columns
@ -162,7 +158,6 @@ class PDF extends FPDF
* @param string $caption * @param string $caption
* @param string $align * @param string $align
*/ */
function AddCol($field=-1,$width=-1,$caption='',$align='L') function AddCol($field=-1,$width=-1,$caption='',$align='L')
{ {
//Add a column to the table //Add a column to the table
@ -178,7 +173,6 @@ class PDF extends FPDF
* @param string $query * @param string $query
* @param array $prop * @param array $prop
*/ */
function Table($query,$prop=array(),$dbresult) function Table($query,$prop=array(),$dbresult)
{ {
//Issue query //Issue query

6
includes/polld.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**

6
includes/show_pdf.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**

15
includes/topnav.php
View File

@ -32,9 +32,8 @@
?> ?>
<form action="<?php echo $_SERVER['PHP_SELF']."?q=".$tsmmonitor->GETVars['qq']."&m=".$tsmmonitor->GETVars['menu']."&s=".$tsmmonitor->GETVars['server']; ?>" method="post"> <form action="<?php echo $_SERVER['PHP_SELF']."?q=".$tsmmonitor->GETVars['qq']."&m=".$tsmmonitor->GETVars['menu']."&s=".$tsmmonitor->GETVars['server']; ?>" method="post">
<?php <?php
//if ($tsmmonitor->GETVars['qq'] != "admin" && !$_POST["edit"] == "edit") { if ($tsmmonitor->GETVars['qq'] != "index" && $tsmmonitor->GETVars['qq'] != "overview" && $tsmmonitor->GETVars['qq'] != "serverlist") {
if ($tsmmonitor->GETVars['qq'] != "index" && $tsmmonitor->GETVars['qq'] != "overview" && $tsmmonitor->GETVars['qq'] != "serverlist") {
echo "<input type='button' value='PDF' onclick='genPDF()' class='button topnavbutton'>"; echo "<input type='button' value='PDF' onclick='genPDF()' class='button topnavbutton'>";
if ($tsmmonitor->configarray["queryarray"][$tsmmonitor->GETVars['qq']]["timetablefields"] != "") { if ($tsmmonitor->configarray["queryarray"][$tsmmonitor->GETVars['qq']]["timetablefields"] != "") {
@ -48,10 +47,10 @@ if ($tsmmonitor->GETVars['qq'] != "index" && $tsmmonitor->GETVars['qq'] != "over
} }
echo "</select>"; echo "</select>";
} }
} }
if ($tsmmonitor->GETVars['qq'] != "polldstat" && $tsmmonitor->GETVars['qq'] != "serverlist") { if ($tsmmonitor->GETVars['qq'] != "polldstat" && $tsmmonitor->GETVars['qq'] != "serverlist") {
echo "<select name='s' size=1 onChange='submit();' class='button topnavbutton'>"; echo "<select name='s' size=1 onChange='submit();' class='button topnavbutton'>";
@ -61,6 +60,6 @@ if ($tsmmonitor->GETVars['qq'] != "polldstat" && $tsmmonitor->GETVars['qq'] != "
echo '> '.$servername.' ('.$serveritems["description"].')</option>'; echo '> '.$servername.' ('.$serveritems["description"].')</option>';
} }
echo "</select>"; echo "</select>";
} }
?> ?>
</form> </form>

6
includes/tsmmonitor.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**
* *

46
index.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
TSM Monitor 2 v0.1 (www.tsm-monitor.org) TSM Monitor 2 v0.1 (www.tsm-monitor.org)
Copyright (C) 2009 Michael Clemens <mail@tsm-monitor.org> Copyright (C) 2009 Michael Clemens <mail@tsm-monitor.org>
@ -18,8 +18,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**
* *
@ -36,10 +36,10 @@ include_once "includes/page_head.php";
?> ?>
<?php if ($_SESSION["logindata"]["loggedin"]) { ?> <?php if ($_SESSION["logindata"]["loggedin"]) { ?>
<tr> <tr>
<td colspan="2" id="head"><a class='navheader' href="index.php"><img src="images/PollDTitle.gif" border=0></img></a></td> <td colspan="2" id="head"><a class='navheader' href="index.php"><img src="images/PollDTitle.gif" border=0></img></a></td>
</tr> </tr>
<tr> <tr>
<td id="tnleft"></td> <td id="tnleft"></td>
<td id="tnright"> <td id="tnright">
<div id="tnbox1"> <div id="tnbox1">
@ -56,10 +56,10 @@ include_once "includes/page_head.php";
</div> </div>
</td> </td>
<?php } ?> <?php } ?>
</tr> </tr>
<tr> <tr>
<?php if ($_SESSION["logindata"]["loggedin"]) { ?> <?php if ($_SESSION["logindata"]["loggedin"]) { ?>
<!-- Start left cik navigation menu --> <!-- Start left navigation menu -->
<td id="menue"> <td id="menue">
<div class="menuelinks"> <div class="menuelinks">
<?php echo $tsmmonitor->getMenu( $tsmmonitor->submenu, "index.php?q=".$tsmmonitor->GETVars['qq']."&m=".$tsmmonitor->GETVars['menu']."&s=".$tsmmonitor->GETVars['server'], "index" ); ?> <?php echo $tsmmonitor->getMenu( $tsmmonitor->submenu, "index.php?q=".$tsmmonitor->GETVars['qq']."&m=".$tsmmonitor->GETVars['menu']."&s=".$tsmmonitor->GETVars['server'], "index" ); ?>
@ -80,13 +80,13 @@ include_once "includes/page_head.php";
</div> </div>
<img src="/images/trans.gif" alt="" width="150" height="1" border="0"><br> <img src="/images/trans.gif" alt="" width="150" height="1" border="0"><br>
</td> </td>
<!-- End left cik navigation menu --> <!-- End left navigation menu -->
<?php } ?> <?php } ?>
<td id="content"> <td id="content">
<?php <?php
// main content, right of menu // main content, right of menu
if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass"]) && $tsmmonitor->GETVars['qq'] != "logout" && $_SESSION["logindata"]["loggedin"]){ if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass"]) && $tsmmonitor->GETVars['qq'] != "logout" && $_SESSION["logindata"]["loggedin"]){
if ($tsmmonitor->GETVars['qq'] != "" && $tsmmonitor->GETVars['qq'] != "overview"){ if ($tsmmonitor->GETVars['qq'] != "" && $tsmmonitor->GETVars['qq'] != "overview"){
// show overview page // show overview page
@ -176,7 +176,7 @@ if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass"
} }
} }
} else { } else {
if (isset($_SESSION["logindata"])){ if (isset($_SESSION["logindata"])){
$errormsg = "Login failed!"; $errormsg = "Login failed!";
}else{ }else{
@ -185,16 +185,18 @@ if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass"
session_unset(); session_unset();
$_SESSION=array(); $_SESSION=array();
include_once "includes/login.php"; include_once "includes/login.php";
} }
$_SESSION['from'] = $tsmmonitor->GETVars['qq']; $_SESSION['from'] = $tsmmonitor->GETVars['qq'];
session_write_close(void); session_write_close(void);
?> ?>
</tr> </td>
</tr>
<?php if ($_SESSION["logindata"]["loggedin"]) include_once "includes/footer.php"; ?> <?php if ($_SESSION["logindata"]["loggedin"]) include_once "includes/footer.php"; ?>
</table> </table>

6
polld/tmonpolld.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
************************************************************************ ************************************************************************
This file is part of TSM Monitor. This file is part of TSM Monitor.
TSM Monitor is free software: you can redistribute it and/or modify TSM Monitor is free software: you can redistribute it and/or modify
@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>. along with TSM Monitor. If not, see <http://www.gnu.org/licenses/>.
************************************************************************ ************************************************************************
*/ */
/** /**