phpwiki-checkins Mailing List for PhpWiki (Page 508)

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6353/lib
Modified Files:
	diff.php 
Added Files:
	difflib.php 
Log Message:
Refactor diff code:
 o Code clean-up and refactor.
 o Split the PhpWiki-independent part of the code into lib/difflib.php.
 o New CSS-formatted unified diff output replaces old table-heavy format.
 o Add character-level diffs.
Issues:
 o New CSS-formatted diffs are very ugly in NS4 (and probably other
 oldish browsers.)
 o Character-level diffs may be overkill. Maybe back off to
 word-level diffs?
***** Error reading new file: [Errno 2] No such file or directory: 'difflib.php'
Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** diff.php	2001年12月11日 05:51:10	1.16
--- diff.php	2001年12月13日 05:10:04	1.17
***************
*** 3,1025 ****
 // diff.php
 //
! // A PHP diff engine for phpwiki.
 //
! // Copyright (C) 2000 Geoffrey T. Dairiki <da...@da...>
 // You may copy this code freely under the conditions of the GPL.
 //
 
! // FIXME: possibly remove assert()'s for production version?
 
[...1185 lines suppressed...]
***************
*** 1143,1149 ****
 }
 else {
! //$fmt = new WikiDiffFormatter;
! $fmt = new WikiUnifiedDiffFormatter;
! $html .= $fmt->format($diff, $old->getContent());
 }
 }
--- 278,287 ----
 }
 else {
! // New CSS formatted unified diffs (ugly in NS4).
! $fmt = new HtmlUnifiedDiffFormatter;
! 
! // Use this for old table-formatted diffs.
! //$fmt = new TableUnifiedDiffFormatter;
! $html .= $fmt->format($diff);
 }
 }

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6239/lib
Modified Files:
	ErrorManager.php 
Log Message:
Fix typo.
Index: ErrorManager.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ErrorManager.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ErrorManager.php	2001年11月21日 19:46:50	1.3
--- ErrorManager.php	2001年12月13日 05:06:06	1.4
***************
*** 189,193 ****
 $this->_flush_errors();
 if ($this->_fatal_handler)
! $this->_fatal_hander->call($error);
 exit -1;
 }
--- 189,193 ----
 $this->_flush_errors();
 if ($this->_fatal_handler)
! $this->_fatal_handler->call($error);
 exit -1;
 }

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv11004/lib
Modified Files:
	stdlib.php transform.php 
Log Message:
Bug fix: empty square brackets lead to "Fatal Database Error" and
other problems.
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** stdlib.php	2001年12月11日 18:16:12	1.58
--- stdlib.php	2001年12月12日 23:51:25	1.59
***************
*** 422,426 ****
 
 // bracket links (only type wiki-* is of interest)
