phpwiki-checkins Mailing List for PhpWiki

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29580/plugin
Modified Files:
	RecentChanges.php 
Log Message:
split title into extra headline. simplify icons, add category, pagematch arguments
Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -2 -b -p -d -r1.120 -r1.121
--- RecentChanges.php	14 Jul 2007 12:04:50 -0000	1.120
+++ RecentChanges.php	25 Aug 2007 18:54:41 -0000	1.121
@@ -42,4 +42,19 @@ class _RecentChanges_Formatter
 }
 
+ function title () {
+ extract($this->_args);
+ if ($author) $title = _("UserContribs").":$author";
+ elseif ($owner) $title = _("UserContribs").":$owner";
+ elseif ($only_new) $title = _("RecentNewPages");
+ elseif ($show_minor) $title = _("RecentEdits");
+ else $title = _("RecentChanges");
+
+ if (!empty($category))
+ $title = $category;
+ elseif (!empty($pagematch))
+ $title .= ":$pagematch";
+	return $title;
+ }
+
 function include_versions_in_URLs() {
 return (bool) $this->_args['show_all'];
@@ -205,33 +220,23 @@ extends _RecentChanges_Formatter
 }
 
- function rss_icon () {
+ function format_icon ($format) {
 global $request, $WikiTheme;
-
- $rss_url = $request->getURLtoSelf(array('action' => $this->action, 'format' => 'rss'));
- return HTML::small(array('style' => 'font-weight:normal; vertical-align:middle;'), 
- $WikiTheme->makeButton("RSS", $rss_url, 'rssicon'));
+ $rss_url = $request->getURLtoSelf(array('action' => $this->action, 'format' => $format));
+ return $WikiTheme->makeButton($format, $rss_url, 'rssicon');
 }
 
- function rss2_icon () {
- global $request, $WikiTheme;
+ function rss_icon () { return $this->format_icon("rss"); }
+ function rss2_icon () { return $this->format_icon("rss2"); }
+ function atom_icon () { return $this->format_icon("atom"); }
+ function rdf_icon () { return DEBUG ? $this->format_icon("rdf") : ''; }
+ function rdfs_icon () { return DEBUG ? $this->format_icon("rdfs") : ''; }
+ function owl_icon () { return DEBUG ? $this->format_icon("owl") : ''; }
 
- $rss_url = $request->getURLtoSelf(array('action' => $this->action, 'format' => 'rss2'));
- return HTML::small(array('style' => 'font-weight:normal; vertical-align:middle;'), 
- $WikiTheme->makeButton("xml", $rss_url, 'rssicon'));
- }
- function atom_icon () {
- global $request, $WikiTheme;
-	if (DEBUG) {
-	 $rss_url = $request->getURLtoSelf(array('action' => $this->action, 'format' => 'atom'));
-	 return HTML::small(array('style' => 'font-weight:normal; vertical-align:middle;'), 
- $WikiTheme->makeButton("atom", $rss_url, 'rssicon'));
-	}
- }
 function grazr_icon () {
 global $request, $WikiTheme;
+	if (!DEBUG) return '';
 $rss_url = 'http://grazr.com/gzpanel.html?' . 
 	 WikiURL($request->getArg('pagename'),array('action' => $this->action, 'format' => 'rss2'),true);
- return HTML::small(array('style' => 'font-weight:normal; vertical-align:middle;'), 
- $WikiTheme->makeButton("grazr-it", $rss_url, 'rssicon'));
+ return $WikiTheme->makeButton("grazr", $rss_url, 'rssicon');
 }
 
@@ -262,4 +267,10 @@ extends _RecentChanges_Formatter
 $edits .= sprintf(_(" for pages owned by %s"), $owner);
 	}
+	if (!empty($category)) {
+ $edits .= sprintf(_(" for all pages linking to %s"), $category);
+	}
+	if (!empty($pagematch)) {
+ $edits .= sprintf(_(" for all pages matching '%s'"), $pagematch);
+	}
 if ($timespan = $days > 0) {
 if (intval($days) != $days)
@@ -325,13 +336,16 @@ extends _RecentChanges_Formatter
 }
 
