From b273806cf08fba27acadb00ce789e17ab7930e44 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 5 Sep 2014 11:21:21 +0200 Subject: [PATCH] Validate setup password --- code/web/public_php/setup/auth.php | 16 +++++++++++++--- code/web/public_php/setup/database.php | 9 +++++++++ code/web/public_php/setup/install.php | 15 ++++++++++++++- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/code/web/public_php/setup/auth.php b/code/web/public_php/setup/auth.php index 8289289f9..b31646042 100644 --- a/code/web/public_php/setup/auth.php +++ b/code/web/public_php/setup/auth.php @@ -9,24 +9,34 @@ try { $pageTitle = "Authenticate"; include('header.php'); +require_once('config.php'); + ?>
- + + +

Continue

- + + +
diff --git a/code/web/public_php/setup/database.php b/code/web/public_php/setup/database.php index 421efa301..564e74039 100644 --- a/code/web/public_php/setup/database.php +++ b/code/web/public_php/setup/database.php @@ -102,6 +102,15 @@ function upgrade_support_databases($continue_r) { function upgrade_domain_databases($continue_r) { $continue = $continue_r; + $con = null; + $con = connect_database($continue, "ring"); + $continue = ($con != null); + if ($continue && get_db_version("ring") < 1) { + $continue = update_database_structure($continue, $con, "ring_domain_00001.sql"); + $continue = set_db_version($continue, "ring", 1); + } + disconnect_database($con, "ring"); + return $continue; } diff --git a/code/web/public_php/setup/install.php b/code/web/public_php/setup/install.php index cc98b9432..496161724 100644 --- a/code/web/public_php/setup/install.php +++ b/code/web/public_php/setup/install.php @@ -80,6 +80,11 @@ include('header.php'); $continue = create_use_database($continue, $con, $_POST["toolDatabase"]); } + if ($roleDomain) { + // Create Ring database + $continue = create_use_database($continue, $con, $_POST["domainDatabase"]); + } + if ($con) { mysqli_close($con); printalert("info", "Disconnected from the Service SQL server"); @@ -167,6 +172,10 @@ include('header.php'); $continue = upgrade_domain_databases($continue); } + if ($roleService) { + // TODO: Create the default admin user + } + if ($roleSupport) { // Load AMS Library if ($continue) { @@ -200,6 +209,10 @@ include('header.php'); } } + if ($roleDomain) { + // TODO: Register the domain with the nel database etc + } + if ($continue && $roleService) { if (file_put_contents("role_service", "1")) { printalert("success", "Service role successfully installed"); @@ -423,7 +436,7 @@ include('header.php');
-

Domain

+

Domain (Multiple domains require separate installations, as they may run different versions)