[phpwiki-checkins] CVS: phpwiki/lib config.php,1.6,1.7 setupwiki.php,1.2,1.3

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv3486/lib

Modified Files:
	config.php setupwiki.php 
Log Message:
Some generic pages are included in English, ignoring the language setting
(avoids unnecessary duplication) - these pages are: TestPage, SteveWainstead,
ReleaseNotes. Removed "nl" counterparts. 


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** config.php	2000/10/19 21:36:50	1.6
--- config.php	2000/10/22 19:33:35	1.7
***************
*** 158,161 ****
--- 158,167 ----
     define('WIKI_PGSRC', gettext("./pgsrc")); // Default (old) behavior.
     //define('WIKI_PGSRC', './wiki.zip'); // New style.
+ 
+    // DEFAULT_WIKI_PGSRC is only used when the language is *not*
+    // the default (English) and when reading from a directory:
+    // in that case some English pages are inserted into the wiki as well
+    // DEFAULT_WIKI_PGSRC defines where the English pages reside 
+    define('DEFAULT_WIKI_PGSRC', "./pgsrc");
    
     $ScriptName = "index.php";

Index: setupwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/setupwiki.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** setupwiki.php	2000/10/20 11:42:52	1.2
--- setupwiki.php	2000/10/22 19:33:35	1.3
***************
*** 74,77 ****
--- 74,79 ----
  function LoadZipOrDir ($dbi, $zip_or_dir)
  {
+   global $LANG, $genericpages;
+ 
    $type = filetype($zip_or_dir);
    
***************
*** 94,101 ****
  	  $mtime = $stat[9];
  	  LoadFile($dbi, $fn, implode("", file("$dir/$fn")), $mtime);
  	}
-       closedir($handle); 
      }
  }
  
  LoadZipOrDir($dbi, WIKI_PGSRC);
--- 96,117 ----
  	  $mtime = $stat[9];
  	  LoadFile($dbi, $fn, implode("", file("$dir/$fn")), $mtime);
+ 	}
+       closedir($handle);
+ 
+       if ($LANG != "C") {   // if language is not default, then insert
+ 			   // generic pages from the English ./pgsrc
+ 	 reset($genericpages);
+ 	 $dir = DEFAULT_WIKI_PGSRC;
+ 	 while (list(, $fn) = each($genericpages))
+ 	    LoadFile($dbi, $fn, implode("", file("$dir/$fn")), $mtime);
  	}
      }
  }
+ 
+ $genericpages = array(
+ 	"ReleaseNotes",
+ 	"SteveWainstead",
+ 	"TestPage"
+ 	);
  
  LoadZipOrDir($dbi, WIKI_PGSRC);