phpwiki-checkins Mailing List for PhpWiki

Revision: 7095
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7095&view=rev
Author: rurban
Date: 2009年08月31日 11:28:47 +0000 (2009年8月31日)
Log Message:
-----------
cleanup: delete references to emailVerified
Modified Paths:
--------------
 trunk/lib/WikiUser/OpenID.php
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php	2009年08月31日 11:28:08 UTC (rev 7094)
+++ trunk/lib/WikiUser/OpenID.php	2009年08月31日 11:28:47 UTC (rev 7095)
@@ -1,6 +1,6 @@
 <?php //-*-php-*-
 rcs_id('$Id$');
-/* Copyright (C) 2007 ReiniUrban
+/* Copyright (C) 2007,2009 ReiniUrban
 * This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
 *
 * See http://openid.net/specs/openid-authentication-1_1.html
@@ -29,11 +29,13 @@
 return $this->_tryNextUser();
 }
 $this->_authmethod = 'OpenID';
- // check the prefs for emailVerified
- if ($this->_prefs->get('emailVerified'))
- return true;
 return $this->_tryNextUser();
 }
+ // no quotes and shorter than 128
+ function isValidName() {
+ if (!$this->_userid) return false;
+ return !preg_match('/[\"\']/', $this->_userid) and strlen($this->_userid) < 128;
+ }
 }
 
 // Local Variables:
@@ -43,4 +45,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7094
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7094&view=rev
Author: rurban
Date: 2009年08月31日 11:28:08 +0000 (2009年8月31日)
Log Message:
-----------
Warn about fixed invalid image links
Modified Paths:
--------------
 trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009年08月31日 11:21:07 UTC (rev 7093)
+++ trunk/lib/stdlib.php	2009年08月31日 11:28:08 UTC (rev 7094)
@@ -475,7 +475,7 @@
 }
 } 
 else {
- trigger_error(sprintf(_("Invalid image attribute %s %s=%s"),
+ trigger_error(sprintf(_("Invalid image attribute \"%s\" %s=%s"),
 $url, $attr, $value), E_USER_WARNING);
 }
 }
@@ -485,10 +485,15 @@
 	$file = NormalizeLocalFileName($ori_url);
 if (file_exists($file)) {
 $link = HTML::img(array('src' => $ori_url));
+ trigger_error(
+ sprintf(_("Invalid image link fixed %s => %s. Spaces must be quoted with %%20."),
+ $url, $ori_url), E_USER_WARNING);
 } elseif (string_starts_with($ori_url, getUploadDataPath())) {
 $file = substr($file, strlen(getUploadDataPath()));
 $path = getUploadFilePath().$file;
 if (file_exists($path)) {
+ 	 trigger_error(sprintf(_("Invalid image link fixed \"%s\" => \"%s\".\n Spaces must be quoted with %%20."),
+ $url, $ori_url), E_USER_WARNING);
 $link->setAttr('src', getUploadDataPath() . $file);
 $url = $ori_url;
 }
@@ -554,7 +559,7 @@
 $link->setAttr('class', 'inlineimage');
 
 /* Check for inlined objects. Everything allowed in INLINE_IMAGES besides
- * png|jpg|gif|jpeg|bmp|pl|cgi
+ * png|jpg|gif|jpeg|bmp|pl|cgi. If no image it is an object to embed.
 * Note: Allow cgi's (pl,cgi) returning images.
 */
 if (!preg_match("/\.(".$force_img.")/i", $url)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7093
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7093&view=rev
Author: rurban
Date: 2009年08月31日 11:21:07 +0000 (2009年8月31日)
Log Message:
-----------
fix wrong paging with cols.
ol start value (listtype=ol) not yet stable
Modified Paths:
--------------
 trunk/lib/PageList.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2009年08月31日 10:58:59 UTC (rev 7092)
+++ trunk/lib/PageList.php	2009年08月31日 11:21:07 UTC (rev 7093)
@@ -1527,15 +1527,15 @@
 	if (empty($this->_pages)) return; // stop recursion
 	if (!isset($this->_options['listtype'])) 
 	 $this->_options['listtype'] = '';
-	 $nb_row = 0;
-	 foreach ($this->_pages as $pagenum => $page) {
-	 	$one_row = $this->_renderPageRow($page);
+	$nb_row = 0;
+	foreach ($this->_pages as $pagenum => $page) {
+	 $one_row = $this->_renderPageRow($page);
 $rows[] = array('header' => WikiLink($page), 'render' => $one_row);
 if ($one_row) $nb_row++;
-	 }
+	}
 $out = HTML();
 if ($caption) {
- 	$caption = preg_replace('/{total}/', $nb_row, asString($caption));
+ $caption = preg_replace('/{total}/', $nb_row, asString($caption));
 $out->pushContent(HTML::p($caption));
 }
 	// Semantic Search et al: only unique list entries, esp. with nopage
@@ -1558,9 +1558,13 @@
 }
 }
 
+ if (!empty($this->_options['limit']))
+ list($offset, $count) = $this->limit($this->_options['limit']);
+ else {
+ $offset = 0; $count = count($this->_pages);
+ }
 // need a recursive switch here for the azhead and cols grouping.
 if (!empty($this->_options['cols']) and $this->_options['cols'] > 1) {
- $count = count($this->_pages);
 $length = intval($count / ($this->_options['cols']));
 // If division does not give an integer, we need one more line
 // E.g. 13 pages to display in 3 columns.
@@ -1569,7 +1573,7 @@
 }
 $width = sprintf("%d", 100 / $this->_options['cols']).'%';
 $cols = HTML::tr(array('valign' => 'top'));
