clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 10:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Rancid error messages (#15683)

Browse Source 
* Fix Rancid error messages

* Fix code style issues.
This commit is contained in:
Ville Hukkamäki 2023-12-31 14:19:32 +02:00 committed by GitHub
parent 8e62ad53b4
commit 2ed5afc826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
includes/html/pages/device/showconfig.inc.php
View File

@ -94,7 +94,17 @@ if (Auth::user()->hasGlobalAdmin()) {
fclose($errors); fclose($errors);
} }
} else { } else {
$fh = fopen($rancid_file, 'r') or exit("Can't open file"); $fh = fopen($rancid_file, 'r');
if ($fh === false) {
echo '<div class="alert alert-warning">Error: Cannot open Rancid configuration file for this device.</div>';
return;
}
if (filesize($rancid_file) == 0) {
echo '<div class="alert alert-warning">Error: Rancid configuration file for this device is empty.</div>';
return;
}
$text = fread($fh, filesize($rancid_file)); $text = fread($fh, filesize($rancid_file));
fclose($fh); fclose($fh);
} }
@ -110,7 +120,17 @@ if (Auth::user()->hasGlobalAdmin()) {
$previous_config = $vars['rev'] . '^'; $previous_config = $vars['rev'] . '^';
} }
} else { } else {
$fh = fopen($rancid_file, 'r') or exit("Can't open file"); $fh = fopen($rancid_file, 'r');
if ($fh === false) {
echo '<div class="alert alert-warning">Error: Cannot open Rancid configuration file for this device.</div>';
return;
}
if (filesize($rancid_file) == 0) {
echo '<div class="alert alert-warning">Error: Rancid configuration file for this device is empty.</div>';
return;
}
$text = fread($fh, filesize($rancid_file)); $text = fread($fh, filesize($rancid_file));
fclose($fh); fclose($fh);
} }