PT:2492070 : First Login wizard updated

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

PT:2492070 : First Login wizard updated
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent b339470e
Showing 12 changed files with 110 additions and 60 deletions
dashboard.php
setup/firstlogin/firstlogin.php
setup/firstlogin/firstloginUtil.php
setup/firstlogin/firstloginWizard.php
setup/firstlogin/step.php
setup/firstlogin/steps/firstloginComplete.php
setup/firstlogin/steps/firstloginTemplates.php
setup/firstlogin/templates/complete.tpl
setup/firstlogin/templates/templates.tpl
setup/wizard/installer.php
setup/wizard/resources/js/firstlogin.js
setup/wizard/steps/complete.php
@@ -135,9 +135,21 @@ class DashboardDispatcher extends KTStandardDispatcher {
               'dashlets_left' => $aDashletsLeft,
               'dashlets_right' => $aDashletsRight,
         );
+        
+		// TODO : Is this ok?
+		if(file_exists(KT_DIR.DIRECTORY_SEPARATOR.'var'.DIRECTORY_SEPARATOR.'bin'.DIRECTORY_SEPARATOR."firstlogin.lock")) {
+			$this->runFirstLoginWizard($oTemplate, $aTemplateData);
+		}
+		
         return $oTemplate->render($aTemplateData);
     }