- for ($i=0; $i < $count; $i += $length) {
+ for ($i=$offset; $i < $offset+$count; $i += $length) {
 $this->_saveOptions(array('cols' => 0, 'paging' => 'none'));
 $this->_pages = array_slice($this->_pages, $i, $length);
 $cols->pushContent(HTML::td(/*array('width' => $width),*/ 
@@ -1577,9 +1581,10 @@
 $this->_restoreOptions();
 }
 // speed up table rendering by defining colgroups
- $out->pushContent(HTML::table(HTML::colgroup(array('span' => $this->_options['cols'],
- 						 'width' => $width)),
- $cols));
+ $out->pushContent(HTML::table(HTML::colgroup
+ 	(array('span' => $this->_options['cols'],
+ 	 'width' => $width)),
+ $cols));
 return $out;
 }
 
@@ -1596,7 +1601,7 @@
 $page =& $this->_pages[$i];
 $h = substr($page->getName(), 0, 1);
 if ($h != $cur_h and $i > $j) {
- $this->_saveOptions(array('cols' => 0, 'azhead' => 0));
+ $this->_saveOptions(array('cols' => 0, 'azhead' => 0, 'ordered' => $j+1));
 $this->_pages = array_slice($this->_pages, $j, $i - $j);
 $out->pushContent($this->_generateList());
 $this->_restoreOptions();
@@ -1606,7 +1611,7 @@
 }
 }
 if ($i > $j) { // flush the rest
- $this->_saveOptions(array('cols' => 0, 'azhead' => 0));
+ $this->_saveOptions(array('cols' => 0, 'azhead' => 0, 'ordered' => $j+1));
 $this->_pages = array_slice($this->_pages, $j, $i - $j);
 $out->pushContent($this->_generateList());
 $this->_restoreOptions();
@@ -1624,13 +1629,16 @@
 return $out;
 }
 
- if ($this->_options['listtype'] == 'ol')
- $this->_options['ordered'] = 1;
- elseif ($this->_options['listtype'] == 'ul')
+ if ($this->_options['listtype'] == 'ol') {
+ if (empty($this->_options['ordered'])) {
+ $this->_options['ordered'] = $offset+1;
+ }
+ } elseif ($this->_options['listtype'] == 'ul')
 $this->_options['ordered'] = 0;
- if (!empty($this->_options['ordered']))
-	 $list = HTML::ol(array('class' => 'pagelist'));
-	elseif ($this->_options['listtype'] == 'dl') {
+ if ($this->_options['listtype'] == 'ol' and !empty($this->_options['ordered'])) {
+	 $list = HTML::ol(array('class' => 'pagelist', 
+	 'start' => $this->_options['ordered']));
+ } elseif ($this->_options['listtype'] == 'dl') {
 $list = HTML::dl(array('class' => 'pagelist'));
 	} else {
 $list = HTML::ul(array('class' => 'pagelist'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7092
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7092&view=rev
Author: rurban
Date: 2009年08月31日 10:58:59 +0000 (2009年8月31日)
Log Message:
-----------
omit debugging notice: undefined readonly
Modified Paths:
--------------
 trunk/lib/WikiDB.php
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2009年08月27日 19:38:42 UTC (rev 7091)
+++ trunk/lib/WikiDB.php	2009年08月31日 10:58:59 UTC (rev 7092)
@@ -216,7 +216,7 @@
 * @see purgePage
 */
 function deletePage($pagename) {
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 	// don't create empty revisions of already purged pages.
 if ($this->_backend->get_latest_version($pagename))
 $result = $this->_cache->delete_page($pagename);
@@ -249,7 +249,7 @@
 * @see deletePage
 */
 function purgePage($pagename) {
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 $result = $this->_cache->purge_page($pagename);
 $this->deletePage($pagename); // just for the notification
 return $result;
@@ -519,7 +519,7 @@
 * @return boolean true or false
 */
 function renamePage($from, $to, $updateWikiLinks = false) {
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 assert(is_string($from) && $from != '');
 assert(is_string($to) && $to != '');
 $result = false;
@@ -671,7 +671,7 @@
 * @param string $newval New value.
 */
 function set($key, $newval) {
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 if (!$key || $key[0] == '%')
 return;
 
@@ -2130,7 +2130,7 @@
 
 function update_pagedata($pagename, $newdata) {
 assert(is_string($pagename) && $pagename != '');
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 
 $this->_backend->update_pagedata($pagename, $newdata);
 
@@ -2155,14 +2155,14 @@
 }
 
 function delete_page($pagename) {
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 $result = $this->_backend->delete_page($pagename);
 $this->invalidate_cache($pagename);
 return $result;
 }
 
 function purge_page($pagename) {
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 $result = $this->_backend->purge_page($pagename);
 $this->invalidate_cache($pagename);
 return $result;
@@ -2215,7 +2215,7 @@
 function set_versiondata($pagename, $version, $data) {
 //unset($this->_versiondata_cache[$pagename][$version]);
 
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 $new = $this->_backend->set_versiondata($pagename, $version, $data);
 // Update the cache
 $this->_versiondata_cache[$pagename][$version]['1'] = $data;
@@ -2225,7 +2225,7 @@
 }
 
 function update_versiondata($pagename, $version, $data) {
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 $new = $this->_backend->update_versiondata($pagename, $version, $data);
 // Update the cache
 $this->_versiondata_cache[$pagename][$version]['1'] = $data;
@@ -2236,7 +2236,7 @@
 }
 
 function delete_versiondata($pagename, $version) {
- if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+ if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
 $new = $this->_backend->delete_versiondata($pagename, $version);
 if (isset($this->_versiondata_cache[$pagename][$version]))
 unset ($this->_versiondata_cache[$pagename][$version]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7091
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7091&view=rev
Author: vargenau
Date: 2009年08月27日 19:38:42 +0000 (2009年8月27日)
Log Message:
-----------
Valid XHTML code
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2009年08月26日 10:47:03 UTC (rev 7090)
+++ trunk/lib/WikiTheme.php	2009年08月27日 19:38:42 UTC (rev 7091)
@@ -1470,7 +1470,7 @@
 	 }
 //$this->addMoreHeaders($this->_CSSlink(0, 
 // $this->_findFile('moacdropdown/css/dropdown.css'), 'all'));
- $this->addMoreHeaders(HTML::style(" @import url( $dir/css/dropdown.css );\n"));
+ $this->addMoreHeaders(HTML::style(array('type' => 'text/css'), " @import url( $dir/css/dropdown.css );\n"));
 	 /*
 	 // for local xmlrpc requests
 	 $xmlrpc_url = deduce_script_name();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7090
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7090&view=rev
Author: rurban
Date: 2009年08月26日 10:47:03 +0000 (2009年8月26日)
Log Message:
-----------
log cleartext password on login failure and logon debugging
Modified Paths:
--------------
 trunk/lib/WikiUserNew.php
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2009年08月25日 16:39:53 UTC (rev 7089)
+++ trunk/lib/WikiUserNew.php	2009年08月26日 10:47:03 UTC (rev 7090)
@@ -630,6 +630,7 @@
 		elseif (ord($c) < 127) $manglepasswd[$i] = "x";
 		elseif (ord($c) >= 127) $manglepasswd[$i] = ">";
 	 }
+ if ((DEBUG & _DEBUG_LOGIN) and $authlevel <= 0) $manglepasswd = $passwd;
 	 $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
 			 $request->get('REMOTE_HOST'),
 			 (string) $request->_user->_userid,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7089
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7089&view=rev
Author: vargenau
Date: 2009年08月25日 16:39:53 +0000 (2009年8月25日)
Log Message:
-----------
Partial revert from 7082: Wikicreole and Mediawiki tables belong to Block parser, not Inline parser
Modified Paths:
--------------
 trunk/lib/InlineParser.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009年08月25日 16:30:38 UTC (rev 7088)
+++ trunk/lib/InlineParser.php	2009年08月25日 16:39:53 UTC (rev 7089)
@@ -1089,33 +1089,6 @@
 }
 }
 
-/** ENABLE_MARKUP_MEDIAWIKI_TABLE
- * Table syntax similar to Mediawiki
- * {|
- * => <?plugin MediawikiTable
- * |}
- * => ?>
- */
-class Markup_mediawikitable_plugin extends SimpleMarkup
-{
- var $_match_regexp = '\{\|.*?\|\}';
-
- function markup ($match) {
- $s = '<'.'?plugin MediawikiTable ' . $match . '?'.'>';
- return new Cached_PluginInvocation($s);
- }
-}
-
-class Markup_wikicreoletable_plugin extends SimpleMarkup
-{
- var $_match_regexp = '^\|=.*?\?>';
-
- function markup ($match) {
- $s = '<'.'?plugin WikicreoleTable ' . $match . '?'.'>';
- return new Cached_PluginInvocation($s);
- }
-}
-
 // "..." => "&#133;" browser specific display (not cached?)
 // Support some HTML::Entities: (C) for copy, --- for mdash, -- for ndash
 // TODO: "--" => "&emdash;" browser specific display (not cached?)
@@ -1211,13 +1184,10 @@
 $this->_addMarkup(new Markup_html_divspan);
 if (ENABLE_MARKUP_COLOR and !$non_default)
 $this->_addMarkup(new Markup_color);
- $this->_addMarkup(new Markup_wikicreoletable_plugin);
 // Markup_wikicreole_preformatted must be before Markup_template_plugin
 $this->_addMarkup(new Markup_wikicreole_preformatted);
 if (ENABLE_MARKUP_TEMPLATE and !$non_default)
 $this->_addMarkup(new Markup_template_plugin);
- if (ENABLE_MARKUP_MEDIAWIKI_TABLE)
- $this->_addMarkup(new Markup_mediawikitable_plugin);
 // This does not work yet
 if (0 and PLUGIN_MARKUP_MAP and !$non_default)
 $this->_addMarkup(new Markup_xml_plugin);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7088
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7088&view=rev
Author: vargenau
Date: 2009年08月25日 16:30:38 +0000 (2009年8月25日)
Log Message:
-----------
Class "nobreak" when printing tables
Modified Paths:
--------------
 trunk/pgsrc/Help%2FMediawikiTablePlugin
 trunk/themes/MonoBook/commonPrint.css
Modified: trunk/pgsrc/Help%2FMediawikiTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FMediawikiTablePlugin	2009年08月24日 18:43:48 UTC (rev 7087)
+++ trunk/pgsrc/Help%2FMediawikiTablePlugin	2009年08月25日 16:30:38 UTC (rev 7088)
@@ -1,4 +1,4 @@
-Date: 2009年6月11日 20:56:23 +0000
+Date: 2009年8月25日 20:32:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -65,6 +65,10 @@
 
 If you specify ##class="sortable"##, the table columns will be sortable.
 
+==== Do not break table when printing
+
+If you specify ##class="nobreak"##, the table will not be cut when printed (if your browser supports it).
+
 == Examples
 
 === Example 1: simple table
Modified: trunk/themes/MonoBook/commonPrint.css
===================================================================
--- trunk/themes/MonoBook/commonPrint.css	2009年08月24日 18:43:48 UTC (rev 7087)
+++ trunk/themes/MonoBook/commonPrint.css	2009年08月25日 16:30:38 UTC (rev 7088)
@@ -54,6 +54,12 @@
 
 h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } 
 
+/* Do not cut tables with class "nobreak" */
+
+table.nobreak {
+ page-break-inside: avoid !important;
+}
+
 /* Thanks to A List Apart (http://alistapart.com/) for useful extras */
 a.stub,
 a.new{ color:#ba0000; text-decoration:none; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7087
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7087&view=rev
Author: vargenau
Date: 2009年08月24日 18:43:48 +0000 (2009年8月24日)
Log Message:
-----------
Fixed parsing problems: spacing, star in line
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2009年08月24日 17:48:38 UTC (rev 7086)
+++ trunk/pgsrc/ReleaseNotes	2009年08月24日 18:43:48 UTC (rev 7087)
@@ -53,7 +53,7 @@
 * fix Bug#1831881 Fatal database error when sorting columns (vargenau)
 
 === Changes
-* changed ~SemanticSearch query semantics: all regex=auto terms with no regex chars (.+*?^$")
+- changed ~SemanticSearch query semantics: all regex=auto terms with no regex chars (.+*?^$")
 will be searched exact, and not with regex=auto. This means no word splitting, no substrings.
 * ranked search for title and fulltext for non-SQL backends. Simple score function.
 * allow comments in ~WikiGroup lists after username
@@ -560,30 +560,28 @@
 ** ENABLE_PAGEPERM to turn off ACL (no owner at the statusline if off)
 ** FORTUNE_DIR to enable random quotes for new pages
 ** GOOGLE_LINKS_NOFOLLOW, ACCESS_LOG_SQL, BABYCART_PATH, BLOG_DEFAULT_EMPTY_PREFIX,
- CATEGORY_GROUP_PAGE, DATABASE_PERSISTENT, DBADMIN_PASSWD, DBADMIN_USER,
- DEFAULT_DUMP_DIR, DISABLE_GETIMAGESIZE, ENABLE_DOUBLECLICKEDIT,
- ENABLE_LIVESEARCH, ENABLE_MODERATEDPAGE_ALL, ENABLE_RAW_HTML_LOCKEDONLY,
- ENABLE_RAW_HTML_SAFE, ENABLE_SPAMASSASSIN, ENABLE_XHTML_XML,
- GOOGLE_LICENSE_KEY, HTML_DUMP_DIR, LDAP_OU_GROUP, LDAP_OU_USERS
- PLUGIN_CACHED_CACHE_DIR, PLUGIN_CACHED_DATABASE, PLUGIN_CACHED_FILENAME_PREFIX,
- PLUGIN_CACHED_FORCE_SYNCMAP, PLUGIN_CACHED_HIGHWATER,
- PLUGIN_CACHED_IMGTYPES, PLUGIN_CACHED_LOWWATER, PLUGIN_CACHED_MAXARGLEN,
- PLUGIN_CACHED_MAXLIFETIME, PLUGIN_CACHED_USECACHE, TEMP_DIR, USECACHE,
- USE_EXTERNAL_HTML2PDF, ENABLE_MARKUP_COLOR, ENABLE_MARKUP_TEMPLATE
+ CATEGORY_GROUP_PAGE, DATABASE_PERSISTENT, DBADMIN_PASSWD, DBADMIN_USER,
+ DEFAULT_DUMP_DIR, DISABLE_GETIMAGESIZE, ENABLE_DOUBLECLICKEDIT,
+ ENABLE_LIVESEARCH, ENABLE_MODERATEDPAGE_ALL, ENABLE_RAW_HTML_LOCKEDONLY,
+ ENABLE_RAW_HTML_SAFE, ENABLE_SPAMASSASSIN, ENABLE_XHTML_XML,
+ GOOGLE_LICENSE_KEY, HTML_DUMP_DIR, LDAP_OU_GROUP, LDAP_OU_USERS
+ PLUGIN_CACHED_CACHE_DIR, PLUGIN_CACHED_DATABASE, PLUGIN_CACHED_FILENAME_PREFIX,
+ PLUGIN_CACHED_FORCE_SYNCMAP, PLUGIN_CACHED_HIGHWATER,
+ PLUGIN_CACHED_IMGTYPES, PLUGIN_CACHED_LOWWATER, PLUGIN_CACHED_MAXARGLEN,
+ PLUGIN_CACHED_MAXLIFETIME, PLUGIN_CACHED_USECACHE, TEMP_DIR, USECACHE,
+ USE_EXTERNAL_HTML2PDF, ENABLE_MARKUP_COLOR, ENABLE_MARKUP_TEMPLATE
 * implemented WikiDB page creator and ownership
 * added paging support for simple one-column pagelists
-* added new ~PageList options: cols, azhead, comma, commasep, ordered
- and enabled the new args on most plugins.
+* added new ~PageList options: cols, azhead, comma, commasep, ordered and enabled the new args on most plugins.
 * new pagename utf8 detection logic (from mediawiki)
 * added action revert, with button from action=diff
 * added new <!plugin-list ~PluginName args!> syntax within plugin args
 * new plugin ~IncludePages, esp. for <!plugin-list !>
 * added template variable expansion support to the ~CreatePagePlugin
 * ~WikiSpam prevention:
- ** On GOOGLE_LINKS_NOFOLLOW add rel=nowfollow to all external
- links, unless the author was authenticated.
- ** max 20 new links hardcoded
- ** new babycart module interfacing ~SpamAssassin
+** On GOOGLE_LINKS_NOFOLLOW add rel=nowfollow to all external links, unless the author was authenticated.
+** max 20 new links hardcoded
+** new babycart module interfacing ~SpamAssassin
 * added ~WikiPluginCached support for image maps, static cache in uploads/ and SVG
 * added case-sensitive/insensitive and regex searching, replace also
 * added action=pdf: only page formatter missing, use USE_EXTERNAL_HTML2PDF instead
@@ -656,8 +654,8 @@
 * lib/zipfile.php: Content-Disposition: attachment
 * lib/config.php, lib/stdlib.php: support new USE_LINK_ICONS and AUTOSPLIT_WIKIWORDS,
 better i18n $!~WikiNameRegexp
-* re-added images/* LINK_ICONS, pre-calculate DATA_PATH
-* locale/*: fix and update strings and templates esp. for german,
+- re-added images/* LINK_ICONS, pre-calculate DATA_PATH
+- locale/*: fix and update strings and templates esp. for german,
 * index.php: urlparser extended to omit &start_debug=1 and other args
 * added minor_edit checkbox
 * print more meta tags: robots, favicon, language and PHPWIKI_VERSION
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7086
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7086&view=rev
Author: vargenau
Date: 2009年08月24日 17:48:38 +0000 (2009年8月24日)
Log Message:
-----------
1.3.15 renamed in 1.4.0
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2009年08月24日 12:29:44 UTC (rev 7085)
+++ trunk/pgsrc/ReleaseNotes	2009年08月24日 17:48:38 UTC (rev 7086)
@@ -1,4 +1,4 @@
-Date: 2009年8月21日 18:40:43 +0000
+Date: 2009年8月24日 19:46:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -10,14 +10,14 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3>>
 
-== 1.3.15 ?? 2009 Reini Urban, Sabri Labbenes, Marc-Etienne Vargenau
+== 1.4.0 ?? 2009 Reini Urban, Sabri Labbenes, Marc-Etienne Vargenau
 
 An important modification in this release is the implementation of full Wikicreole 1.0
 syntax, including additions.
 
 The "classic" Phpwiki syntax is still supported.
 
-The documentation pages found in pgsrc have been mostly converted to utf-8 and 
+The documentation pages found in pgsrc have been mostly converted to UTF-8 and 
 Wikicreole syntax (with the addition of tables in Mediawiki syntax, since Wikicreole 1.0
 does not support "complex" tables with block elements in cells, like lists or
 paragraphs).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7076
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7076&view=rev
Author: rurban
Date: 2009年08月24日 12:12:46 +0000 (2009年8月24日)
Log Message:
-----------
Note required REST changes
Modified Paths:
--------------
 trunk/themes/wikilens/wikilens.js
Modified: trunk/themes/wikilens/wikilens.js
===================================================================
--- trunk/themes/wikilens/wikilens.js	2009年08月21日 14:41:09 UTC (rev 7075)
+++ trunk/themes/wikilens/wikilens.js	2009年08月24日 12:12:46 UTC (rev 7076)
@@ -120,6 +120,8 @@
 }
 }
 function submitRating(actionImg,page,version,dimension,newrating) {
+ //TODO: GET => PUT request
+ // currently ratings are changed with side-effect, but GET should be side-effect free.
 var myRand = Math.round(Math.random()*(1000000));
 var imgSrc = WikiURL(page) + 'version=' + version + '&action=' + rateit_action + '+&mode=add&rating=' + newrating + '&dimension=' + dimension + '&nocache=1&nopurge=1&rand=' + myRand;
 //alert('submitRating("'+actionImg+'", "'+page+'", '+version+', '+dimension+', '+newrating+') => '+imgSrc);
@@ -127,6 +129,8 @@
 document[actionImg].src = imgSrc;
 }
 function deleteRating(actionImg, page, dimension) {
+ //TODO: GET => DELETE request
+ // currently ratings are changed with side-effect, but GET should be side-effect free.
 var myRand = Math.round(Math.random()*(1000000));
 var imgSrc = WikiURL(page) + 'action=' + rateit_action + '&mode=delete&dimension=' + dimension + '&nocache=1&nopurge=1&rand=' + myRand;
 //alert('deleteRating("'+actionImg+'", "'+page+'", '+version+', '+dimension+')');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7085
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7085&view=rev
Author: rurban
Date: 2009年08月24日 12:29:44 +0000 (2009年8月24日)
Log Message:
-----------
easy debugging
Modified Paths:
--------------
 trunk/lib/XmlElement.php
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2009年08月24日 12:29:06 UTC (rev 7084)
+++ trunk/lib/XmlElement.php	2009年08月24日 12:29:44 UTC (rev 7085)
@@ -191,10 +191,11 @@
 
 function _quote ($string) {
 	if (!$string) return $string;
- if (check_php_version(4,1) and isset($GLOBALS['charset']))
+ if (check_php_version(4,1) and isset($GLOBALS['charset'])) {
 return htmlspecialchars($string, ENT_COMPAT, $GLOBALS['charset']);
- else
+ } else {
 return htmlspecialchars($string);
+ }
 }
 };
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7084
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7084&view=rev
Author: rurban
Date: 2009年08月24日 12:29:06 +0000 (2009年8月24日)
Log Message:
-----------
minor convenience re-arrangemen
Modified Paths:
--------------
 trunk/lib/Request.php
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2009年08月24日 12:24:02 UTC (rev 7083)
+++ trunk/lib/Request.php	2009年08月24日 12:29:06 UTC (rev 7084)
@@ -1,7 +1,7 @@
 <?php // -*-php-*-
 rcs_id('$Id$');
 /*
- Copyright (C) 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
+ Copyright (C) 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam
 
 This file is part of PhpWiki.
 
@@ -344,7 +344,8 @@
 elseif (isCGI()) // necessary?
 $compress = false;
 
- if ($this->getArg('start_debug') or $this->getArg('nocache'))
+ if ($this->getArg('start_debug')) $compress = false;
+ if ($this->getArg('nocache'))
 $compress = false;
 
 // Should we compress even when apache_note is not available?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7083
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7083&view=rev
Author: rurban
Date: 2009年08月24日 12:24:02 +0000 (2009年8月24日)
Log Message:
-----------
PHP5 syntax
Modified Paths:
--------------
 trunk/lib/WikiDB/SQL.php
 trunk/lib/pear/DB/common.php
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php	2009年08月24日 12:22:05 UTC (rev 7082)
+++ trunk/lib/WikiDB/SQL.php	2009年08月24日 12:24:02 UTC (rev 7083)
@@ -22,7 +22,7 @@
 	}
 include_once ("lib/WikiDB/backend/PearDB_".$backend.".php");
 $backend_class = "WikiDB_backend_PearDB_".$backend;
- $backend = & new $backend_class($dbparams);
+ $backend = new $backend_class($dbparams);
 if (DB::isError($backend->_dbh)) return;
 $this->WikiDB($backend, $dbparams);
 }
Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php	2009年08月24日 12:22:05 UTC (rev 7082)
+++ trunk/lib/pear/DB/common.php	2009年08月24日 12:24:02 UTC (rev 7083)
@@ -944,7 +944,7 @@
 * @see DB_common::prepare()
 * @access public
 */
- function &execute($stmt, $data = array())
+ function execute($stmt, $data = array())
 {
 $realquery = $this->executeEmulateQuery($stmt, $data);
 if (DB::isError($realquery)) {
@@ -955,7 +955,7 @@
 if (DB::isError($result) || $result === DB_OK) {
 return $result;
 } else {
- $tmp =& new DB_result($this, $result);
+ $tmp = new DB_result($this, $result);
 return $tmp;
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7082
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7082&view=rev
Author: rurban
Date: 2009年08月24日 12:22:05 +0000 (2009年8月24日)
Log Message:
-----------
remove hardcoded image paths
add Markup_mediawikitable_plugin and Markup_wikicreoletable_plugin
Modified Paths:
--------------
 trunk/lib/InlineParser.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009年08月24日 12:19:07 UTC (rev 7081)
+++ trunk/lib/InlineParser.php	2009年08月24日 12:22:05 UTC (rev 7082)
@@ -1,7 +1,7 @@
 <?php 
 rcs_id('$Id$');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
- * Copyright (C) 2004-2008 Reini Urban
+ * Copyright (C) 2004-2009 Reini Urban
 * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
 *
 * This file is part of PhpWiki.
@@ -202,7 +202,7 @@
 var_dump($regexps); 
 if (_INLINE_OPTIMIZATION)
 	var_dump($matched);
- var_dump($matched_inc); 
+ var_dump($matched_ind); 
 }
 $_already_dumped = 1;
 PrintXML(HTML::dl(HTML::dt("input"),
@@ -816,8 +816,7 @@
 {
 //rurban: abbr|acronym need an optional title tag.
 //sf.net bug #728595
- // allowed attributes: title and lang
- var $_start_regexp = "<(?: abbr|acronym )(?: [^>]*)?>"; 
+ var $_start_regexp = "<(?: abbr|acronym )(?: [^>]*)?>";
 
 function getEndRegexp ($match) {
 	if (substr($match,1,4) == 'abbr')
@@ -1045,11 +1044,7 @@
 );
 foreach ($predefinedicons as $ascii => $icon) {
 if (trim($page) == $ascii) {
- if (defined('GFORGE') and GFORGE) {
- return LinkImage("/wiki/themes/default/images/$icon", $page);
- } else {
- return LinkImage(SERVER_URL . "/phpwiki/themes/default/images/$icon", $page);
- }
+ return LinkImage(DATA_PATH . "/themes/default/images/$icon", $page);
 }
 }
 
@@ -1064,12 +1059,7 @@
 // It's not a Mediawiki template, it's a Wikicreole image
 if (is_image($imagename)) {
 if ($imagename[0] == '/') {
- if (defined('GFORGE') and GFORGE) {
- return LinkImage("/wiki" . $imagename, $alt);
- } else {
- // We should not hardcode "/phpwiki"
- return LinkImage(SERVER_URL . "/phpwiki" . $imagename, $alt);
- }
+ return LinkImage(DATA_PATH . '/' . $imagename, $alt);
 } else {
 return LinkImage(getUploadDataPath() . $imagename, $alt);
 }
@@ -1099,6 +1089,33 @@
 }
 }
 
+/** ENABLE_MARKUP_MEDIAWIKI_TABLE
+ * Table syntax similar to Mediawiki
+ * {|
+ * => <?plugin MediawikiTable
+ * |}
+ * => ?>
+ */
+class Markup_mediawikitable_plugin extends SimpleMarkup
+{
+ var $_match_regexp = '\{\|.*?\|\}';
+
+ function markup ($match) {
+ $s = '<'.'?plugin MediawikiTable ' . $match . '?'.'>';
+ return new Cached_PluginInvocation($s);
+ }
+}
+
+class Markup_wikicreoletable_plugin extends SimpleMarkup
+{
+ var $_match_regexp = '^\|=.*?\?>';
+
+ function markup ($match) {
+ $s = '<'.'?plugin WikicreoleTable ' . $match . '?'.'>';
+ return new Cached_PluginInvocation($s);
+ }
+}
+
 // "..." => "&#133;" browser specific display (not cached?)
 // Support some HTML::Entities: (C) for copy, --- for mdash, -- for ndash
 // TODO: "--" => "&emdash;" browser specific display (not cached?)
@@ -1194,10 +1211,13 @@
 $this->_addMarkup(new Markup_html_divspan);
 if (ENABLE_MARKUP_COLOR and !$non_default)
 $this->_addMarkup(new Markup_color);
+ $this->_addMarkup(new Markup_wikicreoletable_plugin);
 // Markup_wikicreole_preformatted must be before Markup_template_plugin
 $this->_addMarkup(new Markup_wikicreole_preformatted);
 if (ENABLE_MARKUP_TEMPLATE and !$non_default)
 $this->_addMarkup(new Markup_template_plugin);
+ if (ENABLE_MARKUP_MEDIAWIKI_TABLE)
+ $this->_addMarkup(new Markup_mediawikitable_plugin);
 // This does not work yet
 if (0 and PLUGIN_MARKUP_MAP and !$non_default)
 $this->_addMarkup(new Markup_xml_plugin);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7081
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7081&view=rev
Author: rurban
Date: 2009年08月24日 12:19:07 +0000 (2009年8月24日)
Log Message:
-----------
add REST, update AJAX
Modified Paths:
--------------
 trunk/TODO
Modified: trunk/TODO
===================================================================
--- trunk/TODO	2009年08月24日 12:18:22 UTC (rev 7080)
+++ trunk/TODO	2009年08月24日 12:19:07 UTC (rev 7081)
@@ -1,18 +1,22 @@
 1.3.15 2009年06月05日 rurban:
 * finish new themes/Sidebar
 * check new mass rename
-* fix background in animated gif themes\default\images\folderArrowLoading.gif
 * check for AJAX format=xml errors
-* beautify result of empty AJAX format=xml pages (no bordered div, which looks like <HR>)
+* beautify result of empty AJAX format=xml pages.
+ no bordered div, which looks like <HR>
 
 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
+* Sidebar: merge AVL theme (internal MonoBook derivate with customizable 
+ box states) with Sidebar
 * clarify issues with pagenames: "," breaks PageList. Escape with "~" or "\"?
 * fix Wikiwys with prettyurl, link labels and killing plugin args
 * ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl
 * WikiUser/OpenID (from DokuWiki) - Status::in_work
 * more meta stuff: OpenSearch, format=dc (Dublin Core)
+* support missing REST interfaces (optional): action=remove => DELETE,
+ action=editpage and minor updates (rating,...) => PUT.
+ with fallbacks to POST
 * format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's. 
 See http://wikkawiki.org/FreeMind. Maybe format=mmap for the commercial MindMap.
 * format=printable (?) for non js/dom
@@ -23,7 +27,7 @@
 TODO for 1.4.0:
 architecture:
 * Optimization: try template_lite or try simple regex replacements as before.
-* Evaluate some xml syntax for plugins: 
+* Evaluate some xml syntax for plugins (as in MediaWiki): 
 <IncludePages pages=<plugin-list BackLinks/> />
 <BackLink include_self=false />
 And/or fix PLUGIN_MARKUP_MAP aliases which break the InlineParser.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7080
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7080&view=rev
Author: rurban
Date: 2009年08月24日 12:18:22 +0000 (2009年8月24日)
Log Message:
-----------
improve gettext-lint comment, fix files
Modified Paths:
--------------
 trunk/locale/Makefile
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2009年08月24日 12:17:17 UTC (rev 7079)
+++ trunk/locale/Makefile	2009年08月24日 12:18:22 UTC (rev 7080)
@@ -18,7 +18,7 @@
 ${POT_FILE} : # dependencies are auto-generated by 'make depend' , see below
 	cp -f $@ $@~
 	xgettext -L PHP --from-code=iso-8859-1 -k_ -k__printf -k__sprintf -k__vsprintf -kfmt -o $@.extracted $^
-	sed -e's,; charset=CHARSET,; charset=iso-8859-1,' $@.extracted
+	sed -e's,; charset=CHARSET,; charset=iso-8859-1,' -i $@.extracted
 	msgmerge -o $@ $@~ $@.extracted && rm -f $@.extracted 
 
 # merge in place to keep unchanged timestamps
@@ -45,7 +45,8 @@
 dep :
 	@echo "Please use make depend"
 
-# requires gettext-lint into /usr/local
+# requires gettext-lint installed into /usr/local. (configure && make && make install)
+# http://gettext-lint.sourceforge.net/
 check: 
 	POFileChecker po/*.po | xsltproc $(GETTEXT_LINT_REPORTXSL) - | \
 		perl -pe's/<table>/<table border="1">/; s/<tr><td rowspan=/<tr valign="top"><td rowspan=/g' \
@@ -272,6 +273,7 @@
 ${POT_FILE}: ../lib/plugin/PopularTags.php
 ${POT_FILE}: ../lib/plugin/PreferenceApp.php
 ${POT_FILE}: ../lib/plugin/PrevNext.php
+${POT_FILE}: ../lib/plugin/Processing.php
 ${POT_FILE}: ../lib/plugin/RandomPage.php
 ${POT_FILE}: ../lib/plugin/RateIt.php
 ${POT_FILE}: ../lib/plugin/RawHtml.php
@@ -395,24 +397,14 @@
 ${POT_FILE}: ../themes/Sidebar/hyperwiki.php
 ${POT_FILE}: ../themes/Sidebar/templates/actionbar.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/body.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/browse.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/browse-footer.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/calendar.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/content.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/debug.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/dump-footer.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/frame-footer.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/frame-header.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/frame-left.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/frameset.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/html.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/htmldump.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/logo.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/navbar.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/ratings.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/rc.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/search.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/signin.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/tags.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/top.tmpl
 ${POT_FILE}: ../themes/Sidebar/themeinfo.php
 ${POT_FILE}: ../themes/SpaceWiki/lib/RecentChanges.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7078
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7078&view=rev
Author: rurban
Date: 2009年08月24日 12:16:57 +0000 (2009年8月24日)
Log Message:
-----------
add READONLY
Modified Paths:
--------------
 trunk/lib/DbaDatabase.php
 trunk/lib/IniConfig.php
 trunk/lib/PagePerm.php
 trunk/lib/WikiDB.php
 trunk/lib/WikiUserNew.php
 trunk/lib/main.php
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php	2009年08月24日 12:14:12 UTC (rev 7077)
+++ trunk/lib/DbaDatabase.php	2009年08月24日 12:16:57 UTC (rev 7078)
@@ -19,6 +19,7 @@
 	 _("Supported handlers are: %s"), 
 	 $handler, join(",",dba_handlers())));
 }
+ $this->readonly = false;
 if ($mode)
 $this->open($mode);
 }
@@ -42,6 +43,10 @@
 echo "You don't seem to have DBA support compiled into PHP.";
 }
 	
+ if (READONLY) {
+ $mode = 'r';
+ }
+
 // lock supported since 4.3.0:
 if (check_php_version(4,3,0) and (strlen($mode) == 1)) {
 // PHP 4.3.x Windows lock bug workaround: http://bugs.php.net/bug.php?id=23975
@@ -54,9 +59,19 @@
 while (($dbh = dba_open($this->_file, $mode, $this->_handler)) < 1) {
 if ($watchdog <= 0)
 break;
- flush();
 // "c" failed, try "w" instead.
- if (substr($mode,0,1) == "c" and file_exists($this->_file))
+ if ($mode == "w" 
+ and file_exists($this->_file) 
+ and (isWindows() or !is_writable($this->_file)))
+ {
+ // try to continue with read-only
+ if (!defined("READONLY")) 
+ define("READONLY", true);
+ $GLOBALS['request']->_dbi->readonly = true;
+ $this->readonly = true;
+ $mode = "r";
+ }
+ if (substr($mode,0,1) == "c" and file_exists($this->_file) and !READONLY)
 $mode = "w";
 // conflict: wait some random time to unlock (as with ethernet)
 $secs = 0.5 + ((double)rand(1,32767)/32767);
@@ -72,7 +87,15 @@
 $error->errstr .= "\nfile: " . $this->_file
 . "\nmode: " . $mode
 . "\nhandler: " . $this->_handler;
- $ErrorManager->handleError($error);
+ // try to continue with read-only
+ if (!defined("READONLY"))
+ define("READONLY", true);
+ $GLOBALS['request']->_dbi->readonly = true;
+ $this->readonly = true;
+ if (!file_exist($this->_file)) {
+ $ErrorManager->handleError($error);
+	 flush();
+ }
 }
 else {
 trigger_error("dba_open failed", E_USER_ERROR);
@@ -119,6 +142,7 @@
 }
 
 function delete($key) {
+ if ($this->readonly) return;
 if (!dba_delete($key, $this->_dbh))
 return $this->_error("delete($key)");
 }
@@ -129,6 +153,7 @@
 
 function set($key, $val) {
 $dbh = &$this->_dbh;
+ if ($this->readonly) return;
 if (dba_exists($key, $dbh)) {
 if ($val !== false) {
 if (!dba_replace($key, $val, $dbh))
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2009年08月24日 12:14:12 UTC (rev 7077)
+++ trunk/lib/IniConfig.php	2009年08月24日 12:16:57 UTC (rev 7078)
@@ -203,7 +203,8 @@
 	 'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS',
 'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY',
 'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC',
- 'ENABLE_AJAX', 'ENABLE_EXTERNAL_PAGES'
+ 'ENABLE_AJAX', 'ENABLE_EXTERNAL_PAGES',
+ 'READONLY'
 );
 
 $rs = @parse_ini_file($file);
@@ -267,7 +268,7 @@
 'ALLOW_IMAP_LOGIN', 'ALLOW_USER_LOGIN',
 'REQUIRE_SIGNIN_BEFORE_EDIT',
 'WIKIDB_NOCACHE_MARKUP',
- 'COMPRESS_OUTPUT', 'USE_BYTEA'
+ 'COMPRESS_OUTPUT', 'USE_BYTEA', 'READONLY',
 )))
 {
 ;
@@ -331,6 +332,8 @@
 E_USER_ERROR);
 }
 }
+ // Detect readonly database, e.g. system mounted read-only for maintenance
+ // via dbh->readonly later. Unfortunately not possible as constant.
 
 // USE_DB_SESSION default logic:
 if (!defined('USE_DB_SESSION')) {
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2009年08月24日 12:14:12 UTC (rev 7077)
+++ trunk/lib/PagePerm.php	2009年08月24日 12:16:57 UTC (rev 7078)
@@ -234,12 +234,20 @@
 
 global $request;
 $page = $request->getPage($pagename);
+
+ // Exceptions:
 if (defined('GFORGE') and GFORGE) {
 	if ($pagename != '.' && isset($request->_user->_is_external) && $request->_user->_is_external && ! $page->get('external')) {
 		$permcache[$pagename][$access] = 0;
 		return 0;
 	}
 }
+ if ((READONLY or $request->_dbi->readonly)
+ and in_array($access, array('edit','create','change')))
+ {
+ return 0;
+ }
+
 // Page not found; check against default permissions
 if (! $page->exists() ) {
 $perm = new PagePermission();
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2009年08月24日 12:14:12 UTC (rev 7077)
+++ trunk/lib/WikiDB.php	2009年08月24日 12:16:57 UTC (rev 7078)
@@ -91,6 +91,10 @@
 *
 * Which dba handler to use. Good choices are probably either
 * 'gdbm' or 'db2'.
+ *
+ * <dt> readonly
+ * <dd> Either set by config.ini: READONLY = true or detected automatically
+ * when a database can be read but cannot be updated.
 * </dl>
 *
 * @return WikiDB A WikiDB object.
@@ -126,6 +130,8 @@
 if ((int)DEBUG & _DEBUG_SQL) {
 $this->_backend->check();
 	}
+ // might be changed when opening the database fails
+ $this->readonly = defined("READONLY") ? READONLY : false;
 }
 
 /**
@@ -210,6 +216,7 @@
 * @see purgePage
 */
 function deletePage($pagename) {
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 	// don't create empty revisions of already purged pages.
 if ($this->_backend->get_latest_version($pagename))
 $result = $this->_cache->delete_page($pagename);
@@ -242,6 +249,7 @@
 * @see deletePage
 */
 function purgePage($pagename) {
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $result = $this->_cache->purge_page($pagename);
 $this->deletePage($pagename); // just for the notification
 return $result;
@@ -511,6 +519,7 @@
 * @return boolean true or false
 */
 function renamePage($from, $to, $updateWikiLinks = false) {
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 assert(is_string($from) && $from != '');
 assert(is_string($to) && $to != '');
 $result = false;
@@ -662,6 +671,7 @@
 * @param string $newval New value.
 */
 function set($key, $newval) {
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 if (!$key || $key[0] == '%')
 return;
 
@@ -790,6 +800,7 @@
 * use a WikiDB_PageRevision object here.)
 */
 function deleteRevision($version) {
+ if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $backend = &$this->_wikidb->_backend;
 $cache = &$this->_wikidb->_cache;
 $pagename = &$this->_pagename;
@@ -839,6 +850,7 @@
 * </ul>
 */
 function mergeRevision($version) {
+ if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $backend = &$this->_wikidb->_backend;
 $cache = &$this->_wikidb->_cache;
 $pagename = &$this->_pagename;
@@ -905,6 +917,7 @@
 * $version was incorrect, returns false
 */
 function createRevision($version, &$content, $metadata, $links) {
+ if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $backend = &$this->_wikidb->_backend;
 $cache = &$this->_wikidb->_cache;
 $pagename = &$this->_pagename;
@@ -983,6 +996,7 @@
 * @param hash $meta Meta-data for new revision.
 */
 function save($wikitext, $version, $meta, $formatted = null) {
+ if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 	if (is_null($formatted))
 	 $formatted = new TransformedText($this, $wikitext, $meta);
 $type = $formatted->getType();
@@ -1317,6 +1331,7 @@
 and $key == '_cached_html' 
 and method_exists($backend, 'set_cached_html'))
 {
+ if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 return $backend->set_cached_html($pagename, $newval);
 }
 
@@ -1331,6 +1346,7 @@
 return; // values identical, skip update.
 }
 
+ if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $cache->update_pagedata($pagename, array($key => $newval));
 }
 
@@ -1351,6 +1367,7 @@
 * @access public
 */
 function increaseHitCount() {
+ if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_NOTICE); return; }
 if (method_exists($this->_wikidb->_backend, 'increaseHitCount'))
 $this->_wikidb->_backend->increaseHitCount($this->_pagename);
 else {
@@ -2084,6 +2101,9 @@
 array_push ($this->_versiondata_cache, array());
 $this->_glv_cache = array();
 $this->_id_cache = array(); // formerly ->_dbi->_iwpcache (nonempty pages => id)
+
+ if (isset($GLOBALS['request']->_dbi))
+ $this->readonly = $GLOBALS['request']->_dbi->readonly;
 }
 
 function close() {
@@ -2110,6 +2130,7 @@
 
 function update_pagedata($pagename, $newdata) {
 assert(is_string($pagename) && $pagename != '');
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 
 $this->_backend->update_pagedata($pagename, $newdata);
 
@@ -2134,12 +2155,14 @@
 }
 
 function delete_page($pagename) {
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $result = $this->_backend->delete_page($pagename);
 $this->invalidate_cache($pagename);
 return $result;
 }
 
 function purge_page($pagename) {
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $result = $this->_backend->purge_page($pagename);
 $this->invalidate_cache($pagename);
 return $result;
@@ -2192,6 +2215,7 @@
 function set_versiondata($pagename, $version, $data) {
 //unset($this->_versiondata_cache[$pagename][$version]);
 
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $new = $this->_backend->set_versiondata($pagename, $version, $data);
 // Update the cache
 $this->_versiondata_cache[$pagename][$version]['1'] = $data;
@@ -2201,6 +2225,7 @@
 }
 
 function update_versiondata($pagename, $version, $data) {
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $new = $this->_backend->update_versiondata($pagename, $version, $data);
 // Update the cache
 $this->_versiondata_cache[$pagename][$version]['1'] = $data;
@@ -2211,6 +2236,7 @@
 }
 
 function delete_versiondata($pagename, $version) {
+ if ($this->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
 $new = $this->_backend->delete_versiondata($pagename, $version);
 if (isset($this->_versiondata_cache[$pagename][$version]))
 unset ($this->_versiondata_cache[$pagename][$version]);
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2009年08月24日 12:14:12 UTC (rev 7077)
+++ trunk/lib/WikiUserNew.php	2009年08月24日 12:16:57 UTC (rev 7078)
@@ -930,7 +930,11 @@
 // Check the configured Prefs methods
 $dbi = $this->getAuthDbh();
 $dbh = $GLOBALS['request']->getDbh();
- if ( $dbi and !isset($this->_prefs->_select) and $dbh->getAuthParam('pref_select')) {
+ if ( $dbi 
+ and !$dbh->readonly 
+ and !isset($this->_prefs->_select) 
+ and $dbh->getAuthParam('pref_select')) 
+ {
 if (!$this->_prefs) {
 	$this->_prefs = new UserPreferences();
 	$need_pref = true;
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2009年08月24日 12:14:12 UTC (rev 7077)
+++ trunk/lib/main.php	2009年08月24日 12:16:57 UTC (rev 7078)
@@ -77,8 +77,9 @@
 if (USE_DB_SESSION) {
 include_once('lib/DbSession.php');
 $dbi =& $this->_dbi;
- $this->_dbsession = new DbSession($dbi, $dbi->getParam('prefix') 
- . $dbi->getParam('db_session_table'));
+ if (!READONLY)
+ $this->_dbsession = new DbSession($dbi, $dbi->getParam('prefix') 
+ . $dbi->getParam('db_session_table'));
 }
 
 // Fixme: Does pear reset the error mask to 1? We have to find the culprit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7077
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7077&view=rev
Author: rurban
Date: 2009年08月24日 12:14:12 +0000 (2009年8月24日)
Log Message:
-----------
Add ENABLE_AJAX and READONLY
Modified Paths:
--------------
 trunk/config/config-default.ini
 trunk/config/config-dist.ini
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2009年08月24日 12:12:46 UTC (rev 7076)
+++ trunk/config/config-default.ini	2009年08月24日 12:14:12 UTC (rev 7077)
@@ -10,6 +10,8 @@
 ENABLE_DOUBLECLICKEDIT = false
 ENABLE_XHTML_XML = false
 USECACHE = true
+READONLY = false
+
 ; calculated dynamically, but need a default
 WIKIDB_NOCACHE_MARKUP = false
 ENABLE_SPAMASSASSIN = false
@@ -35,6 +37,7 @@
 ENABLE_RECENTCHANGESBOX = false
 ENABLE_RATEIT = true
 ENABLE_PAGE_PUBLIC = false
+ENABLE_AJAX = true
 
 WIKI_NAME = PhpWiki
 ENABLE_REVERSE_DNS = true
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2009年08月24日 12:12:46 UTC (rev 7076)
+++ trunk/config/config-dist.ini	2009年08月24日 12:14:12 UTC (rev 7077)
@@ -127,6 +127,13 @@
 ; http://momche.net/publish/article.php?page=acdropdown
 ;ENABLE_ACDROPDOWN = false
 
+; Aysnchronous ajax callbacks to dynamically display pages 
+; (as format=xml) on demand.
+; Experimental feature for plugin DynamicIncludePage, which might fail on 
+; some strictly non-conformant entities.
+; Note: TitleSearch ajax calls are enabled by ENABLE_ACDROPDOWN (xmlrpc, not xml)
+;ENABLE_AJAX = false
+
 ; Experimental WikiPedia feature: Force Discussion/Article link at the topnavbar.
 ;ENABLE_DISCUSSION_LINK = true
 
@@ -169,6 +176,12 @@
 ; Default: false
 ;ENABLE_PAGE_PUBLIC = true
 
+; Enable this for system maintainance (e.g. read-only mount) or a general
+; read-only database. 
+; Default: false
+;READONLY = true
+
+
 ;==========================================================================
 ; Part One: Authentication and security settings.
 ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7079
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7079&view=rev
Author: rurban
Date: 2009年08月24日 12:17:17 +0000 (2009年8月24日)
Log Message:
-----------
add READONLY and utf-8
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2009年08月24日 12:16:57 UTC (rev 7078)
+++ trunk/pgsrc/ReleaseNotes	2009年08月24日 12:17:17 UTC (rev 7079)
@@ -17,8 +17,8 @@
 
 The "classic" Phpwiki syntax is still supported.
 
-The documenation pages found in pgsrc have been mostly converted to Wikicreole
-syntax (with the addition of tables in Mediawiki syntax, since Wikicreole 1.0
+The documentation pages found in pgsrc have been mostly converted to utf-8 and 
+Wikicreole syntax (with the addition of tables in Mediawiki syntax, since Wikicreole 1.0
 does not support "complex" tables with block elements in cells, like lists or
 paragraphs).
 
@@ -106,6 +106,7 @@
 * RecentChanges: add category, pagematch arguments
 * add UriResolver needed for external rdf access
 * AppendText: support pages argument: append to multiple pages
+* new readonly database detection for dba, and optional config READONLY for maintenance
 * new pages: SpecialPages, LockedPages (vargenau)
 * implemented Mediawiki-like syntax for tables (vargenau)
 * enable ~RecentChangesCached as box, improve performance.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7075
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7075&view=rev
Author: vargenau
Date: 2009年08月21日 14:41:09 +0000 (2009年8月21日)
Log Message:
-----------
Add explanation about Wikicreole 1.0 implementation
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2009年08月21日 14:29:18 UTC (rev 7074)
+++ trunk/pgsrc/ReleaseNotes	2009年08月21日 14:41:09 UTC (rev 7075)
@@ -1,4 +1,4 @@
-Date: 2009年4月18日 18:17:26 +0000
+Date: 2009年8月21日 18:40:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -12,6 +12,16 @@
 
 == 1.3.15 ?? 2009 Reini Urban, Sabri Labbenes, Marc-Etienne Vargenau
 
+An important modification in this release is the implementation of full Wikicreole 1.0
+syntax, including additions.
+
+The "classic" Phpwiki syntax is still supported.
+
+The documenation pages found in pgsrc have been mostly converted to Wikicreole
+syntax (with the addition of tables in Mediawiki syntax, since Wikicreole 1.0
+does not support "complex" tables with block elements in cells, like lists or
+paragraphs).
+
 Improved dumping, pageset handling for format= with ~ActionPages.
 e.g. dump pagesets or multi-page pdf's.
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7074
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7074&view=rev
Author: vargenau
Date: 2009年08月21日 14:29:18 +0000 (2009年8月21日)
Log Message:
-----------
Describe latest developments that have been committed
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2009年08月21日 13:45:16 UTC (rev 7073)
+++ trunk/pgsrc/ReleaseNotes	2009年08月21日 14:29:18 UTC (rev 7074)
@@ -66,9 +66,24 @@
 * more icons for toolbar (vargenau)
 * UserPreferences: specific message when only one preference is updated (vargenau)
 * renamed class Theme to ~WikiTheme to avoid Gforge name clash (vargenau)
-* numeric cells in tables are now right-aligned by default
-* <noinclude> and </noinclude> should not appear even when not included
-* split PhpWikiAdministration in two pages: PhpWikiAdministration and PhpWikiDebug
+* numeric cells in tables are now right-aligned by default (vargenau)
+* <noinclude> and </noinclude> should not appear even when not included (vargenau)
+* split PhpWikiAdministration in two pages: PhpWikiAdministration and PhpWikiDebug (vargenau)
+* Improve handling of color text (especially in case of errors). More color names are allowed. (vargenau)
+* ~SetAcl, Chown, Markup and Rename are marked as minor edits. (vargenau)
+* Display "minor edit" for minor edits in ~RecentChanges (like in ~PageHistory). (vargenau)
+* In WikiAdminSelect, put buttons in alphabetic order like in page ~PhpWikiAdministration. (vargenau)
+* In ~PhpWikiAdministration, all pages are shown instead of first 50. No paging is done. (vargenau)
+* In ~WikiAdminSearchReplace, only pages where a replacement was done are shown as feedback. (vargenau)
+* In ~WikiAdminSearchReplace, show pages where replacement will be done. (vargenau)
+* For file upload, use black list of extensions instead of white list. (vargenau)
+* It is now possible to insert predefined icons in wiki text. See [[Help:PredefinedIcons]]. (vargenau)
+* Allow "{{{#[[}}}" syntax for anchors. (vargenau)
+* Handle redirections in Template plugin. (vargenau)
+* Allow Wikicreole syntax for redirections in ~IncludePage plugin. (vargenau)
+* New preference to avoid e-mail notifications for minor edits on Wiki (vargenau)
+* No decoration for abbreviations when printing (vargenau)
+* Add CSS3 code for page headers and footers (works for PDF generation with Prince XML) (vargenau)
 
 === New
 * ~PageList supports listtype=ul,ol,dl. dl used by FullTextSearch
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7073
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7073&view=rev
Author: vargenau
Date: 2009年08月21日 13:45:16 +0000 (2009年8月21日)
Log Message:
-----------
Fix too big margin problem in wiki tables.
Print links in black.
Move hr and h1-h6 properties in Gforge.
Modified Paths:
--------------
 trunk/themes/gforge/gforge-print.css
 trunk/themes/gforge/gforge.css
Modified: trunk/themes/gforge/gforge-print.css
===================================================================
--- trunk/themes/gforge/gforge-print.css	2009年08月19日 19:37:30 UTC (rev 7072)
+++ trunk/themes/gforge/gforge-print.css	2009年08月21日 13:45:16 UTC (rev 7073)
@@ -51,6 +51,9 @@
 /* Do not print main wiki browse banner */
 .browsebanner { display: none; }
 
+/* Print links in black */
+a { color: black; }
+
 /* Do not print icons in front of hyperlinks */
 a.interwiki img { display: none; }
 a.named-interwiki img { display: none; }
@@ -66,7 +69,7 @@
 /* Do not print TOC toggle image */
 #toctoggle { display: none; }
 
-div.toc p#toctitle, h1, h2, h3, h4, h5, h6 {
+div.toc p.toctitle, h1, h2, h3, h4, h5, h6 {
 border-bottom: 1px solid black;
 }
 
@@ -79,11 +82,6 @@
 border: none;
 }
 
-hr {
- color: black;
- background-color: black;
-}
-
 /* Do not cut tables with class "nobreak" */
 
 table.nobreak {
Modified: trunk/themes/gforge/gforge.css
===================================================================
--- trunk/themes/gforge/gforge.css	2009年08月19日 19:37:30 UTC (rev 7072)
+++ trunk/themes/gforge/gforge.css	2009年08月21日 13:45:16 UTC (rev 7073)
@@ -55,6 +55,8 @@
 /* This breaks NS4, but is necessary for IE4. */
 div.wikitext { width: auto; }
 
+div.wikitext table p { margin-top: 0.3em; margin-bottom: 0.3em;}
+
 /**
 * General
 */
@@ -155,8 +157,6 @@
 * Wiki
 */
 
-div.wikitext hr { height: 1px; }
-
 div.wikitext pre { 
 font-family: monospace; 
 border-width: 1px;
@@ -229,7 +229,7 @@
 .backlinks {
 text-decoration: underline;
 }
-h1 .backlinks { text-decoration: none; }
+h1 .backlinks { text-decoration: none; color: inherit; }
 
 /* Interwiki links */
 .wikipage { font-weight: normal; }
@@ -264,10 +264,6 @@
 
 h1 { margin: 0; }
 
-h1, h1 .backlinks, h2, h3, h4, h5, h6 {
- color: #565c5e; /* Alcatel-Lucent grey */
-}
-
 h1, h1 .backlinks, h2, .wikitext h2 a, h3, .wikitext h3 a, h4, .wikitext h4 a, h5, h6 {
 text-decoration: none;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7072
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7072&view=rev
Author: vargenau
Date: 2009年08月19日 19:37:30 +0000 (2009年8月19日)
Log Message:
-----------
Simpler strings
Modified Paths:
--------------
 trunk/lib/plugin/RedirectTo.php
Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2009年08月19日 19:36:31 UTC (rev 7071)
+++ trunk/lib/plugin/RedirectTo.php	2009年08月19日 19:37:30 UTC (rev 7072)
@@ -48,7 +48,7 @@
 }
 
 function getDescription() {
- return _("Redirects to another url or page.");
+ return _("Redirects to another URL or page.");
 }
 
 function getVersion() {
@@ -58,7 +58,6 @@
 
 function getDefaultArguments() {
 return array( 'href' => '',
- // 'type' => 'Temp' // or 'Permanent' // so far ignored
 'page' => false,
 );
 }
@@ -79,8 +78,7 @@
 $url = preg_replace('/%\d\d/','',strip_tags($href));
 $thispage = $request->getPage();
 if (! $thispage->get('locked')) {
- return $this->disabled(fmt("%s is only allowed in locked pages.",
- _("Redirect to an external url")));
+ return $this->disabled(_("Redirect to an external URL is only allowed in locked pages."));
 }
 }
 else if ($page) {
@@ -89,8 +87,7 @@
 'abs_path');
 }
 else {
- return $this->error(fmt("%s or %s parameter missing",
- "'href'", "'page'"));
+ return $this->error(_("'href' or 'page' parameter missing."));
 }
 
 if ($page == $request->getArg('pagename')) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7071
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7071&view=rev
Author: vargenau
Date: 2009年08月19日 19:36:31 +0000 (2009年8月19日)
Log Message:
-----------
Handle redirect (like in IncludePage)
Modified Paths:
--------------
 trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2009年08月19日 19:35:29 UTC (rev 7070)
+++ trunk/lib/plugin/Template.php	2009年08月19日 19:36:31 UTC (rev 7071)
@@ -147,6 +147,29 @@
 }
 $initial_content = $r->getPackedContent();
 
+ $content = $r->getContent();
+ // follow redirects
+ if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/',
+ implode("\n", $content), $m))
+ or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/',
+ implode("\n", $content), $m)))
+ {
+ // Strip quotes (simple or double) from page name if any
+ if ((string_starts_with($m[1], "'")) 
+ or (string_starts_with($m[1], "\""))) {
+ $m[1] = substr($m[1], 1, -1);
+ }
+ // trap recursive redirects
+ if (in_array($m[1], $included_pages)) {
+ return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
+ $page.' => '.$m[1]));
+ }
+ $page = $m[1];
+ $p = $dbi->getPage($page);
+ $r = $p->getCurrentRevision();
+ $initial_content = $r->getPackedContent();
+ }
+
 if ($args['section']) {
 $c = explode("\n", $initial_content);
 $c = extractSection($args['section'], $c, $page, $quiet, $args['sectionhead']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.