From 5da7ce3b86713d0e6871e6c0439a424a27d5a397 Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Mon, 1 Mar 2010 15:21:10 +0200
Subject: [PATCH] PT:2492070 : First Login wizard updated.

---
 setup/firstlogin/stepAction.php                | 6 ++++++
 setup/firstlogin/steps/firstloginTemplates.php | 3 ++-
 setup/firstlogin/templates/wizard.tpl          | 2 +-
 setup/wizard/config/databases.xml              | 2 +-
 setup/wizard/resources/js/firstlogin.js        | 4 ++--
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/setup/firstlogin/stepAction.php b/setup/firstlogin/stepAction.php
index 47b0445..e14da67 100644
--- a/setup/firstlogin/stepAction.php
+++ b/setup/firstlogin/stepAction.php
@@ -84,6 +84,12 @@ class stepAction extends stepActionBase {
 		$vars['left'] = $left; // Set left menu
 		$vars['fl_version'] = $this->properties['fl_version']; // Set version
 		$vars['fl_type'] = $this->properties['fl_type']; // Set type
+		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
+	            $ft_dir = $oPlugin->getDirs();
+		}
+		$vars['ft_handle'] = $ft_dir; // Set type
 		return $vars;
 	}
 
diff --git a/setup/firstlogin/steps/firstloginTemplates.php b/setup/firstlogin/steps/firstloginTemplates.php
index d003bff..b65ee6e 100644
--- a/setup/firstlogin/steps/firstloginTemplates.php
+++ b/setup/firstlogin/steps/firstloginTemplates.php
@@ -68,7 +68,8 @@ class firstloginTemplates extends Step {
     function doStep() {
     	$this->temp_variables = array(
     									"step_name"=>"templates",
-    									"silent"=>$this->silent);
+    									"silent"=>$this->silent,
+    								);
 		if(!$this->inStep("templates")) { // Landing
 			$this->doRun(); // Set folder structure templates
     		return 'landing';
diff --git a/setup/firstlogin/templates/wizard.tpl b/setup/firstlogin/templates/wizard.tpl
index 7d9d482..599ec88 100644
--- a/setup/firstlogin/templates/wizard.tpl
+++ b/setup/firstlogin/templates/wizard.tpl
@@ -49,5 +49,5 @@
 	</body>
 </html>
 <script>
-	var fl = new firstlogin('<?php echo WIZARD_ROOTURL; ?>');
+	var fl = new firstlogin('<?php echo WIZARD_ROOTURL; ?>', '<?php echo $vars['ft_handle']; ?>');
 </script>
\ No newline at end of file
diff --git a/setup/wizard/config/databases.xml b/setup/wizard/config/databases.xml
index b304b8a..a287c28 100644
--- a/setup/wizard/config/databases.xml
+++ b/setup/wizard/config/databases.xml
@@ -17,6 +17,6 @@
     <duname>root</duname>
     <dmsadminuser>ktcomadmin</dmsadminuser>
     <dmsaupass>js9281djw</dmsaupass>
-    <dmsuser>ktcom-dms</dmsuser>
+    <dmsuser>ktcomdms</dmsuser>
     <dmsupass>djw9281js</dmsupass>
 </database>
diff --git a/setup/wizard/resources/js/firstlogin.js b/setup/wizard/resources/js/firstlogin.js
index 3313750..bb45777 100644
--- a/setup/wizard/resources/js/firstlogin.js
+++ b/setup/wizard/resources/js/firstlogin.js
@@ -7,9 +7,9 @@ $(function() { // Document is ready
 });
 
 // Class First Login
-function firstlogin(rootUrl) {
+function firstlogin(rootUrl, pluginHandle) {
 	this.rootUrl = rootUrl;
-	this.ktfolderAccess = rootUrl + "plugins/commercial/folder-templates/KTFolderTemplates.php?action=";
+	this.ktfolderAccess = rootUrl + pluginHandle + "?action=";
 	this.ktmanageFolderAccess = rootUrl + "admin.php?kt_path_info=misc/adminfoldertemplatesmanagement&action=";
 	this.ajaxOn = false;
 }
--
libgit2 0.21.4