CVS: phpwiki/lib loadsave.php,1.136,1.137

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

Modified Files:
        loadsave.php 
Log Message:
simplify page names

Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -2 -b -p -d -r1.136 -r1.137
--- loadsave.php        25 Jan 2005 07:07:24 -0000      1.136
+++ loadsave.php        30 Jan 2005 23:14:38 -0000      1.137
@@ -1220,4 +1220,6 @@ function LoadFileOrDir (&$request)
  * - Todo: installer interface to edit config/config.ini settings
  * - Todo: ask for existing old index.php to convert to config/config.ini
+ * - Todo: theme-specific pages: 
+ *   blog - HomePage, ADMIN_USER/Blogs
  */
 function SetupWiki (&$request)
@@ -1247,9 +1249,9 @@ function SetupWiki (&$request)
     $default_pgsrc = FindFile(DEFAULT_WIKI_PGSRC);
 
-    $request->setArg('overwrite',true);
+    $request->setArg('overwrite', true);
     if ($default_pgsrc != $pgsrc) {
         LoadAny($request, $default_pgsrc, $GenericPages);
     }
-    $request->setArg('overwrite',false);
+    $request->setArg('overwrite', false);
     LoadAny($request, $pgsrc);
     $dbi =& $request->_dbi;
@@ -1259,18 +1261,18 @@ function SetupWiki (&$request)
     foreach 
(array_merge(explode(':','OldTextFormattingRules:TextFormattingRules:PhpWikiAdministration'),
                          $GLOBALS['AllActionPages'],
-                         array(constant('HOME_PAGE'))) as $f) {
+                         array(constant('HOME_PAGE'))) as $f) 
+    {
         $page = gettext($f);
-        if (isSubPage($page))
-            $page = urlencode($page);
-        if (! $dbi->isWikiPage(urldecode($page)) ) {
+        $epage = urlencode($page);
+        if (! $dbi->isWikiPage($page) ) {
             // translated version provided?
-            if ($lf = FindLocalizedFile($pgsrc . $finder->_pathsep . $page, 1))
+            if ($lf = FindLocalizedFile($pgsrc . $finder->_pathsep . $epage, 
1)) {
                 LoadAny($request, $lf);
-            else { // load english version of required action page
+            } else { // load english version of required action page
                 LoadAny($request, FindFile(DEFAULT_WIKI_PGSRC . 
$finder->_pathsep . urlencode($f)));
                 $page = $f;
             }
         }
-        if (! $dbi->isWikiPage(urldecode($page))) {
+        if (! $dbi->isWikiPage($page)) {
             trigger_error(sprintf("Mandatory file %s couldn't be loaded!", 
$page),
                           E_USER_WARNING);
@@ -1306,4 +1308,7 @@ function LoadPostFile (&$request)
 /**
  $Log$
+ Revision 1.137  2005/01/30 23:14:38  rurban
+ simplify page names
+
  Revision 1.136  2005/01/25 07:07:24  rurban
  remove body tags in html dumps, add css and images to zipdumps, simplify 
printing



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl