phpwiki-checkins Mailing List for PhpWiki

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv1029/templates
Modified Files:
	browse.html 
Log Message:
Added support for bogo-logins.
One can now "login" using any WikiWord as a user ID.
(Unless logging in as the admin user, any password will work.)
Currently, the sole effect of logging in is that the
the logged-in user ID is recorded as the author of any
page edits. Thus, "logging in" allows one to control
the author which appears in RecentChanges and the page
info display.
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** browse.html	2001年06月26日 18:13:00	1.18
--- browse.html	2001年07月20日 17:40:12	1.19
***************
*** 16,19 ****
--- 16,20 ----
 href="###ACTION###search&searchtype=full&searchterm=###PAGEURL###"
 ><span class='wikiword'>###PAGE###</span></a></h1>
+ 
 ###IF:!ANONYMOUS###
 <p>You are logged in as <em>###USERID###</em>.
***************
*** 27,30 ****
--- 28,38 ----
 <hr noshade>
 ###ENDIF:!ANONYMOUS###
+ 
+ ###IF:ANONYMOUS###
+ If you would like to, you may 
+ <a class="wikiaction" href="###ACTION###login">log in</a>
+ (use any WikiWord as a user ID, any password.)</p>
+ ###ENDIF:ANONYMOUS###
+ 
 <table class="outer" width="100%" cellspacing=2 border=0>
 <tr><td><table class="inner" width="100%" border=0 cellspacing=0 cellpadding=5>

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1029/lib
Modified Files:
	userauth.php 
Log Message:
Added support for bogo-logins.
One can now "login" using any WikiWord as a user ID.
(Unless logging in as the admin user, any password will work.)
Currently, the sole effect of logging in is that the
the logged-in user ID is recorded as the author of any
page edits. Thus, "logging in" allows one to control
the author which appears in RecentChanges and the page
info display.
Index: userauth.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/userauth.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** userauth.php	2001年05月31日 17:43:05	1.6
--- userauth.php	2001年07月20日 17:40:12	1.7
***************
*** 137,146 ****
 function _get_http_authenticated_userid () {
 global $PHP_AUTH_USER, $PHP_AUTH_PW;
! 
! if (empty($PHP_AUTH_USER) || empty($PHP_AUTH_PW))
 	 return false;
 
! if (($PHP_AUTH_USER != ADMIN_USER) || ($PHP_AUTH_PW != ADMIN_PASSWD))
 	 return false;
 	 
 return $PHP_AUTH_USER;
--- 137,155 ----
 function _get_http_authenticated_userid () {
 global $PHP_AUTH_USER, $PHP_AUTH_PW;
! global $WikiNameRegexp;
! 
! if (empty($PHP_AUTH_USER))
 	 return false;
 
! if ($PHP_AUTH_USER == ADMIN_USER) {
! 	 if (empty($PHP_AUTH_PW) || $PHP_AUTH_PW != ADMIN_PASSWD)
! 	 return false;
! }
! else if (! ALLOW_BOGO_LOGIN) {
! 	 return false;
! }
! else if (! preg_match('/\A' . $WikiNameRegexp . '\z/', $PHP_AUTH_USER)) { 	
 	 return false;
+ }
 	 
 return $PHP_AUTH_USER;
***************
*** 164,168 ****
 if (ACCESS_LOG)
 	 $LogEntry->status = 401;
! echo gettext ("You entered an invalid login or password.");
 ExitWiki();
 }
--- 173,183 ----
 if (ACCESS_LOG)
 	 $LogEntry->status = 401;
! echo "<p>" . gettext ("You entered an invalid login or password.") . "\n";
! if (ALLOW_BOGO_LOGIN) {
! 	 echo "<p>";
! 	 echo gettext ("You can log in using any valid WikiWord as a user ID.") . "\n";
! 	 echo gettext ("(Any password will work, except, of course for the admin user.)") . "\n";
! }
! 
 ExitWiki();
 }

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv1029
Modified Files:
	index.php 
Log Message:
Added support for bogo-logins.
One can now "login" using any WikiWord as a user ID.
(Unless logging in as the admin user, any password will work.)
Currently, the sole effect of logging in is that the
the logged-in user ID is recorded as the author of any
page edits. Thus, "logging in" allows one to control
the author which appears in RecentChanges and the page
info display.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** index.php	2001年07月12日 03:49:05	1.19
--- index.php	2001年07月20日 17:40:12	1.20
***************
*** 61,64 ****
--- 61,70 ----
 define('ACCESS_LOG', '/tmp/wiki_access_log');
 
+ 
+ // If ALLOW_BOGO_LOGIN is true, users are allowed to login
+ // (with any/no password) using any userid which: 1) is not
+ // the ADMIN_USER, 2) is a valid WikiWord (matches $WikiNameRegexp.)
+ define('ALLOW_BOGO_LOGIN', true);
+ 
 /////////////////////////////////////////////////////////////////////
 //

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31972
Added Files:
	PhpWikiDatabase.php 
Log Message:
Initial file for an abstract base class. For now I copy/pasted the
methods suggested in WikiDatabase
(http://phpwiki.sourceforge.net/phpwiki/index.php) as a starting
point, though there were a few that were undecided and I left those
out.
At least for now the class can support retrievePage() and insertPage()
and a few other basic methods, so rudimentary work can start.
The flowerbox reads:
/* 
 * Abstract base class for the database used by PhpWiki.
 * This should be extended by classes for DB/dbx, dba and 
 * flat file.
 */
***** Error reading new file: [Errno 2] No such file or directory: 'PhpWikiDatabase.php'

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv27676/schemas
Modified Files:
	schema.psql 
Log Message:
Changed PostgreSQL db library and schema to work with versioning, maybe.
Index: schema.psql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/schema.psql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** schema.psql	2001年07月12日 03:25:11	1.7
--- schema.psql	2001年07月18日 04:59:47	1.8
***************
*** 29,33 ****
 content TEXT NOT NULL,
 refs TEXT, 
! PRIMARY KEY (pagename)
 );
 
