Peter M. Groen / knowledgetree

Commit 13b194c3f738c70ed18bd9dafa0ddd891214536f

Authored by kevin_fourie
1 parent de982b1c

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
Inline Side-by-side
Showing 7 changed files with 75 additions and 75 deletions
bin/win32/taskrunner.bat
  View file @13b194c
1   -@echo off
2   -"@@BITROCK_INSTALLDIR@@\php\php.exe" "@@BITROCK_INSTALLDIR@@\knowledgeTree\bin\win32\schedulerService.php"
3   -
  1 +@echo off
  2 +"@@BITROCK_INSTALLDIR@@\php\php.exe" "@@BITROCK_INSTALLDIR@@\knowledgeTree\bin\win32\schedulerService.php"
  3 +
... ...
customerrorpage.php
  View file @13b194c
1   -<?php
2   -
3   -if (array_key_exists('fatal', $_POST))
4   -{
5   - $posted = $_POST['fatal'];
6   -
7   -}
8   -
9   -if (array_key_exists('Error_MessageOne', $_POST) && array_key_exists('Error_MessageTwo', $_POST))
10   -{
11   - $sErrorMessage = $_POST['Error_MessageOne'].''.$_POST['Error_MessageTwo'];
12   -
13   -}
14   -
15   -session_start();
16   -if (array_key_exists('sErrorMessage', $_SESSION))
17   -{
18   -$phperror = $_SESSION['sErrorMessage'];
19   -}
20   -
21   -
22   -
23   -?>
24   -
25   -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>
26   - <head>
27   - <title>Knowledgetree - Desklet</title>
28   - <link rel="stylesheet" type="text/css" href="/resources/css/errors.css" />
29   -
30   - <script type="text/javascript">
31   -
32   -function Click()
33   -{
34   -var open = document.getElementById('exp');
35   -open.style.display = 'block';
36   -var border = document.getElementById('error-container');
37   -border.style.height = '250px';
38   -}
39   -
40   -</script>
41   -
42   - </head>
43   - <body>
44   -
45   - <div id="error-container">
46   -
47   - <div id="acc-error">
48   -
49   -
50   - <h1>Error!! - You have encountered a problem starting your document management system.</h1>
51   - <p><h2>Please contact your systems administrator</h2></p>
52   - <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>
53   -
54   - </div>
55   - </div>
56   -
57   - </body>
  1 +<?php
  2 +
  3 +if (array_key_exists('fatal', $_POST))
  4 +{
  5 + $posted = $_POST['fatal'];
  6 +
  7 +}
  8 +
  9 +if (array_key_exists('Error_MessageOne', $_POST) && array_key_exists('Error_MessageTwo', $_POST))
  10 +{
  11 + $sErrorMessage = $_POST['Error_MessageOne'].''.$_POST['Error_MessageTwo'];
  12 +
  13 +}
  14 +
  15 +session_start();
  16 +if (array_key_exists('sErrorMessage', $_SESSION))
  17 +{
  18 +$phperror = $_SESSION['sErrorMessage'];
  19 +}
  20 +
  21 +
  22 +
  23 +?>
  24 +
  25 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>
  26 + <head>
  27 + <title>Knowledgetree - Desklet</title>
  28 + <link rel="stylesheet" type="text/css" href="/resources/css/errors.css" />
  29 +
  30 + <script type="text/javascript">
  31 +
  32 +function Click()
  33 +{
  34 +var open = document.getElementById('exp');
  35 +open.style.display = 'block';
  36 +var border = document.getElementById('error-container');
  37 +border.style.height = '250px';
  38 +}
  39 +
  40 +</script>
  41 +
  42 + </head>
  43 + <body>
  44 +
  45 + <div id="error-container">
  46 +
  47 + <div id="acc-error">
  48 +
  49 +
  50 + <h1>Error!! - You have encountered a problem starting your document management system.</h1>
  51 + <p><h2>Please contact your systems administrator</h2></p>
  52 + <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>
  53 +
  54 + </div>
  55 + </div>
  56 +
  57 + </body>
58 58 </html>
59 59 \ No newline at end of file
... ...
search2/search/expr.inc.php
  View file @13b194c
... ... @@ -882,11 +882,11 @@ class TextQueryBuilder implements QueryBuilder
882 882  
883 883 if (strpos($value, ' ') === false)
884 884 {
885   - $query = "$not$fieldname: $value";
  885 + $query = "$not$fieldname:$value";
886 886 }
887 887 else
888 888 {
889   - $query = "$not$fieldname: \"$value\"";
  889 + $query = "$not$fieldname:\"$value\"";
890 890 }
891 891 }
892 892  
... ... @@ -912,9 +912,9 @@ class TextQueryBuilder implements QueryBuilder
912 912 $not = $expr->not()?' NOT ':'';
913 913  
914 914 if (strpos($value, ' ') !== false)
915   - $query .= "$not$fieldname: \"$value\"";
  915 + $query .= "$not$fieldname:\"$value\"";
916 916 else
917   - $query .= "$not$fieldname: $value";
  917 + $query .= "$not$fieldname:$value";
918 918 }
919 919  
920 920 return $query;
... ...
thirdparty/pear/GraphViz.php
  View file @13b194c
... ... @@ -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 &#39;System.php&#39;;
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 &copy; 2001-2006 Dr. Volker G�bbels <vmg@arachnion.de> and Sebastian Bergmann <sb@sebastian-bergmann.de>
  96 + * @copyright Copyright &copy; 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
  View file @13b194c
... ... @@ -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&auml;ndig &uuml;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 &lt;input type="file" name=?&gt;.',
  218 + 'es' => 'No está definido en el formulario este nombre de fichero como &lt;input type="file" name=?&gt;.',
219 219 'en' => 'This filename is not defined in the form as &lt;input type="file" name=?&gt;.',
220 220 'de' => 'Dieser Dateiname ist im Formular nicht als &lt;input type="file" name=?&gt; definiert.',
221 221 '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
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/LDAP.php
  View file @13b194c
... ... @@ -386,7 +386,7 @@ define (&#39;NET_LDAP_ERROR&#39;, 1000);
386 386 * The <replace> option takes a argument in the same
387 387 * form as add, but will cause any existing
388 388 * attributes with the same name to be replaced. If
389   - * the value for any attribute in the �rray is a ref�
  389 + * the value for any attribute in the årray is a ref­
390 390 * erence to an empty string the all instances of the
391 391 * attribute will be deleted.
392 392 *
... ...
thirdparty/pear/Net/Ping.php
  View file @13b194c
... ... @@ -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()
... ...