From 4c2774040856d4e8a0520fab7072fe318b40d870 Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Sat, 24 May 2008 10:06:21 +0000 Subject: [PATCH] Merged in from DEV trunk... --- lib/foldermanagement/compressionArchiveUtil.inc.php | 1 - lib/upgrades/upgrade.inc.php | 26 +++++++++++++------------- plugins/ktcore/folder/BulkImport.php | 20 ++++++++++---------- plugins/ktcore/folder/BulkUpload.php | 20 ++++++++++---------- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/lib/foldermanagement/compressionArchiveUtil.inc.php b/lib/foldermanagement/compressionArchiveUtil.inc.php index 5cf8180..28f9a3c 100644 --- a/lib/foldermanagement/compressionArchiveUtil.inc.php +++ b/lib/foldermanagement/compressionArchiveUtil.inc.php @@ -89,7 +89,6 @@ class ZipFolder { $this->sZipFileName = $sZipFileName; $this->aPaths = array(); - $aReplace = array( "[" => "[[]", " " => "[ ]", diff --git a/lib/upgrades/upgrade.inc.php b/lib/upgrades/upgrade.inc.php index ac82e07..ed7723e 100644 --- a/lib/upgrades/upgrade.inc.php +++ b/lib/upgrades/upgrade.inc.php @@ -9,31 +9,31 @@ * Document Management Made Simple * Copyright (C) 2008 KnowledgeTree Inc. * Portions copyright The Jam Warehouse Software (Pty) Limited - * + * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the * Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, + * + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, * California 94120-7775, or email info@knowledgetree.com. - * + * * The interactive user interfaces in modified source and object code versions * of this program must display Appropriate Legal Notices, as required under * Section 5 of the GNU General Public License version 3. - * + * * In accordance with Section 7(b) of the GNU General Public License version 3, * these Appropriate Legal Notices must retain the display of the "Powered by - * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * KnowledgeTree" logo and retain the original copyright notice. If the display of the * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices - * must display the words "Powered by KnowledgeTree" and retain the original + * must display the words "Powered by KnowledgeTree" and retain the original * copyright notice. * Contributor( s): ______________________________________ */ @@ -62,7 +62,7 @@ function setupAdminDatabase() { die($default->_admindb->toString()); } $default->_admindb->setFetchMode(DB_FETCHMODE_ASSOC); - return; + return; } setupAdminDatabase(); @@ -100,7 +100,7 @@ function &describeUpgrade ($origVersion, $currVersion) { // 7. Add "recordUpgrade" for whole thing // $recordUpgrade = array('upgrade*' . $currVersion, 'Upgrade to ' . $currVersion, null); - + $steps = array(); foreach (array('SQLUpgradeItem', 'FunctionUpgradeItem') as $itemgen) { $f = array($itemgen, 'getUpgrades'); @@ -186,7 +186,7 @@ function compare_version($version1, $version2) { function lte_version($version1, $version2) { if (in_array(compare_version($version1, $version2), array(-1, 0))) { return true; - } + } return false; } // }} @@ -198,7 +198,7 @@ function lte_version($version1, $version2) { function gte_version($version1, $version2) { if (in_array(compare_version($version1, $version2), array(0, 1))) { return true; - } + } return false; } // }}} diff --git a/plugins/ktcore/folder/BulkImport.php b/plugins/ktcore/folder/BulkImport.php index 429330b..0db63d5 100644 --- a/plugins/ktcore/folder/BulkImport.php +++ b/plugins/ktcore/folder/BulkImport.php @@ -6,31 +6,31 @@ * Document Management Made Simple * Copyright (C) 2008 KnowledgeTree Inc. * Portions copyright The Jam Warehouse Software (Pty) Limited - * + * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the * Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, + * + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, * California 94120-7775, or email info@knowledgetree.com. - * + * * The interactive user interfaces in modified source and object code versions * of this program must display Appropriate Legal Notices, as required under * Section 5 of the GNU General Public License version 3. - * + * * In accordance with Section 7(b) of the GNU General Public License version 3, * these Appropriate Legal Notices must retain the display of the "Powered by - * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * KnowledgeTree" logo and retain the original copyright notice. If the display of the * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices - * must display the words "Powered by KnowledgeTree" and retain the original + * must display the words "Powered by KnowledgeTree" and retain the original * copyright notice. * Contributor( s): ______________________________________ * @@ -52,7 +52,7 @@ class KTBulkImportFolderAction extends KTFolderAction { var $sName = 'ktcore.actions.folder.bulkImport'; var $_sShowPermission = "ktcore.permissions.write"; - var $bAutomaticTransaction = true; + var $bAutomaticTransaction = false; function getDisplayName() { return _kt('Import from Server Location'); diff --git a/plugins/ktcore/folder/BulkUpload.php b/plugins/ktcore/folder/BulkUpload.php index 8bff617..3511446 100644 --- a/plugins/ktcore/folder/BulkUpload.php +++ b/plugins/ktcore/folder/BulkUpload.php @@ -6,31 +6,31 @@ * Document Management Made Simple * Copyright (C) 2008 KnowledgeTree Inc. * Portions copyright The Jam Warehouse Software (Pty) Limited - * + * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the * Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, + * + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, * California 94120-7775, or email info@knowledgetree.com. - * + * * The interactive user interfaces in modified source and object code versions * of this program must display Appropriate Legal Notices, as required under * Section 5 of the GNU General Public License version 3. - * + * * In accordance with Section 7(b) of the GNU General Public License version 3, * these Appropriate Legal Notices must retain the display of the "Powered by - * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * KnowledgeTree" logo and retain the original copyright notice. If the display of the * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices - * must display the words "Powered by KnowledgeTree" and retain the original + * must display the words "Powered by KnowledgeTree" and retain the original * copyright notice. * Contributor( s): ______________________________________ * @@ -50,7 +50,7 @@ class KTBulkUploadFolderAction extends KTFolderAction { var $sName = 'ktcore.actions.folder.bulkUpload'; var $_sShowPermission = "ktcore.permissions.write"; - var $bAutomaticTransaction = true; + var $bAutomaticTransaction = false; function getDisplayName() { return _kt('Bulk Upload'); -- libgit2 0.21.4