mirror of
https://github.com/ACSPRI/queXS
synced 2024-04-02 12:12:16 +00:00
Now displays data from last process run
When refreshing, will not continually create new processes XHTML head refresh function can clear any GET requests
This commit is contained in:
@@ -65,7 +65,7 @@ if ($p)
|
|||||||
if (isset($_GET['kill']))
|
if (isset($_GET['kill']))
|
||||||
kill_process($p);
|
kill_process($p);
|
||||||
|
|
||||||
xhtml_head(T_("Monitor VoIP Process"),true,false,false,false,10);
|
xhtml_head(T_("Monitor VoIP Process"),true,false,false,false,10,true);
|
||||||
|
|
||||||
print "<h1>" . T_("Running process:") . " $p</h1>";
|
print "<h1>" . T_("Running process:") . " $p</h1>";
|
||||||
|
|
||||||
@@ -81,7 +81,10 @@ if ($p)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
xhtml_head(T_("Monitor VoIP Process"));
|
xhtml_head(T_("Monitor VoIP Process"));
|
||||||
|
print "<h2>" . T_("Monitor VoIP Process") . "</h2>";
|
||||||
print "<p><a href='?watch=watch'>" . T_("Click here to begin monitoring the VoIP Process") . "</a></p>";
|
print "<p><a href='?watch=watch'>" . T_("Click here to begin monitoring the VoIP Process") . "</a></p>";
|
||||||
|
print "<h2>" . T_("Outcome of last process run (if any)") . "</h2>";
|
||||||
|
print process_get_last_data();
|
||||||
}
|
}
|
||||||
xhtml_foot();
|
xhtml_foot();
|
||||||
|
|
||||||
|
|||||||
@@ -217,4 +217,27 @@ function process_get_data($process_id)
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get data from the last process run
|
||||||
|
*
|
||||||
|
* @return string Data from the last process, or an empty string if not available
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
function process_get_last_data()
|
||||||
|
{
|
||||||
|
global $db;
|
||||||
|
|
||||||
|
$sql = "SELECT `data`
|
||||||
|
FROM `process`
|
||||||
|
ORDER BY `process_id` DESC
|
||||||
|
LIMIT 1";
|
||||||
|
|
||||||
|
$rs = $db->GetRow($sql);
|
||||||
|
|
||||||
|
if (!empty($rs))
|
||||||
|
return $rs['data'];
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -39,10 +39,11 @@
|
|||||||
* @param bool|array $javascript False for no Javascript otherwise array of Javascript include files
|
* @param bool|array $javascript False for no Javascript otherwise array of Javascript include files
|
||||||
* @param string $bodytext Space in the body element: good for onload='top.close()' to close validly
|
* @param string $bodytext Space in the body element: good for onload='top.close()' to close validly
|
||||||
* @param bool|int $refresh False or 0 for no refresh otherwise the number of seconds to refresh
|
* @param bool|int $refresh False or 0 for no refresh otherwise the number of seconds to refresh
|
||||||
|
* @param bool $clearrefresh False if we want to pass on any GET request in header, True to clear
|
||||||
*
|
*
|
||||||
* @see xhtml_foot()
|
* @see xhtml_foot()
|
||||||
*/
|
*/
|
||||||
function xhtml_head($title="",$body=true,$css=false,$javascript=false,$bodytext=false,$refresh=false)
|
function xhtml_head($title="",$body=true,$css=false,$javascript=false,$bodytext=false,$refresh=false,$clearrefresh=false)
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
||||||
@@ -55,9 +56,13 @@ function xhtml_head($title="",$body=true,$css=false,$javascript=false,$bodytext=
|
|||||||
if ($javascript)
|
if ($javascript)
|
||||||
foreach ($javascript as $j) print "<script type='text/javascript' src='$j'></script>";
|
foreach ($javascript as $j) print "<script type='text/javascript' src='$j'></script>";
|
||||||
if ($refresh)
|
if ($refresh)
|
||||||
|
{
|
||||||
print " <!--Set to refresh every $refresh seconds-->
|
print " <!--Set to refresh every $refresh seconds-->
|
||||||
<meta http-equiv='Cache-Control' content='no-cache'/>
|
<meta http-equiv='Cache-Control' content='no-cache'/>
|
||||||
<meta http-equiv='refresh' content='$refresh'/>";
|
<meta http-equiv='refresh' content='$refresh";
|
||||||
|
if ($clearrefresh) print ";url=?";
|
||||||
|
print "'/>";
|
||||||
|
}
|
||||||
if (!$body) return;
|
if (!$body) return;
|
||||||
?>
|
?>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
Reference in New Issue
Block a user