diff --git a/setup/migrate/step.php b/setup/migrate/step.php index 06d4ef1..0c99e6c 100644 --- a/setup/migrate/step.php +++ b/setup/migrate/step.php @@ -429,6 +429,20 @@ class Step public function setErrors($error) { $this->error = $error; } + + /** + * Is the installation + * + * @author KnowledgeTree Team + * @param none + * @access public + * @return string + */ + public function isCe() { + if($this->util->getVersionType() == "community") + return true; + return false; + } } ?> \ No newline at end of file diff --git a/setup/migrate/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php index ca4fbdc..20a0ceb 100644 --- a/setup/migrate/steps/migrateDatabase.php +++ b/setup/migrate/steps/migrateDatabase.php @@ -103,7 +103,7 @@ class migrateDatabase extends Step } else if($this->previous()) { return 'previous'; } - + $this->storeSilent(); return 'landing'; } @@ -171,7 +171,7 @@ class migrateDatabase extends Step $cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile; if($noFile) { $this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database."; - $this->error[]['msg'] = "Please ensure that your KnowledgeTree Mysql service is running."; + $this->error[]['msg'] = "Ensure that your KnowledgeTree Mysql service is running."; $this->error[]['cmd'] = "Click Next after resolving the above errors."; $this->temp_variables['manual_export'] = ""; } else { @@ -209,6 +209,9 @@ class migrateDatabase extends Step private function setDetails() { $this->createMigrateFile(); // create lock file to indicate migration mode $database = $this->getDataFromSession("database"); + $installation = $this->getDataFromSession("installation"); // Get installation directory + $location = $installation['location']; + $this->temp_variables['location'] = $location; if(isset($database['dumpLocation'])) { if(!empty($database['dumpLocation'])) { if(file_exists($database['dumpLocation'])) { // Maybe file has been deleted by tmp @@ -220,7 +223,8 @@ class migrateDatabase extends Step $this->temp_variables['duname'] = $this->getPostSafe('duname'); $this->temp_variables['dpassword'] = $this->getPostSafe('dpassword'); $this->temp_variables['dumpLocation'] = $this->getPostSafe('dumpLocation'); - + + return true; } diff --git a/setup/migrate/steps/migrateInstallation.php b/setup/migrate/steps/migrateInstallation.php index e97c313..932ec16 100644 --- a/setup/migrate/steps/migrateInstallation.php +++ b/setup/migrate/steps/migrateInstallation.php @@ -220,7 +220,7 @@ class migrateInstallation extends step $this->error[] = "KnowledgeTree installation configuration file not found"; } } else { - $this->error[] = "Please Enter a Location"; + $this->error[] = "Enter a Location"; } return false; diff --git a/setup/migrate/steps/migrateServices.php b/setup/migrate/steps/migrateServices.php index acd6d87..9be485c 100644 --- a/setup/migrate/steps/migrateServices.php +++ b/setup/migrate/steps/migrateServices.php @@ -294,7 +294,7 @@ class migrateServices extends Step $state = 'cross'; $this->error[] = "Service : {$serv->getName()} could not be uninstalled.
"; $this->serviceCheck = 'cross'; - $this->temp_variables['services'][$serv->getName()]['msg'] = "Service Stopped, please uninstall service"; + $this->temp_variables['services'][$serv->getName()]['msg'] = "Service Stopped, uninstall service"; } else { $state = 'tick'; $this->temp_variables['services'][$serv->getName()]['msg'] = "Service has been uninstalled"; @@ -402,7 +402,7 @@ class migrateServices extends Step private function storeSilent() { $this->temp_variables['alreadyUninstalled'] = $this->alreadyUninstalled; $this->temp_variables['serviceCheck'] = $this->serviceCheck; - $this->temp_variables['msg'] = "Please turn off KnowledgeTree Mysql Instance."; + $this->temp_variables['msg'] = "Turn off KnowledgeTree Mysql Instance."; } } ?> \ No newline at end of file diff --git a/setup/migrate/templates/complete.tpl b/setup/migrate/templates/complete.tpl index f1fd284..4e97df3 100644 --- a/setup/migrate/templates/complete.tpl +++ b/setup/migrate/templates/complete.tpl @@ -1,7 +1,7 @@

Migration Completed

-

Your database migration was successfully completed. Please check the section below for details of the migration and final instructions

+

Your database migration was successfully completed. Check the section below for details of the migration and final instructions

@@ -9,13 +9,35 @@ '>     

Start new MySQL service

- In order to complete the upgrade process please start the Zend Server MySQL service and then click Next to continue (Click here for help). -

+ In order to complete the upgrade process, start the Zend Server MySQL service and then click Next to continue (Click here for help). +
+
'>      +
+
+ +

+ + [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql] +
+ Right-Click and run [Start Mysql] as administrator, if applicable, or +
+ Click [Start Mysql] + + #Ubuntu +
+ sudo /etc/init.d/mysql start +
+ #RedHat +
+ sudo /etc/init.d/mysqld start + +

+
diff --git a/setup/migrate/templates/database.tpl b/setup/migrate/templates/database.tpl index b1d0399..cafd054 100644 --- a/setup/migrate/templates/database.tpl +++ b/setup/migrate/templates/database.tpl @@ -6,43 +6,123 @@
-

The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.


- Please ensure that your database is backed up before proceeding. If you need assistance with backing up see the  'Backing up and restoring KnowledgeTree'  wiki entry. +

The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.

+
+

+ Ensure that the new Mysql server installed from your operating system's repository is not running +

+
+

+ + [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql] +
+ Right-Click and run [Stop Mysql] as administrator, if applicable, or +
+ Click [Stop Mysql] + + #Ubuntu +
+ sudo /etc/init.d/mysql stop +
+ #RedHat +
+ sudo /etc/init.d/mysqld stop + +

+
+

+ Ensure that the old KnowledgeTree 3.6.1 Mysql server is running +

+

+ + [START MENU] => [Programs] => [KnowledgeTree 3.6.x] => [Control] +
+ Right-Click and run [Start Services] as administrator, if applicable, or +
+ Click [Start Services] + + sudo dmsctl.sh start mysql + +

+
+ + Ensure that your database is backed up before proceeding. If you need assistance with backing up see the   + 'Backing up and restoring KnowledgeTree'  wiki entry. -

-

Click Next to continue.

+
+
+

Click Next to continue.

- - + + + - - -

- - - -

- - -
+ + ?> + + + + + +

+ Ensure that the new Mysql server installed from your operating system's repository is not running +

+

+ + [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql] +
+ Right-Click and run [Stop Mysql] as administrator, if applicable, or +
+ Click [Stop Mysql] + + #Ubuntu +
+ sudo /etc/init.d/mysql stop +
+ #RedHat +
+ sudo /etc/init.d/mysqld stop + +

+
+

+ Ensure that the old KnowledgeTree 3.6.1 Mysql server is running +

+

+ + [START MENU] => [Programs] => [KnowledgeTree 3.6.x] => [Control] +
+ Right-Click and run [Start Services] as administrator, if applicable, or +
+ Click [Start Services] + + sudo dmsctl.sh start mysql + +

+
+ + +
diff --git a/setup/migrate/templates/installation.tpl b/setup/migrate/templates/installation.tpl index ffcd8da..1470467 100644 --- a/setup/migrate/templates/installation.tpl +++ b/setup/migrate/templates/installation.tpl @@ -20,7 +20,7 @@

- Please enter the full path of the installation you wish to upgrade: + Enter the full path of the installation you wish to upgrade:

diff --git a/setup/migrate/templates/installation_confirm.tpl b/setup/migrate/templates/installation_confirm.tpl index 75ef017..967ba98 100644 --- a/setup/migrate/templates/installation_confirm.tpl +++ b/setup/migrate/templates/installation_confirm.tpl @@ -5,7 +5,7 @@ if(!$errors && !$warnings) { ?>       - Installation has been detected. Please confirm system settings. + Installation has been detected. Confirm system settings.

- Please verify your current installation settings. + Verify your current installation settings.

Installation Settings

diff --git a/setup/migrate/templates/services.tpl b/setup/migrate/templates/services.tpl index 37e6ea7..693509b 100644 --- a/setup/migrate/templates/services.tpl +++ b/setup/migrate/templates/services.tpl @@ -9,7 +9,7 @@ if(!$errors && !$warnings) { ?>       - All services have been shut down. Please click next to continue. + All services have been shut down. Click next to continue.

All services are uninstalled. -

     "; ?>Please shutdown the following services

+

     "; ?>Shutdown the following services

util->getVersionType() == "community") + return true; + return false; + } } ?> \ No newline at end of file diff --git a/setup/wizard/resources/js/wizard.js b/setup/wizard/resources/js/wizard.js index 275e828..e133216 100644 --- a/setup/wizard/resources/js/wizard.js +++ b/setup/wizard/resources/js/wizard.js @@ -85,27 +85,27 @@ wizard.prototype.valRegHelper = function() { var last = $("#last"); var email = $("#email"); if(first.attr('value').length < 1) { - $("#reg_error").html('Please enter a First Name'); + $("#reg_error").html('Enter a First Name'); w.focusElement(first); return false; } if(!w.nameCheck(first.attr('value'))) { - $("#reg_error").html('Please enter a valid First Name'); + $("#reg_error").html('Enter a valid First Name'); w.focusElement(first); return false; } if(last.attr('value').length < 1) { - $("#reg_error").html('Please enter a Last Name'); + $("#reg_error").html('Enter a Last Name'); w.focusElement(last); return false; } if(!w.nameCheck(last.attr('value'))) { - $("#reg_error").html('Please enter a valid Last Name'); + $("#reg_error").html('Enter a valid Last Name'); w.focusElement(last); return false; } if(!w.emailCheck(email.attr('value'))) { - $("#reg_error").html('Please enter a valid email address'); + $("#reg_error").html('Enter a valid email address'); w.focusElement(email); return false; } diff --git a/setup/wizard/step.php b/setup/wizard/step.php index 0c75811..b73cdb7 100644 --- a/setup/wizard/step.php +++ b/setup/wizard/step.php @@ -104,10 +104,15 @@ class Step */ protected $silent = false; + /** + * Flag if step needs to show confirm page first + * + * @author KnowledgeTree Team + * @access public + * @var boolean + */ public $displayFirst = false; - private $salt = 'installers'; - /** * Reference to utility object * @@ -116,10 +121,20 @@ class Step * @var object */ public $util; + + /** + * Session salt + * + * @author KnowledgeTree Team + * @access public + * @var boolean + */ + private $salt = 'installers'; public function __construct() { $this->util = new InstallUtil(); } + /** * Returns step state * @@ -445,6 +460,21 @@ class Step public function setErrors($error) { $this->error = $error; } + + /** + * Is the installation + * + * @author KnowledgeTree Team + * @param none + * @access public + * @return string + */ + public function isCe() { + if($this->util->getVersionType() == "community") + return true; + return false; + } + } ?> \ No newline at end of file diff --git a/setup/wizard/steps/configuration.php b/setup/wizard/steps/configuration.php index 2a0ffc6..ef61a56 100644 --- a/setup/wizard/steps/configuration.php +++ b/setup/wizard/steps/configuration.php @@ -408,15 +408,14 @@ class configuration extends Step $server['host'] = array('name' => 'Host', 'setting' => 'server_name', 'where' => 'db', 'value' => $host); $server['port'] = array('name' => 'Port', 'setting' => 'server_port', 'where' => 'db', 'value' => $port); $server['ssl_enabled'] = array('name' => 'SSL Enabled', 'section' => 'KnowledgeTree', 'setting' => 'sslEnabled', 'where' => 'file', 'value' => $ssl_enabled); - if(empty($server['host']['value'])) - $this->error[] = 'Please enter the server\'s host name'; + $this->error[] = 'Enter the server\'s host name'; if(empty($server['port']['value'])) - $this->error[] = 'Please enter the server\'s port'; + $this->error[] = 'Enter the server\'s port'; if(empty($server['file_system_root']['value'])) - $this->error[] = 'Please enter the file system root'; + $this->error[] = 'Enter the file system root'; return $server; } diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php index 568a873..34349a4 100644 --- a/setup/wizard/steps/database.php +++ b/setup/wizard/steps/database.php @@ -311,11 +311,11 @@ class database extends Step } $this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname); if (!$this->util->dbUtilities->getDatabaseLink()) { - $this->error['con'] = "Could not connect to the database, please check username and password"; + $this->error['con'] = "Could not connect to the database, check username and password"; return false; } else { if ($this->dbExists()) { // Check if database Exists - $this->error['dname'] = 'Database Already Exists, please specify a different name'; // Reset usage errors + $this->error['dname'] = 'Database Already Exists, specify a different name'; // Reset usage errors return false; } else { $this->error = array(); // Reset usage errors diff --git a/setup/wizard/steps/dependencies.php b/setup/wizard/steps/dependencies.php index 3dda4d4..bbeb813 100644 --- a/setup/wizard/steps/dependencies.php +++ b/setup/wizard/steps/dependencies.php @@ -360,7 +360,7 @@ class dependencies extends Step */ private function getConfigurations() { - return array( + $conf = array( array('name' => 'Safe Mode', 'configuration' => 'safe_mode', 'recommended' => 'OFF', 'type' => 'bool'), array('name' => 'Display Errors', 'configuration' => 'display_errors', 'recommended' => 'OFF', 'type' => 'bool'), array('name' => 'Display Startup Errors', 'configuration' => 'display_startup_errors', 'recommended' => 'OFF', 'type' => 'bool'), @@ -375,6 +375,11 @@ class dependencies extends Step array('name' => 'Open base directory', 'configuration' => 'open_basedir', 'recommended' => 'unset', 'type' => 'empty'), array('name' => 'Default MIME type', 'configuration' => 'default_mimetype', 'recommended' => 'text/html', 'type' => 'string'), ); + if(!WINDOWS_OS) { // Remove linux settings + unset($conf[1]); + unset($conf[2]); + } + return $conf; } /** diff --git a/setup/wizard/steps/license.php b/setup/wizard/steps/license.php index 05b843f..5736cb9 100644 --- a/setup/wizard/steps/license.php +++ b/setup/wizard/steps/license.php @@ -76,11 +76,11 @@ class license extends step { if($_POST['license']) { return true; } else { - $this->error[] = "Please accept the license agreement"; + $this->error[] = "Accept the license agreement"; return false; } } - $this->error[] = "Please accept the license agreement"; + $this->error[] = "Accept the license agreement"; return false; } diff --git a/setup/wizard/templates/configuration.tpl b/setup/wizard/templates/configuration.tpl index dcbd3dc..14afe6c 100644 --- a/setup/wizard/templates/configuration.tpl +++ b/setup/wizard/templates/configuration.tpl @@ -9,7 +9,7 @@ if(!$errors && !$warnings) { ?>       - All configuration settings are correctly set. Please click next to continue. + All configuration settings are correctly set. Click next to continue.

-      All configuration settings are correctly set. Please click next to continue.

+      All configuration settings are correctly set. Click next to continue.

diff --git a/setup/wizard/templates/database.tpl b/setup/wizard/templates/database.tpl index 86fc6bb..68dd248 100644 --- a/setup/wizard/templates/database.tpl +++ b/setup/wizard/templates/database.tpl @@ -68,12 +68,12 @@ - + - +
 
 
 
 
@@ -96,17 +96,17 @@ An administrative user is required for creating tables within the database. - Please Enter A Username + Enter A Username - Please Enter A Password + Enter A Password - + - Please Confirm Password + Confirm Password Passwords Do Not Match @@ -125,17 +125,17 @@ An second user is required for normal database interaction, the reading and writ - Please Enter A Username + Enter A Username - Please Enter A Password + Enter A Password - + - Please Confirm Password + Confirm Password Passwords Do Not Match diff --git a/setup/wizard/templates/database_confirm.tpl b/setup/wizard/templates/database_confirm.tpl index d8456b2..c2abdd1 100644 --- a/setup/wizard/templates/database_confirm.tpl +++ b/setup/wizard/templates/database_confirm.tpl @@ -2,7 +2,7 @@

Confirming Database Configurations

- Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. Click to Print This Page + Confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. Click to Print This Page

Database Settings

diff --git a/setup/wizard/templates/license.tpl b/setup/wizard/templates/license.tpl index 989654a..c72562b 100644 --- a/setup/wizard/templates/license.tpl +++ b/setup/wizard/templates/license.tpl @@ -6,7 +6,7 @@ } }?>

-Please read and accept the license agreement below before continuing with the setup. +Read and accept the license agreement below before continuing with the setup.

diff --git a/setup/wizard/templates/registration.tpl b/setup/wizard/templates/registration.tpl index e4cbd60..6cadc39 100644 --- a/setup/wizard/templates/registration.tpl +++ b/setup/wizard/templates/registration.tpl @@ -21,7 +21,7 @@

We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree's products - and services. Please see our Privacy and Data Retention policies for more information. + and services. See our Privacy and Data Retention policies for more information.


diff --git a/setup/wizard/templates/services.tpl b/setup/wizard/templates/services.tpl index 7b843b1..08c2c24 100644 --- a/setup/wizard/templates/services.tpl +++ b/setup/wizard/templates/services.tpl @@ -15,7 +15,7 @@ if(!$errors && !$warnings) { ?>       - All service dependencies are met. Please click next to continue. + All service dependencies are met. Click next to continue.