-
- function title () {
+ /* was title */
+ function headline () {
 extract($this->_args);
- return array($show_minor ? _("RecentEdits") : _("RecentChanges"),
+ return array($this->title(),
 ' ',
 $this->rss_icon(), 
-		 HTML::raw(' '), $this->rss2_icon(),
-		 HTML::raw(' '), $this->grazr_icon(),
-		 HTML::raw(' '), $this->atom_icon(),
+		 $this->rss2_icon(),
+		 $this->atom_icon(),
+		 $this->rdf_icon(),
+		 /*$this->rdfs_icon(),
+		 $this->owl_icon(),*/
+		 $this->grazr_icon(),
 $this->sidebar_link());
 }
@@ -359,6 +373,8 @@ extends _RecentChanges_Formatter
 
 global $WikiTheme;
- $sidebar_button = $WikiTheme->makeButton("sidebar", 'javascript:addPanel();', 'sidebaricon');
- $addsidebarjsclick = asXML(HTML::small(array('style' => 'font-weight:normal;vertical-align:middle;'), $sidebar_button));
+ $sidebar_button = $WikiTheme->makeButton("sidebar", 'javascript:addPanel();', 'sidebaricon', 
+ array('title' => _("Click to add this feed to your sidebar"),
+ 'style' => 'font-size:9pt;font-weight:normal; vertical-align:middle;'));
+ $addsidebarjsclick = asXML($sidebar_button);
 $jsc = JavaScript("if ((typeof window.sidebar == 'object') &&\n"
 ." (typeof window.sidebar.addPanel == 'function'))\n"
@@ -373,5 +389,5 @@ extends _RecentChanges_Formatter
 include_once('lib/InlineParser.php');
 
- $html = HTML(HTML::h2(false, $this->title()));
+ $html = HTML(HTML::h2(false, $this->headline()));
 if (($desc = $this->description()))
 $html->pushContent($desc);
@@ -455,12 +471,13 @@ class _RecentChanges_UserContribsFormatt
 extends _RecentChanges_HtmlFormatter
 {
- function title () {
+ function headline () {
 extract($this->_args);
 return array(_("UserContribs"),":",$author ? $author : $owner,
 ' ',
 $this->rss_icon(), 
-		 HTML::raw(' '), $this->rss2_icon(),
-		 //HTML::raw(' '), $this->grazr_icon(),
-		 HTML::raw(' '), $this->atom_icon());
+		 $this->rss2_icon(),
+		 $this->atom_icon(),
+		 $this->rdf_icon(),
+		 $this->grazr_icon());
 }
 
@@ -468,5 +485,5 @@ extends _RecentChanges_HtmlFormatter
 include_once('lib/InlineParser.php');
 
- $html = HTML(HTML::h2(false, $this->title()));
+ $html = HTML(HTML::h2(false, $this->headline()));
 	$lines = HTML::ol();
 $first = true; $count = 0;
@@ -520,8 +537,8 @@ extends _RecentChanges_HtmlFormatter
 }
 function rss2_icon () { }
- function title () {
+ function headline () {
 //title click opens the normal RC or RE page in the main browser frame
 extract($this->_args);
- $titlelink = WikiLink($show_minor ? _("RecentEdits") : _("RecentChanges"));
+ $titlelink = WikiLink($this->title());
 $titlelink->setAttr('target', '_content');
 return HTML($this->logo(), $titlelink);
@@ -600,4 +617,9 @@ extends _RecentChanges_HtmlFormatter
 printf("<head>\n");
 extract($this->_args);
+ if (!empty($category))
+ $title = $category;
+ elseif (!empty($pagematch))
+ $title = $pagematch;
+ else
 $title = WIKI_NAME . $show_minor ? _("RecentEdits") : _("RecentChanges");
 printf("<title>" . $title . "</title>\n");
@@ -624,5 +646,5 @@ extends _RecentChanges_HtmlFormatter
 function rss2_icon () {
 }
- function title () {
+ function headline () {
 }
 function authorLink ($rev) {
@@ -732,12 +754,13 @@ extends _RecentChanges_Formatter
 global $request;
 
- extract($this->_args);
 $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
- if ($author) $description = _("UserContribs").":$author";
- elseif ($owner) $description = _("UserContribs").":$owner";
- elseif ($only_new) $description = _("RecentNewPages");
- elseif ($show_minor) $description = _("RecentEdits");
- else $description = _("RecentChanges");
- return array('title' => WIKI_NAME,
+ extract($this->_args);
+	$title = WIKI_NAME;
+ $description = $this->title();
+ if ($category)
+	 $title = $category;
+ elseif ($pagematch)
+	 $title = $pagematch;
+ return array('title' => $title,
 'link' => $rc_url,
 'description' => $description,
@@ -856,5 +879,12 @@ extends _RecentChanges_RssFormatter {
 	// "channel" is called "feed" in atom
 $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
- $feed_props = array('title' => WIKI_NAME,
+ extract($this->_args);
+	$title = WIKI_NAME;
+ $description = $this->title();
+ if ($category)
+	 $title = $category;
+ elseif ($pagematch)
+	 $title = $pagematch;
+ $feed_props = array('title' => $description,
 			 'link' => array('rel'=>"alternate",
 			 		 'type'=>"text/html",
@@ -963,4 +993,65 @@ class NewPageRevisionIterator extends Wi
 
 /**
+ * Only pages with links to a certain category
+ */
+class LinkRevisionIterator extends WikiDB_PageRevisionIterator
+{
+ function LinkRevisionIterator ($revisions, $category) {
+ $this->_revisions = $revisions;
+ if (preg_match("/[\?\.\*]/", $category)) {
+ $backlinkiter = $this->_revisions->_wikidb->linkSearch
+ (new TextSearchQuery("*", true), 
+ new TextSearchQuery($category, true), 
+ "linkfrom");
+ } else {
+ $basepage = $GLOBALS['request']->getPage($category);
+ $backlinkiter = $basepage->getBackLinks(true);
+ }
+ $this->links = array();
+ foreach ($backlinkiter->asArray() as $p) {
+ if (is_object($p)) $this->links[] = $p->getName();
+ elseif (is_array($p)) $this->links[] = $p['pagename'];
+ else $this->links[] = $p;
+ }
+ $backlinkiter->free();
+ sort($this->links);
+ }
+
+ function next () {
+ while (($rev = $this->_revisions->next())) {
+ if (binary_search($rev->getName(), $this->links) != false)
+ return $rev;
+ }
+ $this->free();
+ return false;
+ }
+
+ function free () {
+ unset ($this->links);
+ }
+}
+
+class PageMatchRevisionIterator extends WikiDB_PageRevisionIterator
+{
+ function PageMatchRevisionIterator ($revisions, $match) {
+ $this->_revisions = $revisions;
+ $this->search = new TextSearchQuery($match, true);
+ }
+
+ function next () {
+ while (($rev = $this->_revisions->next())) {
+ if ($this->search->match($rev->getName()))
+ return $rev;
+ }
+ $this->free();
+ return false;
+ }
+
+ function free () {
+ unset ($this->search);
+ }
+}
+
+/**
 * Filter by author
 */
@@ -1047,5 +1138,7 @@ extends WikiPlugin
 'difflinks' => true,
 'historylinks' => false,
- 'caption' => ''
+ 'caption' => '',
+ 'category' => '',
+ 'pagematch' => ''
 );
 }
@@ -1110,4 +1203,13 @@ extends WikiPlugin
 $show_deleted = @$args['show_minor'];
 
+ // only pages (e.g. PageHistory of subpages)
+ if (!empty($args['pagematch'])) {
+ require_once("lib/TextSearchQuery.php");
+ $changes = new PageMatchRevisionIterator($changes, $args['pagematch']);
+ }
+ if (!empty($args['category'])) {
+ require_once("lib/TextSearchQuery.php");
+ $changes = new LinkRevisionIterator($changes, $args['category']);
+ }
 if (!empty($args['only_new']))
 $changes = new NewPageRevisionIterator($changes);
@@ -1159,4 +1261,10 @@ extends WikiPlugin
 $args['days'] = min($args['days'], 365000);
 
+	if (empty($args['category']) and empty($args['pagematch'])
+	 and preg_match("/^Category/", $request->getArg('pagename'))) 
+	{
+	 $args['category'] = $request->getArg('pagename');
+	}
+ 
 // Hack alert: format() is a NORETURN for rss formatters.
 return $this->format($this->getChanges($dbi, $args), $args);
@@ -1233,4 +1341,7 @@ class DayButtonBar extends HtmlElement {
 
 // $Log$
+// Revision 1.121 2007年08月25日 18:54:41 rurban
+// split title into extra headline. simplify icons, add category, pagematch arguments
+//
 // Revision 1.120 2007年07月14日 12:04:50 rurban
 // fix rss button actions and rss description according the action

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29609/plugin
Modified Files:
	TitleSearch.php 
Log Message:
fix TextSearch paging
Index: TitleSearch.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/TitleSearch.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -2 -b -p -d -r1.29 -r1.30
--- TitleSearch.php	2 Jan 2007 13:23:30 -0000	1.29
+++ TitleSearch.php	25 Aug 2007 18:55:01 -0000	1.30
@@ -80,8 +80,5 @@ extends WikiPlugin
 
 $pagelist = new PageList($args['info'], $args['exclude'], $args);
- while ($page = $pages->next()) {
- $pagelist->addPage($page);
- $last_name = $page->getName();
- }
+ $pagelist->addPages($pages);
 	// this hack will go away
 if ($args['format'] == 'livesearch') {
@@ -100,11 +97,18 @@ extends WikiPlugin
 if (!$args['noheader']) {
 $s = $args['s'];
- if (!$pagelist->getTotal() and !$query->_regex)
+ $total = $pagelist->getTotal();
+ if (!$total and !$query->_regex) {
 $s = WikiLink($args['s'], 'auto');
+ }
+ if ($total) {
+ 	$pagelist->setCaption(fmt("Title search results for '%s' (%d total)", $s, $total));
+ } else {
 $pagelist->setCaption(fmt("Title search results for '%s'", $s));
 }
+ }
 
 if ($args['auto_redirect'] && ($pagelist->getTotal() == 1)) {
- return HTML($request->redirect(WikiURL($last_name, false, 'absurl'), false),
+ $page = $pages->next();
+ return HTML($request->redirect(WikiURL($page->getName(), false, 'absurl'), false),
 $pagelist);
 }
@@ -115,4 +119,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.30 2007年08月25日 18:55:01 rurban
+// fix TextSearch paging
+//
 // Revision 1.29 2007年01月02日 13:23:30 rurban
 // note to deprecate livesearch hack

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20679
Modified Files:
	Theme.php 
Log Message:
protect options, improve docs style
Index: Theme.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Theme.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -2 -b -p -d -r1.143 -r1.144
--- Theme.php	15 Jul 2007 17:39:18 -0000	1.143
+++ Theme.php	25 Aug 2007 18:31:12 -0000	1.144
@@ -1500,13 +1500,23 @@ function dateStatusFunc(date, y, m, d) {
 ////////////////////////////////////////////////////////////////
 
- /* Callback when a new user creates or edits a page */
+ /** CbUserLogin (&$request, $userid)
+ * Callback when a user logs in
+ */
+ function CbUserLogin (&$request, $userid) {
+	; // do nothing
+ }
+
+ /** CbNewUserEdit (&$request, $userid)
+ * Callback when a new user creates or edits a page 
+ */
 function CbNewUserEdit (&$request, $userid) {
 	; // i.e. create homepage with Template/UserPage
 }
 
- /* Callback when a new user logs in. 
- What is new? We only record changes, not logins.
- Should we track user actions?
- Let's say user without homepage.
+ /** CbNewUserLogin (&$request, $userid)
+ * Callback when a "new user" logs in. 
+ * What is new? We only record changes, not logins.
+ * Should we track user actions?
+ * Let's say a new user is a user without homepage.
 */
 function CbNewUserLogin (&$request, $userid) {
@@ -1514,5 +1524,6 @@ function dateStatusFunc(date, y, m, d) {
 }
 
- /* Callback when a user logs out
+ /** CbUserLogout (&$request, $userid) 
+ * Callback when a user logs out
 */
 function CbUserLogout (&$request, $userid) {
@@ -1549,5 +1560,5 @@ class Button extends HtmlElement {
 if ($request->getArg('frame'))
 $this->setAttr('target', '_top');
- if (!empty($options)) {
+ if (!empty($options) and is_array($options)) {
 foreach ($options as $key => $val)
 $this->setAttr($key, $val);
@@ -1788,4 +1799,7 @@ function listAvailableLanguages() {
 
 // $Log$
+// Revision 1.144 2007年08月25日 18:31:12 rurban
+// protect options, improve docs style
+//
 // Revision 1.143 2007年07月15日 17:39:18 rurban
 // No mozilla round and background for Image buttons

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8553/lib
Modified Files:
	PageList.php 
Log Message:
more limit fixes: limit earlier, fix COUNT slice
Index: PageList.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/PageList.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -2 -b -p -d -r1.144 -r1.145
--- PageList.php	21 Jul 2007 19:33:43 -0000	1.144
+++ PageList.php	25 Aug 2007 17:58:14 -0000	1.145
@@ -534,4 +534,6 @@ class PageList {
 	 $GLOBALS['request']->_pagelist++; 
 	$this->id = $GLOBALS['request']->_pagelist;
+ 	if ($GLOBALS['request']->getArg('count'))
+ 	 $options['count'] = $GLOBALS['request']->getArg('count');
 if ($options)
 $this->_options = $options;
@@ -615,4 +617,6 @@ class PageList {
 		$this->_options[$key] = $request->getArg($key);
 	 }
+	 else 
+		$this->_options[$key] = false;
 }
 if ($exclude) {
@@ -780,19 +784,43 @@ class PageList {
 }
 
+ /* ignore from, but honor limit */
 function addPages ($page_iter) {
- //Todo: if limit check max(strlen(pagename))
+ // TODO: if limit check max(strlen(pagename))
+	$i = 0;
+ if (isset($this->_options['limit'])) { // extract from,count from limit
+	 list($from, $limit) = WikiDB_backend::limit($this->_options['limit']);
+	 $limit += $from;
+ } else {
+	 $limit = 0;
+ }
 while ($page = $page_iter->next()) {
+ $i++;	
+ if ($from and $i < $from) 
+ continue;
+	 if (!$limit or ($limit and $i < $limit))
 $this->addPage($page);
 }
+ if (empty($this->_options['count']))
+	 $this->_options['count'] = $i;
 }
 
 function addPageList (&$list) {
 if (empty($list)) return; // Protect reset from a null arg
+ if (isset($this->_options['limit'])) { // extract from,count from limit
+	 list($from, $limit) = WikiDB_backend::limit($this->_options['limit']);
+	 $limit += $from;
+ } else {
+	 $limit = 0;
+ }
 foreach ($list as $page) {
- if (is_object($page))
- $page = $page->_pagename;
+ $i++;	
+ if ($from and $i < $from) 
+ continue;
+	 if (!$limit or ($limit and $i < $limit)) {
+ if (is_object($page)) $page = $page->_pagename;
 $this->addPage((string)$page);
 }
 }
+ }
 
 function maxLen() {
@@ -1071,5 +1099,5 @@ class PageList {
 */
 'checkbox'
- => new _PageList_Column_checkbox('p', _("Select")),
+ => new _PageList_Column_checkbox('p', _("All")),
 'pagename'
 => new _PageList_Column_pagename,
@@ -1284,11 +1312,11 @@ class PageList {
 list($offset, $pagesize) = $this->limit($limit);
 if (!$pagesize or
- (!$offset and $numrows <= $pagesize) or
- ($offset + $pagesize < 0))
+ (!$offset and $numrows < $pagesize) or
+ (($offset + $pagesize) < 0))
 return false;
 
 $request = &$GLOBALS['request'];
 $pagename = $request->getArg('pagename');
- $defargs = $request->args;
+ $defargs = array_merge(array('id' => $this->id), $request->args);
 if (USE_PATH_INFO) unset($defargs['pagename']);
 if ($defargs['action'] == 'browse') unset($defargs['action']);
@@ -1297,9 +1325,9 @@ class PageList {
 $tokens = array();
 $tokens['PREV'] = false; $tokens['PREV_LINK'] = "";
- $tokens['COLS'] = count($this->_columns);
+ $tokens['COLS'] = $ncolumns;
 $tokens['COUNT'] = $numrows; 
 $tokens['OFFSET'] = $offset; 
 $tokens['SIZE'] = $pagesize;
- $tokens['NUMPAGES'] = (int)($numrows / $pagesize)+1;
+ $tokens['NUMPAGES'] = (int) ceil($numrows / $pagesize);
 $tokens['ACTPAGE'] = (int) (($offset+1) / $pagesize)+1;
 if ($offset > 0) {
@@ -1314,5 +1342,5 @@ class PageList {
 $next = $defargs;
 $tokens['NEXT'] = false; $tokens['NEXT_LINK'] = "";
- if ($offset + $pagesize < $numrows) {
+ if (($offset + $pagesize) < $numrows) {
 $next['limit'] = min($offset + $pagesize, $numrows - $pagesize) . ",$pagesize";
 $next['count'] = $numrows;
@@ -1342,5 +1370,5 @@ class PageList {
 $this->_options['limit']);
 if ($tokens) 
- $this->_pages = array_slice($this->_pages, $tokens['OFFSET'], $tokens['NUMPAGES']);
+ $this->_pages = array_slice($this->_pages, $tokens['OFFSET'], $tokens['COUNT']);
 }
 foreach ($this->_pages as $pagenum => $page) {
@@ -1457,4 +1485,18 @@ function flipAll(formObj) {
 	}
 if (count($this->_sortby) > 0) $this->_sortPages();
+	$count = $this->getTotal();
+ $do_paging = ( isset($this->_options['paging']) 
+ 	 and !empty($this->_options['limit']) 
+ 	 and $count 
+ 	 and $this->_options['paging'] != 'none' );
+ if ( $do_paging ) {
+ $tokens = $this->pagingTokens($count, 
+ count($this->_columns), 
+ $this->_options['limit']);
+ if ($tokens) {
+ $paging = Template("pagelink", $tokens);
+ $out->pushContent(HTML::table(array('width'=>'50%'), $paging));
+ }
+ }
 
 // need a recursive switch here for the azhead and cols grouping.
@@ -1465,5 +1507,5 @@ function flipAll(formObj) {
 $cols = HTML::tr(array('valign' => 'top'));
 for ($i=0; $i < $count; $i += $length) {
- $this->_saveOptions(array('cols' => 0));
+ $this->_saveOptions(array('cols' => 0, 'paging' => 'none'));
 $this->_pages = array_slice($this->_pages, $i, $length);
 $cols->pushContent(HTML::td(/*array('width' => $width),*/ 
@@ -1519,17 +1561,4 @@ function flipAll(formObj) {
 }
 
- $do_paging = ( isset($this->_options['paging']) 
- 	 and !empty($this->_options['limit']) 
- 	 and $this->getTotal() 
- 	 and $this->_options['paging'] != 'none' );
- if ( $do_paging ) {
- $tokens = $this->pagingTokens($this->getTotal(), 
- count($this->_columns), 
- $this->_options['limit']);
- if ($tokens) {
- $paging = Template("pagelink", $tokens);
- $out->pushContent(HTML::table($paging));
- }
- }
 if ($this->_options['listtype'] == 'ol')
 $this->_options['ordered'] = 1;
@@ -1652,6 +1681,6 @@ extends PageList {
 
 // $Log$
-// Revision 1.144 2007年07月21日 19:33:43 rurban
-// fix column access
+// Revision 1.145 2007年08月25日 17:58:14 rurban
+// more limit fixes: limit earlier, fix COUNT slice
 //
 // Revision 1.143 2007年07月14日 12:03:19 rurban

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21741
Modified Files:
	WikiUserNew.php 
Log Message:
add LOGIN_LOG to check possible external auth problems
Index: WikiUserNew.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUserNew.php,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -2 -b -p -d -r1.145 -r1.146
--- WikiUserNew.php	7 Jun 2007 16:56:27 -0000	1.145
+++ WikiUserNew.php	25 Aug 2007 18:34:08 -0000	1.146
@@ -575,4 +575,24 @@ class _WikiUser
 
 if ($logout) { // Log out
+	 if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
+		global $request;
+		$zone_offset = Request_AccessLogEntry::_zone_offset();
+		$ncsa_time = date("d/M/Y:H:i:s", time());
+		$entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
+				 (string) $request->get('REMOTE_HOST'),
+				 (string) $request->_user->_userid,
+				 $ncsa_time, $zone_offset, 
+				 "logout ".get_class($request->_user),
+				 "401",
+				 (string) $request->get('HTTP_REFERER'),
+				 (string) $request->get('HTTP_USER_AGENT')
+				 );
+		if (($fp = fopen(LOGIN_LOG, "a"))) {
+		 flock($fp, LOCK_EX);
+		 fputs($fp, "$entry\n");
+		 fclose($fp);
+		}
+		//error_log("$entry\n", 3, LOGIN_LOG);
+	 }
 if (method_exists($GLOBALS['request']->_user, "logout")) { //_HttpAuthPassUser
 	$GLOBALS['request']->_user->logout();
@@ -591,4 +611,38 @@ class _WikiUser
 
 $authlevel = $this->checkPass($passwd === false ? '' : $passwd);
+
+	if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
+	 global $request;
+	 $zone_offset = Request_AccessLogEntry::_zone_offset();
+	 $ncsa_time = date("d/M/Y:H:i:s", time());
+	 $manglepasswd = $passwd;
+	 for ($i=0; $i<strlen($manglepasswd); $i++) {
+		$c = substr($manglepasswd,$i,1);
+		if (ord($c) < 32) $manglepasswd[$i] = "<";
+		elseif ($c == '*') $manglepasswd[$i] = "*";
+		elseif ($c == '?') $manglepasswd[$i] = "?";
+		elseif ($c == '(') $manglepasswd[$i] = "(";
+		elseif ($c == ')') $manglepasswd[$i] = ")";
+		elseif ($c == "\\") $manglepasswd[$i] = "\\";
+		elseif (ord($c) < 127) $manglepasswd[$i] = "x";
+		elseif (ord($c) >= 127) $manglepasswd[$i] = ">";
+	 }
+	 $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
+			 $request->get('REMOTE_HOST'),
+			 (string) $request->_user->_userid,
+			 $ncsa_time, $zone_offset, 
+			 "login $userid/$manglepasswd => $authlevel ".get_class($request->_user),
+			 $authlevel > 0 ? "200" : "403",
+			 (string) $request->get('HTTP_REFERER'),
+			 (string) $request->get('HTTP_USER_AGENT')
+			 );
+	 if (($fp = fopen(LOGIN_LOG, "a"))) {
+		flock($fp, LOCK_EX);
+		fputs($fp, "$entry\n");
+		fclose($fp);
+	 }
+	 //error_log("$entry\n", 3, LOGIN_LOG);
+	}
+
 if ($authlevel <= 0) { // anon or forbidden
 if ($passwd)
@@ -2162,4 +2216,7 @@ extends UserPreferences
 
 // $Log$
+// Revision 1.146 2007年08月25日 18:34:08 rurban
+// add LOGIN_LOG to check possible external auth problems
+//
 // Revision 1.145 2007年06月07日 16:56:27 rurban
 // protect against empty username

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25216
Modified Files:
	upgrade.php 
Log Message:
add missing DBParams. Detected by Sacha Schär.
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/upgrade.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -2 -b -p -d -r1.59 -r1.60
--- upgrade.php	9 Jun 2007 18:57:44 -0000	1.59
+++ upgrade.php	25 Aug 2007 18:43:35 -0000	1.60
@@ -397,5 +397,5 @@ CREATE TABLE $log_tbl (
 */
 function CheckDatabaseUpdate() {
-	global $DBAuthParams;
+	global $DBAuthParams, $DBParams;
 
 	echo "<h3>",sprintf(_("check for necessary %s updates"),
@@ -1280,4 +1280,7 @@ function DoUpgrade(&$request) {
 /*
 $Log$
+ Revision 1.60 2007年08月25日 18:43:35 rurban
+ add missing DBParams. Detected by Sacha Schär.
+
 Revision 1.59 2007年06月09日 18:57:44 rurban
 fix action=upgrade for dba

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/dumb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28015/WikiDB/backend/dumb
Modified Files:
	TextSearchIter.php 
Log Message:
fix TextSearch paging
Index: TextSearchIter.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/dumb/TextSearchIter.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -2 -b -p -d -r1.8 -r1.9
--- TextSearchIter.php	14 Jul 2007 12:03:44 -0000	1.8
+++ TextSearchIter.php	25 Aug 2007 18:51:02 -0000	1.9
@@ -60,9 +60,14 @@ extends WikiDB_backend_iterator
 $pages = &$this->_pages;
 while ($page = $pages->next()) {
-	 if (($this->_from > 0) and ($this->_index < $this->_from))
-		continue;
 if ($score = $this->_match($page)) {
 	 $this->_index++;
- if ($this->_count and ($this->_index >= $this->_count)) return false;
+	 if (($this->_from > 0) and ($this->_index <= $this->_from))
+ // not yet reached the offset
+		 continue;
+ /*if ($this->_count and ($this->_index > $this->_count)) {
+ // reached the limit, but need getTotal
+ $this->_count++;
+ return false;
+ }*/
 if (is_array($page))
 		 $page['score'] = $score;

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21045/default/templates
Modified Files:
	pagelink.tmpl 
Log Message:
from "<< prev | next >>" to "|<< << - i/sum - >> >>|"
Index: pagelink.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/pagelink.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- pagelink.tmpl	20 Apr 2004 00:06:04 -0000	1.1
+++ pagelink.tmpl	25 Aug 2007 19:55:06 -0000	1.2
@@ -1,5 +1,5 @@
 <?php 
 /**
- * Themable paging "<< prev | next >>" links
+ * Themable paging "|<< << - i/sum - >> >>|" links
 *
 * $Id$ -->
@@ -13,5 +13,5 @@
 <?= $PREV ? HTML::a(array('href'=>$FIRST_LINK),_("|<<")) : _("|<<") ?>
 &nbsp;
- <?= $PREV ? HTML::a(array('href'=>$PREV_LINK),_("<<")) : _("<<") ?>
+ <?= $PREV ? HTML::a(array('href'=>$PREV_LINK),_("<< Prev")) : _("<<") ?>
 </td>
 <td class="wikipaging-enabled" align="center">
@@ -19,5 +19,5 @@
 </td>
 <td class="wikipaging<?= $NEXT ? "-enabled" : "-disabled" ?>" align="right">
- <?= $NEXT ? HTML::a(array('href'=>$NEXT_LINK),_(">>")) : _(">>") ?> 
+ <?= $NEXT ? HTML::a(array('href'=>$NEXT_LINK),_("Next >>")) : _(">>") ?> 
 &nbsp;
 <?= $NEXT ? HTML::a(array('href'=>$LAST_LINK),_(">>|")) : _(">>|") ?>

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12564
Modified Files:
	WikiAdminSearchReplace.php 
Log Message:
minor code rearrangment: _tablePush, checkBox
Index: WikiAdminSearchReplace.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/WikiAdminSearchReplace.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -2 -b -p -d -r1.19 -r1.20
--- WikiAdminSearchReplace.php	26 Nov 2004 18:39:02 -0000	1.19
+++ WikiAdminSearchReplace.php	25 Aug 2007 18:09:45 -0000	1.20
@@ -2,5 +2,5 @@
 rcs_id('$Id$');
 /*
- Copyright 2004 $ThePhpWikiProgrammingTeam
+ Copyright 2004,2007 $ThePhpWikiProgrammingTeam
 
 This file is part of PhpWiki.
@@ -95,8 +95,11 @@ extends WikiPlugin_WikiAdminSelect
 $regex = !empty($post_args['regex']);
 foreach ($pages as $pagename) {
- if (!mayAccessPage('edit',$pagename)) {
+ if (!mayAccessPage('edit', $pagename)) {
 		$ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",$pagename)));
- } elseif (($result = $this->replaceHelper($dbi, $pagename, $from, $to, $case_exact, $regex))) {
- $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.", $from, $to, WikiLink($pagename))));
+ } elseif (($result = $this->replaceHelper($dbi, $pagename, $from, $to, 
+ $case_exact, $regex))) 
+ {
+ $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.", 
+ $from, $to, WikiLink($pagename))));
 $count++;
 } else {
@@ -143,5 +146,6 @@ extends WikiPlugin_WikiAdminSelect
 if ($post_args['action'] == 'verify' and !empty($post_args['from'])) {
 // Real action
- return $this->searchReplacePages($dbi, $request, array_keys($p), $post_args['from'], $post_args['to']);
+ return $this->searchReplacePages($dbi, $request, array_keys($p), 
+ $post_args['from'], $post_args['to']);
 }
 if ($post_args['action'] == 'select') {
@@ -156,5 +160,6 @@ extends WikiPlugin_WikiAdminSelect
 // List all pages to select from.
 //TODO: check for permissions and list only the allowed
- $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
+ $pages = $this->collectPages($pages, $dbi, $args['sortby'], 
+ $args['limit'], $args['exclude']);
 }
 
@@ -162,5 +167,6 @@ extends WikiPlugin_WikiAdminSelect
 $args['info'] = "checkbox,pagename,hi_content";
 }
- $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
+ $pagelist = new PageList_Selectable
+	 ($args['info'], $args['exclude'],
 array_merge
 (
@@ -208,28 +214,31 @@ extends WikiPlugin_WikiAdminSelect
 }
 
+ function checkBox (&$post_args, $name, $msg) {
+ 	$id = 'admin_replace-'.$name;
+ 	$checkbox = HTML::input(array('type' => 'checkbox',
+ 'name' => 'admin_replace['.$name.']',
+ 'id' => $id,
+ 'value' => 1));
+ if (!empty($post_args[$name]))
+ $checkbox->setAttr('checked', 'checked');
+ return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
+ }
+
 function replaceForm(&$header, $post_args) {
 $header->pushContent(HTML::div(array('class'=>'hint'),
 _("Replace all occurences of the given string in the content of all pages.")),
 HTML::br());
- $header->pushContent(_("Replace: "));
- $header->pushContent(HTML::input(array('name' => 'admin_replace[from]',
+ $table = HTML::table();
+ $this->_tablePush($table, _("Replace").": ",
+			 HTML::input(array('name' => 'admin_replace[from]',
+					 'size' => 90,
 'value' => $post_args['from'])));
- $header->pushContent(' '._("by").': ');
- $header->pushContent(HTML::input(array('name' => 'admin_replace[to]',
+ $this->_tablePush($table, _("by").': ',
+			 HTML::input(array('name' => 'admin_replace[to]',
+					 'size' => 90,
 'value' => $post_args['to'])));
- $checkbox = HTML::input(array('type' => 'checkbox',
- 'name' => 'admin_replace[case_exact]',
- 'value' => 1));
- if (!empty($post_args['case_exact']))
- $checkbox->setAttr('checked','checked');
- $header->pushContent(HTML::br(),$checkbox," ",_("case-exact"));
- $checkbox_re = HTML::input(array('type' => 'checkbox',
- 'name' => 'admin_replace[regex]',
- //'disabled' => 'disabled',
- 'value' => 1));
- if (!empty($post_args['regex']))
- $checkbox_re->setAttr('checked','checked');
- $header->pushContent(HTML::br(),HTML::span(//array('style'=>'color: #aaa'),
- $checkbox_re," ",_("regex")));
+ $this->_tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?")));
+	$this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
+ $header->pushContent($table);
 $header->pushContent(HTML::br());
 return $header;
@@ -265,4 +274,7 @@ function stri_replace($find,$replace,$st
 
 // $Log$
+// Revision 1.20 2007年08月25日 18:09:45 rurban
+// minor code rearrangment: _tablePush, checkBox
+//
 // Revision 1.19 2004年11月26日 18:39:02 rurban
 // new regex search parser and SQL backends (90% complete, glob and pcre backends missing)

Update of /cvsroot/phpwiki/phpwiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6057
Modified Files:
	Makefile 
Log Message:
add dist (very basic yet)
Index: Makefile
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -2 -b -p -d -r1.13 -r1.14
--- Makefile	19 Jul 2007 06:21:12 -0000	1.13
+++ Makefile	25 Aug 2007 17:51:51 -0000	1.14
@@ -1,4 +1,5 @@
 # $Id$
 # user-definable settings:
+VERSION=
 # for mysqladmin
 DBADMIN_USER=root
@@ -14,4 +15,9 @@ else
 endif
 
+ifeq ("$(VERSION)", "")
+ TARDIST = ../phpwiki.tar.bz2
+else
+ TARDIST = ../phpwiki-$(VERSION).tar.bz2
+endif
 DB_SQLITE_DBFILE = /tmp/phpwiki-sqlite.db
 
@@ -50,5 +56,5 @@ endif
 PHP_SRC := $(wildcard *.php ./lib/*.php ./lib/WikiDB/*.php ./lib/plugin/*.php)
 
-.PHONY: all install locale mysql pqsql sqlite dbtest install-config
+.PHONY: all install locale mysql pqsql sqlite dbtest install-config dist
 
 all: TAGS
@@ -120,2 +126,19 @@ ${DB_SQLITE_DBFILE}: schemas/sqlite.sql
 	mv ${DB_SQLITE_DBFILE} ${DB_SQLITE_DBFILE}.old
 	sqlite $(DB_SQLITE_DBFILE) < dump.sql
+
+dist: $(TARDIST)
+
+# --exclude='\.*'
+$(TARDIST) :
+	tar cfj $(TARDIST) --exclude=CVS \
+		--exclude=config.ini \
+		--exclude='*~' \
+		--exclude='*.bak' \
+		--exclude='*.orig' \
+		--exclude='*.rej' \
+		--exclude=uploads \
+		--exclude=.patches \
+		--exclude=TAGS \
+		--exclude=TAGS.full \
+		--exclude='*.tar.bz2' \
+		.

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15458
Modified Files:
	backend.php 
Log Message:
rearrange access_log columns into natural order: request_args
Index: backend.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -2 -b -p -d -r1.34 -r1.35
--- backend.php	14 Jul 2007 12:03:51 -0000	1.34
+++ backend.php	25 Aug 2007 18:17:46 -0000	1.35
@@ -469,5 +469,5 @@ class WikiDB_backend
 * @return boolean True iff database is in a consistent state.
 */
- function check() {
+ function check($args=false) {
 }
 
@@ -481,5 +481,5 @@ class WikiDB_backend
 * @return boolean True iff successful.
 */
- function rebuild() {
+ function rebuild($args=false) {
 	global $request;
 	$dbh = $request->getDbh();
@@ -608,6 +608,6 @@ class WikiDB_backend
 // duration problem: sprintf "%f" might use comma e.g. "100,201" in european locales
 $dbh->query("INSERT INTO $log_tbl"
- . " (time_stamp,remote_host,remote_user,request_method,request_line,request_uri,"
- . "request_args,request_time,status,bytes_sent,referer,agent,request_duration)"
+ . " (time_stamp,remote_host,remote_user,request_method,request_line,request_args,"
+ . "request_uri,request_time,status,bytes_sent,referer,agent,request_duration)"
 . " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)",
 array(
@@ -619,6 +619,6 @@ class WikiDB_backend
 $entry->request_method, 
 $entry->request, 
- $entry->request_uri, 
 $entry->request_args,
+ $entry->request_uri,
 $entry->_ncsa_time($entry->time), 
 $entry->status, 
@@ -762,4 +762,7 @@ class WikiDB_backend_search_sql extends 
 
 // $Log$
+// Revision 1.35 2007年08月25日 18:17:46 rurban
+// rearrange access_log columns into natural order: request_args
+//
 // Revision 1.34 2007年07月14日 12:03:51 rurban
 // just typo

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29170/plugin
Modified Files:
	PageHistory.php 
Log Message:
add proper headline
Index: PageHistory.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PageHistory.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -2 -b -p -d -r1.33 -r1.34
--- PageHistory.php	14 Jul 2007 12:04:39 -0000	1.33
+++ PageHistory.php	25 Aug 2007 18:53:19 -0000	1.34
@@ -2,5 +2,5 @@
 rcs_id('$Id$');
 /**
- Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
+ Copyright 1999, 2000, 2001, 2002, 2007 $ThePhpWikiProgrammingTeam
 
 This file is part of PhpWiki.
@@ -88,9 +88,16 @@ extends _RecentChanges_HtmlFormatter
 }
 
- function title() {
- return array(fmt("PageHistory for %s",
+ function headline() {
+ return HTML(fmt("PageHistory for %s",
 WikiLink($this->_args['page'])),
 "\n",
- $this->rss_icon());
+ $this->rss_icon(),
+		 $this->rss2_icon(),
+		 $this->atom_icon(),
+		 $this->rdf_icon());
+ }
+
+ function title() {
+ return "PageHistory:".$this->_args['page'];
 }
 
@@ -337,4 +344,7 @@ extends WikiPlugin_RecentChanges
 
 // $Log$
+// Revision 1.34 2007年08月25日 18:53:19 rurban
+// add proper headline
+//
 // Revision 1.33 2007年07月14日 12:04:39 rurban
 // fix rss button actions

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18492
Modified Files:
	RssWriter.php 
Log Message:
remove old comments from mediawiki
Index: RssWriter.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/RssWriter.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -2 -b -p -d -r1.14 -r1.15
--- RssWriter.php	1 Jul 2007 09:17:45 -0000	1.14
+++ RssWriter.php	25 Aug 2007 18:25:40 -0000	1.15
@@ -188,5 +188,7 @@ class RssWriter extends XmlElement
 };
 
-/* taken from mediawiki */
+/* Taken from mediawiki. 
+ * See http://www.atomenabled.org/developers/syndication/ 
+ */
 class AtomFeed extends RssWriter {
 
@@ -210,11 +212,4 @@ class AtomFeed extends RssWriter {
 printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", RSS_ENCODING);
 printf("<!-- generator=\"PhpWiki-%s\" -->\n", PHPWIKI_VERSION);
- /*
- <feed version="0.3" xmlns="http://www.w3.org/2005/Atom" xml:lang="$LANG">	
- <title><?php print $this->getTitle() ?></title>
- <link rel="alternate" type="text/html" href="<?php print $this->getUrl() ?>"/>
- <modified><?= gmdate( 'Y-m-d\TH:i:s', wfTimestamp( TS_UNIX, $ts ) ) ?>Z</modified>
- <tagline><?php print $this->getDescription() ?></tagline>
- */
 $this->printXML();
 }
@@ -237,23 +232,8 @@ class AtomFeed extends RssWriter {
 function addItem($properties, $attr=false, $uri = false) {
 $this->_items[] = $this->__node('entry', $attr, $properties, $uri);
- /*
-	<entry>
-		<title><?php print $item->getTitle() ?></title>
-		<link rel="alternate" type="<?php print $wgMimeType ?>" href="<?php print $item->getUrl() ?>"/>
-		<?php if( $item->getDate() ) { ?>
-		<modified><?php print $this->formatTime( $item->getDate() ) ?>Z</modified>
-		<issued><?php print $this->formatTime( $item->getDate() ) ?></issued>
-		<created><?php print $this->formatTime( $item->getDate() ) ?>Z</created><?php } ?>
-	
-		<summary type="text/plain"><?php print $item->getDescription() ?></summary>
-		<?php if( $item->getAuthor() ) { ?><author><name><?php print $item->getAuthor() ?></name><!-- <url></url><email></email> --></author><?php }?>
-		<comment>foobar</comment>
- <?php if( $item->getComments() ) { ?><dc:comment><?php print $item->getComments() ?></dc:comment><?php }?> 
-	</entry> 
- */
 }
 
 /**
- * Finish construction of RSS.
+ * Print it.
 */
 function finish() {
@@ -263,21 +243,4 @@ class AtomFeed extends RssWriter {
 $channel = &$this->_channel;
 $items = &$this->_items;
-	/*
- $seq = new XmlElement('rdf:Seq');
- if ($items) {
- foreach ($items as $item)
- $seq->pushContent($this->__ref('rdf:li', $item));
- }
- $channel->pushContent(new XmlElement('items', false, $seq));
-	if (isset($this->_image)) {
- $channel->pushContent($this->__ref('image', $this->_image));
-	 $items[] = $this->_image;
-	}
-	if (isset($this->_textinput)) {
- $channel->pushContent($this->__ref('textinput', $this->_textinput));
-	 $items[] = $this->_textinput;
-	}
-	*/
-
 	if ($items)
 	 $channel->pushContent($items);

Update of /cvsroot/phpwiki/phpwiki/lib/WikiUser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28380/WikiUser
Modified Files:
	AdoDb.php 
Log Message:
protect _HomePagehandle
Index: AdoDb.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser/AdoDb.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- AdoDb.php	30 May 2007 21:53:52 -0000	1.10
+++ AdoDb.php	25 Aug 2007 18:51:25 -0000	1.11
@@ -56,5 +56,5 @@ extends _DbPassUser
 }
 }
- if ($this->_HomePagehandle) {
+ if (!empty($this->_HomePagehandle)) {
 if ($restored_from_page = $this->_prefs->retrieve
 ($this->_HomePagehandle->get('pref'))) {
@@ -276,4 +276,7 @@ extends _DbPassUser
 
 // $Log$
+// Revision 1.11 2007年08月25日 18:51:25 rurban
+// protect _HomePagehandle
+//
 // Revision 1.10 2007年05月30日 21:53:52 rurban
 // add userid to authcreate

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19929/pgsrc
Added Files:
	UriResolver 
Log Message:
add UriResolver needed for external rdf access
--- NEW FILE: UriResolver ---
Date: 2007年7月16日 17:28:05 +0200
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14)
X-Rcs-Id: $Id: UriResolver,v 1.1 2007年08月25日 18:29:24 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=UriResolver;
 pgsrc_version="1 $Revision: 1.1 $";
 flags=PAGE_LOCKED;
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
<?plugin UriResolver ?>

Update of /cvsroot/phpwiki/phpwiki/themes/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20653/default
Modified Files:
	phpwiki.css 
Log Message:
openid support
Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/phpwiki.css,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -2 -b -p -d -r1.61 -r1.62
--- phpwiki.css	15 Jul 2007 17:40:13 -0000	1.61
+++ phpwiki.css	25 Aug 2007 19:54:26 -0000	1.62
@@ -88,4 +88,9 @@ div#browse {
 /*background: #dddddd;*/
 }
+input#inp-openid {
+ background: url('images/openid.png') bottom left no-repeat;
+ background-repeat: no-repeat;
+ padding-left: 18px !important;
+}
 
 /* .interwiki-map thead td { text-decoration: underline; } */
@@ -196,5 +201,5 @@ h1 .backlinks { text-decoration: underli
 /* image buttons */
 a.wikibutton, a.wikibutton:visited, input.wikibutton { 
- background-color: none; 
+ background-color: white; 
 }
 
@@ -914,4 +919,5 @@ div.feed { color: #333; margin: -0.5em; 
 div.itemdesc { padding-left: 1em; }
 div.rssitem { border-top: thin dashed #aaa; }
+a.rssicon { font-weight:normal; font-size:small; vertical-align:middle; }
 
 /* SqlResult */

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14763
Modified Files:
	dbaBase.php 
Log Message:
add args to check and rebuild
fix sorting for empty mtime field
improve docs
Index: dbaBase.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/dbaBase.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -2 -b -p -d -r1.30 -r1.31
--- dbaBase.php	15 Jul 2007 17:39:25 -0000	1.30
+++ dbaBase.php	25 Aug 2007 18:16:23 -0000	1.31
@@ -11,31 +11,32 @@ require_once('lib/WikiDB/backend.php');
 *
 * page:
- * Index: pagename
+ * Index: 'p' + pagename
 * Values: latestversion . ':' . flags . ':' serialized hash of page meta data
 * Currently flags = 1 if latest version has empty content.
 *
 * version
- * Index: version:pagename
+ * Index: 'v' + version:pagename
 * Value: serialized hash of revision meta data, including:
 * + quasi-meta-data %content
 *
 * links
- * index: 'o' . pagename
+ * index: 'o' + pagename
 * value: serialized list of pages (names) which pagename links to.
- * index: 'i' . pagename
+ * index: 'i' + pagename
 * value: serialized list of pages which link to pagename
 *
 * TODO:
- * Don't keep tables locked the whole time
- *
- * index table with:
- * list of pagenames for get_all_pages
- * mostpopular list?
- * RecentChanges support: 
- * lists of most recent edits (major, minor, either).
+ * Don't keep tables locked the whole time.
 * 
+ * More index tables:
+ * - Yes - RecentChanges support. Lists of most recent edits (major, minor, either).
+ * 't' + mtime => 'a|i' + version+':'+pagename ('a': major, 'i': minor)
+ * Cost: Currently we have to get_all_pages and sort it by mtime.
+ * With a seperate t table we have to update this table on every version change.
+ * - No - list of pagenames for get_all_pages (very cheap: iterate page table)
+ * - Maybe - mostpopular list? 'h' + pagename => hits
 *
 * Separate hit table, so we don't have to update the whole page entry
- * each time we get a hit. (Maybe not so important though...).
+ * each time we get a hit. Maybe not so important though.
 */ 
 
@@ -73,5 +74,6 @@ extends WikiDB_backend
 }
 
- function rebuild() {
+ function rebuild($args=false) {
+ 	if (!empty($args['all']))
 	parent::rebuild();
 	// rebuild backlink table
@@ -80,5 +82,5 @@ extends WikiDB_backend
 }
 
- function check() {
+ function check($args=false) {
 return $this->_linkdb->check();
 }
@@ -186,4 +188,5 @@ extends WikiDB_backend
 	// update links and backlinks
 $this->_linkdb->set_links($to, $links);
+ // better: update all back-/inlinks for all outlinks.
 
 	return true;
@@ -532,11 +535,12 @@ function WikiDB_backend_dbaBase_sortby_n
 $bv = $dbi->_backend->get_latest_version($bname);
 $a = $dbi->_backend->get_versiondata($aname, $av, false);
- if (!$a) return 0;
+ if (!$a) return -1;
 $b = $dbi->_backend->get_versiondata($bname, $bv, false);
- if (!$b) return 0;
- if ((!isset($a[$field]) && !isset($b[$field])) || ($a[$field] === $b[$field])) {
+ if (!$b or !isset($b[$field])) return 0;
+ if (empty($a[$field])) return -1;
+ if ((!isset($a[$field]) and !isset($b[$field])) or ($a[$field] === $b[$field])) {
 return 0; 
 } else {
- return (!isset($a[$field]) || ($a[$field] < $b[$field])) ? -1 : 1;
+ return ($a[$field] < $b[$field]) ? -1 : 1;
 }
 }
@@ -637,8 +641,9 @@ class WikiDB_backend_dbaBase_linktable 
 $newlinks = array();
 foreach ($links as $hash) {
- if (!empty($hash['linkto']) 
- and !in_array($hash['linkto'], $newlinks))
+ if (!empty($hash['linkto']) and !in_array($hash['linkto'], $newlinks))
 // for attributes it's empty
 $newlinks[] = $hash['linkto'];		
+ elseif (is_string($hash) and !in_array($hash, $newlinks)) 		
+ $newlinks[] = $hash;
 }
 //$newlinks = array_unique($newlinks);
@@ -789,4 +794,9 @@ class WikiDB_backend_dbaBase_linktable 
 
 // $Log$
+// Revision 1.31 2007年08月25日 18:16:23 rurban
+// add args to check and rebuild
+// fix sorting for empty mtime field
+// improve docs
+//
 // Revision 1.30 2007年07月15日 17:39:25 rurban
 // update links at rename. optimize _has_link from O(n) to O(n/2) - binary search O(log n) in work

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28792/plugin
Modified Files:
	ModeratedPage.php 
Log Message:
protect _HomePagehandle
Index: ModeratedPage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/ModeratedPage.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- ModeratedPage.php	7 Jan 2007 18:45:46 -0000	1.6
+++ ModeratedPage.php	25 Aug 2007 18:52:34 -0000	1.7
@@ -239,4 +239,5 @@ extends WikiPlugin
 	 $moderated['id'] = $id; 		// overwrite current id
 	 $tempuser = $request->_user;
+	 if (isset($tempuser->_HomePagehandle))
 	 unset($tempuser->_HomePagehandle);
 	 $moderated['data'][$id] = array( 	// add current request
@@ -447,4 +448,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.7 2007年08月25日 18:52:34 rurban
+// protect _HomePagehandle
+//
 // Revision 1.6 2007年01月07日 18:45:46 rurban
 // Finish 3/3 of the functionality, the Moderators approve and reject, Fix some logical flaws with !empty($status[emails]). Generate a better ID

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18113
Modified Files:
	BlockParser.php 
Log Message:
speed up divspan without \n
Index: BlockParser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/BlockParser.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -2 -b -p -d -r1.62 -r1.63
--- BlockParser.php	10 Aug 2007 21:54:08 -0000	1.62
+++ BlockParser.php	25 Aug 2007 18:24:30 -0000	1.63
@@ -1095,5 +1095,8 @@ class Block_divspan extends BlockMarkup
 $content = $me[1];
 $input->advance();
- $content = TransformInline(trim($content));
+ if (strstr($content, "\n"))
+ $content = TransformText($content);
+ else 
+ $content = TransformInline($content);
 if (!$argstr) 
 $args = false;
@@ -1167,4 +1170,7 @@ function TransformText ($text, $markup =
 
 // $Log$
+// Revision 1.63 2007年08月25日 18:24:30 rurban
+// speed up divspan without \n
+//
 // Revision 1.62 2007年08月10日 21:54:08 rurban
 // fix DIVSPAN parsing

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11495
Modified Files:
	LdapSearch.php 
Log Message:
use default basedn
Index: LdapSearch.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/LdapSearch.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- LdapSearch.php	22 Jan 2007 23:50:00 -0000	1.5
+++ LdapSearch.php	25 Aug 2007 18:06:46 -0000	1.6
@@ -83,4 +83,5 @@ extends WikiPlugin
 $args = $this->getArgs($argstr, $request);
 extract($args);
+ //include_once("lib/WikiUser/LDAP.php");
 if (!$host) {
 if (defined('LDAP_AUTH_HOST')) {
@@ -135,4 +136,5 @@ extends WikiPlugin
 }
 if (!$bind) return $this->error(_("Failed to bind LDAP host"));
+	if (!$basedn) $basedn = LDAP_BASE_DN;
 	$attr_array = array("");
 	if (!$attributes) {
@@ -162,5 +164,5 @@ extends WikiPlugin
 		$data = $entries[$i][$ii];
 		$datalen = $entries[$i][$data]["count"];
-		if ($attrcols[$ii] < $datalen ) {
+		if ($attrcols[$ii] < $datalen) {
 		 $attrcols[$ii] = $datalen;
 		}
@@ -178,17 +180,15 @@ extends WikiPlugin
 
 	// Print the data rows
-	for ($i = 0; $i<$entries["count"]; $i++) {
+	for ($i = 0; $i < $entries["count"]; $i++) {
 	 $row = HTML::tr(); $nc=0;
-	 for ($ii=0; $ii < $entries[$i]["count"]; $ii++){
-		$data = $entries[$i][$ii];
-		// 3 possible cases for the values of each attribute.
-		switch ($entries[$i][$data]["count"]) {
-		case 0:
+	 for ($ii=0; $ii < count($attr_array); $ii++){
+		$data = @$entries[$i][$attr_array[$ii]];
+		if ($data and $data["count"] > 0) {
+		 for ($iii=0; $iii < $data["count"]; $iii++) {
+			$row->pushContent(HTML::td($data[$iii])); $nc++;
+		 }
+		} else {
 		 $row->pushContent(HTML::td("")); $nc++;
 		 break;
-		default:
-		 for ($iii=0; $iii < $entries[$i][$data]["count"]; $iii++) {
-			$row->pushContent(HTML::td($entries[$i][$data][$iii])); $nc++;
-		 }
 		}
 		// Make up some blank cells if required to pad this row
@@ -204,4 +204,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.6 2007年08月25日 18:06:46 rurban
+// use default basedn
+//
 // Revision 1.5 2007年01月22日 23:50:00 rurban
 // Improve Table for no attributes

Update of /cvsroot/phpwiki/phpwiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6412
Modified Files:
	TODO 
Log Message:
add rename
Index: TODO
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/TODO,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -2 -b -p -d -r1.18 -r1.19
--- TODO	1 Jul 2007 10:05:15 -0000	1.18
+++ TODO	25 Aug 2007 17:52:14 -0000	1.19
@@ -1,10 +1,10 @@
 short-term TODO:
+* rename should check existing subpages and rename these also.
 * Sidebar: merge AVL theme (internal MonoBook derivate with customizable box states) with Sidebar
 * fix session loss on php-5.2 (with or without DB_SESSION)
 * clarify issues with pagenames: "," breaks PageList. Escape with "~" or "\"?
 * fix Wikiwys with prettyurl, link labels and killing plugin args
-* ranked FullTextSearch (besides postgresql)
 * ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl
-* WikiUser/OpenID (from DokuWiki)
+* WikiUser/OpenID (from DokuWiki) - Status::in_work
 * more meta stuff: OpenSearch, format=dc (Dublin Core)
 * format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's. 

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29980/plugin
Modified Files:
	WhoIsOnline.php 
Log Message:
cleanup stale session
Index: WhoIsOnline.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/WhoIsOnline.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -2 -b -p -d -r1.11 -r1.12
--- WhoIsOnline.php	2 Feb 2005 19:39:42 -0000	1.11
+++ WhoIsOnline.php	25 Aug 2007 18:55:24 -0000	1.12
@@ -103,6 +103,10 @@ extends WikiPlugin
 $registered = array(); $guests = array();
 $admins = array(); $uniquenames = array();
+	$sess_time = ini_get('session.gc_maxlifetime'); // in seconds
+	if (!$sess_time) $sess_time = 24*60;
 if (isset($request->_dbsession)) { // only ADODB and SQL backends
- $dbsession = &$request->_dbsession;
+ $dbsession =& $request->_dbsession;
+ if (method_exists($dbsession->_backend, "gc"))
+ $dbsession->_backend->gc($sess_time);
 $sessions = $dbsession->currentSessions();
 //$num_online = count($sessions);
@@ -166,6 +170,4 @@ extends WikiPlugin
 $num_users = $num_guests + $num_registered;
 
-	$sess_time = ini_get('session.gc_maxlifetime'); // in seconds
-
 //TODO: get and sets max stats in global_data
 //$page = $dbi->getPage($request->getArg('pagename'));
@@ -200,4 +202,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.12 2007年08月25日 18:55:24 rurban
+// cleanup stale session
+//
 // Revision 1.11 2005年02月02日 19:39:42 rurban
 // better box layout

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30012/plugin
Modified Files:
	WikiAdminUtils.php 
Log Message:
support new check and rebuild args
Index: WikiAdminUtils.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/WikiAdminUtils.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -2 -b -p -d -r1.24 -r1.25
--- WikiAdminUtils.php	7 Jan 2007 18:46:31 -0000	1.24
+++ WikiAdminUtils.php	25 Aug 2007 18:55:49 -0000	1.25
@@ -210,5 +210,5 @@ extends WikiPlugin
 $dbh = $request->getDbh();
 	//FIXME: display result.
- $result = $dbh->_backend->check();
+ $result = $dbh->_backend->check($args);
 return $result;
 }
@@ -218,5 +218,5 @@ extends WikiPlugin
 $dbh = $request->getDbh();
 	//FIXME: display result.
- $result = $dbh->_backend->rebuild();
+ $result = $dbh->_backend->rebuild($args);
 return $result;
 }

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12205
Modified Files:
	WikiAdminRename.php 
Log Message:
change rename action from access perm change to edit: allow the signed in user to rename. Improve layout
Index: WikiAdminRename.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/WikiAdminRename.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -2 -b -p -d -r1.26 -r1.27
--- WikiAdminRename.php	1 Apr 2005 16:06:41 -0000	1.26
+++ WikiAdminRename.php	25 Aug 2007 18:08:24 -0000	1.27
@@ -2,5 +2,5 @@
 rcs_id('$Id$');
 /*
- Copyright 2004,2005 $ThePhpWikiProgrammingTeam
+ Copyright 2004,2005,2007 $ThePhpWikiProgrammingTeam
 
 This file is part of PhpWiki.
@@ -81,6 +81,6 @@ extends WikiPlugin_WikiAdminSelect
 $ul->pushContent(HTML::li(fmt("Page %s already exists. Ignored.",
 WikiLink($newname))));
- elseif (! mayAccessPage('change', $name))
- $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",
+ elseif (! mayAccessPage('edit', $name))
+ $ul->pushContent(HTML::li(fmt("Access denied to rename page '%s'.",
 WikiLink($name))));
 elseif ( $dbi->renamePage($name, $newname, $updatelinks)) {
@@ -108,6 +108,7 @@ extends WikiPlugin_WikiAdminSelect
 
 function run($dbi, $argstr, &$request, $basepage) {
- if ($request->getArg('action') != 'browse')
- if ($request->getArg('action') != _("PhpWikiAdministration/Rename"))
+ 	$action = $request->getArg('action');
+ if ($action != 'browse' and $action != 'rename' 
+ and $action != _("PhpWikiAdministration")."/"._("Rename"))
 return $this->disabled("(action != 'browse')");
 
@@ -149,7 +150,7 @@ extends WikiPlugin_WikiAdminSelect
 $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
 }
- if ($next_action == 'verify') {
+ /*if ($next_action == 'verify') {
 $args['info'] = "checkbox,pagename,renamed_pagename";
- }
+ }*/
 $pagelist = new PageList_Selectable
 (
@@ -166,10 +167,9 @@ extends WikiPlugin_WikiAdminSelect
 $header->pushContent(
 HTML::p(HTML::strong(
- _("Are you sure you want to permanently rename the selected files?"))));
+ _("Are you sure you want to permanently rename the selected pages?"))));
 $header = $this->renameForm($header, $post_args);
 }
 else {
 $button_label = _("Rename selected pages");
- $header->pushContent(HTML::p(_("Select the pages to rename:")));
 if (!$post_args and count($pages) == 1) {
 list($post_args['from'],) = array_keys($pages);
@@ -177,7 +177,9 @@ extends WikiPlugin_WikiAdminSelect
 }
 $header = $this->renameForm($header, $post_args);
+ $header->pushContent(HTML::p(_("Select the pages to rename:")));
 }
 
 $buttons = HTML::p(Button('submit:admin_rename[rename]', $button_label, 'wikiadmin'),
+			 HTML::Raw('  '),
 Button('submit:admin_rename[cancel]', _("Cancel"), 'button'));
 
@@ -197,24 +199,30 @@ extends WikiPlugin_WikiAdminSelect
 
 function checkBox (&$post_args, $name, $msg) {
+ 	$id = 'admin_rename-'.$name;
 $checkbox = HTML::input(array('type' => 'checkbox',
 'name' => 'admin_rename['.$name.']',
+ 'id' => $id,
 'value' => 1));
 if (!empty($post_args[$name]))
 $checkbox->setAttr('checked', 'checked');
- return HTML::div($checkbox, ' ', HTML::span($msg));
+ return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
 }
 
 function renameForm(&$header, $post_args) {
- $header->pushContent(_("Rename")." "._("from").': ');
- $header->pushContent(HTML::input(array('name' => 'admin_rename[from]',
+ $table = HTML::table();
+ $this->_tablePush($table, _("Rename"). " ". _("from").': ',
+			 HTML::input(array('name' => 'admin_rename[from]',
+					 'size' => 90,
 'value' => $post_args['from'])));
- $header->pushContent(' '._("to").': ');
- $header->pushContent(HTML::input(array('name' => 'admin_rename[to]',
+ $this->_tablePush($table, _("to").': ',
+			 HTML::input(array('name' => 'admin_rename[to]',
+					 'size' => 90,
 'value' => $post_args['to'])));
- $header->pushContent($this->checkBox($post_args, 'regex', _("Regex?")));
- $header->pushContent($this->checkBox($post_args, 'icase', _("Case insensitive?")));
- $header->pushContent(HTML::br());
- $header->pushContent($this->checkBox($post_args, 'updatelinks', 
+	$this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
+ $this->_tablePush($table, '', $this->checkBox($post_args, 'icase', _("Case insensitive?")));
+ $this->_tablePush($table, '', HTML::td());
+ $this->_tablePush($table, '', $this->checkBox($post_args, 'updatelinks', 
 _("Change pagename in all linked pages also?")));
+ $header->pushContent($table);
 $header->pushContent(HTML::p());
 return $header;
@@ -233,7 +241,9 @@ class _PageList_Column_renamed_pagename 
 $options = array('regex' => @$post_args['regex'],
 'icase' => @$post_args['icase']);
- $value = WikiPlugin_WikiAdminRename::renameHelper($page_handle->getName(), 
+ 
+ $value = $post_args ? WikiPlugin_WikiAdminRename::renameHelper($page_handle->getName(), 
 $post_args['from'], $post_args['to'],
- $options);
+ $options)
+ : $page_handle->getName(); 
 $div = HTML::div(" => ",HTML::input(array('type' => 'text',
 'name' => 'rename[]',
@@ -249,4 +259,7 @@ class _PageList_Column_renamed_pagename 
 
 // $Log$
+// Revision 1.27 2007年08月25日 18:08:24 rurban
+// change rename action from access perm change to edit: allow the signed in user to rename. Improve layout
+//
 // Revision 1.26 2005年04月01日 16:06:41 rurban
 // do not trim spaces

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28767/plugin
Modified Files:
	Calendar.php 
Log Message:
Calendar weekday: change from Sunday to start now with Monday
Index: Calendar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Calendar.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -2 -b -p -d -r1.33 -r1.34
--- Calendar.php	22 Jan 2007 23:48:54 -0000	1.33
+++ Calendar.php	25 Aug 2007 18:52:21 -0000	1.34
@@ -60,5 +60,5 @@ extends WikiPlugin
 'month_format' => '%B, %Y',
 'wday_format' => '%a',
- 'start_wday' => '0',
+ 'start_wday' => '1', // start now with monday
 		 'display_weeknum' => 0);
 }
@@ -252,4 +252,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.34 2007年08月25日 18:52:21 rurban
+// Calendar weekday: change from Sunday to start now with Monday
+//
 // Revision 1.33 2007年01月22日 23:48:54 rurban
 // Fix Calendar %U: weeknum starting with 1