summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/xmlrpc_client.inc1
-rwxr-xr-xusr/local/www/diag_logs_filter.php2
-rwxr-xr-xusr/local/www/diag_logs_vpn.php1
3 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/xmlrpc_client.inc b/etc/inc/xmlrpc_client.inc
index aa329b9..c91c9a2 100644
--- a/etc/inc/xmlrpc_client.inc
+++ b/etc/inc/xmlrpc_client.inc
@@ -1835,6 +1835,7 @@ function XML_RPC_iso8601_encode($timet, $utc = 0)
function XML_RPC_iso8601_decode($idate, $utc = 0)
{
$t = 0;
+ $regs = "";
if (ereg('([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})', $idate, $regs)) {
if ($utc) {
$t = gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index 887cb2b..7bc973f 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -56,7 +56,7 @@ if ($_POST['clear']) {
/* format filter logs */
function conv_clog($logfile, $tail = 50) {
- global $config, $nentries;
+ global $config, $nentries, $g;
$logarr = "";
/* make interface/port table */
$iftable = array();
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index e7562b4..4340f26 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -48,6 +48,7 @@ function dump_clog_vpn($logfile, $tail) {
$sor = isset($config['syslog']['reverse']) ? "-r" : "";
+ $logarr = "";
exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr);
foreach ($logarr as $logent) {
OpenPOWER on IntegriCloud