phpwiki-checkins Mailing List for PhpWiki (Page 515)

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv5531/lib
Modified Files:
	transform.php 
Log Message:
Fix regexp so that punctuation does not get included in the rhs of
interwiki links (without the use of square brackets, that is.)
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** transform.php	2001年11月14日 21:05:38	1.25
--- transform.php	2001年11月16日 21:02:58	1.26
***************
*** 296,300 ****
 $transform->register(WT_TOKENIZER, 'wtt_interwikilinks',
 			pcre_fix_posix_classes("!?(?<![[:alnum:]])") .
! 			"$InterWikiLinkRegexp:\\S+");
 }
 $transform->register(WT_TOKENIZER, 'wtt_bumpylinks', "!?$WikiNameRegexp");
--- 296,300 ----
 $transform->register(WT_TOKENIZER, 'wtt_interwikilinks',
 			pcre_fix_posix_classes("!?(?<![[:alnum:]])") .
! 			"$InterWikiLinkRegexp:[^\\s.,;?]+");
 }
 $transform->register(WT_TOKENIZER, 'wtt_bumpylinks', "!?$WikiNameRegexp");

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv17428
Modified Files:
 Tag: release-1_2-branch
	msql.php 
Log Message:
Removed debug output; improved error messages. pages with backslashes
are not being saved to the archive due to a primary key violation.
Index: msql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/msql.php,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -C2 -r1.6.2.6 -r1.6.2.7
*** msql.php	2001年11月16日 02:42:27	1.6.2.6
--- msql.php	2001年11月16日 02:53:21	1.6.2.7
***************
*** 210,214 ****
 $retval = msql_query($query, $dbi['dbc']);
 if ($retval == false) {
! printf(gettext ("Insert/update failed: %s"), msql_error());
 print "<br>\n";
 }
--- 210,214 ----
 $retval = msql_query($query, $dbi['dbc']);
 if ($retval == false) {
! printf(gettext ("Insert/update to table 'wiki' failed: %s"), msql_error());
 print "<br>\n";
 }
