Peter M. Groen / knowledgetree

Commit 4c2774040856d4e8a0520fab7072fe318b40d870

Authored by kevin_fourie
1 parent 952f656b

Merged in from DEV trunk... 

Merged in some whitespace differences from DEV trunk.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/branches/3.5.3-Branch@8530 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 33 additions and 34 deletions
lib/foldermanagement/compressionArchiveUtil.inc.php
  View file @4c27740
... ... @@ -89,7 +89,6 @@ class ZipFolder {
89 89 $this->sZipFileName = $sZipFileName;
90 90 $this->aPaths = array();
91 91  
92   -
93 92 $aReplace = array(
94 93 "[" => "[[]",
95 94 " " => "[ ]",
... ...
lib/upgrades/upgrade.inc.php
  View file @4c27740
... ... @@ -9,31 +9,31 @@
9 9 * Document Management Made Simple
10 10 * Copyright (C) 2008 KnowledgeTree Inc.
11 11 * Portions copyright The Jam Warehouse Software (Pty) Limited
12   - *
  12 + *
13 13 * This program is free software; you can redistribute it and/or modify it under
14 14 * the terms of the GNU General Public License version 3 as published by the
15 15 * Free Software Foundation.
16   - *
  16 + *
17 17 * This program is distributed in the hope that it will be useful, but WITHOUT
18 18 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
19 19 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
20 20 * details.
21   - *
  21 + *
22 22 * You should have received a copy of the GNU General Public License
23 23 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24   - *
25   - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  24 + *
  25 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
26 26 * California 94120-7775, or email info@knowledgetree.com.
27   - *
  27 + *
28 28 * The interactive user interfaces in modified source and object code versions
29 29 * of this program must display Appropriate Legal Notices, as required under
30 30 * Section 5 of the GNU General Public License version 3.
31   - *
  31 + *
32 32 * In accordance with Section 7(b) of the GNU General Public License version 3,
33 33 * these Appropriate Legal Notices must retain the display of the "Powered by
34   - * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  34 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
35 35 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
36   - * must display the words "Powered by KnowledgeTree" and retain the original
  36 + * must display the words "Powered by KnowledgeTree" and retain the original
37 37 * copyright notice.
38 38 * Contributor( s): ______________________________________
39 39 */
... ... @@ -62,7 +62,7 @@ function setupAdminDatabase() {
62 62 die($default->_admindb->toString());
63 63 }
64 64 $default->_admindb->setFetchMode(DB_FETCHMODE_ASSOC);
65   - return;
  65 + return;
66 66 }
67 67 setupAdminDatabase();
68 68  
... ... @@ -100,7 +100,7 @@ function &amp;describeUpgrade ($origVersion, $currVersion) {
100 100 // 7. Add "recordUpgrade" for whole thing
101 101  
102 102 // $recordUpgrade = array('upgrade*' . $currVersion, 'Upgrade to ' . $currVersion, null);
103   -
  103 +
104 104 $steps = array();
105 105 foreach (array('SQLUpgradeItem', 'FunctionUpgradeItem') as $itemgen) {
106 106 $f = array($itemgen, 'getUpgrades');
... ... @@ -186,7 +186,7 @@ function compare_version($version1, $version2) {
186 186 function lte_version($version1, $version2) {
187 187 if (in_array(compare_version($version1, $version2), array(-1, 0))) {
188 188 return true;
189   - }
  189 + }
190 190 return false;
191 191 }
192 192 // }}
... ... @@ -198,7 +198,7 @@ function lte_version($version1, $version2) {
198 198 function gte_version($version1, $version2) {
199 199 if (in_array(compare_version($version1, $version2), array(0, 1))) {
200 200 return true;
201   - }
  201 + }
202 202 return false;
203 203 }
204 204 // }}}
... ...
plugins/ktcore/folder/BulkImport.php
  View file @4c27740
... ... @@ -6,31 +6,31 @@
6 6 * Document Management Made Simple
7 7 * Copyright (C) 2008 KnowledgeTree Inc.
8 8 * Portions copyright The Jam Warehouse Software (Pty) Limited
9   - *
  9 + *
10 10 * This program is free software; you can redistribute it and/or modify it under
11 11 * the terms of the GNU General Public License version 3 as published by the
12 12 * Free Software Foundation.
13   - *
  13 + *
14 14 * This program is distributed in the hope that it will be useful, but WITHOUT
15 15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
16 16 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
17 17 * details.
18   - *
  18 + *
19 19 * You should have received a copy of the GNU General Public License
20 20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21   - *
22   - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  21 + *
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
23 23 * California 94120-7775, or email info@knowledgetree.com.
24   - *
  24 + *
25 25 * The interactive user interfaces in modified source and object code versions
26 26 * of this program must display Appropriate Legal Notices, as required under
27 27 * Section 5 of the GNU General Public License version 3.
28   - *
  28 + *
29 29 * In accordance with Section 7(b) of the GNU General Public License version 3,
30 30 * these Appropriate Legal Notices must retain the display of the "Powered by
31   - * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
32 32 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
33   - * must display the words "Powered by KnowledgeTree" and retain the original
  33 + * must display the words "Powered by KnowledgeTree" and retain the original
34 34 * copyright notice.
35 35 * Contributor( s): ______________________________________
36 36 *
... ... @@ -52,7 +52,7 @@ class KTBulkImportFolderAction extends KTFolderAction {
52 52 var $sName = 'ktcore.actions.folder.bulkImport';
53 53  
54 54 var $_sShowPermission = "ktcore.permissions.write";
55   - var $bAutomaticTransaction = true;
  55 + var $bAutomaticTransaction = false;
56 56  
57 57 function getDisplayName() {
58 58 return _kt('Import from Server Location');
... ...
plugins/ktcore/folder/BulkUpload.php
  View file @4c27740
... ... @@ -6,31 +6,31 @@
6 6 * Document Management Made Simple
7 7 * Copyright (C) 2008 KnowledgeTree Inc.
8 8 * Portions copyright The Jam Warehouse Software (Pty) Limited
9   - *
  9 + *
10 10 * This program is free software; you can redistribute it and/or modify it under
11 11 * the terms of the GNU General Public License version 3 as published by the
12 12 * Free Software Foundation.
13   - *
  13 + *
14 14 * This program is distributed in the hope that it will be useful, but WITHOUT
15 15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
16 16 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
17 17 * details.
18   - *
  18 + *
19 19 * You should have received a copy of the GNU General Public License
20 20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21   - *
22   - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  21 + *
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
23 23 * California 94120-7775, or email info@knowledgetree.com.
24   - *
  24 + *
25 25 * The interactive user interfaces in modified source and object code versions
26 26 * of this program must display Appropriate Legal Notices, as required under
27 27 * Section 5 of the GNU General Public License version 3.
28   - *
  28 + *
29 29 * In accordance with Section 7(b) of the GNU General Public License version 3,
30 30 * these Appropriate Legal Notices must retain the display of the "Powered by
31   - * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
32 32 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
33   - * must display the words "Powered by KnowledgeTree" and retain the original
  33 + * must display the words "Powered by KnowledgeTree" and retain the original
34 34 * copyright notice.
35 35 * Contributor( s): ______________________________________
36 36 *
... ... @@ -50,7 +50,7 @@ class KTBulkUploadFolderAction extends KTFolderAction {
50 50 var $sName = 'ktcore.actions.folder.bulkUpload';
51 51  
52 52 var $_sShowPermission = "ktcore.permissions.write";
53   - var $bAutomaticTransaction = true;
  53 + var $bAutomaticTransaction = false;
54 54  
55 55 function getDisplayName() {
56 56 return _kt('Bulk Upload');
... ...