diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index 3a020ed807..6236fa2836 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -41,7 +41,7 @@ $config['sfdp'] = "/usr/bin/sfdp"; if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["SERVER_PORT"])) { - $config['base_url'] = "http://" . $_SERVER["SERVER_NAME"] .":".$_SERVER["SERVER_PORT"]."/"; + $config['base_url'] = "http://" . $_SERVER["SERVER_NAME"] .":".$_SERVER["SERVER_PORT"]."/"; } $config['title_image'] = "images/observium-logo.png"; @@ -54,7 +54,7 @@ $config['front_page'] = "pages/front/default.php"; $config['page_title'] = "Observium :: Network Observation and Monitoring"; $config['timestamp_format'] = 'd-m-Y H:i:s'; $config['page_gen'] = 1; -$config['web_header'] = "header.inc.php"; # in html/includes +$config['web_header'] = "header.inc.php"; # in html/includes $config['login_message'] = "Unauthorised access or use shall render the user liable to criminal and/or civil prosecution."; $config['int_customers'] = 1; # Enable Customer Port Parsing diff --git a/includes/discovery/libvirt-vminfo.inc.php b/includes/discovery/libvirt-vminfo.inc.php index 7291caed3b..68157ab5a6 100755 --- a/includes/discovery/libvirt-vminfo.inc.php +++ b/includes/discovery/libvirt-vminfo.inc.php @@ -27,7 +27,7 @@ if ($config['enable_libvirt'] == '1' && $device['os'] == "linux" ) { # Check if we are using SSH if we can log in without password - without blocking the discovery # Also automatically add the host key so discovery doesn't block on the yes/no question, and run echo so we don't get stuck in a remote shell ;-) - exec('ssh -o "StrictHostKeyChecking no" -o "PreferredAuthentications publickey" -o "IdentitiesOnly yes" ' . $device['hostname'] . ' echo', $out, $ret); + exec('ssh -o "StrictHostKeyChecking no" -o "PreferredAuthentications publickey" -o "IdentitiesOnly yes" ' . $device['hostname'] . ' echo -e', $out, $ret); if ($ret != 255) { $ssh_ok = 1; } } diff --git a/scripts/update-sql.php b/scripts/update-sql.php index faf79fbac1..eae7123c1f 100755 --- a/scripts/update-sql.php +++ b/scripts/update-sql.php @@ -4,18 +4,24 @@ include("config.php"); include("includes/functions.php"); -$fd = fopen($argv[1],'r'); -$data = fread($fd,4096); -while (!feof($fd)) +if ($fd = @fopen($argv[1],'r')) { - $data .= fread($fd,4096); -} + $data = fread($fd,4096); + while (!feof($fd)) + { + $data .= fread($fd,4096); + } -foreach (explode("\n", $data) as $line) + foreach (explode("\n", $data) as $line) + { + $update = mysql_query($line); + # FIXME check query success? + echo("$line \n"); + } +} +else { - $update = mysql_query($line); - # FIXME check query success? - echo("$line \n"); + echo("ERROR: Could not open file \"$argv[1]\".\n"); } ?> \ No newline at end of file