! $numBracketLinks = preg_match_all("/\[\s*([^\]|]+\|)?\s*(.+?)\s*\]/", $line, $brktlinks);
 for ($i = 0; $i < $numBracketLinks; $i++) {
 $link = ParseAndLink($brktlinks[0][$i]);
--- 422,426 ----
 
 // bracket links (only type wiki-* is of interest)
! $numBracketLinks = preg_match_all("/\[\s*([^\]|]+\|)?\s*(\S.*?)\s*\]/", $line, $brktlinks);
 for ($i = 0; $i < $numBracketLinks; $i++) {
 $link = ParseAndLink($brktlinks[0][$i]);
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** transform.php	2001年12月12日 23:38:53	1.29
--- transform.php	2001年12月12日 23:51:25	1.30
***************
*** 437,446 ****
 function wtt_bracketlinks($match, &$trfrm)
 {
! $link = ParseAndLink($match);
! if (strstr($link['link'], "</form>")) {
! // FIXME: BIG HACK: see note in wtm_plugin.
! return "</p>" . $link['link'] . "<p>";
! }
! return $link["link"];
 }
 
--- 437,450 ----
 function wtt_bracketlinks($match, &$trfrm)
 {
! if (preg_match('/^\[\s*\]$/', $match)) {
! return htmlspecialchars($match);
! }
! 
! $link = ParseAndLink($match);
! if (strstr($link['link'], "</form>")) {
! // FIXME: BIG HACK: see note in wtm_plugin.
! return "</p>" . $link['link'] . "<p>";
! }
! return $link["link"];
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv7548/lib
Modified Files:
	transform.php 
Log Message:
Fix "Lists nested too deep in SetHTMLOutputMode" bug (again).
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** transform.php	2001年12月06日 18:41:21	1.28
--- transform.php	2001年12月12日 23:38:53	1.29
***************
*** 186,189 ****
--- 186,191 ----
 function ListItem($list_type, $level, $defn_term = '')
 {
+ $level = min($level, 10);
+ 
 $retval = $this->SetHTMLMode($list_type, 2 * $level - 1);
 if ($list_type == 'dl') {

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv10198/templates
Modified Files:
	browse.html 
Log Message:
Add link to RecentChanges.
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** browse.html	2001年12月11日 22:41:40	1.25
--- browse.html	2001年12月12日 16:58:57	1.26
***************
*** 55,59 ****
 </td>
 <td align="right">
! <?php echo LinkExistingWikiWord(_("FindPage")) ?> 
 | <span><input type="hidden" name="auto_redirect" value="1" />
 <input type="text" name="s" size="12"
--- 55,60 ----
 </td>
 <td align="right">
! <?php echo LinkExistingWikiWord(_("RecentChanges")) ?> 
! | <?php echo LinkExistingWikiWord(_("FindPage")) ?> 
 | <span><input type="hidden" name="auto_redirect" value="1" />
 <input type="text" name="s" size="12"

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv991/phpwiki/lib
Modified Files:
	ziplib.php 
Log Message:
sf #482938 Content-Disposition parameter
Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ziplib.php	2001年12月11日 18:21:38	1.10
--- ziplib.php	2001年12月12日 05:12:46	1.11
***************
*** 239,243 ****
 $zipname = addslashes($zipname);
 header("Content-Type: application/zip; name=\"$zipname\"");
! header("Content-Disposition: save; filename=\"$zipname\"");
 }
 
--- 239,243 ----
 $zipname = addslashes($zipname);
 header("Content-Type: application/zip; name=\"$zipname\"");
! header("Content-Disposition: attachment; filename=\"$zipname\"");
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv797/phpwiki/lib
Modified Files:
 Tag: release-1_2-branch
	ziplib.php 
Log Message:
sf #482938 Content-Disposition parameter
Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** ziplib.php	2001年11月07日 20:32:24	1.2.2.3
--- ziplib.php	2001年12月12日 05:12:06	1.2.2.4
***************
*** 241,245 ****
 $zipname = addslashes($zipname);
 header("Content-Type: application/zip; name=\"$zipname\"");
! header("Content-Disposition: save; filename=\"$zipname\"");
 }
 
--- 241,245 ----
 $zipname = addslashes($zipname);
 header("Content-Type: application/zip; name=\"$zipname\"");
! header("Content-Disposition: attachment; filename=\"$zipname\"");
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv11353/lib/plugin
Modified Files:
	RecentChanges.php 
Log Message:
Set RSS channel title from new config var WIKI_NAME.
Added "RSS" icon (which links to RSSified RecentChanges) 
to the HTML version of RecentChanges.
Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** RecentChanges.php	2001年12月08日 16:30:44	1.4
--- RecentChanges.php	2001年12月11日 22:45:39	1.5
***************
*** 25,35 ****
 'exclude_major_revisions' => !$show_major,
 'include_all_revisions' => $show_all);
! if ($days > 0.0) {
 $params['since'] = time() - 24 * 3600 * $days;
- $title = sprintf(_("RecentChanges in the past %.1f days"), $args['days']);
- }
- else {
- $title = _("RecentChanges");
- }
 
 $changes = $dbi->mostRecent($params);
--- 25,31 ----
 'exclude_major_revisions' => !$show_major,
 'include_all_revisions' => $show_all);
! 
! if ($days > 0.0)
 $params['since'] = time() - 24 * 3600 * $days;
 
 $changes = $dbi->mostRecent($params);
***************
*** 44,48 ****
 header("Content-Type: application/xml; charset=" . RSS_ENCODING);
 
! $xml = $this->__format_as_rss($changes, $title, $args, $request);
 printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", RSS_ENCODING);
 printf("<!-- Generated by PhpWiki:\n%s-->\n", $GLOBALS['RCS_IDS']);
--- 40,44 ----
 header("Content-Type: application/xml; charset=" . RSS_ENCODING);
 
! $xml = $this->__format_as_rss($changes, $args, $request);
 printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", RSS_ENCODING);
 printf("<!-- Generated by PhpWiki:\n%s-->\n", $GLOBALS['RCS_IDS']);
***************
*** 51,60 ****
 break;
 default:
! return $this->__format_as_html($changes, $title, $args);
 break;
 }
 }
 