--- 29,33 ----
 content TEXT NOT NULL,
 refs TEXT, 
! PRIMARY KEY (pagename, version)
 );
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27676/lib
Modified Files:
	pgsql.php 
Log Message:
Changed PostgreSQL db library and schema to work with versioning, maybe.
Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/pgsql.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pgsql.php	2001年07月15日 16:03:26	1.7
--- pgsql.php	2001年07月18日 04:59:47	1.8
***************
*** 7,15 ****
 OpenDataBase($table)
 CloseDataBase($dbi)
! RetrievePage($dbi, $pagename, $pagestore)
! InsertPage($dbi, $pagename, $pagehash)
! SaveCopyToArchive($dbi, $pagename, $pagehash) 
 IsWikiPage($dbi, $pagename)
 IsInArchive($dbi, $pagename)
 InitTitleSearch($dbi, $search)
 TitleSearchNextMatch($dbi, $res)
--- 7,20 ----
 OpenDataBase($table)
 CloseDataBase($dbi)
! RetrievePage($dbi, $pagename, $pagestore, $version)
! RetrievePageVersions($dbi, $pagename, $curstore, $archstore)
! GetMaxVersionNumber($dbi, $pagename, $pagestore)
! InsertPage($dbi, $pagename, $pagehash, $clobber)
! SelectStore($dbi, $pagename, $version, $curstore, $archstore)
! IsVersionInWiki($dbi, $pagename, $version)
! IsVersionInArchive($dbi, $pagename, $version)
 IsWikiPage($dbi, $pagename)
 IsInArchive($dbi, $pagename)
+ RemovePage($dbi, $pagename)
 InitTitleSearch($dbi, $search)
 TitleSearchNextMatch($dbi, $res)
***************
*** 65,71 ****
 
 // Return hash of page + attributes or default
