Merged in from DEV trunk...

KTS-1594 "Support for Office 2007 Documents" Fixed. Remove some stdout logging Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-2852 " Title of the 'Welcome to KnowledgeTree' dashlet is cut off at the first double-quote the system encounters when it is in Edit mode." Fixed. Added functionality to convert double quotes to &quot so that the input tag displays the title correctly. Committed By: Jonathan Byrne Reviewed By: Jalaloedien Abrahams git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8157 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-1594 "Support for Office 2007 Documents" Fixed. Remove some stdout logging Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-2852 " Title of the 'Welcome to KnowledgeTree' dashlet is cut off at the first double-quote the system encounters when it is in Edit mode." Fixed. Added functionality to convert double quotes to &quot so that the input tag displays the title correctly. Committed By: Jonathan Byrne Reviewed By: Jalaloedien Abrahams git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8157 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent de982b1c
Showing 7 changed files with 75 additions and 75 deletions
bin/win32/taskrunner.bat
customerrorpage.php
search2/search/expr.inc.php
thirdparty/pear/GraphViz.php
thirdparty/pear/HTTP/Upload.php
thirdparty/pear/Net/LDAP.php
thirdparty/pear/Net/Ping.php
-@echo off
-"@@BITROCK_INSTALLDIR@@\php\php.exe" "@@BITROCK_INSTALLDIR@@\knowledgeTree\bin\win32\schedulerService.php"
-
+@echo off
+"@@BITROCK_INSTALLDIR@@\php\php.exe" "@@BITROCK_INSTALLDIR@@\knowledgeTree\bin\win32\schedulerService.php"
+
-<?php
-
-if (array_key_exists('fatal', $_POST))
-{
-	$posted = $_POST['fatal'];
-	
-}
-
-if (array_key_exists('Error_MessageOne', $_POST) && array_key_exists('Error_MessageTwo', $_POST))
-{
-	$sErrorMessage = $_POST['Error_MessageOne'].''.$_POST['Error_MessageTwo'];
-	
-}
-
-session_start();
-if (array_key_exists('sErrorMessage', $_SESSION))
-{
-$phperror = $_SESSION['sErrorMessage'];
-}
-
-
-
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>
-	<head>
-		<title>Knowledgetree - Desklet</title>
-		<link rel="stylesheet" type="text/css" href="/resources/css/errors.css" />
-	
-	<script type="text/javascript"> 
-		
-function Click()
-{
-var open = document.getElementById('exp');
-open.style.display = 'block';
-var border = document.getElementById('error-container');
-border.style.height = '250px'; 
-}
-
-</script>		
-		
-	</head>
-	<body>
-	
-		<div id="error-container">
-			
-			<div id="acc-error">
-	
-						
-				<h1>Error!! - You have encountered a problem starting your document management system.</h1>
-				<p><h2>Please contact your systems administrator</h2></p>
-				<p>For more details, click here <img src="/resources/graphics/info.gif" style="cursor: pointer;" onclick="Click()" /><div id ="exp" style="display: none; "> <?php if(isset($sErrorMessage)){ echo $sErrorMessage;  }else  if(isset($posted)){ echo $posted; } else if($phperror){ echo $phperror; } ?></div></p>
-				
-			</div>		
-		</div>		
-				
-	</body>
+<?php
+
+if (array_key_exists('fatal', $_POST))
+{
+	$posted = $_POST['fatal'];
+	
+}
+
+if (array_key_exists('Error_MessageOne', $_POST) && array_key_exists('Error_MessageTwo', $_POST))
+{
+	$sErrorMessage = $_POST['Error_MessageOne'].''.$_POST['Error_MessageTwo'];
+	
+}
+
+session_start();
+if (array_key_exists('sErrorMessage', $_SESSION))
+{
+$phperror = $_SESSION['sErrorMessage'];
+}
+
+
+
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>
+	<head>
+		<title>Knowledgetree - Desklet</title>
+		<link rel="stylesheet" type="text/css" href="/resources/css/errors.css" />
+	
+	<script type="text/javascript"> 
+		
+function Click()
+{
+var open = document.getElementById('exp');
+open.style.display = 'block';
+var border = document.getElementById('error-container');
+border.style.height = '250px'; 
+}
+
+</script>		
+		
+	</head>
+	<body>
+	
+		<div id="error-container">
+			
+			<div id="acc-error">
+	
+						
+				<h1>Error!! - You have encountered a problem starting your document management system.</h1>
+				<p><h2>Please contact your systems administrator</h2></p>
+				<p>For more details, click here <img src="/resources/graphics/info.gif" style="cursor: pointer;" onclick="Click()" /><div id ="exp" style="display: none; "> <?php if(isset($sErrorMessage)){ echo $sErrorMessage;  }else  if(isset($posted)){ echo $posted; } else if($phperror){ echo $phperror; } ?></div></p>
+				
+			</div>		
+		</div>		
+				
+	</body>
 </html>
 \ No newline at end of file
@@ -882,11 +882,11 @@ class TextQueryBuilder implements QueryBuilder
             if (strpos($value, ' ') === false)
             {
-            	$query = "$not$fieldname: $value";
+            	$query = "$not$fieldname:$value";
             }
             else
             {
-            	$query = "$not$fieldname: \"$value\"";
+            	$query = "$not$fieldname:\"$value\"";
             }
 		}
@@ -912,9 +912,9 @@ class TextQueryBuilder implements QueryBuilder
             $not = $expr->not()?' NOT ':'';
             if (strpos($value, ' ') !== false)
-				$query .= "$not$fieldname: \"$value\"";
+				$query .= "$not$fieldname:\"$value\"";
 			else
-				$query .= "$not$fieldname: $value";
+				$query .= "$not$fieldname:$value";
 		}
 		return $query;
@@ -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);
@@ -386,7 +386,7 @@ define (&#39;NET_LDAP_ERROR&#39;, 1000);
      * The <replace> option takes a argument in the same
      * form as add, but will cause any existing
      * attributes with the same name to be replaced. If
-     * the value for any attribute in the ï¿½rray is a refï¿½
+     * the value for any attribute in the årray is a ref
      * erence to an empty string the all instances of the
      * attribute will be deleted.
      *
@@ -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()