diff --git a/.gitignore b/.gitignore index 661da2b..9027b17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *~ bin/luceneserver/lucene.pid +bin/schedulerTask.sh *.tmproj .DS_Store .buildpath diff --git a/clienttools/.gitignore b/clienttools/.gitignore deleted file mode 100644 index 0bde6cd..0000000 --- a/clienttools/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -*~ -bin/luceneserver/lucene.pid -*.tmproj -.DS_Store -.buildpath -.project -.settings/ -dummy.php -var/* -plugins/commercial diff --git a/ktwebservice/KTDownloadManager.inc.php b/ktwebservice/KTDownloadManager.inc.php index 9efc4e5..cbe0075 100644 --- a/ktwebservice/KTDownloadManager.inc.php +++ b/ktwebservice/KTDownloadManager.inc.php @@ -9,7 +9,7 @@ * KnowledgeTree Community Edition * Document Management Made Simple * Copyright (C) 2008, 2009 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 diff --git a/ktwebservice/KTUploadManager.inc.php b/ktwebservice/KTUploadManager.inc.php index be50f93..eb1b7cd 100644 --- a/ktwebservice/KTUploadManager.inc.php +++ b/ktwebservice/KTUploadManager.inc.php @@ -9,7 +9,7 @@ * KnowledgeTree Community Edition * Document Management Made Simple * Copyright (C) 2008, 2009 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 diff --git a/ktwebservice/KTWebService.php b/ktwebservice/KTWebService.php index d65a19a..a6936de 100644 --- a/ktwebservice/KTWebService.php +++ b/ktwebservice/KTWebService.php @@ -5,7 +5,7 @@ * KnowledgeTree Community Edition * Document Management Made Simple * Copyright (C) 2008, 2009 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 @@ -671,4 +671,4 @@ $ws->handle(); exit(); -?> \ No newline at end of file +?> diff --git a/ktwebservice/checkup.php b/ktwebservice/checkup.php index ac9fd62..fa78c3a 100644 --- a/ktwebservice/checkup.php +++ b/ktwebservice/checkup.php @@ -32,4 +32,4 @@ $uploadsWritable = !is_writable($uploadsDir)?'The upload directory is not writab Upload Directory Writable - \ No newline at end of file + diff --git a/ktwebservice/download.php b/ktwebservice/download.php index f3170c4..1a4a468 100644 --- a/ktwebservice/download.php +++ b/ktwebservice/download.php @@ -7,7 +7,7 @@ * KnowledgeTree Community Edition * Document Management Made Simple * Copyright (C) 2008, 2009 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 @@ -81,4 +81,4 @@ if (PEAR::isError($response)) exit; } -?> \ No newline at end of file +?> diff --git a/ktwebservice/download_cleanup.php b/ktwebservice/download_cleanup.php index 783a3ae..5162c90 100644 --- a/ktwebservice/download_cleanup.php +++ b/ktwebservice/download_cleanup.php @@ -9,7 +9,7 @@ * KnowledgeTree Community Edition * Document Management Made Simple * Copyright (C) 2008, 2009 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 diff --git a/ktwebservice/index.php b/ktwebservice/index.php index f6836cf..f295520 100644 --- a/ktwebservice/index.php +++ b/ktwebservice/index.php @@ -9,7 +9,7 @@ * KnowledgeTree Community Edition * Document Management Made Simple * Copyright (C) 2008, 2009 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 diff --git a/ktwebservice/json.php b/ktwebservice/json.php index c288131..51b6f64 100644 --- a/ktwebservice/json.php +++ b/ktwebservice/json.php @@ -3,4 +3,4 @@ define('JSON_WEBSERVICE',1); require_once('webservice.php'); -?> \ No newline at end of file +?> diff --git a/ktwebservice/upload.php b/ktwebservice/upload.php index 35f96aa..94430da 100644 --- a/ktwebservice/upload.php +++ b/ktwebservice/upload.php @@ -9,7 +9,7 @@ * KnowledgeTree Community Edition * Document Management Made Simple * Copyright (C) 2008, 2009 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 @@ -207,4 +207,4 @@ function respond($code, $msg, $uploads=array()) } -?> \ No newline at end of file +?> diff --git a/plugins/multiselect/BulkImport.php b/plugins/multiselect/BulkImport.php index b42fb88..9c2ea28 100755 --- a/plugins/multiselect/BulkImport.php +++ b/plugins/multiselect/BulkImport.php @@ -65,11 +65,12 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction { $js .= ""; $aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js'; + $aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js'; + $oPage =& $GLOBALS['main']; if (method_exists($oPage, 'requireJSResources')) { $oPage->requireJSResources($aJavascript); } - return $js._kt('Import from Server Location'); } else diff --git a/plugins/multiselect/BulkUpload.php b/plugins/multiselect/BulkUpload.php index db2aaa6..e9a56e5 100755 --- a/plugins/multiselect/BulkUpload.php +++ b/plugins/multiselect/BulkUpload.php @@ -67,6 +67,7 @@ class InetBulkUploadFolderAction extends KTFolderAction { if(!KTPluginUtil::pluginIsActive('inet.foldermetadata.plugin')) { $aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js'; + $aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js'; $oPage =& $GLOBALS['main']; if (method_exists($oPage, 'requireJSResources')) { diff --git a/thirdpartyjs/jquery/jquery_noconflict.js b/thirdpartyjs/jquery/jquery_noconflict.js new file mode 100644 index 0000000..f4b1f44 --- /dev/null +++ b/thirdpartyjs/jquery/jquery_noconflict.js @@ -0,0 +1 @@ +jQuery.noConflict();