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:
Tony Murray
2016-09-14 10:53:04 -05:00
committed by Neil Lathwood
parent f7b68c4714
commit d2193f76ca
23 changed files with 64 additions and 79 deletions

24
config_to_json.php Normal file → Executable file
View File

@@ -1,3 +1,4 @@
#!/usr/bin/env php
<?php
/*
@@ -6,24 +7,11 @@
*
*/
$defaults_file = 'includes/defaults.inc.php';
$config_file = 'config.php';
// move to install dir
chdir(dirname($argv[0]));
function iscli()
{
if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
return true;
} else {
return false;
}
}
chdir(__DIR__); // cwd to the directory containing this script
// check if we are running through the CLI, otherwise abort
if (iscli()) {
include_once $defaults_file;
include_once $config_file;
print (json_encode($config));
if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
include_once 'includes/defaults.inc.php';
include_once 'config.php';
echo json_encode($config);
}