! function __format_as_html($changes, $title, $args) {
 
 global $dateformat;
--- 47,56 ----
 break;
 default:
! return $this->__format_as_html($changes, $args, $request);
 break;
 }
 }
 
! function __format_as_html($changes, $args, $request) {
 
 global $dateformat;
***************
*** 67,71 ****
 
 // FIXME: add XML icon (and link) to title?
! $html = QElement('h3', $title);
 
 $limit = $args['limit'];
--- 63,73 ----
 
 // FIXME: add XML icon (and link) to title?
! $rss_url = $request->getURLtoSelf(array('format' => 'rss'));
! $rss_icon = Element('a', array('href' => $rss_url),
! Element('img', array('src' => DataURL('images/rss.png'),
! 'alt' => 'RSS available',
! 'class' => 'linkicon')));
! 
! $html = Element('h3', htmlspecialchars(_("RecentChanges")) . " $rss_icon");
 
 $limit = $args['limit'];
***************
*** 120,130 ****
 }
 
! function __format_as_rss($changes, $title, $args, $request) {
 include_once('lib/RssWriter.php');
 $rss = new RssWriter;
 $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
! 
! $chan = array('title' => 'PhpWiki', // FIXME: this should be a config define
! 'dc:description' => $title,
 'link' => $rc_url,
 'dc:date' => Iso8601DateTime(time()));
--- 122,132 ----
 }
 
! function __format_as_rss($changes, $args, $request) {
 include_once('lib/RssWriter.php');
 $rss = new RssWriter;
 $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
! 
! $chan = array('title' => WIKI_NAME,
! 'dc:description' => _("RecentChanges"),
 'link' => $rc_url,
 'dc:date' => Iso8601DateTime(time()));

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv11353/lib
Modified Files:
	Request.php 
Log Message:
Set RSS channel title from new config var WIKI_NAME.
Added "RSS" icon (which links to RSSified RecentChanges) 
to the HTML version of RecentChanges.
Index: Request.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Request.php	2001年12月11日 18:41:03	1.5
--- Request.php	2001年12月11日 22:45:38	1.6
***************
*** 59,62 ****
--- 59,74 ----
 }
 
+ function getURLtoSelf($args = false) {
+ $get_args = $this->args;
+ if ($args)
+ $get_args = array_merge($get_args, $args);
+ 
+ unset ($get_args['pagename']);
+ if ($get_args['action'] == 'browse')
+ unset($get_args['action']);
+ 
+ return WikiURL($this->getArg('pagename'), $get_args);
+ }
+ 
 
 function redirect($url) {

Update of /cvsroot/phpwiki/phpwiki/images
In directory usw-pr-cvs1:/tmp/cvs-serv11353/images
Added Files:
	rss.png 
Log Message:
Set RSS channel title from new config var WIKI_NAME.
Added "RSS" icon (which links to RSSified RecentChanges) 
to the HTML version of RecentChanges.
--- NEW FILE ---
‰PNG


Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv11353
Modified Files:
	phpwiki.css 
Log Message:
Set RSS channel title from new config var WIKI_NAME.
Added "RSS" icon (which links to RSSified RecentChanges) 
to the HTML version of RecentChanges.
Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** phpwiki.css	2001年12月11日 05:51:14	1.8
--- phpwiki.css	2001年12月11日 22:45:38	1.9
***************
*** 176,180 ****
 margin-right: 0.5ex;
 margin-left: 0.25ex;
! vertical-align: bottom;
 }
 
--- 176,180 ----
 margin-right: 0.5ex;
 margin-left: 0.25ex;
! vertical-align: middle /* bottom */;
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv9145/lib
Modified Files:
	config.php display.php Template.php 
Log Message:
Name the wiki (SF task #34142).
New config define: WIKI_NAME, which is used to generate a KEYWORDS
meta tag, and also for the channel title in RSS output.
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** config.php	2001年11月29日 03:00:19	1.46
--- config.php	2001年12月11日 22:41:39	1.47
***************
*** 268,271 ****
--- 268,275 ----
 }
 
