diff --git a/ktapi/KTAPIDocument.inc.php b/ktapi/KTAPIDocument.inc.php
index 9335221..1a5af7e 100644
--- a/ktapi/KTAPIDocument.inc.php
+++ b/ktapi/KTAPIDocument.inc.php
@@ -2225,6 +2225,7 @@ class KTAPI_Document extends KTAPI_FolderItem
$version['user'] = $username;
$version['metadata_version'] = $document->getMetadataVersion();
$version['content_version'] = $document->getVersion();
+ $version['datetime'] = $document->getVersionCreated();
if ($wsversion >= 2)
{
$version['metadata_version'] = (int) $version['metadata_version'];
diff --git a/plugins/ktcore/KTBulkActions.php b/plugins/ktcore/KTBulkActions.php
index 22297ec..b54b664 100644
--- a/plugins/ktcore/KTBulkActions.php
+++ b/plugins/ktcore/KTBulkActions.php
@@ -259,16 +259,9 @@ class KTBulkDeleteAction extends KTBulkAction {
return parent::do_performaction();
}
- /*
+ /**
* Bulk delete
- * Author : Jarrett Jordaan
- * Modified : 28/04/09
- *
* @params : KTDocumentUtil/KTFolderUtil $oEntity
- *
- * Description : Since its a bulk operation, the delete function needs to
- * know that. Added extra boolean param to the delete
- * function.
*/
function perform_action($oEntity) {
$sReason = $this->res['reason'];
@@ -526,16 +519,10 @@ class KTBulkMoveAction extends KTBulkAction {
return parent::do_performaction();
}
- /*
+ /**
* Bulk move
- * Author : Jarrett Jordaan
- * Modified : 28/04/09
- *
* @params : KTDocumentUtil/KTFolderUtil $oEntity
*
- * Description : Since its a bulk operation, the move function needs to
- * know that. Added extra boolean param to the move
- * function.
*/
function perform_action($oEntity) {
if(is_a($oEntity, 'Document')) {
@@ -771,16 +758,10 @@ class KTBulkCopyAction extends KTBulkAction {
return parent::do_performaction();
}
- /*
+ /**
* Bulk copy
- * Author : Jarrett Jordaan
- * Modified : 28/04/09
- *
* @params : KTDocumentUtil/KTFolderUtil $oEntity
- *
- * Description : Since its a bulk operation, the copy function needs to
- * know that. Added extra boolean param to the copy
- * function.
+ *
*/
function perform_action($oEntity) {
if(is_a($oEntity, 'Document')) {
@@ -1029,16 +1010,10 @@ class KTBulkArchiveAction extends KTBulkAction {
return parent::do_performaction();
}
- /*
+ /**
* Bulk archive
- * Author : Jarrett Jordaan
- * Modified : 28/04/09
- *
* @params : KTDocumentUtil/KTFolderUtil $oEntity
*
- * Description : Since its a bulk operation, the archive function needs
- * to know that. Added extra boolean param to the archive
- * function.
*/
function perform_action($oEntity) {
if(is_a($oEntity, 'Document')) {
@@ -1216,16 +1191,10 @@ class KTBrowseBulkExportAction extends KTBulkAction {
return $str;
}
- /*
+ /**
* Bulk export
- * Author : Jarrett Jordaan
- * Modified : 28/04/09
- *
* @params : KTDocumentUtil/KTFolderUtil $oEntity
*
- * Description : Since its a bulk operation, the export function needs
- * to know that. Added extra boolean param to the export
- * function.
*/
function perform_action($oEntity) {
// TODO find a way to do bulk email
@@ -1489,16 +1458,10 @@ class KTBrowseBulkCheckoutAction extends KTBulkAction {
return $result;
}
- /*
+ /**
* Bulk checkout
- * Author : Jarrett Jordaan
- * Modified : 28/04/09
- *
* @params : KTDocumentUtil/KTFolderUtil $oEntity
*
- * Description : Since its a bulk operation, the checkout function needs
- * to know that. Added extra boolean param to the checkout
- * function.
*/
function perform_action($oEntity) {
// checkout document
diff --git a/plugins/ktcore/admin/workflowsv2.php b/plugins/ktcore/admin/workflowsv2.php
index 861381d..75b2c2e 100644
--- a/plugins/ktcore/admin/workflowsv2.php
+++ b/plugins/ktcore/admin/workflowsv2.php
@@ -2365,8 +2365,7 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
if (!empty($sFilter)) {
$allowed = array();
- // Modified Jarrett Jordaan Only notify enabled users
- $q = sprintf('name like "%%%s%%" AND disabled = 0', DBUtil::escapeSimple($sFilter));
+ $q = sprintf('name like "%%%s%%" AND disabled = 0', DBUtil::escapeSimple($sFilter)); // notify enabled users
$aUsers = User::getList($q);
$q = sprintf('name like "%%%s%%"', DBUtil::escapeSimple($sFilter));
$aGroups = Group::getList($q);
diff --git a/plugins/multiselect/templates/ktcore/search2/adv_query_builder.smarty b/plugins/multiselect/templates/ktcore/search2/adv_query_builder.smarty
index 30cef4a..50702bf 100644
--- a/plugins/multiselect/templates/ktcore/search2/adv_query_builder.smarty
+++ b/plugins/multiselect/templates/ktcore/search2/adv_query_builder.smarty
@@ -519,8 +519,6 @@ function addFieldTypeSelection(groupid, fid, type, options)
default:
html += 'unknown: ' + type;
}
- // Jarrett Jordaan
- // Closing tags added
html += "";
return {html: html, init: callback};
diff --git a/setup/migrate/steps/migrateComplete.php b/setup/migrate/steps/migrateComplete.php
index cf99ec9..a3eaf6b 100644
--- a/setup/migrate/steps/migrateComplete.php
+++ b/setup/migrate/steps/migrateComplete.php
@@ -164,7 +164,6 @@ class migrateComplete extends Step {
if($state == "STARTED" || $state == "RUNNING")
$running = true;
} else {
- //TODO : Read fomr my.cnf file
$mysqlPid = "/var/run/mysqld/mysqld.sock";
if(file_exists($mysqlPid))
$running = true;
diff --git a/setup/migrate/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php
index b4a6bc0..419e195 100644
--- a/setup/migrate/steps/migrateDatabase.php
+++ b/setup/migrate/steps/migrateDatabase.php
@@ -155,31 +155,20 @@ class migrateDatabase extends Step
unlink($sqlFile);
}
}
- $noFile = true;
// Handle failed dump
if(WINDOWS_OS) {
// Could be permissions, check error code.
- if(!$noFile) {
- $sqlFile = "C:\\kt-backup-$date.sql"; // Use tmp instead due to permissions
- }
+ $sqlFile = "C:\\kt-backup-$date.sql"; // Use tmp instead due to permissions
} else {
- if(!$noFile) {
- $sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
- }
+ $sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
}
$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'] = "Ensure that your KnowledgeTree Mysql service is running.";
- $this->error[]['cmd'] = "Click Next after resolving the above errors.";
- $this->temp_variables['manual_export'] = "";
- } else {
- $this->error[]['error'] = "Could not export database:";
- $this->error[]['msg'] = "Execute the following command in a $termOrBash.";
- $this->error[]['cmd'] = $cmd;
- $this->temp_variables['manual_export'] = $sqlFile;
- }
-
+ $this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
+ $this->error[]['msg'] = "Ensure that your KnowledgeTree Mysql service is running.";
+ $this->error[]['cmd'] = "Click Next after resolving the above errors.";
+ $this->temp_variables['dumpLocation'] = $sqlFile;
+ $this->temp_variables['manual_export'] = $sqlFile;
+ $this->error[]['manual'] = $cmd;
return false;
}
@@ -274,7 +263,7 @@ class migrateDatabase extends Step
return $this->error;
}
- private function storeSilent() {
+ public function storeSilent() {
// TODO
$_SESSION['migrate']['database']['dumpLocation'] = $this->sqlDumpFile;
$this->temp_variables['dumpLocation'] = $this->sqlDumpFile;
diff --git a/setup/migrate/steps/migrateServices.php b/setup/migrate/steps/migrateServices.php
index 9b3b507..852993f 100644
--- a/setup/migrate/steps/migrateServices.php
+++ b/setup/migrate/steps/migrateServices.php
@@ -398,7 +398,7 @@ class migrateServices extends Step
* @access private
* @return void
*/
- private function storeSilent() {
+ public function storeSilent() {
$this->temp_variables['alreadyUninstalled'] = $this->alreadyUninstalled;
$this->temp_variables['serviceCheck'] = $this->serviceCheck;
$this->temp_variables['msg'] = "Turn off KnowledgeTree Mysql Instance.";
diff --git a/setup/migrate/templates/database.tpl b/setup/migrate/templates/database.tpl
index cafd054..e24044d 100644
--- a/setup/migrate/templates/database.tpl
+++ b/setup/migrate/templates/database.tpl
@@ -118,6 +118,16 @@
+
+ Manually perform a KnowledgeTree 3.6.1 database export
+
+
+
+
diff --git a/setup/migrate/templates/wizard.tpl b/setup/migrate/templates/wizard.tpl
index a82660a..4133c7d 100644
--- a/setup/migrate/templates/wizard.tpl
+++ b/setup/migrate/templates/wizard.tpl
@@ -21,7 +21,7 @@