mirror of
https://codeberg.org/mclemens/tsmmonitor2.git
synced 2025-01-05 04:36:32 -05:00
- Some pre-release cleanup.
This commit is contained in:
parent
10d433a3c6
commit
f951f398e2
@ -67,8 +67,6 @@ class TSMMonitor {
|
|||||||
|
|
||||||
$this->adodb = $adodb;
|
$this->adodb = $adodb;
|
||||||
|
|
||||||
//$this->adodb->setDebug($_SESSION["debug"]);
|
|
||||||
|
|
||||||
session_name("tsmmonitordev");
|
session_name("tsmmonitordev");
|
||||||
session_start();
|
session_start();
|
||||||
|
|
||||||
@ -102,13 +100,11 @@ class TSMMonitor {
|
|||||||
// Session-variables
|
// Session-variables
|
||||||
$this->configarray = $_SESSION['configarray'];
|
$this->configarray = $_SESSION['configarray'];
|
||||||
|
|
||||||
// timeout
|
// Timeout
|
||||||
if( !ini_get('safe_mode')) {
|
if( !ini_get('safe_mode')) {
|
||||||
if (ini_get('max_execution_time') != $this->configarray["settings"]["timeout"]) {
|
if (ini_get('max_execution_time') != $this->configarray["settings"]["timeout"]) {
|
||||||
ini_set('max_execution_time', $this->configarray["settings"]["timeout"]);
|
ini_set('max_execution_time', $this->configarray["settings"]["timeout"]);
|
||||||
}
|
}
|
||||||
//ini_set('session.gc_maxlifetime', 10);
|
|
||||||
//ini_set('session.gc_divisor', 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// set defaults if vars are empty
|
// set defaults if vars are empty
|
||||||
@ -187,7 +183,6 @@ class TSMMonitor {
|
|||||||
* @return array All results in an associative array
|
* @return array All results in an associative array
|
||||||
*/
|
*/
|
||||||
function fetchSplitArrayDB($sql, $rows_per_page = '20') {
|
function fetchSplitArrayDB($sql, $rows_per_page = '20') {
|
||||||
// $this->conn->debug = true;
|
|
||||||
$this->page = intval($_GET['page']);
|
$this->page = intval($_GET['page']);
|
||||||
|
|
||||||
$sql = $this->adodb->sanitizeSQL($sql);
|
$sql = $this->adodb->sanitizeSQL($sql);
|
||||||
@ -303,7 +298,6 @@ class TSMMonitor {
|
|||||||
|
|
||||||
$navline = $fp.' '.$pp.' '.$numbers.' '.$np.' '.$lp;
|
$navline = $fp.' '.$pp.' '.$numbers.' '.$np.' '.$lp;
|
||||||
}
|
}
|
||||||
//return '<table width="100%" align="center" cellpadding="1" cellspacing="0" border=0><tr><td width="10%" align="left"></td><td width="80%" align="center">'.$navline.'</td><td width="10%" align="right">'.$linebox.'</td></tr></table>';
|
|
||||||
if ($navline != "") {
|
if ($navline != "") {
|
||||||
return '<div id="pagecountbox">'.$linebox.'</div>'.$navline.'';
|
return '<div id="pagecountbox">'.$linebox.'</div>'.$navline.'';
|
||||||
} else {
|
} else {
|
||||||
@ -366,7 +360,6 @@ class TSMMonitor {
|
|||||||
$ret .= " SELECTED ";
|
$ret .= " SELECTED ";
|
||||||
}
|
}
|
||||||
$ret .= "> ".strftime('%H:%M:%S', $ts['timestamp'])."</option>";
|
$ret .= "> ".strftime('%H:%M:%S', $ts['timestamp'])."</option>";
|
||||||
//echo '> '.$ts->timestamp.'</option>';
|
|
||||||
}
|
}
|
||||||
$ret .= "</select>";
|
$ret .= "</select>";
|
||||||
$ret .= "<br>";
|
$ret .= "<br>";
|
||||||
@ -691,8 +684,6 @@ class TSMMonitor {
|
|||||||
$server = $this->GETVars['server'];
|
$server = $this->GETVars['server'];
|
||||||
$ret = array();
|
$ret = array();
|
||||||
|
|
||||||
//$qtable = $this->configarray["queryarray"][$this->GETVars['qq']]["name"];
|
|
||||||
|
|
||||||
$sql = "SELECT MAX(TimeStamp) from res_".$qq."_".$server;
|
$sql = "SELECT MAX(TimeStamp) from res_".$qq."_".$server;
|
||||||
$ret = $this->adodb->fetchArrayDB($sql);
|
$ret = $this->adodb->fetchArrayDB($sql);
|
||||||
$ret = (array)$ret[0];
|
$ret = (array)$ret[0];
|
||||||
@ -1608,7 +1599,6 @@ class TSMMonitor {
|
|||||||
$query = "SELECT * from cfg_overviewqueries where parent='".$box['name']."' order by sortorder asc";
|
$query = "SELECT * from cfg_overviewqueries where parent='".$box['name']."' order by sortorder asc";
|
||||||
$queryoverview = $this->adodb->fetchArrayDB($query);
|
$queryoverview = $this->adodb->fetchArrayDB($query);
|
||||||
$temp = array ();
|
$temp = array ();
|
||||||
//print_r($queryoverview);
|
|
||||||
while (list ($subkey, $ovquery) = each ($queryoverview)) {
|
while (list ($subkey, $ovquery) = each ($queryoverview)) {
|
||||||
$ovquery['header'] = $queryoverview['name'];
|
$ovquery['header'] = $queryoverview['name'];
|
||||||
$temp[] = (array)$ovquery;
|
$temp[] = (array)$ovquery;
|
||||||
|
Loading…
Reference in New Issue
Block a user