phpwiki-checkins Mailing List for PhpWiki (Page 519)

Update of /cvsroot/phpwiki/phpwiki/tests
In directory usw-pr-cvs1:/tmp/cvs-serv3039
Added Files:
	AAD_FindText.inputs 
Log Message:
Simple test to verify text appears in the source of a page.
***** Error reading new file: [Errno 2] No such file or directory: 'AAD_FindText.inputs'

Update of /cvsroot/phpwiki/phpwiki/tests
In directory usw-pr-cvs1:/tmp/cvs-serv27632
Added Files:
	AAA_GetHomePage.inputs AAB_EditSandBox.inputs 
	AAC_MakeAutoTestPage.inputs 
Log Message:
Three simple tests.
***** Error reading new file: [Errno 2] No such file or directory: 'AAA_GetHomePage.inputs'
***** Error reading new file: [Errno 2] No such file or directory: 'AAB_EditSandBox.inputs'
***** Error reading new file: [Errno 2] No such file or directory: 'AAC_MakeAutoTestPage.inputs'

Update of /cvsroot/phpwiki/phpwiki/tests
In directory usw-pr-cvs1:/tmp/cvs-serv27099
Added Files:
	maketest.pl 
Log Message:
Given an input file, generate a Java source file.
***** Error reading new file: [Errno 2] No such file or directory: 'maketest.pl'

Update of /cvsroot/phpwiki/phpwiki/tests
In directory usw-pr-cvs1:/tmp/cvs-serv26761
Added Files:
	makemakebuild.pl 
Log Message:
This Perl script generates a Makefile and a build.xml for ant, based on the available input files in the tests directory.
***** Error reading new file: [Errno 2] No such file or directory: 'makemakebuild.pl'

Update of /cvsroot/phpwiki/phpwiki/tests
In directory usw-pr-cvs1:/tmp/cvs-serv26602/tests
Log Message:
Directory /cvsroot/phpwiki/phpwiki/tests added to the repository

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv3069/lib/WikiDB/backend
Modified Files:
	PearDB.php 
Log Message:
_pear_notice_filter: Another minor fix (this time for windows.)
Index: PearDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** PearDB.php	2001年09月20日 18:25:15	1.4
--- PearDB.php	2001年09月20日 19:09:26	1.5
***************
*** 691,695 ****
 function _pear_notice_filter($err) {
 return ( $err->isNotice()
! && preg_match('|DB/common.php$|', $err->errfile)
 && $err->errline == 126
 && preg_match('/Undefined offset: +0\b/', $err->errstr) );
--- 691,695 ----
 function _pear_notice_filter($err) {
 return ( $err->isNotice()
! && preg_match('|DB[/\\]common.php$|', $err->errfile)
 && $err->errline == 126
 && preg_match('/Undefined offset: +0\b/', $err->errstr) );

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv25209/lib
Modified Files:
	FileFinder.php 
Log Message:
Workaround for apparent bug in some versions of PHP (notably the
PHP 4.0.6 which is on SourceForge's project web server.)
Index: FileFinder.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/FileFinder.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FileFinder.php	2001年09月19日 19:16:27	1.1
--- FileFinder.php	2001年09月20日 18:26:14	1.2
***************
*** 126,131 ****
 if (!in_array($dir, $path)) {
 $path[] = $dir;
! ini_set('include_path', implode(':', $path));
 }
 }
 }
--- 126,143 ----
 if (!in_array($dir, $path)) {
 $path[] = $dir;
! //ini_set('include_path', implode(':', $path));
 }
+ /*
+ * Some (buggy) PHP's (notable SourceForge's PHP 4.0.6)
+ * sometimes don't seem to heed their include_path.
+ 	 * I.e. sometimes a file is not found even though it seems
+ * to be in the current include_path.
+ * A simple ini_set('include_path', ini_get('include_path'))
+ * seems to be enough to fix the problem
+ *
+ * This following line should be in the above if-block,
+ * but we put it here, as it seems to work-around the bug. 
+ */
+ ini_set('include_path', implode(':', $path));
 }
 }

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv24901/lib/WikiDB/backend
Modified Files:
	PearDB.php 
