nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated installer

Browse Source
This commit is contained in:
laf
2015-04-30 11:35:43 +01:00
parent c5ef169b8b
commit 05ec4d0145
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/index.php
+7 -8
View File
@@ -50,6 +50,13 @@ if (strpos($_SERVER['PATH_INFO'], "debug"))
// Set variables
$msg_box = array();
// Check for install.inc.php
if (!file_exists('../config.php') && $_SERVER['PATH_INFO'] != '/install.php')
{
// no config.php does so let's redirect to the install
header('Location: /install.php');
exit;
}
include("../includes/defaults.inc.php");
include("../config.php");
@@ -60,14 +67,6 @@ include("includes/vars.inc.php");
include('includes/plugins.inc.php');
Plugins::start();
// Check for install.inc.php
if (!file_exists('../config.php') && $_SERVER['PATH_INFO'] != '/install.php')
{
// no config.php does so let's redirect to the install
header('Location: /install.php');
exit;
}
$runtime_start = utime();
ob_start();
html/install.php
+2 -3
View File
@@ -48,10 +48,10 @@ include("includes/functions.inc.php");
if($stage == 2)
{
$test_db = mysqli_connect($dbhost,$dbuser,$dbpass,$dbname);
if(mysqli_connect_errno($test_db))
if(mysqli_connect_error())
{
$stage = 1;
$msg = "Couldn't connect to the database, please check your details";
$msg = "Couldn't connect to the database, please check your details<br /> " . mysqli_connect_error();
}
else
{
@@ -404,7 +404,6 @@ $config_file = <<<"EOD"
\$config\['poller-wrapper'\]\['alerter'\] = FALSE;
# Uncomment the next line to disable daily updates
#\$config\['update'\] = 0;
?>
EOD;
if(!file_exists("../config.php"))