+    // 
+    function runFirstLoginWizard($oTemplate, $aTemplateData) {
+    	$this->oPage->requireJSResource('thirdpartyjs/jquery/jquery-1.3.2.min.js');
+    	$this->oPage->requireJSResource('setup/wizard/resources/js/firstlogin.js');
+    }
+    
     // return some kind of ID for each dashlet
     // currently uses the class name
     function _getDashletId($oDashlet) {
@@ -491,7 +491,8 @@ class firstlogin {
     	$this->_readXml(); // Xml steps
         $this->_resetSessions(); // Make sure session is cleared
         $this->_loadFromSessions();
-    	if(isset($_POST['Next'])) { $this->action = 'next'; 
+    	if(isset($_POST['Next'])) { 
+    		$this->action = 'next'; 
     		$this->response = 'next';
     	} elseif (isset($_POST['Previous'])) {
     		$this->action = 'previous';
@@ -509,8 +510,31 @@ class firstlogin {
     		$this->response = '';
     		$this->action = '';
     	}
+    	$this->loadAjax();
     }
+    private function loadAjax() {
+    	if(isset($_GET['Next'])) { 
+    		$this->action = 'next'; 
+    		$this->response = 'next';
+    	} elseif (isset($_GET['Previous'])) {
+    		$this->action = 'previous';
+    		$this->response = 'previous';
+   	  	} elseif (isset($_GET['Confirm'])) {
+   	  		$this->action = 'confirm';
+    		$this->response = 'next';
+    	} elseif (isset($_GET['Edit'])) {
+    		$this->action = 'edit';
+    		$this->response = 'next';
+    	} elseif (isset($_GET['Skip'])) {
+    		$this->action = 'next';
+    		$this->response = 'next';
+    	} else {
+    		$this->response = '';
+    		$this->action = '';
+    	}
+    }
+    
 	/**
 	* Main control to handle the flow
 	*
@@ -85,47 +85,23 @@ class firstloginUtil extends InstallUtil {
 	* @return mixed
  	*/
     public function checkStructurePermissions() {
-    	// Check if Wizard Directory is writable
-    	if(!$this->_checkPermission(WIZARD_DIR)) {
+    	if(!$this->_checkPermission(WIZARD_DIR)) { // Check if Wizard Directory is writable
     		return 'firstlogin';
     	}
     	return true;
     }
-    public function loadInstallServices() {
-    	require_once("../wizard/steps/services.php");
-    	$s = new services();
-    	return $s->getServices();
-    }
-
-    public function loadInstallService($serviceName) {
-    	require_once("../wizard/lib/services/service.php");
-    	require_once("../wizard/lib/services/".OS."Service.php");
-    	require_once("../wizard/lib/services/$serviceName.php");
-    	return new $serviceName();
-    }
-
     /**
-     * Return port of the old installation
+     * Deletes first login lock file
      *
-     * @param location
-     * @return string
+     * @author KnowledgeTree Team
+     * @access public
+     * @return void
      */
-    public function getPort($location) {
-    	if(WINDOWS_OS) {
-    		$myIni = "my.ini";
-    	} else {
-    		$myIni = "my.cnf";
-    	}
-    	$dbConfigPath = $location.DS."mysql".DS."$myIni";
-    	if(file_exists($dbConfigPath)) {
-			$this->iniUtilities->load($dbConfigPath);
-			$dbSettings = $this->iniUtilities->getSection('mysqladmin');
-    		return $dbSettings['port'];
-    	}
-
-    	return '3306';
+    public function deleteFirstLogin() {
+    	if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."firstlogin.lock"))
+    		unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."firstlogin.lock");
     }
 }
 ?>
 \ No newline at end of file
@@ -165,7 +165,7 @@ class firstloginWizard extends WizardBase {
 		} elseif ($this->getBypass() === "0") {
 			$this->createFile();
 		}
-		if(!$this->isFirstLogin()) { // Check if the systems
+		if($this->isFirstLogin()) { // Check if the systems
 			$response = $this->systemChecks();
 			if($response === true) {
 				$this->display();
@@ -145,7 +145,23 @@ class Step extends StepBase
      */
     public function run() {
     	return $this->run;
-    }    
+    }
+
+	/**
+	* Checks if next button has been clicked
+	*
+	* @author KnowledgeTree Team
+	* @param none
+	* @access public
+	* @return boolean
+	*/
+    public function next() {
+        if(isset($_GET['Next'])) {
+            return true;
+        }
+
+        return false;
+    }
 }
 ?>
 \ No newline at end of file
@@ -68,7 +68,7 @@ class firstloginComplete extends Step {
     }
     function doRun() {
-		
+		$this->util->deleteFirstLogin();
         return 'landing';
     }
@@ -91,14 +91,16 @@ class firstloginTemplates extends Step {
     function applyTemplates() {
     	$templateId = KTUtil::arrayGet($_POST['data'], "templateId", 0);
+    	if($templateId < 1) {
+			$templateId = KTUtil::arrayGet($_GET, "templateId", 0);// Could be ajax call
+    	}
     	if($templateId > 0) {
 			if (KTPluginUtil::pluginIsActive('fs.FolderTemplatesPlugin.plugin')) { // Check if folder templates plugin is active
 	            $oRegistry =& KTPluginRegistry::getSingleton();
 	            $oPlugin =& $oRegistry->getPlugin('fs.FolderTemplatesPlugin.plugin'); // Get a handle on the plugin
-	            return $oPlugin->applyFolderTemplate($templateId, 1);
+	            return $oPlugin->firstLoginAction(1, $templateId);
 			}
     	}
-    	
     	return false;
     }
@@ -6,6 +6,9 @@
 	<input type="submit" name="Next" value="Finish" class="button_next"/>
 </form>
 <script type="text/javascript">
-	$("#duname").focus();
+	$("form").bind("submit", function() {
+		closeFirstLogin();
+		return false;
+	});
 </script>
 <?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
-<form id="<?php echo $step_name; ?>" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
+<form id="step_name_<?php echo $step_name; ?>" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Apply Templates</p>
 	<p class="description">You can select a base folder layout to apply to your root folder of KnowledgeTree.</p>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<div class="field ">
       	<p class="descriptiveText">Choose a template, if you would like to generate predefined folders.</p>
 		<p class="errorMessage"></p>
-			<select name="data[templateId]">
-				<option selected="selected" value="">- No template -</option>
+			<select name="data[templateId]" id="selectedTemplate">
+				<option selected="selected" value="0">- No template -</option>
 				<?php 
 					foreach ($aFolderTemplates as $oFolderTemplate) {
 						echo "<option onclick=\"javascript:{fl.showFolderTemplateTree('{$oFolderTemplate->getId()}')}\" value=\"{$oFolderTemplate->getId()}\">".$oFolderTemplate->getName()."</option>";
@@ -45,10 +45,13 @@
 			</table>
 		</div>
 	</div>
-	<input type="submit" name="Skip" value="Skip" class="button_skip"/>
-	<input type="submit" name="Next" value="Next" class="button_next"/>
+	<input id="skip" type="submit" name="Skip" value="Skip" class="button_skip"/>
+	<input id="next" type="submit" name="Next" value="Next" class="button_next"/>
 </form>
 <script type="text/javascript">
-	$("#duname").focus();
+	$("form").bind("submit", function() {
+		fl.sendFirstLoginForm();
+		return false;
+	});
 </script>
 <?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -142,6 +142,7 @@ class Installer extends NavBase {
 	*/
     private function completeInstall() {
     	touch(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock");
+    	touch(SYSTEM_DIR.'var'.DS.'bin'.DS."firstlogin.lock");
     }
 	/**
-// Class First Login
-//TODO : Plugin path in js
-var ktfolderAccess = "../../plugins/commercial/folder-templates/KTFolderTemplates.php?action=";
-var ktmanageFolderAccess = "admin.php?kt_path_info=misc/adminfoldertemplatesmanagement&action=";
+var win;
+
 $(function() { // Document is ready
 	if($("#wrapper").attr('class') != 'wizard') {// Check if we in a wizard, or on the dashboard
   		showForm(); // Display first login wizard
 	}
 });
+// Class First Login
 function firstlogin(rootUrl) {
+	this.rootUrl = rootUrl;
 	this.ktfolderAccess = rootUrl + "plugins/commercial/folder-templates/KTFolderTemplates.php?action=";
 	this.ktmanageFolderAccess = rootUrl + "admin.php?kt_path_info=misc/adminfoldertemplatesmanagement&action=";
 	this.ajaxOn = false;
@@ -49,6 +49,7 @@ firstlogin.prototype.hideFolderTemplateTrees = function() {
 	);
 }
+// Template has this action. Not needed in first login wizard
 firstlogin.prototype.showNodeOptions = function() {
 }
@@ -68,13 +69,12 @@ var showForm = function() {
         shadow: false,
         modal: true
     });
-    
     this.win.show();
 }
 var createForm = function() {
 	var holder = "<div id='firstlogin'></div>"; 
-	$("#wrapper").append(holder); // Append to current dashboard
+	$("#pageBody").append(holder); // Append to current dashboard
 	var address = "setup/firstlogin/index.php";
 	getUrl(address, "firstlogin"); // Pull in existing wizard
 }
@@ -93,6 +93,19 @@ var getUrl = function (address, div)  {
 	});
 }
+/*
+* Close the popup
+*/
+var closeFirstLogin = function ()  {
+    this.win.destroy();
+    $('.ext-el-mask').each( // TODO : Why does overlay hang around?
+		function() {
+			$(this).remove();
+		}
+	);
+    
+}
+
 // Node clicked
 firstlogin.prototype.nodeAction = function(updateContentDiv, updateDiv, address) {
 	var className = $("#"+updateDiv).attr('class');
@@ -106,4 +119,13 @@ firstlogin.prototype.nodeAction = function(updateContentDiv, updateDiv, address)
 	}
 }
+firstlogin.prototype.getRootUrl = function() {
+	return this.rootUrl;
+}
+firstlogin.prototype.sendFirstLoginForm = function() {
+	var templateId = $("#selectedTemplate").val();
+	var action = $("#step_name_templates").attr('action');
+	var address = this.rootUrl + "setup/firstlogin/" + action + "&templateId=" + templateId + "&Next=Next";
+	getUrl(address, 'firstlogin');
+}
@@ -242,21 +242,12 @@ class complete extends Step {
     function checkInstallType() {
     	if ($this->util->isMigration()) {
     		$this->migrate_check = true;
-    		$this->registerPlugins(); // Set silent mode variables
     	} else {
     		$this->migrate_check = false;
     	}
     }
     /**
-     * Register extra commercial plugins
-     *
-     */
-    private function registerPlugins() {
-
-    }
-    
-    /**
      * Set all silent mode varibles
      *
      */