Log Message:
_pear_notice_filter(): minor fix.
Index: PearDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PearDB.php	2001年09月19日 19:20:30	1.3
--- PearDB.php	2001年09月20日 18:25:15	1.4
***************
*** 691,695 ****
 function _pear_notice_filter($err) {
 return ( $err->isNotice()
! && $err->errfile == 'DB/common.php' 
 && $err->errline == 126
 && preg_match('/Undefined offset: +0\b/', $err->errstr) );
--- 691,695 ----
 function _pear_notice_filter($err) {
 return ( $err->isNotice()
! && preg_match('|DB/common.php$|', $err->errfile)
 && $err->errline == 126
 && preg_match('/Undefined offset: +0\b/', $err->errstr) );

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv12091/lib/WikiDB/backend
Modified Files:
	PearDB.php 
Log Message:
Search some standard locations for PEAR library code if DB.php is
not found in PHP's include_path.
Added some workarounds for a bug in the PEAR DB code which ships
with PHP 4.0.6.
(I have now tested the MySQL backend with PEAR code from PHP 4.0.4pl1,
PHP 4.0.5 and PHP 4.0.6. Only the 4.0.6 code is buggy. With the new
fixes, all three versions seem to work fine. The bug is reported
to be fixed in the CVS version of the PHP source code.)
Index: PearDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** PearDB.php	2001年09月19日 02:58:24	1.2
--- PearDB.php	2001年09月19日 19:20:30	1.3
***************
*** 2,7 ****
 rcs_id('$Id$');
 
! require_once('DB.php');
 require_once('lib/WikiDB/backend.php');
 
 class WikiDB_backend_PearDB
--- 2,9 ----
 rcs_id('$Id$');
 
! //require_once('DB.php');
 require_once('lib/WikiDB/backend.php');
+ require_once('lib/FileFinder.php');
+ require_once('lib/ErrorManager.php');
 
 class WikiDB_backend_PearDB
***************
*** 9,12 ****
--- 11,22 ----
 {
 function WikiDB_backend_PearDB ($dbparams) {
+ // Find and include PEAR's DB.php.
+ $pearFinder = new PearFileFinder;
+ $pearFinder->includeOnce('DB.php');
+ 
+ // Install filter to handle bogus error notices from buggy DB.php's.
+ global $ErrorManager;
+ $ErrorManager->pushErrorHandler(array($this, '_pear_notice_filter'));
+ 
 // Open connection to database
 $dsn = $dbparams['dsn'];
***************
*** 634,643 ****
 */
 function _pear_error_callback($error) {
 $this->_dbh->setErrorHandling(PEAR_ERROR_PRINT);	// prevent recursive loops.
 $this->close();
! //trigger_error($this->_pear_error_message($error), E_USER_WARNING);
! ExitWiki($this->_pear_error_message($error));
 }
 
 function _pear_error_message($error) {
 $class = get_class($this);
--- 644,674 ----
 */
 function _pear_error_callback($error) {
+ if ($this->_is_false_error($error))
+ return;
+ 
 $this->_dbh->setErrorHandling(PEAR_ERROR_PRINT);	// prevent recursive loops.
 $this->close();
! trigger_error($this->_pear_error_message($error), E_USER_ERROR);
 }
 
+ /**
+ * Detect false errors messages from PEAR DB.
+ *
+ * The version of PEAR DB which ships with PHP 4.0.6 has a bug in that
+ * it doesn't recognize "LOCK" and "UNLOCK" as SQL commands which don't
+ * return any data. (So when a "LOCK" command doesn't return any data,
+ * DB reports it as an error, when in fact, it's not.)
+ *
+ * @access private
+ * @return bool True iff error is not really an error.
+ */
+ function _is_false_error($error) {
+ $code = $error->getCode();
+ $query = $this->_dbh->last_query;
+ return ($code == DB_ERROR
+ && ! DB::isManip($query)
+ && preg_match('/^\s*"?(LOCK|UNLOCK)\s/', $query));
+ }
+ 
 function _pear_error_message($error) {
 $class = get_class($this);
***************
*** 647,650 ****
--- 678,697 ----
 
 return $message;
+ }
+ 
+ /**
+ * Filter PHP errors notices from PEAR DB code.
+ *
+ * The PEAR DB code which ships with PHP 4.0.6 produces spurious
+ * errors and notices. This is an error callback (for use with
+ * ErrorManager which will filter out those spurious messages.)
+ * @see _is_false_error, ErrorManager
+ * @access private
+ */
+ function _pear_notice_filter($err) {
+ return ( $err->isNotice()
+ && $err->errfile == 'DB/common.php' 
+ && $err->errline == 126
+ && preg_match('/Undefined offset: +0\b/', $err->errstr) );
 }
 };

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv11726/lib
Modified Files:
	config.php 
Added Files:
	FileFinder.php 
Log Message:
New file lib/FileFinder.php with utility code to help find source files.
***** Error reading new file: [Errno 2] No such file or directory: 'FileFinder.php'
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** config.php	2001年09月19日 02:27:50	1.42
--- config.php	2001年09月19日 19:16:27	1.43
***************
*** 24,52 ****
 $FieldSeparator = "\x81";
 
 // Search PHP's include_path to find file or directory.
 function FindFile ($file, $missing_okay = false)
 {
! // FIXME: This wont work for DOS filenames.
! if (ereg('^/', $file))
! {
! // absolute path.
! if (file_exists($file))
! return $file;
! }
! else
! {
! $include_path = ini_get('include_path');
! if (empty($include_path))
! $include_path = '.';
! // FIXME: This wont work for DOS filenames.
! $path = explode(':', $include_path);
! while (list($i, $dir) = each ($path))
! if (file_exists("$dir/$file"))
! return "$dir/$file";
! }
! 
! if (!$missing_okay)
! ExitWiki("$file: file not found");
! return false;
 }
 
--- 24,35 ----
 $FieldSeparator = "\x81";
 
+ require_once('lib/FileFinder.php');
 // Search PHP's include_path to find file or directory.
 function FindFile ($file, $missing_okay = false)
 {
! static $finder;
! if (!isset($finder))
! $finder = new FileFinder;
! return $finder->findFile($file, $missing_okay);
 }
 
***************
*** 55,87 ****
 function FindLocalizedFile ($file, $missing_okay = false)
 {
! $language = $GLOBALS['LANG'];
! 
! if (empty($language))
! $language = getenv("LC_ALL");
! if (empty($language))
! $language = getenv("LC_MESSAGES");
! if (empty($language))
! $language = getenv("LC_RESPONSES"); // deprecated
! if (empty($language))
! $language = getenv("LANG");
! if (empty($language))
! $language = "C";
! 
! // FIXME: This wont work for DOS filenames.
! if (!ereg('^/', $file))
! {
! if ( ($path = FindFile("locale/$language/$file", 'missing_is_okay')) )
! return $path;
! // A locale can be, e.g. de_DE.iso8859-1@euro.
! // Try less specific versions of the locale: 
! $seps = array('@', '.', '_');
! for ($i = 0; $i < count($seps); $i++)
! if ( ($tail = strchr($language, $seps[$i])) ) {
! $head = substr($language, 0, -strlen($tail));
! if ( ($path = FindFile("locale/$head/$file", 'missing_is_okay')) )
! return $path;
! }
! }
! return FindFile($file, $missing_okay);
 }
 
--- 38,45 ----
 function FindLocalizedFile ($file, $missing_okay = false)
 {
! static $finder;
! if (!isset($finder))
! $finder = new LocalizedFileFinder;
! return $finder->findFile($file, $missing_okay);
 }
 

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv10976
Modified Files:
	index.php 
Log Message:
Added note about the possible need to set session.save_path.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** index.php	2001年09月19日 03:44:53	1.23
--- index.php	2001年09月19日 19:12:16	1.24
***************
*** 67,70 ****
--- 67,82 ----
 define('ALLOW_BOGO_LOGIN', true);
 
+ // The login code now uses PHP's session support. Usually, the default
+ // configuration of PHP is to store the session state information in
+ // /tmp. That probably will work fine, but fails e.g. on clustered
+ // servers where each server has their own distinct /tmp (this
+ // is the case on SourceForge's project web server.) You can specify
+ // an alternate directory in which to store state information like so
+ // (whatever user your httpd runs as must have read/write permission
+ // in this directory):
+ 
+ // ini_set('session.save_path', 'some_other_directory');
+ 
+ 
 /////////////////////////////////////////////////////////////////////
 //

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv13004
Removed Files:
	msql.php 
Log Message:
msql is not likely to be supported by DB.php, the demand is minimal, msql is going throught a revision anyway, etc. etc.
--- msql.php DELETED ---

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv11653
Modified Files:
	index.php 
Log Message:
Oops. I changed the directory for dbm files and committed it by
accident. Careless.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** index.php	2001年09月19日 03:24:36	1.22
--- index.php	2001年09月19日 03:44:53	1.23
***************
*** 110,114 ****
 
 // Used by 'dba'
! 'directory' => "/tmp/delme",
 'dba_handler' => 'gdbm', // Either of 'gdbm' or 'db2' work great for me.
 //'dba_handler' => 'db2',
--- 110,114 ----
 
 // Used by 'dba'
! 'directory' => "/tmp",
 'dba_handler' => 'gdbm', // Either of 'gdbm' or 'db2' work great for me.
 //'dba_handler' => 'db2',

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/dumb
In directory usw-pr-cvs1:/tmp/cvs-serv8452/lib/WikiDB/backend/dumb
Modified Files:
	BackLinkIter.php MostPopularIter.php 
Log Message:
Updated the "emacs local variables" blocks.
Index: BackLinkIter.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/dumb/BackLinkIter.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BackLinkIter.php	2001年09月18日 19:16:23	1.1
--- BackLinkIter.php	2001年09月19日 03:24:36	1.2
***************
*** 37,39 ****
--- 37,48 ----
 }
 
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
+ 
 ?>
Index: MostPopularIter.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/dumb/MostPopularIter.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MostPopularIter.php	2001年09月18日 19:16:23	1.1
--- MostPopularIter.php	2001年09月19日 03:24:36	1.2
***************
*** 46,48 ****
--- 46,57 ----
 }
 
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
+ 
 ?>

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv8452/lib/plugin
Modified Files:
	BackLinks.php HelloWorld.php 
Log Message:
Updated the "emacs local variables" blocks.
Index: BackLinks.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/BackLinks.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BackLinks.php	2001年09月18日 19:19:05	1.1
--- BackLinks.php	2001年09月19日 03:24:36	1.2
***************
*** 47,50 ****
--- 47,59 ----
 }
 };
+ 
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
 
 ?>
Index: HelloWorld.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/HelloWorld.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** HelloWorld.php	2001年09月18日 19:19:05	1.1
--- HelloWorld.php	2001年09月19日 03:24:36	1.2
***************
*** 18,21 ****
--- 18,30 ----
 }
 };
+ 
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
 
 ?>

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv8452/lib
Modified Files:
	DbaListSet.php Template.php display.php fullsearch.php 
	logger.php msql.php search.php 
Log Message:
Updated the "emacs local variables" blocks.
Index: DbaListSet.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/DbaListSet.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DbaListSet.php	2001年09月18日 19:16:23	1.1
--- DbaListSet.php	2001年09月19日 03:24:36	1.2
***************
*** 137,142 ****
--- 137,148 ----
 
 
+ // For emacs users
 // Local Variables:
 // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
 // End:
