From 13b194c3f738c70ed18bd9dafa0ddd891214536f Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Tue, 26 Feb 2008 13:12:20 +0000 Subject: [PATCH] Merged in from DEV trunk... --- bin/win32/taskrunner.bat | 6 +++--- customerrorpage.php | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------- search2/search/expr.inc.php | 8 ++++---- thirdparty/pear/GraphViz.php | 8 ++++---- thirdparty/pear/HTTP/Upload.php | 6 +++--- thirdparty/pear/Net/LDAP.php | 2 +- thirdparty/pear/Net/Ping.php | 6 +++--- 7 files changed, 75 insertions(+), 75 deletions(-) diff --git a/bin/win32/taskrunner.bat b/bin/win32/taskrunner.bat index 290e4c9..dbed1f4 100644 --- a/bin/win32/taskrunner.bat +++ b/bin/win32/taskrunner.bat @@ -1,3 +1,3 @@ -@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" + diff --git a/customerrorpage.php b/customerrorpage.php index d3de5e9..82ccbd8 100644 --- a/customerrorpage.php +++ b/customerrorpage.php @@ -1,58 +1,58 @@ - - - - - Knowledgetree - Desklet - - - - - - - -
- -
- - -

Error!! - You have encountered a problem starting your document management system.

-

Please contact your systems administrator

-

For more details, click here

- -
-
- - + + + + + Knowledgetree - Desklet + + + + + + + +
+ +
+ + +

Error!! - You have encountered a problem starting your document management system.

+

Please contact your systems administrator

+

For more details, click here

+ +
+
+ + \ No newline at end of file diff --git a/search2/search/expr.inc.php b/search2/search/expr.inc.php index 610a3da..a4ed3a7 100644 --- a/search2/search/expr.inc.php +++ b/search2/search/expr.inc.php @@ -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; diff --git a/thirdparty/pear/GraphViz.php b/thirdparty/pear/GraphViz.php index dd9b822..5224018 100644 --- a/thirdparty/pear/GraphViz.php +++ b/thirdparty/pear/GraphViz.php @@ -4,7 +4,7 @@ /** * Image_GraphViz * - * Copyright (c) 2001-2006, Dr. Volker G�bbels and + * Copyright (c) 2001-2006, Dr. Volker Göbbels and * Sebastian Bergmann . 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 + * @author Dr. Volker Göbbels * @author Sebastian Bergmann * @author Karsten Dambekalns * @author Michael Lively Jr. @@ -90,10 +90,10 @@ require_once 'System.php'; * @category Image * @package GraphViz * @author Sebastian Bergmann - * @author Dr. Volker G�bbels + * @author Dr. Volker Göbbels * @author Karsten Dambekalns * @author Michael Lively Jr. - * @copyright Copyright © 2001-2006 Dr. Volker G�bbels and Sebastian Bergmann + * @copyright Copyright © 2001-2006 Dr. Volker Göbbels and Sebastian Bergmann * @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 diff --git a/thirdparty/pear/HTTP/Upload.php b/thirdparty/pear/HTTP/Upload.php index 10b8276..d2390e0 100644 --- a/thirdparty/pear/HTTP/Upload.php +++ b/thirdparty/pear/HTTP/Upload.php @@ -205,7 +205,7 @@ class HTTP_Upload_Error extends PEAR 'en' => 'The file was only partially uploaded.', 'de' => 'Die Datei wurde unvollständig ü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 <input type="file" name=?>.', + 'es' => 'No está definido en el formulario este nombre de fichero como <input type="file" name=?>.', 'en' => 'This filename is not defined in the form as <input type="file" name=?>.', 'de' => 'Dieser Dateiname ist im Formular nicht als <input type="file" name=?> definiert.', '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 */ function nameToSafe($name, $maxlen=250) { - $noalpha = '�����������������������������������������������������@���'; + $noalpha = 'ÁÉÍÓÚÝáéíóúýÂÊÎÔÛâêîôûÀÈÌÒÙàèìòùÄËÏÖÜäëïöüÿÃãÕõÅåÑñÇç@°ºª'; $alpha = 'AEIOUYaeiouyAEIOUaeiouAEIOUaeiouAEIOUaeiouyAaOoAaNnCcaooa'; $name = substr($name, 0, $maxlen); diff --git a/thirdparty/pear/Net/LDAP.php b/thirdparty/pear/Net/LDAP.php index 8343f36..9c9e8ec 100644 --- a/thirdparty/pear/Net/LDAP.php +++ b/thirdparty/pear/Net/LDAP.php @@ -386,7 +386,7 @@ define ('NET_LDAP_ERROR', 1000); * The 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. * diff --git a/thirdparty/pear/Net/Ping.php b/thirdparty/pear/Net/Ping.php index b2c254b..8446cf5 100644 --- a/thirdparty/pear/Net/Ping.php +++ b/thirdparty/pear/Net/Ping.php @@ -16,7 +16,7 @@ // | Authors: Martin Jansen | // | Tomas V.V.Cox | // | Jan Lehnardt | -// | Kai Schr�der | +// | Kai Schröder | // +----------------------------------------------------------------------+ // // $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 + * @author Kai Schröder */ function _raiseError($error) { @@ -864,7 +864,7 @@ class Net_Ping_Result /** * Parses the output of Windows' ping command * - * @author Kai Schr�der + * @author Kai Schröder * @access private */ function _parseResultwindows() -- libgit2 0.21.4