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

Add uuid filter for the log viewer. Thanks to soapee01.

This commit is contained in:
Mark Crane 2013-07-05 03:48:40 +00:00
parent 4d884015db
commit cf0922ddb7
2 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/log_viewer/app_languages.php
View File

@ -24,11 +24,12 @@
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
James Rose <james.o.rose@gmail.com> James Rose <james.o.rose@gmail.com>
*/ */
$text['label-log-viewer']['en-us'] = 'Log Viewer'; $text['label-log-viewer']['en-us'] = 'Log Viewer';
$text['label-line-num']['en-us'] = 'Show Line Numbers'; $text['label-line-num']['en-us'] = 'Show Line Numbers';
$text['label-sort']['en-us'] = 'Sort Descending'; $text['label-sort']['en-us'] = 'Sort Descending';
$text['label-filter']['en-us'] = 'Filter';
$text['description-filter']['en-us'] = 'Filtering the log with the text:';
$text['button-reload']['en-us'] = 'Reload'; $text['button-reload']['en-us'] = 'Reload';
$text['label-kb']['en-us'] = 'KB'; //KiloBytes $text['label-kb']['en-us'] = 'KB'; //KiloBytes
$text['button-download']['en-us'] = 'Download Logs'; $text['button-download']['en-us'] = 'Download Logs';
@ -37,6 +38,7 @@
$text['label-syntax']['en-us'] = 'Syntax Highlighted'; $text['label-syntax']['en-us'] = 'Syntax Highlighted';
$text['label-open-at']['en-us'] = 'opening at'; $text['label-open-at']['en-us'] = 'opening at';
$text['label-open-file']['en-us'] = 'opening entire file'; $text['label-open-file']['en-us'] = 'opening entire file';
$text['error-open-file']['en-us'] = 'Unable to open file!';
?> ?>

59
app/log_viewer/log_viewer.php
View File

