mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
feature: allow scripts to be run from any working directory (#4437)
* feature: allow validate.php to be run from any working directory * remove redundant realpath() call * re-add realpath() to remove symbolic links * realpath() isn't needed... * chdir() in all php scripts in ./ and ./scripts/ * update-sql.php clearly is not used, as it was broken. * Change some scripts to executable Remove extra chdir() call in snmp-scan.php * Missed console-ui.php Kind of fixed console-ui.php help output * Re-add newline
This commit is contained in:
committed by
Neil Lathwood
parent
f7b68c4714
commit
d2193f76ca
@@ -1,11 +1,13 @@
|
||||
#!/usr/bin/env php
|
||||
<?php
|
||||
|
||||
require '../includes/defaults.inc.php';
|
||||
require '../config.php';
|
||||
require_once '../includes/definitions.inc.php';
|
||||
require '../includes/functions.php';
|
||||
require '../html/includes/functions.inc.php';
|
||||
chdir(realpath(__DIR__ . '/..')); // cwd to the parent directory of this script
|
||||
|
||||
require 'includes/defaults.inc.php';
|
||||
require 'config.php';
|
||||
require_once 'includes/definitions.inc.php';
|
||||
require 'includes/functions.php';
|
||||
require 'html/includes/functions.inc.php';
|
||||
|
||||
$console_color = new Console_Color2();
|
||||
|
||||
@@ -88,7 +90,7 @@ while ($end == 0) {
|
||||
$port_speed = humanspeed($port['ifSpeed']);
|
||||
}
|
||||
|
||||
if ($port[ifDuplex] != 'unknown') {
|
||||
if ($port['ifDuplex'] != 'unknown') {
|
||||
$port_duplex = $port['ifDuplex'];
|
||||
}
|
||||
|
||||
@@ -108,22 +110,18 @@ while ($end == 0) {
|
||||
echo $options['list'];
|
||||
echo "Usage of console-ui.php:
|
||||
|
||||
-l What log type we want to see:
|
||||
eventlog = Event log messages
|
||||
syslog = Syslog messages
|
||||
-l What log type we want to see:
|
||||
eventlog = Event log messages
|
||||
syslog = Syslog messages
|
||||
-d Specify the device id to filter results
|
||||
--list What to list
|
||||
devices = list devices and device id's
|
||||
--device-stats Lists the port statistics for a given device
|
||||
|
||||
-d Specify the device id to filter results
|
||||
|
||||
--list What to list
|
||||
devices = list devices and device id's
|
||||
|
||||
--device-stats Lists the port statistics for a given device
|
||||
|
||||
Examples:
|
||||
#1 php console-ui.php -l eventlog -d 1
|
||||
#2 php console-ui.php --list=devices
|
||||
|
||||
";
|
||||
Examples:
|
||||
#1 php console-ui.php -l eventlog -d 1
|
||||
#2 php console-ui.php --list=devices
|
||||
";
|
||||
exit;
|
||||
}//end if
|
||||
echo print $console_color->convert('%rLast update at '.date('Y-m-d h:i:s')."%n\n\n");
|
||||
|
||||
@@ -11,9 +11,11 @@
|
||||
* the source code distribution for details.
|
||||
*/
|
||||
|
||||
include_once("../includes/defaults.inc.php");
|
||||
include_once("../config.php");
|
||||
include_once("../includes/definitions.inc.php");
|
||||
chdir(realpath(__DIR__ . '/..')); // cwd to the parent directory of this script
|
||||
|
||||
include_once("includes/defaults.inc.php");
|
||||
include_once("config.php");
|
||||
include_once("includes/definitions.inc.php");
|
||||
|
||||
?>
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#!/usr/bin/env php
|
||||
<?php
|
||||
|
||||
chdir(realpath(__DIR__ . '/..')); // cwd to the parent directory of this script
|
||||
|
||||
require 'includes/defaults.inc.php';
|
||||
require 'config.php';
|
||||
require 'includes/definitions.inc.php';
|
||||
@@ -26,3 +28,5 @@ foreach (dbFetchRows("SELECT `device_id`,`hostname` FROM `devices` WHERE `hostna
|
||||
rrdtool_tune('port', $rrdfile, $port['ifSpeed']);
|
||||
}
|
||||
}
|
||||
|
||||
rrdtool_close();
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
#!/usr/bin/env php
|
||||
<?php
|
||||
|
||||
// MYSQL Check - FIXME
|
||||
// 1 UPDATE
|
||||
require 'config.php';
|
||||
require 'includes/functions.php';
|
||||
|
||||
if ($fd = @fopen($argv[1], 'r')) {
|
||||
$data = fread($fd, 4096);
|
||||
while (!feof($fd)) {
|
||||
$data .= fread($fd, 4096);
|
||||
}
|
||||
|
||||
foreach (explode("\n", $data) as $line) {
|
||||
$update = mysql_query($line);
|
||||
// FIXME check query success?
|
||||
echo "$line \n";
|
||||
}
|
||||
} else {
|
||||
echo "ERROR: Could not open file \"$argv[1]\".\n";
|
||||
}
|
||||
Reference in New Issue
Block a user