fixed paged result table problems
fixed problems with multiple servers and timemachine
This commit is contained in:
parent
228d07c602
commit
14fb779ea1
|
@ -127,7 +127,7 @@ function initialize() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (($_POST['Poll'] == "Poll Now!" || $_SESSION['timemachine']['date'] == "") && $queryarray[$GETVars['qq']]["polltype"]=="snapshot") {
|
if (($_POST['Poll'] == "Poll Now!" || $_SESSION['timemachine']['date'] == "") && $queryarray[$GETVars['qq']]["polltype"]=="snapshot" || $_POST['s'] != "") {
|
||||||
$qtable = $configarray["queryarray"][$GETVars['qq']]["name"];
|
$qtable = $configarray["queryarray"][$GETVars['qq']]["name"];
|
||||||
$sql = "SELECT MAX(TimeStamp) FROM res_".$qtable."_".$GETVars["server"];
|
$sql = "SELECT MAX(TimeStamp) FROM res_".$qtable."_".$GETVars["server"];
|
||||||
$res = fetchArrayDB($sql, $conn);
|
$res = fetchArrayDB($sql, $conn);
|
||||||
|
@ -166,6 +166,7 @@ function showPageNavigation($links_per_page = "1") {
|
||||||
global $GETVars;
|
global $GETVars;
|
||||||
|
|
||||||
$page = intval($_GET['page']);
|
$page = intval($_GET['page']);
|
||||||
|
if ($page == "") $page = 1;
|
||||||
$so = $_GET['so'];
|
$so = $_GET['so'];
|
||||||
$sortcol = $_GET['sort'];
|
$sortcol = $_GET['sort'];
|
||||||
|
|
||||||
|
@ -213,7 +214,7 @@ function showPageNavigation($links_per_page = "1") {
|
||||||
$numbers = '';
|
$numbers = '';
|
||||||
|
|
||||||
for( $i=$start ; $i<=$end ; $i++) {
|
for( $i=$start ; $i<=$end ; $i++) {
|
||||||
if($i == $page) {
|
if($i == $page ) {
|
||||||
$numbers .= " $i ";
|
$numbers .= " $i ";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -267,7 +268,7 @@ function GetTimemachine() {
|
||||||
|
|
||||||
if ($queryarray[$GETVars['qq']]["polltype"]=="snapshot") {
|
if ($queryarray[$GETVars['qq']]["polltype"]=="snapshot") {
|
||||||
$ret .= "<div class='sidebarinfo'><b>Time Machine</b><br><br><div id='datechooser'>";
|
$ret .= "<div class='sidebarinfo'><b>Time Machine</b><br><br><div id='datechooser'>";
|
||||||
$ret .= "<form name='calform' action='".$_SERVER['PHP_SELF']."?q=".$GETVars['qq']."&m=".$GETVars['menu']."' method='post'>";
|
$ret .= "<form name='calform' action='".$_SERVER['PHP_SELF']."?q=".$GETVars['qq']."&m=".$GETVars['menu']."&s=".$GETVars['server']."' method='post'>";
|
||||||
$ret .= "<input id='dateinput' class='textfield' name='dateinput' type='text' style='width: 100px' value='".strftime("%Y/%m/%d", $_SESSION['timemachine']['date'])."'>";
|
$ret .= "<input id='dateinput' class='textfield' name='dateinput' type='text' style='width: 100px' value='".strftime("%Y/%m/%d", $_SESSION['timemachine']['date'])."'>";
|
||||||
$ret .= "<br>";
|
$ret .= "<br>";
|
||||||
$ret .= "<select name='timestamps' class='button' size=1 style='width: 103px' onchange='submit()'>";
|
$ret .= "<select name='timestamps' class='button' size=1 style='width: 103px' onchange='submit()'>";
|
||||||
|
@ -751,7 +752,8 @@ function execute($type = 'table') {
|
||||||
$polltype = $configarray["queryarray"][$GETVars['qq']]["polltype"];
|
$polltype = $configarray["queryarray"][$GETVars['qq']]["polltype"];
|
||||||
|
|
||||||
if ($polltype == "snapshot") {
|
if ($polltype == "snapshot") {
|
||||||
if ($_SESSION['timemachine']['time'] == date) {
|
//if ($_SESSION['timemachine']['time'] == date) {
|
||||||
|
if ($_SESSION['timemachine']['time'] == $_SESSION['timemachine']['date']) {
|
||||||
$timestampquery = " WHERE timestamp=(SELECT MAX(TimeStamp) FROM res_".$qtable."_".$server.")";
|
$timestampquery = " WHERE timestamp=(SELECT MAX(TimeStamp) FROM res_".$qtable."_".$server.")";
|
||||||
} else {
|
} else {
|
||||||
$timestampquery = " WHERE timestamp = '".$_SESSION['timemachine']['time']."'";
|
$timestampquery = " WHERE timestamp = '".$_SESSION['timemachine']['time']."'";
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<form action="<?php echo $_SERVER['PHP_SELF']."?q=".$GETVars['qq']."&m=".$GETVars['menu']; ?>" method="post">
|
<form action="<?php echo $_SERVER['PHP_SELF']."?q=".$GETVars['qq']."&m=".$GETVars['menu']."&s=".$GETVars['server']; ?>" method="post">
|
||||||
<?php
|
<?php
|
||||||
if ($GETVars['qq'] != "admin" && !$_POST["edit"] == "edit") {
|
if ($GETVars['qq'] != "admin" && !$_POST["edit"] == "edit") {
|
||||||
if ($GETVars['qq'] != "index" && $GETVars['qq'] != "overview") {
|
if ($GETVars['qq'] != "index" && $GETVars['qq'] != "overview") {
|
||||||
|
|
Loading…
Reference in New Issue