! function RetrievePage($dbi, $pagename, $pagestore) {
 $pagename = addslashes($pagename);
! $query = "select * from $pagestore where pagename='$pagename'";
 // echo "<p>$query<p>";
 $res = pg_exec($dbi['dbc'], $query);
--- 70,77 ----
 
 // Return hash of page + attributes or default
! function RetrievePage($dbi, $pagename, $pagestore, $version) {
 $pagename = addslashes($pagename);
! $version = $version ? " and version=$version" : '';
! $query = "select * from $pagestore where pagename='$pagename'$version";
 // echo "<p>$query<p>";
 $res = pg_exec($dbi['dbc'], $query);
***************
*** 95,100 ****
 
 
 // Either insert or replace a key/value (a page)
! function InsertPage($dbi, $pagename, $pagehash) {
 $pagename = addslashes($pagename);
 
--- 101,145 ----
 
 
+ // Return all versions of a page as an array of page hashes
+ function RetrievePageVersions($dbi, $pagename, $curstore, $archstore) {
+ $pagename = addslashes($pagename);
+ if (($page[0] = RetrievePage($dbi, $pagename, $curstore, 0)) != -1) {
+ $res = pg_exec($dbi['dbc'], "select * from $archstore where pagename='$pagename' order by version desc");
+ if (pg_numrows($res)) {
+ while ($array = pg_fetch_array($res, 0)) {
+ while (list($key, $val) = each($array)) {
+ if (gettype($key) == "integer") {
+ continue;
+ }
+ $dbhash[$key] = $val;
+ }
+ 
+ $dbhash['refs'] = unserialize($dbhash['refs']);
+ $dbhash['content'] = explode("\n", $dbhash['content']);
+ 
+ array_push($page, $dbhash);
+ }
+ 
+ return $page;
+ }
+ }
+ 
+ // if we reach this the query failed
+ return -1;
+ }
+ 
+ 
+ // Get maximum version number of a page in pagestore
+ function GetMaxVersionNumber($dbi, $pagename, $pagestore) {
+ $pagename = addslashes($pagename);
+ if ($res = pg_exec($dbi['dbc'], "select max(version) from $pagestore where pagename='$pagename'")) {
+ return pg_result($res, 0, "version");
+ }
+ return -1;
+ }
+ 
+ 
 // Either insert or replace a key/value (a page)
! function InsertPage($dbi, $pagename, $pagehash, $clobber) {
 $pagename = addslashes($pagename);
 
***************
*** 123,240 ****
 // record the time of modification
 $pagehash["lastmodified"] = time();
- 
 
! if (IsWikiPage($dbi, $pagename)) {
 
! $PAIRS = "author='$pagehash[author]'," .
! "content='$pagehash[content]'," .
! "created=$pagehash[created]," .
! "flags=$pagehash[flags]," .
! "lastmodified=$pagehash[lastmodified]," .
! "pagename='$pagehash[pagename]'," .
! "refs='$pagehash[refs]'," .
! "version=$pagehash[version]";
 
! $query = "UPDATE $dbi[table] SET $PAIRS WHERE pagename='$pagename'";
! 
! } else {
! // do an insert
! // build up the column names and values for the query
! 
! $COLUMNS = "author, content, created, flags, " .
! "lastmodified, pagename, refs, version";
 
! $VALUES = "'$pagehash[author]', '$pagehash[content]', " .
! "$pagehash[created], $pagehash[flags], " .
! "$pagehash[lastmodified], '$pagehash[pagename]', " .
! "'$pagehash[refs]', $pagehash[version]";
 
 
! $query = "INSERT INTO $dbi[table] ($COLUMNS) VALUES($VALUES)";
 }
 
- // echo "<p>Query: $query<p>\n";
- $retval = pg_exec($dbi['dbc'], $query);
- if ($retval == false) 
- echo "Insert/update failed: " . pg_errormessage($dbi['dbc']);
 
 }
 
 
! function SaveCopyToArchive($dbi, $pagename, $pagehash) {
 global $ArchivePageStore;
- // echo "<p>save copy called<p>";
 
 $pagename = addslashes($pagename);
! // echo "<p>dbi in SaveCopyToArchive: '$dbi' '$ArchivePageStore' '$dbi[dbc]'<p>";
! 
! // prepare the content for storage
! if (!isset($pagehash["pagename"]))
! $pagehash["pagename"] = $pagename;
! if (!isset($pagehash["flags"]))
! $pagehash["flags"] = 0;
! $pagehash["author"] = addslashes($pagehash["author"]);
! $pagehash["content"] = implode("\n", $pagehash["content"]);
! $pagehash["content"] = addslashes($pagehash["content"]);
! $pagehash["pagename"] = addslashes($pagehash["pagename"]);
! $pagehash["refs"] = serialize($pagehash["refs"]);
! 
! if (IsInArchive($dbi, $pagename)) {
! 
! $PAIRS = "author='$pagehash[author]'," .
! "content='$pagehash[content]'," .
! "created=$pagehash[created]," .
! "flags=$pagehash[flags]," .
! "lastmodified=$pagehash[lastmodified]," .
! "pagename='$pagehash[pagename]'," .
! "refs='$pagehash[refs]'," .
! "version=$pagehash[version]";
! 
! $query = "UPDATE $ArchivePageStore SET $PAIRS WHERE pagename='$pagename'";
 
- } else {
- // do an insert
- // build up the column names and values for the query
 
! $COLUMNS = "author, content, created, flags, " .
! "lastmodified, pagename, refs, version";
 
- $VALUES = "'$pagehash[author]', '$pagehash[content]', " .
- "$pagehash[created], $pagehash[flags], " .
- "$pagehash[lastmodified], '$pagehash[pagename]', " .
- "'$pagehash[refs]', $pagehash[version]";
 
 
! $query = "INSERT INTO $ArchivePageStore ($COLUMNS) VALUES($VALUES)";
 }
 
- // echo "<p>Query: $query<p>\n";
- $retval = pg_exec($dbi['dbc'], $query);
- if ($retval == false) 
- echo "Insert/update failed: " . pg_errormessage($dbi['dbc']);
 
 
! }
 
 
! function IsWikiPage($dbi, $pagename) {
! global $WikiPageStore; 	
! $pagename = addslashes($pagename);
! $query = "select count(*) from $WikiPageStore " .
! "where pagename='$pagename'";
! $res = pg_exec($query);
! $array = pg_fetch_array($res, 0);
! return $array[0];
! }
 
 
! function IsInArchive($dbi, $pagename) {
! 	 global $ArchivePageStore;
! $pagename = addslashes($pagename);
! $query = "select count(*) from $ArchivePageStore " .
! "where pagename='$pagename'";
! $res = pg_exec($query);
! $array = pg_fetch_array($res, 0);
! return $array[0];
 }
 
--- 168,275 ----
 // record the time of modification
 $pagehash["lastmodified"] = time();
 
! // Clobber existing page?
! $clobber = $clobber ? 'replace' : 'insert';
 
! $COLUMNS = "author, content, created, flags, " .
! "lastmodified, pagename, refs, version";
 
! $VALUES = "'$pagehash[author]', '$pagehash[content]', " .
! "$pagehash[created], $pagehash[flags], " .
! "$pagehash[lastmodified], '$pagehash[pagename]', " .
! "'$pagehash[refs]', $pagehash[version]";
! 
! if (!pg_exec($dbi['dbc'], "$clobber into $dbi[table] ($COLUMNS) values ($VALUES)")) {
! $msg = htmlspecialchars(sprintf(gettext("Error writing page '%s'"), $pagename));
! $msg .= "<BR>";
! $msg .= htmlspecialchars(sprintf(gettext("PostgreSQL error: %s"), pg_errormessage($dbi['dbc'])));
! ExitWiki($msg);
! }
! }
 
! 
! // Adds a page to the archive pagestore
! function SavePageToArchive($pagename, $pagehash) {
! global $ArchivePageStore;
! $dbi = OpenDataBase($ArchivePageStore);
! InsertPage($dbi, $pagename, $pagehash, false);
! } 
 
 
! // Returns store where version of page resides
! function SelectStore($dbi, $pagename, $version, $curstore, $archstore) {
! if ($version) {
! if (IsVersionInWiki($dbi, $pagename, $version)) return $curstore;
! elseif (IsVersionInArchive($dbi, $pagename, $version)) return $archstore;
! else return -1;
 }
+ elseif (IsWikiPage($dbi, $pagename)) return $curstore;
+ else return -1;
+ }
 
 
+ function IsVersionInWiki($dbi, $pagename, $version) {
+ $pagename = addslashes($pagename);
+ if ($res = pg_exec($dbi['dbc'], "select count(*) from $dbi[table] where pagename='$pagename' and version='$version'")) {
+ return pg_result($res, 0, "count");
+ }
+ return 0;
 }
 
 
! function IsVersionInArchive($dbi, $pagename, $version) {
 global $ArchivePageStore;
 
 $pagename = addslashes($pagename);
! if ($res = pg_exec($dbi['dbc'], "select count(*) from $ArchivePageStore where pagename='$pagename' and version='$version'")) {
! return pg_result($res, 0, "count");
! }
! return 0;
! }
 
 
! function IsWikiPage($dbi, $pagename) {
! $pagename = addslashes($pagename);
! if ($res = pg_exec($dbi['dbc'], "select count(*) from $dbi[table] where pagename='$pagename'")) {
! return pg_result($res, 0, "count");
! }
! return 0;
! }
 
 
+ function IsInArchive($dbi, $pagename) {
+ global $ArchivePageStore;
 
! $pagename = addslashes($pagename);
! if ($res = pg_exec($dbi['dbc'], "select count(*) from $ArchivePageStore where pagename='$pagename'")) {
! return pg_result($res, 0, "count");
 }
+ return 0;
+ }
 
 
+ function RemovePage($dbi, $pagename) {
+ global $WikiPageStore, $ArchivePageStore;
+ global $WikiLinksStore, $HitCountStore, $WikiScoreStore;
 
! $pagename = addslashes($pagename);
! $msg = gettext ("Cannot delete '%s' from table '%s'");
! $msg .= "<br>\n";
! $msg .= gettext ("PostgreSQL error: %s");
 
+ if (!pg_exec($dbi['dbc'], "delete from $WikiPageStore where pagename='$pagename'"))
+ ExitWiki(sprintf($msg, $pagename, $WikiPageStore, pg_errormessage()));
 
! if (!pg_exec($dbi['dbc'], "delete from $ArchivePageStore where pagename='$pagename'"))
! ExitWiki(sprintf($msg, $pagename, $ArchivePageStore, pg_errormessage()));
 
+ if (!pg_exec($dbi['dbc'], "delete from $WikiLinksStore where frompage='$pagename'"))
+ ExitWiki(sprintf($msg, $pagename, $WikiLinksStore, pg_errormessage()));
 
! if (!pg_exec($dbi['dbc'], "delete from $HitCountStore where pagename='$pagename'"))
! ExitWiki(sprintf($msg, $pagename, $HitCountStore, pg_errormessage()));
! 
! if (!pg_exec($dbi['dbc'], "delete from $WikiScoreStore where pagename='$pagename'"))
! ExitWiki(sprintf($msg, $pagename, $WikiScoreStore, mysql_error()));
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27143
Modified Files:
	mysql.php 
Log Message:
More cosmetic changes... wow did I not follow formating conventions the
first time around.
Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/mysql.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** mysql.php	2001年07月18日 01:06:29	1.15
--- mysql.php	2001年07月18日 04:56:14	1.16
***************
*** 113,116 ****
--- 113,118 ----
 }
 }
+ 
+ // if we reach this the query failed
 return -1;
 }
