phpwiki-checkins Mailing List for PhpWiki

Revision: 9633
 http://sourceforge.net/p/phpwiki/code/9633
Author: vargenau
Date: 2015年03月31日 13:37:40 +0000 (2015年3月31日)
Log Message:
-----------
Use unlimited memory for SOAP (Fusionforge)
Modified Paths:
--------------
 trunk/g
Modified: trunk/g
===================================================================
--- trunk/g	2015年03月30日 10:43:29 UTC (rev 9632)
+++ trunk/g	2015年03月31日 13:37:40 UTC (rev 9633)
@@ -41,7 +41,11 @@
 * ALONE BASIS."
 */
 
-ini_set("memory_limit", "256M");
+if (defined('WIKI_SOAP')) {
+ ini_set('memory_limit', -1);
+} else {
+ ini_set('memory_limit', "256M");
+}
 ini_set('pcre.backtrack_limit', 100000000);
 
 // Disable compression, seems needed to get all the messages.
@@ -65,7 +69,13 @@
 }
 
 if (defined('WIKI_SOAP')) {
- $group_id = 6;
+ $help = group_get_object_by_name('help');
+ if ($help) {
+ $group_id = $help->getID();
+ } else {
+ // Test system don't have help project, use projecta instead.
+ $group_id = 6;
+ }
 }
 
 if (isset($group_id) && $group_id) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9632
 http://sourceforge.net/p/phpwiki/code/9632
Author: vargenau
Date: 2015年03月30日 10:43:29 +0000 (2015年3月30日)
Log Message:
-----------
Remove xa0 (non breaking space), it prevented to create create pages containing "?195円?160円" in UTF-8
Modified Paths:
--------------
 trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2015年03月25日 13:56:37 UTC (rev 9631)