+ if (!defined('WIKI_NAME')) {
+ define('WIKI_NAME', "An unnamed PhpWiki");
+ }
+ 
 // FIXME: delete
 // Access log
Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** display.php	2001年09月19日 03:24:36	1.11
--- display.php	2001年12月11日 22:41:40	1.12
***************
*** 7,10 ****
--- 7,44 ----
 require_once('lib/transform.php');
 
+ /**
+ * Guess a short description of the page.
+ *
+ * Algorithm:
+ *
+ * This algorithm was suggested on MeatballWiki by
+ * Alex Schroeder <ken...@ya...>.
+ *
+ * Use the first paragraph in the page which contains at least two sentences.
+ *
+ * @see http://www.usemod.com/cgi-bin/mb.pl?MeatballWikiSuggestions
+ */
+ function GleanDescription ($rev) {
+ $two_sentences
+ = pcre_fix_posix_classes("/[.?!]\s+[[:upper:])]"
+ . ".*"
+ . "[.?!]\s*([[:upper:])]|$)/sx");
+ 
+ $content = $rev->getPackedContent();
+ 
+ // Iterate through paragraphs.
+ while (preg_match('/(?: ^ \w .* $ \n? )+/mx', $content, $m)) {
+ $paragraph = $m[0];
+ 
+ // Return paragraph if it contains at least two sentences.
+ if (preg_match($two_sentences, $paragraph)) {
+ return preg_replace("/\s*\n\s*/", " ", trim($paragraph));
+ }
+ 
+ $content = substr(strstr($content, $paragraph), strlen($paragraph));
+ }
+ return '';
+ }
+ 
 function displayPage($dbi, $request) {
 $pagename = $request->getArg('pagename');
***************
*** 24,27 ****
--- 58,62 ----
 $template->setPageRevisionTokens($revision);
 $template->replace('CONTENT', do_transform($revision->getContent()));
+ $template->qreplace('PAGE_DESCRIPTION', GleanDescription($revision));
 echo $template->getExpansion();
 flush();
Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Template.php	2001年11月29日 02:59:21	1.4
--- Template.php	2001年12月11日 22:41:40	1.5
***************
*** 277,280 ****
--- 277,281 ----
 $this->qreplace('BROWSE', WikiURL(''));
 $this->qreplace('CSS_URL', DataURL(CSS_URL));
+ $this->qreplace('WIKI_NAME', WIKI_NAME);
 
 if (isset($user))

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv9145/templates
Modified Files:
	browse.html 
Log Message:
Name the wiki (SF task #34142).
New config define: WIKI_NAME, which is used to generate a KEYWORDS
meta tag, and also for the channel title in RSS output.
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** browse.html	2001年12月10日 20:53:40	1.24
--- browse.html	2001年12月11日 22:41:40	1.25
***************
*** 8,11 ****
--- 8,15 ----
 ${RCS_IDS}
 -->
+ <meta name="keywords" content="${SPLIT_PAGE}, ${WIKI_NAME}" />
+ <?php if (!empty($PAGE_DESCRIPTION)) { ?>
+ <meta name="description" content="${PAGE_DESCRIPTION}" />
+ <?php } ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <!-- <meta name="robots" content="index,follow" /> -->
***************
*** 20,24 ****
 href="${BROWSE}HomePage"
 ><img src="${LOGO}"
! border="0" alt="[phpwiki]" 
 align="right" width="50" height="50" /></a></div>
 <h1>
--- 24,28 ----
 href="${BROWSE}HomePage"
 ><img src="${LOGO}"
! border="0" alt="${WIKI_NAME}" 
 align="right" width="50" height="50" /></a></div>
 <h1>

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv9145
Modified Files:
	index.php 
Log Message:
Name the wiki (SF task #34142).
New config define: WIKI_NAME, which is used to generate a KEYWORDS
meta tag, and also for the channel title in RSS output.
Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** index.php	2001年12月07日 05:37:13	1.38
--- index.php	2001年12月11日 22:41:38	1.39
***************
*** 45,48 ****
--- 45,53 ----
 /////////////////////////////////////////////////////////////////////
 
+ // The name of your wiki.
+ // This is used to generate a keywords meta tag in the HTML templates,
+ // and during RSS generation for the <title> of the RSS channel.
+ //define('WIKI_NAME', 'PhpWiki');
+ 
 // If set, we will perform reverse dns lookups to try to convert the users
 // IP number to a host name, even if the http server didn't do it for us.

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32589/lib
Modified Files:
	WikiUser.php 
Log Message:
Fix MonsterCookie bug. (See http://phpwiki.sf.net/wiki/BadRequest.)
Index: WikiUser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** WikiUser.php	2001年12月06日 20:44:13	1.5
--- WikiUser.php	2001年12月11日 18:42:12	1.6
***************
*** 201,213 ****
 }
 
! function _copy($object) {
! if (!is_object($object))
 return false;
- if (strtolower(get_class($object)) != 'wikiuser')
- return false;
 
! $this->userid = $object->userid;
! $this->state = $object->state;
! $this->realm = $object->realm;
 return true;
 }
--- 201,211 ----
 }
 
! function _copy($saved) {
! if (!is_array($saved) || !isset($saved['state']) || !isset($saved['realm']))
 return false;
 
! $this->userid = $saved['userid'];
! $this->state = $saved['state'];
! $this->realm = $saved['realm'];
 return true;
 }
***************
*** 232,238 ****
 $req = &$this->_request;
 
! $req->setSessionVar('auth_state', $this);
 // FIXME: Disable restore from cookie (see note in WikiUser().)
! //$req->setCookieVar('WIKI_AUTH', $this);
 }
 }
