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

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
kevin_fourie
1 parent f1d87be2
Showing 22 changed files with 280 additions and 111 deletions
bin/win32/installScheduler.php
bin/win32/schedulerServiceStatus.php
bin/win32/uninstallScheduler.php
ktwebservice/download_cleanup.php
ktwebservice/index.php
ktwebservice/upload_cleanup.php
lib/util/ktutil.inc
plugins/ktcore/folder/addDocument.php
plugins/ktstandard/PDFGeneratorAction.php
plugins/ktstandard/admin/manageDisclaimers.php
plugins/ktstandard/contents/BaseIndexer.php
plugins/ktstandard/contents/WordIndexer.php
plugins/rssplugin/RSSDashlet.php
plugins/rssplugin/RSSDocumentLinkAction.php
plugins/rssplugin/RSSFolderLinkAction.php
plugins/rssplugin/manageRSSFeeds.php
plugins/tagcloud/TagCloudRedirectPage.php
presentation/i18nJavascript.php
sql/mysql/upgrade/3.4.6/remove_backslashes.sql
thirdparty/pear/GraphViz.php
 <?php
+/**
+ * $Id: $
+ *
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2007 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 <http://www.gnu.org/licenses/>.
+ *
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. 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
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s): ______________________________________
+ *
+ */
+
 $scriptPath = realpath(dirname(__FILE__) . '/taskrunner.bat');
 win32_create_service(array(
 <?php
+/**
+ * $Id: $
+ *
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2007 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 <http://www.gnu.org/licenses/>.
+ *
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. 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
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s): ______________________________________
+ *
+ */
+
 var_dump(win32_query_service_status('ktscheduler'));
 ?>
 <?php
+/**
+ * $Id: $
+ *
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2007 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 <http://www.gnu.org/licenses/>.
+ *
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. 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
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s): ______________________________________
+ *
+ */
+
 win32_delete_service('ktscheduler');
 ?>
 \ No newline at end of file
@@ -2,7 +2,7 @@
 /**
  *
- * $Id:$
+ * $Id$
  *
  * Cleans up the download_files table.
  *
@@ -2,7 +2,7 @@
 /**
  *
- * $Id:$
+ * $Id$
  *
  * A wrapper for webservice.php
  *
@@ -2,7 +2,7 @@
 /**
  *
- * $Id:$
+ * $Id$
  *
  * Cleans up the uploaded_files table and the upload.
  *
@@ -303,6 +303,49 @@ class KTUtil {
     }
     // }}}
+
+    // {{{ winexec
+    /**
+     * Execute a command on a windows platform.
+     */
+    function winexec($aCmd, $aOptions = null) {
+    	if (is_array($aCmd)) {
+    		$sCmd = KTUtil::safeShellString($aCmd);
+    	} else {
+    		$sCmd = $aCmd;
+    	}
+    	$sAppend = KTUtil::arrayGet($aOptions, 'append');
+    	if ($sAppend) {
+    		$sCmd .= " >> " . escapeshellarg($sAppend);
+    	}
+
+    	$sCmd = str_replace( '/','\\',$sCmd);
+
+    	// Set wait to true if the execute must wait for the script to complete before continuing
+    	$wait = true;
+        if(isset($aOptions['exec_wait']) && ($aOptions['exec_wait'] == 'false')){
+            $wait = false;
+        }
+
+    	// Iterate through the various execute functions till one works.
+  		$WshShell = new COM("WScript.Shell");
+        $res = $WshShell->Run($sCmd, 0, $wait);
+
+        if($res){
+            return $res;
+        }
+
+    	$sCmd = "start /b \"kt\" " . $sCmd;
+    	$fp = popen($sCmd, 'r');
+    	fclose($fp);
+
+    	if($wait){
+    	    sleep(1);
+    	}
+    	return 1;
+    }
+    // }}}
+
     // {{{ copyDirectory
     function copyDirectory($sSrc, $sDst, $bMove = false) {
         if (file_exists($sDst)) {
@@ -311,7 +311,7 @@ class KTFolderAddDocumentAction extends KTFolderAction {
         );
         $aFile = $this->oValidator->validateFile($extra_d['file'], $aErrorOptions);
-        $sTitle = sanitizeForSQL($extra_d['document_name']);
+        $sTitle = $extra_d['document_name'];
         $iFolderId = $this->oFolder->getId();
         $aOptions = array(
@@ -2,29 +2,35 @@
 /**
  * $Id$
  *
- * The contents of this file are subject to the KnowledgeTree Public
- * License Version 1.1.2 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.knowledgetree.com/KPL
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
  * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
- * See the License for the specific language governing rights and
- * limitations under the License.
- *
- * All copies of the Covered Code must include on each user interface screen:
- *    (i) the "Powered by KnowledgeTree" logo and
- *    (ii) the KnowledgeTree copyright notice
- * in the same form as they appear in the distribution.  See the License for
- * requirements.
+ * 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 <http://www.gnu.org/licenses/>.
+ * 
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
  * 
- * The Original Code is: KnowledgeTree Open Source
+ * 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.
  * 
- * The Initial Developer of the Original Code is The Jam Warehouse Software
- * (Pty) Ltd, trading as KnowledgeTree.
- * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
- * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
+ * 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 
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original 
+ * copyright notice. 
  * Contributor( s): ______________________________________
  *
  */
 <?php
 /**
- * $Id:$
+ * $Id$
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
@@ -5,37 +5,37 @@
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
  * Copyright (C) 2004 - 2007 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 <http://www.gnu.org/licenses/>.
- * 
+ *
  * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. 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 
- * copyright notice. 
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
  * Contributor( s): ______________________________________
  *
  */
-class KTBaseIndexerTrigger { 
+class KTBaseIndexerTrigger {
     /**
      * Which MIME types that this indexer acts upon.
      */
@@ -76,8 +76,8 @@ class KTBaseIndexerTrigger {
      * If it is false, the temporary file will be sent as the last
      * parameter.
      */
-    var $use_pipes = true; 
-    
+    var $use_pipes = true;
+
     /* return a diagnostic string _if_ there is something wrong.  NULL otherwise. */
     function getDiagnostic() {
         return null;
@@ -103,9 +103,10 @@ class KTBaseIndexerTrigger {
         }
         $oKTConfig =& KTConfig::getSingleton();
-        $sBasedir = $oKTConfig->get("urls/tmpDirectory");        
-        
+        $sBasedir = $oKTConfig->get("urls/tmpDirectory");
+
         $myfilename = tempnam($sBasedir, 'kt.' . $tempstub);
+
         if (OS_WINDOWS) {
             $intermediate = tempnam($sBasedir, 'kt.' . $tempstub);
             if (!@copy($sFile, $intermediate)) {
@@ -114,9 +115,9 @@ class KTBaseIndexerTrigger {
         } else {
             $intermediate = $sFile;
         }
-        
+
         $contents = $this->extract_contents($intermediate, $myfilename);
-        
+
         @unlink($myfilename);
         if (OS_WINDOWS) { @unlink($intermediate); }
         if (empty($contents)) {
@@ -127,14 +128,14 @@ class KTBaseIndexerTrigger {
             'document_text' => $contents,
         );
         $sTable = KTUtil::getTableName('document_text');
-        
+
         // clean up the document query "stuff".
         // FIXME this suggests that we should move the _old_ document_searchable_text across to the old-document's id if its a checkin.
         DBUtil::runQuery(array('DELETE FROM ' . $sTable . ' WHERE document_id = ?', array($this->oDocument->getId())));
         DBUtil::autoInsert($sTable, $aInsertValues, array('noid' => true));
     }
-    
+
     // handles certain, _very_ simple reader types.
     function extract_contents($sFilename, $sTempFilename) {
         $sCommand = KTUtil::findCommand($this->commandconfig, $this->command);
@@ -145,7 +146,7 @@ class KTBaseIndexerTrigger {
         $cmdline = array($sCommand);
         $cmdline = kt_array_merge($cmdline, $this->args);
         $cmdline[] = $sFilename;
-        
+
         $aOptions = array();
         $aOptions['exec_wait'] = 'true';
         if ($this->use_pipes) {
@@ -153,7 +154,12 @@ class KTBaseIndexerTrigger {
         } else {
             $cmdline[] = $sTempFilename;
         }
-        $aRet = KTUtil::pexec($cmdline, $aOptions);
+
+        if(OS_WINDOWS){
+            $aRet = KTUtil::winexec($cmdline, $aOptions);
+        }else{
+            $aRet = KTUtil::pexec($cmdline, $aOptions);
+        }
         $this->aCommandOutput = $aRet['out'];
         $contents = file_get_contents($sTempFilename);
@@ -5,32 +5,32 @@
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
  * Copyright (C) 2004 - 2007 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 <http://www.gnu.org/licenses/>.
- * 
+ *
  * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. 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 
- * copyright notice. 
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
  * Contributor( s): ______________________________________
  *
  */
@@ -45,62 +45,64 @@ class KTWordIndexerTrigger extends KTBaseIndexerTrigger {
     var $commandconfig = 'indexer/catdoc';          // could be any application.
     var $args = array("-w", "-d", "UTF-8");
     var $use_pipes = true;
-    
+
     function extract_contents($sFilename, $sTempFilename) {
-        if (OS_WINDOWS) {	    
+        if (OS_WINDOWS) {
             $this->command = 'c:\antiword\antiword.exe';
             $this->commandconfig = 'indexer/antiword';
             $this->args = array();
         }
 	  putenv('LANG=en_US.UTF-8');
-	
+
 	  $sCommand = KTUtil::findCommand($this->commandconfig, $this->command);
         if (empty($sCommand)) {
             return false;
         }
-        
-        if (OS_WINDOWS) {	
+
+        if (OS_WINDOWS) {
             $sDir = dirname(dirname($sCommand));
-	          putenv('HOME=' . $sDir);
+	        putenv('HOME=' . $sDir);
+	        /*
             $cmdline = array($sCommand);
             $cmdline = kt_array_merge($cmdline, $this->args);
             $cmdline[] = $sFilename;
-            
+
             $sCmd = KTUtil::safeShellString($cmdline);
         	$sCmd .= " >> " . escapeshellarg($sTempFilename);
-        	
+
         	$sCmd = str_replace( '/','\\',$sCmd);
-        	
+
             $sCmd = "start /b \"kt\" " . $sCmd;
-            
+
             pclose(popen($sCmd, 'r'));
-        	
+
             $this->aCommandOutput = 1;
             $contents = file_get_contents($sTempFilename);
             return $contents;
+            */
         }
         return parent::extract_contents($sFilename, $sTempFilename);
     }
-    
+
     function findLocalCommand() {
         if (OS_WINDOWS) {
             $this->command = 'c:\antiword\antiword.exe';
             $this->commandconfig = 'indexer/antiword';
             $this->args = array();
-        }        
+        }
         $sCommand = KTUtil::findCommand($this->commandconfig, $this->command);
         return $sCommand;
     }
-    
+
     function getDiagnostic() {
         $sCommand = $this->findLocalCommand();
-        
+
         // can't find the local command.
         if (empty($sCommand)) {
             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);
         }
-        
+
         return null;
     }
 }
 <?php
 /*
- * $Id:$
+ * $Id$
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
 <?php
 /*
- * The contents of this file are subject to the KnowledgeTree Public
- * License Version 1.1.2 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.knowledgetree.com/KPL
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
- * See the License for the specific language governing rights and
- * limitations under the License.
+ * $Id$
  *
- * All copies of the Covered Code must include on each user interface screen:
- *    (i) the "Powered by KnowledgeTree" logo and
- *    (ii) the KnowledgeTree copyright notice
- * in the same form as they appear in the distribution.  See the License for
- * requirements.
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2007 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 <http://www.gnu.org/licenses/>.
+ * 
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
  * 
- * The Original Code is: KnowledgeTree Open Source
+ * 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.
  * 
- * The Initial Developer of the Original Code is The Jam Warehouse Software
- * (Pty) Ltd, trading as KnowledgeTree.
- * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
- * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
+ * 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 
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original 
+ * copyright notice. 
  * Contributor( s): ______________________________________
  *
  */
@@ -76,4 +84,4 @@ class RSSDocumentLinkAction extends KTDocumentAction {
         return $oTemplate->render($aTemplateData);
     }
 }
-?>
 \ No newline at end of file
+?>
 <?php
 /*
- * $Id:$
+ * $Id$
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
 <?php
 /*
- * $Id:$
+ * $Id$
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
 <?php
 /*
- * $Id:$
+ * $Id$
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
 <?php
 /*
- * $Id:$
+ * $Id$
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
-/* Script to remove back slashes from ' and " and \
- * From the welcome dashlet, folder names and document titles.
- */
-
 UPDATE help_replacement
 SET description = replace(replace(replace(description, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\''),
  title = replace(replace(replace(title, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\'');
@@ -16,4 +12,4 @@ SET name = replace(replace(replace(name, &#39;\\\\&#39;, &#39;\\&#39;), &#39;\\\&quot;&#39;, &#39;\&quot;&#39;), &#39;\\\&#39;&#39;, &#39;
 UPDATE discussion_comments
 SET subject = replace(replace(replace(subject, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\''),
- body = replace(replace(replace(body, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\'');
 \ No newline at end of file
+ body = replace(replace(replace(body, '\\\\', '\\'), '\\\"', '\"'), '\\\'', '\'');
@@ -4,7 +4,7 @@
 /**
  * Image_GraphViz
  *
- * Copyright (c) 2001-2006, Dr. Volker Göbbels <vmg@arachnion.de> and
+ * Copyright (c) 2001-2006, Dr. Volker Gï¿½bbels <vmg@arachnion.de> and
  * Sebastian Bergmann <sb@sebastian-bergmann.de>. All rights reserved.
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
@@ -15,7 +15,7 @@
  *
  * @category   Image
  * @package    GraphViz
- * @author     Dr. Volker Göbbels <vmg@arachnion.de>
+ * @author     Dr. Volker Gï¿½bbels <vmg@arachnion.de>
  * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
  * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
  * @author     Michael Lively Jr. <mlively@ft11.net>
@@ -90,10 +90,10 @@ require_once &#39;System.php&#39;;
  * @category  Image
  * @package   GraphViz
  * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @author    Dr. Volker Göbbels <vmg@arachnion.de>
+ * @author    Dr. Volker Gï¿½bbels <vmg@arachnion.de>
  * @author    Karsten Dambekalns <k.dambekalns@fishfarm.de>
  * @author    Michael Lively Jr. <mlively@ft11.net>
- * @copyright Copyright &copy; 2001-2006 Dr. Volker Göbbels <vmg@arachnion.de> and Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright Copyright &copy; 2001-2006 Dr. Volker Gï¿½bbels <vmg@arachnion.de> and Sebastian Bergmann <sb@sebastian-bergmann.de>
  * @license   http://www.php.net/license/3_0.txt The PHP License, Version 3.0
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/Image_GraphViz
@@ -205,7 +205,7 @@ class HTTP_Upload_Error extends PEAR
                 'en'    => 'The file was only partially uploaded.',
                 'de'    => 'Die Datei wurde unvollst&auml;ndig &uuml;bertragen.',
                 'nl'    => 'Het bestand is slechts gedeeltelijk geupload.',
-                'pt_BR' => 'O arquivo não foi enviado por completo.'
+                'pt_BR' => 'O arquivo nï¿½o foi enviado por completo.'
                 ),
             'ERROR' => array(
                 'es'    => 'Error en subida:',
@@ -215,7 +215,7 @@ class HTTP_Upload_Error extends PEAR
                 'pt_BR' => 'Erro de upload:'
                 ),
             'DEV_NO_DEF_FILE' => array(
-                'es'    => 'No está definido en el formulario este nombre de fichero como &lt;input type="file" name=?&gt;.',
+                'es'    => 'No estï¿½ definido en el formulario este nombre de fichero como &lt;input type="file" name=?&gt;.',
                 'en'    => 'This filename is not defined in the form as &lt;input type="file" name=?&gt;.',
                 'de'    => 'Dieser Dateiname ist im Formular nicht als &lt;input type="file" name=?&gt; definiert.',
                 'nl'    => 'Deze bestandsnaam is niett gedefineerd in het formulier als &lt;input type="file" name=?&gt;.'
@@ -660,7 +660,7 @@ class HTTP_Upload_File extends HTTP_Upload_Error
      */
     function nameToSafe($name, $maxlen=250)
     {
-        $noalpha = 'ÁÉÍÓÚÝáéíóúýÂÊÎÔÛâêîôûÀÈÌÒÙàèìòùÄËÏÖÜäëïöüÿÃãÕõÅåÑñÇç@°ºª';
+        $noalpha = 'ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½@ï¿½ï¿½ï¿½';
         $alpha   = 'AEIOUYaeiouyAEIOUaeiouAEIOUaeiouAEIOUaeiouyAaOoAaNnCcaooa';
         $name = substr($name, 0, $maxlen);
@@ -16,7 +16,7 @@
 // | Authors: Martin Jansen <mj@php.net>                                  |
 // |          Tomas V.V.Cox <cox@idecnet.com>                             |
 // |          Jan Lehnardt  <jan@php.net>                                 |
-// |          Kai Schröder <k.schroeder@php.net>                          |
+// |          Kai Schrï¿½der <k.schroeder@php.net>                          |
 // +----------------------------------------------------------------------+
 //
 // $Id$
@@ -408,7 +408,7 @@ class Net_Ping
     * @param mixed $error a PEAR error or a string with the error message
     * @return bool false
     * @access private
-    * @author Kai Schröder <k.schroeder@php.net>
+    * @author Kai Schrï¿½der <k.schroeder@php.net>
     */
     function _raiseError($error)
     {
@@ -864,7 +864,7 @@ class Net_Ping_Result
     /**
     * Parses the output of Windows' ping command
     *
-    * @author Kai Schröder <k.schroeder@php.net>
+    * @author Kai Schrï¿½der <k.schroeder@php.net>
     * @access private
     */
     function _parseResultwindows()