+++ trunk/lib/stdlib.php	2015年03月30日 10:43:29 UTC (rev 9632)
@@ -923,7 +923,7 @@
 private function _check($pagename)
 {
 // Compress internal white-space to single space character.
- $pagename = preg_replace('/[\s\xa0]+/', ' ', $orig = $pagename);
+ $pagename = preg_replace('/[\s]+/', ' ', $orig = $pagename);
 if ($pagename != $orig)
 $this->_warnings[] = _("White space converted to single space");
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9631
 http://sourceforge.net/p/phpwiki/code/9631
Author: vargenau
Date: 2015年03月25日 13:56:37 +0000 (2015年3月25日)
Log Message:
-----------
WebM Video for Internet Explorer
Modified Paths:
--------------
 trunk/pgsrc/Help%2FVideoPlugin
Modified: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin	2015年03月25日 12:52:58 UTC (rev 9630)
+++ trunk/pgsrc/Help%2FVideoPlugin	2015年03月25日 13:56:37 UTC (rev 9631)
@@ -1,4 +1,4 @@
-Date: 2015年3月25日 12:24:09 +0000
+Date: 2015年3月25日 14:34:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FVideoPlugin;
@@ -78,6 +78,7 @@
 * [[Help:Images]]
 * [[Help:Adobe Flash]]
 * [[Help:Wikicreole]]
+* [[http://tools.google.com/dlpage/webmmf/|WebM Video for Internet Explorer 9+]]
 
 <noinclude>
 ----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9630
 http://sourceforge.net/p/phpwiki/code/9630
Author: vargenau
Date: 2015年03月25日 12:52:58 +0000 (2015年3月25日)
Log Message:
-----------
Update ReleaseNotes
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年03月25日 11:32:00 UTC (rev 9629)
+++ trunk/pgsrc/ReleaseNotes	2015年03月25日 12:52:58 UTC (rev 9630)
@@ -1,4 +1,4 @@
-Date: Fri, 6 Mar 2015 18:20:19 +0000
+Date: 2015年3月25日 13:48:38 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -12,6 +12,7 @@
 
 * Fix ~WantedPages for Fusionforge
 * Remove ~WantedPagesOld (use ~WantedPages instead)
+* Add WebM format in Video plugin
 
 == 1.5.3 2015年03月04日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9629
 http://sourceforge.net/p/phpwiki/code/9629
Author: vargenau
Date: 2015年03月25日 11:32:00 +0000 (2015年3月25日)
Log Message:
-----------
Improve Video plugin
Modified Paths:
--------------
 trunk/lib/BlockParser.php
 trunk/lib/InlineParser.php
 trunk/lib/plugin/Video.php
 trunk/lib/stdlib.php
 trunk/pgsrc/Help%2FVideoPlugin
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2015年03月18日 14:19:38 UTC (rev 9628)
+++ trunk/lib/BlockParser.php	2015年03月25日 11:32:00 UTC (rev 9629)
@@ -1193,7 +1193,12 @@
 
 // It's a video
 if (is_video($imagename)) {
- $pi = '<' . '?plugin Video file="' . $pi . '" ?>';
+ if ((strpos($imagename, 'http://') === 0)
+ || (strpos($imagename, 'https://') === 0)) {
+ $pi = '<' . '?plugin Video url="' . $pi . '" ?>';
+ } else {
+ $pi = '<' . '?plugin Video file="' . $pi . '" ?>';
+ }
 $this->_element = new Cached_PluginInvocation($pi);
 return true;
 }
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2015年03月18日 14:19:38 UTC (rev 9628)
+++ trunk/lib/InlineParser.php	2015年03月25日 11:32:00 UTC (rev 9629)
@@ -1106,7 +1106,12 @@
 
 // It's a video
 if (is_video($imagename)) {
- $s = '<' . '?plugin Video file="' . $imagename . '" ?' . '>';
+ if ((strpos($imagename, 'http://') === 0)
+ || (strpos($imagename, 'https://') === 0)) {
+ $s = '<' . '?plugin Video url="' . $imagename . '" ?' . '>';
+ } else {
+ $s = '<' . '?plugin Video file="' . $imagename . '" ?' . '>';
+ }
 return new Cached_PluginInvocation($s);
 }
 
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	2015年03月18日 14:19:38 UTC (rev 9628)
+++ trunk/lib/plugin/Video.php	2015年03月25日 11:32:00 UTC (rev 9629)
@@ -72,7 +72,11 @@
 
 global $WikiTheme;
 $args = $this->getArgs($argstr, $request);
- extract($args);
+ $url = $args['url'];
+ $file = $args['file'];
+ $width = $args['width'];
+ $height = $args['height'];
+ $autoplay = $args['autoplay'];
 
 if (!$url && !$file) {
 return $this->error(_("Both 'url' or 'file' parameters missing."));
@@ -83,9 +87,18 @@
 $url = getUploadDataPath() . '/' . $file;
 }
 
- if (string_ends_with($url, ".ogg")) {
- return HTML::video(array('autoplay' => 'true', 'controls' => 'true', 'src' => $url),
+ if (string_ends_with($url, ".ogg")
+ || string_ends_with($url, ".mp4")
+ || string_ends_with($url, ".webm")) {
+ $video = HTML::video(array('controls' => 'controls',
+ 'width' => $width,
+ 'height' => $height,
+ 'src' => $url),
 _("Your browser does not understand the HTML 5 video tag."));
+ if ($autoplay == 'true') {
+ $video->setAttr('autoplay', 'autoplay');
+ }
+ return $video;
 }
 
 $html = HTML();
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2015年03月18日 14:19:38 UTC (rev 9628)
+++ trunk/lib/stdlib.php	2015年03月25日 11:32:00 UTC (rev 9629)
@@ -2089,13 +2089,15 @@
 
 /**
 * Returns true if the filename ends with an video suffix.
- * Currently only FLV and OGG
+ * Currently FLV, OGG, MP4 and WebM.
 */
 function is_video($filename)
 {
 
 return string_ends_with(strtolower($filename), ".flv")
- or string_ends_with(strtolower($filename), ".ogg");
+ or string_ends_with(strtolower($filename), ".ogg")
+ or string_ends_with(strtolower($filename), ".mp4")
+ or string_ends_with(strtolower($filename), ".webm");
 }
 
 /**
Modified: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin	2015年03月18日 14:19:38 UTC (rev 9628)
+++ trunk/pgsrc/Help%2FVideoPlugin	2015年03月25日 11:32:00 UTC (rev 9629)
@@ -1,4 +1,4 @@
-Date: 2015年3月18日 15:14:44 +0000
+Date: 2015年3月25日 12:24:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FVideoPlugin;
@@ -8,9 +8,9 @@
 
 The **~Video** [[Help:WikiPlugin|plugin]] allows to include video in a wiki page.
 Video file must be encoded in FLV format ([[WikiPedia:Flash Video|Flash Video]]) or in an HTML 5 format:
-* [[WikiPedia:Ogg|Ogg]],
-* [[WikiPedia:MP4|MP4]],
-* [[WikiPedia:WebM|WebM]].
+* [[WikiPedia:Ogg|Ogg]] (##.ogg## suffix),
+* [[WikiPedia:MP4|MP4]] (##.mp4## suffix),
+* [[WikiPedia:WebM|WebM]] (##.webm## suffix).
 
 The Video plugin can also be called with the ~{~{video.flv~}~} syntax.
 
@@ -41,11 +41,11 @@
 | 320
 |-
 | **autoplay**
-| Auto play the video when page is displayed.
+| Auto play the video when page is displayed (boolean).
 | false
 |}
 
-== Example ==
+== Examples ==
 
 A video:
 {{{
@@ -62,6 +62,13 @@
 {{another_video.flv}}
 }}}
 
+=== Big Buck Bunny ===
+
+{{{
+{{http://video.webmfiles.org/big-buck-bunny_trailer.webm}}
+}}}
+{{http://video.webmfiles.org/big-buck-bunny_trailer.webm}}
+
 == Authors ==
 
 * Roger Guignard, Alcatel-Lucent
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9628
 http://sourceforge.net/p/phpwiki/code/9628
Author: vargenau
Date: 2015年03月18日 14:19:38 +0000 (2015年3月18日)
Log Message:
-----------
Revert RateIt fusionforge font-size
Modified Paths:
--------------
 trunk/themes/fusionforge/fusionforge.css
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2015年03月18日 14:15:57 UTC (rev 9627)
+++ trunk/themes/fusionforge/fusionforge.css	2015年03月18日 14:19:38 UTC (rev 9628)
@@ -1325,6 +1325,7 @@
 /* RateIt plugin ====================================================== */
 
 .rateit {
+ font-size: 60%;
 font-weight: bold;
 vertical-align: middle;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9627
 http://sourceforge.net/p/phpwiki/code/9627
Author: vargenau
Date: 2015年03月18日 14:15:57 +0000 (2015年3月18日)
Log Message:
-----------
Update Video help: add HTML 5 formats
Modified Paths:
--------------
 trunk/pgsrc/Help%2FVideoPlugin
Modified: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin	2015年03月11日 15:02:44 UTC (rev 9626)
+++ trunk/pgsrc/Help%2FVideoPlugin	2015年03月18日 14:15:57 UTC (rev 9627)
@@ -1,4 +1,4 @@
-Date: Wed, 4 Mar 2015 14:20:06 +0000
+Date: 2015年3月18日 15:14:44 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FVideoPlugin;
@@ -7,7 +7,10 @@
 Content-Transfer-Encoding: binary
 
 The **~Video** [[Help:WikiPlugin|plugin]] allows to include video in a wiki page.
-Video file must be encoded in FLV format.
+Video file must be encoded in FLV format ([[WikiPedia:Flash Video|Flash Video]]) or in an HTML 5 format:
+* [[WikiPedia:Ogg|Ogg]],
+* [[WikiPedia:MP4|MP4]],
+* [[WikiPedia:WebM|WebM]].
 
 The Video plugin can also be called with the ~{~{video.flv~}~} syntax.
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9626
 http://sourceforge.net/p/phpwiki/code/9626
Author: vargenau
Date: 2015年03月11日 15:02:44 +0000 (2015年3月11日)
Log Message:
-----------
Translate message
Modified Paths:
--------------
 trunk/lib/plugin/UpLoad.php
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/lib/plugin/UpLoad.php	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -197,7 +197,7 @@
 $message->pushContent(HTML::div(array('class' => 'feedback'),
 HTML::p(_("File successfully uploaded.")),
 HTML::p($link),
- HTML::p("Note: some forbidded characters in filename have been replaced by dash.")));
+ HTML::p(_("Note: some forbidden characters in filename have been replaced by dash."))));
 } else {
 $message->pushContent(HTML::div(array('class' => 'feedback'),
 HTML::p(_("File successfully uploaded.")),
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/locale/po/de.po	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
+"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -3262,6 +3262,9 @@
 msgid "File successfully uploaded."
 msgstr "Datei erfolgreich hochgeladen."
 
+msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgstr ""
+
 #, php-format
 msgid "uploaded %s"
 msgstr "%s wurde hochgeladen"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/locale/po/es.po	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
+"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3169,6 +3169,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
+msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgstr ""
+
 #, php-format
 msgid "uploaded %s"
 msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/locale/po/fr.po	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
+"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3217,6 +3217,11 @@
 msgid "File successfully uploaded."
 msgstr "Fichier téléchargé avec succès."
 
+msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgstr ""
+"Note : certains caractères interdits dans les noms de fichier ont été "
+"remplacés par des tirets."
+
 #, php-format
 msgid "uploaded %s"
 msgstr "Téléchargé %s"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/locale/po/it.po	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
+"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -3142,6 +3142,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
+msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgstr ""
+
 #, php-format
 msgid "uploaded %s"
 msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/locale/po/ja.po	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
+"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3183,6 +3183,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
+msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgstr ""
+
 #, fuzzy, php-format
 msgid "uploaded %s"
 msgstr "%s をアップロード中です"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/locale/po/nl.po	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
+"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -3134,6 +3134,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
+msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgstr ""
+
 #, php-format
 msgid "uploaded %s"
 msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/locale/po/phpwiki.pot	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
+"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3126,6 +3126,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
+msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgstr ""
+
 #, php-format
 msgid "uploaded %s"
 msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/locale/po/sv.po	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
+"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3127,6 +3127,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
+msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgstr ""
+
 #, php-format
 msgid "uploaded %s"
 msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年03月09日 16:24:38 UTC (rev 9625)
+++ trunk/locale/po/zh.po	2015年03月11日 15:02:44 UTC (rev 9626)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
+"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3256,6 +3256,9 @@
 msgid "File successfully uploaded."
 msgstr "檔案已經成功地上傳."
 
+msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgstr ""
+
 #, php-format
 msgid "uploaded %s"
 msgstr "已上傳 %s"
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9625
 http://sourceforge.net/p/phpwiki/code/9625
Author: vargenau
Date: 2015年03月09日 16:24:38 +0000 (2015年3月09日)
Log Message:
-----------
Update French translation
Modified Paths:
--------------
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2015年03月09日 14:34:30 UTC (rev 9624)
+++ trunk/locale/po/de.po	2015年03月09日 16:24:38 UTC (rev 9625)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
+"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年03月09日 14:34:30 UTC (rev 9624)
+++ trunk/locale/po/es.po	2015年03月09日 16:24:38 UTC (rev 9625)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
+"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年03月09日 14:34:30 UTC (rev 9624)
+++ trunk/locale/po/fr.po	2015年03月09日 16:24:38 UTC (rev 9625)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
+"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1409,6 +1409,7 @@
 
 msgid "List blog months links for the current or ADMIN user."
 msgstr ""
+"Lister les liens mensuels du blog de l'utilisateur ou de l'administrateur."
 
 #, php-format
 msgid "Blog Entries for %s:"
@@ -1425,6 +1426,7 @@
 
 msgid "Include latest blog entries for the current or ADMIN user."
 msgstr ""
+"Inclure les liens mensuels du blog de l'utilisateur ou de l'administrateur."
 
 msgid "New entry"
 msgstr "Nouvelle entrée"
@@ -1433,10 +1435,10 @@
 msgstr "Pas d'entrées dans le blog"
 
 msgid "A simple plugin for <div class=boxright> with wikimarkup."
-msgstr ""
+msgstr "In greffon simple pour <div class=boxright> en syntaxe wiki."
 
 msgid "This is a simple example using WikiPluginCached."
-msgstr ""
+msgstr "Ceci est un exemple simple de WikiPluginCached."
 
 msgid "CalendarList"
 msgstr "ListeDuCalendrier"
@@ -1467,7 +1469,7 @@
 msgstr "Cacher des commentaires dans une page wiki."
 
 msgid "Automatically create a Bibtex file from linked pages."
-msgstr ""
+msgstr "Créer automatiquement un fichier Bibtex à partir des pages liées."
 
 msgid "Save to File"
 msgstr "Enregistrer dans un fichier"
@@ -1559,11 +1561,11 @@
 
 #, php-format
 msgid "Show a markup retransformation of page %s."
-msgstr ""
+msgstr "Afficher la retransformation en syntaxe wiki de la page %s."
 
 #, php-format
 msgid "Retransform page "%s""
-msgstr ""
+msgstr "Retransformer la page « %s »"
 
 msgid "Display differences between revisions."
 msgstr "Affiche les différences entre versions."
@@ -1622,10 +1624,12 @@
 msgstr "Argument non valable : %s=%s"
 
 msgid "Display a Facebook Like button."
-msgstr ""
+msgstr "Afficher un bouton Facebook « J'aime »"
 
 msgid "Display file information like version, size, date... of uploaded files."
 msgstr ""
+"Afficher des informations telles que la version, la taille, la date... des "
+"fichiers téléchargés."
 
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
@@ -1636,6 +1640,7 @@
 
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
+"Analyser un fichier RDF FOAF et extraire les informations à afficher en HTML."
 
 msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
@@ -1731,7 +1736,7 @@
 msgstr "OK"
 
 msgid "GraphViz image or imagemap creation of directed graphs."
-msgstr ""
+msgstr "Création d'images de graphes orientés avec GraphViz."
 
 #, php-format
 msgid "%s is empty."
@@ -1756,7 +1761,7 @@
 msgstr ""
 
 msgid "Convert HTML markup into wiki markup."
-msgstr ""
+msgstr "Convertir du langage HTML en syntaxe wiki."
 
 msgid "Convert"
 msgstr "Convertir"
@@ -1800,7 +1805,7 @@
 msgstr "Créer une carte du site commençant à [pagename]."
 
 msgid "Display Dynamic Category Tree."
-msgstr ""
+msgstr "Afficher dynamiquement l'arbre des catégories."
 
 msgid "Perform searches on InterWiki sites listed in InterWikiMap."
 msgstr ""
@@ -1814,7 +1819,7 @@
 msgstr "Rechercher"
 
 msgid "Display Jabber presence."
-msgstr ""
+msgstr "Afficher la présence Jabber."
 
 msgid "Search an LDAP directory."
 msgstr "Chercher dans un annuaire LDAP."
@@ -1848,10 +1853,12 @@
 "List all pages with all links in various formats for some Java Visualization "
 "tools."
 msgstr ""
+"Lister toutes les pages avec tous les liens dans divers formats pour "
+"afficher avec des outils Java."
 
 #, php-format
 msgid "All pages with all links in this wiki (%d total):"
-msgstr "Tout pages avec tous les liens dans ce wiki (%d au total) :"
+msgstr "Toutes les pages avec tous les liens dans ce wiki (%d au total) :"
 
 msgid "Links"
 msgstr "Liens"
@@ -2673,10 +2680,10 @@
 msgstr ""
 
 msgid "Display the list of relations and attributes on this page."
-msgstr ""
+msgstr "Afficher les liste des relations et des attributs de cette page."
 
 msgid "SemanticSearch"
-msgstr ""
+msgstr "RechercheSémantique"
 
 #, php-format
 msgid "Semantic relations for %s"
@@ -2696,7 +2703,7 @@
 msgstr ""
 
 msgid "Parse and execute a full query expression."
-msgstr ""
+msgstr "Analyser et exécuter une requête complète."
 
 msgid "Enter a valid query expression"
 msgstr ""
@@ -2712,7 +2719,7 @@
 msgstr "Relation"
 
 msgid "Search relations and attributes."
-msgstr ""
+msgstr "Rechercher des relations et des attributs."
 
 msgid "Filter by this relation. With autocompletion."
 msgstr ""
@@ -2788,7 +2795,7 @@
 msgstr "(niveau maximum de récursivité: %d)"
 
 msgid "Check the spelling of a page and make suggestions."
-msgstr ""
+msgstr "Vérifier l'orthographe d'une page et faire des suggestions."
 
 msgid "SpellCheck"
 msgstr ""
@@ -2861,6 +2868,7 @@
 
 msgid "Source code syntax highlighter (via http://highlightjs.org/)."
 msgstr ""
+"Surlignage syntaxique de code source (grâce à http://highlightjs.org/)."
 
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr "Affiche les informations de bas niveau pour PhpWiki."
@@ -2869,7 +2877,7 @@
 msgstr "pas de cache utilisé"
 
 msgid "cached pagedata:"
-msgstr "page bufferisée :"
+msgstr "page en cache :"
 
 msgid "cached versiondata:"
 msgstr "version bufferisée :"
@@ -3022,7 +3030,7 @@
 msgstr "Thèmes supportés"
 
 msgid "Parametrized page inclusion."
-msgstr ""
+msgstr "Inclusion de page avec des paramètres."
 
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
@@ -3223,10 +3231,10 @@
 msgstr "Impossible d'ouvrir le journal des fichiers déposés."
 
 msgid "Converts an URI-escaped identifier back to an unique XML-ID."
-msgstr ""
+msgstr "Convertir un identifiant URI en identifiant XML."
 
 msgid "Allow any user to adjust his own preferences."
-msgstr ""
+msgstr "Permettre aux utilisateurs de modifier leurs préférences."
 
 msgid "Error: You are not logged in, cannot display UserPreferences."
 msgstr ""
@@ -3269,11 +3277,11 @@
 msgstr "%d préférences ont été mises à jour avec succès."
 
 msgid "List the user's ratings."
-msgstr ""
+msgstr "Lister les évaluations de l'utilisateur."
 
 #, php-format
 msgid "Displaying %d ratings:"
-msgstr ""
+msgstr "Affichage de %d évaluations :"
 
 #, php-format
 msgid "Showing all %ss (%%d):"
@@ -3332,7 +3340,7 @@
 msgstr "Pages recherchées dans ce wiki :"
 
 msgid "Manage notifications e-mails per page."
-msgstr ""
+msgstr "Gérér les notifications par courriel des pages."
 
 msgid "Your current watchlist: "
 msgstr "Votre liste de suivi actuelle : "
@@ -3842,10 +3850,10 @@
 msgstr "Vous devez vous identifier pour ajouter des messages de blog."
 
 msgid "Layout tables using the Wikicreole syntax."
-msgstr ""
+msgstr "Inclure des tables avec la syntaxe Wikicréole."
 
 msgid "Provide generic WikiForm input buttons."
-msgstr ""
+msgstr "Fournir des boutons d'entrée génériques pour les formulaires."
 
 msgid "Load File"
 msgstr "Importer un fichier"
@@ -4398,7 +4406,7 @@
 msgstr "Définir la traduction pour %s en %s"
 
 msgid "Embed YouTube videos."
-msgstr ""
+msgstr "Incruster des vidéos YouTube"
 
 #, php-format
 msgid "Required argument %s missing"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年03月09日 14:34:30 UTC (rev 9624)
+++ trunk/locale/po/it.po	2015年03月09日 16:24:38 UTC (rev 9625)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
+"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年03月09日 14:34:30 UTC (rev 9624)
+++ trunk/locale/po/ja.po	2015年03月09日 16:24:38 UTC (rev 9625)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
+"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年03月09日 14:34:30 UTC (rev 9624)
+++ trunk/locale/po/nl.po	2015年03月09日 16:24:38 UTC (rev 9625)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
+"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年03月09日 14:34:30 UTC (rev 9624)
+++ trunk/locale/po/phpwiki.pot	2015年03月09日 16:24:38 UTC (rev 9625)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
+"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年03月09日 14:34:30 UTC (rev 9624)
+++ trunk/locale/po/sv.po	2015年03月09日 16:24:38 UTC (rev 9625)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
+"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年03月09日 14:34:30 UTC (rev 9624)
+++ trunk/locale/po/zh.po	2015年03月09日 16:24:38 UTC (rev 9625)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
+"POT-Creation-Date: 2015年03月09日 17:23+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9624
 http://sourceforge.net/p/phpwiki/code/9624
Author: vargenau
Date: 2015年03月09日 14:34:30 +0000 (2015年3月09日)
Log Message:
-----------
Remove obsolete comments
Modified Paths:
--------------
 trunk/schemas/mysql-initialize.sql
Modified: trunk/schemas/mysql-initialize.sql
===================================================================
--- trunk/schemas/mysql-initialize.sql	2015年03月09日 14:08:02 UTC (rev 9623)
+++ trunk/schemas/mysql-initialize.sql	2015年03月09日 14:34:30 UTC (rev 9624)
@@ -1,10 +1,5 @@
 CREATE TABLE page (
 	id INT NOT NULL AUTO_INCREMENT,
--- for mysql => 4.1 define the charset here
--- this is esp. needed for mysql 4.1.0 up to 4.1.6. 
--- not yet confirmed, at least since 4.1.8 it's okay with binary.
--- pagename VARCHAR(100) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
--- otherwise use the old syntax to do case-sensitive comparison
 pagename VARCHAR(100) BINARY NOT NULL,
 	hits INT NOT NULL DEFAULT 0,
 pagedata MEDIUMTEXT NOT NULL DEFAULT '',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9623
 http://sourceforge.net/p/phpwiki/code/9623
Author: vargenau
Date: 2015年03月09日 14:08:02 +0000 (2015年3月09日)
Log Message:
-----------
Remove MSIE
Modified Paths:
--------------
 trunk/configurator.php
 trunk/themes/Portland/templates/navbar.tmpl
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2015年03月09日 13:56:40 UTC (rev 9622)
+++ trunk/configurator.php	2015年03月09日 14:08:02 UTC (rev 9623)
@@ -223,7 +223,6 @@
 function update(accepted, error, value, output) {
 var msg = document.getElementById(output);
 if (accepted) {
- /* MSIE 5.0 fails here */
 if (msg && msg.innerHTML) {
 msg.innerHTML = "<span color=\"green\">Input accepted.</span>";
 }
Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl	2015年03月09日 13:56:40 UTC (rev 9622)
+++ trunk/themes/Portland/templates/navbar.tmpl	2015年03月09日 14:08:02 UTC (rev 9623)
@@ -9,11 +9,6 @@
 <?php echo $SEP?><?php echo Button('remove') ?>
 <?php } ?>
 <hr />
-<!-- I would like not to have to use these tables, and managed to
- get this stuff to work more or less correctly using
- CSSs float:left; and float:right;. However float:right; seems
- to cause MSIE4.01/NT to hang.
- So, we use tables... -->
 <table class="toolbar fullwidth" id="actionbar">
 <tr class="baseline">
 <td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9622
 http://sourceforge.net/p/phpwiki/code/9622
Author: vargenau
Date: 2015年03月09日 13:56:40 +0000 (2015年3月09日)
Log Message:
-----------
Remove MSIE6
Modified Paths:
--------------
 trunk/config/config-dist.ini
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2015年03月09日 10:08:43 UTC (rev 9621)
+++ trunk/config/config-dist.ini	2015年03月09日 13:56:40 UTC (rev 9622)
@@ -82,7 +82,7 @@
 ;UNITS_EXE = /usr/bin/units
 
 ; Needed for inlined SVG and MathM, but conflicts with document.write(). 
-; Experimental. Default: false. Problematic with MSIE6
+; Experimental. Default: false.
 ; See http://hixie.ch/advocacy/xhtml
 ;ENABLE_XHTML_XML = true
 
@@ -455,7 +455,7 @@
 ; db2 - Berkeley DB v2; not supported by modern versions of PHP.
 ; db3 - Berkeley DB v3; as per db2. The best on Windows.
 ; db4 - Berkeley DB v4; current version, however PHP has some issues
-; with it's db4 support.
+; with its db4 support.
 ; dbm - Older dba handler; suffers from limits on the size of data
 ; items.
 ; Better not use other hacks such as inifile, flatfile or cdb.
@@ -517,7 +517,7 @@
 ; number of archived revisions of that class. This is
 ; meant to be used as a safety cap when a non-zero
 ; min_age is specified. It should be set relatively high,
-; and it's purpose is to prevent malicious or accidental
+; and its purpose is to prevent malicious or accidental
 ; database overflow due to someone causing an
 ; unreasonable number of edits in a short period of time.
 ;
@@ -1149,7 +1149,7 @@
 ; Disable HTTP redirects.
 ; (You probably don't need to touch this.)
 ;
-; PhpWiki uses HTTP redirects for some of it's functionality.
+; PhpWiki uses HTTP redirects for some of its functionality.
 ; (e.g. after saving changes, PhpWiki redirects your browser to
 ; view the page you just saved.)
 ; Some web service providers (notably free European Lycos) don't seem to
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9621
 http://sourceforge.net/p/phpwiki/code/9621
Author: vargenau
Date: 2015年03月09日 10:08:43 +0000 (2015年3月09日)
Log Message:
-----------
Remove todo functions
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB_pgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php	2015年03月09日 10:05:59 UTC (rev 9620)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php	2015年03月09日 10:08:43 UTC (rev 9621)
@@ -82,71 +82,6 @@
 }
 
 /*
- * Create a new revision of a page.
- */
- function _todo_set_versiondata($pagename, $version, $data)
- {
- $dbh = &$this->_dbh;
- $version_tbl = $this->_table_names['version_tbl'];
-
- $minor_edit = (int)!empty($data['is_minor_edit']);
- unset($data['is_minor_edit']);
-
- $mtime = (int)$data['mtime'];
- unset($data['mtime']);
- assert(!empty($mtime));
-
- @$content = (string)$data['%content'];
- unset($data['%content']);
- unset($data['%pagedata']);
-
- $this->lock();
- $id = $this->_get_pageid($pagename, true);
- $dbh->query(sprintf("DELETE FROM version WHERE id=%d AND version=%d", $id, $version));
- $dbh->query(sprintf("INSERT INTO version (id,version,mtime,minor_edit,content,versiondata)" .
- " VALUES (%d, %d, %d, %d, '%s', '%s')",
- $id, $version, $mtime, $minor_edit,
- $this->_quote($content),
- $this->_serialize($data)));
- // TODO: This function does not work yet
- $dbh->query(sprintf("SELECT update_recent (%d, %d)", $id, $version));
- $this->unlock();
- }
-
- /*
- * Delete an old revision of a page.
- */
- function _todo_delete_versiondata($pagename, $version)
- {
- $dbh = &$this->_dbh;
- // TODO: This function was removed
- $dbh->query(sprintf("SELECT delete_versiondata (%d, %d)", $id, $version));
- }
-
- /*
- * Rename page in the database.
- */
- function _todo_rename_page($pagename, $to)
- {
- $dbh = &$this->_dbh;
- extract($this->_table_names);
-
- $this->lock();
- if (($id = $this->_get_pageid($pagename, false))) {
- if ($new = $this->_get_pageid($to, false)) {
- // Cludge Alert!
- // This page does not exist (already verified before), but exists in the page table.
- // So we delete this page in one step.
- $dbh->query("SELECT prepare_rename_page($id, $new)");
- }
- $dbh->query(sprintf("UPDATE $page_tbl SET pagename='%s' WHERE id=$id",
- $dbh->escapeSimple($to)));
- }
- $this->unlock();
- return $id;
- }
-
- /*
 * Lock all tables we might use.
 */
 protected function _lock_tables($write_lock = true)
@@ -227,7 +162,6 @@
 $callback = new WikiMethodCb($searchobj, "_pagename_match_clause");
 $search_clause = $search->makeSqlClauseObj($callback);
 }
-
 $sql = "SELECT $fields FROM $table"
 . " WHERE $join_clause"
 . " AND ($search_clause)"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9620
 http://sourceforge.net/p/phpwiki/code/9620
Author: vargenau
Date: 2015年03月09日 10:05:59 +0000 (2015年3月09日)
Log Message:
-----------
Comment only
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB.php
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2015年03月06日 17:21:47 UTC (rev 9619)
+++ trunk/lib/WikiDB/backend/PearDB.php	2015年03月09日 10:05:59 UTC (rev 9620)
@@ -682,7 +682,7 @@
 }
 
 /*
- * Title and fulltext search.
+ * Text search (title or full text)
 */
 public function text_search($search, $fulltext = false,
 $sortby = '', $limit = '', $exclude = '')
@@ -691,7 +691,6 @@
 extract($this->_table_names);
 $orderby = $this->sortby($sortby, 'db');
 if ($orderby) $orderby = ' ORDER BY ' . $orderby;
- //else " ORDER BY rank($field, to_tsquery('$searchon')) DESC";
 
 $searchclass = get_class($this) . "_search";
 // no need to define it everywhere and then fallback. memory!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9619
 http://sourceforge.net/p/phpwiki/code/9619
Author: vargenau
Date: 2015年03月06日 17:21:47 +0000 (2015年3月06日)
Log Message:
-----------
Remove WantedPagesOld (use WantedPages instead)
Modified Paths:
--------------
 trunk/lib/IniConfig.php
 trunk/lib/plugin/WikiTranslation.php
 trunk/locale/Makefile
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
 trunk/pgsrc/ReleaseNotes
Removed Paths:
-------------
 trunk/lib/plugin/WantedPagesOld.php
 trunk/pgsrc/Help%2FWantedPagesOldPlugin
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/lib/IniConfig.php	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -690,7 +690,6 @@
 $AllAllowedPlugins[] = 'text2png';
 $AllAllowedPlugins[] = 'TexToPng';
 $AllAllowedPlugins[] = 'VisualWiki';
- $AllAllowedPlugins[] = 'WantedPagesOld';
 $AllAllowedPlugins[] = 'WikiForum';
 $AllAllowedPlugins[] = 'WikiTranslation';
 }
Deleted: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/lib/plugin/WantedPagesOld.php	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -1,233 +0,0 @@
-<?php
-
-/*
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * A plugin which returns a list of referenced pages which do not exist yet.
- *
- **/
-
-class WikiPlugin_WantedPagesOld
- extends WikiPlugin
-{
- public $pagelist;
- public $_rows;
- private $_messageIfEmpty;
- public $_columns;
-
- function getDescription()
- {
- return _("List referenced page names which do not exist yet.");
- }
-
- function getDefaultArguments()
- {
- return array('noheader' => false,
- 'exclude' => _("PgsrcTranslation"),
- 'page' => '[pagename]',
- 'sortby' => false,
- 'limit' => 50,
- 'paging' => 'auto');
- }
-
- // info arg allows multiple columns
- // info=mtime,hits,summary,version,author,locked,minor,markup or all
- // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges
-
- /**
- * @param WikiDB $dbi
- * @param string $argstr
- * @param WikiRequest $request
- * @param string $basepage
- * @return mixed
- */
- function run($dbi, $argstr, &$request, $basepage)
- {
- extract($this->getArgs($argstr, $request));
-
- if (isset($limit) && !is_limit($limit)) {
- return HTML::p(array('class' => "error"),
- _("Illegal "limit" argument: must be an integer or two integers separated by comma"));
- }
-
- if ($exclude) {
- if (!is_array($exclude))
- $exclude = explode(',', $exclude);
- }
-
- if ($page == _("WantedPages"))
- $page = "";
-
- // The PageList class can't handle the 'count' column needed
- // for this table
- $this->pagelist = array();
-
- // There's probably a more memory-efficient way to do this (eg
- // a tailored SQL query via the backend, but this gets the job
- // done.
- if (!$page) {
- $include_empty = false;
- $allpages_iter = $dbi->getAllPages($include_empty, $sortby, $limit);
- while ($page_handle = $allpages_iter->next()) {
- $name = $page_handle->getName();
- if ($name == __("InterWikiMap")) continue;
- if (!in_array($name, $exclude))
- $this->iterateLinks($page_handle, $dbi);
- }
- } elseif ($page && $pageisWikiPage = $dbi->isWikiPage($page)) {
- //only get WantedPages links for one page
- $page_handle = $dbi->getPage($page);
- $this->iterateLinks($page_handle, $dbi);
- if (!$request->getArg('count')) {
- $args['count'] = count($this->pagelist);
- } else {
- $args['count'] = $request->getArg('count');
- }
- }
- ksort($this->pagelist);
- arsort($this->pagelist);
-
- $this->_rows = HTML();
- $caption = false;
- $this->_messageIfEmpty = _("None");
-
- if ($page) {
- // link count always seems to be 1 for a single page so
- // omit count column
- foreach ($this->pagelist as $key => $val) {
- $row = HTML::li(WikiLink((string)$key, 'unknown'));
- $this->_rows->pushContent($row);
- }
- if (!$noheader) {
- if ($pageisWikiPage)
- $pagelink = WikiLink($page);
- else
- $pagelink = WikiLink($page, 'unknown');
- $c = count($this->pagelist);
- $caption = fmt("Wanted Pages for %s (%d total):",
- $pagelink, $c);
- }
- return $this->generateList($caption);
-
- } else {
- $spacer = new RawXml("&nbsp;&nbsp;&nbsp;&nbsp;");
- // Clicking on the number in the links column does a
- // FullTextSearch for the citations of the WantedPage
- // link.
- foreach ($this->pagelist as $key => $val) {
- $key = (string)$key; // TODO: Not sure why, but this
- // string cast type-coersion
- // does seem necessary here.
- // Enclose any FullTextSearch keys containing a space
- // with quotes in oder to request a defnitive search.
- $searchkey = (strstr($key, ' ') === false) ? $key : "\"$key\"";
- $row = HTML::tr(HTML::td(array('class' => 'align-right'),
- Button(array('s' => $searchkey),
- $val, _("FullTextSearch")),
- // Alternatively, get BackLinks
- // instead.
- //
- //Button(array('action'
- // => _("BackLinks")),
- // $val, $searchkey),
- HTML::td(HTML($spacer,
- WikiLink($key,
- 'unknown')))
- ));
- $this->_rows->pushContent($row);
- }
- $c = count($this->pagelist);
- if (!$noheader)
- $caption = sprintf(_("Wanted Pages in this wiki (%d total):"),
- $c);
- $this->_columns = array(_("Count"), _("Page Name"));
- if ($c > 0)
- return $this->generateTable($caption);
- else
- return HTML(HTML::p($caption), HTML::p($this->_messageIfEmpty));
- }
- }
-
- private function generateTable($caption)
- {
-
- if (count($this->pagelist) > 0) {
- $table = HTML::table(array('class' => 'pagelist'));
- if ($caption)
- $table->pushContent(HTML::caption(array('style' => 'caption-side:top'),
- $caption));
-
- $row = HTML::tr();
- $spacer = new RawXml("&nbsp;&nbsp;&nbsp;&nbsp;");
- foreach ($this->_columns as $col_heading) {
- $row->pushContent(HTML::td(HTML($spacer,
- HTML::u($col_heading))));
- $table_summary[] = $col_heading;
- }
- // Table summary for non-visual browsers.
- $table->setAttr('summary', sprintf(_("Columns: %s."),
- implode(", ", $table_summary)));
-
- $table->pushContent(HTML::thead($row),
- HTML::tbody(false, $this->_rows));
- } else {
- $table = HTML();
- if ($caption)
- $table->pushContent(HTML::p($caption));
- $table->pushContent(HTML::p($this->_messageIfEmpty));
- }
-
- return $table;
- }
-
- private function generateList($caption)
- {
- $list = HTML();
- $c = count($this->pagelist);
- if ($caption)
- $list->pushContent(HTML::p($caption));
-
- if ($c > 0)
- $list->pushContent(HTML::ul($this->_rows));
- else
- $list->pushContent(HTML::p($this->_messageIfEmpty));
-
- return $list;
- }
-
- private function iterateLinks($page_handle, $dbi)
- {
- $links_iter = $page_handle->getLinks($reversed = false);
- while ($link_handle = $links_iter->next()) {
- if (!$dbi->isWikiPage($linkname = $link_handle->getName()))
- if (!in_array($linkname, array_keys($this->pagelist)))
- $this->pagelist[$linkname] = 1;
- else
- $this->pagelist[$linkname] += 1;
- }
- }
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/lib/plugin/WikiTranslation.php	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -213,7 +213,6 @@
 _("VisualWiki") . ',' .
 _("WabiSabi") . ',' .
 _("WantedPages") . ',' .
- _("WantedPagesOld") . ',' .
 _("WatchPage") . ',' .
 _("WhoIsOnline") . ',' .
 _("WikiAdminChown") . ',' .
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/Makefile	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -272,7 +272,6 @@
 ${POT_FILE}: .././lib/plugin/UserRatings.php
 ${POT_FILE}: .././lib/plugin/Video.php
 ${POT_FILE}: .././lib/plugin/VisualWiki.php
-${POT_FILE}: .././lib/plugin/WantedPagesOld.php
 ${POT_FILE}: .././lib/plugin/WantedPages.php
 ${POT_FILE}: .././lib/plugin/WatchPage.php
 ${POT_FILE}: .././lib/plugin/WhoIsOnline.php
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/po/de.po	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月04日 14:26+0100\n"
+"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -3368,27 +3368,9 @@
 msgid "List referenced page names which do not exist yet."
 msgstr "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden."
 
-msgid "PgsrcTranslation"
-msgstr "PgsrcTranslation"
-
 msgid "WantedPages"
 msgstr "WunschZettelSeiten"
 
-#, php-format
-msgid "Wanted Pages for %s (%d total):"
-msgstr "WunschZettelSeiten für %s (%d gesamt):"
-
-#, php-format
-msgid "Wanted Pages in this wiki (%d total):"
-msgstr "WunschZettelSeiten in diesem Wiki (%d gesamt):"
-
-msgid "Count"
-msgstr "Anzahl"
-
-#, php-format
-msgid "Columns: %s."
-msgstr "Spalten: %s."
-
 msgid "Wanted From"
 msgstr "Benötigt von"
 
@@ -4393,9 +4375,6 @@
 msgid "WabiSabi"
 msgstr ""
 
-msgid "WantedPagesOld"
-msgstr "WunschZettelSeitenAlt"
-
 msgid "WatchPage"
 msgstr "SeiteBeobarten"
 
@@ -6122,6 +6101,21 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "PgsrcTranslation"
+#~ msgstr "PgsrcTranslation"
+
+#~ msgid "Wanted Pages for %s (%d total):"
+#~ msgstr "WunschZettelSeiten für %s (%d gesamt):"
+
+#~ msgid "Wanted Pages in this wiki (%d total):"
+#~ msgstr "WunschZettelSeiten in diesem Wiki (%d gesamt):"
+
+#~ msgid "Count"
+#~ msgstr "Anzahl"
+
+#~ msgid "Columns: %s."
+#~ msgstr "Spalten: %s."
+
 #~ msgid "LiveSearch"
 #~ msgstr "LiveSuche"
 
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/po/es.po	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月04日 14:26+0100\n"
+"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3272,27 +3272,9 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "WantedPages"
 msgstr ""
 
-#, php-format
-msgid "Wanted Pages for %s (%d total):"
-msgstr ""
-
-#, php-format
-msgid "Wanted Pages in this wiki (%d total):"
-msgstr ""
-
-msgid "Count"
-msgstr ""
-
-#, php-format
-msgid "Columns: %s."
-msgstr "Columnas: %s."
-
 msgid "Wanted From"
 msgstr ""
 
@@ -4274,9 +4256,6 @@
 msgid "WabiSabi"
 msgstr ""
 
-msgid "WantedPagesOld"
-msgstr ""
-
 msgid "WatchPage"
 msgstr ""
 
@@ -5946,6 +5925,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Columns: %s."
+#~ msgstr "Columnas: %s."
+
 #~ msgid "Unexpected EOF in ZIP file"
 #~ msgstr "EOF inesperado en archivo del ZIP"
 
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/po/fr.po	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月04日 14:26+0100\n"
+"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3318,27 +3318,9 @@
 msgid "List referenced page names which do not exist yet."
 msgstr "Afficher toutes les pages référencées qui n'existent pas."
 
-msgid "PgsrcTranslation"
-msgstr "TraductionPgsrc"
-
 msgid "WantedPages"
 msgstr "PagesRecherchées"
 
-#, php-format
-msgid "Wanted Pages for %s (%d total):"
-msgstr "Pages recherchées pour %s dans ce wiki (%d au total) :"
-
-#, php-format
-msgid "Wanted Pages in this wiki (%d total):"
-msgstr "Pages recherchées dans ce wiki (%d au total) :"
-
-msgid "Count"
-msgstr "Nombre"
-
-#, php-format
-msgid "Columns: %s."
-msgstr "Colonnes : %s."
-
 msgid "Wanted From"
 msgstr "Recherchées par"
 
@@ -4331,9 +4313,6 @@
 msgid "WabiSabi"
 msgstr "WabiSabi"
 
-msgid "WantedPagesOld"
-msgstr "VieillesPagesRecherchées"
-
 msgid "WatchPage"
 msgstr "Suivre"
 
@@ -6024,6 +6003,21 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "PgsrcTranslation"
+#~ msgstr "TraductionPgsrc"
+
+#~ msgid "Wanted Pages for %s (%d total):"
+#~ msgstr "Pages recherchées pour %s dans ce wiki (%d au total) :"
+
+#~ msgid "Wanted Pages in this wiki (%d total):"
+#~ msgstr "Pages recherchées dans ce wiki (%d au total) :"
+
+#~ msgid "Count"
+#~ msgstr "Nombre"
+
+#~ msgid "Columns: %s."
+#~ msgstr "Colonnes : %s."
+
 #~ msgid "LiveSearch"
 #~ msgstr "RechercheLive"
 
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/po/it.po	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月04日 14:26+0100\n"
+"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -3245,27 +3245,9 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "WantedPages"
 msgstr ""
 
-#, php-format
-msgid "Wanted Pages for %s (%d total):"
-msgstr ""
-
-#, php-format
-msgid "Wanted Pages in this wiki (%d total):"
-msgstr ""
-
-msgid "Count"
-msgstr ""
-
-#, php-format
-msgid "Columns: %s."
-msgstr "Caratteri: %s."
-
 msgid "Wanted From"
 msgstr ""
 
@@ -4239,9 +4221,6 @@
 msgid "WabiSabi"
 msgstr ""
 
-msgid "WantedPagesOld"
-msgstr ""
-
 msgid "WatchPage"
 msgstr ""
 
@@ -5887,6 +5866,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Columns: %s."
+#~ msgstr "Caratteri: %s."
+
 #~ msgid "LiveSearch"
 #~ msgstr "RicercaLive"
 
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/po/ja.po	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月04日 14:26+0100\n"
+"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3288,27 +3288,9 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "WantedPages"
 msgstr ""
 
-#, php-format
-msgid "Wanted Pages for %s (%d total):"
-msgstr ""
-
-#, php-format
-msgid "Wanted Pages in this wiki (%d total):"
-msgstr ""
-
-msgid "Count"
-msgstr "カウント"
-
-#, php-format
-msgid "Columns: %s."
-msgstr ""
-
 #, fuzzy
 msgid "Wanted From"
 msgstr "データフォーマット"
@@ -4361,9 +4343,6 @@
 msgid "WabiSabi"
 msgstr ""
 
-msgid "WantedPagesOld"
-msgstr ""
-
 #, fuzzy
 msgid "WatchPage"
 msgstr "幅"
@@ -6083,6 +6062,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Count"
+#~ msgstr "カウント"
+
 #, fuzzy
 #~ msgid "LiveSearch"
 #~ msgstr "タイトル検索"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/po/nl.po	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月04日 14:26+0100\n"
+"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -3237,27 +3237,9 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "WantedPages"
 msgstr ""
 
-#, php-format
-msgid "Wanted Pages for %s (%d total):"
-msgstr ""
-
-#, php-format
-msgid "Wanted Pages in this wiki (%d total):"
-msgstr "De %d meestbezochte pagina's van deze Wiki:"
-
-msgid "Count"
-msgstr ""
-
-#, php-format
-msgid "Columns: %s."
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -4231,9 +4213,6 @@
 msgid "WabiSabi"
 msgstr "WabiSabi"
 
-msgid "WantedPagesOld"
-msgstr ""
-
 msgid "WatchPage"
 msgstr ""
 
@@ -5877,6 +5856,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Wanted Pages in this wiki (%d total):"
+#~ msgstr "De %d meestbezochte pagina's van deze Wiki:"
+
 #~ msgid "LiveSearch"
 #~ msgstr "LiveZoek"
 
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/po/phpwiki.pot	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月04日 14:26+0100\n"
+"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3229,27 +3229,9 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "WantedPages"
 msgstr ""
 
-#, php-format
-msgid "Wanted Pages for %s (%d total):"
-msgstr ""
-
-#, php-format
-msgid "Wanted Pages in this wiki (%d total):"
-msgstr ""
-
-msgid "Count"
-msgstr ""
-
-#, php-format
-msgid "Columns: %s."
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -4223,9 +4205,6 @@
 msgid "WabiSabi"
 msgstr ""
 
-msgid "WantedPagesOld"
-msgstr ""
-
 msgid "WatchPage"
 msgstr ""
 
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/po/sv.po	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月04日 14:26+0100\n"
+"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3230,27 +3230,9 @@
 msgid "List referenced page names which do not exist yet."
 msgstr ""
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "WantedPages"
 msgstr ""
 
-#, php-format
-msgid "Wanted Pages for %s (%d total):"
-msgstr ""
-
-#, php-format
-msgid "Wanted Pages in this wiki (%d total):"
-msgstr ""
-
-msgid "Count"
-msgstr ""
-
-#, php-format
-msgid "Columns: %s."
-msgstr ""
-
 msgid "Wanted From"
 msgstr ""
 
@@ -4224,9 +4206,6 @@
 msgid "WabiSabi"
 msgstr ""
 
-msgid "WantedPagesOld"
-msgstr ""
-
 msgid "WatchPage"
 msgstr ""
 
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/locale/po/zh.po	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月04日 14:26+0100\n"
+"POT-Creation-Date: 2015年03月06日 18:19+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3366,27 +3366,9 @@
 msgid "List referenced page names which do not exist yet."
 msgstr "列出還未存在的頁面名稱."
 
-msgid "PgsrcTranslation"
-msgstr ""
-
 msgid "WantedPages"
 msgstr ""
 
-#, php-format
-msgid "Wanted Pages for %s (%d total):"
-msgstr "%s 所需要的頁面 (共 %d):"
-
-#, php-format
-msgid "Wanted Pages in this wiki (%d total):"
-msgstr "在此 wiki 所需要的頁面 (共 %d):"
-
-msgid "Count"
-msgstr "計數"
-
-#, php-format
-msgid "Columns: %s."
-msgstr "行: %s."
-
 #, fuzzy
 msgid "Wanted From"
 msgstr "日期格式"
@@ -4438,10 +4420,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "WantedPagesOld"
-msgstr "%s 所需要的頁面 (共 %d):"
-
-#, fuzzy
 msgid "WatchPage"
 msgstr "寬度"
 
@@ -6188,6 +6166,18 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Wanted Pages for %s (%d total):"
+#~ msgstr "%s 所需要的頁面 (共 %d):"
+
+#~ msgid "Wanted Pages in this wiki (%d total):"
+#~ msgstr "在此 wiki 所需要的頁面 (共 %d):"
+
+#~ msgid "Count"
+#~ msgstr "計數"
+
+#~ msgid "Columns: %s."
+#~ msgstr "行: %s."
+
 #, fuzzy
 #~ msgid "LiveSearch"
 #~ msgstr "標題搜索"
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Deleted: trunk/pgsrc/Help%2FWantedPagesOldPlugin
===================================================================
--- trunk/pgsrc/Help%2FWantedPagesOldPlugin	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/pgsrc/Help%2FWantedPagesOldPlugin	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -1,68 +0,0 @@
-Date: Wed, 4 Mar 2015 14:20:06 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.3)
-Content-Type: application/x-phpwiki;
- pagename=Help%2FWantedPagesOldPlugin;
- flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-The **~WantedPagesOld** [[Help:WikiPlugin|plugin]] returns a list of referenced pages which do not exist yet.
-
-All empty pages which are linked from any page - with an ending question mark, or for just a single page, when the page argument is present.
-
-== Usage ==
-
-{{{
-<<WantedPagesOld arguments>>
-}}}
-
-== Arguments ==
-
-{| class="bordered"
-|-
-! Argument
-! Description
-! Default value
-|-
-| **page**
-| just for a single page
-| pagename
-|-
-| **noheader**
-| do not display header
-| false
-|-
-| **exclude**
-| pages to exclude
-| PgsrcTranslation
-|-
-| **limit**
-| maximum number of wanted pages to display
-| 50
-|-
-| **paging**
-|
-| auto
-|-
-| **sortby**
-|
-|
-|}
-
-== Example ==
-
-{{{
-<<WantedPagesOld>>
-}}}
-
-<<WantedPagesOld>>
-
-== Author ==
-* [[Help:Reini Urban|Reini Urban]]
-
-== See Also ==
-
-<noinclude>
-----
-[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
-</noinclude>
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年03月06日 17:16:43 UTC (rev 9618)
+++ trunk/pgsrc/ReleaseNotes	2015年03月06日 17:21:47 UTC (rev 9619)
@@ -1,4 +1,4 @@
-Date: Fri, 6 Mar 2015 14:11:21 +0000
+Date: Fri, 6 Mar 2015 18:20:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -11,6 +11,7 @@
 == 1.5.4 2015-03-XX Marc-Etienne Vargenau ==
 
 * Fix ~WantedPages for Fusionforge
+* Remove ~WantedPagesOld (use ~WantedPages instead)
 
 == 1.5.3 2015年03月04日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9618
 http://sourceforge.net/p/phpwiki/code/9618
Author: vargenau
Date: 2015年03月06日 17:16:43 +0000 (2015年3月06日)
Log Message:
-----------
Revert: function _extract_page_data is public
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/ADODB.php
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PearDB.php
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2015年03月06日 13:18:23 UTC (rev 9617)
+++ trunk/lib/WikiDB/backend/ADODB.php	2015年03月06日 17:16:43 UTC (rev 9618)
@@ -210,7 +210,7 @@
 return $row ? $this->_extract_page_data($row[3], $row[2]) : false;
 }
 
- private function _extract_page_data($data, $hits)
+ public function _extract_page_data($data, $hits)
 {
 if (empty($data))
 return array('hits' => $hits);
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2015年03月06日 13:18:23 UTC (rev 9617)
+++ trunk/lib/WikiDB/backend/PDO.php	2015年03月06日 17:16:43 UTC (rev 9618)
@@ -280,7 +280,7 @@
 return $row ? $this->_extract_page_data($row[3], $row[2]) : false;
 }
 
- private function _extract_page_data($data, $hits)
+ public function _extract_page_data($data, $hits)
 {
 if (empty($data))
 return array('hits' => $hits);
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2015年03月06日 13:18:23 UTC (rev 9617)
+++ trunk/lib/WikiDB/backend/PearDB.php	2015年03月06日 17:16:43 UTC (rev 9618)
@@ -187,7 +187,7 @@
 return $result ? $this->_extract_page_data($result) : false;
 }
 
- private function _extract_page_data($data)
+ public function _extract_page_data($data)
 {
 if (empty($data)) return array();
 elseif (empty($data['pagedata'])) return $data; else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9617
 http://sourceforge.net/p/phpwiki/code/9617
Author: vargenau
Date: 2015年03月06日 13:18:23 +0000 (2015年3月06日)
Log Message:
-----------
1.5.4: Fix WantedPages for Fusionforge
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年03月06日 12:56:54 UTC (rev 9616)
+++ trunk/pgsrc/ReleaseNotes	2015年03月06日 13:18:23 UTC (rev 9617)
@@ -1,4 +1,4 @@
-Date: Thu, 5 Mar 2015 18:21:45 +0000
+Date: Fri, 6 Mar 2015 14:11:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -8,6 +8,10 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
+== 1.5.4 2015-03-XX Marc-Etienne Vargenau ==
+
+* Fix ~WantedPages for Fusionforge
+
 == 1.5.3 2015年03月04日 Marc-Etienne Vargenau ==
 
 * Fix Bug#648 Call to protected method
@@ -39,7 +43,7 @@
 * remove ~FrameInclude plugin (frames are not supported in HTML 5)
 * sort tables with [[http://tablesorter.com|tablesorter jQuery plugin]] instead of sortable.js
 * fix Bug#636 Recursive include is not trapped
-* fix Bug#647 undefined method ~WikiDB_backend_dba::~WikiDB_backend_dbaBase
+* fix Bug#647 undefined method {{{WikiDB_backend_dba::WikiDB_backend_dbaBase}}}
 * correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe
 * fix Bug#607 BackLinks do not work inside a [[Help:RichTablePlugin|RichTable]]
 * fix Bug#646 Wrong number of links in BackLinks
@@ -102,7 +106,7 @@
 * ensure ending uploads slash even on user provided UPLOAD constants. Fixes plugin/~UpLoad
 * stabilize Comment. substring search for basepages, do not tokenize.
 * fix Bug#1792170 Handle " ( " or "(test" without closing ")" as plain word. Allow single string token "0"
-* fix Bug#1752172 undefined method ~TextSearchQuery~_node_or::~_sql_quote()
+* fix Bug#1752172 undefined method {{{TextSearchQuery_node_or::_sql_quote()}}}
 * dba: fix sorting for empty mtime field
 * ~LdapSearch: fix layout and logic
 * ~FileInfo: fix Upload: links
@@ -303,7 +307,7 @@
 * updated most template files for harmonisation
 * changed default ~LiveSearch method in search.tmpl from url to xmlrpc. faster and less hackish.
 * fixed all templates with missing revision check. can be false.
-* rewrote and redefined ~WikiDB::~listRelations. list only all relations as array.
+* rewrote and redefined {{{WikiDB::listRelations}}}. list only all relations as array.
 * changed Semantic attribute syntax from ":-" to ":=" (relevant to cvs users only)
 * change ~TextSearchQuery handling of regex=pcre: plain string, no parsing at all,
 detect and apply modifiers.
@@ -354,7 +358,7 @@
 * added lib/~XmlRpcClient, xmlrpc methods to lib/~HttpClient and acdropdown.js. JSON not yet.
 * created Help/~*Plugin stubs for *ALL* plugins in pgsrc
 * added a new _DEBUG_REMOTE flag to debug into remote sessions (xmlrpc, ajax, ...)
-* added ~WikiDB::~linkSearch and backend/dumb/~LinkSearchIter.php. Mainly for ~SemanticSearch,
+* added {{{WikiDB::linkSearch}}} and backend/dumb/~LinkSearchIter.php. Mainly for ~SemanticSearch,
 and LinkSearch, but can be used for ~SemanticSearchAdvanced (combined queries as <ask>) and
 BackLinks et al also.
 * added Calendar display_weeknum argument
@@ -389,7 +393,7 @@
 * simplify messages for translators
 * added ~ImageTile.php
 * added tsearch2 to doc/INSTALL.pgsql
-* added basepage to ~Cached_~WikiLink::~asXML for subpages within ~CreateTOC
+* added basepage to {{{Cached_WikiLink::asXML}}} for subpages within ~CreateTOC
 * print filename on dba access error
 * use bind_textdomain_codeset. bug #1480077 (Kai Krakow)
 * make ~TextSearchQuery->_stoplist localizable and overridable within config.ini
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9616
 http://sourceforge.net/p/phpwiki/code/9616
Author: vargenau
Date: 2015年03月06日 12:56:54 +0000 (2015年3月06日)
Log Message:
-----------
Fix WantedPages for Fusionforge
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月06日 11:52:49 UTC (rev 9615)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月06日 12:56:54 UTC (rev 9616)
@@ -551,10 +551,10 @@
 $orderby = 'ORDER BY ' . $orderby;
 
 if ($exclude_from) // array of pagenames
- $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
+ $exclude_from = " AND substring(p.pagename from $p) NOT IN " . $this->_sql_set($exclude_from);
 if ($exclude) // array of pagenames
- $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
- $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename"
+ $exclude = " AND substring(p.pagename from $p) NOT IN " . $this->_sql_set($exclude);
+ $sql = "SELECT substring(pp.pagename from $p) AS wantedfrom, substring(p.pagename from $p) AS pagename"
 . " FROM $page_tbl AS p, $link_tbl AS linked"
 . " LEFT JOIN $page_tbl AS pp ON linked.linkto = pp.id"
 . " LEFT JOIN $nonempty_tbl AS ne ON linked.linkto = ne.id"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9615
 http://sourceforge.net/p/phpwiki/code/9615
Author: vargenau
Date: 2015年03月06日 11:52:49 +0000 (2015年3月06日)
Log Message:
-----------
Add AS in SQL
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月06日 11:27:36 UTC (rev 9614)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月06日 11:52:49 UTC (rev 9615)
@@ -555,9 +555,9 @@
 if ($exclude) // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
 $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename"
- . " FROM $page_tbl p, $link_tbl linked"
- . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
- . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id"
+ . " FROM $page_tbl AS p, $link_tbl AS linked"
+ . " LEFT JOIN $page_tbl AS pp ON linked.linkto = pp.id"
+ . " LEFT JOIN $nonempty_tbl AS ne ON linked.linkto = ne.id"
 . " WHERE ne.id IS NULL"
 . " AND p.id = linked.linkfrom"
 . " AND substring(p.pagename from 0 for $p) = '$page_prefix'"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9614
 http://sourceforge.net/p/phpwiki/code/9614
Author: vargenau
Date: 2015年03月06日 11:27:36 +0000 (2015年3月06日)
Log Message:
-----------
Use page_prefix
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月06日 11:01:51 UTC (rev 9613)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月06日 11:27:36 UTC (rev 9614)
@@ -67,12 +67,11 @@
 $dbh = &$this->_dbh;
 extract($this->_table_names);
 global $page_prefix;
- $pat = $page_prefix;
- $p = strlen($pat) + 1;
+ $p = strlen($page_prefix) + 1;
 return $dbh->getCol("SELECT substring(pagename from $p)"
 . " FROM $nonempty_tbl, $page_tbl"
 . " WHERE $nonempty_tbl.id=$page_tbl.id"
- . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'");
+ . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'");
 }
 
 /*
@@ -83,12 +82,11 @@
 $dbh = &$this->_dbh;
 extract($this->_table_names);
 global $page_prefix;
- $pat = $page_prefix;
- $p = strlen($pat) + 1;
+ $p = strlen($page_prefix) + 1;
 return $dbh->getOne("SELECT count(*)"
 . " FROM $nonempty_tbl, $page_tbl"
 . " WHERE $nonempty_tbl.id=$page_tbl.id"
- . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'");
+ . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'");
 }
 
 /*
@@ -325,8 +323,7 @@
 $exclude = '';
 
 global $page_prefix;
- $pat = $page_prefix;
- $p = strlen($pat) + 1;
+ $p = strlen($page_prefix) + 1;
 
 $qpagename = $dbh->escapeSimple($pagename);
 // MeV+APe 2007年11月14日
@@ -338,8 +335,8 @@
 . " $page_tbl linkee, $page_tbl linker, $link_tbl "
 . ($want_relations ? " JOIN $page_tbl related ON ($link_tbl.relation=related.id)" : '')
 . " WHERE linkfrom=linker.id AND linkto=linkee.id"
- . " AND $have.pagename='$pat$qpagename'"
- . " AND substring($want.pagename from 0 for $p) = '$pat'"
+ . " AND $have.pagename='$page_prefix$qpagename'"
+ . " AND substring($want.pagename from 0 for $p) = '$page_prefix'"
 . (!$include_empty ? " AND $nonempty_tbl.id=$want.id" : "")
 //. " GROUP BY $want.id"
 . $exclude
@@ -362,8 +359,7 @@
 extract($this->_table_names);
 
 global $page_prefix;
- $pat = $page_prefix;
- $p = strlen($pat) + 1;
+ $p = strlen($page_prefix) + 1;
 
 $orderby = $this->sortby($sortby, 'db');
 if ($orderby) $orderby = ' ORDER BY ' . $orderby;
@@ -379,7 +375,7 @@
 . " FROM $page_tbl, $recent_tbl, $version_tbl"
 . " WHERE $page_tbl.id=$recent_tbl.id"
 . " AND $page_tbl.id=$version_tbl.id AND latestversion=version"
- . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'"
+ . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'"
 . $exclude
 . $orderby;
 } else {
@@ -389,7 +385,7 @@
 . " WHERE $nonempty_tbl.id=$page_tbl.id"
 . " AND $page_tbl.id=$recent_tbl.id"
 . " AND $page_tbl.id=$version_tbl.id AND latestversion=version"
- . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'"
+ . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'"
 . $exclude
 . $orderby;
 }
@@ -400,14 +396,14 @@
 . " FROM $page_tbl"
 . ($exclude ? " WHERE $exclude" : '')
 . ($exclude ? " AND " : " WHERE ")
- . " substring($page_tbl.pagename from 0 for $p) = '$pat'"
+ . " substring($page_tbl.pagename from 0 for $p) = '$page_prefix'"
 . $orderby;
 } else {
 $sql = "SELECT "
 . $this->page_tbl_fields
 . " FROM $nonempty_tbl, $page_tbl"
 . " WHERE $nonempty_tbl.id=$page_tbl.id"
- . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'"
+ . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'"
 . $exclude
 . $orderby;
 }
@@ -432,8 +428,7 @@
 $dbh = &$this->_dbh;
 extract($this->_table_names);
 global $page_prefix;
- $pat = $page_prefix;
- $p = strlen($pat) + 1;
+ $p = strlen($page_prefix) + 1;
 if ($limit < 0) {
 $order = "hits ASC";
 $limit = -$limit;
@@ -454,7 +449,7 @@
 . $this->page_tbl_fields
 . " FROM $nonempty_tbl, $page_tbl"
 . " WHERE $nonempty_tbl.id=$page_tbl.id"
- . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'"
+ . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'"
 . $where
 . $orderby;
 if ($limit) {
@@ -525,15 +520,14 @@
 $where_clause .= " AND " . join(" AND ", $pick);
 
 global $page_prefix;
- $pat = $page_prefix;
- $p = strlen($pat) + 1;
+ $p = strlen($page_prefix) + 1;
 
 // FIXME: use SQL_BUFFER_RESULT for mysql?
 $sql = "SELECT "
 . $this->page_tbl_fields . ", " . $this->version_tbl_fields
 . " FROM $table"
 . " WHERE $where_clause"
- . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'"
+ . " AND substring($page_tbl.pagename from 0 for $p) = '$page_prefix'"
 . " ORDER BY mtime $order";
 if ($limit) {
 list($from, $count) = $this->limit($limit);
@@ -552,8 +546,7 @@
 $dbh = &$this->_dbh;
 extract($this->_table_names);
 global $page_prefix;
- $pat = $page_prefix;
- $p = strlen($pat) + 1;
+ $p = strlen($page_prefix) + 1;
 if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
 $orderby = 'ORDER BY ' . $orderby;
 
@@ -561,15 +554,14 @@
 $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
 if ($exclude) // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
- $p = strlen($page_prefix) + 1;
 $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename"
 . " FROM $page_tbl p, $link_tbl linked"
 . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
 . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id"
 . " WHERE ne.id IS NULL"
 . " AND p.id = linked.linkfrom"
- . " AND substring(p.pagename from 0 for $p) = '$pat'"
- . " AND substring(pp.pagename from 0 for $p) = '$pat'"
+ . " AND substring(p.pagename from 0 for $p) = '$page_prefix'"
+ . " AND substring(pp.pagename from 0 for $p) = '$page_prefix'"
 . $exclude_from
 . $exclude
 . $orderby;
@@ -650,8 +642,7 @@
 $dbh = &$this->_dbh;
 extract($this->_table_names);
 global $page_prefix;
- $pat = $page_prefix;
- $len = strlen($pat) + 1;
+ $len = strlen($page_prefix) + 1;
 $orderby = $this->sortby($sortby, 'db');
 if ($sortby and $orderby) $orderby = ' ORDER BY ' . $orderby;
 
@@ -677,14 +668,14 @@
 $callback = new WikiMethodCb($searchobj, "_fulltext_match_clause");
 $search_string = $search->makeTsearch2SqlClauseObj($callback);
 $search_string = str_replace('%', '', $search_string);
- $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND (";
+ $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$page_prefix') AND (";
 
 $search_clause .= "idxFTI @@ plainto_tsquery('english', '$search_string')";
 if (!$orderby)
 $orderby = " ORDER BY ts_rank(idxFTI, plainto_tsquery('english', '$search_string')) DESC";
 } else {
 $callback = new WikiMethodCb($searchobj, "_pagename_match_clause");
- $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND (";
+ $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$page_prefix') AND (";
 $search_clause .= $search->makeSqlClauseObj($callback);
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9613
 http://sourceforge.net/p/phpwiki/code/9613
Author: vargenau
Date: 2015年03月06日 11:01:51 +0000 (2015年3月06日)
Log Message:
-----------
Remove wrong comment
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月06日 10:53:35 UTC (rev 9612)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月06日 11:01:51 UTC (rev 9613)
@@ -574,7 +574,6 @@
 . $exclude
 . $orderby;
 if ($limit) {
- // oci8 error: WHERE NULL = NULL appended
 list($from, $count) = $this->limit($limit);
 $result = $dbh->limitQuery($sql, $from, $count * 3);
 } else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9612
 http://sourceforge.net/p/phpwiki/code/9612
Author: vargenau
Date: 2015年03月06日 10:53:35 +0000 (2015年3月06日)
Log Message:
-----------
Update comments
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/PearDB_mysql.php
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2015年03月06日 10:46:43 UTC (rev 9611)
+++ trunk/lib/WikiDB/backend/PearDB.php	2015年03月06日 10:53:35 UTC (rev 9612)
@@ -891,14 +891,6 @@
 if ($exclude) // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
 
- /*
- all empty pages, independent of linkstatus:
- select pagename as empty from page left join nonempty using(id) where is null(nonempty.id);
- only all empty pages, which have a linkto:
- select page.pagename, linked.pagename as wantedfrom from link, page linked
- left join page on link.linkto=page.id left join nonempty on link.linkto=nonempty.id
- where nonempty.id is null and linked.id=link.linkfrom;
- */
 $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
 . " FROM $page_tbl p, $link_tbl linked"
 . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
@@ -909,7 +901,6 @@
 . $exclude
 . $orderby;
 if ($limit) {
- // oci8 error: WHERE NULL = NULL appended
 list($from, $count) = $this->limit($limit);
 $result = $dbh->limitQuery($sql, $from, $count * 3);
 } else {
Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php	2015年03月06日 10:46:43 UTC (rev 9611)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php	2015年03月06日 10:53:35 UTC (rev 9612)
@@ -105,7 +105,9 @@
 . " GROUP BY id");
 }
 
- /* ISNULL is mysql specific */
+ /*
+ * Find referenced empty pages.
+ */
 function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
 {
 $dbh = &$this->_dbh;
@@ -118,7 +120,8 @@
 if ($exclude) // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
 
- $sql = "SELECT p.pagename, pp.pagename as wantedfrom"
+ /* ISNULL is mysql specific */
+ $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
 . " FROM $page_tbl p, $link_tbl linked"
 . " LEFT JOIN $page_tbl pp ON (linked.linkto = pp.id)"
 . " LEFT JOIN $nonempty_tbl ne ON (linked.linkto = ne.id)"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9611
 http://sourceforge.net/p/phpwiki/code/9611
Author: vargenau
Date: 2015年03月06日 10:46:43 +0000 (2015年3月06日)
Log Message:
-----------
Add private, add braces, remove dead code
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/ADODB.php
 trunk/lib/WikiDB/backend/ADODB_mysql.php
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PDO_pgsql.php
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/PearDB_mysql.php
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2015年03月06日 09:52:06 UTC (rev 9610)
+++ trunk/lib/WikiDB/backend/ADODB.php	2015年03月06日 10:46:43 UTC (rev 9611)
@@ -210,7 +210,7 @@
 return $row ? $this->_extract_page_data($row[3], $row[2]) : false;
 }
 
- function _extract_page_data($data, $hits)
+ private function _extract_page_data($data, $hits)
 {
 if (empty($data))
 return array('hits' => $hits);
@@ -230,7 +230,7 @@
 // hit count, who cares?
 $dbh->Execute(sprintf("UPDATE $page_tbl SET hits=%d WHERE pagename=%s",
 $newdata['hits'], $dbh->qstr($pagename)));
- return;
+ return true;
 }
 $where = sprintf("pagename=%s", $dbh->qstr($pagename));
 $dbh->BeginTrans();
@@ -402,7 +402,7 @@
 return $row ? $this->_extract_version_data_num($row, $want_content) : false;
 }
 
- function _extract_version_data_num($row, $want_content)
+ private function _extract_version_data_num($row, $want_content)
 {
 if (!$row)
 return false;
@@ -460,7 +460,7 @@
 unset($data['mtime']);
 assert(!empty($mtime));
 
- @$content = (string)$data['%content'];
+ $content = isset($data['%content']) ? (string)$data['%content'] : '';
 unset($data['%content']);
 unset($data['%pagedata']);
 
@@ -590,12 +590,6 @@
 return $result;
 }
 
- // The only thing we might be interested in updating which we can
- // do fast in the flags (minor_edit). I think the default
- // update_versiondata will work fine...
- //function update_versiondata($pagename, $version, $data) {
- //}
-
 /*
 * Update link table.
 * on DEBUG: delete old, deleted links from page
@@ -805,11 +799,6 @@
 //. " GROUP BY $want.id"
 . $exclude
 . $orderby;
- /*
- echo "SELECT linkee.id AS id, linkee.pagename AS pagename, related.pagename as linkrelation FROM link, page linkee, page linker JOIN page related ON (link.relation=related.id) WHERE linkfrom=linker.id AND linkto=linkee.id AND linker.pagename='SanDiego'" | mysql phpwiki
- id pagename linkrelation
- 2268 California located_in
- */
 if ($limit) {
 // extract from,count from limit
 list($offset, $count) = $this->limit($limit);
@@ -860,8 +849,7 @@
 $exclude = '';
 }
 
- //$dbh->SetFetchMode(ADODB_FETCH_ASSOC);
- if (strstr($orderby, 'mtime ')) { // was ' mtime'
+ if (strstr($orderby, 'mtime ')) { // multiple columns possible
 if ($include_empty) {
 $sql = "SELECT "
 . $this->page_tbl_fields
@@ -903,7 +891,6 @@
 } else {
 $result = $dbh->Execute($sql);
 }
- //$dbh->SetFetchMode(ADODB_FETCH_NUM);
 return new WikiDB_backend_ADODB_iter($this, $result, $this->page_tbl_field_list);
 }
 
@@ -989,8 +976,9 @@
 if ($sortby != '-hits') {
 if ($order = $this->sortby($sortby, 'db')) $orderby = " ORDER BY " . $order;
 else $orderby = "";
- } else
+ } else {
 $orderby = " ORDER BY hits $order";
+ }
 $sql = "SELECT "
 . $this->page_tbl_fields
 . " FROM $nonempty_tbl, $page_tbl"
@@ -1391,6 +1379,14 @@
 }
 }
 
+ function free()
+ {
+ if ($this->_result) {
+ $this->_result->Close();
+ $this->_result = false;
+ }
+ }
+
 function asArray()
 {
 $result = array();
@@ -1398,15 +1394,6 @@
 $result[] = $page;
 return $result;
 }
-
- function free()
- {
- if ($this->_result) {
- /* call mysql_free_result($this->_queryID) */
- $this->_result->Close();
- $this->_result = false;
- }
- }
 }
 
 class WikiDB_backend_ADODB_iter
@@ -1444,7 +1431,6 @@
 class WikiDB_backend_ADODB_search extends WikiDB_backend_search_sql
 {
 // no surrounding quotes because we know it's a string
- // function _quote($word) { return $this->_dbh->escapeSimple($word); }
 }
 
 // Following function taken from Pear::DB (prev. from adodb-pear.inc.php).
@@ -1578,7 +1564,7 @@
 $parsed['socket'] = $proto_opts;
 }
 
- // Get dabase if any
+ // Get database if any
 // $dsn => database
 if ($dsn) {
 // /database
Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php	2015年03月06日 09:52:06 UTC (rev 9610)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php	2015年03月06日 10:46:43 UTC (rev 9611)
@@ -106,6 +106,7 @@
 if (DO_FULL_LOCK) {
 // if this is not enough:
 $lock_type = $write_lock ? "WRITE" : "READ";
+ $locks = array();
 foreach ($this->_table_names as $key => $table) {
 $locks[] = "$table $lock_type";
 }
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2015年03月06日 09:52:06 UTC (rev 9610)
+++ trunk/lib/WikiDB/backend/PDO.php	2015年03月06日 10:46:43 UTC (rev 9611)
@@ -280,7 +280,7 @@
 return $row ? $this->_extract_page_data($row[3], $row[2]) : false;
 }
 
- function _extract_page_data($data, $hits)
+ private function _extract_page_data($data, $hits)
 {
 if (empty($data))
 return array('hits' => $hits);
@@ -302,7 +302,7 @@
 $sth->bindParam(1, $newdata['hits'], PDO::PARAM_INT);
 $sth->bindParam(2, $pagename, PDO::PARAM_STR, 100);
 $sth->execute();
- return;
+ return true;
 }
 $this->beginTransaction();
 $data = $this->get_pagedata($pagename);
@@ -372,6 +372,7 @@
 return $cache[$pagename];
 }
 }
+
 // attributes play this game.
 if ($pagename === '') return 0;
 
@@ -487,7 +488,7 @@
 return $row ? $this->_extract_version_data_num($row, $want_content) : false;
 }
 