--- 230,240 ----
 $req = &$this->_request;
 
! $saved = array('userid' => $this->userid,
! 'state' => $this->state,
! 'realm' => $this->realm);
! 
! $req->setSessionVar('auth_state', $saved);
 // FIXME: Disable restore from cookie (see note in WikiUser().)
! //$req->setCookieVar('WIKI_AUTH', $saved);
 }
 }

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32372/lib
Modified Files:
	Request.php 
Log Message:
Delete debugging cruft.
Index: Request.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Request.php	2001年11月29日 18:03:59	1.4
--- Request.php	2001年12月11日 18:41:03	1.5
***************
*** 347,352 ****
 */
 function setStatus ($status) {
- trigger_error("setStatus: $status", E_USER_WARNING);
- 
 $this->status = $status;
 }
--- 347,350 ----

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv26030/lib
Modified Files:
	loadsave.php ziplib.php 
Log Message:
Delete ctime() and rfc1123date() from lib/ziplib.php in favor of
CTime() and Rfc2822DateTime() in lib/stdlib.php.
Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** loadsave.php	2001年11月26日 22:00:26	1.13
--- loadsave.php	2001年12月11日 18:21:38	1.14
***************
*** 34,41 ****
 $from = isset($SERVER_ADMIN) ? $SERVER_ADMIN : 'foo@bar';
 
! $head = "From $from " . ctime(time()) . "\r\n";
 $head .= "Subject: " . rawurlencode($page->getName()) . "\r\n";
 $head .= "From: $from (PhpWiki)\r\n";
! $head .= "Date: " . rfc1123date($current->get('mtime')) . "\r\n";
 $head .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n", PHPWIKI_VERSION);
 
--- 34,41 ----
 $from = isset($SERVER_ADMIN) ? $SERVER_ADMIN : 'foo@bar';
 
! $head = "From $from " . CTime(time()) . "\r\n";
 $head .= "Subject: " . rawurlencode($page->getName()) . "\r\n";
 $head .= "From: $from (PhpWiki)\r\n";
! $head .= "Date: " . Rfc2822DateTime($current->get('mtime')) . "\r\n";
 $head .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n", PHPWIKI_VERSION);
 
Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** ziplib.php	2001年09月19日 02:58:00	1.9
--- ziplib.php	2001年12月11日 18:21:38	1.10
***************
*** 427,451 ****
 * Routines for Mime mailification of pages.
 */
! //FIXME: these should go elsewhere (stdlib.php).
! function ctime ($unix_time)
! {
! return date("D M j H:i:s Y", $unix_time);
! }
! 
! function rfc1123date ($unix_time)
! {
! $zone = ' +';
! 
! $zonesecs = date("Z", $unix_time);
! if ($zonesecs < 0)
! $zone = ' -';
! 
! $zonemins = (int)((abs($zonesecs) + 30) / 60);
! $zonehrs = (int)(($zonemins + 30) / 60);
! $zonemins -= $zonehrs * 60;
! $zone .= sprintf("%02d%02d", $zonehrs, $zonemins);
! 
! return date("D, j M Y H:i:s", $unix_time) . $zone;
! }
 
 /**
--- 427,431 ----
 * Routines for Mime mailification of pages.
 */
