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

Code had two file connections use one. 

Noticed there were two open connection for the file log. A few other adjustments.
This commit is contained in:
FusionPBX 2022-09-21 13:02:56 -06:00 committed by GitHub
parent bc2b14739c
commit 2900b9fb1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/log_viewer/log_viewer.php
View File

@ -45,16 +45,16 @@
//set a default line number value (off) //set a default line number value (off)
if (!isset($_POST['line_number']) || $_POST['line_number'] == '') { if (!isset($_POST['line_number']) || $_POST['line_number'] == '') {
$_POST['line_number'] = 0; $_POST['line_number'] = 0;
} }
//set a default ordinal (descending) //set a default ordinal (descending)
if (!isset($_POST['sort']) || $_POST['sort'] == '') { if (!isset($_POST['sort']) || $_POST['sort'] == '') {
$_POST['sort'] = "asc"; $_POST['sort'] = "asc";
} }
//set a default file size //set a default file size
if (!isset($_POST['size']) || strlen($_POST['size']) == 0) { if (!isset($_POST['size']) || strlen($_POST['size']) == 0) {
$_POST['size'] = "32"; $_POST['size'] = "32";
} }
@ -107,9 +107,9 @@
$file_size = filesize($log_file); $file_size = filesize($log_file);
} }
//read the log //open the log file
if (file_exists($log_file)) { if (file_exists($log_file)) {
$file_handle = fopen($log_file, "r"); $file = fopen($log_file, "r") or exit($text['error-open_file']);
} }
//include the header //include the header
@ -191,12 +191,14 @@
$array_filter[5]['color'] = 'gold'; $array_filter[5]['color'] = 'gold';
$array_filter[5]['type'] = 'bold'; $array_filter[5]['type'] = 'bold';
$array_filter[5]['font'] = 'monospace'; $array_filter[5]['font'] = 'monospace';
$array_filter[6]['pattern'] = '[CRIT]'; $array_filter[6]['pattern'] = '[CRIT]';
$array_filter[6]['color'] = 'red'; $array_filter[6]['color'] = 'red';
$array_filter[6]['type'] = 'bold'; $array_filter[6]['type'] = 'bold';
$array_filter[6]['font'] = 'monospace'; $array_filter[6]['font'] = 'monospace';
$file_size = filesize($log_file);
/* /*
// removed: duplicate of above // removed: duplicate of above
if (isset($_POST['submit'])) { if (isset($_POST['submit'])) {
@ -243,8 +245,8 @@
else { else {
//open the file //open the file
$byte_count ='0'; $byte_count ='0';
if ($file_handle) { if ($file) {
fseek($file_handle, 0); fseek($file, 0);
} }
echo "<br>".$text['label-open_file']."<br>"; echo "<br>".$text['label-open_file']."<br>";
} }
@ -267,14 +269,14 @@
//start processing //start processing
$byte_count = 0; $byte_count = 0;
if ($file_handle) { if ($file) {
while(!feof($file_handle)) { while(!feof($file)) {
$log_line = escape(fgets($file_handle)); $log_line = escape(fgets($file));
$byte_count++; $byte_count++;
$noprint = false; $noprint = false;
$skip_line = false; $skip_line = false;
if (!empty($filter) ) { if (!empty($filter)) {
$uuid_match = strpos($log_line, $filter); $uuid_match = strpos($log_line, $filter);
if ($uuid_match === false) { if ($uuid_match === false) {
$skip_line = true; $skip_line = true;
@ -326,7 +328,7 @@
} }
} }
} }
echo " </div>"; echo " </div>";
} }
echo " </td>"; echo " </td>";
@ -337,8 +339,8 @@
require_once "resources/footer.php"; require_once "resources/footer.php";
//close the file //close the file
if ($file_handle) { if ($file) {
fclose($file_handle); fclose($file);
} }
?> ?>