dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multiple notify warnings (#2254)

Browse Source 
test:
- enable all errors
- go to log view page

expected result:
- no warnings/notify/errors

actual result:
Notice: Undefined index: ln in /var/www/fusionpbx/app/log_viewer/log_viewer.php on line 48
Notice: Undefined index: ord in /var/www/fusionpbx/app/log_viewer/log_viewer.php on line 51
Notice: Undefined index: fs in /var/www/fusionpbx/app/log_viewer/log_viewer.php on line 54
Notice: Undefined index: a in /var/www/fusionpbx/app/log_viewer/log_viewer.php on line 57
Notice: Undefined index: filter in /var/www/fusionpbx/app/log_viewer/log_viewer.php on line 81
Notice: Undefined variable: byte_count in /var/www/fusionpbx/app/log_viewer/log_viewer.php on line 221
Notice: Use of undefined constant color - assumed 'color' in /var/www/fusionpbx/app/log_viewer/log_viewer.php on line 246
Notice: Use of undefined constant font - assumed 'font' in /var/www/fusionpbx/app/log_viewer/log_viewer.php on line 246
Notice: Undefined variable: line_num in /var/www/fusionpbx/app/log_viewer/log_viewer.php on line 270
This commit is contained in:
jebsolutions
2016-12-20 13:26:42 -07:00
committed by FusionPBX
parent fb857088db
commit 5e14ba33ea
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/log_viewer/log_viewer.php
+11 -6
View File
@@ -45,17 +45,20 @@ else {
$row_style["1"] = "row_style1"; $row_style["1"] = "row_style1";
//set a default line number value (off) //set a default line number value (off)
if ($_POST['ln'] == '') { $_POST['ln'] = 0; } if (!isset($_POST['ln']) || $_POST['ln'] == '') { $_POST['ln'] = 0; }
//set a default ordinal (descending) //set a default ordinal (descending)
if ($_POST['ord'] == '') { $_POST['ord'] = "asc"; } if (!isset($_POST['ord']) || $_POST['ord'] == '') { $_POST['ord'] = "asc"; }
//set a default file size //set a default file size
if (strlen($_POST['fs']) == 0) { $_POST['fs'] = "32"; } if (!isset($_POST['fs']) || strlen($_POST['fs']) == 0) { $_POST['fs'] = "32"; }
//set a default filter
if (!isset($_POST['filter'])) { $_POST['filter'] = ""; }
if (permission_exists('log_download')) { if (permission_exists('log_download')) {
if ($_GET['a'] == "download") { if (isset($_GET['a']) && $_GET['a'] == "download") {
if ($_GET['t'] == "logs") { if (isset($_GET['t']) && $_GET['t'] == "logs") {
$tmp = $_SESSION['switch']['log']['dir'].'/'; $tmp = $_SESSION['switch']['log']['dir'].'/';
$filename = 'freeswitch.log'; $filename = 'freeswitch.log';
} }
@@ -215,6 +218,7 @@ if (permission_exists('log_view')) {
} }
//start processing //start processing
$byte_count = 0;
while(!feof($file)) while(!feof($file))
{ {
$log_line = fgets($file); $log_line = fgets($file);
@@ -243,7 +247,7 @@ if (permission_exists('log_view')) {
$log_line = str_replace($v1["pattern".$i], "<span style='color: ".$v1["color".$i].";'>".$v1["pattern".$i]."</span>", $log_line); $log_line = str_replace($v1["pattern".$i], "<span style='color: ".$v1["color".$i].";'>".$v1["pattern".$i]."</span>", $log_line);
} }
} }
$ary_output[] = "<span style='color: ".$v1[color]."; font-family: ".$v1[font].";'>".$log_line."</span><br>"; $ary_output[] = "<span style='color: ".$v1['color']."; font-family: ".$v1['font'].";'>".$log_line."</span><br>";
$noprint = true; $noprint = true;
} }
} }
@@ -263,6 +267,7 @@ if (permission_exists('log_view')) {
$adj_index = 1; $adj_index = 1;
} }
foreach ($ary_output as $index => $line) { foreach ($ary_output as $index => $line) {
$line_num = "";
if ($line != "<span style='color: #fff; font-family: monospace;'></span><br>") { if ($line != "<span style='color: #fff; font-family: monospace;'></span><br>") {
if ($_POST['ln']) { if ($_POST['ln']) {
$line_num = "<span style='font-family: courier; color: #aaa; font-size: 10px;'>".($index + $adj_index)."&nbsp;&nbsp;&nbsp;</span>"; $line_num = "<span style='font-family: courier; color: #aaa; font-size: 10px;'>".($index + $adj_index)."&nbsp;&nbsp;&nbsp;</span>";