diff --git a/setup/migrate/steps/migrateComplete.php b/setup/migrate/steps/migrateComplete.php
index 8e76177..1fe77e8 100644
--- a/setup/migrate/steps/migrateComplete.php
+++ b/setup/migrate/steps/migrateComplete.php
@@ -169,6 +169,9 @@ class migrateComplete extends Step {
$mysqlPid = "/var/run/mysqld/mysqld.sock";
if(file_exists($mysqlPid))
$running = true;
+ $mysqlPid = "/var/run/mysqld/mysqld.pid";
+ if(file_exists($mysqlPid))
+ $running = true;
}
if($running) {
$this->temp_variables['zmysql']['class'] = "tick";
diff --git a/setup/migrate/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php
index ba62d78..d304329 100644
--- a/setup/migrate/steps/migrateDatabase.php
+++ b/setup/migrate/steps/migrateDatabase.php
@@ -152,6 +152,8 @@ class migrateDatabase extends Step
if(!empty($fileContents)) {
$this->sqlDumpFile = realpath($sqlFile); // Store location of dump
return true;
+ } else {
+ unlink($sqlFile);
}
}
$noFile = true;
diff --git a/setup/migrate/steps/migrateInstallation.php b/setup/migrate/steps/migrateInstallation.php
index 16634a3..72ed725 100644
--- a/setup/migrate/steps/migrateInstallation.php
+++ b/setup/migrate/steps/migrateInstallation.php
@@ -128,7 +128,7 @@ class migrateInstallation extends step
public function detectInstallation() {
if(WINDOWS_OS) {
- $knownWindowsLocations = array("C:\Program Files\ktdms"=>"C:\Program Files\ktdms\knowledgeTree\config\config-path","C:\Program Files x86\ktdms"=>"C:\Program Files x86\ktdms\knowledgeTree\config\config-path","C:\ktdms"=>"C:\ktdms\knowledgeTree\config\config-path");
+ $knownWindowsLocations = array("C:\Program Files\ktdms"=>"C:\Program Files\ktdms\knowledgeTree\config\config-path","C:\Program Files (x86)\ktdms"=>"C:\Program Files (x86)\ktdms\knowledgeTree\config\config-path","C:\ktdms"=>"C:\ktdms\knowledgeTree\config\config-path");
foreach ($knownWindowsLocations as $loc=>$configPath) {
if(file_exists($configPath))
$this->location = $loc;
@@ -244,14 +244,8 @@ class migrateInstallation extends step
$this->ktSettings = array('fileSystemRoot'=> $froot);
$varDir = $froot.DS.'var';
$this->urlPaths = array(
-// array('name'=> 'Var Directory', 'path'=> $varDir),
-// array('name'=> 'Log Directory', 'path'=> $varDir.DS.'log'),
array('name'=> 'Document Root', 'path'=> $froot.DS.'Documents'),
-// array('name'=> 'Temporary Directory', 'path'=> $varDir.DS.'tmp'),
-// array('name'=> 'Cache Directory', 'path'=> $varDir.DS.'cache'),
-// array('name'=> 'Upload Directory', 'path'=> $varDir.DS.'uploads'),
);
-// $this->urlPaths = array();
$this->dbSettings['dbPort'] = $this->util->getPort($this->location); // Add Port
$this->temp_variables['urlPaths'] = $this->urlPaths;
$this->temp_variables['ktSettings'] = $this->ktSettings;
diff --git a/setup/migrate/steps/migrateServices.php b/setup/migrate/steps/migrateServices.php
index 71ac4f6..acd6d87 100644
--- a/setup/migrate/steps/migrateServices.php
+++ b/setup/migrate/steps/migrateServices.php
@@ -285,11 +285,16 @@ class migrateServices extends Step
$serv = $this->util->loadInstallService($className);
$serv->load();
$sStatus = $serv->status();
- if($sStatus == 'STARTED' || $sStatus == 'RUNNING' || $sStatus == 'STOPPED') {
+ if($sStatus == 'STARTED' || $sStatus == 'RUNNING') {
$state = 'cross';
$this->error[] = "Service : {$serv->getName()} could not be uninstalled.
";
$this->serviceCheck = 'cross';
$this->temp_variables['services'][$serv->getName()]['msg'] = "Service Running";
+ } elseif ($sStatus == 'STOPPED') {
+ $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";
} else {
$state = 'tick';
$this->temp_variables['services'][$serv->getName()]['msg'] = "Service has been uninstalled";
diff --git a/setup/migrate/templates/complete.tpl b/setup/migrate/templates/complete.tpl
index caabd77..f1fd284 100644
--- a/setup/migrate/templates/complete.tpl
+++ b/setup/migrate/templates/complete.tpl
@@ -2,13 +2,6 @@
Migration Completed
Your database migration was successfully completed. Please check the section below for details of the migration and final instructions
- '
- . ''
- . 'Click Here for help on overcoming post migrate issues
';
- }
- ?>
diff --git a/setup/migrate/templates/services.tpl b/setup/migrate/templates/services.tpl
index 1be119d..37e6ea7 100644
--- a/setup/migrate/templates/services.tpl
+++ b/setup/migrate/templates/services.tpl
@@ -75,7 +75,7 @@
-
Click Next if deactivating the above services.
+
Click Next if the above services are deactivated .
Your database has been upgraded to
+
+
Services
@@ -20,17 +26,22 @@
- [START MENU] => [Programs] => [KnowledgeTree] => [Services]
+ Using shortcuts:
+
+ [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
+
+ Click [Install Services]
- Click [Install Services]
+ [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
- Click [Start Services]
+ Click [Start Services]
- Alternatively:
+ Alternatively:
Open a command prompt and enter the following:
+
cd
dmsctl.bat install
dmsctl.bat start
@@ -47,11 +58,6 @@
-
diff --git a/setup/upgrade/templates/database.tpl b/setup/upgrade/templates/database.tpl
index 6c56a5f..e2d3079 100644
--- a/setup/upgrade/templates/database.tpl
+++ b/setup/upgrade/templates/database.tpl
@@ -21,7 +21,7 @@
- We are about to start the upgrade process.
+
We are about to start the upgrade process. Are you sure you want to proceed with the upgrade process?
Please ensure that you have made a backup before continuing with the upgrade process.
diff --git a/setup/upgrade/templates/loading.tpl b/setup/upgrade/templates/loading.tpl
index ba837db..350fc4a 100644
--- a/setup/upgrade/templates/loading.tpl
+++ b/setup/upgrade/templates/loading.tpl
@@ -1,5 +1,5 @@
-
+
";
- return false;
- }
- $this->writeLuceneInstall($cmd);
- //$response = $this->util->pexec($cmd);
-// return $response;
-// }
- return $state;
-// }
-
+ $cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" -description "."\"".$this->description."\""." \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
+ if(DEBUG) {
+ echo "$cmd
";
+ return false;
+ }
+ $this->writeLuceneInstall($cmd);
return $state;
}
diff --git a/setup/wizard/lib/services/windowsOpenOffice.php b/setup/wizard/lib/services/windowsOpenOffice.php
index 2d64edd..8ac99ac 100644
--- a/setup/wizard/lib/services/windowsOpenOffice.php
+++ b/setup/wizard/lib/services/windowsOpenOffice.php
@@ -134,6 +134,8 @@ class windowsOpenOffice extends windowsService {
public $hrname = "KnowledgeTree OpenOffice.org Service. (KTOpenOffice)";
+ public $description = "KnowledgeTree OpenOffice.org Service.";
+
/**
* Load defaults needed by service
*
@@ -212,7 +214,7 @@ class windowsOpenOffice extends windowsService {
if($status == '') {
$binary = $this->getBin();
if($binary != '') {
- $cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
+ $cmd = "\"{$this->winservice}\" install \"{$this->name}\" -description \"{$this->description}\" -displayname \"{$this->name}\" -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
if(DEBUG) {
echo "$cmd
";
return false;
diff --git a/setup/wizard/lib/services/windowsScheduler.php b/setup/wizard/lib/services/windowsScheduler.php
index 17816dd..c4d4899 100644
--- a/setup/wizard/lib/services/windowsScheduler.php
+++ b/setup/wizard/lib/services/windowsScheduler.php
@@ -79,6 +79,8 @@ class windowsScheduler extends windowsService {
public $hrname = "KnowledgeTree Scheduler Service. (KTScheduler)";
+ public $description = "KnowledgeTree Scheduler Service.";
+
/**
* Load defaults needed by service
*
@@ -180,7 +182,7 @@ class windowsScheduler extends windowsService {
}
private function setOptions() {
- $this->options = "-displayname {$this->name} -start auto -binary \"{$this->getSchedulerScriptPath()}\" -headless -invisible ";
+ $this->options = "-displayname \"{$this->name}\" -description \"{$this->description}\" -start auto -binary \"{$this->getSchedulerScriptPath()}\" -headless -invisible ";
}
private function writeTaskRunner() {
@@ -233,36 +235,9 @@ class windowsScheduler extends windowsService {
$state = $this->status();
if($state == '') {
$this->writeTaskRunner();
- //if (function_exists('win32_create_service')) { // TODO what if it does not exist? check how the dmsctl.bat does this
-// if(DEBUG) {
-// echo '';
-// print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
-// echo '';
-// echo '';
-// print_r(file_get_contents($this->getSchedulerScriptPath()));
-// echo '
';
-// return ;
-// }
- /*
- $response = win32_create_service(array(
- 'service' => $this->name,
- 'display' => $this->name,
- 'path' => $this->getSchedulerScriptPath()
- ));
- return $response;
- */
- //} else { // Attempt to use the winserv
- // TODO: Add service using winserv
- $this->setWinservice();
- $this->setOptions();
- $cmd = "\"{$this->winservice}\" install $this->name $this->options";
- if(DEBUG) {
- echo "$cmd
";
- return false;
- }
- //$response = $this->util->pexec($cmd);
- //return $response;
- //}
+ $this->setWinservice();
+ $this->setOptions();
+ $cmd = "\"{$this->winservice}\" install $this->name $this->options";
$this->writeSchedulerInstall($cmd);
}
return $state;
@@ -285,7 +260,7 @@ class windowsScheduler extends windowsService {
}
public function getStopMsg($installDir) {
- return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
+ return "";
}
}
?>
\ No newline at end of file
diff --git a/setup/wizard/resources/css/wizard.css b/setup/wizard/resources/css/wizard.css
index 54e1a35..929bbc0 100644
--- a/setup/wizard/resources/css/wizard.css
+++ b/setup/wizard/resources/css/wizard.css
@@ -609,4 +609,13 @@ td.dir_description {
.facebook {
+}
+
+.connect {
+ float:none;
+ padding-bottom:0;
+ padding-left:560px;
+ padding-right:10px;
+ padding-top:10px;
+ position:static;
}
\ No newline at end of file
diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php
index caff7a2..1f7e36e 100644
--- a/setup/wizard/steps/database.php
+++ b/setup/wizard/steps/database.php
@@ -638,6 +638,9 @@ class database extends Step
$this->error['con'] = "Could not populate schema ";
}
$this->writeBinaries();
+ $port = $conf['server']['port'];
+ $iserverPorts = 'UPDATE config_settings SET value = "'.$port.'" where group_name = "server" and item IN("internal_server_port", "server_port");'; // Update internal server port
+ $this->util->dbUtilities->query($iserverPorts);
// ensure a guid was generated and is stored
$this->util->getSystemIdentifier();
$this->reBuildPaths();
@@ -767,10 +770,13 @@ class database extends Step
$this->parse_mysql_dump($sqlFile);
$dropPluginHelper = "TRUNCATE plugin_helper;"; // Remove plugin helper table
$this->util->dbUtilities->query($dropPluginHelper);
- $this->reBuildPaths();
-
+ $conf = $this->util->getDataFromSession('configuration');
+ $port = $conf['server']['port'];
+ $iserverPorts = 'UPDATE config_settings SET value = "'.$port.'" where group_name = "server" and item IN("internal_server_port", "server_port");'; // Update internal server port
+ $this->util->dbUtilities->query($iserverPorts);
$updateExternalBinaries = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "externalBinary";'; // Remove references to old paths
$this->util->dbUtilities->query($updateExternalBinaries);
+ $this->reBuildPaths();
$this->writeBinaries(); // Rebuild some of the binaries
$this->util->getSystemIdentifier(); // ensure a guid was generated and is stored
diff --git a/setup/wizard/templates/complete.tpl b/setup/wizard/templates/complete.tpl
index 4944500..1f57252 100644
--- a/setup/wizard/templates/complete.tpl
+++ b/setup/wizard/templates/complete.tpl
@@ -13,16 +13,7 @@
-
+
Services
@@ -38,14 +29,18 @@
- [START MENU] => [Programs] => [KnowledgeTree] => [Services]
+ Using shortcuts:
+
+ [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
+
+ Click [Install Services]
- Click [Install Services]
+ [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
- Click [Start Services]
+ Click [Start Services]
- Alternatively:
+ Alternatively:
Open a command prompt and enter the following:
@@ -187,6 +182,16 @@
| |
- |
+ |
|
diff --git a/setup/wizard/templates/wizard.tpl b/setup/wizard/templates/wizard.tpl
index 603a523..6a2d8a6 100644
--- a/setup/wizard/templates/wizard.tpl
+++ b/setup/wizard/templates/wizard.tpl
@@ -12,6 +12,7 @@
css('ie6.css'); ?>
css('ie7.css'); ?>
css('ie8.css'); ?>
+ css('community.css'); ?>