! //FIXME: these should go elsewhere (libmime?).
 
 /**

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv24212/lib
Modified Files:
	stdlib.php 
Log Message:
Rename Rfc822DateTime() to Rfc2822DateTime(). (Also fix it.)
Add CTime().
Remove debugging cruft.
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** stdlib.php	2001年12月11日 17:47:10	1.57
--- stdlib.php	2001年12月11日 18:16:12	1.58
***************
*** 106,110 ****
 
 list ($proto) = explode(':', $protocol_or_url, 2);
- echo "PROTO: $proto<br>\n";
 
 if (isset($URL_LINK_ICONS[$proto])) {
--- 106,109 ----
***************
*** 115,120 ****
 }
 
- echo "IMG: $linkimg<br>\n";
- 
 if (empty($linkimg))
 return '';
--- 114,117 ----
***************
*** 583,590 ****
 * @return string Date and time in RFC-2822 format.
 */
! function Rfc822DateTime ($time = false) {
 if ($time === false)
 $time = time();
! return date('D, d F H:i:s ', $time) . TimezoneOffset($time, 'no colon');
 }
 
--- 580,600 ----
 * @return string Date and time in RFC-2822 format.
 */
! function Rfc2822DateTime ($time = false) {
! if ($time === false)
! $time = time();
! return date('D, j M Y H:i:s ', $time) . TimezoneOffset($time, 'no colon');
! }
! 
! /**
! * Format time to standard 'ctime' format.
! *
! * @param $time time_t Time. Default: now.
! * @return string Date and time in RFC-2822 format.
! */
! function CTime ($time = false)
! {
 if ($time === false)
 $time = time();
! return date("D M j H:i:s Y", $time);
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv15918/lib
Modified Files:
	interwiki.php stdlib.php 
Log Message:
Refactor external link icon code.
Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** interwiki.php	2001年12月07日 05:27:20	1.10
--- interwiki.php	2001年12月11日 17:47:10	1.11
***************
*** 48,66 ****
 }
 
- $linkproto='interwiki';
- $ICONS = &$GLOBALS['URL_LINK_ICONS'];
- 
- $linkimg = isset($ICONS[$linkproto]) ? $ICONS[$linkproto] : $ICONS['*'];
- if (!empty($linkimg)) {
- $imgtag = Element('img', array('src' => DataURL($linkimg),
- 'alt' => $linkproto,
- 'class' => 'linkicon'));
- $linktext = $imgtag . $linktext;
- }
- 
 return Element('a', array('href' => $url,
 'class' => $class),
! $linktext);
 }
 
 // Link InterWiki links
--- 48,56 ----
 }
 
 return Element('a', array('href' => $url,
 'class' => $class),
! IconForLink('interwiki') . $linktext);
 }
+ 
 
 // Link InterWiki links
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** stdlib.php	2001年12月07日 22:14:32	1.56
--- stdlib.php	2001年12月11日 17:47:10	1.57
***************
*** 101,104 ****
--- 101,128 ----
 }
 }
+ 
+ function IconForLink($protocol_or_url) {
+ global $URL_LINK_ICONS;
+ 
+ list ($proto) = explode(':', $protocol_or_url, 2);
+ echo "PROTO: $proto<br>\n";
+ 
+ if (isset($URL_LINK_ICONS[$proto])) {
+ $linkimg = $URL_LINK_ICONS[$proto];
+ }
+ elseif (isset($URL_LINK_ICONS['*'])) {
+ $linkimg = $URL_LINK_ICONS['*'];
+ }
+ 
+ echo "IMG: $linkimg<br>\n";
+ 
+ if (empty($linkimg))
+ return '';
+ 
+ return Element('img', array('src' => DataURL($linkimg),
+ 'alt' => $proto,
+ 'class' => 'linkicon'));
+ }
+ 
 
 function LinkURL($url, $linktext = '') {
***************
*** 119,136 ****
 $attr['class'] = 'namedurl';
 }