+ 
 ?>
Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Template.php	2001年09月18日 19:16:23	1.1
--- Template.php	2001年09月19日 03:24:36	1.2
***************
*** 302,306 ****
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
! // indent-tabs-mode: nil33
 // End: 
 ?>
--- 302,306 ----
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
! // indent-tabs-mode: nil
 // End: 
 ?>
Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** display.php	2001年09月18日 19:16:23	1.10
--- display.php	2001年09月19日 03:24:36	1.11
***************
*** 32,36 ****
 // Local Variables:
 // mode: php
! // c-file-style: "ellemtel"
! // End: 
 ?>
--- 32,40 ----
 // Local Variables:
 // mode: php
! // tab-width: 8
! // c-basic-offset: 4
! // c-hanging-comment-ender-p: nil
! // indent-tabs-mode: nil
! // End:
! 
 ?>
Index: fullsearch.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/fullsearch.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** fullsearch.php	2001年09月18日 19:16:23	1.7
--- fullsearch.php	2001年09月19日 03:24:36	1.8
***************
*** 49,51 ****
--- 49,62 ----
 
 echo GeneratePage('MESSAGE', $html, sprintf(gettext("Full Text Search: %s"), $searchterm));
+ 
+ 
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
+ 
 ?>
Index: logger.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/logger.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** logger.php	2001年05月31日 17:41:55	1.2
--- logger.php	2001年09月19日 03:24:36	1.3
***************
*** 68,72 ****
 // Local Variables:
 // mode: php
! // c-file-style: "ellemtel"
! // End: 
 ?>
--- 68,76 ----
 // Local Variables:
 // mode: php
! // tab-width: 8
! // c-basic-offset: 4
! // c-hanging-comment-ender-p: nil
! // indent-tabs-mode: nil
! // End:
! 
 ?>
Index: search.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/search.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** search.php	2001年09月18日 19:16:23	1.8
--- search.php	2001年09月19日 03:24:36	1.9
***************
*** 27,29 ****
--- 27,38 ----
 echo GeneratePage('MESSAGE', $html, "$search_title: $searchterm");
 
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
+ 
 ?>

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB
In directory usw-pr-cvs1:/tmp/cvs-serv8452/lib/WikiDB
Modified Files:
	SQL.php backend.php 
Log Message:
Updated the "emacs local variables" blocks.
Index: SQL.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/SQL.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SQL.php	2001年09月18日 19:16:23	1.1
--- SQL.php	2001年09月19日 03:24:36	1.2
***************
*** 45,50 ****
--- 45,56 ----
 
 
+ // For emacs users
 // Local Variables:
 // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
 // End:
+ 
 ?>
Index: backend.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** backend.php	2001年09月18日 19:16:23	1.1
--- backend.php	2001年09月19日 03:24:36	1.2
***************
*** 479,483 ****
 };
 
! // (c-file-style: "gnu")
 // Local Variables:
 // mode: php
--- 479,483 ----
 };
 
! // For emacs users
 // Local Variables:
 // mode: php
***************
*** 486,489 ****
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
! // End: 
 ?>
--- 486,490 ----
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
! // End:
! 
 ?>

Update of /cvsroot/phpwiki/phpwiki/admin
In directory usw-pr-cvs1:/tmp/cvs-serv8452/admin
Modified Files:
	removepage.php wiki_dumpHTML.php wiki_port1_0.php 
	wiki_rebuilddbms.php 
Log Message:
Updated the "emacs local variables" blocks.
Index: removepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/removepage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** removepage.php	2001年09月18日 19:16:23	1.4
--- removepage.php	2001年09月19日 03:24:36	1.5
***************
*** 19,21 ****
--- 19,31 ----
 require_once('lib/template.php');
 echo GeneratePage('MESSAGE', $html, gettext("Remove page"));
+ 
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
+ 
 ?> 
Index: wiki_dumpHTML.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/wiki_dumpHTML.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** wiki_dumpHTML.php	2000年08月29日 02:42:59	1.2
--- wiki_dumpHTML.php	2001年09月19日 03:24:36	1.3
***************
*** 5,7 ****
--- 5,17 ----
 echo "Got: $dumpHTML $directory<br>\n";
 
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
+ 
+ 
 ?>
Index: wiki_port1_0.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/wiki_port1_0.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** wiki_port1_0.php	2001年09月18日 19:16:23	1.5
--- wiki_port1_0.php	2001年09月19日 03:24:36	1.6
***************
*** 72,75 ****
--- 72,85 ----
 
 dbmclose($dbmh);
+ 
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
+ 
 ?>
 
Index: wiki_rebuilddbms.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/wiki_rebuilddbms.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** wiki_rebuilddbms.php	2000年08月29日 02:42:59	1.2
--- wiki_rebuilddbms.php	2001年09月19日 03:24:36	1.3
***************
*** 3,6 ****
--- 3,14 ----
 
 echo "Rebuild DBM files called.<p>\n";
+ // For emacs users
+ // Local Variables:
+ // mode: php
+ // tab-width: 8
+ // c-basic-offset: 4
+ // c-hanging-comment-ender-p: nil
+ // indent-tabs-mode: nil
+ // End:
 
 ?>

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv8452
Modified Files:
	index.php 
Log Message:
Updated the "emacs local variables" blocks.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** index.php	2001年09月18日 19:16:23	1.21
--- index.php	2001年09月19日 03:24:36	1.22
***************
*** 110,114 ****
 
 // Used by 'dba'
! 'directory' => "/tmp",
 'dba_handler' => 'gdbm', // Either of 'gdbm' or 'db2' work great for me.
 //'dba_handler' => 'db2',
--- 110,114 ----
 
 // Used by 'dba'
! 'directory' => "/tmp/delme",
 'dba_handler' => 'gdbm', // Either of 'gdbm' or 'db2' work great for me.
 //'dba_handler' => 'db2',

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv4281/lib/WikiDB/backend
Modified Files:
	PearDB.php 
Log Message:
Minor cleanup.
Index: PearDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PearDB.php	2001年09月18日 19:16:23	1.1
--- PearDB.php	2001年09月19日 02:58:24	1.2
***************
*** 18,22 ****
 E_USER_ERROR);
 }
- $this->_dbh = $dbh;
 $dbh->setErrorHandling(PEAR_ERROR_CALLBACK,
 array($this, '_pear_error_callback'));
--- 18,21 ----

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv3995/lib
Modified Files:
	Request.php loadsave.php ziplib.php 
