mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reconstruct addHost() so it is easier to understand

Browse Source 
Update addHost() to return either device_id or a string
modify print_error(), print_message() to allow for $quiet variable
Only call addHost() once in addhost.php, if the snmp version isn't set, addHost will cope
Fix up snmp-scan.php and discovery-protocols.inc.php to detect when a device already exists
change in ip_exists() to make it more readable
This commit is contained in:
Tony Murray
2016-08-01 22:01:01 -05:00
parent ddf20a2f79
commit 66bed276c2
8 changed files with 177 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
includes/common.php
View File

@@ -80,9 +80,13 @@ function isCli() {
}
}
function print_error($text) {
global $console_color;
function print_error($text, $quiet = false) {
if ($quiet) {
return;
}
if (isCli()) {
global $console_color;
print $console_color->convert("%r".$text."%n\n", false);
}
else {
@@ -90,9 +94,14 @@ function print_error($text) {
}
}
function print_message($text) {
function print_message($text, $quiet = false) {
if ($quiet) {
return;
}
if (isCli()) {
print Console_Color2::convert("%g".$text."%n\n", false);
global $console_color;
print $console_color->convert("%g".$text."%n\n", false);
}
else {
echo('<div class="alert alert-success"><img src="images/16/tick.png" align="absmiddle"> '.$text.'</div>');