- $linktext = htmlspecialchars($linktext);
- 
- $linkproto = substr($url, 0, strpos($url, ":"));
- $ICONS = &$GLOBALS['URL_LINK_ICONS'];
- 
- $linkimg = isset($ICONS[$linkproto]) ? $ICONS[$linkproto] : $ICONS['*'];
- if (!empty($linkimg)) {
- $imgtag = Element('img', array('src' => DataURL($linkimg),
- 'alt' => $linkproto,
- 'class' => 'linkicon'));
- $linktext = $imgtag . $linktext;
- }
 
! return Element('a', $attr, $linktext);
 }
 
--- 143,149 ----
 $attr['class'] = 'namedurl';
 }
 
! return Element('a', $attr,
! IconForLink($url) . htmlspecialchars($linktext));
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv13230/lib
Modified Files:
 Tag: release-1_2-branch
	config.php 
Log Message:
SF bug #422780 & task #31712: International characters in wiki words.
Updated $WikiNameRegexp so that it should work with all ISO-8859-1
languages.
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24.2.10
retrieving revision 1.24.2.11
diff -C2 -r1.24.2.10 -r1.24.2.11
*** config.php	2001年12月02日 21:36:43	1.24.2.10
--- config.php	2001年12月11日 15:47:02	1.24.2.11
***************
*** 207,213 ****
 // Perl regexp for WikiNames
 // (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
! $WikiNameRegexp = "(?<![A-Za-z0-9])([A-Z][a-z]+){2,}(?![A-Za-z0-9])";
! 
! 
 
 /////////////////////////////////////////////////////////////////////
--- 207,213 ----
 // Perl regexp for WikiNames
 // (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
! //$WikiNameRegexp = "(?<![A-Za-z0-9])([A-Z][a-z]+){2,}(?![A-Za-z0-9])";
! // This should work for all ISO-8859-1 languages:
! $WikiNameRegexp = "(?<![A-Za-z0-9μÀ-ÖØ-öø-ÿ])([A-ZÀ-ÖØ-Þ][a-zμß-öø-ÿ]+){2,}(?![A-Za-z0-9μÀ-ÖØ-öø-ÿ])";
 
 /////////////////////////////////////////////////////////////////////

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv4207/phpwiki
Modified Files:
	phpwiki.css 
Log Message:
Moved some diff colouring to css. Appearance looks identical to previous non-css method of colouring in: IE5, Mozilla (and presumably NS6), iCab, Opera, OmniWeb.
Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** phpwiki.css	2001年12月07日 06:57:08	1.7
--- phpwiki.css	2001年12月11日 05:51:14	1.8
***************
*** 226,229 ****
--- 226,242 ----
 }
 