@ -83,10 +83,11 @@ echo " <b>".$text['label-log-viewer']."</b><br />\n";
echo " </td>\n"; echo " </td>\n";
echo " <form action=\"log_viewer.php\" method=\"POST\">\n"; echo " <form action=\"log_viewer.php\" method=\"POST\">\n";
echo " <td align='right' valign='middle' nowrap>\n"; echo " <td align='right' valign='middle' nowrap>\n";
echo " <label for='ln' style='margin-right: 30px;'><input type='checkbox' name='ln' id='ln' value='1' ".(($_POST['ln'] == 1) ? 'checked' : null)."> ".$text['label-line-num']."</label>"; echo " <label for='filter' style='margin-right: 30px;'>".$text['label-filter']." <input type=\"text\" class=\"formfld\" style=\"width: 150px; text-align: center;\" name=\"filter\" value=\"".$_POST['filter']."\" onclick=\"this.select();\"></label>";
echo " <label for='ord' style='margin-right: 30px;'><input type='checkbox' name='ord' id='ord' value='desc' ".(($_POST['ord'] == 'desc') ? 'checked' : null)."> ".$text['label-sort']."</label>"; echo " <label for='ln' style='margin-right: 30px;'><input type='checkbox' name='ln' id='ln' value='1' ".(($_POST['ln'] == 1) ? 'checked' : null)."> ".$text['label-line-num']."</label>";
echo " Display <input type=\"text\" class=\"formfld\" style=\"width: 50px; text-align: center;\" name=\"fs\" value=\"".$_POST['fs']."\" onclick=\"this.select();\"> ".$text['label-kb'].""; echo " <label for='ord' style='margin-right: 30px;'><input type='checkbox' name='ord' id='ord' value='desc' ".(($_POST['ord'] == 'desc') ? 'checked' : null)."> ".$text['label-sort']."</label>";
echo " <input type=\"submit\" class=\"btn\" style=\"margin-left: 30px;\" name=\"submit\" value=\"".$text['button-reload']."\">"; echo " Display <input type=\"text\" class=\"formfld\" style=\"width: 50px; text-align: center;\" name=\"fs\" value=\"".$_POST['fs']."\" onclick=\"this.select();\"> ".$text['label-kb']."";
echo " <input type=\"submit\" class=\"btn\" style=\"margin-left: 30px;\" name=\"submit\" value=\"".$text['button-reload']."\">";
echo " </td>\n"; echo " </td>\n";
echo " </form>\n"; echo " </form>\n";
echo " <td width='125' align='right' valign='middle' nowrap='nowrap'>\n"; echo " <td width='125' align='right' valign='middle' nowrap='nowrap'>\n";
@ -167,12 +168,16 @@ if (permission_exists('log_view')) {
else { else {
$user_filesize = $_POST['fs'] * 1024; $user_filesize = $_POST['fs'] * 1024;
} }
if (strlen($_REQUEST['filter']) > 0){
$uuid_filter = $_REQUEST['filter'];
echo "<div style=\"text-align: right;color: #FFFFFF;\">".$text['description-filter']." " . $uuid_filter . "</div>";
}
} }
//echo "Log File Size: " . $file_size . " bytes. <br />"; //echo "Log File Size: " . $file_size . " bytes. <br />";
echo "<div style=\"text-align: right;color: #FFFFFF;\">".$text['label-displaying']." " . number_format($user_filesize,0,'.',',') . " of " . number_format($file_size,0,'.',',') . " ".$text['label-bytes'].". </div><br><hr>"; echo "<div style=\"text-align: right;color: #FFFFFF;\">".$text['label-displaying']." " . number_format($user_filesize,0,'.',',') . " of " . number_format($file_size,0,'.',',') . " ".$text['label-bytes'].". </div><br><hr>";
$file = fopen($log_file, "r") or exit("Unable to open file!"); $file = fopen($log_file, "r") or exit($text['error-open-file']);
//set pointer in file //set pointer in file
if ($user_filesize >= '0') { if ($user_filesize >= '0') {
@ -221,27 +226,39 @@ if (permission_exists('log_view')) {
$log_line = fgets($file); $log_line = fgets($file);
$byte_count++; $byte_count++;
$noprint = false; $noprint = false;
foreach ($arr_filter as $v1) {
$pos = strpos($log_line, $v1['pattern']);
//echo "</br> POS is: '$pos'</br>";
if ($pos !== false){
//color adjustments on words in log line
for ($i=2; $i<=$MAXEL; $i++){
if (isset ($v1["pattern".$i])){
$log_line = str_replace($v1["pattern".$i], "<font color=\"{$v1["color".$i]}\">{$v1["pattern".$i]}</font>", $log_line);
}
}
$ary_output[] = "<font color=\"{$v1[color]}\" face=\"{$v1[font]}\">".$log_line."</font><br>"; $skip_line = false;
$noprint = true; if (!empty($uuid_filter) ) {
$uuid_match = strpos($log_line, $uuid_filter);
if ($uuid_match === false) {
$skip_line = true;
}
else {
$skip_line = false;
} }
} }
if ($noprint !== true){ if ($skip_line === false) {
//more firefox workaround... foreach ($arr_filter as $v1) {
//echo "<p style=\"background-color:$background_color;color:$default_color;font-wieght:$default_type;font-family:$default_font\">"; $pos = strpos($log_line, $v1['pattern']);
//echo "</br> POS is: '$pos'</br>";
if ($pos !== false){
//color adjustments on words in log line
for ($i=2; $i<=$MAXEL; $i++){
if (isset ($v1["pattern".$i])){
$log_line = str_replace($v1["pattern".$i], "<font color=\"{$v1["color".$i]}\">{$v1["pattern".$i]}</font>", $log_line);
}
}
$ary_output[] = "<font color=\"{$v1[color]}\" face=\"{$v1[font]}\">".$log_line."</font><br>";
$noprint = true;
}
}
$ary_output[] = "<font color=\"$default_color\" face=\"$default_font\">".htmlentities($log_line)."</font><br>"; if ($noprint !== true){
//more firefox workaround...
//echo "<p style=\"background-color:$background_color;color:$default_color;font-wieght:$default_type;font-family:$default_font\">";
$ary_output[] = "<font color=\"$default_color\" face=\"$default_font\">".$log_line."</font><br>";
}
} }
} }