***************
*** 188,202 ****
 	// Returns store where version of page resides
 	function SelectStore($dbi, $pagename, $version, $curstore, $archstore) {
! if ($version) {
! if (IsVersionInWiki($dbi, $pagename, $version)) return $curstore;
! elseif (IsVersionInArchive($dbi, $pagename, $version)) return $archstore;
! else return -1; 
! }
! elseif (IsWikiPage($dbi, $pagename)) return $curstore;
! else return -1;	
! }
 
 
! function IsVersionInWiki($dbi, $pagename, $version) {
 $pagename = addslashes($pagename);
 if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename' and version='$version'", $dbi['dbc'])) {
--- 190,204 ----
 	// Returns store where version of page resides
 	function SelectStore($dbi, $pagename, $version, $curstore, $archstore) {
! if ($version) {
! if (IsVersionInWiki($dbi, $pagename, $version)) return $curstore;
! elseif (IsVersionInArchive($dbi, $pagename, $version)) return $archstore;
! else return -1; 
! }
! elseif (IsWikiPage($dbi, $pagename)) return $curstore;
! else return -1;	
! }
 
 
! function IsVersionInWiki($dbi, $pagename, $version) {
 $pagename = addslashes($pagename);
 if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename' and version='$version'", $dbi['dbc'])) {
***************
*** 220,224 ****
 $pagename = addslashes($pagename);
 if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename'", $dbi['dbc'])) {
! return(mysql_result($res, 0));
 }
 return 0;
--- 222,226 ----
 $pagename = addslashes($pagename);
 if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename'", $dbi['dbc'])) {
! return mysql_result($res, 0);
 }
 return 0;
***************
*** 230,234 ****
 $pagename = addslashes($pagename);
 if ($res = mysql_query("select count(*) from $ArchivePageStore where pagename='$pagename'", $dbi['dbc'])) {
! return(mysql_result($res, 0));
 }
 return 0;
--- 232,236 ----
 $pagename = addslashes($pagename);
 if ($res = mysql_query("select count(*) from $ArchivePageStore where pagename='$pagename'", $dbi['dbc'])) {
! return mysql_result($res, 0);
 }
 return 0;

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv26047
Modified Files:
	mysql.php 
Log Message:
Minor cosmetic changes (removed some hard tabs).
Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/mysql.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** mysql.php	2001年07月15日 15:47:59	1.14
--- mysql.php	2001年07月18日 01:06:29	1.15
***************
*** 8,19 ****
 MakePageHash($dbhash)
 RetrievePage($dbi, $pagename, $pagestore, $version)
! 		RetrievePageVersions($dbi, $pagename, $curstore, $archstore)
! 		GetMaxVersionNumber($dbi, $pagename, $pagestore)
 InsertPage($dbi, $pagename, $pagehash, $clobber)
! 		ReplaceCurrentPage($pagename, $pagehash)
 SavePageToArchive($pagename, $pagehash)
! 		SelectStore($dbi, $pagename, $version, $curstore, $archstore)
! 		IsVersionInWiki($dbi, $pagename, $version)
! 		IsVersionInArchive($dbi, $pagename, $version)
 IsWikiPage($dbi, $pagename)
 IsInArchive($dbi, $pagename)
--- 8,19 ----
 MakePageHash($dbhash)
 RetrievePage($dbi, $pagename, $pagestore, $version)
! RetrievePageVersions($dbi, $pagename, $curstore, $archstore)
! GetMaxVersionNumber($dbi, $pagename, $pagestore)
 InsertPage($dbi, $pagename, $pagehash, $clobber)
! ReplaceCurrentPage($pagename, $pagehash)
 SavePageToArchive($pagename, $pagehash)
! SelectStore($dbi, $pagename, $version, $curstore, $archstore)
! IsVersionInWiki($dbi, $pagename, $version)
! IsVersionInArchive($dbi, $pagename, $version)
 IsWikiPage($dbi, $pagename)
 IsInArchive($dbi, $pagename)
***************
*** 106,110 ****
 $pagename = addslashes($pagename);
 