+ .diff-added { 
+ background: #cfc;
+ }
+ .diff-deleted { 
+ background: #fcc;
+ }
+ .diff-unchanged { 
+ background: white;
+ }
+ .diff-notation { 
+ background: #ccc;
+ }
+ 
 /* For emacs users
 *

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv4180/phpwiki/lib
Modified Files:
	diff.php 
Log Message:
Moved some diff colouring to css. Appearance looks identical to previous non-css method of colouring in: IE5, Mozilla (and presumably NS6), iCab, Opera, OmniWeb.
Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** diff.php	2001年12月07日 17:39:45	1.15
--- diff.php	2001年12月11日 05:51:10	1.16
***************
*** 927,931 ****
 {
 	$html = '';
! 	$prefix = Element('td', array('bgcolor' => '#cccccc', 'width' => "1%"), $prefix);
 	reset($lines);
 	while (list ($junk, $line) = each($lines))
--- 927,931 ----
 {
 	$html = '';
! 	$prefix = Element('td', array('class' => 'diff-notation', 'width' => "1%"), $prefix);
 	reset($lines);
 	while (list ($junk, $line) = each($lines))
***************
*** 934,938 ****
 	 $line = empty($line) ? ' ' : htmlspecialchars($line);
 	 $html .= Element('tr', array('valign' => 'top'), 
! 			 $prefix . Element('td', array('bgcolor' => $color),
 					 Element('tt', $line)));
 	 }
--- 934,938 ----
 	 $line = empty($line) ? ' ' : htmlspecialchars($line);
 	 $html .= Element('tr', array('valign' => 'top'), 
! 			 $prefix . Element('td', array('class' => $color),
 					 Element('tt', $line)));
 	 }
***************
*** 950,956 ****
 			'a' => $this->adds_prefix,
 			'd' => $this->deletes_prefix);
! 	$color = array('c' => '#ffffff',
! 		 'a' => '#ffcccc',
! 		 'd' => '#ccffcc');
 
 	$diff = '';
--- 950,956 ----
 			'a' => $this->adds_prefix,
 			'd' => $this->deletes_prefix);
! 	$color = array('c' => 'diff-unchanged',
! 		 'a' => 'diff-added',
! 		 'd' => 'diff-deleted');
 
 	$diff = '';
***************
*** 959,969 ****
 	 if (!empty($hunk['c']))
 		$diff .= $this->_emit_lines($hunk['c'],
! 		 $this->context_prefix, '#ffffff');
 	 if (!empty($hunk['d']))
 		$diff .= $this->_emit_lines($hunk['d'],
! 		 $this->deletes_prefix, '#ccffcc');
 	 if (!empty($hunk['a']))
 		$diff .= $this->_emit_lines($hunk['a'],
! 		 $this->adds_prefix, '#ffcccc');
 	 }
 
--- 959,969 ----
 	 if (!empty($hunk['c']))
 		$diff .= $this->_emit_lines($hunk['c'],
! 		 $this->context_prefix, 'diff-unchanged');
 	 if (!empty($hunk['d']))
 		$diff .= $this->_emit_lines($hunk['d'],
! 		 $this->deletes_prefix, 'diff-deleted');
 	 if (!empty($hunk['a']))
 		$diff .= $this->_emit_lines($hunk['a'],
! 		 $this->adds_prefix, 'diff-added');
 	 }
 

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv1903/phpwiki/templates
Modified Files:
	editpage.html 
Log Message:
Added table summary attribute for non-visual browsers.
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** editpage.html	2001年12月01日 13:01:45	1.24
--- editpage.html	2001年12月10日 20:53:46	1.25
***************
*** 57,61 ****
 name="summary" value="$FORMVARS[summary]" size="50" />
 </div>
! <table class="toolbar" width="100%"
 cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
 <td>
--- 57,61 ----
 name="summary" value="$FORMVARS[summary]" size="50" />
 </div>
! <table summary="Toolbar: Page editing options." class="toolbar" width="100%"
 cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
 <td>

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv1869/phpwiki/templates
Modified Files:
	browse.html 
Log Message:
Added table summary attribute for non-visual browsers.
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** browse.html	2001年11月29日 02:59:21	1.23
--- browse.html	2001年12月10日 20:53:40	1.24
***************
*** 41,45 ****
 to cause MSIE4.01/NT to hang. 
 So, we use tables... -->
! <table class="toolbar" width="100%"
 cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
 <td>
--- 41,45 ----
 to cause MSIE4.01/NT to hang. 
 So, we use tables... -->
! <table summary="Toolbar 1: Page date and page search options." class="toolbar" width="100%"
 cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
 <td>
***************
*** 60,64 ****
 </td>
 </tr></table>
! <table class="toolbar" width="100%"
 cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
 <td>
--- 60,64 ----
 </td>
 </tr></table>
! <table summary="Toolbar 2: Page actions and sign in." class="toolbar" width="100%"
 cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
 <td>

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv29055/lib/plugin
Modified Files:
	RecentChanges.php 
Log Message:
SF Bug #489544: Change strftime %P to %p. (%P is a GNU extension to
the POSIX strftime spec, and is not supported on all systems.)
 '%p' expands to 'AM' or 'PM'
 '%P', when supported, expands to 'am' or 'pm'
The lowercase version (%P) is much prettier to my eyes, but I guess,
in this case the cost of portability is ugliness. (Is it worth some
hackage to restore the lower case am/pm?)
Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** RecentChanges.php	2001年12月07日 22:28:21	1.3
--- RecentChanges.php	2001年12月08日 16:30:44	1.4
***************
*** 73,77 ****
 $created = $rev->get('mtime');
 $date = strftime($dateformat, $created);
! $time = strftime("%l:%M %P", $created); // Make configurable.
 if ($date != $last_date) {
 if ($lines) {
--- 73,77 ----
 $created = $rev->get('mtime');
 $date = strftime($dateformat, $created);
! $time = strftime("%l:%M %p", $created); // Make configurable.
 if ($date != $last_date) {
 if ($lines) {