- function _extract_version_data_num($row, $want_content)
+ private function _extract_version_data_num($row, $want_content)
 {
 if (!$row)
 return false;
@@ -543,7 +544,7 @@
 unset($data['mtime']);
 assert(!empty($mtime));
 
- @$content = (string)$data['%content'];
+ $content = isset($data['%content']) ? (string)$data['%content'] : '';
 unset($data['%content']);
 unset($data['%pagedata']);
 
@@ -671,6 +672,7 @@
 $this->rollBack();
 return false;
 }
+ return false;
 }
 
 /*
@@ -705,12 +707,6 @@
 return $result;
 }
 
- // The only thing we might be interested in updating which we can
- // do fast in the flags (minor_edit). I think the default
- // update_versiondata will work fine...
- //function update_versiondata($pagename, $version, $data) {
- //}
-
 /*
 * Update link table.
 * on DEBUG: delete old, deleted links from page
@@ -907,7 +903,7 @@
 $table .= ", $version_tbl";
 $join_clause .= " AND $page_tbl.id=$version_tbl.id AND latestversion=version";
 
- $fields .= ",$page_tbl.pagedata as pagedata," . $this->version_tbl_fields;
+ $fields .= ", $page_tbl.pagedata as pagedata, " . $this->version_tbl_fields;
 $field_list = array_merge($field_list, array('pagedata'), $this->version_tbl_field_list);
 $callback = new WikiMethodCb($searchobj, "_fulltext_match_clause");
 } else {
@@ -959,8 +955,9 @@
 if ($sortby != '-hits') {
 if ($order = $this->sortby($sortby, 'db')) $orderby = " ORDER BY " . $order;
 else $orderby = "";
- } else
+ } else {
 $orderby = " ORDER BY hits $order";
+ }
 $sql = "SELECT "
 . $this->page_tbl_fields
 . " FROM $nonempty_tbl, $page_tbl"
@@ -1536,7 +1533,7 @@
 $parsed['socket'] = $proto_opts;
 }
 
- // Get dabase if any
+ // Get database if any
 // $dsn => database
 if ($dsn) {
 // /database
Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_pgsql.php	2015年03月06日 09:52:06 UTC (rev 9610)
+++ trunk/lib/WikiDB/backend/PDO_pgsql.php	2015年03月06日 10:46:43 UTC (rev 9611)
@@ -37,7 +37,7 @@
 if ($limit) {
 list($offset, $count) = $this->limit($limit);
 if ($offset)
- $limit = " LIMIT $count OFFSET $from";
+ $limit = " LIMIT $count OFFSET $offset";
 else
 $limit = " LIMIT $count";
 } else
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2015年03月06日 09:52:06 UTC (rev 9610)
+++ trunk/lib/WikiDB/backend/PearDB.php	2015年03月06日 10:46:43 UTC (rev 9611)
@@ -187,7 +187,7 @@
 return $result ? $this->_extract_page_data($result) : false;
 }
 
- function _extract_page_data($data)
+ private function _extract_page_data($data)
 {
 if (empty($data)) return array();
 elseif (empty($data['pagedata'])) return $data; else {
@@ -219,7 +219,7 @@
 $this->_get_pageid($pagename, true); // Creates page record
 }
 
- $hits = !empty($data['hits']) ? (int)$data['hits'] : 0;
+ $hits = (empty($data['hits'])) ? 0 : (int)$data['hits'];
 unset($data['hits']);
 
 foreach ($newdata as $key => $val) {
@@ -469,29 +469,6 @@
 }
 
 /*
- * Delete page from the database with backup possibility.
- * i.e save_page('') and DELETE nonempty id
- * Can be undone and is seen in RecentChanges.
- */
- /* // see parent backend.php
- function delete_page($pagename) {
- $mtime = time();
- $user =& $GLOBALS['request']->_user;
- $vdata = array('author' => $user->getId(),
- 'author_id' => $user->getAuthenticatedId(),
- 'mtime' => $mtime);
-
- $this->lock();
- $version = $this->get_latest_version($pagename);
- $this->set_versiondata($pagename, $version+1, $vdata);
- $this->set_links($pagename, false);
- $pagedata = get_pagedata($pagename);
- $this->update_pagedata($pagename, array('hits' => $pagedata['hits']));
- $this->unlock();
- }
- */
-
- /*
 * Delete page completely from the database.
 */
 function purge_page($pagename)