! 		$version = $version ? " and version=$version" : '';
 
 if ($res = mysql_query("select * from $pagestore where pagename='$pagename'$version", $dbi['dbc'])) {
--- 106,110 ----
 $pagename = addslashes($pagename);
 
! $version = $version ? " and version=$version" : '';
 
 if ($res = mysql_query("select * from $pagestore where pagename='$pagename'$version", $dbi['dbc'])) {
***************
*** 119,143 ****
 	// Return all versions of a page as an array of page hashes
 	function RetrievePageVersions($dbi, $pagename, $curstore, $archstore) {
! 		$pagename = addslashes($pagename);
! 		if (($page[0] = RetrievePage($dbi, $pagename, $curstore, 0)) != -1) {
! 			if ($res = mysql_query("select * from $archstore where pagename='$pagename' order by version desc", $dbi['dbc'])) {
! 				while ($dbhash = mysql_fetch_array($res)) {
! 					array_push($page, MakePageHash($dbhash));
! 				}
! 				return $page;
! 			}
! 		}
! 		return -1;
! 	}
 
 
 	// Get maximum version number of a page in pagestore
! 	function GetMaxVersionNumber($dbi, $pagename, $pagestore) {
! 		$pagename = addslashes($pagename);
! 		if ($res = mysql_query("select max(version) from $pagestore where pagename='$pagename'", $dbi['dbc'])) {
! 			return mysql_result($res, 0);
! 		}
! 		return -1;
! 	}
 
 
--- 119,143 ----
 	// Return all versions of a page as an array of page hashes
 	function RetrievePageVersions($dbi, $pagename, $curstore, $archstore) {
! $pagename = addslashes($pagename);
! if (($page[0] = RetrievePage($dbi, $pagename, $curstore, 0)) != -1) {
! if ($res = mysql_query("select * from $archstore where pagename='$pagename' order by version desc", $dbi['dbc'])) {
! while ($dbhash = mysql_fetch_array($res)) {
! array_push($page, MakePageHash($dbhash));
! }
! return $page;
! }
! }
! return -1;
! }
 
 
 	// Get maximum version number of a page in pagestore
! function GetMaxVersionNumber($dbi, $pagename, $pagestore) {
! $pagename = addslashes($pagename);
! if ($res = mysql_query("select max(version) from $pagestore where pagename='$pagename'", $dbi['dbc'])) {
! return mysql_result($res, 0);
! }
! return -1;
! }
 
 
***************
*** 168,202 ****
 
 
! 	// Adds to or replaces a page in the current pagestore
! 	function ReplaceCurrentPage($pagename, $pagehash) {
! 		global $WikiPageStore;
! 		$dbi = OpenDataBase($WikiPageStore);
! 		$linklist = ExtractWikiPageLinks($pagehash['content']);
! 		SetWikiPageLinks($dbi, $pagename, $linklist);
! 		InsertPage($dbi, $pagename, $pagehash, true);
 	}
 
 
! 	// Adds a page to the archive pagestore
! 	function SavePageToArchive($pagename, $pagehash) {
! 		global $ArchivePageStore;
! 		$dbi = OpenDataBase($ArchivePageStore);
! 		InsertPage($dbi, $pagename, $pagehash, false);
! 	}
 
 
 	// Returns store where version of page resides
 	function SelectStore($dbi, $pagename, $version, $curstore, $archstore) {
! 		if ($version) {
! 			if (IsVersionInWiki($dbi, $pagename, $version)) return $curstore;
! 			elseif (IsVersionInArchive($dbi, $pagename, $version)) return $archstore;
! 			else return -1; 
! 		}
! 		elseif (IsWikiPage($dbi, $pagename)) return $curstore;
! 		else return -1;	
! 	}
 
 
! 	function IsVersionInWiki($dbi, $pagename, $version) {
 $pagename = addslashes($pagename);
 if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename' and version='$version'", $dbi['dbc'])) {
--- 168,202 ----
 
 
! // Adds to or replaces a page in the current pagestore
! function ReplaceCurrentPage($pagename, $pagehash) {
! global $WikiPageStore;
! $dbi = OpenDataBase($WikiPageStore);
! $linklist = ExtractWikiPageLinks($pagehash['content']);
! SetWikiPageLinks($dbi, $pagename, $linklist);
! InsertPage($dbi, $pagename, $pagehash, true);
 	}
 
 
! // Adds a page to the archive pagestore
! function SavePageToArchive($pagename, $pagehash) {
! global $ArchivePageStore;
! $dbi = OpenDataBase($ArchivePageStore);
! InsertPage($dbi, $pagename, $pagehash, false);
! }
 
 
 	// Returns store where version of page resides
 	function SelectStore($dbi, $pagename, $version, $curstore, $archstore) {
! if ($version) {
! if (IsVersionInWiki($dbi, $pagename, $version)) return $curstore;
! elseif (IsVersionInArchive($dbi, $pagename, $version)) return $archstore;
! else return -1; 
! }
! elseif (IsWikiPage($dbi, $pagename)) return $curstore;
! else return -1;	
! }
 
 
! function IsVersionInWiki($dbi, $pagename, $version) {
 $pagename = addslashes($pagename);
 if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename' and version='$version'", $dbi['dbc'])) {
***************
*** 207,211 ****
 
 	function IsVersionInArchive($dbi, $pagename, $version) {
! 		global $ArchivePageStore;
 
 $pagename = addslashes($pagename);
--- 207,211 ----
 
 	function IsVersionInArchive($dbi, $pagename, $version) {
! global $ArchivePageStore;
 
 $pagename = addslashes($pagename);

Update of /cvsroot/phpwiki/phpwiki/locale/es/templates
In directory usw-pr-cvs1:/tmp/cvs-serv10213/locale/es/templates
Modified Files:
 Tag: release-1_2-branch
	browse.html 
Log Message:
Fix link to BuscarPagina.
(Reported by Aníbal Rojas <ar...@va...>.)
Note the BuscarPagina should probably (I think) be renamed
to BuscarPágina. (PaginaPrincipal, as well as other pages
probably need to have accents added as well.)
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/browse.html,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** browse.html	2001年06月14日 00:38:31	1.3.2.1
--- browse.html	2001年07月17日 21:35:37	1.3.2.2
***************
*** 26,30 ****
 [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>]) 
 <br>
! <a href="###SCRIPTURL###?FindPage">BuscarP&aacute;gina</a> navegando o buscando 
 <hr noshade>
 <small>###RELATEDPAGES###</small>
--- 26,30 ----
 [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>]) 
 <br>
! <a href="###SCRIPTURL###?BuscarPagina">BuscarP&aacute;gina</a> navegando o buscando 
 <hr noshade>
 <small>###RELATEDPAGES###</small>

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv11442/schemas
Modified Files:
	schema.mysql 
Log Message:
Bug fix: ..._wikilinks => ..._links.
Index: schema.mysql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/schema.mysql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** schema.mysql	2001年07月12日 03:21:35	1.5
--- schema.mysql	2001年07月17日 15:58:28	1.6
***************
*** 3,7 ****
 drop table if exists phpwiki_pages;
 drop table if exists phpwiki_archive;
! drop table if exists phpwiki_wikilinks;
 drop table if exists phpwiki_hitcount;
 drop table if exists phpwiki_score;
--- 3,7 ----
 drop table if exists phpwiki_pages;
 drop table if exists phpwiki_archive;
! drop table if exists phpwiki_links;
 drop table if exists phpwiki_hitcount;
 drop table if exists phpwiki_score;

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27750
Modified Files:
	pgsql.php 
Log Message:
Updated the table names.
Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/pgsql.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgsql.php	2001年02月13日 05:54:38	1.6
--- pgsql.php	2001年07月15日 16:03:26	1.7
***************
*** 25,33 ****
 */
 
! $WikiPageStore = $DBParams['prefix'] . "wiki";
! $ArchivePageStore = $DBParams['prefix'] . "archive";
! $WikiLinksPageStore = $DBParams['prefix'] . "wikilinks";
 $HotTopicsPageStore = $DBParams['prefix'] . "hottopics";
! $HitCountPageStore = $DBParams['prefix'] . "hitcount";
 
 // open a database and return a hash
--- 25,33 ----
 */
 
! $WikiPageStore = $DBParams['prefix'] . "pages";
! $ArchivePageStore = $DBParams['prefix'] . "archive";
! $WikiLinksPageStore = $DBParams['prefix'] . "links";
 $HotTopicsPageStore = $DBParams['prefix'] . "hottopics";
! $HitCountPageStore = $DBParams['prefix'] . "hitcount";
 
 // open a database and return a hash
***************
*** 435,438 ****
--- 435,440 ----
 // mode: php
 // c-file-style: "ellemtel"
+ // tab-width: 4
+ // indent-tabs-mode: nil
 // End: 
 ?>

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv25692
Modified Files:
	INSTALL.mysql 
Log Message:
Changed one line: lib/config.php to index.php.
Index: INSTALL.mysql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL.mysql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** INSTALL.mysql	2001年01月24日 18:36:17	1.6
--- INSTALL.mysql	2001年07月15日 15:49:44	1.7
***************
*** 31,35 ****
 the "drop tables" lines from schemas/schema.mysql - it should work now
 
! 4. Edit lib/config.php to reflect your settings.
 
 	a) comment out the DBM settings
--- 31,35 ----
 the "drop tables" lines from schemas/schema.mysql - it should work now
 
! 4. Edit index.php to reflect your settings.
 
 	a) comment out the DBM settings

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv25371
Modified Files:
	mysql.php 
Log Message:
Fixed the table names. Here is an example of duplicate information,
where the table names are stored both in schema.mysql and
mysql.php. Of course I failed to notice this and the nightly build was
broken. Task #34376.
Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/mysql.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mysql.php	2001年06月26日 18:01:01	1.13
--- mysql.php	2001年07月15日 15:47:59	1.14
***************
*** 33,41 ****
 */
 
! $WikiPageStore = $DBParams['prefix'] . "wiki";
! $ArchivePageStore = $DBParams['prefix'] . "archive";
! $WikiLinksStore = $DBParams['prefix'] . "wikilinks";
! $WikiScoreStore = $DBParams['prefix'] . "wikiscore";
! $HitCountStore = $DBParams['prefix'] . "hitcount";
 
 // open a database and return the handle
--- 33,41 ----
 */
 
! $WikiPageStore = $DBParams['prefix'] . "pages";
! $ArchivePageStore = $DBParams['prefix'] . "archive";
! $WikiLinksStore = $DBParams['prefix'] . "links";
! $WikiScoreStore = $DBParams['prefix'] . "score";
! $HitCountStore = $DBParams['prefix'] . "hitcount";
 
 // open a database and return the handle

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv30533
Modified Files:
	index.php 
Log Message:
Added a comment regarding the table name prefix as a precaution to
admins who set up alpha versions of 1.3.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** index.php	2001年07月12日 03:21:35	1.18
--- index.php	2001年07月12日 03:49:05	1.19
***************
*** 86,90 ****
 // Used by all DB types:
 'database' => 'wiki',
! 'prefix' => 'phpwiki_',	// prefix for filenames or table names
 
 // Used by 'dbm', 'dba', 'file'
--- 86,96 ----
 // Used by all DB types:
 'database' => 'wiki',
! // prefix for filenames or table names
! /* 
! * currently you MUST EDIT THE SQL file too (in the schemas/ directory
! * because we aren't doing on the fly sql generation during the
! * installation.
! */
! 'prefix' => 'phpwiki_',
 
 // Used by 'dbm', 'dba', 'file'

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv27060
Modified Files:
	schema.psql 
Log Message:
Oops: fixed a typo just now.
Updated table names so all are prefaced with 'phpwiki_'. This is not
tested with Postgresql yet though.
Index: schema.psql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/schema.psql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** schema.psql	2001年07月12日 03:24:18	1.6
--- schema.psql	2001年07月12日 03:25:11	1.7
***************
*** 8,12 ****
 drop table phpwiki_score;
 
! CREATE TABLE wiki (
 pagename VARCHAR(100) NOT NULL,
 version INT NOT NULL DEFAULT 1,
--- 8,12 ----
 drop table phpwiki_score;
 
! CREATE TABLE phpwiki_pages (
 pagename VARCHAR(100) NOT NULL,
 version INT NOT NULL DEFAULT 1,

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv26877
Modified Files:
	schema.psql 
Log Message:
Updated table names so all are prefaced with 'phpwiki_'. This is not
tested with Postgresql yet though.
Index: schema.psql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/schema.psql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** schema.psql	2000年11月02日 04:34:41	1.5
--- schema.psql	2001年07月12日 03:24:18	1.6
***************
*** 1,10 ****
 -- $Id$
 
! drop table wiki;
! drop table archive;
! drop table wikilinks;
! drop table hottopics;
! drop table hitcount;
! drop table wikiscore;
 
 CREATE TABLE wiki (
--- 1,10 ----
 -- $Id$
 
! drop table phpwiki_pages;
! drop table phpwiki_archive;
! drop table phpwiki_links;
! drop table phpwiki_hottopics;
! drop table phpwiki_hitcount;
! drop table phpwiki_score;
 
 CREATE TABLE wiki (
***************
*** 20,24 ****
 );
 
! CREATE TABLE archive (
 pagename VARCHAR(100) NOT NULL,
 version INT NOT NULL DEFAULT 1,
--- 20,24 ----
 );
 
! CREATE TABLE phpwiki_archive (
 pagename VARCHAR(100) NOT NULL,
 version INT NOT NULL DEFAULT 1,
***************
*** 32,36 ****
 );
 
! CREATE TABLE wikilinks (
 frompage VARCHAR(100) NOT NULL,
 topage VARCHAR(100) NOT NULL,
--- 32,36 ----
 );
 
! CREATE TABLE phpwiki_links (
 frompage VARCHAR(100) NOT NULL,
 topage VARCHAR(100) NOT NULL,
***************
*** 38,42 ****
 );
 
! CREATE TABLE hottopics ( 
 pagename VARCHAR(100) NOT NULL,
 lastmodified INT NOT NULL,
--- 38,42 ----
 );
 
! CREATE TABLE phpwiki_hottopics ( 
 pagename VARCHAR(100) NOT NULL,
 lastmodified INT NOT NULL,
***************
*** 44,48 ****
 );
 
! CREATE TABLE hitcount ( 
 pagename VARCHAR(100) NOT NULL, 
 hits INT NOT NULL DEFAULT 0, 
--- 44,48 ----
 );
 
! CREATE TABLE phpwiki_hitcount ( 
 pagename VARCHAR(100) NOT NULL, 
 hits INT NOT NULL DEFAULT 0, 
***************
*** 50,54 ****
 );
 
! CREATE TABLE wikiscore (
 pagename VARCHAR(100) NOT NULL,
 score INT NOT NULL DEFAULT 0,
--- 50,54 ----
 );
 
! CREATE TABLE phpwiki_score (
 pagename VARCHAR(100) NOT NULL,
 score INT NOT NULL DEFAULT 0,
***************
*** 57,65 ****
 
 
! GRANT ALL ON wiki TO nobody;
! GRANT ALL ON archive TO nobody;
! GRANT ALL ON wikilinks TO nobody;
! GRANT ALL ON hottopics TO nobody;
! GRANT ALL ON hitcount TO nobody;
! GRANT ALL ON wikiscore TO nobody;
 
--- 57,65 ----
 
 
! GRANT ALL ON phpwiki_pages TO nobody;
! GRANT ALL ON phpwiki_archive TO nobody;
! GRANT ALL ON phpwiki_links TO nobody;
! GRANT ALL ON phpwiki_hottopics TO nobody;
! GRANT ALL ON phpwiki_hitcount TO nobody;
! GRANT ALL ON phpwiki_score TO nobody;
 

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv26353/schemas
Modified Files:
	schema.mysql 
Log Message:
I changed the table names in the schema so all are prefaced with phpwiki_.
I updated index.php (where the config info is) as well; seems to test OK.
Index: schema.mysql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/schema.mysql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** schema.mysql	2001年06月26日 17:51:30	1.4
--- schema.mysql	2001年07月12日 03:21:35	1.5
***************
*** 1,13 ****
 -- $Id$
 
! drop table if exists wiki;
! drop table if exists archive;
! drop table if exists wikilinks;
! drop table if exists hitcount;
! drop table if exists wikiscore;
! drop table if exists hottopics;
 
 
! CREATE TABLE wiki (
 pagename VARCHAR(100) NOT NULL,
 version INT NOT NULL DEFAULT 1,
--- 1,13 ----
 -- $Id$
 
! drop table if exists phpwiki_pages;
! drop table if exists phpwiki_archive;
! drop table if exists phpwiki_wikilinks;
! drop table if exists phpwiki_hitcount;
! drop table if exists phpwiki_score;
! drop table if exists phpwiki_hottopics;
 
 
! CREATE TABLE phpwiki_pages (
 pagename VARCHAR(100) NOT NULL,
 version INT NOT NULL DEFAULT 1,
***************
*** 21,25 ****
 );
 
! CREATE TABLE archive (
 pagename VARCHAR(100) NOT NULL,
 version INT NOT NULL DEFAULT 1,
--- 21,25 ----
 );
 
! CREATE TABLE phpwiki_archive (
 pagename VARCHAR(100) NOT NULL,
 version INT NOT NULL DEFAULT 1,
***************
*** 33,37 ****
 );
 
! CREATE TABLE wikilinks (
 frompage VARCHAR(100) NOT NULL,
 topage VARCHAR(100) NOT NULL,
--- 33,37 ----
 );
 
! CREATE TABLE phpwiki_links (
 frompage VARCHAR(100) NOT NULL,
 topage VARCHAR(100) NOT NULL,
***************
*** 39,43 ****
 );
 
! CREATE TABLE hitcount (
 pagename VARCHAR(100) NOT NULL,
 hits INT NOT NULL DEFAULT 0,
--- 39,43 ----
 );
 
! CREATE TABLE phpwiki_hitcount (
 pagename VARCHAR(100) NOT NULL,
 hits INT NOT NULL DEFAULT 0,
***************
*** 45,49 ****
 );
 
! CREATE TABLE wikiscore (
 pagename VARCHAR(100) NOT NULL,
 score INT NOT NULL DEFAULT 0,
--- 45,49 ----
 );
 
! CREATE TABLE phpwiki_score (
 pagename VARCHAR(100) NOT NULL,
 score INT NOT NULL DEFAULT 0,
***************
*** 54,58 ****
 -- tables below are not yet used
 
! CREATE TABLE hottopics ( 
 pagename VARCHAR(100) NOT NULL,
 lastmodified INT NOT NULL,
--- 54,58 ----
 -- tables below are not yet used
 
! CREATE TABLE phpwiki_hottopics ( 
 pagename VARCHAR(100) NOT NULL,
 lastmodified INT NOT NULL,

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv26353
Modified Files:
	index.php 
Log Message:
I changed the table names in the schema so all are prefaced with phpwiki_.
I updated index.php (where the config info is) as well; seems to test OK.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** index.php	2001年05月31日 17:39:01	1.17
--- index.php	2001年07月12日 03:21:35	1.18
***************
*** 86,90 ****
 // Used by all DB types:
 'database' => 'wiki',
! 'prefix' => '',	// prefix for filenames or table names
 
 // Used by 'dbm', 'dba', 'file'
--- 86,90 ----
 // Used by all DB types:
 'database' => 'wiki',
! 'prefix' => 'phpwiki_',	// prefix for filenames or table names
 
 // Used by 'dbm', 'dba', 'file'

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv16945
Modified Files:
	search.php 
Log Message:
Got fooled by an IF with no braces.
Index: search.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/search.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search.php	2001年07月07日 17:34:52	1.6
--- search.php	2001年07月07日 17:44:25	1.7
***************
*** 5,27 ****
 rcs_id('$Id$');
 
! if (empty($searchterm))
! $searchterm = '';		// FIXME: do something better here?
 
! fix_magic_quotes_gpc($searchterm);
 
! $html = "<P><B>"
! . sprintf(gettext ("Searching for \"%s\" ....."),
! htmlspecialchars($searchterm))
! . "</B></P>\n";
 
 // quote regexp chars
 $search = preg_quote($searchterm);
 
 // search matching pages
 $query = InitTitleSearch($dbi, $searchterm);
 $found = 0;
 while ($page = TitleSearchNextMatch($dbi, $query)) {
! $found++;
! $html .= LinkExistingWikiWord($page) . "<br>\n";
 }
 
--- 5,30 ----
 rcs_id('$Id$');
 
! if (empty($searchterm)) {
! $searchterm = '';		// FIXME: do something better here?
! }
 
! fix_magic_quotes_gpc($searchterm);
 
! $html = "<P><B>"
! . sprintf(gettext ("Searching for \"%s\" ....."),
! htmlspecialchars($searchterm))
! . "</B></P>\n";
 
 // quote regexp chars
 $search = preg_quote($searchterm);
 
+ 
 // search matching pages
 $query = InitTitleSearch($dbi, $searchterm);
 $found = 0;
+ 
 while ($page = TitleSearchNextMatch($dbi, $query)) {
! $found++;
! $html .= LinkExistingWikiWord($page) . "<br>\n";
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv15027
Modified Files:
	search.php 
Log Message:
Reformatted the code by hand to PEAR standards. Well, mostly by
hand. php-mode doesn't like variable assignments that span several
lines like:
 $html = "<P><B>"
 . sprintf(gettext ("Searching for \"%s\" ....."),
 htmlspecialchars($searchterm))
 . "</B></P>\n";
I have to indent this by hand.
Index: search.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/search.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** search.php	2001年02月12日 01:43:10	1.5
--- search.php	2001年07月07日 17:34:52	1.6
***************
*** 1,31 ****
 <?php
- // Title search: returns pages having a name matching the search term
- rcs_id('$Id$');
 
! if (empty($searchterm))
! $searchterm = '';		// FIXME: do something better here?
 
! fix_magic_quotes_gpc($searchterm);
 
! $html = "<P><B>"
! 	 . sprintf(gettext ("Searching for \"%s\" ....."),
! 		 htmlspecialchars($searchterm))
! 	 . "</B></P>\n";
! 
! // quote regexp chars
! $search = preg_quote($searchterm);
! 
! // search matching pages
! $query = InitTitleSearch($dbi, $searchterm);
! $found = 0;
! while ($page = TitleSearchNextMatch($dbi, $query)) {
! $found++;
! $html .= LinkExistingWikiWord($page) . "<br>\n";
! }
! 
! $html .= "<hr noshade>\n"
! 	 . sprintf(gettext ("%d pages match your query."), $found)
! 	 . "\n";
 
! echo GeneratePage('MESSAGE', $html, gettext ("Title Search Results"), 0);
 ?>
--- 1,34 ----
 <?php
 
! // Title search: returns pages having a name matching the search term
 
! rcs_id('$Id$');
 
! if (empty($searchterm))
! $searchterm = '';		// FIXME: do something better here?
 
! fix_magic_quotes_gpc($searchterm);
! 
! $html = "<P><B>"
! . sprintf(gettext ("Searching for \"%s\" ....."),
! htmlspecialchars($searchterm))
! . "</B></P>\n";
! 
! // quote regexp chars
! $search = preg_quote($searchterm);
! 
! // search matching pages
! $query = InitTitleSearch($dbi, $searchterm);
! $found = 0;
! while ($page = TitleSearchNextMatch($dbi, $query)) {
! $found++;
! $html .= LinkExistingWikiWord($page) . "<br>\n";
! }
! 
! $html .= "<hr noshade>\n"
! . sprintf(gettext ("%d pages match your query."), $found)
! . "\n";
! 
! echo GeneratePage('MESSAGE', $html, gettext ("Title Search Results"), 0);
! 
 ?>