Log Message:
Fixed a couple bugs having to do with file uploads, and zip archive
unzipping.
Index: Request.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Request.php	2001年09月18日 19:16:23	1.1
--- Request.php	2001年09月19日 02:58:00	1.2
***************
*** 6,11 ****
 
 function Request() {
! 
 $this->_fix_magic_quotes_gpc();
 
 switch($this->get('REQUEST_METHOD')) {
--- 6,12 ----
 
 function Request() {
! 
 $this->_fix_magic_quotes_gpc();
+ $this->_fix_multipart_form_data();
 
 switch($this->get('REQUEST_METHOD')) {
***************
*** 116,119 ****
--- 117,121 ----
 }
 
+ 
 function _stripslashes(&$var) {
 if (is_array($var)) {
***************
*** 124,127 ****
--- 126,143 ----
 $var = stripslashes($var);
 }
+ 
+ function _fix_multipart_form_data () {
+ if (preg_match('|^multipart/form-data|', $this->get('CONTENT_TYPE')))
+ $this->_strip_leading_nl($GLOBALS['HTTP_POST_VARS']);
+ }
+ 
+ function _strip_leading_nl(&$var) {
+ if (is_array($var)) {
+ foreach ($var as $key => $val)
+ $this->_strip_leading_nl($var[$key]);
+ }
+ elseif (is_string($var))
+ $var = preg_replace('|^\r?\n?|', '', $var);
+ }
 }
 
***************
*** 199,203 ****
 
 $fileinfo = &$HTTP_POST_FILES[$postname];
! if (!is_uploaded_file($fileinfo['temp_name']))
 return false; // possible malicious attack.
 
--- 215,219 ----
 
 $fileinfo = &$HTTP_POST_FILES[$postname];
! if (!is_uploaded_file($fileinfo['tmp_name']))
 return false; // possible malicious attack.
 
Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** loadsave.php	2001年09月18日 19:16:23	1.8
--- loadsave.php	2001年09月19日 02:58:00	1.9
***************
*** 424,440 ****
 
 if (!$upload)
! ExitWiki('No uploade file to upload?');
! 
! // Dump http headers.
! $fd = fopen($tmp_name, "rb");
! while ( ($header = fgets($fd, 4096)) )
! if (trim($header) == '')
! break;
 
 StartLoadDump("Uploading " . $upload->getName());
 echo "<dl>\n";
 
 if (IsZipFile($fd))
! LoadZip($dbi, $upload->open(), false, array(gettext('RecentChanges')));
 else
 Loadfile($dbi, $upload->getName(), $upload->getContents());
--- 424,436 ----
 
 if (!$upload)
! ExitWiki('No uploaded file to upload?');
 
+ // Dump http headers.
 StartLoadDump("Uploading " . $upload->getName());
 echo "<dl>\n";
 
+ $fd = $upload->open();
 if (IsZipFile($fd))
! LoadZip($dbi, $fd, false, array(gettext('RecentChanges')));
 else
 Loadfile($dbi, $upload->getName(), $upload->getContents());
Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ziplib.php	2001年09月18日 19:16:23	1.8
--- ziplib.php	2001年09月19日 02:58:00	1.9
***************
*** 74,143 ****
 * CRC32 computation. Hacked from Info-zip's zip-2.3 source code.
 */
- /* NOTE: The range of PHP ints seems to be -0x80000000 to 0x7fffffff.
- * So, had to munge these constants.
- */
- $zip_crc_table = array (
- 0x00000000, 0x77073096, -0x11f19ed4, -0x66f6ae46, 0x076dc419,
- 0x706af48f, -0x169c5acb, -0x619b6a5d, 0x0edb8832, 0x79dcb8a4,
- -0x1f2a16e2, -0x682d2678, 0x09b64c2b, 0x7eb17cbd, -0x1847d2f9,
- -0x6f40e26f, 0x1db71064, 0x6ab020f2, -0x0c468eb8, -0x7b41be22,
- 0x1adad47d, 0x6ddde4eb, -0x0b2b4aaf, -0x7c2c7a39, 0x136c9856,
- 0x646ba8c0, -0x029d0686, -0x759a3614, 0x14015c4f, 0x63066cd9,
- -0x05f0c29d, -0x72f7f20b, 0x3b6e20c8, 0x4c69105e, -0x2a9fbe1c,
- -0x5d988e8e, 0x3c03e4d1, 0x4b04d447, -0x2df27a03, -0x5af54a95,
- 0x35b5a8fa, 0x42b2986c, -0x2444362a, -0x534306c0, 0x32d86ce3,
- 0x45df5c75, -0x2329f231, -0x542ec2a7, 0x26d930ac, 0x51de003a,
- -0x3728ae80, -0x402f9eea, 0x21b4f4b5, 0x56b3c423, -0x30456a67,
- -0x47425af1, 0x2802b89e, 0x5f058808, -0x39f3264e, -0x4ef416dc,
- 0x2f6f7c87, 0x58684c11, -0x3e9ee255, -0x4999d2c3, 0x76dc4190,
- 0x01db7106, -0x672ddf44, -0x102aefd6, 0x71b18589, 0x06b6b51f,
- -0x60401b5b, -0x17472bcd, 0x7807c9a2, 0x0f00f934, -0x69f65772,
- -0x1ef167e8, 0x7f6a0dbb, 0x086d3d2d, -0x6e9b9369, -0x199ca3ff,
- 0x6b6b51f4, 0x1c6c6162, -0x7a9acf28, -0x0d9dffb2, 0x6c0695ed,
- 0x1b01a57b, -0x7df70b3f, -0x0af03ba9, 0x65b0d9c6, 0x12b7e950,
- -0x74414716, -0x03467784, 0x62dd1ddf, 0x15da2d49, -0x732c830d,
- -0x042bb39b, 0x4db26158, 0x3ab551ce, -0x5c43ff8c, -0x2b44cf1e,
- 0x4adfa541, 0x3dd895d7, -0x5b2e3b93, -0x2c290b05, 0x4369e96a,
- 0x346ed9fc, -0x529877ba, -0x259f4730, 0x44042d73, 0x33031de5,
- -0x55f5b3a1, -0x22f28337, 0x5005713c, 0x270241aa, -0x41f4eff0,
- -0x36f3df7a, 0x5768b525, 0x206f85b3, -0x46992bf7, -0x319e1b61,
- 0x5edef90e, 0x29d9c998, -0x4f2f67de, -0x3828574c, 0x59b33d17,
- 0x2eb40d81, -0x4842a3c5, -0x3f459353, -0x12477ce0, -0x65404c4a,
- 0x03b6e20c, 0x74b1d29a, -0x152ab8c7, -0x622d8851, 0x04db2615,
- 0x73dc1683, -0x1c9cf4ee, -0x6b9bc47c, 0x0d6d6a3e, 0x7a6a5aa8,
- -0x1bf130f5, -0x6cf60063, 0x0a00ae27, 0x7d079eb1, -0x0ff06cbc,
- -0x78f75c2e, 0x1e01f268, 0x6906c2fe, -0x089da8a3, -0x7f9a9835,
- 0x196c3671, 0x6e6b06e7, -0x012be48a, -0x762cd420, 0x10da7a5a,
- 0x67dd4acc, -0x06462091, -0x71411007, 0x17b7be43, 0x60b08ed5,
- -0x29295c18, -0x5e2e6c82, 0x38d8c2c4, 0x4fdff252, -0x2e44980f,
- -0x5943a899, 0x3fb506dd, 0x48b2364b, -0x27f2d426, -0x50f5e4b4,
- 0x36034af6, 0x41047a60, -0x209f103d, -0x579820ab, 0x316e8eef,
- 0x4669be79, -0x349e4c74, -0x43997ce6, 0x256fd2a0, 0x5268e236,
- -0x33f3886b, -0x44f4b8fd, 0x220216b9, 0x5505262f, -0x3a45c442,
- -0x4d42f4d8, 0x2bb45a92, 0x5cb36a04, -0x3d280059, -0x4a2f30cf,
- 0x2cd99e8b, 0x5bdeae1d, -0x649b3d50, -0x139c0dda, 0x756aa39c,
- 0x026d930a, -0x63f6f957, -0x14f1c9c1, 0x72076785, 0x05005713,
- -0x6a40b57e, -0x1d4785ec, 0x7bb12bae, 0x0cb61b38, -0x6d2d7165,
- -0x1a2a41f3, 0x7cdcefb7, 0x0bdbdf21, -0x792c2d2c, -0x0e2b1dbe,
- 0x68ddb3f8, 0x1fda836e, -0x7e41e933, -0x0946d9a5, 0x6fb077e1,
- 0x18b74777, -0x77f7a51a, -0x00f09590, 0x66063bca, 0x11010b5c,
- -0x709a6101, -0x079d5197, 0x616bffd3, 0x166ccf45, -0x5ff51d88,
- -0x28f22d12, 0x4e048354, 0x3903b3c2, -0x5898d99f, -0x2f9fe909,
- 0x4969474d, 0x3e6e77db, -0x512e95b6, -0x2629a524, 0x40df0b66,
- 0x37d83bf0, -0x564351ad, -0x2144613b, 0x47b2cf7f, 0x30b5ffe9,
- -0x42420de4, -0x35453d76, 0x53b39330, 0x24b4a3a6, -0x452fc9fb,
- -0x3228f96d, 0x54de5729, 0x23d967bf, -0x4c9985d2, -0x3b9eb548,
- 0x5d681b02, 0x2a6f2b94, -0x4bf441c9, -0x3cf3715f, 0x5a05df1b,
- 0x2d02ef8d
- );
 
 function zip_crc32 ($str, $crc = 0) 
 {
! global $zip_crc_table;
! $crc = ~$crc;
! for ($i = 0; $i < strlen($str); $i++)
! $crc = ( $zip_crc_table[($crc ^ ord($str[$i])) & 0xff]
! ^ (($crc >> 8) & 0xffffff) );
! return ~$crc;
 }
 
--- 74,147 ----
 * CRC32 computation. Hacked from Info-zip's zip-2.3 source code.
 */
 
 function zip_crc32 ($str, $crc = 0) 
 {
! static $zip_crc_table;
! 
! if (empty($zip_crc_table)) {
! /* NOTE: The range of PHP ints seems to be -0x80000000 to 0x7fffffff.
! * So, had to munge these constants.
! */
! $zip_crc_table
! = array (0x00000000, 0x77073096, -0x11f19ed4, -0x66f6ae46, 0x076dc419,
! 0x706af48f, -0x169c5acb, -0x619b6a5d, 0x0edb8832, 0x79dcb8a4,
! -0x1f2a16e2, -0x682d2678, 0x09b64c2b, 0x7eb17cbd, -0x1847d2f9,
! -0x6f40e26f, 0x1db71064, 0x6ab020f2, -0x0c468eb8, -0x7b41be22,
! 0x1adad47d, 0x6ddde4eb, -0x0b2b4aaf, -0x7c2c7a39, 0x136c9856,
! 0x646ba8c0, -0x029d0686, -0x759a3614, 0x14015c4f, 0x63066cd9,
! -0x05f0c29d, -0x72f7f20b, 0x3b6e20c8, 0x4c69105e, -0x2a9fbe1c,
! -0x5d988e8e, 0x3c03e4d1, 0x4b04d447, -0x2df27a03, -0x5af54a95,
! 0x35b5a8fa, 0x42b2986c, -0x2444362a, -0x534306c0, 0x32d86ce3,
! 0x45df5c75, -0x2329f231, -0x542ec2a7, 0x26d930ac, 0x51de003a,
! -0x3728ae80, -0x402f9eea, 0x21b4f4b5, 0x56b3c423, -0x30456a67,
! -0x47425af1, 0x2802b89e, 0x5f058808, -0x39f3264e, -0x4ef416dc,
! 0x2f6f7c87, 0x58684c11, -0x3e9ee255, -0x4999d2c3, 0x76dc4190,
! 0x01db7106, -0x672ddf44, -0x102aefd6, 0x71b18589, 0x06b6b51f,
! -0x60401b5b, -0x17472bcd, 0x7807c9a2, 0x0f00f934, -0x69f65772,
! -0x1ef167e8, 0x7f6a0dbb, 0x086d3d2d, -0x6e9b9369, -0x199ca3ff,
! 0x6b6b51f4, 0x1c6c6162, -0x7a9acf28, -0x0d9dffb2, 0x6c0695ed,
! 0x1b01a57b, -0x7df70b3f, -0x0af03ba9, 0x65b0d9c6, 0x12b7e950,
! -0x74414716, -0x03467784, 0x62dd1ddf, 0x15da2d49, -0x732c830d,
! -0x042bb39b, 0x4db26158, 0x3ab551ce, -0x5c43ff8c, -0x2b44cf1e,
! 0x4adfa541, 0x3dd895d7, -0x5b2e3b93, -0x2c290b05, 0x4369e96a,
! 0x346ed9fc, -0x529877ba, -0x259f4730, 0x44042d73, 0x33031de5,
! -0x55f5b3a1, -0x22f28337, 0x5005713c, 0x270241aa, -0x41f4eff0,
! -0x36f3df7a, 0x5768b525, 0x206f85b3, -0x46992bf7, -0x319e1b61,
! 0x5edef90e, 0x29d9c998, -0x4f2f67de, -0x3828574c, 0x59b33d17,
! 0x2eb40d81, -0x4842a3c5, -0x3f459353, -0x12477ce0, -0x65404c4a,
! 0x03b6e20c, 0x74b1d29a, -0x152ab8c7, -0x622d8851, 0x04db2615,
! 0x73dc1683, -0x1c9cf4ee, -0x6b9bc47c, 0x0d6d6a3e, 0x7a6a5aa8,
! -0x1bf130f5, -0x6cf60063, 0x0a00ae27, 0x7d079eb1, -0x0ff06cbc,
! -0x78f75c2e, 0x1e01f268, 0x6906c2fe, -0x089da8a3, -0x7f9a9835,
! 0x196c3671, 0x6e6b06e7, -0x012be48a, -0x762cd420, 0x10da7a5a,
! 0x67dd4acc, -0x06462091, -0x71411007, 0x17b7be43, 0x60b08ed5,
! -0x29295c18, -0x5e2e6c82, 0x38d8c2c4, 0x4fdff252, -0x2e44980f,
! -0x5943a899, 0x3fb506dd, 0x48b2364b, -0x27f2d426, -0x50f5e4b4,
! 0x36034af6, 0x41047a60, -0x209f103d, -0x579820ab, 0x316e8eef,
! 0x4669be79, -0x349e4c74, -0x43997ce6, 0x256fd2a0, 0x5268e236,
! -0x33f3886b, -0x44f4b8fd, 0x220216b9, 0x5505262f, -0x3a45c442,
! -0x4d42f4d8, 0x2bb45a92, 0x5cb36a04, -0x3d280059, -0x4a2f30cf,
! 0x2cd99e8b, 0x5bdeae1d, -0x649b3d50, -0x139c0dda, 0x756aa39c,
! 0x026d930a, -0x63f6f957, -0x14f1c9c1, 0x72076785, 0x05005713,
! -0x6a40b57e, -0x1d4785ec, 0x7bb12bae, 0x0cb61b38, -0x6d2d7165,
! -0x1a2a41f3, 0x7cdcefb7, 0x0bdbdf21, -0x792c2d2c, -0x0e2b1dbe,
! 0x68ddb3f8, 0x1fda836e, -0x7e41e933, -0x0946d9a5, 0x6fb077e1,
! 0x18b74777, -0x77f7a51a, -0x00f09590, 0x66063bca, 0x11010b5c,
! -0x709a6101, -0x079d5197, 0x616bffd3, 0x166ccf45, -0x5ff51d88,
! -0x28f22d12, 0x4e048354, 0x3903b3c2, -0x5898d99f, -0x2f9fe909,
! 0x4969474d, 0x3e6e77db, -0x512e95b6, -0x2629a524, 0x40df0b66,
! 0x37d83bf0, -0x564351ad, -0x2144613b, 0x47b2cf7f, 0x30b5ffe9,
! -0x42420de4, -0x35453d76, 0x53b39330, 0x24b4a3a6, -0x452fc9fb,
! -0x3228f96d, 0x54de5729, 0x23d967bf, -0x4c9985d2, -0x3b9eb548,
! 0x5d681b02, 0x2a6f2b94, -0x4bf441c9, -0x3cf3715f, 0x5a05df1b,
! 0x2d02ef8d);
! }
! 
! $crc = ~$crc;
! for ($i = 0; $i < strlen($str); $i++) {
! $crc = ( $zip_crc_table[($crc ^ ord($str[$i])) & 0xff]
! ^ (($crc >> 8) & 0xffffff) );
! }
! return ~$crc;
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1409
Modified Files:
	interwiki.php 
Log Message:
Added new local variables list; reformatted leading whitespace.
Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** interwiki.php	2001年09月18日 19:16:23	1.6
--- interwiki.php	2001年09月19日 02:36:24	1.7
***************
*** 3,20 ****
 function generate_interwikimap_and_regexp()
 {
! global $interwikimap_file, $InterWikiLinkRegexp, $interwikimap;
 
! $intermap_data = file(INTERWIKI_MAP_FILE, 1);
! $wikiname_regexp = "";
! for ($i=0; $i<count($intermap_data); $i++)
! {
! list( $wiki, $inter_url ) = split(' ', chop($intermap_data[$i]));
! $interwikimap[$wiki] = $inter_url;
! if ($wikiname_regexp)
! 	 $wikiname_regexp .= "|";
! $wikiname_regexp .= $wiki;
! }
 
! $InterWikiLinkRegexp = "($wikiname_regexp)";
 }
 
--- 3,20 ----
 function generate_interwikimap_and_regexp()
 {
! global $interwikimap_file, $InterWikiLinkRegexp, $interwikimap;
 
! $intermap_data = file(INTERWIKI_MAP_FILE, 1);
! $wikiname_regexp = "";
! for ($i=0; $i<count($intermap_data); $i++)
! {
! list( $wiki, $inter_url ) = split(' ', chop($intermap_data[$i]));
! $interwikimap[$wiki] = $inter_url;
! if ($wikiname_regexp)
! $wikiname_regexp .= "|";
! $wikiname_regexp .= $wiki;
! }
 
! $InterWikiLinkRegexp = "($wikiname_regexp)";
 }
 
***************
*** 23,51 ****
 function LinkInterWikiLink($link, $linktext='')
 {
! global $interwikimap;
 
! list( $wiki, $page ) = split( ":", $link, 2 );
 
! $url = $interwikimap[$wiki];
 
! // Urlencode page only if it's a query arg.
! if (strstr($url, '?'))
! $url .= rawurlencode($page);
! else
! $url .= $page;
! 
! if ($linktext) {
! $linktext = htmlspecialchars($linktext);
! $class = 'named-interwiki';
! }
! else {
! $linktext = ( htmlspecialchars("$wiki:")
! . QElement('span', array('class' => 'wikipage'), $page) );
! $class = 'interwiki';
! }
! 
! return Element('a', array('href' => $url,
! 			 'class' => $class),
! 		 $linktext);
 }
 
--- 23,51 ----
 function LinkInterWikiLink($link, $linktext='')
 {
! global $interwikimap;
 
! list( $wiki, $page ) = split( ":", $link, 2 );
 
! $url = $interwikimap[$wiki];
 
! // Urlencode page only if it's a query arg.
! if (strstr($url, '?'))
! $url .= rawurlencode($page);
! else
! $url .= $page;
! 
! if ($linktext) {
! $linktext = htmlspecialchars($linktext);
! $class = 'named-interwiki';
! }
! else {
! $linktext = ( htmlspecialchars("$wiki:")
! . QElement('span', array('class' => 'wikipage'), $page) );
! $class = 'interwiki';
! }
! 
! return Element('a', array('href' => $url,
! 'class' => $class),
! $linktext);
 }
 
***************
*** 54,60 ****
 function wtt_interwikilinks($match, &$trfrm)
 {
! if ($match[0] == "!")
! return htmlspecialchars(substr($match,1));
! return LinkInterWikiLink($match);
 }
 
--- 54,60 ----
 function wtt_interwikilinks($match, &$trfrm)
 {
! if ($match[0] == "!")
! return htmlspecialchars(substr($match,1));
! return LinkInterWikiLink($match);
 }
 
***************
*** 62,66 ****
 // Local Variables:
 // mode: php
! // c-file-style: "ellemtel"
! // End: 
 ?>
--- 62,70 ----
 // Local Variables:
 // mode: php
! // tab-width: 8
! // c-basic-offset: 4
! // c-hanging-comment-ender-p: nil
! // indent-tabs-mode: nil
! // End:
! 
 ?>

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32517
Modified Files:
	config.php 
Log Message:
Testing latest Local Variables setting. I stripped all leading white
space and then did an indent-region.
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** config.php	2001年09月18日 19:16:23	1.41
--- config.php	2001年09月19日 02:27:50	1.42
***************
*** 3,15 ****
 /*
 * NOTE: the settings here should probably not need to be changed.
! *
! *
! * (The user-configurable settings have been moved to index.php.)
! */
 
 if (!defined("LC_ALL")) {
! // Backward compatibility (for PHP < 4.0.5)
! define("LC_ALL", "LC_ALL");
! define("LC_CTYPE", "LC_CTYPE");
 }
 
--- 3,15 ----
 /*
 * NOTE: the settings here should probably not need to be changed.
! *
! *
! * (The user-configurable settings have been moved to index.php.)
! */
 
 if (!defined("LC_ALL")) {
! // Backward compatibility (for PHP < 4.0.5)
! define("LC_ALL", "LC_ALL");
! define("LC_CTYPE", "LC_CTYPE");
 }
 
***************
*** 27,52 ****
 function FindFile ($file, $missing_okay = false)
 {
! // FIXME: This wont work for DOS filenames.
! if (ereg('^/', $file))
! {
! // absolute path.
! if (file_exists($file))
! 	 return $file;
! }
! else
! {
! $include_path = ini_get('include_path');
! if (empty($include_path))
! 	 $include_path = '.';
! // FIXME: This wont work for DOS filenames.
! $path = explode(':', $include_path);
! while (list($i, $dir) = each ($path))
! 	 if (file_exists("$dir/$file"))
! 	 return "$dir/$file";
! }
! 
! if (!$missing_okay)
! ExitWiki("$file: file not found");
! return false;
 }
 
--- 27,52 ----
 function FindFile ($file, $missing_okay = false)
 {
! // FIXME: This wont work for DOS filenames.
! if (ereg('^/', $file))
! {
! // absolute path.
! if (file_exists($file))
! return $file;
! }
! else
! {
! $include_path = ini_get('include_path');
! if (empty($include_path))
! $include_path = '.';
! // FIXME: This wont work for DOS filenames.
! $path = explode(':', $include_path);
! while (list($i, $dir) = each ($path))
! if (file_exists("$dir/$file"))
! return "$dir/$file";
! }
! 
! if (!$missing_okay)
! ExitWiki("$file: file not found");
! return false;
 }
 
***************
*** 55,87 ****
 function FindLocalizedFile ($file, $missing_okay = false)
 {
! $language = $GLOBALS['LANG'];
! 
! if (empty($language))
! $language = getenv("LC_ALL");
! if (empty($language))
! $language = getenv("LC_MESSAGES");
! if (empty($language))
! $language = getenv("LC_RESPONSES"); // deprecated
! if (empty($language))
! $language = getenv("LANG");
! if (empty($language))
! $language = "C";
! 
! // FIXME: This wont work for DOS filenames.
! if (!ereg('^/', $file))
! {
! if ( ($path = FindFile("locale/$language/$file", 'missing_is_okay')) )
! 	 return $path;
! // A locale can be, e.g. de_DE.iso8859-1@euro.
! // Try less specific versions of the locale: 
! $seps = array('@', '.', '_');
! for ($i = 0; $i < count($seps); $i++)
! 	 if ( ($tail = strchr($language, $seps[$i])) ) {
! 	 $head = substr($language, 0, -strlen($tail));
! 	 if ( ($path = FindFile("locale/$head/$file", 'missing_is_okay')) )
! 	 return $path;
! 	 }
! }
! return FindFile($file, $missing_okay);
 }
 
--- 55,87 ----
 function FindLocalizedFile ($file, $missing_okay = false)
 {
! $language = $GLOBALS['LANG'];
! 
! if (empty($language))
! $language = getenv("LC_ALL");
! if (empty($language))
! $language = getenv("LC_MESSAGES");
! if (empty($language))
! $language = getenv("LC_RESPONSES"); // deprecated
! if (empty($language))
! $language = getenv("LANG");
! if (empty($language))
! $language = "C";
! 
! // FIXME: This wont work for DOS filenames.
! if (!ereg('^/', $file))
! {
! if ( ($path = FindFile("locale/$language/$file", 'missing_is_okay')) )
! return $path;
! // A locale can be, e.g. de_DE.iso8859-1@euro.
! // Try less specific versions of the locale: 
! $seps = array('@', '.', '_');
! for ($i = 0; $i < count($seps); $i++)
! if ( ($tail = strchr($language, $seps[$i])) ) {
! $head = substr($language, 0, -strlen($tail));
! if ( ($path = FindFile("locale/$head/$file", 'missing_is_okay')) )
! return $path;
! }
! }
! return FindFile($file, $missing_okay);
 }
 
***************
*** 92,114 ****
 if (!function_exists ('gettext'))
 {
! $locale = array();
 
! function gettext ($text) { 
! global $locale;
! if (!empty ($locale[$text]))
! 	 return $locale[$text];
! return $text;
! }
! 
! if ( ($lcfile = FindLocalizedFile("LC_MESSAGES/phpwiki.php", 'missing_ok')) )
! {
! include($lcfile);
! }
 }
 else
 {
! // Setup localisation
! bindtextdomain ("phpwiki", FindFile("locale"));
! textdomain ("phpwiki");
 }
 
--- 92,114 ----
 if (!function_exists ('gettext'))
 {
! $locale = array();
 
! function gettext ($text) { 
! global $locale;
! if (!empty ($locale[$text]))
! return $locale[$text];
! return $text;
! }
! 
! if ( ($lcfile = FindLocalizedFile("LC_MESSAGES/phpwiki.php", 'missing_ok')) )
! {
! include($lcfile);
! }
 }
 else
 {
! // Setup localisation
! bindtextdomain ("phpwiki", FindFile("locale"));
! textdomain ("phpwiki");
 }
 
***************
*** 134,183 ****
 // have a list of locales to try.
 if (setlocale(LC_CTYPE, 0) == 'C')
! setlocale(LC_CTYPE, 'en_US.iso-8859-1');
 
 /** string pcre_fix_posix_classes (string $regexp)
! *
! * Older version (pre 3.x?) of the PCRE library do not support
! * POSIX named character classes (e.g. [[:alnum:]]).
! *
! * This is a helper function which can be used to convert a regexp
! * which contains POSIX named character classes to one that doesn't.
! *
! * All instances of strings like '[:<class>:]' are replaced by the equivalent
! * enumerated character class.
! *
! * Implementation Notes:
! *
! * Currently we use hard-coded values which are valid only for
! * ISO-8859-1. Also, currently on the classes [:alpha:], [:alnum:],
! * [:upper:] and [:lower:] are implemented. (The missing classes:
! * [:blank:], [:cntrl:], [:digit:], [:graph:], [:print:], [:punct:],
! * [:space:], and [:xdigit:] could easily be added if needed.)
! *
! * This is a hack. I tried to generate these classes automatically
! * using ereg(), but discovered that in my PHP, at least, ereg() is
! * slightly broken w.r.t. POSIX character classes. (It includes
! * "\xaa" and "\xba" in [:alpha:].)
! *
! * So for now, this will do. --Jeff <da...@da...> 14 Mar, 2001
! */
 function pcre_fix_posix_classes ($regexp) {
! // First check to see if our PCRE lib supports POSIX character
! // classes. If it does, there's nothing to do.
! if (preg_match('/[[:upper:]]/', 'A'))
! 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);
 }
! 	 
 $WikiNameRegexp = pcre_fix_posix_classes($WikiNameRegexp);
 
--- 134,183 ----
 // have a list of locales to try.
 if (setlocale(LC_CTYPE, 0) == 'C')
! setlocale(LC_CTYPE, 'en_US.iso-8859-1');
 
 /** string pcre_fix_posix_classes (string $regexp)
! *
! * Older version (pre 3.x?) of the PCRE library do not support
! * POSIX named character classes (e.g. [[:alnum:]]).
! *
! * This is a helper function which can be used to convert a regexp
! * which contains POSIX named character classes to one that doesn't.
! *
! * All instances of strings like '[:<class>:]' are replaced by the equivalent
! * enumerated character class.
! *
! * Implementation Notes:
! *
! * Currently we use hard-coded values which are valid only for
! * ISO-8859-1. Also, currently on the classes [:alpha:], [:alnum:],
! * [:upper:] and [:lower:] are implemented. (The missing classes:
! * [:blank:], [:cntrl:], [:digit:], [:graph:], [:print:], [:punct:],
! * [:space:], and [:xdigit:] could easily be added if needed.)
! *
! * This is a hack. I tried to generate these classes automatically
! * using ereg(), but discovered that in my PHP, at least, ereg() is
! * slightly broken w.r.t. POSIX character classes. (It includes
! * "\xaa" and "\xba" in [:alpha:].)
! *
! * So for now, this will do. --Jeff <da...@da...> 14 Mar, 2001
! */
 function pcre_fix_posix_classes ($regexp) {
! // First check to see if our PCRE lib supports POSIX character
! // classes. If it does, there's nothing to do.
! if (preg_match('/[[:upper:]]/', 'A'))
! 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);
 }
! 
 $WikiNameRegexp = pcre_fix_posix_classes($WikiNameRegexp);
 
***************
*** 189,208 ****
 if (!defined('SCRIPT_NAME')) define('SCRIPT_NAME', $HTTP_SERVER_VARS['SCRIPT_NAME']);
 if (!defined('DATA_PATH'))
! define('DATA_PATH', dirname(SCRIPT_NAME));
! if (!defined('USE_PATH_INFO'))
 {
! /*
! * If SCRIPT_NAME does not look like php source file,
! * or user cgi we assume that php is getting run by an
! * action handler in /cgi-bin. In this case,
! * I think there is no way to get Apache to pass
! * useful PATH_INFO to the php script (PATH_INFO
! * is used to the the php interpreter where the
! * php script is...)
! */
! if (php_sapi_name() == 'apache')
! define('USE_PATH_INFO', true);
! else
! define('USE_PATH_INFO', ereg('\.(php3?|cgi)$', $SCRIPT_NAME));
 }
 
--- 189,208 ----
 if (!defined('SCRIPT_NAME')) define('SCRIPT_NAME', $HTTP_SERVER_VARS['SCRIPT_NAME']);
 if (!defined('DATA_PATH'))
! define('DATA_PATH', dirname(SCRIPT_NAME));
! if (!defined('USE_PATH_INFO'))
 {
! /*
! * If SCRIPT_NAME does not look like php source file,
! * or user cgi we assume that php is getting run by an
! * action handler in /cgi-bin. In this case,
! * I think there is no way to get Apache to pass
! * useful PATH_INFO to the php script (PATH_INFO
! * is used to the the php interpreter where the
! * php script is...)
! */
! if (php_sapi_name() == 'apache')
! define('USE_PATH_INFO', true);
! else
! define('USE_PATH_INFO', ereg('\.(php3?|cgi)$', $SCRIPT_NAME));
 }
 
***************
*** 210,277 ****
 function IsProbablyRedirectToIndex () 
 {
! // This might be a redirect to the DirectoryIndex,
! // e.g. REQUEST_URI = /dir/ got redirected
! // to SCRIPT_NAME = /dir/index.php
! 
! // In this case, the proper virtual path is still
! // $SCRIPT_NAME, since pages appear at
! // e.g. /dir/index.php/HomePage.
! 
! //global $REQUEST_URI, $SCRIPT_NAME;
! extract($GLOBALS['HTTP_SERVER_VARS']);
! 
! $requri = preg_quote($REQUEST_URI, '%');
! return preg_match("%^${requri}[^/]*$%", $SCRIPT_NAME);
 }
 
- 
 if (!defined('VIRTUAL_PATH'))
 {
! // We'd like to auto-detect when the cases where apaches
! // 'Action' directive (or similar means) is used to
! // redirect page requests to a cgi-handler.
! //
! // In cases like this, requests for e.g. /wiki/HomePage
! // get redirected to a cgi-script called, say,
! // /path/to/wiki/index.php. The script gets all
! // of /wiki/HomePage as it's PATH_INFO.
! //
! // The problem is:
! // How to detect when this has happened reliably?
! // How to pick out the "virtual path" (in this case '/wiki')?
! //
! // (Another time an redirect might occur is to a DirectoryIndex
! // -- the requested URI is '/wikidir/', the request gets
! // passed to '/wikidir/index.php'. In this case, the
! // proper VIRTUAL_PATH is '/wikidir/index.php', since the
! // pages will appear at e.g. '/wikidir/index.php/HomePage'.
! //
! 
! $REDIRECT_URL = &$HTTP_SERVER_VARS['REDIRECT_URL'];
! if (USE_PATH_INFO and isset($REDIRECT_URL)
! and ! IsProbablyRedirectToIndex())
! {
! // FIXME: This is a hack, and won't work if the requested
! // pagename has a slash in it.
! define('VIRTUAL_PATH', dirname($REDIRECT_URL . 'x'));
! }
! else
! define('VIRTUAL_PATH', SCRIPT_NAME);
 }
 
 if (SERVER_PORT && SERVER_PORT != 80)
! define('SERVER_URL',
! 	 "http://" . SERVER_NAME . ':' . SERVER_PORT);
! else
! define('SERVER_URL',
! 	 "http://" . SERVER_NAME);
 
 if (VIRTUAL_PATH != SCRIPT_NAME)
 {
! // Apache action handlers are used.
! define('PATH_INFO_PREFIX', VIRTUAL_PATH . "/");
 }
 else
! define("PATH_INFO_PREFIX", '/');
 
 
--- 210,277 ----
 function IsProbablyRedirectToIndex () 
 {
! // This might be a redirect to the DirectoryIndex,
! // e.g. REQUEST_URI = /dir/ got redirected
! // to SCRIPT_NAME = /dir/index.php
! 
! // In this case, the proper virtual path is still
! // $SCRIPT_NAME, since pages appear at
! // e.g. /dir/index.php/HomePage.
! 
! //global $REQUEST_URI, $SCRIPT_NAME;
! extract($GLOBALS['HTTP_SERVER_VARS']);
! 
! $requri = preg_quote($REQUEST_URI, '%');
! return preg_match("%^${requri}[^/]*$%", $SCRIPT_NAME);
 }
+ 
 
 if (!defined('VIRTUAL_PATH'))
 {
! // We'd like to auto-detect when the cases where apaches
! // 'Action' directive (or similar means) is used to
! // redirect page requests to a cgi-handler.
! //
! // In cases like this, requests for e.g. /wiki/HomePage
! // get redirected to a cgi-script called, say,
! // /path/to/wiki/index.php. The script gets all
! // of /wiki/HomePage as it's PATH_INFO.
! //
! // The problem is:
! // How to detect when this has happened reliably?
! // How to pick out the "virtual path" (in this case '/wiki')?
! //
! // (Another time an redirect might occur is to a DirectoryIndex
! // -- the requested URI is '/wikidir/', the request gets
! // passed to '/wikidir/index.php'. In this case, the
! // proper VIRTUAL_PATH is '/wikidir/index.php', since the
! // pages will appear at e.g. '/wikidir/index.php/HomePage'.
! //
! 
! $REDIRECT_URL = &$HTTP_SERVER_VARS['REDIRECT_URL'];
! if (USE_PATH_INFO and isset($REDIRECT_URL)
! and ! IsProbablyRedirectToIndex())
! {
! // FIXME: This is a hack, and won't work if the requested
! // pagename has a slash in it.
! define('VIRTUAL_PATH', dirname($REDIRECT_URL . 'x'));
! }
! else
! define('VIRTUAL_PATH', SCRIPT_NAME);
 }
 
 if (SERVER_PORT && SERVER_PORT != 80)
! define('SERVER_URL',
! "http://" . SERVER_NAME . ':' . SERVER_PORT);
! else
! define('SERVER_URL',
! "http://" . SERVER_NAME);
 
 if (VIRTUAL_PATH != SCRIPT_NAME)
 {
! // Apache action handlers are used.
! define('PATH_INFO_PREFIX', VIRTUAL_PATH . "/");
 }
 else
! define("PATH_INFO_PREFIX", '/');
 
 
***************
*** 281,285 ****
 if (empty($DBParams['dbtype']))
 {
! $DBParams['dbtype'] = 'dba';
 }
 
--- 281,285 ----
 if (empty($DBParams['dbtype']))
 {
! $DBParams['dbtype'] = 'dba';
 }
 
***************
*** 288,292 ****
 if (defined('INTERWIKI_MAP_FILE'))
 {
! include ('lib/interwiki.php');
 }
 
--- 288,292 ----
 if (defined('INTERWIKI_MAP_FILE'))
 {
! include ('lib/interwiki.php');
 }
 
***************
*** 294,309 ****
 // Access log
 if (!defined('ACCESS_LOG'))
! define('ACCESS_LOG', '');
 
 // FIXME: delete
 // Get remote host name, if apache hasn't done it for us
 if (empty($HTTP_SERVER_VARS['REMOTE_HOST']) && ENABLE_REVERSE_DNS)
! $HTTP_SERVER_VARS['REMOTE_HOST'] = gethostbyaddr($HTTP_SERVER_VARS['REMOTE_ADDR']);
 
- 
 // For emacs users
 // Local Variables:
 // mode: php
! // c-file-style: "ellemtel"
! // End: 
 ?>
--- 294,314 ----
 // Access log
 if (!defined('ACCESS_LOG'))
! define('ACCESS_LOG', '');
 
 // FIXME: delete
 // Get remote host name, if apache hasn't done it for us
 if (empty($HTTP_SERVER_VARS['REMOTE_HOST']) && ENABLE_REVERSE_DNS)
! $HTTP_SERVER_VARS['REMOTE_HOST'] = gethostbyaddr($HTTP_SERVER_VARS['REMOTE_ADDR']);
! 
 
 // For emacs users
 // Local Variables:
 // mode: php
! // tab-width: 8
! // c-basic-offset: 4
! // c-hanging-comment-ender-p: nil
! // indent-tabs-mode: nil
! // End:
! 
! 
 ?>

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv6202
Modified Files:
	INSTALL 
Log Message:
Updated info for posting patches, bugs and getting support.
Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** INSTALL	2001年09月18日 21:20:30	1.10
--- INSTALL	2001年09月18日 21:26:31	1.11
***************
*** 76,82 ****
 It reportedly works on Windows with Apache+PHP, which amazes me. 
 
! That should be all. Send patches, bugs etc. to:
 
 php...@li...
 
 FIN
--- 76,93 ----
 It reportedly works on Windows with Apache+PHP, which amazes me. 
 
! 4. PATCHES
 
+ Post patches to http://sourceforge.net/tracker/?func=add&group_id=6121&atid=306121
+ 
+ 5. BUGS
+ 
+ Post bugs to http://sourceforge.net/tracker/?func=add&group_id=6121&atid=106121
+ 
+ 6. SUPPORT
+ 
+ For support from the PhpWiki team and user community post to
 php...@li...
+ 
+ You can join this list at http://lists.sourceforge.net/lists/listinfo/phpwiki-talk
 
 FIN

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv4801
Modified Files:
	INSTALL 
Log Message:
Added a CVS id tag.
Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** INSTALL	2001年09月18日 19:16:23	1.9
--- INSTALL	2001年09月18日 21:20:30	1.10
***************
*** 81,82 ****
--- 81,84 ----
 
 FIN
+ 
+ $Id$
\ No newline at end of file