@@ -524,12 +501,6 @@
 return $result;
 }
 
- // The only thing we might be interested in updating which we can
- // do fast in the flags (minor_edit). I think the default
- // update_versiondata will work fine...
- //function update_versiondata($pagename, $version, $data) {
- //}
-
 /*
 * Update link table.
 * on DEBUG: delete old, deleted links from page
@@ -558,10 +529,12 @@
 else
 $relation = 0;
 // avoid duplicates
- if (isset($linkseen[$linkto]) and !$relation)
+ if (isset($linkseen[$linkto]) and !$relation) {
 continue;
- if (!$relation)
+ }
+ if (!$relation) {
 $linkseen[$linkto] = true;
+ }
 $linkid = $this->_get_pageid($linkto, true);
 if (!$linkid) {
 echo("No link for $linkto on page $pagename");
@@ -655,10 +628,11 @@
 extract($this->_table_names);
 $orderby = $this->sortby($sortby, 'db');
 if ($orderby) $orderby = ' ORDER BY ' . $orderby;
- if ($exclude) // array of pagenames
+ if ($exclude) { // array of pagenames
 $exclude = " AND $page_tbl.pagename NOT IN " . $this->_sql_set($exclude);
- else
+ } else {
 $exclude = '';
+ }
 
 if (strstr($orderby, 'mtime ')) { // multiple columns possible
 if ($include_empty) {
@@ -708,8 +682,7 @@
 }
 
 /*
- * Text search (title or full text)
- * Todo: exclude
+ * Title and fulltext search.
 */
 public function text_search($search, $fulltext = false,
 $sortby = '', $limit = '', $exclude = '')
