[phpwiki-checkins] CVS: phpwiki/lib Request.php,1.100,1.101 loadsave.php,1.139,1.140 config.php,1.137,1.138 WikiUser.php,1.65,1.66 stdlib.php,1.249,1.250

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21465

Modified Files:
	Request.php loadsave.php config.php WikiUser.php stdlib.php 
Log Message:
wikihash for php-5.1

Index: Request.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -2 -b -p -d -r1.100 -r1.101
--- Request.php	17 Jan 2006 18:57:09 -0000	1.100
+++ Request.php	7 Mar 2006 20:45:43 -0000	1.101
@@ -1169,5 +1169,5 @@ function Request_AccessLogEntry_shutdown
 class HTTP_ETag {
     function HTTP_ETag($val, $is_weak=false) {
-        $this->_val = hash($val);
+        $this->_val = wikihash($val);
         $this->_weak = $is_weak;
     }
@@ -1347,4 +1347,7 @@ class HTTP_ValidatorSet {
 
 // $Log$
+// Revision 1.101  2006/03/07 20:45:43  rurban
+// wikihash for php-5.1
+//
 // Revision 1.100  2006/01/17 18:57:09  uckelman
 // _accesslog->logtable is not set when using non-SQL logging; check should

Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -2 -b -p -d -r1.139 -r1.140
--- loadsave.php	27 Aug 2005 18:02:43 -0000	1.139
+++ loadsave.php	7 Mar 2006 20:45:43 -0000	1.140
@@ -156,5 +156,5 @@ function MailifyPage ($page, $nversions 
     $parts = array();
     while ($revision = $iter->next()) {
-        $parts[] = MimeifyPageRevision($revision);
+        $parts[] = MimeifyPageRevision($page, $revision);
         if ($nversions > 0 && count($parts) >= $nversions)
             break;
@@ -1271,5 +1271,5 @@ function SetupWiki (&$request)
     // Ensure that all mandatory pages are loaded
     $finder = new FileFinder;
-    foreach (array_merge(explode(':','OldTextFormattingRules:TextFormattingRules:PhpWikiAdministration'),
+    foreach (array_merge(explode(':','Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration'),
                          $GLOBALS['AllActionPages'],
                          array(constant('HOME_PAGE'))) as $f) 
@@ -1320,4 +1320,7 @@ function LoadPostFile (&$request)
 /**
  $Log$
+ Revision 1.140  2006/03/07 20:45:43  rurban
+ wikihash for php-5.1
+
  Revision 1.139  2005/08/27 18:02:43  rurban
  fix and expand pages

Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -2 -b -p -d -r1.137 -r1.138
--- config.php	6 Aug 2005 14:31:10 -0000	1.137
+++ config.php	7 Mar 2006 20:45:43 -0000	1.138
@@ -427,5 +427,5 @@ if (!function_exists('array_key_exists')
 
 // => php-4.0.5
-if (!function_exists('is_scalar')) { // lib/stdlib.php:hash()
+if (!function_exists('is_scalar')) { // lib/stdlib.php:wikihash()
     function is_scalar($x) {
         return is_numeric($x) or is_string($x) or is_float($x) or is_bool($x); 
@@ -561,4 +561,7 @@ function getUploadDataPath() {
 
 // $Log$
+// Revision 1.138  2006/03/07 20:45:43  rurban
+// wikihash for php-5.1
+//
 // Revision 1.137  2005/08/06 14:31:10  rurban
 // ensure absolute uploads path

Index: WikiUser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -2 -b -p -d -r1.65 -r1.66
--- WikiUser.php	5 Jun 2005 05:38:02 -0000	1.65
+++ WikiUser.php	7 Mar 2006 20:45:44 -0000	1.66
@@ -742,9 +742,12 @@ class UserPreferences {
 
     function hash () {
-        return hash($this->_prefs);
+        return wikihash($this->_prefs);
     }
 }
 
 // $Log$
+// Revision 1.66  2006/03/07 20:45:44  rurban
+// wikihash for php-5.1
+//
 // Revision 1.65  2005/06/05 05:38:02  rurban
 // Default ENABLE_DOUBLECLICKEDIT = false. Moved to UserPreferences

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -2 -b -p -d -r1.249 -r1.250
--- stdlib.php	30 Oct 2005 14:24:33 -0000	1.249
+++ stdlib.php	7 Mar 2006 20:45:44 -0000	1.250
@@ -67,5 +67,5 @@
     can ($object, $method)
     function_usable ($function_name)
-    hash ($x)
+    wikihash ($x)
     better_srand ($seed = '')
     count_all ($arg)
@@ -1601,5 +1601,5 @@ function function_usable($function_name)
  * This is used for generating ETags.
  */
-function hash ($x) {
+function wikihash ($x) {
     if (is_scalar($x)) {
         return $x;
@@ -2072,4 +2072,7 @@ function getMemoryUsage() {
 
 // $Log$
+// Revision 1.250  2006/03/07 20:45:44  rurban
+// wikihash for php-5.1
+//
 // Revision 1.249  2005/10/30 14:24:33  rurban
 // move rand_ascii_readable from Captcha to stdlib