***************
*** 231,239 ****
 for ($x = 0; $x < count($pagehash["content"]); $x++) {
 $line = addslashes($pagehash["content"][$x]);
 $esc_pagename = addslashes($pagename);
 $query = "INSERT INTO $dbi[page_table] " .
 "(pagename, lineno, line) " .
 "VALUES('$esc_pagename', $x, '$line')";
! echo "Page line insert query: $query<br>\n";
 $retval = msql_query($query, $dbi['dbc']);
 if ($retval == false) { 
--- 231,240 ----
 for ($x = 0; $x < count($pagehash["content"]); $x++) {
 $line = addslashes($pagehash["content"][$x]);
+ if ($line == '') continue; // why do we always have 127 lines?
 $esc_pagename = addslashes($pagename);
 $query = "INSERT INTO $dbi[page_table] " .
 "(pagename, lineno, line) " .
 "VALUES('$esc_pagename', $x, '$line')";
! //echo "Page line insert query: $query<br>\n";
 $retval = msql_query($query, $dbi['dbc']);
 if ($retval == false) { 
***************
*** 287,291 ****
 $retval = msql_query($query, $dbi['dbc']);
 if ($retval == false) {
! printf(gettext ("Insert/update failed: %s"), msql_error());
 	 print "<br>\n";
 }
--- 288,292 ----
 $retval = msql_query($query, $dbi['dbc']);
 if ($retval == false) {
! printf(gettext ("Insert/update into table 'archive' failed: %s"), msql_error());
 	 print "<br>\n";
 }

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv15451
Modified Files:
 Tag: release-1_2-branch
	msql.php 
Log Message:
Fixed bug where page titles with apostrophes caused a sql error.
Index: msql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/msql.php,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -r1.6.2.5 -r1.6.2.6
*** msql.php	2001年11月16日 01:22:27	1.6.2.5
--- msql.php	2001年11月16日 02:42:27	1.6.2.6
***************
*** 231,238 ****
 for ($x = 0; $x < count($pagehash["content"]); $x++) {
 $line = addslashes($pagehash["content"][$x]);
 $query = "INSERT INTO $dbi[page_table] " .
 "(pagename, lineno, line) " .
! "VALUES('$pagename', $x, '$line')";
! // echo "Page line insert query: $query<br>\n";
 $retval = msql_query($query, $dbi['dbc']);
 if ($retval == false) { 
--- 231,239 ----
 for ($x = 0; $x < count($pagehash["content"]); $x++) {
 $line = addslashes($pagehash["content"][$x]);
+ $esc_pagename = addslashes($pagename);
 $query = "INSERT INTO $dbi[page_table] " .
 "(pagename, lineno, line) " .
! "VALUES('$esc_pagename', $x, '$line')";
! echo "Page line insert query: $query<br>\n";
 $retval = msql_query($query, $dbi['dbc']);
 if ($retval == false) { 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32563
Modified Files:
 Tag: release-1_2-branch
	msql.php 
Log Message:
Fixed a bug with InitBackLinkSearch. Although I completely rewrote it,
it turned out to be just a scope issue, and an ampersand would
probably have fixed the original code. This implemetation is slightly
more efficient at the cost of a small amount of memory.
Index: msql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/msql.php,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** msql.php	2001年11月07日 20:30:47	1.6.2.4
--- msql.php	2001年11月16日 01:22:27	1.6.2.5
***************
*** 425,428 ****
--- 425,429 ----
 
 $topage = addslashes($pagename);
+ $res[arr] = array();
 
 // FIXME: this is buggy. If a [multiword link] is split accross
***************
*** 430,457 ****
 // (Probably the best fix is to implement the link table, and use it.)
 $res['regexp'] = MakeBackLinkSearchRegexp($pagename);
! $res['res'] = msql_query( "SELECT pagename, line FROM $dbi[page_table]"
! 				. " WHERE line LIKE '%$topage%'"
! 				. " ORDER BY pagename",
! 				$dbi["dbc"]);
! $res['lastpage'] = '';
 
! return $res;
! }
 
 
! // iterating through database
! function BackLinkSearchNextMatch($dbi, $res) {
! while (true) {
! 	 if ( ! ($o = msql_fetch_object($res['res']))) {
! 	 return 0;
! 	 }
! 	 if ( $res['lastpage'] == $o->pagename )
! 	 continue;
! 	 if ( ! preg_match($res['regexp'], $a->line) )
! 	 continue;
! 	 $res['lastpage'] = $o->pagename;
! 	 return $o->pagename;
 }
 }
 
 function IncreaseHitCount($dbi, $pagename) {
--- 431,487 ----
 // (Probably the best fix is to implement the link table, and use it.)
 $res['regexp'] = MakeBackLinkSearchRegexp($pagename);
! $query = "SELECT pagename, line FROM $dbi[page_table]"
! . " WHERE line LIKE '%$topage%'"
! . " ORDER BY pagename";
 
! //echo "<p>$query<p>\n";
! $res['res'] = msql_query($query, $dbi["dbc"]);
 
+ $count = 0;
+ $arr = array();
 
! // build an array of the results.
! while ($hash = msql_fetch_array($res[res]) ) {
! if ($arr[$count -1 ] == $hash[pagename])
! continue;
! $arr[$count] = $hash[pagename];
! $count++;
 }
+ 
+ $res[count] = 0;
+ reset($arr);
+ $res[arr] = $arr;
+ 
+ return $res;
 }
+ 
+ 
+ // iterating through database
+ function BackLinkSearchNextMatch($dbi, &$res) {
+ 
+ if ($res[count] > count($res[arr]))
+ return 0;
+ 
+ $retval = $res[arr][$res[count]];
+ $res[count]++;
+ 
+ return $retval;
+ }
+ 
+ /*
+ if ( ($o = msql_fetch_object($res['res'])) == FALSE ) {
+ echo "returning zero<p>\n";
+ echo "it's '$o' <p>\n";
+ return 0;
+ }
+ if ( $res['lastpage'] == $o->pagename )
+ continue;
+ if ( ! preg_match($res['regexp'], $a->line) )
+ continue;
+ $res['lastpage'] = $o->pagename;
+ return $o->pagename;
+ }
+ */
+ 
 
 function IncreaseHitCount($dbi, $pagename) {

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32658/lib
Modified Files:
 Tag: release-1_2-branch
	pgsql.php 
Log Message:
More addslashes() bugs.
Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/pgsql.php,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** pgsql.php	2001年11月07日 20:30:47	1.4.2.5
--- pgsql.php	2001年11月15日 01:20:39	1.4.2.6
***************
*** 86,91 ****
 // Either insert or replace a key/value (a page)
 function InsertPage($dbi, $pagename, $pagehash) {
- $pagename = addslashes($pagename);
- 
 // update the wikilinks table
 $linklist = ExtractWikiPageLinks($pagehash['content']);
--- 86,89 ----
***************
*** 155,159 ****
 // echo "<p>save copy called<p>";
 
- $pagename = addslashes($pagename);
 // echo "<p>dbi in SaveCopyToArchive: '$dbi' '$ArchivePageStore' '$dbi[dbc]'<p>";
 
--- 153,156 ----
***************
*** 180,184 ****
 "version=$pagehash[version]";
 
! $query = "UPDATE $ArchivePageStore SET $PAIRS WHERE pagename='$pagename'";
 
 } else {
--- 177,181 ----
 "version=$pagehash[version]";
 
! $query = "UPDATE $ArchivePageStore SET $PAIRS WHERE pagename='$pagehash[pagename]'";
 
 } else {

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv6431/templates
Modified Files:
	browse.html editpage.html message.html 
Log Message:
Another XHTML fix.
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** browse.html	2001年11月14日 21:05:38	1.21
--- browse.html	2001年11月14日 21:25:32	1.22
***************
*** 5,8 ****
--- 5,9 ----
 <head>
 <!-- phpwiki source:
+ $Id$
 ${RCS_IDS}
 -->
***************
*** 16,20 ****
 </head>
 <body>
- <h1>
 <div><a class="wikilink" 
 href="${BROWSE}HomePage"
--- 17,20 ----
***************
*** 22,25 ****
--- 22,26 ----
 border="0" alt="[phpwiki]" 
 align="right" width="50" height="50" /></a></div>
+ <h1>
 <?plugin-link BackLinks description="Get BackLinks for [pagename]"
 page="[pagename]" class="backlinks"
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** editpage.html	2001年11月14日 21:05:38	1.21
--- editpage.html	2001年11月14日 21:25:32	1.22
***************
*** 5,8 ****
--- 5,9 ----
 <head>
 <!-- phpwiki source:
+ $Id$
 ${RCS_IDS}
 -->
***************
*** 16,24 ****
 
 <body>
- <h1>
 <div><a class="wikilink"
 href="${BROWSE}HomePage"
 ><img src="${LOGO}" border="0" align="right"
 	 alt="[phpwiki]" width="50" height="50" /></a></div>
 Edit <a href="${BROWSE}${PAGEURL}" 
 class="wikilink"><span class="wikiword">${PAGE}</span></a>
--- 17,25 ----
 
 <body>
 <div><a class="wikilink"
 href="${BROWSE}HomePage"
 ><img src="${LOGO}" border="0" align="right"
 	 alt="[phpwiki]" width="50" height="50" /></a></div>
+ <h1>
 Edit <a href="${BROWSE}${PAGEURL}" 
 class="wikilink"><span class="wikiword">${PAGE}</span></a>
Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** message.html	2001年11月14日 21:05:38	1.13
--- message.html	2001年11月14日 21:25:32	1.14
***************
*** 5,8 ****
--- 5,9 ----
 <head>
 <!-- phpwiki source:
+ $Id$
 ${RCS_IDS}
 -->
***************
*** 14,18 ****
 </head>
 <body>
- <h1>
 <div><a class="wikilink" 
 href="${BROWSE}HomePage"
--- 15,18 ----
***************
*** 21,26 ****
 width="50" height="50"
 /></a></div>
! ${TITLE}
! </h1>
 
 ${CONTENT}
--- 21,25 ----
 width="50" height="50"
 /></a></div>
! <h1>${TITLE}</h1>
 
 ${CONTENT}

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv31659/templates
Modified Files:
	browse.html editpage.html message.html 
Log Message:
XHTML fixes. At this point, PhpWiki's output is almost valid XHTML.
(Most of these changes are based on patches by Tara/Steph.)
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** browse.html	2001年09月18日 19:16:24	1.20
--- browse.html	2001年11月14日 21:05:38	1.21
***************
*** 1,16 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
! <html>
 <head>
 <!-- phpwiki source:
 ${RCS_IDS}
 -->
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <!-- <meta name="robots" content="index,follow"> -->
! <base href="${BASE_URL}">
 <title>${SPLIT_PAGE}</title>
 <!--
 -->
! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css">
 </head>
 <body>
--- 1,17 ----
! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <!-- phpwiki source:
 ${RCS_IDS}
 -->
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
! <!-- <meta name="robots" content="index,follow" /> -->
! <base href="${BASE_URL}" />
 <title>${SPLIT_PAGE}</title>
 <!--
 -->
! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
 </head>
 <body>
***************
*** 19,42 ****
 href="${BROWSE}HomePage"
 ><img src="${LOGO}"
! border=0 alt="[phpwiki]" 
! align="right" width=50 height=50></a></div>
! <!--FIXME: this link is broken unless pages are in pathinfo -->
! <!--<a title="Get BackLinks for ${PAGE}"
! onmouseover="window.status='Get BackLinks for ${PAGE}';return true;"
! class="backlinks"
! href="${BROWSE}BackLinks?page=${PAGEURL}"
! ><span class="wikiword">${SPLIT_PAGE}</span></a>-->
 <?plugin-link BackLinks description="Get BackLinks for [pagename]"
 page="[pagename]" class="backlinks"
 linktext="${SPLIT_PAGE}" ?>
 </h1>
! <div class="br"><br clear="both" class="ignore"></div>
 <?php if (! $IS_CURRENT) { ?>
! <p><b>Note</b>: You are viewing an old revision of this page.
 Click <a href="${BROWSE}${PAGEURL}">here</a> to view the current version.</p>
! <hr class="ignore" noshade>
 <?php } ?>
 <div class="wikitext">${CONTENT}</div>
! <hr class="ignore" noshade>
 <form action="<?php echo WikiURL('TitleSearch'); ?>" method="get">
 <!-- I would like not to have to use these tables, and managed to
--- 20,37 ----
 href="${BROWSE}HomePage"
 ><img src="${LOGO}"
! border="0" alt="[phpwiki]" 
! align="right" width="50" height="50" /></a></div>
 <?plugin-link BackLinks description="Get BackLinks for [pagename]"
 page="[pagename]" class="backlinks"
 linktext="${SPLIT_PAGE}" ?>
 </h1>
! <div class="br"><br clear="all" class="ignore" /></div>
 <?php if (! $IS_CURRENT) { ?>
! <p><strong>Note</strong>: You are viewing an old revision of this page.
 Click <a href="${BROWSE}${PAGEURL}">here</a> to view the current version.</p>
! <hr class="ignore" noshade="noshade" />
 <?php } ?>
 <div class="wikitext">${CONTENT}</div>
! <hr class="ignore" noshade="noshade" />
 <form action="<?php echo WikiURL('TitleSearch'); ?>" method="get">
 <!-- I would like not to have to use these tables, and managed to
***************
*** 46,50 ****
 So, we use tables... -->
 <table class="toolbar" width="100%"
! cellpadding=0 cellspacing=0 border=0><tr valign="baseline">
 <td>
 <?php if ($IS_CURRENT) { ?>
--- 41,45 ----
 So, we use tables... -->
 <table class="toolbar" width="100%"
! cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
 <td>
 <?php if ($IS_CURRENT) { ?>
***************
*** 56,70 ****
 <td align="right">
 <?php echo LinkExistingWikiWord('FindPage') ?> 
! | <span><input type="hidden" name="auto_redirect" value="1">
 <input type="text" name="s" size="12"
 title="Quick Search"
 onmouseover="window.status='Quick Search'; return true;"
! onmouseout="window.status=''; return true;"></span>
! <!-- | <a class="wikiaction" href="${BROWSE}LikePages?page=${PAGEURL}">LikePages</a> -->
 | <?plugin-link LikePages page="[pagename]" description="List LikePages for [pagename]"?>
 </td>
 </tr></table>
 <table class="toolbar" width="100%"
! cellpadding=0 cellspacing=0 border=0><tr valign="baseline">
 <td>
 <?php if ($page->get('locked') && !$user->is_admin()) { ?>
--- 51,64 ----
 <td align="right">
 <?php echo LinkExistingWikiWord('FindPage') ?> 
! | <span><input type="hidden" name="auto_redirect" value="1" />
 <input type="text" name="s" size="12"
 title="Quick Search"
 onmouseover="window.status='Quick Search'; return true;"
! onmouseout="window.status=''; return true;" /></span>
 | <?plugin-link LikePages page="[pagename]" description="List LikePages for [pagename]"?>
 </td>
 </tr></table>
 <table class="toolbar" width="100%"
! cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
 <td>
 <?php if ($page->get('locked') && !$user->is_admin()) { ?>
***************
*** 105,109 ****
 
 <?php /*
! <hr class="ignore" noshade>
 <small>${RELATEDPAGES}</small>
 */ ?>
--- 99,103 ----
 
 <?php /*
! <hr class="ignore" noshade="noshade" />
 <small>${RELATEDPAGES}</small>
 */ ?>
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** editpage.html	2001年09月18日 19:16:24	1.20
--- editpage.html	2001年11月14日 21:05:38	1.21
***************
*** 1,4 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
 <html>
 <head>
--- 1,5 ----
! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
***************
*** 6,13 ****
 ${RCS_IDS}
 -->
! <base href="${BASE_URL}">
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <meta name="robots" content="noindex,nofollow">
! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css">
 
 <title>Edit: ${SPLIT_PAGE}</title>
--- 7,14 ----
 ${RCS_IDS}
 -->
! <base href="${BASE_URL}" />
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
! <meta name="robots" content="noindex,nofollow" />
! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
 
 <title>Edit: ${SPLIT_PAGE}</title>
***************
*** 18,23 ****
 <div><a class="wikilink"
 href="${BROWSE}HomePage"
! ><img src="${LOGO}" border=0 align="right"
! 	 alt="[phpwiki]" width=50 height=50></a></div>
 Edit <a href="${BROWSE}${PAGEURL}" 
 class="wikilink"><span class="wikiword">${PAGE}</span></a>
--- 19,24 ----
 <div><a class="wikilink"
 href="${BROWSE}HomePage"
! ><img src="${LOGO}" border="0" align="right"
! 	 alt="[phpwiki]" width="50" height="50" /></a></div>
 Edit <a href="${BROWSE}${PAGEURL}" 
 class="wikilink"><span class="wikiword">${PAGE}</span></a>
***************
*** 25,37 ****
 
 <?php if (!empty($PREVIEW_CONTENT)) { ?>
! <p><b>Preview only! Changes not saved.</b></p>
 <div class="wikitext">${PREVIEW_CONTENT}</div>
! <hr class="ignore" noshade>
 <?php } ?>
 
 <?php if (!$IS_CURRENT) { ?>
! <p><b>Warning: You are editing an old revision.
! Saving this page will overwrite the current version.</b></p>
! <hr class="ignore" noshade>
 <?php } ?>
 
--- 26,38 ----
 
 <?php if (!empty($PREVIEW_CONTENT)) { ?>
! <p><strong>Preview only! Changes not saved.</strong></p>
 <div class="wikitext">${PREVIEW_CONTENT}</div>
! <hr class="ignore" noshade />
 <?php } ?>
 
 <?php if (!$IS_CURRENT) { ?>
! <p><strong>Warning: You are editing an old revision.
! Saving this page will overwrite the current version.</strong></p>
! <hr class="ignore" noshade />
 <?php } ?>
 
***************
*** 44,48 ****
 */ ?>
 
! <form method="POST" action="${BROWSE}EditPage">
 <textarea class="wikiedit"
 name="content"
--- 45,49 ----
 */ ?>
 
! <form method="post" action="${BROWSE}EditPage">
 <textarea class="wikiedit"
 name="content"
***************
*** 53,67 ****
 <div class="toolbar" style="text-align: center;">
 Summary:<input type="text" class="wikitext"
! name="summary" value="$FORMVARS[summary]" size=50>
 </div>
 <table class="toolbar" width="100%"
! cellpadding=0 cellspacing=0 border=0><tr valign="baseline">
 <td>
! <input type="checkbox" name="minor_edit" value="checked" $FORMVARS[minor_edit]>
 This is a minor change.
 </td>
 <td align="center">
! <input type="submit" class="button" name="preview" value="Preview">
! | <input type="submit" class="button" value="Save">
 </td>
 <td align="right">
--- 54,68 ----
 <div class="toolbar" style="text-align: center;">
 Summary:<input type="text" class="wikitext"
! name="summary" value="$FORMVARS[summary]" size="50" />
 </div>
 <table class="toolbar" width="100%"
! cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
 <td>
! <input type="checkbox" name="minor_edit" value="checked" $FORMVARS[minor_edit] />
 This is a minor change.
 </td>
 <td align="center">
! <input type="submit" class="button" name="preview" value="Preview" />
! | <input type="submit" class="button" value="Save" />
 </td>
 <td align="right">
***************
*** 78,82 ****
 Also see <?php echo LinkExistingWikiWord('GoodStyle') ?> tips for editing.
 </p>
! <hr noshade>
 <small>
 <b>Emphasis:</b>
--- 79,83 ----
 Also see <?php echo LinkExistingWikiWord('GoodStyle') ?> tips for editing.
 </p>
! <hr noshade="noshade" />
 <small>
 <b>Emphasis:</b>
***************
*** 84,111 ****
 __ for bold,
 ''__ for both
! <br><b>Lists:</b>
 * for bullet lists,
 # for numbered lists,
 ''; term : definition'' for definition lists
! <br><b>References:</b>
 JoinCapitalizedWords or use square brackets for a [page link]
 or URL [http://cool.wiki.int/].
! <br><b>Footnotes:</b>
 Use [1],[2],[3],... 
! <br><b>Preventing linking:</b>
 Avoid linking with "!": !DoNotHyperlink,
 name links like [[text | URL] (double up on the "[")
! <br><b>Misc:</b>
 "!", "!!", "!!!" make headings,
 "%%%" makes a linebreak,
 "- - - -" makes a horizontal rule
! <br>
 more on <?php echo LinkExistingWikiWord('TextFormattingRules') ?>
 </small>
 
! <input type="hidden" name="action" value="save">
! <input type="hidden" name="pagename" value="$FORMVARS[pagename]">
! <input type="hidden" name="editversion" value="$FORMVARS[editversion]">
! <input type="hidden" name="version" value="$FORMVARS[version]">
 </form>
 </body>
--- 85,112 ----
 __ for bold,
 ''__ for both
! <br /><b>Lists:</b>
 * for bullet lists,
 # for numbered lists,
 ''; term : definition'' for definition lists
! <br /><b>References:</b>
 JoinCapitalizedWords or use square brackets for a [page link]
 or URL [http://cool.wiki.int/].
! <br /><b>Footnotes:</b>
 Use [1],[2],[3],... 
! <br /><b>Preventing linking:</b>
 Avoid linking with "!": !DoNotHyperlink,
 name links like [[text | URL] (double up on the "[")
! <br /><b>Misc:</b>
 "!", "!!", "!!!" make headings,
 "%%%" makes a linebreak,
 "- - - -" makes a horizontal rule
! <br />
 more on <?php echo LinkExistingWikiWord('TextFormattingRules') ?>
 </small>
 
! <input type="hidden" name="action" value="save" />
! <input type="hidden" name="pagename" value="$FORMVARS[pagename]" />
! <input type="hidden" name="editversion" value="$FORMVARS[editversion]" />
! <input type="hidden" name="version" value="$FORMVARS[version]" />
 </form>
 </body>
Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** message.html	2001年09月18日 19:16:24	1.12
--- message.html	2001年11月14日 21:05:38	1.13
***************
*** 1,4 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
 <html>
 <head>
--- 1,5 ----
! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
***************
*** 6,13 ****
 ${RCS_IDS}
 -->
! <base href="${BASE_URL}">
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <meta name="robots" content="noindex,nofollow">
! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css">
 <title>${TITLE}</title>
 </head>
--- 7,14 ----
 ${RCS_IDS}
 -->
! <base href="${BASE_URL}" />
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
! <meta name="robots" content="noindex,nofollow" />
! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
 <title>${TITLE}</title>
 </head>
***************
*** 17,23 ****
 href="${BROWSE}HomePage"
 ><img src="${LOGO}" align="right"
! border=0 alt="[phpwiki]"
! width=50 height=50
! ></a></div>
 ${TITLE}
 </h1>
--- 18,24 ----
 href="${BROWSE}HomePage"
 ><img src="${LOGO}" align="right"
! border="0" alt="[phpwiki]"
! width="50" height="50"
! /></a></div>
 ${TITLE}
 </h1>

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31659/lib
Modified Files:
	diff.php editpage.php savepage.php stdlib.php transform.php 
Log Message:
XHTML fixes. At this point, PhpWiki's output is almost valid XHTML.
(Most of these changes are based on patches by Tara/Steph.)
Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** diff.php	2001年09月18日 19:16:23	1.13
--- diff.php	2001年11月14日 21:05:38	1.14
***************
*** 1136,1145 ****
 . PageInfoRow($pagename, gettext ("Older page:"), $old));
 
- $html .= "<p>\n";
 
 if ($new && $old) {
 $diff = new WikiDiff($old->getContent(), $new->getContent());
 if ($diff->isEmpty()) {
! $html .= '<hr>[' . gettext ("Versions are identical") . ']';
 }
 else {
--- 1136,1145 ----
 . PageInfoRow($pagename, gettext ("Older page:"), $old));
 
 
 if ($new && $old) {
 $diff = new WikiDiff($old->getContent(), $new->getContent());
 if ($diff->isEmpty()) {
! $html .= Element('hr');
! $html .= QElement('p', '[' . gettext ("Versions are identical") . ']');
 }
 else {
Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** editpage.php	2001年09月18日 19:16:23	1.17
--- editpage.php	2001年11月14日 21:05:38	1.18
***************
*** 23,34 ****
 global $user; // FIXME: make this non-global.
 if ($page->get('locked') && !$user->is_admin()) {
! $html = "<p>";
! $html .= gettext ("This page has been locked by the administrator and cannot be edited.");
! $html .= "\n<p>";
! $html .= gettext ("Sorry for the inconvenience.");
 $html .= "\n";
 
 echo GeneratePage('MESSAGE', $html,
! sprintf(gettext("Problem while editing %s"), $args->pagename),
 $selected);
 ExitWiki ("");
--- 23,34 ----
 global $user; // FIXME: make this non-global.
 if ($page->get('locked') && !$user->is_admin()) {
! $html = QElement('p',
! gettext ("This page has been locked by the administrator and cannot be edited."));
 $html .= "\n";
+ $html .= QElement('p', gettext ("Sorry for the inconvenience.")) . "\n";
 
 echo GeneratePage('MESSAGE', $html,
! sprintf(gettext("Problem while editing %s"),
! $request->getArg('pagename')),
 $selected);
 ExitWiki ("");
Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** savepage.php	2001年09月18日 19:16:23	1.16
--- savepage.php	2001年11月14日 21:05:38	1.17
***************
*** 19,39 ****
 We want to translate this entire paragraph as one string, of course.
 */
! $html = "<P>";
 $html .= gettext ("PhpWiki is unable to save your changes, because another user edited and saved the page while you were editing the page too. If saving proceeded now changes from the previous author would be lost.");
! $html .= "</P>\n<P>";
 $html .= gettext ("In order to recover from this situation follow these steps:");
! $html .= "\n<OL><LI>";
 $html .= gettext ("Use your browser's <b>Back</b> button to go back to the edit page.");
! $html .= "\n<LI>";
 $html .= gettext ("Copy your changes to the clipboard or to another temporary place (e.g. text editor).");
! $html .= "\n<LI>";
 $html .= gettext ("<b>Reload</b> the page. You should now see the most current version of the page. Your changes are no longer there.");
! $html .= "\n<LI>";
 $html .= gettext ("Make changes to the file again. Paste your additions from the clipboard (or text editor).");
! $html .= "\n<LI>";
 $html .= gettext ("Press <b>Save</b> again.");
! $html .= "</OL>\n<P>";
! $html .= gettext ("Sorry for the inconvenience.");
! $html .= "</P>";
 
 echo GeneratePage('MESSAGE', $html,
--- 19,38 ----
 We want to translate this entire paragraph as one string, of course.
 */
! $html = "<p>";
 $html .= gettext ("PhpWiki is unable to save your changes, because another user edited and saved the page while you were editing the page too. If saving proceeded now changes from the previous author would be lost.");
! $html .= "</p>\n<p>";
 $html .= gettext ("In order to recover from this situation follow these steps:");
! $html .= "\n<ol><li>";
 $html .= gettext ("Use your browser's <b>Back</b> button to go back to the edit page.");
! $html .= "</li>\n<li>";
 $html .= gettext ("Copy your changes to the clipboard or to another temporary place (e.g. text editor).");
! $html .= "</li>\n<li>";
 $html .= gettext ("<b>Reload</b> the page. You should now see the most current version of the page. Your changes are no longer there.");
! $html .= "</li>\n<li>";
 $html .= gettext ("Make changes to the file again. Paste your additions from the clipboard (or text editor).");
! $html .= "</li>\n<li>";
 $html .= gettext ("Press <b>Save</b> again.");
! $html .= "</li></ol></p>\n";
! $html .= QElement('p', gettext ("Sorry for the inconvenience."));
 
 echo GeneratePage('MESSAGE', $html,
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** stdlib.php	2001年10月29日 18:41:11	1.43
--- stdlib.php	2001年11月14日 21:05:38	1.44
***************
*** 50,53 ****
--- 50,60 ----
 }
 
+ define('NO_END_TAG_PAT',
+ '/^' . join('|', array('area', 'base', 'basefont',
+ 'br', 'col', 'frame',
+ 'hr', 'img', 'input',
+ 'isindex', 'link', 'meta',
+ 'param')) . '$/i');
+ 
 function StartTag($tag, $args = '')
 {
***************
*** 60,64 ****
 	 $s .= sprintf(' %s="%s"', $key, htmlspecialchars($val));
 	 else if ($val)
! 	 $s .= " $key";
 }
 }
--- 67,71 ----
 	 $s .= sprintf(' %s="%s"', $key, htmlspecialchars($val));
 	 else if ($val)
! 	 $s .= " $key=\"$key\"";
 }
 }
***************
*** 67,109 ****
 
 
! define('NO_END_TAG_PAT',
! 	 '/^' . join('|', array('area', 'base', 'basefont',
! 				 'br', 'col', 'frame',
! 				 'hr', 'image', 'input',
! 				 'isindex', 'link', 'meta',
! 				 'param')) . '$/i');
! 
! function Element($tag, $args = '', $content = '')
! {
! $html = "<$tag";
! if (!is_array($args))
! {
! 	 $content = $args;
! 	 $args = false;
! }
! $html = StartTag($tag, $args);
! if (!preg_match(NO_END_TAG_PAT, $tag))
! {
! 	 $html .= $content;
! 	 $html .= "</$tag>";//FIXME: newline might not always be desired.
! }
! return $html;
! }
 
! function QElement($tag, $args = '', $content = '')
! {
! if (is_array($args))
! 	 return Element($tag, $args, htmlspecialchars($content));
! else
! {
! 	 $content = $args;
! 	 return Element($tag, htmlspecialchars($content));
! }
! }
 
 function LinkURL($url, $linktext='') {
 // FIXME: Is this needed (or sufficient?)
 if(ereg("[<>\"]", $url)) {
! return "<b><u>BAD URL -- remove all of &lt;, &gt;, &quot;</u></b>";
 }
 
--- 74,111 ----
 
 
! function Element($tag, $args = '', $content = '')
! {
! $html = "<$tag";
! if (!is_array($args)) {
! $content = $args;
! $args = false;
! }
! $html = StartTag($tag, $args);
! if (preg_match(NO_END_TAG_PAT, $tag)) {
! assert(! $content);
! return preg_replace('/>$/', " />", $html);
! } else {
! $html .= $content;
! $html .= "</$tag>";//FIXME: newline might not always be desired.
! }
! return $html;
! }
 
! function QElement($tag, $args = '', $content = '')
! {
! if (is_array($args))
! return Element($tag, $args, htmlspecialchars($content));
! else {
! $content = $args;
! return Element($tag, htmlspecialchars($content));
! }
! }
 
 function LinkURL($url, $linktext='') {
 // FIXME: Is this needed (or sufficient?)
 if(ereg("[<>\"]", $url)) {
! return Element('strong',
! QElement('u', array('class' => 'baduri'),
! 'BAD URL -- remove all of <, >, "'));
 }
 
***************
*** 163,167 ****
 // As long as the src in htmlspecialchars()ed I think it's safe.
 if(ereg('[<>"]', $url)) {
! return "<b><u>BAD URL -- remove all of &lt;, &gt;, &quot;</u></b>";
 }
 return Element('img', array('src' => $url, 'alt' => $alt));
--- 165,171 ----
 // As long as the src in htmlspecialchars()ed I think it's safe.
 if(ereg('[<>"]', $url)) {
! return Element('strong',
! QElement('u', array('class' => 'baduri'),
! 'BAD URL -- remove all of <, >, "'));
 }
 return Element('img', array('src' => $url, 'alt' => $alt));
***************
*** 268,273 ****
 
 	if (!preg_match('/^ phpwiki: ([^?]*) [?]? (.*) $/x', $url, $m))
! 		return "<b><u>BAD phpwiki: URL</u></b>";
! 
 	if ($m[1])
 		$pagename = urldecode($m[1]);
--- 272,278 ----
 
 	if (!preg_match('/^ phpwiki: ([^?]*) [?]? (.*) $/x', $url, $m))
! return Element('strong',
! QElement('u', array('class' => 'baduri'),
! 'BAD phpwiki: URL'));
 	if ($m[1])
 		$pagename = urldecode($m[1]);
***************
*** 421,427 ****
 $links = GetWikiPageLinks($dbi, $pagename);
 
! $txt = "<b>";
! $txt .= sprintf (gettext ("%d best incoming links:"), NUM_RELATED_PAGES);
! $txt .= "</b>\n";
 for($i = 0; $i < NUM_RELATED_PAGES; $i++) {
 if(isset($links['in'][$i])) {
--- 426,431 ----
 $links = GetWikiPageLinks($dbi, $pagename);
 
! $txt = QElement('strong',
! sprintf (gettext ("%d best incoming links:"), NUM_RELATED_PAGES));
 for($i = 0; $i < NUM_RELATED_PAGES; $i++) {
 if(isset($links['in'][$i])) {
***************
*** 430,437 ****
 }
 }
! 
! $txt .= "\n<br><b>";
! $txt .= sprintf (gettext ("%d best outgoing links:"), NUM_RELATED_PAGES);
! $txt .= "</b>\n";
 for($i = 0; $i < NUM_RELATED_PAGES; $i++) {
 if(isset($links['out'][$i])) {
--- 434,441 ----
 }
 }
! 
! $txt .= "\n" . Element('br');
! $txt .= Element('strong',
! sprintf (gettext ("%d best outgoing links:"), NUM_RELATED_PAGES));
 for($i = 0; $i < NUM_RELATED_PAGES; $i++) {
 if(isset($links['out'][$i])) {
***************
*** 442,448 ****
 }
 
! $txt .= "\n<br><b>";
! $txt .= sprintf (gettext ("%d most popular nearby:"), NUM_RELATED_PAGES);
! $txt .= "</b>\n";
 for($i = 0; $i < NUM_RELATED_PAGES; $i++) {
 if(isset($links['popular'][$i])) {
--- 446,452 ----
 }
 
! $txt .= "\n" . Element('br');
! $txt .= Element('strong',
! sprintf (gettext ("%d most popular nearby:"), NUM_RELATED_PAGES));
 for($i = 0; $i < NUM_RELATED_PAGES; $i++) {
 if(isset($links['popular'][$i])) {
***************
*** 494,501 ****
 
 function NoSuchRevision ($page, $version) {
! $html = "<p><b>" . gettext("Bad Version") . "</b>\n<p>";
! $html .= sprintf(gettext("I'm sorry. Version %d of %s is not in my database."),
! $version, htmlspecialchars($page->getName()));
! $html .= "\n";
 
 include_once('lib/Template.php');
--- 498,505 ----
 
 function NoSuchRevision ($page, $version) {
! $html = Element('p', QElement('strong', gettext("Bad Version"))) . "\n";
! $html .= QElement('p',
! sprintf(gettext("I'm sorry. Version %d of %s is not in my database."),
! $version, $page->getName())) . "\n";
 
 include_once('lib/Template.php');
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** transform.php	2001年11月14日 17:54:45	1.24
--- transform.php	2001年11月14日 21:05:38	1.25
***************
*** 354,358 ****
 $ftnt = trim(substr($match,1,-1)) + 0;
 $fntext = "[$ftnt]";
! $html = "<br>";
 
 $fnlist = $trfrm->user_data['footnotes'][$ftnt];
--- 354,358 ----
 $ftnt = trim(substr($match,1,-1)) + 0;
 $fntext = "[$ftnt]";
! $html = Element('br');
 
 $fnlist = $trfrm->user_data['footnotes'][$ftnt];
***************
*** 450,454 ****
 // %%% are linebreaks
 function wtm_linebreak($line, &$transformer) {
! return str_replace('%%%', '<br>', $line);
 }
 
--- 450,454 ----
 // %%% are linebreaks
 function wtm_linebreak($line, &$transformer) {
! return str_replace('%%%', Element('br'), $line);
 }
 
***************
*** 510,515 ****
 $numtabs = strlen($matches[1]);
 $line = preg_replace("/^([#*]*\*)/", '', $line);
! $html = $trfrm->SetHTMLMode('ul', $numtabs) . '<li>';
! $line = $html . $line;
 }
 return $line;
--- 510,515 ----
 $numtabs = strlen($matches[1]);
 $line = preg_replace("/^([#*]*\*)/", '', $line);
! $html = $trfrm->SetHTMLMode('ul', $numtabs);
! $line = $html . Element('li', $line);
 }
 return $line;
***************
*** 521,526 ****
 $numtabs = strlen($matches[1]);
 $line = preg_replace("/^([#*]*\#)/", "", $line);
! $html = $trfrm->SetHTMLMode('ol', $numtabs) . '<li>';
! $line = $html . $line;
 }
 return $line;
--- 521,526 ----
 $numtabs = strlen($matches[1]);
 $line = preg_replace("/^([#*]*\#)/", "", $line);
! $html = $trfrm->SetHTMLMode('ol', $numtabs);
! $line = $html . Element('li', $line);
 }
 return $line;
***************
*** 534,539 ****
 $line = $trfrm->SetHTMLMode('dl', $numtabs);
 	 if(trim($matches[2]))
! $line .= '<dt>' . $matches[2];
! 	 $line .= '<dd>' . $matches[3];
 }
 return $line;
--- 534,539 ----
 $line = $trfrm->SetHTMLMode('dl', $numtabs);
 	 if(trim($matches[2]))
! $line .= Element('dt', $matches[2]);
! 	 $line .= Element('dd', $matches[3]);
 }
 return $line;
***************
*** 550,558 ****
 // mode: headings, i.e. <h1>, <h2>, <h3>
 // lines starting with !,!!,!!! are headings
 function wtm_headings($line, &$trfrm) {
 if (preg_match("/^(!{1,3})[^!]/", $line, $whichheading)) {
! 	 if($whichheading[1] == '!') $heading = 'h3';
! 	 elseif($whichheading[1] == '!!') $heading = 'h2';
! 	 elseif($whichheading[1] == '!!!') $heading = 'h1';
 	 $line = preg_replace("/^!+/", '', $line);
 	 $line = $trfrm->SetHTMLMode($heading) . $line;
--- 550,560 ----
 // mode: headings, i.e. <h1>, <h2>, <h3>
 // lines starting with !,!!,!!! are headings
+ // Patch from steph/tara <te...@cl...>:
+ // use <h2>, <h3>, <h4> since <h1> is page title.
 function wtm_headings($line, &$trfrm) {
 if (preg_match("/^(!{1,3})[^!]/", $line, $whichheading)) {
! 	 if($whichheading[1] == '!') $heading = 'h4';
! 	 elseif($whichheading[1] == '!!') $heading = 'h3';
! 	 elseif($whichheading[1] == '!!!') $heading = 'h2';
 	 $line = preg_replace("/^!+/", '', $line);
 	 $line = $trfrm->SetHTMLMode($heading) . $line;
***************
*** 602,606 ****
 function wtm_hr($line, &$trfrm) {
 if (preg_match('/^-{4,}(.*)$/', $line, $m)) {
! 	 $line = $trfrm->SetHTMLMode('', 0) . '<hr>';
 	 if ($m[1])
 	 $line .= $trfrm->SetHTMLMode('p') . $m[1];
--- 604,608 ----
 function wtm_hr($line, &$trfrm) {
 if (preg_match('/^-{4,}(.*)$/', $line, $m)) {
! $line = $trfrm->SetHTMLMode('', 0) . Element('hr');
 	 if ($m[1])
 	 $line .= $trfrm->SetHTMLMode('p') . $m[1];

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv23940/lib
Modified Files:
	interwiki.map 
Log Message:
Add new entries collected by Adam Shand.
Add new entry: RFC
BUG note: The entry for Category will only work when USE_PATH_INFO
is set. When USE_PATH_INFO is false, the following entry will,
I think, work:
 Category index.php?pagename=Category
Index: interwiki.map
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.map,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** interwiki.map	2001年11月08日 19:07:43	1.3
--- interwiki.map	2001年11月14日 18:50:54	1.4
***************
*** 1,49 ****
! Wiki http://c2.com/cgi/wiki?
! PPR http://c2.com/cgi/wiki?
! C2find http://c2.com/cgi/wiki?FindPage&value=
! ZWiki http://www.zwiki.org/
! OrgPatterns http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns?
! FoxWiki http://fox.wikis.com/wc.dll?Wiki~
! PhpWiki http://phpwiki.sourceforge.net/phpwiki/index.php?
! DejaNews http://www.deja.com/=dnc/getdoc.xp?AN=
! MuWeb http://www.dunstable.com/scripts/MuWebWeb?
! PyWiki http://www.voght.com/cgi-bin/pywiki?
! Squeak http://minnow.cc.gatech.edu/squeak/
! UseMod http://www.usemod.com/cgi-bin/wiki.pl?
! MeatBall http://www.usemod.com/cgi-bin/mb.pl?
! MbTest http://www.usemod.com/cgi-bin/mbtest.pl?
! HammondWiki http://www.dairiki.org/HammondWiki/index.php3?
! Advogato http://www.advogato.org/
! MoinMoin http://purl.net/wiki/moin/
! EfnetPythonWiki http://purl.net/wiki/python/
! EfnetCppWiki http://purl.net/wiki/cpp/
! EfnetXmlWiki http://purl.net/wiki/xml/
! PolitizenWiki http://www.politizen.com/wiki.asp?
! DolphinWiki http://www.object-arts.com/wiki/html/Dolphin/
! LegoWiki http://www.object-arts.com/wiki/html/Lego-Robotics/
! TWiki http://twiki.sourceforge.net/cgi-bin/view/
! VisualWorks http://wiki.cs.uiuc.edu/VisualWorks/
! StrikiWiki http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
! BridgesWiki http://c2.com/w2/bridges/
! IMDB http://us.imdb.com/Title?
! JiniWiki http://www.cdegroot.com/cgi-bin/jini?
! Dictionary http://www.dictionary.com/cgi-bin/dict.pl?term=
! AndStuff http://andstuff.org/wiki.php?
! PythonInfo http://www.python.org/cgi-bin/moinmoin/
! CreationMatters http://www.ourpla.net/cgi-bin/wiki.pl?
! CmWiki http://www.ourpla.net/cgi-bin/wiki.pl?
! BenefitsWiki http://www.benefitslink.com/cgi-bin/wiki.cgi?
! Why http://clublet.com/c/c/why?
! SourceForge http://sourceforge.net/
! MetaWiki http://sunir.org/apps/meta.pl?
! AcadWiki http://xarch.tu-graz.ac.at/autocad/wiki/
! CLiki http://www.telent.net/cliki/
! SenseisLibrary http://senseis.xmp.net/?
! JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
! WikiPedia http://www.wikipedia.com/wiki.cgi?
! SeattleWireless http://seattlewireless.net/?
! Tavi http://tavi.sourceforge.net/index.php?
! PersonalTelco http://www.personaltelco.net/index.cgi/
! Google http://www.google.com/search?q=
! GoogleGroups http://groups.google.com/groups?q=
! EmacsWiki http://www.emacswiki.org/cgi-bin/wiki.pl?
--- 1,58 ----
! AcadWiki http://xarch.tu-graz.ac.at/autocad/wiki/
! Advogato http://www.advogato.org/
! AndStuff http://andstuff.org/wiki.php?
! BcWireless http://www.bcwireless.net/wiki-moinmoin/moin.cgi/
! BenefitsWiki http://www.benefitslink.com/cgi-bin/wiki.cgi?
! BrainBench http://www.brainbench.com/transcript.jsp?pid=
! BridgesWiki http://c2.com/w2/bridges/
! C2find http://c2.com/cgi/wiki?FindPage&value=
! Category Category
! CLiki http://www.telent.net/cliki/
! CmWiki http://www.ourpla.net/cgi-bin/wiki.pl?
! CreationMatters http://www.ourpla.net/cgi-bin/wiki.pl?
! DejaNews http://www.deja.com/=dnc/getdoc.xp?AN=
! Dictionary http://www.dictionary.com/cgi-bin/dict.pl?term=
! DolphinWiki http://www.object-arts.com/wiki/html/Dolphin/
! EfnetCeeWiki http://rm-f.net/~jh/c-wiki/moin.cgi/
! EfnetCppWiki http://purl.net/wiki/cpp/
! EfnetPythonWiki http://purl.net/wiki/python/
! EfnetXmlWiki http://purl.net/wiki/xml/
! EmacsWiki http://www.emacswiki.org/cgi-bin/wiki.pl?
! FoxWiki http://fox.wikis.com/wc.dll?Wiki~
! FreeNetworks http://www.freenetworks.org/index.cgi/
! FreshMeat http://freshmeat.net/
! Google http://www.google.com/search?q=
! GoogleGroups http://groups.google.com/groups?q=
! HammondWiki http://www.dairiki.org/HammondWiki/index.php3?
! IMDB http://us.imdb.com/Title?
! ISBN http://www.amazon.com/exec/obidos/ISBN=
! JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
! JiniWiki http://www.cdegroot.com/cgi-bin/jini?
! LegoWiki http://www.object-arts.com/wiki/html/Lego-Robotics/
! MbTest http://www.usemod.com/cgi-bin/mbtest.pl?
! MeatBall http://www.usemod.com/cgi-bin/mb.pl?
! MetaWiki http://sunir.org/apps/meta.pl?
! MoinMoin http://purl.net/wiki/moin/
! MuWeb http://www.dunstable.com/scripts/MuWebWeb?
! OrgPatterns http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns?
! PersonalTelco http://www.personaltelco.net/index.cgi/
! PhpWiki http://phpwiki.sourceforge.net/phpwiki/index.php?
! PolitizenWiki http://www.politizen.com/wiki.asp?
! PPR http://c2.com/cgi/wiki?
! PythonInfo http://www.python.org/cgi-bin/moinmoin/
! PyWiki http://www.voght.com/cgi-bin/pywiki?
! RFC http://www.faqs.org/rfcs/rfc%s.html
! SeattleWireless http://seattlewireless.net/?
! SenseisLibrary http://senseis.xmp.net/?
! SourceForge http://sourceforge.net/
! Squeak http://minnow.cc.gatech.edu/squeak/
! StrikiWiki http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
! TWiki http://twiki.sourceforge.net/cgi-bin/view/
! Tavi http://tavi.sourceforge.net/index.php?
! Thinki http://www.thinkware.se/cgi-bin/thinki.cgi/
! UseMod http://www.usemod.com/cgi-bin/wiki.pl?
! VisualWorks http://wiki.cs.uiuc.edu/VisualWorks/
! Why http://clublet.com/c/c/why?
! Wiki http://c2.com/cgi/wiki?
! WikiPedia http://www.wikipedia.com/wiki.cgi?
! ZWiki http://www.zwiki.org/

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv23631/lib
Modified Files:
	interwiki.php 
Log Message:
Add support for '%s' (which gets replaced by rhs of interwiki link)
in interwiki map URLs. (This is needed for the new RFC entry in
interwiki.map.)
Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** interwiki.php	2001年09月19日 02:36:24	1.7
--- interwiki.php	2001年11月14日 18:48:47	1.8
***************
*** 31,35 ****
 // Urlencode page only if it's a query arg.
 if (strstr($url, '?'))
! $url .= rawurlencode($page);
 else
 $url .= $page;
--- 31,38 ----
 // Urlencode page only if it's a query arg.
 if (strstr($url, '?'))
! $page = rawurlencode($page);
! 
! if (strstr($url, '%s'))
! $url = sprintf($url, $page);
 else
 $url .= $page;

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv9126/lib
Modified Files:
	transform.php 
Log Message:
Change regexp for InterWiki links to accept non-WikiWord right hand
sides. (Suggested by Adam Shand.)
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** transform.php	2001年09月18日 19:16:23	1.23
--- transform.php	2001年11月14日 17:54:45	1.24
***************
*** 296,300 ****
 $transform->register(WT_TOKENIZER, 'wtt_interwikilinks',
 			pcre_fix_posix_classes("!?(?<![[:alnum:]])") .
! 			"$InterWikiLinkRegexp:$WikiNameRegexp");
 }
 $transform->register(WT_TOKENIZER, 'wtt_bumpylinks', "!?$WikiNameRegexp");
--- 296,300 ----
 $transform->register(WT_TOKENIZER, 'wtt_interwikilinks',
 			pcre_fix_posix_classes("!?(?<![[:alnum:]])") .
! 			"$InterWikiLinkRegexp:\\S+");
 }
 $transform->register(WT_TOKENIZER, 'wtt_bumpylinks', "!?$WikiNameRegexp");

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6122/lib
Modified Files:
	loadsave.php 
Log Message:
When loading pages from a directory, ignore file names starting
with '.'. (Based on SF patch #480195 by Carsten Klapp.)
Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** loadsave.php	2001年11月09日 16:23:37	1.10
--- loadsave.php	2001年11月14日 17:43:50	1.11
***************
*** 353,357 ****
 while ($fn = readdir($handle))
 {
! if (filetype("$dir/$fn") != 'file')
 	 continue;
 
--- 353,357 ----
 while ($fn = readdir($handle))
 {
! if ($fn[0] == '.' || filetype("$dir/$fn") != 'file')
 	 continue;
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv2855/lib
Modified Files:
 Tag: release-1_2-branch
	setupwiki.php 
Log Message:
When loading pages from a directory, ignore file names starting
with '.'. (Based on SF patch #480195 by Carsten Klapp.)
Index: setupwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/setupwiki.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** setupwiki.php	2000年10月22日 19:33:35	1.3
--- setupwiki.php	2001年11月14日 17:42:01	1.3.2.1
***************
*** 91,95 ****
 while ($fn = readdir($handle))
 	{
! 	 if (filetype("$dir/$fn") != 'file')
 	 continue;
 	 $stat = stat("$dir/$fn");
--- 91,95 ----
 while ($fn = readdir($handle))
 	{
! 	 if ($fn[0] == '.' || filetype("$dir/$fn") != 'file')
 	 continue;
 	 $stat = stat("$dir/$fn");

Update of /cvsroot/phpwiki/phpwiki/admin
In directory usw-pr-cvs1:/tmp/cvs-serv2855/admin
Modified Files:
 Tag: release-1_2-branch
	loadserial.php 
Log Message:
When loading pages from a directory, ignore file names starting
with '.'. (Based on SF patch #480195 by Carsten Klapp.)
Index: loadserial.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/Attic/loadserial.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** loadserial.php	2001年02月14日 06:32:19	1.1.2.1
--- loadserial.php	2001年11月14日 17:42:01	1.1.2.2
***************
*** 20,24 ****
 while ($file = readdir($handle)) {
 
! if ($file == "." || $file == "..")
 continue;
 
--- 20,24 ----
 while ($file = readdir($handle)) {
 
! if ($file[0] == ".")
 continue;
 

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv29584
Modified Files:
	UPGRADING 
Log Message:
Warn about zip-dump bug in 1.2.0 and 1.2.1.
Index: UPGRADING
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/UPGRADING,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** UPGRADING	2001年11月09日 20:36:45	1.5
--- UPGRADING	2001年11月14日 17:15:42	1.6
***************
*** 36,39 ****
--- 36,46 ----
 should get you a zip dump.)
 
+ WARNING! WARNING! WARNING! There is a bug in releases 1.2.0
+ and 1.2.1 of PhpWiki which results in corrupt zip dumps if
+ you are using the DBA, DBM or flat-file backends. If you
+ are using one of those backends you should make sure to
+ fix that bug (see note below) before making the zip dump.
+ 
+ 
 3. Now upload your zip dump to your new 1.3 wiki. (First you need to
 have set the admin user/passwd in the new index.php.) You should
***************
*** 75,78 ****
--- 82,116 ----
 An older note of mine on the same subject can be found at:
 http://sourceforge.net/forum/message.php?msg_id=107858
+ 
+ 
+ ==========
+ 
+ On the zip-dump bug in 1.2.0 and 1.2.1.
+ 
+ There is a bug which causes PhpWiki release 1.2.0 or 1.2.1 to produce
+ corrupt zip dumps if you are using the DBA, DBM or flat-file backends.
+ 
+ To fix the bug, either upgrade to release 1.2.2, or patch your PhpWiki
+ source code as follows:
+ 
+ To Manually Patch PhpWiki 1.2.0 or 1.2.1:
+ 
+ 1. Edit the appropriate backend driver:
+ Backend Driver File
+ ======= ============
+ DBA lib/dbalib.php
+ DBM lib/dbmlib.php
+ flat file lib/db_filesystem.php
+ 
+ 2. Find the function definition for RetrievePage(). (Look for a file
+ which begins "function RetrievePage"...)
+ 
+ 3. Within RetrievePage() look for the line which begins: 
+ $pagehash = unserialize(
+ (the exact arguments of unserialize depend on the backend.)
+ 
+ 4. Immediately after that line add a line which reads:
+ $pagehash['pagename'] = $pagename;
+ 
 
 $Id$

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv26510
Modified Files:
	index.php 
Log Message:
Fix typo.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** index.php	2001年11月14日 15:36:41	1.27
--- index.php	2001年11月14日 17:07:07	1.28
***************
*** 21,26 ****
 // include_path here) make sure you include the path to the PEAR
 // code in include_path. (To find the PEAR code on your system, search
- //
 // for a file named 'PEAR.php'. Some common locations are:
 // Unixish systems:
 // /usr/share/php
--- 21,26 ----
 // include_path here) make sure you include the path to the PEAR
 // code in include_path. (To find the PEAR code on your system, search
 // for a file named 'PEAR.php'. Some common locations are:
+ //
 // Unixish systems:
 // /usr/share/php

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv27479
Modified Files:
	index.php 
Log Message:
Add note about making sure the path to PEAR code is in include_path.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** index.php	2001年11月09日 18:58:42	1.26
--- index.php	2001年11月14日 15:36:41	1.27
***************
*** 16,20 ****
 // rest of the PhpWiki code, you can set the include_path here.
 
! 
 //ini_set('include_path', '.:/where/you/installed/phpwiki');
 
--- 16,32 ----
 // rest of the PhpWiki code, you can set the include_path here.
 
! // NOTE: phpwiki uses the PEAR library of php code for SQL database
! // access. Your PHP is probably already configured to set include_path
! // so that PHP can find the pear code. If not (or if you change
! // include_path here) make sure you include the path to the PEAR
! // code in include_path. (To find the PEAR code on your system, search
! //
! // for a file named 'PEAR.php'. Some common locations are:
! // Unixish systems:
! // /usr/share/php
! // /usr/local/share/php
! // Mac OS X:
! // /System/Library/PHP
! //
 //ini_set('include_path', '.:/where/you/installed/phpwiki');
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv25639/lib
Modified Files:
	main.php 
Log Message:
Comment out the not yet implemented action=xmldump code.
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** main.php	2001年11月09日 17:58:09	1.16
--- main.php	2001年11月14日 15:29:50	1.17
***************
*** 149,152 ****
--- 149,153 ----
 break;
 
+ /* Not yet implemented: 
 case 'xmldump':
 // FIXME:
***************
*** 161,165 ****
 $xmlwriter->end();
 break;
! 
 case 'upload':
 include_once("lib/loadsave.php");
--- 162,167 ----
 $xmlwriter->end();
 break;
! */
! 
 case 'upload':
 include_once("lib/loadsave.php");

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv6870/lib/plugin
Added Files:
	Calendar.php 
Log Message:
First crack at calendar plugin based on ideas from Gary Benson.
***** Error reading new file: [Errno 2] No such file or directory: 'Calendar.php'

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv6870
Modified Files:
	phpwiki.css 
Log Message:
First crack at calendar plugin based on ideas from Gary Benson.
Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** phpwiki.css	2001年09月18日 19:16:23	1.3
--- phpwiki.css	2001年11月10日 04:56:18	1.4
***************
*** 186,189 ****
--- 186,198 ----
 TEXTAREA.wikiedit { width: 100%; margin-top: 1ex; }
 
+ 
+ /* Calendar plugin */
+ 
+ a.cal-hide, a.cal-arrow { text-decoration: none; }
+ .cal-arrow { font-weight: bold; }
+ .cal-header { font-size: larger; }
+ .cal-dayname { font-size: smaller; text-decoration: underline; }
+ table.cal { border: thin solid black; } 
+ 
 /* For emacs users
 *

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv11398
Modified Files:
	UPGRADING 
Log Message:
Updated notes on how to move an older PhpWiki to a new 1.3.x wiki.
Index: UPGRADING
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/UPGRADING,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** UPGRADING	2001年11月07日 22:27:54	1.4
--- UPGRADING	2001年11月09日 20:36:45	1.5
***************
*** 1,59 ****
 FIXME: WARNING WARNING: the schemas used by the new databases
 are completely incompatible with schemas in any previous version
! of PhpWiki. If you install this new PhpWiki, you must start with a
! new empty database (currently either mysql or dba). (It will be
! filled with the usual default pages.)
 
 FIXME: add more.
 
 
! More comprehensive updgrading information is forthcoming... however in
! the meantime, this message is in the Open Discussion board on
! Sourceforge (see URL below for the thread). In it Jeff describes how
! to dump your current Wiki to a zip file and load the zip file into a
! new Wiki.
! 
! To: no...@so...
! Subject: [phpwiki - Open Discussion] RE: convert dbm to mySql
! From: nobody <no...@so...>
! Date: 2001年2月09日 16:42:57 -0800
! 
! Read and respond to this message at: 
! http://sourceforge.net/forum/message.php?msg_id=107858
! By: dairiki
! 
! Yes this is a little clumsy and non-obvious.
! I'm currently working on making it better (at least
! in the development branch.)
! 
! In the mean time, here's how I suggest you
! 
! Get either a zip dump, or a serialized dump from your
! old wiki. (But first, create a copy of FrontPage called HomePage, or
! else you will have trouble loading the new wiki. It will try to load
! the zip file every time since it doesn't detect a HomePage. --SW)
! 
! (If your using a zip dump, it must (for now) be
! on the server machine. Copy it there if it's not
! there yet.)
! 
! Edit lib/config.php in the new wiki and set WIKI_PGSRC
! to point either to your zip file, or the the serialized
! dump directory.
! 
! Blow away the database of your new wiki.
! (Delete the db files for a db base wiki,
! or do something like:
! mysql -u <user> -p <database> < schemas/schema.mysql
! to blow away a mysql based wiki.
! 
! Now with your web browser, go browse to
! the HomePage of your new wiki. It will detect
! that it's working with a virgin database and
! will pull in the pages from the source
! specified in WIKI_PGSRC.
 
- Jeff
 
 
 $Id$
--- 1,78 ----
 FIXME: WARNING WARNING: the schemas used by the new databases
 are completely incompatible with schemas in any previous version
! (i.e. before release 1.3.1 of PhpWiki). If you install this new
! PhpWiki, you must start with a new empty database (currently
! either mysql, postgres or dba). (It will be filled with the
! usual default pages.)
 
 FIXME: add more.
 
+ Here's an excerpt from a note I posted on phpwiki-talk with my 
+ recommendation on how to move a wiki from and older version of 
+ PhpWiki to a 1.3.x PhpWiki:
+ 
+ From: Jeff Dairiki <da...@da...>
+ Cc: php...@li...
+ Date: Fri, 9 Nov 2001 11:33:18 -0800
+ 
+ > Now, say I want to migrate all my 1.2.1 pages. I need to do a zip dump 
+ > (does the admin page let me do that?) and then.... what?
+ 
+ It's still a bit of a messy process at this point. Here's my suggestion.
+ 
+ 1. Start 1.3.x with an empty database. Browse the FrontPage. This should
+ fill the wiki with the distributed default 1.3.x pgsrc. (You've probably
+ already gotten this far.)
+ 
+ 2. Make a zip dump of your 1.2 wiki. If the contents of
+ PhpWikiAdministration are correct there should be a links 
+ (near the top) which will do that for you. You need to be
+ in admin mode, though. This means you must have set an
+ admin user and passwd in admin.php, and you should be browsing
+ through a URL like:
+ http://path.to.your/wiki/admin.php?PhpWikiAdministration
+ (If your PhpWikAdministration page is broken, then
+ http://path.to.your/wiki/admin.php?zip=all
+ should get you a zip dump.)
+ 
+ 3. Now upload your zip dump to your new 1.3 wiki. (First you need to
+ have set the admin user/passwd in the new index.php.) You should
+ be able to use the "Upload File" form on the PhpWikiAdministration
+ page.
+ 
+ 
+ If that works, the pages from your 1.2 wiki have now overwritten
+ the 1.3 pages (though the 1.3 pages are still saved in the archive).
+ This will break a bunch of 1.3 functionality until you restore
+ the page contents. Of the top of my head, some pages for which 
+ this will be an issue are:
+ MostPopular, RecentChanges, PhpWikiAdministration,
+ MagicPhpWikiURLs, and ReleaseNotes.
+ 
+ To restore these pages to the original (1.3) contents:
+ 
+ 4a. Login as the administration user (using the SignIn button at the
+ bottom right corner of the page.) (You need to do this because
+ some of the pages which need fixing are locked.)
+ 
+ 4b. Browse to a page which needs restoring. Hit the "History" button
+ (at the bottom of the page). This should get you a list of all
+ archived versions of the page.
+ 
+ 4c. Browse to the archive 1.3 version of the page (probably version number
+ 1) by clicking on the version number of the desired version.
+ 
+ 4d. Click the "Edit old revision" button (bottom of page). This should
+ get you to the edit form.
+ 
+ 4e. Click the "Save" button. This should save the archived page contents
+ as the current contents.
 
! We really need to figure out a way to simplify this process, but, for now,
! that's what you gotta do.
 
 
+ An older note of mine on the same subject can be found at:
+ http://sourceforge.net/forum/message.php?msg_id=107858
 
 $Id$

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv5400
Modified Files:
	index.php 
Log Message:
Address SF bug #480064: "relative" vs "absolute" URLs (in comments).
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** index.php	2001年11月09日 16:25:02	1.25
--- index.php	2001年11月09日 18:58:42	1.26
***************
*** 348,352 ****
 
 /*
! * Absolute URL (from the server root) of the PhpWiki
 * script.
 */
--- 348,352 ----
 
 /*
! * Relative URL (from the server root) of the PhpWiki
 * script.
 */
***************
*** 354,358 ****
 
 /*
! * Absolute URL (from the server root) of the directory
 * in which relative URL's for images and other support files
 * are interpreted.
--- 354,358 ----
 
 /*
! * Relative URL (from the server root) of the directory
 * in which relative URL's for images and other support files
 * are interpreted.

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv16259/lib
Modified Files:
	main.php 
Log Message:
Fix SF bug #480061: Example search forms on MagicPhpWikiURLs
were broken.
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** main.php	2001年11月08日 16:02:40	1.15
--- main.php	2001年11月09日 17:58:09	1.16
***************
*** 113,123 ****
 
 case 'search':
! $request->compress_output();
 if ($request->getArg('searchtype') == 'full') {
! include "lib/fullsearch.php";
 }
 else {
! include "lib/search.php";
 }
 break;
 
--- 113,127 ----
 
 case 'search':
! // This is obsolete: reformulate URL and redirect.
! // FIXME: this whole section should probably be deleted.
 if ($request->getArg('searchtype') == 'full') {
! $search_page = gettext('FullTextSearch');
 }
 else {
! $search_page = gettext('TitleSearch');
 }
+ $request->redirect(WikiURL($search_page,
+ array('s' => $request->getArg('searchterm')),
+ 'absolute_url'));
 break;
 

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv16259/pgsrc
Modified Files:
	MagicPhpWikiURLs 
Log Message:
Fix SF bug #480061: Example search forms on MagicPhpWikiURLs
were broken.
Index: MagicPhpWikiURLs
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/MagicPhpWikiURLs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MagicPhpWikiURLs	2001年05月31日 17:45:24	1.4
--- MagicPhpWikiURLs	2001年11月09日 17:58:09	1.5
***************
*** 57,64 ****
 * [ Lock the HomePage | phpwiki:HomePage?action=lock ],
 * [ Get a Full Zip Dump | phpwiki:?action=zip&include=all ],
! * [ Page titles containing 'wiki' | phpwiki:?action=search&searchterm=wiki ],
 
 !! Writing Magic Forms in Wiki Pages
 
 If one of the ''query-args'' has a value like
 ''arg''__=__''opt-width''__(__''opt-dflt-val''__)__
--- 57,66 ----
 * [ Lock the HomePage | phpwiki:HomePage?action=lock ],
 * [ Get a Full Zip Dump | phpwiki:?action=zip&include=all ],
! * [ Page titles containing 'wiki' | phpwiki:TitleSearch?s=wiki ],
 
 !! Writing Magic Forms in Wiki Pages
 
+ ''__Note__: Magic forms are on their way out, I think. They are being superceded by <''''?plugin-form>s.''
+ 
 If one of the ''query-args'' has a value like
 ''arg''__=__''opt-width''__(__''opt-dflt-val''__)__
***************
*** 73,86 ****
 Examples:
 
! [[ Full Search | phpwiki:?action=search&searchtype=full&searchterm=() ] 
 gives
! [ Full Search | phpwiki:?action=search&searchtype=full&searchterm=() ] 
 
 While
! [[ phpwiki:?action=search&searchterm=12() ]
 yields
! [ phpwiki:?action=search&searchterm=12() ]
 
 Other examples:
 [ Browse Page | phpwiki:?action=browse&pagename=() ]
- 
--- 75,87 ----
 Examples:
 
! [[ Full Search | phpwiki:FullTextSearch?s=() ] 
 gives
! [ Full Search | phpwiki:FullTextSearch?s=() ] 
 
 While
! [[ phpwiki:TitleSearch?s=12() ]
 yields
! [ phpwiki:TitleSearch?s=12() ]
 
 Other examples:
 [ Browse Page | phpwiki:?action=browse&pagename=() ]

Update of /cvsroot/phpwiki/phpwiki/locale/sv/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv377/locale/sv/pgsrc
Added Files:
 Tag: release-1_2-branch
	G%e4stboken HurManAnv%e4nderWiki L%e4ggaTillSidor 
	MestPopul%e4r S%f6kEfterSida Sandl%e5dan Senaste%c4ndringar 
Removed Files:
 Tag: release-1_2-branch
	Gästboken HurManAnvänderWiki LäggaTillSidor MestPopulär 
	Sandlådan SenasteÄndringar SökEfterSida 
Log Message:
Renamed pgsrc files whose filenames contained non-ascii characters.
These files seemed to be giving certain CVS clients (Mac OS X) gas.
Note that there is nothing wrong with non-ASCII characters in
wiki-page names --- it's just that the wiki-page name should be
urlencode()ed for use as a file name.
(See SF bug #479256.)
--- NEW FILE ---
Signera med namn och datum nedan!
Jeff Dairiki, Arno Hollosi, SteveWainstead, Php Wiki-programmerarna
--- NEW FILE ---
''"Wiki wiki"'' betyder "snabb" på Hawai.
__Allt du behöver veta är:__
* För att redigera en sida, klicka på länken längst ned på sidan. Du bör göra det nu på en gång och läsa källkoden för den här sidan. Det är vettigare.
* Du får lutande text genom att sätta två apostrofer på var sin sida om ordet ''så här''.
* Du får __fet text__ genom att sätta två understreck på var sin sida.
* Och __''fet lutande text''__ genom att använda båda.
* Du får punkter genom att använda asterisk i början av raden
* För att få text med lika breda tecken, indentera med ett mellanslag:
 det här är en dikt
 om text med lika breda tecken
 det är lätt att rimma på dikt
 men inte med lika breda tecken
* Du kan separera paragrafer med en extra blankrad. Exempel:
Jag är en paragraf.
Jag är också en paragraf. Vi är bara väldigt små paragrafer.
* Du kan få horisontella linjer genom att skriva fyra eller fler streck så här:
--------
* För att skapa hyperlänkar behöver du bara skriva ord som börjar med stor bokstav och sätta ihop dem. Låt oss säga att du vill skapa en sida om att Steve Wainstead äter maskar. Allt du behöver göra är att skriva orden med stor bokstav i början och sätta ihop dem så här: SteveWainsteadEatsWorms. Om sidan inte existerar än kommer det finnas ett frågetecken efter länken som inbjuder dig att skapa sidan: [DenHärSidanSkaInteFinnas]. (Var snäll och inte förstör exemplet genom att skapa sidan.)
* För att länka till sidor utanför Wikin kan du bara skriva URL:en och Wiki kommer skapa en länk åt dig: http://www.nytimes.com/
* För att inkludera bilder, skriv en hyperlänk innanför hakparenteser så här: [[http://www.dindator.dindomän/bild.png]. URL:er till bilder som inte är innanför hakparenteser blir en vanlig länk till bilden.
* Nu är du redo att [LäggaTillSidor].
----
En WikiWikiWeb är menad att vara snabb och lätt att ändra. Den har ett enkelt uppmärkningsspråk som du kan läsa om i [Textformateringsregler].
--- NEW FILE ---
Allt du behöver göra för att skapa en sida i Wiki är att komma på en
meningsfull titel, skriva alla ord med stor bokstav i början av ordet
och [SättaIhopDemSåHär]. Wiki kommer automatiskt att känna igen det som
en hyperlänk. Alternativt kan du sätt vad som helst innanför
[hakparenteser]. Wiki känner inte igen länkar med sammansatta ord om
orden innehåller å,ä eller ö, t.ex. GratisÖlÅtAllaÄlgar. I dessa fall
måste hakparenteser användas.
Sedan kan du [KlickaPåFrågetecknet] efter hyperlänken så öppnar Wiki ett
fönster där du kan beskriva den nya sidan.
Vill du lägga till ett dokument med komplicerad design till Wiki är det
bättre om du ger en URL istället för att försöka skriva dokumentet här. Det
gör du på det här sättet:
 Projekthemsidan för PhpWiki: http://phpwiki.sourceforge.net
Wiki stöder inte HTML-taggar (se [Textformateringsregler]). <taggar>De
kommer att rendreras som text.</taggar> Wiki är menat att vara så
enkelt som möjligt för att uppmuntra dess användning.
Observera att det är möjligt för systemadministratören att tillåta
inbäddad HTML, men det innebär säkerhetsrisker.
--- NEW FILE ---
De 20 mest populära sidorna för den här wikin:
(antal träffar, namn på sidan)
%%Mostpopular%%
--- NEW FILE ---
Här är några bra startpunkter för att leta.
* [HurManAnvänderWiki] är en snabb introduktion till hur man skriver i Wiki.
* [SenasteÄndringar] ändras automatiskt.
* MerOmMekanismerna om hur man söker och ändrar på den här servern.
Här är titelsökningen. Försök med ord wom ''wiki'' eller ''smörgås''.
%%Search%%
Använd följande för fulltextsökning. Det kan ta några
sekunder. Resultatet visar alla rader på en sidan som innehåller
en träff.
%%Fullsearch%%
------
Separera ord med mellanslag. Alla ord måste matcha.
%%%För att exkludera ord sätt ett "-" framför.
%%%Exempel: "wiki text -php" söker på alla sidor som innehåller orden "wiki"
__och__ "text", men __inte__ innehåller ordet "php".
--- NEW FILE ---
Här kan du pröva Wiki.
Ha det så roligt :-)
--- NEW FILE ---
De senaste ändrade sidorna listas nedan.
____Dag ett (första dagen för den här Wikin)
* [LäggaTillSidor]
* [KonverteraMellanslagTillTabbar]
* [RedigeraText]
* [SökEfterSida]
* [Framsida]
* [BraStil]
* [HurManAnvänderWiki]
* [MerOmMekanismerna]
* [MestPopulär]
* [PhpWiki]
* [SenasteÄndringar]
* [Gästboken]
* [ReleaseNotes]
* [Sandlådan]
* [SteveWainstead]
* [TestPage]
* [Textformateringsregler]
* [WabiSabi]
* [WikiWikiWeb]
Snabb titelsökning:
%%Search%%
----
--- Gästboken DELETED ---
--- HurManAnvänderWiki DELETED ---
--- LäggaTillSidor DELETED ---
--- MestPopulär DELETED ---
--- Sandlådan DELETED ---
--- SenasteÄndringar DELETED ---
--- SökEfterSida DELETED ---