StoryId 778896:Automatic startup wizard

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

StoryId 778896:Automatic startup wizard
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent d5e8b53b
Showing 8 changed files with 53 additions and 19 deletions
control.php
setup/wizard/index.php
setup/wizard/install_util.php
setup/wizard/installer.php
setup/wizard/resources/wizard.js
setup/wizard/steps/database.php
setup/wizard/templates/database.tpl
setup/wizard/templates/wizard.tpl
@@ -38,7 +38,7 @@
 // main library routines and defaults
 require_once('config/dmsDefaults.php');
-
+require_once("setup/wizard/install_util.php");
 /**
  * Controller page -- controls the web application by responding to a set of
  * defined actions.  The controller performs session handling, page-level
@@ -49,6 +49,12 @@ require_once(&#39;config/dmsDefaults.php&#39;);
 // -------------------------------
 // page start
 // -------------------------------
+// Check if system has been installed
+$iu = new InstallUtil();
+if(!$iu->isSystemInstalled()) {
+	redirect("setup/wizard");
+	exit(0);
+}
 $action = $_REQUEST['action'];
@@ -39,5 +39,12 @@
 * @package Installer
 * @version Version 0.1
 */
-	require("installer.php");
+	require_once("install_util.php");
+	$ui = new InstallUtil();
+	if(!$ui->isSystemInstalled()) {
+		require("installer.php");
+	} else {
+		echo "System has been installed <a href='../../'>Goto Login</a>";
+	}
+
 ?>
 \ No newline at end of file
+<?php
+
+class InstallUtil {
+	
+	public function __construct() {
+		
+	}
+	
+	public function isSystemInstalled() {
+		if (file_exists(dirname(__FILE__)."/install")) {
+			return false;
+		}
+
+		return true;
+	}
+}
+?>
 \ No newline at end of file
@@ -439,6 +439,12 @@ class Installer {
     	for ($i=1; $i< count($steps)+1; $i++) {
     		$this->installHelper($steps[$i]);
     	}
+    	
+    	$this->completeInstall();
+    }
+    
+    private function completeInstall() {
+    	unlink("install");
     }
 	/**
@@ -457,8 +463,8 @@ class Installer {
 				$class->setDataFromSession($className); // Set Session Information
 				$class->setDBConfig(); // Set any posted variables
 				$response = $class->installStep(); // Run install step
-				echo "$className==$response<br/>";
-				echo "<pre>";print_r($_SESSION['database']);echo "</pre>";
+//				echo "$className==$response<br/>";
+//				echo "<pre>";print_r($_SESSION['database']);echo "</pre>";
 //				echo $response;
 //				if($response == 'error') {
 //					return $this->landing();
@@ -10,8 +10,8 @@ wizard.prototype.doFormCheck = function() {
 // Disable DnD on element
 // Element has to have a readOnly status set to readonly
 wizard.prototype.disableDnd = function(el_id) {
-    el = document.getElementById(el_id);
-    el.removeAttribute('readOnly');
+//    el = document.getElementById(el_id);
+//    el.removeAttribute('readOnly');
 }
 // Add readOnly access on all inputs of a form
@@ -740,17 +740,17 @@ class database extends Step
 	* @return boolean
 	*/
     public function doAjaxTest($host, $uname, $dname) {
-    	echo 'asd';
-    	die;
-    	if($this->dport == '') 
-    		$con = $this->dbhandler->DBUtil($this->dhost, $this->duname, $this->dpassword, $this->dname);
-    	else 
-    		$con = $this->dbhandler->DBUtil($this->dhost.":".$this->dport, $this->duname, $this->dpassword, $this->dname);
-        if (!$con) {
-            return false;
-        } else {
-            return true;
-        }
+//    	echo 'asd';
+//    	die;
+//    	if($this->dport == '') 
+//    		$con = $this->dbhandler->DBUtil($this->dhost, $this->duname, $this->dpassword, $this->dname);
+//    	else 
+//    		$con = $this->dbhandler->DBUtil($this->dhost.":".$this->dport, $this->duname, $this->dpassword, $this->dname);
+//        if (!$con) {
+//            return false;
+//        } else {
+//            return true;
+//        }
     }
     public function setPostValues() {
 <h1>Database Configuration</h1>
-<!--onclick="javascript:{ldelim}disableDnd('input_period');{rdelim}" readOnly="readonly"-->
 <div class="errors">
     <?php if(isset($errors)) {
@@ -32,5 +32,4 @@
 </html>
 <script>
 	var w = new wizard();
-	w.disableDnd();
 </script>
 \ No newline at end of file