Commit a52131c9006e861093a5e3514fce70e1a4967048
1 parent
f1d87be2
Merged in whitespace and comments from DEV trunk.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@7928 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
22 changed files
with
280 additions
and
111 deletions
bin/win32/installScheduler.php
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | +/** | |
| 4 | + * $Id: $ | |
| 5 | + * | |
| 6 | + * KnowledgeTree Open Source Edition | |
| 7 | + * Document Management Made Simple | |
| 8 | + * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited | |
| 9 | + * | |
| 10 | + * This program is free software; you can redistribute it and/or modify it under | |
| 11 | + * the terms of the GNU General Public License version 3 as published by the | |
| 12 | + * Free Software Foundation. | |
| 13 | + * | |
| 14 | + * This program is distributed in the hope that it will be useful, but WITHOUT | |
| 15 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
| 16 | + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | |
| 17 | + * details. | |
| 18 | + * | |
| 19 | + * You should have received a copy of the GNU General Public License | |
| 20 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 21 | + * | |
| 22 | + * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, | |
| 23 | + * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. | |
| 24 | + * | |
| 25 | + * The interactive user interfaces in modified source and object code versions | |
| 26 | + * of this program must display Appropriate Legal Notices, as required under | |
| 27 | + * Section 5 of the GNU General Public License version 3. | |
| 28 | + * | |
| 29 | + * In accordance with Section 7(b) of the GNU General Public License version 3, | |
| 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 | |
| 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 | |
| 34 | + * copyright notice. | |
| 35 | + * Contributor( s): ______________________________________ | |
| 36 | + * | |
| 37 | + */ | |
| 38 | + | |
| 3 | 39 | $scriptPath = realpath(dirname(__FILE__) . '/taskrunner.bat'); |
| 4 | 40 | |
| 5 | 41 | win32_create_service(array( | ... | ... |
bin/win32/schedulerServiceStatus.php
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | +/** | |
| 4 | + * $Id: $ | |
| 5 | + * | |
| 6 | + * KnowledgeTree Open Source Edition | |
| 7 | + * Document Management Made Simple | |
| 8 | + * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited | |
| 9 | + * | |
| 10 | + * This program is free software; you can redistribute it and/or modify it under | |
| 11 | + * the terms of the GNU General Public License version 3 as published by the | |
| 12 | + * Free Software Foundation. | |
| 13 | + * | |
| 14 | + * This program is distributed in the hope that it will be useful, but WITHOUT | |
| 15 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
| 16 | + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | |
| 17 | + * details. | |
| 18 | + * | |
| 19 | + * You should have received a copy of the GNU General Public License | |
| 20 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 21 | + * | |
| 22 | + * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, | |
| 23 | + * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. | |
| 24 | + * | |
| 25 | + * The interactive user interfaces in modified source and object code versions | |
| 26 | + * of this program must display Appropriate Legal Notices, as required under | |
| 27 | + * Section 5 of the GNU General Public License version 3. | |
| 28 | + * | |
| 29 | + * In accordance with Section 7(b) of the GNU General Public License version 3, | |
| 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 | |
| 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 | |
| 34 | + * copyright notice. | |
| 35 | + * Contributor( s): ______________________________________ | |
| 36 | + * | |
| 37 | + */ | |
| 38 | + | |
| 3 | 39 | var_dump(win32_query_service_status('ktscheduler')); |
| 4 | 40 | |
| 5 | 41 | ?> | ... | ... |
bin/win32/uninstallScheduler.php
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | +/** | |
| 4 | + * $Id: $ | |
| 5 | + * | |
| 6 | + * KnowledgeTree Open Source Edition | |
| 7 | + * Document Management Made Simple | |
| 8 | + * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited | |
| 9 | + * | |
| 10 | + * This program is free software; you can redistribute it and/or modify it under | |
| 11 | + * the terms of the GNU General Public License version 3 as published by the | |
| 12 | + * Free Software Foundation. | |
| 13 | + * | |
| 14 | + * This program is distributed in the hope that it will be useful, but WITHOUT | |
| 15 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
| 16 | + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | |
| 17 | + * details. | |
| 18 | + * | |
| 19 | + * You should have received a copy of the GNU General Public License | |
| 20 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 21 | + * | |
| 22 | + * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, | |
| 23 | + * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. | |
| 24 | + * | |
| 25 | + * The interactive user interfaces in modified source and object code versions | |
| 26 | + * of this program must display Appropriate Legal Notices, as required under | |
| 27 | + * Section 5 of the GNU General Public License version 3. | |
| 28 | + * | |
| 29 | + * In accordance with Section 7(b) of the GNU General Public License version 3, | |
| 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 | |
| 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 | |
| 34 | + * copyright notice. | |
| 35 | + * Contributor( s): ______________________________________ | |
| 36 | + * | |
| 37 | + */ | |
| 38 | + | |
| 3 | 39 | win32_delete_service('ktscheduler'); |
| 4 | 40 | |
| 5 | 41 | ?> |
| 6 | 42 | \ No newline at end of file | ... | ... |
ktwebservice/download_cleanup.php
ktwebservice/index.php
ktwebservice/upload_cleanup.php
lib/util/ktutil.inc
| ... | ... | @@ -303,6 +303,49 @@ class KTUtil { |
| 303 | 303 | } |
| 304 | 304 | // }}} |
| 305 | 305 | |
| 306 | + | |
| 307 | + // {{{ winexec | |
| 308 | + /** | |
| 309 | + * Execute a command on a windows platform. | |
| 310 | + */ | |
| 311 | + function winexec($aCmd, $aOptions = null) { | |
| 312 | + if (is_array($aCmd)) { | |
| 313 | + $sCmd = KTUtil::safeShellString($aCmd); | |
| 314 | + } else { | |
| 315 | + $sCmd = $aCmd; | |
| 316 | + } | |
| 317 | + $sAppend = KTUtil::arrayGet($aOptions, 'append'); | |
| 318 | + if ($sAppend) { | |
| 319 | + $sCmd .= " >> " . escapeshellarg($sAppend); | |
| 320 | + } | |
| 321 | + | |
| 322 | + $sCmd = str_replace( '/','\\',$sCmd); | |
| 323 | + | |
| 324 | + // Set wait to true if the execute must wait for the script to complete before continuing | |
| 325 | + $wait = true; | |
| 326 | + if(isset($aOptions['exec_wait']) && ($aOptions['exec_wait'] == 'false')){ | |
| 327 | + $wait = false; | |
| 328 | + } | |
| 329 | + | |
| 330 | + // Iterate through the various execute functions till one works. | |
| 331 | + $WshShell = new COM("WScript.Shell"); | |
| 332 | + $res = $WshShell->Run($sCmd, 0, $wait); | |
| 333 | + | |
| 334 | + if($res){ | |
| 335 | + return $res; | |
| 336 | + } | |
| 337 | + | |
| 338 | + $sCmd = "start /b \"kt\" " . $sCmd; | |
| 339 | + $fp = popen($sCmd, 'r'); | |
| 340 | + fclose($fp); | |
| 341 | + | |
| 342 | + if($wait){ | |
| 343 | + sleep(1); | |
| 344 | + } | |
| 345 | + return 1; | |
| 346 | + } | |
| 347 | + // }}} | |
| 348 | + | |
| 306 | 349 | // {{{ copyDirectory |
| 307 | 350 | function copyDirectory($sSrc, $sDst, $bMove = false) { |
| 308 | 351 | if (file_exists($sDst)) { | ... | ... |
plugins/ktcore/folder/addDocument.php
| ... | ... | @@ -311,7 +311,7 @@ class KTFolderAddDocumentAction extends KTFolderAction { |
| 311 | 311 | ); |
| 312 | 312 | |
| 313 | 313 | $aFile = $this->oValidator->validateFile($extra_d['file'], $aErrorOptions); |
| 314 | - $sTitle = sanitizeForSQL($extra_d['document_name']); | |
| 314 | + $sTitle = $extra_d['document_name']; | |
| 315 | 315 | |
| 316 | 316 | $iFolderId = $this->oFolder->getId(); |
| 317 | 317 | $aOptions = array( | ... | ... |
plugins/ktstandard/PDFGeneratorAction.php
| ... | ... | @@ -2,29 +2,35 @@ |
| 2 | 2 | /** |
| 3 | 3 | * $Id$ |
| 4 | 4 | * |
| 5 | - * The contents of this file are subject to the KnowledgeTree Public | |
| 6 | - * License Version 1.1.2 ("License"); You may not use this file except in | |
| 7 | - * compliance with the License. You may obtain a copy of the License at | |
| 8 | - * http://www.knowledgetree.com/KPL | |
| 5 | + * KnowledgeTree Open Source Edition | |
| 6 | + * Document Management Made Simple | |
| 7 | + * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited | |
| 9 | 8 | * |
| 10 | - * Software distributed under the License is distributed on an "AS IS" | |
| 11 | - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. | |
| 12 | - * See the License for the specific language governing rights and | |
| 13 | - * limitations under the License. | |
| 14 | - * | |
| 15 | - * All copies of the Covered Code must include on each user interface screen: | |
| 16 | - * (i) the "Powered by KnowledgeTree" logo and | |
| 17 | - * (ii) the KnowledgeTree copyright notice | |
| 18 | - * in the same form as they appear in the distribution. See the License for | |
| 19 | - * requirements. | |
| 9 | + * This program is free software; you can redistribute it and/or modify it under | |
| 10 | + * the terms of the GNU General Public License version 3 as published by the | |
| 11 | + * Free Software Foundation. | |
| 12 | + * | |
| 13 | + * This program is distributed in the hope that it will be useful, but WITHOUT | |
| 14 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
| 15 | + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | |
| 16 | + * details. | |
| 17 | + * | |
| 18 | + * You should have received a copy of the GNU General Public License | |
| 19 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 20 | + * | |
| 21 | + * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, | |
| 22 | + * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. | |
| 20 | 23 | * |
| 21 | - * The Original Code is: KnowledgeTree Open Source | |
| 24 | + * The interactive user interfaces in modified source and object code versions | |
| 25 | + * of this program must display Appropriate Legal Notices, as required under | |
| 26 | + * Section 5 of the GNU General Public License version 3. | |
| 22 | 27 | * |
| 23 | - * The Initial Developer of the Original Code is The Jam Warehouse Software | |
| 24 | - * (Pty) Ltd, trading as KnowledgeTree. | |
| 25 | - * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright | |
| 26 | - * (C) 2007 The Jam Warehouse Software (Pty) Ltd; | |
| 27 | - * All Rights Reserved. | |
| 28 | + * In accordance with Section 7(b) of the GNU General Public License version 3, | |
| 29 | + * these Appropriate Legal Notices must retain the display of the "Powered by | |
| 30 | + * KnowledgeTree" logo and retain the original copyright notice. If the display of the | |
| 31 | + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices | |
| 32 | + * must display the words "Powered by KnowledgeTree" and retain the original | |
| 33 | + * copyright notice. | |
| 28 | 34 | * Contributor( s): ______________________________________ |
| 29 | 35 | * |
| 30 | 36 | */ | ... | ... |
plugins/ktstandard/admin/manageDisclaimers.php
plugins/ktstandard/contents/BaseIndexer.php
| ... | ... | @@ -5,37 +5,37 @@ |
| 5 | 5 | * KnowledgeTree Open Source Edition |
| 6 | 6 | * Document Management Made Simple |
| 7 | 7 | * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited |
| 8 | - * | |
| 8 | + * | |
| 9 | 9 | * This program is free software; you can redistribute it and/or modify it under |
| 10 | 10 | * the terms of the GNU General Public License version 3 as published by the |
| 11 | 11 | * Free Software Foundation. |
| 12 | - * | |
| 12 | + * | |
| 13 | 13 | * This program is distributed in the hope that it will be useful, but WITHOUT |
| 14 | 14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
| 15 | 15 | * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more |
| 16 | 16 | * details. |
| 17 | - * | |
| 17 | + * | |
| 18 | 18 | * You should have received a copy of the GNU General Public License |
| 19 | 19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 20 | - * | |
| 20 | + * | |
| 21 | 21 | * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, |
| 22 | 22 | * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. |
| 23 | - * | |
| 23 | + * | |
| 24 | 24 | * The interactive user interfaces in modified source and object code versions |
| 25 | 25 | * of this program must display Appropriate Legal Notices, as required under |
| 26 | 26 | * Section 5 of the GNU General Public License version 3. |
| 27 | - * | |
| 27 | + * | |
| 28 | 28 | * In accordance with Section 7(b) of the GNU General Public License version 3, |
| 29 | 29 | * these Appropriate Legal Notices must retain the display of the "Powered by |
| 30 | - * KnowledgeTree" logo and retain the original copyright notice. If the display of the | |
| 30 | + * KnowledgeTree" logo and retain the original copyright notice. If the display of the | |
| 31 | 31 | * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices |
| 32 | - * must display the words "Powered by KnowledgeTree" and retain the original | |
| 33 | - * copyright notice. | |
| 32 | + * must display the words "Powered by KnowledgeTree" and retain the original | |
| 33 | + * copyright notice. | |
| 34 | 34 | * Contributor( s): ______________________________________ |
| 35 | 35 | * |
| 36 | 36 | */ |
| 37 | 37 | |
| 38 | -class KTBaseIndexerTrigger { | |
| 38 | +class KTBaseIndexerTrigger { | |
| 39 | 39 | /** |
| 40 | 40 | * Which MIME types that this indexer acts upon. |
| 41 | 41 | */ |
| ... | ... | @@ -76,8 +76,8 @@ class KTBaseIndexerTrigger { |
| 76 | 76 | * If it is false, the temporary file will be sent as the last |
| 77 | 77 | * parameter. |
| 78 | 78 | */ |
| 79 | - var $use_pipes = true; | |
| 80 | - | |
| 79 | + var $use_pipes = true; | |
| 80 | + | |
| 81 | 81 | /* return a diagnostic string _if_ there is something wrong. NULL otherwise. */ |
| 82 | 82 | function getDiagnostic() { |
| 83 | 83 | return null; |
| ... | ... | @@ -103,9 +103,10 @@ class KTBaseIndexerTrigger { |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | $oKTConfig =& KTConfig::getSingleton(); |
| 106 | - $sBasedir = $oKTConfig->get("urls/tmpDirectory"); | |
| 107 | - | |
| 106 | + $sBasedir = $oKTConfig->get("urls/tmpDirectory"); | |
| 107 | + | |
| 108 | 108 | $myfilename = tempnam($sBasedir, 'kt.' . $tempstub); |
| 109 | + | |
| 109 | 110 | if (OS_WINDOWS) { |
| 110 | 111 | $intermediate = tempnam($sBasedir, 'kt.' . $tempstub); |
| 111 | 112 | if (!@copy($sFile, $intermediate)) { |
| ... | ... | @@ -114,9 +115,9 @@ class KTBaseIndexerTrigger { |
| 114 | 115 | } else { |
| 115 | 116 | $intermediate = $sFile; |
| 116 | 117 | } |
| 117 | - | |
| 118 | + | |
| 118 | 119 | $contents = $this->extract_contents($intermediate, $myfilename); |
| 119 | - | |
| 120 | + | |
| 120 | 121 | @unlink($myfilename); |
| 121 | 122 | if (OS_WINDOWS) { @unlink($intermediate); } |
| 122 | 123 | if (empty($contents)) { |
| ... | ... | @@ -127,14 +128,14 @@ class KTBaseIndexerTrigger { |
| 127 | 128 | 'document_text' => $contents, |
| 128 | 129 | ); |
| 129 | 130 | $sTable = KTUtil::getTableName('document_text'); |
| 130 | - | |
| 131 | + | |
| 131 | 132 | // clean up the document query "stuff". |
| 132 | 133 | // FIXME this suggests that we should move the _old_ document_searchable_text across to the old-document's id if its a checkin. |
| 133 | 134 | DBUtil::runQuery(array('DELETE FROM ' . $sTable . ' WHERE document_id = ?', array($this->oDocument->getId()))); |
| 134 | 135 | DBUtil::autoInsert($sTable, $aInsertValues, array('noid' => true)); |
| 135 | 136 | |
| 136 | 137 | } |
| 137 | - | |
| 138 | + | |
| 138 | 139 | // handles certain, _very_ simple reader types. |
| 139 | 140 | function extract_contents($sFilename, $sTempFilename) { |
| 140 | 141 | $sCommand = KTUtil::findCommand($this->commandconfig, $this->command); |
| ... | ... | @@ -145,7 +146,7 @@ class KTBaseIndexerTrigger { |
| 145 | 146 | $cmdline = array($sCommand); |
| 146 | 147 | $cmdline = kt_array_merge($cmdline, $this->args); |
| 147 | 148 | $cmdline[] = $sFilename; |
| 148 | - | |
| 149 | + | |
| 149 | 150 | $aOptions = array(); |
| 150 | 151 | $aOptions['exec_wait'] = 'true'; |
| 151 | 152 | if ($this->use_pipes) { |
| ... | ... | @@ -153,7 +154,12 @@ class KTBaseIndexerTrigger { |
| 153 | 154 | } else { |
| 154 | 155 | $cmdline[] = $sTempFilename; |
| 155 | 156 | } |
| 156 | - $aRet = KTUtil::pexec($cmdline, $aOptions); | |
| 157 | + | |
| 158 | + if(OS_WINDOWS){ | |
| 159 | + $aRet = KTUtil::winexec($cmdline, $aOptions); | |
| 160 | + }else{ | |
| 161 | + $aRet = KTUtil::pexec($cmdline, $aOptions); | |
| 162 | + } | |
| 157 | 163 | $this->aCommandOutput = $aRet['out']; |
| 158 | 164 | $contents = file_get_contents($sTempFilename); |
| 159 | 165 | ... | ... |
plugins/ktstandard/contents/WordIndexer.php
| ... | ... | @@ -5,32 +5,32 @@ |
| 5 | 5 | * KnowledgeTree Open Source Edition |
| 6 | 6 | * Document Management Made Simple |
| 7 | 7 | * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited |
| 8 | - * | |
| 8 | + * | |
| 9 | 9 | * This program is free software; you can redistribute it and/or modify it under |
| 10 | 10 | * the terms of the GNU General Public License version 3 as published by the |
| 11 | 11 | * Free Software Foundation. |
| 12 | - * | |
| 12 | + * | |
| 13 | 13 | * This program is distributed in the hope that it will be useful, but WITHOUT |
| 14 | 14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
| 15 | 15 | * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more |
| 16 | 16 | * details. |
| 17 | - * | |
| 17 | + * | |
| 18 | 18 | * You should have received a copy of the GNU General Public License |
| 19 | 19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 20 | - * | |
| 20 | + * | |
| 21 | 21 | * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, |
| 22 | 22 | * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. |
| 23 | - * | |
| 23 | + * | |
| 24 | 24 | * The interactive user interfaces in modified source and object code versions |
| 25 | 25 | * of this program must display Appropriate Legal Notices, as required under |
| 26 | 26 | * Section 5 of the GNU General Public License version 3. |
| 27 | - * | |
| 27 | + * | |
| 28 | 28 | * In accordance with Section 7(b) of the GNU General Public License version 3, |
| 29 | 29 | * these Appropriate Legal Notices must retain the display of the "Powered by |
| 30 | - * KnowledgeTree" logo and retain the original copyright notice. If the display of the | |
| 30 | + * KnowledgeTree" logo and retain the original copyright notice. If the display of the | |
| 31 | 31 | * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices |
| 32 | - * must display the words "Powered by KnowledgeTree" and retain the original | |
| 33 | - * copyright notice. | |
| 32 | + * must display the words "Powered by KnowledgeTree" and retain the original | |
| 33 | + * copyright notice. | |
| 34 | 34 | * Contributor( s): ______________________________________ |
| 35 | 35 | * |
| 36 | 36 | */ |
| ... | ... | @@ -45,62 +45,64 @@ class KTWordIndexerTrigger extends KTBaseIndexerTrigger { |
| 45 | 45 | var $commandconfig = 'indexer/catdoc'; // could be any application. |
| 46 | 46 | var $args = array("-w", "-d", "UTF-8"); |
| 47 | 47 | var $use_pipes = true; |
| 48 | - | |
| 48 | + | |
| 49 | 49 | function extract_contents($sFilename, $sTempFilename) { |
| 50 | - if (OS_WINDOWS) { | |
| 50 | + if (OS_WINDOWS) { | |
| 51 | 51 | $this->command = 'c:\antiword\antiword.exe'; |
| 52 | 52 | $this->commandconfig = 'indexer/antiword'; |
| 53 | 53 | $this->args = array(); |
| 54 | 54 | } |
| 55 | 55 | putenv('LANG=en_US.UTF-8'); |
| 56 | - | |
| 56 | + | |
| 57 | 57 | $sCommand = KTUtil::findCommand($this->commandconfig, $this->command); |
| 58 | 58 | if (empty($sCommand)) { |
| 59 | 59 | return false; |
| 60 | 60 | } |
| 61 | - | |
| 62 | - if (OS_WINDOWS) { | |
| 61 | + | |
| 62 | + if (OS_WINDOWS) { | |
| 63 | 63 | $sDir = dirname(dirname($sCommand)); |
| 64 | - putenv('HOME=' . $sDir); | |
| 64 | + putenv('HOME=' . $sDir); | |
| 65 | 65 | |
| 66 | + /* | |
| 66 | 67 | $cmdline = array($sCommand); |
| 67 | 68 | $cmdline = kt_array_merge($cmdline, $this->args); |
| 68 | 69 | $cmdline[] = $sFilename; |
| 69 | - | |
| 70 | + | |
| 70 | 71 | $sCmd = KTUtil::safeShellString($cmdline); |
| 71 | 72 | $sCmd .= " >> " . escapeshellarg($sTempFilename); |
| 72 | - | |
| 73 | + | |
| 73 | 74 | $sCmd = str_replace( '/','\\',$sCmd); |
| 74 | - | |
| 75 | + | |
| 75 | 76 | $sCmd = "start /b \"kt\" " . $sCmd; |
| 76 | - | |
| 77 | + | |
| 77 | 78 | pclose(popen($sCmd, 'r')); |
| 78 | - | |
| 79 | + | |
| 79 | 80 | $this->aCommandOutput = 1; |
| 80 | 81 | $contents = file_get_contents($sTempFilename); |
| 81 | 82 | return $contents; |
| 83 | + */ | |
| 82 | 84 | } |
| 83 | 85 | return parent::extract_contents($sFilename, $sTempFilename); |
| 84 | 86 | } |
| 85 | - | |
| 87 | + | |
| 86 | 88 | function findLocalCommand() { |
| 87 | 89 | if (OS_WINDOWS) { |
| 88 | 90 | $this->command = 'c:\antiword\antiword.exe'; |
| 89 | 91 | $this->commandconfig = 'indexer/antiword'; |
| 90 | 92 | $this->args = array(); |
| 91 | - } | |
| 93 | + } | |
| 92 | 94 | $sCommand = KTUtil::findCommand($this->commandconfig, $this->command); |
| 93 | 95 | return $sCommand; |
| 94 | 96 | } |
| 95 | - | |
| 97 | + | |
| 96 | 98 | function getDiagnostic() { |
| 97 | 99 | $sCommand = $this->findLocalCommand(); |
| 98 | - | |
| 100 | + | |
| 99 | 101 | // can't find the local command. |
| 100 | 102 | if (empty($sCommand)) { |
| 101 | 103 | return sprintf(_kt('Unable to find required command for indexing. Please ensure that <strong>%s</strong> is installed and in the %s Path. For more information on indexers and helper applications, please <a href="%s">visit the %s site</a>.'), $this->command, APP_NAME, $this->support_url, APP_NAME); |
| 102 | 104 | } |
| 103 | - | |
| 105 | + | |
| 104 | 106 | return null; |
| 105 | 107 | } |
| 106 | 108 | } | ... | ... |
plugins/rssplugin/RSSDashlet.php
plugins/rssplugin/RSSDocumentLinkAction.php
| 1 | 1 | <?php |
| 2 | 2 | /* |
| 3 | - * The contents of this file are subject to the KnowledgeTree Public | |
| 4 | - * License Version 1.1.2 ("License"); You may not use this file except in | |
| 5 | - * compliance with the License. You may obtain a copy of the License at | |
| 6 | - * http://www.knowledgetree.com/KPL | |
| 7 | - * | |
| 8 | - * Software distributed under the License is distributed on an "AS IS" | |
| 9 | - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. | |
| 10 | - * See the License for the specific language governing rights and | |
| 11 | - * limitations under the License. | |
| 3 | + * $Id$ | |
| 12 | 4 | * |
| 13 | - * All copies of the Covered Code must include on each user interface screen: | |
| 14 | - * (i) the "Powered by KnowledgeTree" logo and | |
| 15 | - * (ii) the KnowledgeTree copyright notice | |
| 16 | - * in the same form as they appear in the distribution. See the License for | |
| 17 | - * requirements. | |
| 5 | + * KnowledgeTree Open Source Edition | |
| 6 | + * Document Management Made Simple | |
| 7 | + * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited | |
| 8 | + * | |
| 9 | + * This program is free software; you can redistribute it and/or modify it under | |
| 10 | + * the terms of the GNU General Public License version 3 as published by the | |
| 11 | + * Free Software Foundation. | |
| 12 | + * | |
| 13 | + * This program is distributed in the hope that it will be useful, but WITHOUT | |
| 14 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
| 15 | + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | |
| 16 | + * details. | |
| 17 | + * | |
| 18 | + * You should have received a copy of the GNU General Public License | |
| 19 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 20 | + * | |
| 21 | + * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, | |
| 22 | + * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. | |
| 18 | 23 | * |
| 19 | - * The Original Code is: KnowledgeTree Open Source | |
| 24 | + * The interactive user interfaces in modified source and object code versions | |
| 25 | + * of this program must display Appropriate Legal Notices, as required under | |
| 26 | + * Section 5 of the GNU General Public License version 3. | |
| 20 | 27 | * |
| 21 | - * The Initial Developer of the Original Code is The Jam Warehouse Software | |
| 22 | - * (Pty) Ltd, trading as KnowledgeTree. | |
| 23 | - * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright | |
| 24 | - * (C) 2007 The Jam Warehouse Software (Pty) Ltd; | |
| 25 | - * All Rights Reserved. | |
| 28 | + * In accordance with Section 7(b) of the GNU General Public License version 3, | |
| 29 | + * these Appropriate Legal Notices must retain the display of the "Powered by | |
| 30 | + * KnowledgeTree" logo and retain the original copyright notice. If the display of the | |
| 31 | + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices | |
| 32 | + * must display the words "Powered by KnowledgeTree" and retain the original | |
| 33 | + * copyright notice. | |
| 26 | 34 | * Contributor( s): ______________________________________ |
| 27 | 35 | * |
| 28 | 36 | */ |
| ... | ... | @@ -76,4 +84,4 @@ class RSSDocumentLinkAction extends KTDocumentAction { |
| 76 | 84 | return $oTemplate->render($aTemplateData); |
| 77 | 85 | } |
| 78 | 86 | } |
| 79 | -?> | |
| 80 | 87 | \ No newline at end of file |
| 88 | +?> | ... | ... |
plugins/rssplugin/RSSFolderLinkAction.php
plugins/rssplugin/manageRSSFeeds.php
plugins/tagcloud/TagCloudRedirectPage.php
presentation/i18nJavascript.php
sql/mysql/upgrade/3.4.6/remove_backslashes.sql
| 1 | -/* Script to remove back slashes from ' and " and \ | |
| 2 | - * From the welcome dashlet, folder names and document titles. | |
| 3 | - */ | |
| 4 | - | |
| 5 | 1 | UPDATE help_replacement |
| 6 | 2 | SET description = replace(replace(replace(description, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\''), |
| 7 | 3 | title = replace(replace(replace(title, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\''); |
| ... | ... | @@ -16,4 +12,4 @@ SET name = replace(replace(replace(name, '\\\\', '\\'), '\\\"', '\"'), '\\\'', ' |
| 16 | 12 | |
| 17 | 13 | UPDATE discussion_comments |
| 18 | 14 | SET subject = replace(replace(replace(subject, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\''), |
| 19 | - body = replace(replace(replace(body, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\''); | |
| 20 | 15 | \ No newline at end of file |
| 16 | + body = replace(replace(replace(body, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\''); | ... | ... |
thirdparty/pear/GraphViz.php
| ... | ... | @@ -4,7 +4,7 @@ |
| 4 | 4 | /** |
| 5 | 5 | * Image_GraphViz |
| 6 | 6 | * |
| 7 | - * Copyright (c) 2001-2006, Dr. Volker Göbbels <vmg@arachnion.de> and | |
| 7 | + * Copyright (c) 2001-2006, Dr. Volker G�bbels <vmg@arachnion.de> and | |
| 8 | 8 | * Sebastian Bergmann <sb@sebastian-bergmann.de>. All rights reserved. |
| 9 | 9 | * |
| 10 | 10 | * LICENSE: This source file is subject to version 3.0 of the PHP license |
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | * |
| 16 | 16 | * @category Image |
| 17 | 17 | * @package GraphViz |
| 18 | - * @author Dr. Volker Göbbels <vmg@arachnion.de> | |
| 18 | + * @author Dr. Volker G�bbels <vmg@arachnion.de> | |
| 19 | 19 | * @author Sebastian Bergmann <sb@sebastian-bergmann.de> |
| 20 | 20 | * @author Karsten Dambekalns <k.dambekalns@fishfarm.de> |
| 21 | 21 | * @author Michael Lively Jr. <mlively@ft11.net> |
| ... | ... | @@ -90,10 +90,10 @@ require_once 'System.php'; |
| 90 | 90 | * @category Image |
| 91 | 91 | * @package GraphViz |
| 92 | 92 | * @author Sebastian Bergmann <sb@sebastian-bergmann.de> |
| 93 | - * @author Dr. Volker Göbbels <vmg@arachnion.de> | |
| 93 | + * @author Dr. Volker G�bbels <vmg@arachnion.de> | |
| 94 | 94 | * @author Karsten Dambekalns <k.dambekalns@fishfarm.de> |
| 95 | 95 | * @author Michael Lively Jr. <mlively@ft11.net> |
| 96 | - * @copyright Copyright © 2001-2006 Dr. Volker Göbbels <vmg@arachnion.de> and Sebastian Bergmann <sb@sebastian-bergmann.de> | |
| 96 | + * @copyright Copyright © 2001-2006 Dr. Volker G�bbels <vmg@arachnion.de> and Sebastian Bergmann <sb@sebastian-bergmann.de> | |
| 97 | 97 | * @license http://www.php.net/license/3_0.txt The PHP License, Version 3.0 |
| 98 | 98 | * @version Release: @package_version@ |
| 99 | 99 | * @link http://pear.php.net/package/Image_GraphViz | ... | ... |
thirdparty/pear/HTTP/Upload.php
| ... | ... | @@ -205,7 +205,7 @@ class HTTP_Upload_Error extends PEAR |
| 205 | 205 | 'en' => 'The file was only partially uploaded.', |
| 206 | 206 | 'de' => 'Die Datei wurde unvollständig übertragen.', |
| 207 | 207 | 'nl' => 'Het bestand is slechts gedeeltelijk geupload.', |
| 208 | - 'pt_BR' => 'O arquivo não foi enviado por completo.' | |
| 208 | + 'pt_BR' => 'O arquivo n�o foi enviado por completo.' | |
| 209 | 209 | ), |
| 210 | 210 | 'ERROR' => array( |
| 211 | 211 | 'es' => 'Error en subida:', |
| ... | ... | @@ -215,7 +215,7 @@ class HTTP_Upload_Error extends PEAR |
| 215 | 215 | 'pt_BR' => 'Erro de upload:' |
| 216 | 216 | ), |
| 217 | 217 | 'DEV_NO_DEF_FILE' => array( |
| 218 | - 'es' => 'No está definido en el formulario este nombre de fichero como <input type="file" name=?>.', | |
| 218 | + 'es' => 'No est� definido en el formulario este nombre de fichero como <input type="file" name=?>.', | |
| 219 | 219 | 'en' => 'This filename is not defined in the form as <input type="file" name=?>.', |
| 220 | 220 | 'de' => 'Dieser Dateiname ist im Formular nicht als <input type="file" name=?> definiert.', |
| 221 | 221 | 'nl' => 'Deze bestandsnaam is niett gedefineerd in het formulier als <input type="file" name=?>.' |
| ... | ... | @@ -660,7 +660,7 @@ class HTTP_Upload_File extends HTTP_Upload_Error |
| 660 | 660 | */ |
| 661 | 661 | function nameToSafe($name, $maxlen=250) |
| 662 | 662 | { |
| 663 | - $noalpha = 'ÁÉÍÓÚÝáéíóúýÂÊÎÔÛâêîôûÀÈÌÒÙàèìòùÄËÏÖÜäëïöüÿÃãÕõÅåÑñÇç@°ºª'; | |
| 663 | + $noalpha = '�����������������������������������������������������@���'; | |
| 664 | 664 | $alpha = 'AEIOUYaeiouyAEIOUaeiouAEIOUaeiouAEIOUaeiouyAaOoAaNnCcaooa'; |
| 665 | 665 | |
| 666 | 666 | $name = substr($name, 0, $maxlen); | ... | ... |
thirdparty/pear/Net/Ping.php
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | // | Authors: Martin Jansen <mj@php.net> | |
| 17 | 17 | // | Tomas V.V.Cox <cox@idecnet.com> | |
| 18 | 18 | // | Jan Lehnardt <jan@php.net> | |
| 19 | -// | Kai Schröder <k.schroeder@php.net> | | |
| 19 | +// | Kai Schr�der <k.schroeder@php.net> | | |
| 20 | 20 | // +----------------------------------------------------------------------+ |
| 21 | 21 | // |
| 22 | 22 | // $Id$ |
| ... | ... | @@ -408,7 +408,7 @@ class Net_Ping |
| 408 | 408 | * @param mixed $error a PEAR error or a string with the error message |
| 409 | 409 | * @return bool false |
| 410 | 410 | * @access private |
| 411 | - * @author Kai Schröder <k.schroeder@php.net> | |
| 411 | + * @author Kai Schr�der <k.schroeder@php.net> | |
| 412 | 412 | */ |
| 413 | 413 | function _raiseError($error) |
| 414 | 414 | { |
| ... | ... | @@ -864,7 +864,7 @@ class Net_Ping_Result |
| 864 | 864 | /** |
| 865 | 865 | * Parses the output of Windows' ping command |
| 866 | 866 | * |
| 867 | - * @author Kai Schröder <k.schroeder@php.net> | |
| 867 | + * @author Kai Schr�der <k.schroeder@php.net> | |
| 868 | 868 | * @access private |
| 869 | 869 | */ |
| 870 | 870 | function _parseResultwindows() | ... | ... |