diff --git a/setup/migrate/steps/migrateComplete.php b/setup/migrate/steps/migrateComplete.php index c70a228..8f38df0 100644 --- a/setup/migrate/steps/migrateComplete.php +++ b/setup/migrate/steps/migrateComplete.php @@ -86,7 +86,6 @@ class migrateComplete extends Step { } if($this->next()) { $this->checkZendMysql(); - //if($this->checkMysql()) { if($this->checkZendMysql()) { return 'binstall'; } else { @@ -134,8 +133,17 @@ class migrateComplete extends Step { if($response['out']) { $state = preg_replace('/^STATE *\: *\d */', '', trim($response['out'][3])); // Status store in third key } - if($state == "STARTED") + if($state == "STARTED") { $running = true; + } else { + $installation = $this->getDataFromSession("database"); // Get installation directory + $dbConf = $installation; +// $this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname); +// $res = @mysql_connect(null, 'root', ''); +// if($res) { +// $running = true; +// } + } } else { $installation = $this->getDataFromSession("installation"); // Get installation directory $mysqlPid = $installation['location'].DS."mysql".DS."data".DS."mysqld.pid"; diff --git a/setup/migrate/steps/migrateServices.php b/setup/migrate/steps/migrateServices.php index de04b16..a595ee7 100644 --- a/setup/migrate/steps/migrateServices.php +++ b/setup/migrate/steps/migrateServices.php @@ -156,6 +156,8 @@ class migrateServices extends Step * @return boolean */ private function doRun() { + $installation = $this->getDataFromSession("installation"); // Get installation directory + $this->conf = $installation['location']; if(!$this->alreadyUninstalled()) { // Pre-check if services are uninstalled $this->uninstallServices(); } diff --git a/setup/upgrade/steps/upgradeComplete.php b/setup/upgrade/steps/upgradeComplete.php index eaa399d..0e458f6 100644 --- a/setup/upgrade/steps/upgradeComplete.php +++ b/setup/upgrade/steps/upgradeComplete.php @@ -86,7 +86,7 @@ class upgradeComplete extends Step { */ protected function storeSilent() { $v = $this->getDataFromSession('upgradeProperties'); - $this->temp_variables['sysVersion'] = $v['upgrade_version']; + $this->temp_variables['sysVersion'] = $this->util->readVersion(); $this->temp_variables['migrateCheck'] = $this->migrateCheck; $this->temp_variables['servicesCheck'] = $this->servicesCheck; } diff --git a/setup/upgrade/templates/complete.tpl b/setup/upgrade/templates/complete.tpl index 64254d9..53282b2 100644 --- a/setup/upgrade/templates/complete.tpl +++ b/setup/upgrade/templates/complete.tpl @@ -23,7 +23,7 @@

- cd
+ cd
dmsctl.bat install
dmsctl.bat start diff --git a/setup/wizard/resources/css/wizard.css b/setup/wizard/resources/css/wizard.css index 4c30e23..54e1a35 100644 --- a/setup/wizard/resources/css/wizard.css +++ b/setup/wizard/resources/css/wizard.css @@ -601,4 +601,12 @@ td.dir_description { font-size:100%; line-height:150%; font-family:sans-serif; +} + +.twitter { + +} + +.facebook { + } \ No newline at end of file diff --git a/setup/wizard/resources/graphics/facebookbutton.png b/setup/wizard/resources/graphics/facebookbutton.png new file mode 100644 index 0000000..8d98e0c --- /dev/null +++ b/setup/wizard/resources/graphics/facebookbutton.png diff --git a/setup/wizard/resources/graphics/twitterbutton.png b/setup/wizard/resources/graphics/twitterbutton.png new file mode 100644 index 0000000..06edb56 --- /dev/null +++ b/setup/wizard/resources/graphics/twitterbutton.png diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php index 0acd43e..caff7a2 100644 --- a/setup/wizard/steps/database.php +++ b/setup/wizard/steps/database.php @@ -309,11 +309,7 @@ class database extends Step $this->error['dmsuserpassword'] = "Passwords do not match: " . $this->dmsuserpassword." ". $this->getPassword2(); return false; } -// if($this->dport == '') { -// $this->util->dbUtilities->load($this->dhost, $this->duname, $this->dpassword, $this->dname); -// } else { - $this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname); -// } + $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"; return false; diff --git a/setup/wizard/templates/complete.tpl b/setup/wizard/templates/complete.tpl index 6273ccc..4fb5381 100644 --- a/setup/wizard/templates/complete.tpl +++ b/setup/wizard/templates/complete.tpl @@ -4,9 +4,7 @@

This step allows you to check that your KnowledgeTree configuration is set up correctly. - Click Finish to browse to the KnowledgeTree Web Interface. Default login credentials are username: admin and password: admin. -

@@ -15,6 +13,16 @@

+
+ +
+
+ +

Services

@@ -50,7 +58,6 @@ $iconFlag = "     "; $checkHeading = "

".$iconFlag."Paths and Permissions

"; ?> - - - - - - "; @@ -71,7 +73,6 @@ echo $pathsCheck; ?> -' . $varDirectory . ''; ?> ' . $documentRoot . ''; ?> @@ -84,10 +85,8 @@ -

-     "; @@ -100,10 +99,7 @@ $details = 'Hide Details'; $display = 'block'; }?> - - -"; @@ -133,10 +129,7 @@ $details = 'Hide Details'; $display = 'block'; }?> - - -"; @@ -152,7 +145,6 @@ -
@@ -164,46 +156,18 @@
Show Details
- - - - - - - - -
     "; ?> Lucene Service Could not be started Started - - - - - -
     "; ?> Scheduler Service Could not be started Started - - - - - -
     "; ?> OpenOffice Service Could not be started Started - - - - - -
@@ -218,8 +182,6 @@ $file_system_root = $_SERVER['DOCUMENT_ROOT']; $host = $_SERVER['SERVER_NAME']; $port = $_SERVER['SERVER_PORT']; - //$ssl_enabled = isset($_SERVER['HTTPS']) ? (strtolower($_SERVER['HTTPS']) === 'on' ? 'yes' : 'no') : 'no'; - $pos = strpos($script, '/setup/wizard/'); $root_url = substr($script, 0, $pos); if($port == '')