lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: shared get_crash_report() to local has_crash_report()

Browse Source 
It is no longer used anywhere else.
This commit is contained in:
Franco Fichtner 2023-01-31 09:08:16 +01:00
parent 0b04cc5efc
commit 396fdee7cd
2 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/www/crash_reporter.php
View File

@ -1,7 +1,7 @@
<?php
/*
* Copyright (C) 2015-2018 Franco Fichtner <franco@opnsense.org>
* Copyright (C) 2015-2023 Franco Fichtner <franco@opnsense.org>
* Copyright (C) 2014 Deciso B.V.
* Copyright (C) 2011 Scott Ullrich <sullrich@gmail.com>
* All rights reserved.
@ -28,7 +28,29 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
require_once("guiconfig.inc");
require_once 'guiconfig.inc';
function has_crash_report()
{
$skip_files = ['.', '..', 'minfree', 'bounds', ''];
$PHP_errors_log = '/tmp/PHP_errors.log';
$count = 0;
if (file_exists($PHP_errors_log)) {
if (intval(shell_safe('/bin/cat %s | /usr/bin/wc -l | /usr/bin/awk \'{ print $1 }\'', $PHP_errors_log))) {
$count++;
}
}
$crashes = glob('/var/crash/*');
foreach ($crashes as $crash) {
if (!in_array(basename($crash), $skip_files)) {
$count++;
}
}
return $count;
}
function upload_crash_report($files, $agent)
{
@ -150,7 +172,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
} else {
/* if there is no user activity probe for a crash report */
$has_crashed = !empty(get_crash_report());
$has_crashed = has_crash_report();
}
if ($has_crashed) {

35
src/www/guiconfig.inc
View File

@ -469,41 +469,6 @@ if (!$timezone) {
date_default_timezone_set($timezone);
function get_crash_report()
{
if (!userIsAdmin($_SESSION['Username'])) {
return;
}
$savemsg = sprintf(
gettext('A problem was detected. Click %shere%s for more information.'),
'<a href="/crash_reporter.php">',
'</a>'
);
$skip_files = array('.', '..', 'minfree', 'bounds', '');
$PHP_errors_log = '/tmp/PHP_errors.log';
$count = 0;
if (file_exists($PHP_errors_log)) {
if (intval(shell_safe('/bin/cat %s | /usr/bin/wc -l | /usr/bin/awk \'{ print $1 }\'', $PHP_errors_log))) {
$count++;
}
}
$crashes = glob('/var/crash/*');
foreach ($crashes as $crash) {
if (!in_array(basename($crash), $skip_files)) {
$count++;
}
}
if (!$count) {
$savemsg = '';
}
return $savemsg;
}
function get_menu_user()
{
global $config;