@@ -817,7 +790,6 @@
 } else {
 $orderby = " ORDER BY $order";
 }
- //$limitclause = $limit ? " LIMIT $limit" : '';
 $sql = "SELECT "
 . $this->page_tbl_fields
 . " FROM $nonempty_tbl, $page_tbl"
@@ -886,17 +858,15 @@
 $order = "ASC";
 $limit = -$limit;
 }
- // $limitclause = $limit ? " LIMIT $limit" : '';
 $where_clause = $join_clause;
 if ($pick)
 $where_clause .= " AND " . join(" AND ", $pick);
-
- // FIXME: use SQL_BUFFER_RESULT for mysql?
 $sql = "SELECT "
 . $this->page_tbl_fields . ", " . $this->version_tbl_fields
 . " FROM $table"
 . " WHERE $where_clause"
 . " ORDER BY mtime $order";
+ // FIXME: use SQL_BUFFER_RESULT for mysql?
 if ($limit) {
 list($from, $count) = $this->limit($limit);
 $result = $dbh->limitQuery($sql, $from, $count);
@@ -920,6 +890,15 @@
 $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
 if ($exclude) // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
+
+ /*
+ all empty pages, independent of linkstatus:
+ select pagename as empty from page left join nonempty using(id) where is null(nonempty.id);
+ only all empty pages, which have a linkto:
+ select page.pagename, linked.pagename as wantedfrom from link, page linked
+ left join page on link.linkto=page.id left join nonempty on link.linkto=nonempty.id
+ where nonempty.id is null and linked.id=link.linkfrom;
+ */
 $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
 . " FROM $page_tbl p, $link_tbl linked"
 . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
@@ -1249,8 +1228,9 @@
 
 function count()
 {
- if (!$this->_result)
+ if (!$this->_result) {
 return false;
+ }
 return $this->_result->numRows();
 }
 
@@ -1328,7 +1308,6 @@
 class WikiDB_backend_PearDB_search extends WikiDB_backend_search_sql
 {
 // no surrounding quotes because we know it's a string
- // function _quote($word) { return $this->_dbh->addq($word); }
 }
 
 // Local Variables:
Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php	2015年03月06日 09:52:06 UTC (rev 9610)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php	2015年03月06日 10:46:43 UTC (rev 9611)
@@ -175,6 +175,7 @@
 protected function _lock_tables($write_lock = true)
 {
 $lock_type = $write_lock ? "WRITE" : "READ";
+ $tables = array();
 foreach ($this->_table_names as $table) {
 $tables[] = "$table $lock_type";
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9610
 http://sourceforge.net/p/phpwiki/code/9610
Author: vargenau
Date: 2015年03月06日 09:52:06 +0000 (2015年3月06日)
Log Message:
-----------
Add public
Modified Paths:
--------------
 trunk/lib/WikiDB.php
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2015年03月05日 18:30:15 UTC (rev 9609)
+++ trunk/lib/WikiDB.php	2015年03月06日 09:52:06 UTC (rev 9610)
@@ -1519,7 +1519,7 @@
 /* Semantic Web value, not stored in the links.
 * todo: unify with some unit knowledge
 */
- function setAttribute($relation, $value)
+ public function setAttribute($relation, $value)
 {
 $attr = $this->get('attributes');
 if (empty($attr))
@@ -1626,7 +1626,7 @@
 return $this->_pagename;
 }
 
- function getName()
+ public function getName()
 {
 return $this->_pagename;
 }
@@ -2329,7 +2329,7 @@
 unset($this->_glv_cache[$pagename]);
 }
 
- function update_versiondata($pagename, $version, $data)
+ public function update_versiondata($pagename, $version, $data)
 {
 if (!empty($this->readonly)) {
 trigger_error("readonly database", E_USER_WARNING);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9609
 http://sourceforge.net/p/phpwiki/code/9609
Author: vargenau
Date: 2015年03月05日 18:30:15 +0000 (2015年3月05日)
Log Message:
-----------
Add comments
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月05日 18:06:57 UTC (rev 9608)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年03月05日 18:30:15 UTC (rev 9609)
@@ -75,6 +75,9 @@
 . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'");
 }
 
+ /*
+ * filter (nonempty pages) currently ignored
+ */
 function numPages($filter = false, $exclude = '')
 {
 $dbh = &$this->_dbh;
@@ -88,6 +91,9 @@
 . " AND substring($page_tbl.pagename from 0 for $p) = '$pat'");
 }
 
+ /*
+ * Read page information from database.
+ */
 function get_pagedata($pagename)
 {
 global $page_prefix;
@@ -165,6 +171,16 @@
 return parent::get_previous_version($page_prefix . $pagename, $version);
 }
 
+ /**
+ * Get version data.
+ *
+ * @param string $pagename Name of the page
+ * @param int $version Which version to get
+ * @param bool $want_content Do we need content?
+ *
+ * @return array hash The version data, or false if specified version does not
+ * exist.
+ */
 function get_versiondata($pagename, $version, $want_content = false)
 {
 $dbh = &$this->_dbh;
@@ -174,11 +190,10 @@
 // assert(is_string($pagename) and $pagename != "");
 // assert($version > 0);
 
- //trigger_error("GET_REVISION $pagename $version $want_content", E_USER_NOTICE);
 // FIXME: optimization: sometimes don't get page data?
 if ($want_content) {
 $fields = $this->page_tbl_fields
- . ",$page_tbl.pagedata as pagedata,"
+ . ",$page_tbl.pagedata AS pagedata,"
 . $this->version_tbl_fields;
 } else {
 $fields = $this->page_tbl_fields . ","
@@ -253,6 +268,9 @@
 return $id;
 }
 
+ /*
+ * Delete page completely from the database.
+ */
 function purge_page($pagename)
 {
 $dbh = &$this->_dbh;
@@ -281,6 +299,13 @@
 return $result;
 }
 
+ /*
+ * Find pages which link to or are linked from a page.
+ *
+ * TESTME relations: get_links is responsible to add the relation to the pagehash
+ * as 'linkrelation' key as pagename. See WikiDB_PageIterator::next
+ * if (isset($next['linkrelation']))
+ */
 function get_links($pagename, $reversed = true, $include_empty = false,
 $sortby = '', $limit = '', $exclude = '',
 $want_relations = false)
@@ -399,6 +424,9 @@
 return new WikiDB_backend_PearDB_iter($this, $result, $options);
 }
 
+ /*
+ * Find highest or lowest hit counts.
+ */
 public function most_popular($limit = 20, $sortby = '-hits')
 {
 $dbh = &$this->_dbh;
@@ -435,10 +463,12 @@
 } else {
 $result = $dbh->query($sql);
 }
-
 return new WikiDB_backend_PearDB_iter($this, $result);
 }
 
+ /*
+ * Find recent changes.
+ */
 public function most_recent($params)
 {
 $limit = 0;
@@ -514,6 +544,9 @@
 return new WikiDB_backend_PearDB_iter($this, $result);
 }
 
+ /*
+ * Find referenced empty pages.
+ */
 function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
 {
 $dbh = &$this->_dbh;
@@ -528,7 +561,6 @@
 $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
 if ($exclude) // array of pagenames
 $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
-
 $p = strlen($page_prefix) + 1;
 $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename"
 . " FROM $page_tbl p, $link_tbl linked"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.