From 19b1f522bbdff07b32e995f9a69c86eaffe2916c Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 29 Apr 2004 23:25:12 +0000
Subject: [PATCH] re-ordered locale init (as in 1.3.9) fixed loadfile with
 subpages, and merge/restore anyway   (sf.net bug #844188)

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3404 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/IniConfig.php            | 14 ++++++++------
 lib/config.php               | 32 +++++++++++++++++---------------
 lib/editpage.php             | 10 ++++++++--
 lib/loadsave.php             | 11 ++++++-----
 lib/plugin/PopularNearby.php | 19 ++++++++++++-------
 5 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/lib/IniConfig.php b/lib/IniConfig.php
index 47ff60e17..0d1b0f453 100644
--- a/lib/IniConfig.php
+++ b/lib/IniConfig.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: IniConfig.php,v 1.13 2004-04-29 21:54:05 rurban Exp $');
+rcs_id('$Id: IniConfig.php,v 1.14 2004-04-29 23:25:12 rurban Exp $');
 
 /**
  * A configurator intended to read it's config from a PHP-style INI file,
@@ -272,7 +272,7 @@ function fix_configs() {
     // $FieldSeparator = "\xFF"; // this byte should never appear in utf-8
     // FIXME: get rid of constant. pref is dynamic and language specific
     $charset = CHARSET;
-    if (isset($GLOBALS['LANG']) and in_array($GLOBALS['LANG'],array('ja','zh')))
+    if (isset($LANG) and in_array($LANG,array('ja','zh')))
         $charset = 'utf-8';
     if (strtolower($charset) == 'utf-8')
         $FieldSeparator = "\xFF";
@@ -282,7 +282,8 @@ function fix_configs() {
     if (!defined('DEFAULT_LANGUAGE'))
         define('DEFAULT_LANGUAGE', 'en');
 
-    //
+    update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE);
+
     // Set up (possibly fake) gettext()
     //
     if (!function_exists ('bindtextdomain')) {
@@ -435,8 +436,6 @@ function fix_configs() {
     if (!defined('THEME'))
         define('THEME', 'default');
 
-    update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE);
-
     if (!defined('WIKI_NAME'))
         define('WIKI_NAME', _("An unnamed PhpWiki"));
 
@@ -469,6 +468,7 @@ function fix_configs() {
                           E_USER_ERROR);
             // this is flawed. constants cannot be changed.
             define('USE_DB_SESSION',false);
+            $DBParams['db_session_table'] = @$DBParams['prefix'] . 'session';
         }
     } else {
         // default: true (since v1.3.8)
@@ -488,10 +488,12 @@ function fix_configs() {
         if (isset($DBParams['dsn']))
             $DBAuthParams['auth_dsn'] = $DBParams['dsn'];
     }
-
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.13  2004/04/29 21:54:05  rurban
+// typo
+//
 // Revision 1.12  2004/04/27 16:16:27  rurban
 // more subtle config problems with defaults
 //
diff --git a/lib/config.php b/lib/config.php
index 50ccd2cdd..3cfd419a1 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: config.php,v 1.101 2004-04-26 13:22:32 rurban Exp $');
+rcs_id('$Id: config.php,v 1.102 2004-04-29 23:25:12 rurban Exp $');
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php
@@ -222,23 +222,14 @@ function update_locale($loc) {
 */
 function pcre_fix_posix_classes ($regexp) {
     global $charset;
-    // First check to see if our PCRE lib supports POSIX character
-    // classes.  If it does, there's nothing to do.
-    if (preg_match('/[[:upper:]]/', 'Ä'))
-        return $regexp;
-
-    static $classes = array(
-                            'alnum' => "0-9A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff",
-                            'alpha' => "A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff",
-                            'upper' => "A-Z\xc0-\xd6\xd8-\xde",
-                            'lower' => "a-z\xdf-\xf6\xf8-\xff"
-                            );
     if (!isset($charset))
-        $charset = CHARSET; // FIXME: get rid of constant. pref is dynamic and language specific
+        $charset = CHARSET; // get rid of constant. pref is dynamic and language specific
     if (in_array($GLOBALS['LANG'],array('ja','zh')))
         $charset = 'utf-8';
     if (strtolower($charset) == 'utf-8') { // thanks to John McPherson
         // until posix class names/pcre work with utf-8
+	if (preg_match('/[[:upper:]]/', '\xc4\x80'))
+            return $regexp;    
         // utf-8 non-ascii chars: most common (eg western) latin chars are 0xc380-0xc3bf
         // we currently ignore other less common non-ascii characters
         // (eg central/east european) latin chars are 0xc432-0xcdbf and 0xc580-0xc5be
@@ -250,10 +241,18 @@ function pcre_fix_posix_classes ($regexp) {
         // this replaces [[:upper:]] with utf-8 match (Latin only)
         $regexp = preg_replace('/\[\[\:upper\:\]\]/','(?:[A-Z]|\xc3[\x80-\x9e]|\xc4[\x80\x82\x84\x86])',
                                $regexp);
+    } elseif (preg_match('/[[:upper:]]/', 'Ä')) {
+        // First check to see if our PCRE lib supports POSIX character
+        // classes.  If it does, there's nothing to do.
+        return $regexp;
     }
-   
+    static $classes = array(
+                            'alnum' => "0-9A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff",
+                            'alpha' => "A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff",
+                            'upper' => "A-Z\xc0-\xd6\xd8-\xde",
+                            'lower' => "a-z\xdf-\xf6\xf8-\xff"
+                            );
     $keys = join('|', array_keys($classes));
-
     return preg_replace("/\[:($keys):]/e", '$classes["\1"]', $regexp);
 }
 
@@ -283,6 +282,9 @@ function IsProbablyRedirectToIndex () {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.101  2004/04/26 13:22:32  rurban
+// calculate bool old or dynamic constants later
+//
 // Revision 1.100  2004/04/26 12:15:01  rurban
 // check default config values
 //
diff --git a/lib/editpage.php b/lib/editpage.php
index 6d048ddfe..9ef0d0a0a 100644
--- a/lib/editpage.php
+++ b/lib/editpage.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: editpage.php,v 1.65 2004-04-18 01:11:52 rurban Exp $');
+rcs_id('$Id: editpage.php,v 1.66 2004-04-29 23:25:12 rurban Exp $');
 
 require_once('lib/Template.php');
 
@@ -59,7 +59,8 @@ class PageEditor
                 $this->_content = $initial_content;
             }
         }
-        header("Content-Type: text/html; charset=" . $GLOBALS['charset']);
+        if (!headers_sent())
+            header("Content-Type: text/html; charset=" . $GLOBALS['charset']);
     }
 
     function editPage () {
@@ -625,6 +626,11 @@ extends PageEditor
 
 /**
  $Log: not supported by cvs2svn $
+ Revision 1.65  2004/04/18 01:11:52  rurban
+ more numeric pagename fixes.
+ fixed action=upload with merge conflict warnings.
+ charset changed from constant to global (dynamic utf-8 switching)
+
  Revision 1.64  2004/04/06 19:48:56  rurban
  temp workaround for action=edit AddComment form
 
diff --git a/lib/loadsave.php b/lib/loadsave.php
index fd29806d9..7c7c42cc1 100644
--- a/lib/loadsave.php
+++ b/lib/loadsave.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: loadsave.php,v 1.97 2004-04-29 22:39:50 rurban Exp $');
+rcs_id('$Id: loadsave.php,v 1.98 2004-04-29 23:25:12 rurban Exp $');
 
 /*
  Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
@@ -811,10 +811,11 @@ function LoadAny (&$request, $file_or_dir, $files = false, $exclude = false)
 function LoadFileOrDir (&$request)
 {
     $source = $request->getArg('source');
-    StartLoadDump($request, fmt("Loading '%s'", HTML(dirname($source),
-                                                     "/",
-                                                     WikiLink(basename($source),
-                                                              'auto'))));
+    $page = rawurldecode(basename($source));
+    StartLoadDump($request, fmt("Loading '%s'", 
+    	HTML(dirname($source),
+             dirname($source) ? "/" : "",
+             WikiLink($page,'auto'))));
     echo "<dl>\n";
     LoadAny($request, $source);
     echo "</dl>\n";
diff --git a/lib/plugin/PopularNearby.php b/lib/plugin/PopularNearby.php
index 3354448ca..7213e7f6b 100644
--- a/lib/plugin/PopularNearby.php
+++ b/lib/plugin/PopularNearby.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PopularNearby.php,v 1.1 2004-04-29 18:32:38 rurban Exp $');
+rcs_id('$Id: PopularNearby.php,v 1.2 2004-04-29 23:25:12 rurban Exp $');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
 
@@ -28,9 +28,9 @@ rcs_id('$Id: PopularNearby.php,v 1.1 2004-04-29 18:32:38 rurban Exp $');
  */
 /* Usage:
 
-* <?plugin PopularNearby mode=incoming ?>
-* <?plugin PopularNearby mode=outgoing ?>
-* <?plugin PopularNearby mode=nearby ?>
+* <small><?plugin PopularNearby mode=incoming ?></small>
+* <small><?plugin PopularNearby mode=outgoing ?></small>
+* <small><?plugin PopularNearby mode=nearby ?></small>
 
 */
  
@@ -50,14 +50,14 @@ extends WikiPlugin
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.1 $");
+                            "\$Revision: 1.2 $");
     }
 
     function getDefaultArguments() {
         return array('pagename' => '[pagename]',
                      'mode'     => 'nearby', // or 'incoming' or 'outgoing'
                      'exclude'  => '',
-                     'limit'    => 5, // limit <0 returns least popular pages
+                     'limit'    => 5,
                      'noheader' => 0,
                     );
     }
@@ -88,7 +88,6 @@ extends WikiPlugin
                                         false,$limit);
             break;
         }
-        // if (count($links) > $limit) array_splice($links, $limit);
         $html = HTML($header);
         for ($i=0; $i<count($links); $i++) {
             $html->pushContent($links[$i]['format'],$i<count($links)-1?', ':'');
@@ -154,6 +153,12 @@ extends WikiPlugin
 };
 
 // $Log: not supported by cvs2svn $
+// Revision 1.1  2004/04/29 18:32:38  rurban
+// Re-implement the classic phpwiki-1.2 feature of the
+//  * 5 best incoming links: xx, xx, xx, ...
+//  * 5 best outgoing links: xx, xx, xx, ...
+//  * 5 most popular nearby: xx, xx, xx, ...
+//
 
 // Local Variables:
 // mode: php
-- 
2.45.0