phpwiki-checkins Mailing List for PhpWiki

Revision: 9503
 http://sourceforge.net/p/phpwiki/code/9503
Author: vargenau
Date: 2015年01月30日 15:18:59 +0000 (2015年1月30日)
Log Message:
-----------
PHP Doc
Modified Paths:
--------------
 trunk/lib/ziplib.php
Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2015年01月30日 10:05:37 UTC (rev 9502)
+++ trunk/lib/ziplib.php	2015年01月30日 15:18:59 UTC (rev 9503)
@@ -502,6 +502,13 @@
 * automatically convert encodings to a safe type if they receive
 * mail encoded in '8bit' and/or 'binary' encodings.
 */
+
+/**
+ * @param WikiDB_Page $page
+ * @param WikiDB_PageRevision $revision
+ * @return string
+ */
+
 function MimeifyPageRevision(&$page, &$revision)
 {
 // $wikidb =& $revision->_wikidb;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9502
 http://sourceforge.net/p/phpwiki/code/9502
Author: vargenau
Date: 2015年01月30日 10:05:37 +0000 (2015年1月30日)
Log Message:
-----------
Add class error
Modified Paths:
--------------
 trunk/lib/plugin/PageHistory.php
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2015年01月29日 17:40:50 UTC (rev 9501)
+++ trunk/lib/plugin/PageHistory.php	2015年01月30日 10:05:37 UTC (rev 9502)
@@ -342,8 +342,8 @@
 $args = $this->getArgs($argstr, $request);
 
 if (isset($args['limit']) && !is_limit($args['limit'])) {
- return HTML::div(array('class' => "error"),
- _("Illegal "limit" argument: must be an integer or two integers separated by comma"));
+ return HTML::p(array('class' => "error"),
+ _("Illegal "limit" argument: must be an integer or two integers separated by comma"));
 }
 
 $pagename = $args['page'];
@@ -353,8 +353,8 @@
 $page = $dbi->getPage($pagename);
 $current = $page->getCurrentRevision();
 if ($current->getVersion() < 1) {
- return HTML(HTML::p(fmt("Page "%s" does not exist.", WikiLink($pagename, 'unknown'))),
- $this->makeForm("", $request));
+ return HTML(HTML::p(array('class' => "error"), fmt("Page "%s" does not exist.", $pagename)),
+ $this->makeForm("", $request));
 }
 // Hack alert: format() is a NORETURN for rss formatters.
 return $this->format($this->getChanges($dbi, $args), $args);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9501
 http://sourceforge.net/p/phpwiki/code/9501
Author: vargenau
Date: 2015年01月29日 17:40:50 +0000 (2015年1月29日)
Log Message:
-----------
We may need a lot of memory and time for the dump
Modified Paths:
--------------
 trunk/lib/ziplib.php
Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2015年01月28日 16:49:18 UTC (rev 9500)
+++ trunk/lib/ziplib.php	2015年01月29日 17:40:50 UTC (rev 9501)
@@ -699,6 +699,10 @@
 // references.
 function ParseMimeifiedPages($data)
 {
+ // We may need a lot of memory and time for the dump
+ ini_set("memory_limit", -1);
+ ini_set('max_execution_time', 0);
+
 if (!($headers = ParseRFC822Headers($data))
 || empty($headers['content-type'])
 ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9500
 http://sourceforge.net/p/phpwiki/code/9500
Author: vargenau
Date: 2015年01月28日 16:49:18 +0000 (2015年1月28日)
Log Message:
-----------
Better MonoBook layout
Modified Paths:
--------------
 trunk/themes/MonoBook/monobook.css
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2015年01月28日 16:37:54 UTC (rev 9499)
+++ trunk/themes/MonoBook/monobook.css	2015年01月28日 16:49:18 UTC (rev 9500)
@@ -1191,7 +1191,7 @@
 #p-personal .pBody {
 z-index: 0;
 padding: 0;
- margin: 0;
+ margin: 12px 0 0 0;
 border: none;
 overflow: visible;
 background-image: none;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9499
 http://sourceforge.net/p/phpwiki/code/9499
Author: vargenau
Date: 2015年01月28日 16:37:54 +0000 (2015年1月28日)
Log Message:
-----------
Use smart quotes
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
 trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2015年01月28日 16:36:33 UTC (rev 9498)
+++ trunk/themes/default/templates/userprefs.tmpl	2015年01月28日 16:37:54 UTC (rev 9499)
@@ -343,7 +343,7 @@
 <p>
 <?php echo $RelativeDatesCB ?>
 <label for="relativeDates">
- <?php echo _("Show relative dates using 'Today' and 'Yesterday'") ?>
+ <?php echo _("Show relative dates using "Today" and "Yesterday"") ?>
 </label>
 </p>
 </td></tr>
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl	2015年01月28日 16:36:33 UTC (rev 9498)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl	2015年01月28日 16:37:54 UTC (rev 9499)
@@ -413,7 +413,7 @@
 <p>
 <?php echo $RelativeDatesCB ?>
 <label for="relativeDates">
- <?php echo _("Show relative dates using 'Today' and 'Yesterday'") ?>
+ <?php echo _("Show relative dates using "Today" and "Yesterday"") ?>
 </label>
 </p>
 </td></tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9498
 http://sourceforge.net/p/phpwiki/code/9498
Author: vargenau
Date: 2015年01月28日 16:36:33 +0000 (2015年1月28日)
Log Message:
-----------
Use smart quotes
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年01月28日 16:32:33 UTC (rev 9497)
+++ trunk/locale/po/de.po	2015年01月28日 16:36:33 UTC (rev 9498)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
+"POT-Creation-Date: 2015年01月28日 17:35+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."
@@ -5736,7 +5736,7 @@
 msgid "Date Format"
 msgstr "Datumsformat"
 
-msgid "Show relative dates using 'Today' and 'Yesterday'"
+msgid "Show relative dates using "Today" and "Yesterday""
 msgstr "Datum mit relativen Bezeichnungen, wie »Heute« und »Gestern«"
 
 msgid "Update Preferences"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年01月28日 16:32:33 UTC (rev 9497)
+++ trunk/locale/po/es.po	2015年01月28日 16:36:33 UTC (rev 9498)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
+"POT-Creation-Date: 2015年01月28日 17:35+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5588,7 +5588,7 @@
 msgid "Date Format"
 msgstr ""
 
-msgid "Show relative dates using 'Today' and 'Yesterday'"
+msgid "Show relative dates using "Today" and "Yesterday""
 msgstr ""
 
 msgid "Update Preferences"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年01月28日 16:32:33 UTC (rev 9497)
+++ trunk/locale/po/fr.po	2015年01月28日 16:36:33 UTC (rev 9498)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
+"POT-Creation-Date: 2015年01月28日 17:35+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."
@@ -5673,7 +5673,7 @@
 msgid "Date Format"
 msgstr "Format de la date"
 
-msgid "Show relative dates using 'Today' and 'Yesterday'"
+msgid "Show relative dates using "Today" and "Yesterday""
 msgstr "Afficher des dates relatives avec « Aujourd'hui » et « Hier »"
 
 msgid "Update Preferences"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年01月28日 16:32:33 UTC (rev 9497)
+++ trunk/locale/po/it.po	2015年01月28日 16:36:33 UTC (rev 9498)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
+"POT-Creation-Date: 2015年01月28日 17:35+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"
@@ -5532,7 +5532,7 @@
 msgid "Date Format"
 msgstr "Formato della Data"
 
-msgid "Show relative dates using 'Today' and 'Yesterday'"
+msgid "Show relative dates using "Today" and "Yesterday""
 msgstr ""
 
 msgid "Update Preferences"
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年01月28日 16:32:33 UTC (rev 9497)
+++ trunk/locale/po/ja.po	2015年01月28日 16:36:33 UTC (rev 9498)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
+"POT-Creation-Date: 2015年01月28日 17:35+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"
@@ -5702,7 +5702,7 @@
 msgid "Date Format"
 msgstr "データフォーマット"
 
-msgid "Show relative dates using 'Today' and 'Yesterday'"
+msgid "Show relative dates using "Today" and "Yesterday""
 msgstr ""
 
 msgid "Update Preferences"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年01月28日 16:32:33 UTC (rev 9497)
+++ trunk/locale/po/nl.po	2015年01月28日 16:36:33 UTC (rev 9498)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
+"POT-Creation-Date: 2015年01月28日 17:35+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"
@@ -5524,7 +5524,7 @@
 msgid "Date Format"
 msgstr ""
 
-msgid "Show relative dates using 'Today' and 'Yesterday'"
+msgid "Show relative dates using "Today" and "Yesterday""
 msgstr ""
 
 msgid "Update Preferences"
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年01月28日 16:32:33 UTC (rev 9497)
+++ trunk/locale/po/phpwiki.pot	2015年01月28日 16:36:33 UTC (rev 9498)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
+"POT-Creation-Date: 2015年01月28日 17:35+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"
@@ -5516,7 +5516,7 @@
 msgid "Date Format"
 msgstr ""
 
-msgid "Show relative dates using 'Today' and 'Yesterday'"
+msgid "Show relative dates using "Today" and "Yesterday""
 msgstr ""
 
 msgid "Update Preferences"
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年01月28日 16:32:33 UTC (rev 9497)
+++ trunk/locale/po/sv.po	2015年01月28日 16:36:33 UTC (rev 9498)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
+"POT-Creation-Date: 2015年01月28日 17:35+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5517,7 +5517,7 @@
 msgid "Date Format"
 msgstr ""
 
-msgid "Show relative dates using 'Today' and 'Yesterday'"
+msgid "Show relative dates using "Today" and "Yesterday""
 msgstr ""
 
 msgid "Update Preferences"
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年01月28日 16:32:33 UTC (rev 9497)
+++ trunk/locale/po/zh.po	2015年01月28日 16:36:33 UTC (rev 9498)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
+"POT-Creation-Date: 2015年01月28日 17:35+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5801,7 +5801,7 @@
 msgid "Date Format"
 msgstr "日期格式"
 
-msgid "Show relative dates using 'Today' and 'Yesterday'"
+msgid "Show relative dates using "Today" and "Yesterday""
 msgstr "使用'今天'和'昨天'來顯示相對日期."
 
 msgid "Update Preferences"
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: 9497
 http://sourceforge.net/p/phpwiki/code/9497
Author: vargenau
Date: 2015年01月28日 16:32:33 +0000 (2015年1月28日)
Log Message:
-----------
Better MonoBook layout
Modified Paths:
--------------
 trunk/themes/MonoBook/monobook.css
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2015年01月28日 16:05:33 UTC (rev 9496)
+++ trunk/themes/MonoBook/monobook.css	2015年01月28日 16:32:33 UTC (rev 9497)
@@ -1266,7 +1266,7 @@
 position: absolute;
 /*z-index: 1;*/
 /* important! */
- top: 1.3em;
+ top: 1.8em;
 left: 11.5em;
 margin: 0;
 white-space: nowrap;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9496
 http://sourceforge.net/p/phpwiki/code/9496
Author: vargenau
Date: 2015年01月28日 16:05:33 +0000 (2015年1月28日)
Log Message:
-----------
Check user
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2015年01月28日 16:04:43 UTC (rev 9495)
+++ trunk/lib/WikiTheme.php	2015年01月28日 16:05:33 UTC (rev 9496)
@@ -1637,12 +1637,18 @@
 */
 global $request;
 
- if (!$UserCalPageTitle)
- $UserCalPageTitle = $request->_user->getId() .
- '/' . _("Calendar");
- if (!$UserCalPageTitle)
- $UserCalPageTitle = (BLOG_EMPTY_DEFAULT_PREFIX ? ''
- : ($request->_user->getId() . '/')) . "Blog";
+ if (!$UserCalPageTitle) {
+ if (!empty($request->_user)) {
+ $UserCalPageTitle = $request->_user->getId().'/'._("Calendar");
+ }
+ }
+ if (!$UserCalPageTitle) {
+ if (BLOG_EMPTY_DEFAULT_PREFIX) {
+ $UserCalPageTitle = "Blog";
+ } else {
+ $UserCalPageTitle = $request->_user->getId() . '/' . "Blog";
+ }
+ }
 return $UserCalPageTitle;
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9495
 http://sourceforge.net/p/phpwiki/code/9495
Author: vargenau
Date: 2015年01月28日 16:04:43 +0000 (2015年1月28日)
Log Message:
-----------
Better print style sheet for MonoBook
Modified Paths:
--------------
 trunk/themes/MonoBook/commonPrint.css
Modified: trunk/themes/MonoBook/commonPrint.css
===================================================================
--- trunk/themes/MonoBook/commonPrint.css	2015年01月27日 10:47:46 UTC (rev 9494)
+++ trunk/themes/MonoBook/commonPrint.css	2015年01月28日 16:04:43 UTC (rev 9495)
@@ -182,9 +182,7 @@
 .toctoggle,
 div#f-poweredbyico,
 div#f-copyrightico,
-li#f-viewcount,
-li#f-about,
-li#f-disclaimer,
+ul#f-list,
 div#xhtml-validator,
 li#pt-logout,
 li#pt-login,
@@ -210,7 +208,7 @@
 }
 
 #footer {
- border: 1px solid black;
+ border: none;
 }
 
 h1, h2, h3, h4, h5, h6 {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9494
 http://sourceforge.net/p/phpwiki/code/9494
Author: vargenau
Date: 2015年01月27日 10:47:46 +0000 (2015年1月27日)
Log Message:
-----------
Update translations
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年01月27日 10:27:03 UTC (rev 9493)
+++ trunk/locale/po/de.po	2015年01月27日 10:47:46 UTC (rev 9494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:25+0100\n"
+"POT-Creation-Date: 2015年01月27日 11:46+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."
@@ -877,7 +877,7 @@
 msgstr "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen"
 
 msgid "download a HTML ZIP dump from this wiki"
-msgstr "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen"
+msgstr "um alle HTML Seiten als Zipdatei von diesem Wiki herunterzuladen"
 
 msgid "use"
 msgstr "benutze"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年01月27日 10:27:03 UTC (rev 9493)
+++ trunk/locale/po/es.po	2015年01月27日 10:47:46 UTC (rev 9494)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:25+0100\n"
+"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -858,7 +858,7 @@
 msgstr "para descargar un cierre relámpago descargue de este wiki"
 
 msgid "download a HTML ZIP dump from this wiki"
-msgstr "para descargar un cierre relámpago descargue de este wiki"
+msgstr "para descargar un HTML relampague la descarga de este wiki"
 
 msgid "use"
 msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年01月27日 10:27:03 UTC (rev 9493)
+++ trunk/locale/po/fr.po	2015年01月27日 10:47:46 UTC (rev 9494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:25+0100\n"
+"POT-Creation-Date: 2015年01月27日 11:46+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."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年01月27日 10:27:03 UTC (rev 9493)
+++ trunk/locale/po/it.po	2015年01月27日 10:47:46 UTC (rev 9494)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:25+0100\n"
+"POT-Creation-Date: 2015年01月27日 11:46+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年01月27日 10:27:03 UTC (rev 9493)
+++ trunk/locale/po/ja.po	2015年01月27日 10:47:46 UTC (rev 9494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:25+0100\n"
+"POT-Creation-Date: 2015年01月27日 11:46+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年01月27日 10:27:03 UTC (rev 9493)
+++ trunk/locale/po/nl.po	2015年01月27日 10:47:46 UTC (rev 9494)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:25+0100\n"
+"POT-Creation-Date: 2015年01月27日 11:46+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年01月27日 10:27:03 UTC (rev 9493)
+++ trunk/locale/po/phpwiki.pot	2015年01月27日 10:47:46 UTC (rev 9494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:25+0100\n"
+"POT-Creation-Date: 2015年01月27日 11:46+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年01月27日 10:27:03 UTC (rev 9493)
+++ trunk/locale/po/sv.po	2015年01月27日 10:47:46 UTC (rev 9494)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:25+0100\n"
+"POT-Creation-Date: 2015年01月27日 11:46+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年01月27日 10:27:03 UTC (rev 9493)
+++ trunk/locale/po/zh.po	2015年01月27日 10:47:46 UTC (rev 9494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年01月27日 11:25+0100\n"
+"POT-Creation-Date: 2015年01月27日 11:46+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5252,7 +5252,7 @@
 msgstr "無法開啟 ZIP 檔案 "%s" 進行讀取"
 
 msgid "Unexpected EOF in ZIP file"
-msgstr "ZIP 檔案中存有不被期待的 EOF."
+msgstr "ZIP 檔案中存有不被期待的 EOF"
 
 #, php-format
 msgid "[%d] See [%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: 9493
 http://sourceforge.net/p/phpwiki/code/9493
Author: vargenau
Date: 2015年01月27日 10:27:03 +0000 (2015年1月27日)
Log Message:
-----------
Use upper case for ZIP and HTML
Modified Paths:
--------------
 trunk/lib/WikiPluginCached.php
 trunk/lib/main.php
 trunk/lib/ziplib.php
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2015年01月27日 10:26:36 UTC (rev 9492)
+++ trunk/lib/WikiPluginCached.php	2015年01月27日 10:27:03 UTC (rev 9493)
@@ -840,7 +840,7 @@
 // cache empty, but image maps have to be created _inline_
 // so ask user to reload wiki page instead
 if (($plugin->getPluginType() & PLUGIN_CACHED_MAP) && PLUGIN_CACHED_FORCE_SYNCMAP) {
- $errortext = _("Image map expired. Reload wiki page to recreate its html part.");
+ $errortext = _("Image map expired. Reload wiki page to recreate its HTML part.");
 $this->printError($errorformat, $errortext);
 }
 
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015年01月27日 10:26:36 UTC (rev 9492)
+++ trunk/lib/main.php	2015年01月27日 10:27:03 UTC (rev 9493)
@@ -564,7 +564,7 @@
 $actionDescriptions
 = array('browse' => _("view this page"),
 'diff' => _("diff this page"),
- 'dumphtml' => _("dump html pages"),
+ 'dumphtml' => _("dump HTML pages"),
 'dumpserial' => _("dump serial pages"),
 'edit' => _("edit this page"),
 'rename' => _("rename this page"),
@@ -575,13 +575,13 @@
 'purge' => _("purge this page"),
 'remove' => _("remove this page"),
 'unlock' => _("unlock this page"),
- 'upload' => _("upload a zip dump"),
+ 'upload' => _("upload a ZIP dump"),
 'verify' => _("verify the current action"),
 'viewsource' => _("view the source of this page"),
 'xmlrpc' => _("access this wiki via XML-RPC"),
 'soap' => _("access this wiki via SOAP"),
- 'zip' => _("download a zip dump from this wiki"),
- 'ziphtml' => _("download a html zip dump from this wiki")
+ 'zip' => _("download a ZIP dump from this wiki"),
+ 'ziphtml' => _("download a HTML ZIP dump from this wiki")
 );
 }
 if (in_array($action, array_keys($actionDescriptions)))
@@ -608,7 +608,7 @@
 $disallowedActionDescriptions
 = array('browse' => _("Browsing pages"),
 'diff' => _("Diffing pages"),
- 'dumphtml' => _("Dumping html pages"),
+ 'dumphtml' => _("Dumping HTML pages"),
 'dumpserial' => _("Dumping serial pages"),
 'edit' => _("Editing pages"),
 'revert' => _("Reverting to a previous version of pages"),
@@ -618,13 +618,13 @@
 'purge' => _("Purging pages"),
 'remove' => _("Removing pages"),
 'unlock' => _("Unlocking pages"),
- 'upload' => _("Uploading zip dumps"),
+ 'upload' => _("Uploading ZIP dumps"),
 'verify' => _("Verify the current action"),
 'viewsource' => _("Viewing the source of pages"),
 'xmlrpc' => _("XML-RPC access"),
 'soap' => _("SOAP access"),
- 'zip' => _("Downloading zip dumps"),
- 'ziphtml' => _("Downloading html zip dumps")
+ 'zip' => _("Downloading ZIP dumps"),
+ 'ziphtml' => _("Downloading HTML ZIP dumps")
 );
 }
 if (in_array($action, array_keys($disallowedActionDescriptions)))
Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2015年01月27日 10:26:36 UTC (rev 9492)
+++ trunk/lib/ziplib.php	2015年01月27日 10:27:03 UTC (rev 9493)
@@ -322,7 +322,7 @@
 if ($zipfile) {
 $this->zipfile = $zipfile;
 if (!($this->fp = fopen($zipfile, "rb"))) {
- trigger_error(sprintf(_("Can't open zip file "%s" for reading"),
+ trigger_error(sprintf(_("Can't open ZIP file "%s" for reading"),
 $zipfile), E_USER_ERROR);
 }
 }
@@ -333,11 +333,11 @@
 if ($this->fp) {
 $chunk = fread($this->fp, $nbytes);
 if (strlen($chunk) != $nbytes)
- trigger_error(_("Unexpected EOF in zip file"), E_USER_ERROR);
+ trigger_error(_("Unexpected EOF in ZIP file"), E_USER_ERROR);
 return $chunk;
 } elseif ($this->buf) {
 if (strlen($this->buf) < $nbytes)
- trigger_error(_("Unexpected EOF in zip file"), E_USER_ERROR);
+ trigger_error(_("Unexpected EOF in ZIP file"), E_USER_ERROR);
 $chunk = substr($this->buf, 0, $nbytes);
 $this->buf = substr($this->buf, $nbytes);
 return $chunk;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9491
 http://sourceforge.net/p/phpwiki/code/9491
Author: vargenau
Date: 2015年01月27日 09:49:26 +0000 (2015年1月27日)
Log Message:
-----------
Allow unlimited memory for ZIP dump
Modified Paths:
--------------
 trunk/lib/loadsave.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015年01月26日 16:40:23 UTC (rev 9490)
+++ trunk/lib/loadsave.php	2015年01月27日 09:49:26 UTC (rev 9491)
@@ -231,6 +231,8 @@
 $include_empty = true;
 }
 
+ // We may need much memory for the dump
+ ini_set("memory_limit", -1);
 $zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $zipname);
 
 /* ignore fatals in plugins */
@@ -488,7 +490,11 @@
 } else {
 $zipname = "wikihtml.zip";
 }
+
+ // We may need much memory for the dump
+ ini_set("memory_limit", -1);
 $zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $zipname);
+
 $dbi =& $request->_dbi;
 $thispage = $request->getArg('pagename'); // for "Return to ..."
 if ($pages = $request->getArg('pages')) { // which pagenames
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9490
 http://sourceforge.net/p/phpwiki/code/9490
Author: vargenau
Date: 2015年01月26日 16:40:23 +0000 (2015年1月26日)
Log Message:
-----------
PageHistory: by default, limit number of versions to display to 100
Modified Paths:
--------------
 trunk/lib/plugin/PageHistory.php
 trunk/pgsrc/Help%2FPageHistoryPlugin
 trunk/soapscripts/createpage
 trunk/soapscripts/createpagefromfile
 trunk/soapscripts/fulltextsearch
 trunk/soapscripts/getallpagenames
 trunk/soapscripts/getcurrentrevision
 trunk/soapscripts/getpage
 trunk/soapscripts/getpagemeta
 trunk/soapscripts/getpagerevision
 trunk/soapscripts/getpluginsynopsis
 trunk/soapscripts/listlinks
 trunk/soapscripts/listplugins
 trunk/soapscripts/listrelations
 trunk/soapscripts/recentchanges
 trunk/soapscripts/replacestring
 trunk/soapscripts/titlesearch
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/lib/plugin/PageHistory.php	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -27,7 +27,7 @@
 {
 public $_itemcount;
 
- function _PageHistory_PageRevisionIter($rev_iter, $params)
+ function __construct($rev_iter, $params)
 {
 $this->_iter = $rev_iter;
 
@@ -284,7 +284,7 @@
 return array('days' => false,
 'show_minor' => true,
 'show_major' => true,
- 'limit' => 0,
+ 'limit' => 100,
 'page' => '[pagename]',
 'format' => false);
 }
Modified: trunk/pgsrc/Help%2FPageHistoryPlugin
===================================================================
--- trunk/pgsrc/Help%2FPageHistoryPlugin	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/pgsrc/Help%2FPageHistoryPlugin	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:57 +0000
+Date: 2015年1月26日 17:36:01 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FPageHistoryPlugin;
@@ -38,8 +38,8 @@
 | true
 |-
 | **limit**
-|
-|
+| Number of versions to display
+| 100
 |-
 | **format**
 |
Modified: trunk/soapscripts/createpage
===================================================================
--- trunk/soapscripts/createpage	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/createpage	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/createpagefromfile
===================================================================
--- trunk/soapscripts/createpagefromfile	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/createpagefromfile	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -27,7 +27,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/fulltextsearch
===================================================================
--- trunk/soapscripts/fulltextsearch	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/fulltextsearch	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/getallpagenames
===================================================================
--- trunk/soapscripts/getallpagenames	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/getallpagenames	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/getcurrentrevision
===================================================================
--- trunk/soapscripts/getcurrentrevision	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/getcurrentrevision	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/getpage
===================================================================
--- trunk/soapscripts/getpage	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/getpage	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password); 
+ fprintf($fp, "%s:%s", $login, $password); 
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/getpagemeta
===================================================================
--- trunk/soapscripts/getpagemeta	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/getpagemeta	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/getpagerevision
===================================================================
--- trunk/soapscripts/getpagerevision	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/getpagerevision	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -21,7 +21,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/getpluginsynopsis
===================================================================
--- trunk/soapscripts/getpluginsynopsis	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/getpluginsynopsis	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/listlinks
===================================================================
--- trunk/soapscripts/listlinks	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/listlinks	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/listplugins
===================================================================
--- trunk/soapscripts/listplugins	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/listplugins	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/listrelations
===================================================================
--- trunk/soapscripts/listrelations	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/listrelations	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/recentchanges
===================================================================
--- trunk/soapscripts/recentchanges	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/recentchanges	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -21,7 +21,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/replacestring
===================================================================
--- trunk/soapscripts/replacestring	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/replacestring	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
Modified: trunk/soapscripts/titlesearch
===================================================================
--- trunk/soapscripts/titlesearch	2015年01月26日 13:05:02 UTC (rev 9489)
+++ trunk/soapscripts/titlesearch	2015年01月26日 16:40:23 UTC (rev 9490)
@@ -17,7 +17,7 @@
 $password = readline("Password: ");
 $credentials = base64_encode($login.':'.$password);
 if ($fp = fopen($phpwiki, 'w')) {
- fprintf($fp, "%s:%s\n", $login, $password);
+ fprintf($fp, "%s:%s", $login, $password);
 fclose($fp);
 chmod($phpwiki, 0600);
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9489
 http://sourceforge.net/p/phpwiki/code/9489
Author: vargenau
Date: 2015年01月26日 13:05:02 +0000 (2015年1月26日)
Log Message:
-----------
Remove obsolete comment
Modified Paths:
--------------
 trunk/lib/plugin/FullTextSearch.php
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2015年01月22日 14:54:52 UTC (rev 9488)
+++ trunk/lib/plugin/FullTextSearch.php	2015年01月26日 13:05:02 UTC (rev 9489)
@@ -33,11 +33,6 @@
 * Only uploaded: textfiles, PDF, HTML, DOC, XLS, ... or
 * External apps: xapian-omages seems to be the better than lucene,
 * lucene.net, swish, nakamazu, ...
- *
- * See http://sf.net/tracker/index.php?aid=927395&group_id=6121&atid=106121
- * Wordaround to let the dead locks occur somewhat later:
- * Increase the memory limit of PHP from 8 MB to 32 MB
- * php.ini: memory_limit = 32 MB
 */
 class WikiPlugin_FullTextSearch
 extends WikiPlugin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9488
 http://sourceforge.net/p/phpwiki/code/9488
Author: vargenau
Date: 2015年01月22日 14:54:52 +0000 (2015年1月22日)
Log Message:
-----------
Add soapscripts
Added Paths:
-----------
 trunk/soapscripts/
 trunk/soapscripts/README
 trunk/soapscripts/createpage
 trunk/soapscripts/createpagefromfile
 trunk/soapscripts/fulltextsearch
 trunk/soapscripts/getallpagenames
 trunk/soapscripts/getcurrentrevision
 trunk/soapscripts/getpage
 trunk/soapscripts/getpagemeta
 trunk/soapscripts/getpagerevision
 trunk/soapscripts/getpluginsynopsis
 trunk/soapscripts/listlinks
 trunk/soapscripts/listplugins
 trunk/soapscripts/listrelations
 trunk/soapscripts/recentchanges
 trunk/soapscripts/replacestring
 trunk/soapscripts/titlesearch
Added: trunk/soapscripts/README
===================================================================
--- trunk/soapscripts/README	 (rev 0)
+++ trunk/soapscripts/README	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,16 @@
+The following scripts are available as examples of SOAP use:
+* createpage
+* createpagefromfile
+* fulltextsearch
+* getallpagenames
+* getcurrentrevision
+* getpage
+* getpagemeta
+* getpagerevision
+* getpluginsynopsis
+* listlinks
+* listplugins
+* listrelations
+* recentchanges
+* replacestring
+* titlesearch
Added: trunk/soapscripts/createpage
===================================================================
--- trunk/soapscripts/createpage	 (rev 0)
+++ trunk/soapscripts/createpage	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,33 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 3) {
+ echo "usage: $argv[0] pagename content\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ echo $client->doSavePage($argv[1], $argv[2], $credentials);
+ echo "\n";
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/createpage
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/createpagefromfile
===================================================================
--- trunk/soapscripts/createpagefromfile	 (rev 0)
+++ trunk/soapscripts/createpagefromfile	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,43 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 3) {
+ echo "usage: $argv[0] pagename filename\n";
+ exit;
+}
+
+if (!file_exists($argv[2])) {
+ echo "error: file $argv[2] does not exist\n";
+ exit;
+}
+
+if (!is_readable($argv[2])) {
+ echo "error: file $argv[2] is not readable\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ echo $client->doSavePage($argv[1], file_get_contents($argv[2]), $credentials);
+ echo "\n";
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/createpagefromfile
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/fulltextsearch
===================================================================
--- trunk/soapscripts/fulltextsearch	 (rev 0)
+++ trunk/soapscripts/fulltextsearch	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,35 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 2) {
+ echo "usage: $argv[0] term-to-search\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ $pages = $client->doFullTextSearch($argv[1], $credentials);
+ foreach ($pages as $page) {
+ echo $page['pagename']."\n"; 
+ }
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/fulltextsearch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/getallpagenames
===================================================================
--- trunk/soapscripts/getallpagenames	 (rev 0)
+++ trunk/soapscripts/getallpagenames	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,36 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 1) {
+ echo "usage: $argv[0]\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ $all_pages = $client->getAllPagenames($argv[1]);
+ for ($i = 0; $i < count($all_pages); $i++) {
+ echo $all_pages[$i]['pagename'];
+ echo "\n";
+ }
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/getallpagenames
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/getcurrentrevision
===================================================================
--- trunk/soapscripts/getcurrentrevision	 (rev 0)
+++ trunk/soapscripts/getcurrentrevision	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,33 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 2) {
+ echo "usage: $argv[0] pagename\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ echo $client->getCurrentRevision($argv[1], $credentials);
+ echo "\n";
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/getcurrentrevision
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/getpage
===================================================================
--- trunk/soapscripts/getpage	 (rev 0)
+++ trunk/soapscripts/getpage	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,33 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 2) {
+ echo "usage: $argv[0] pagename\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password); 
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ echo $client->getPageContent($argv[1], $credentials);
+ echo "\n";
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/getpage
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/getpagemeta
===================================================================
--- trunk/soapscripts/getpagemeta	 (rev 0)
+++ trunk/soapscripts/getpagemeta	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,35 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 2) {
+ echo "usage: $argv[0] pagename\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ $pagemeta = $client->getPageMeta($argv[1], $credentials);
+ foreach ($pagemeta as $key => $value) {
+ echo "$key: $value\n"; 
+ }
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/getpagemeta
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/getpagerevision
===================================================================
--- trunk/soapscripts/getpagerevision	 (rev 0)
+++ trunk/soapscripts/getpagerevision	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,37 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 3) {
+ echo "usage: $argv[0] pagename revision\n";
+ exit;
+}
+if (!is_numeric($argv[2])) {
+ echo "usage: revision must be an integer\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ echo $client->getPageRevision($argv[1], $argv[2], $credentials);
+ echo "\n";
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/getpagerevision
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/getpluginsynopsis
===================================================================
--- trunk/soapscripts/getpluginsynopsis	 (rev 0)
+++ trunk/soapscripts/getpluginsynopsis	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,33 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 2) {
+ echo "usage: $argv[0] plugin-name\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ echo $client->getPluginSynopsis($argv[1], $credentials);
+ echo "\n";
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/getpluginsynopsis
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/listlinks
===================================================================
--- trunk/soapscripts/listlinks	 (rev 0)
+++ trunk/soapscripts/listlinks	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,35 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 2) {
+ echo "usage: $argv[0] pagename\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ $links = $client->listLinks($argv[1], $credentials);
+ foreach ($links as $link) {
+ echo $link['pagename']."\n";
+ }
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/listlinks
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/listplugins
===================================================================
--- trunk/soapscripts/listplugins	 (rev 0)
+++ trunk/soapscripts/listplugins	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,36 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 1) {
+ echo "usage: $argv[0]\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ $plugins = $client->listPlugins($credentials);
+ for ($i = 0; $i < count($plugins); $i++) {
+ echo $plugins[$i];
+ echo "\n";
+ }
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/listplugins
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/listrelations
===================================================================
--- trunk/soapscripts/listrelations	 (rev 0)
+++ trunk/soapscripts/listrelations	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,36 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 1) {
+ echo "usage: $argv[0]\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ $relations = $client->listRelations($credentials);
+ for ($i = 0; $i < count($relations); $i++) {
+ echo $relations[$i];
+ echo "\n";
+ }
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/listrelations
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/recentchanges
===================================================================
--- trunk/soapscripts/recentchanges	 (rev 0)
+++ trunk/soapscripts/recentchanges	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,45 @@
+#!/usr/bin/php
+<?php
+if (count($argv) == 1) {
+ $limit = 20;
+} elseif (count($argv) == 2) {
+ $limit = $argv[0];
+} else {
+ echo "usage: $argv[0] [limit]\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ $changes = $client->getRecentChanges($limit, $credentials);
+ foreach ($changes as $change) {
+ echo "Pagename: ".$change['pagename']."\n";
+ echo "Last modified: ".$change['lastModified']."\n";
+ echo "Author: ".$change['author']."\n";
+ echo "Summary: ".$change['summary']."\n";
+ echo "Version: ".$change['version']."\n";
+ echo "\n";
+ }
+
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/recentchanges
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/replacestring
===================================================================
--- trunk/soapscripts/replacestring	 (rev 0)
+++ trunk/soapscripts/replacestring	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,37 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 4) {
+ echo "usage: $argv[0] pagename search replace\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ $old_content = $client->getPageContent($argv[1], $credentials);
+ $new_content = str_replace($argv[2], $argv[3], $old_content);
+ if ($new_content != $old_content) {
+ echo $client->doSavePage($argv[1], $new_content, $credentials);
+ echo "\n";
+ }
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/replacestring
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/soapscripts/titlesearch
===================================================================
--- trunk/soapscripts/titlesearch	 (rev 0)
+++ trunk/soapscripts/titlesearch	2015年01月22日 14:54:52 UTC (rev 9488)
@@ -0,0 +1,35 @@
+#!/usr/bin/php
+<?php
+if (count($argv) != 2) {
+ echo "usage: $argv[0] term-to-search\n";
+ exit;
+}
+
+try {
+ $client = new SoapClient("http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl");
+} catch (SoapFault $fault) {
+ die($fault->faultstring);
+}
+
+$phpwiki = getenv("HOME")."/.phpwiki";
+if (!file_exists($phpwiki)) {
+ $login = readline("Login: ");
+ $password = readline("Password: ");
+ $credentials = base64_encode($login.':'.$password);
+ if ($fp = fopen($phpwiki, 'w')) {
+ fprintf($fp, "%s:%s\n", $login, $password);
+ fclose($fp);
+ chmod($phpwiki, 0600);
+ }
+} else {
+ $credentials = base64_encode(file_get_contents($phpwiki));
+}
+
+try {
+ $pages = $client->doTitleSearch($argv[1], $credentials);
+ foreach ($pages as $page) {
+ echo $page['pagename']."\n"; 
+ }
+} catch (SoapFault $e) {
+ echo 'Error: ' . $e->getMessage() . "\n";
+}
Property changes on: trunk/soapscripts/titlesearch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9487
 http://sourceforge.net/p/phpwiki/code/9487
Author: vargenau
Date: 2015年01月21日 16:26:40 +0000 (2015年1月21日)
Log Message:
-----------
Display WDSL in browser
Modified Paths:
--------------
 trunk/SOAP.php
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015年01月21日 16:07:37 UTC (rev 9486)
+++ trunk/SOAP.php	2015年01月21日 16:26:40 UTC (rev 9487)
@@ -355,13 +355,26 @@
 }
 return $links->asArray();
 }
-
 }
 
 $server = new SoapServer('PhpWiki.wsdl');
 $server->setClass('PhpWikiSoapServer');
-$server->handle();
 
+if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD']=='POST') {
+ $server->handle();
+} elseif (isset($_SERVER['QUERY_STRING'])) {
+ // Return the WSDL
+ $wsdl = @implode('', @file('PhpWiki.wsdl'));
+ if (strlen($wsdl) > 1) {
+ header("Content-type: text/xml");
+ echo $wsdl;
+ } else {
+ header("Status: 500 Internal Server Error");
+ header("Content-type: text/plain");
+ echo "HTTP/1.0 500 Internal Server Error";
+ }
+}
+
 // Local Variables:
 // mode: php
 // tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9486
 http://sourceforge.net/p/phpwiki/code/9486
Author: vargenau
Date: 2015年01月21日 16:07:37 +0000 (2015年1月21日)
Log Message:
-----------
Sort result in getAllPagenames
Modified Paths:
--------------
 trunk/SOAP.php
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015年01月20日 13:41:47 UTC (rev 9485)
+++ trunk/SOAP.php	2015年01月21日 16:07:37 UTC (rev 9486)
@@ -145,6 +145,7 @@
 while ($page = $page_iter->next()) {
 $pages[] = array('pagename' => $page->_pagename);
 }
+ sort($pages);
 return $pages;
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9485
 http://sourceforge.net/p/phpwiki/code/9485
Author: vargenau
Date: 2015年01月20日 13:41:47 +0000 (2015年1月20日)
Log Message:
-----------
Make credentials a string
Modified Paths:
--------------
 trunk/PhpWiki.wsdl
 trunk/SOAP.php
Modified: trunk/PhpWiki.wsdl
===================================================================
--- trunk/PhpWiki.wsdl	2015年01月19日 16:20:47 UTC (rev 9484)
+++ trunk/PhpWiki.wsdl	2015年01月20日 13:41:47 UTC (rev 9485)
@@ -9,12 +9,12 @@
 
 <message name="getPageContent">
 <part name="pagename" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="getPageRevision">
 <part name="pagename" type="xsd:string"/>
 <part name="revision" type="xsd:double"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="getPageContentResponse">
 <part name="content" type="xsd:string"/>
@@ -22,7 +22,7 @@
 
 <message name="getCurrentRevision">
 <part name="pagename" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="getRevisionResponse">
 <part name="revision" type="xsd:double"/>
@@ -30,7 +30,7 @@
 
 <message name="getPageMeta">
 <part name="pagename" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="getPageMetaResponse">
 <part name="meta" type="typens:PageMetadata"/>
@@ -38,59 +38,59 @@
 <message name="doSavePage">
 <part name="pagename" type="xsd:string"/>
 <part name="content" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="doSavePageResponse">
 <part name="successcode" type="xsd:int"/>
 </message>
 
 <message name="getAllPagenames">
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="getBackLinks">
 <part name="pagename" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="doTitleSearch">
 <part name="query" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="doFullTextSearch">
 <part name="query" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="getRecentChanges">
 <part name="limit" type="xsd:int"/>
 <part name="since" type="xsd:int"/>
 <part name="include_minor" type="xsd:int"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="listLinks">
 <part name="pagename" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="listPlugins">
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="callPlugin">
 <part name="pluginname" type="xsd:string"/>
 <part name="pluginargs" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="getPluginSynopsis">
 <part name="pluginname" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="listRelations">
 <part name="option" type="xsd:int"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 <message name="linkSearch">
 <part name="linktype" type="xsd:string"/>
 <part name="search" type="xsd:string"/>
 <part name="pages" type="xsd:string"/>
 <part name="relation" type="xsd:string"/>
- <part name="credentials" type="typens:Credentials"/>
+ <part name="credentials" type="xsd:string"/>
 </message>
 
 <message name="PagenameListResponse">
@@ -133,12 +133,6 @@
 <part name="version" type="xsd:int"/>
 </xsd:all>
 </xsd:complexType>
- <xsd:complexType name="Credentials">
- <xsd:all>
- <xsd:element name="username" type="xsd:string"/>
- <xsd:element name="password" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
 <xsd:complexType name="PageMetadata">
 <xsd:all>
 <xsd:element name="createdby" type="xsd:string"/>
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015年01月19日 16:20:47 UTC (rev 9484)
+++ trunk/SOAP.php	2015年01月20日 13:41:47 UTC (rev 9485)
@@ -26,32 +26,40 @@
 
 function checkCredentials(&$server, &$credentials, $access, $pagename)
 {
- /*
- // check the "Authorization: Basic '.base64_encode("$this->username:$this->password").'\r\n'" header
- if (isset($server->header['Authorization'])) {
- $line = base64_decode(str_replace("Basic ", "", trim($server->header['Authorization'])));
- list($credentials['username'], $credentials['password']) = explode(':', $line);
- } else {
- if (!isset($_SERVER))
- $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
+ // check the "Authorization: Basic '.base64_encode("$this->username:$this->password").'\r\n'" header
+ if (isset($server->header['Authorization'])) {
+ $line = base64_decode(str_replace("Basic ", "", trim($server->header['Authorization'])));
+ list($username, $password) = explode(':', $line);
+ } elseif ($credentials && is_string($credentials) && base64_decode($credentials, true)) {
+ list($username, $password) = explode(':', base64_decode($credentials));
+ } else {
+ if (!isset($_SERVER))
+ $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
 // TODO: where in the header is the client IP
- if (!isset($credentials['username'])) {
+ if (!isset($username)) {
 if (isset($_SERVER['REMOTE_ADDR']))
- $credentials['username'] = $_SERVER['REMOTE_ADDR'];
+ $username = $_SERVER['REMOTE_ADDR'];
 elseif (isset($GLOBALS['REMOTE_ADDR']))
- $credentials['username'] = $GLOBALS['REMOTE_ADDR']; else
- $credentials['username'] = $server->host;
+ $username = $GLOBALS['REMOTE_ADDR'];
+ else
+ $username = $server->host;
 }
- }
- if (!isset($credentials['password'])) $credentials['password'] = '';
+ }
+ if (!isset($password))
+ $password = '';
 
- global $request;
- $request->_user = WikiUser($credentials['username']);
- $request->_user->AuthCheck(array('userid' => $credentials['username'],
- 'passwd' => $credentials['password']));
- if (!mayAccessPage($access, $pagename))
- $server->fault(401, '', "no permission");
- */
+ global $request;
+ $request->_user = WikiUser($username);
+ $request->_user->AuthCheck(array('userid' => $username, 'passwd' => $password));
+
+ if (!mayAccessPage($access, $pagename)) {
+ $server->fault(401, "no permission, "
+ . "access=$access, "
+ . "pagename=$pagename, "
+ . "username=$username, "
+ );
+ }
+ $credentials = array('username' => $username, 'password' => $password);
 }
 
 class PhpWikiSoapServer
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9484
 http://sourceforge.net/p/phpwiki/code/9484
Author: vargenau
Date: 2015年01月19日 16:20:47 +0000 (2015年1月19日)
Log Message:
-----------
Update meta
Modified Paths:
--------------
 trunk/SOAP.php
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015年01月16日 14:37:26 UTC (rev 9483)
+++ trunk/SOAP.php	2015年01月19日 16:20:47 UTC (rev 9484)
@@ -66,9 +66,15 @@
 $dbi = WikiDB::open($GLOBALS['DBParams']);
 $page = $dbi->getPage($pagename);
 $current = $page->getCurrentRevision();
- $meta = $current->_data;
- $meta['summary'] = sprintf(_("SOAP Request %s", $credentials['username'])); // from user or IP ?
 $version = $current->getVersion();
+ $userid = $credentials['username'];
+ $summary = sprintf(_("SOAP Request by %s"), $userid);
+ $meta = array('author' => $userid,
+ 'author_id' => $userid,
+ 'summary' => $summary,
+ 'mtime' => time(),
+ 'pagetype' => 'wikitext'
+ );
 return $page->save($content, $version + 1, $meta);
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9481
 http://sourceforge.net/p/phpwiki/code/9481
Author: vargenau
Date: 2015年01月16日 13:21:18 +0000 (2015年1月16日)
Log Message:
-----------
Reformat code
Modified Paths:
--------------
 trunk/PhpWiki.wsdl
Modified: trunk/PhpWiki.wsdl
===================================================================
--- trunk/PhpWiki.wsdl	2015年01月16日 10:17:29 UTC (rev 9480)
+++ trunk/PhpWiki.wsdl	2015年01月16日 13:21:18 UTC (rev 9481)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
- <definitions name="Wiki"
- targetNamespace="http://phpwiki.sourceforge.net/PhpWiki.wsdl"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://phpwiki.sourceforge.net/PhpWiki.wsdl"
- xmlns:xsd="http://www.w3.org/1999/XMLSchema"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- >
+<definitions name="Wiki"
+ targetNamespace="http://phpwiki.sourceforge.net/PhpWiki.wsdl"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://phpwiki.sourceforge.net/PhpWiki.wsdl"
+ xmlns:xsd="http://www.w3.org/1999/XMLSchema"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ >
 
 <message name="getPageContent">
 <part name="pagename" type="xsd:string"/>
@@ -109,45 +109,45 @@
 <part name="content" type="xsd:string"/>
 </message>
 
- <xsd:complexType name="PagenameList">
- <xsd:all> 
- <part name="pagename" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType> 
- <xsd:complexType name="RdfTripleList">
- <xsd:all> 
- <part name="pagename" type="xsd:string"/>
- <part name="relation" type="xsd:string"/>
- <part name="target" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType> 
- <xsd:complexType name="StringList">
- <xsd:all type="xsd:string" /> 
- </xsd:complexType> 
- <xsd:complexType name="RecentChangesList">
- <xsd:all>
- <part name="pagename" type="xsd:string"/>
- <part name="lastModified" type="xsd:int"/>
- <part name="author" type="xsd:string"/>
- <part name="summary" type="xsd:string"/>
- <part name="version" type="xsd:int"/>
- </xsd:all>
- </xsd:complexType> 
- <xsd:complexType name="Credentials">
- <xsd:all> 
- <xsd:element name="username" type="xsd:string"/> 
- <xsd:element name="password" type="xsd:string"/> 
- </xsd:all>
- </xsd:complexType> 
- <xsd:complexType name="PageMetadata">
- <xsd:all> 
- <xsd:element name="createdby" type="xsd:string"/> 
- <xsd:element name="lastauthor" type="xsd:string"/> 
- <xsd:element name="ctime" type="xsd:int"/> 
- <xsd:element name="mtime" type="xsd:int"/> 
- <xsd:element name="atime" type="xsd:int"/> 
- </xsd:all>
- </xsd:complexType> 
+ <xsd:complexType name="PagenameList">
+ <xsd:all>
+ <part name="pagename" type="xsd:string"/>
+ </xsd:all>
+ </xsd:complexType>
+ <xsd:complexType name="RdfTripleList">
+ <xsd:all>
+ <part name="pagename" type="xsd:string"/>
+ <part name="relation" type="xsd:string"/>
+ <part name="target" type="xsd:string"/>
+ </xsd:all>
+ </xsd:complexType>
+ <xsd:complexType name="StringList">
+ <xsd:all type="xsd:string" />
+ </xsd:complexType>
+ <xsd:complexType name="RecentChangesList">
+ <xsd:all>
+ <part name="pagename" type="xsd:string"/>
+ <part name="lastModified" type="xsd:int"/>
+ <part name="author" type="xsd:string"/>
+ <part name="summary" type="xsd:string"/>
+ <part name="version" type="xsd:int"/>
+ </xsd:all>
+ </xsd:complexType>
+ <xsd:complexType name="Credentials">
+ <xsd:all>
+ <xsd:element name="username" type="xsd:string"/>
+ <xsd:element name="password" type="xsd:string"/>
+ </xsd:all>
+ </xsd:complexType>
+ <xsd:complexType name="PageMetadata">
+ <xsd:all>
+ <xsd:element name="createdby" type="xsd:string"/>
+ <xsd:element name="lastauthor" type="xsd:string"/>
+ <xsd:element name="ctime" type="xsd:int"/>
+ <xsd:element name="mtime" type="xsd:int"/>
+ <xsd:element name="atime" type="xsd:int"/>
+ </xsd:all>
+ </xsd:complexType>
 
 <portType name="wikiPortType">
 <operation name="getPageContent">
@@ -366,7 +366,7 @@
 
 <service name="wikiService">
 <port name="wikiPortType" binding="tns:wikiBinding">
- <soap:address location="http://phpwiki.nmu.alcatel.fr/phpwiki/SOAP.php" />
+ <soap:address location="http://phpwiki.nmu.alcatel.fr/phpwiki/SOAP.php" />
 </port>
 </service>
 </definitions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9483
 http://sourceforge.net/p/phpwiki/code/9483
Author: vargenau
Date: 2015年01月16日 14:37:26 +0000 (2015年1月16日)
Log Message:
-----------
Improve getPageMeta
Modified Paths:
--------------
 trunk/SOAP.php
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2015年01月16日 13:38:13 UTC (rev 9482)
+++ trunk/SOAP.php	2015年01月16日 14:37:26 UTC (rev 9483)
@@ -117,10 +117,7 @@
 checkCredentials($server, $credentials, 'view', $pagename);
 $dbi = WikiDB::open($GLOBALS['DBParams']);
 $page = $dbi->getPage($pagename);
- $rev = $page->getCurrentRevision();
- $meta = $rev->_data;
- //todo: reformat the meta hash
- return $meta;
+ return $page->getMetaData();
 }
 
 // require 'view' access to AllPages
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9482
 http://sourceforge.net/p/phpwiki/code/9482
Author: vargenau
Date: 2015年01月16日 13:38:13 +0000 (2015年1月16日)
Log Message:
-----------
Fix getPageMeta, getPageMetaResponse & getCurrentRevision
Modified Paths:
--------------
 trunk/PhpWiki.wsdl
Modified: trunk/PhpWiki.wsdl
===================================================================
--- trunk/PhpWiki.wsdl	2015年01月16日 13:21:18 UTC (rev 9481)
+++ trunk/PhpWiki.wsdl	2015年01月16日 13:38:13 UTC (rev 9482)
@@ -29,11 +29,11 @@
 </message>
 
 <message name="getPageMeta">
- <part name="pagename" type="typens:PageMetadata"/>
+ <part name="pagename" type="xsd:string"/>
 <part name="credentials" type="typens:Credentials"/>
 </message>
 <message name="getPageMetaResponse">
- <part name="meta" type="xsd:double"/>
+ <part name="meta" type="typens:PageMetadata"/>
 </message>
 <message name="doSavePage">
 <part name="pagename" type="xsd:string"/>
@@ -160,7 +160,7 @@
 </operation>
 <operation name="getCurrentRevision">
 <input message="tns:getPageRevision"/>
- <output message="tns:getPageContentResponse"/>
+ <output message="tns:getRevisionResponse"/>
 </operation>
 <operation name="getPageMeta">
 <input message="tns:getPageMeta"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9480
 http://sourceforge.net/p/phpwiki/code/9480
Author: vargenau
Date: 2015年01月16日 10:17:29 +0000 (2015年1月16日)
Log Message:
-----------
Put back http://phpwiki.sourceforge.net
Modified Paths:
--------------
 trunk/PhpWiki.wsdl
Modified: trunk/PhpWiki.wsdl
===================================================================
--- trunk/PhpWiki.wsdl	2015年01月15日 14:06:13 UTC (rev 9479)
+++ trunk/PhpWiki.wsdl	2015年01月16日 10:17:29 UTC (rev 9480)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <definitions name="Wiki"
- targetNamespace="http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"
+ targetNamespace="http://phpwiki.sourceforge.net/PhpWiki.wsdl"
 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://phpwiki.nmu.alcatel.fr/phpwiki/PhpWiki.wsdl"
+ xmlns:tns="http://phpwiki.sourceforge.net/PhpWiki.wsdl"
 xmlns:xsd="http://www.w3.org/1999/XMLSchema"
 xmlns="http://schemas.xmlsoap.org/wsdl/"
 >
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9479
 http://sourceforge.net/p/phpwiki/code/9479
Author: vargenau
Date: 2015年01月15日 14:06:13 +0000 (2015年1月15日)
Log Message:
-----------
Change template syntax to please Template engine
Modified Paths:
--------------
 trunk/themes/Crao/templates/editpage.tmpl
 trunk/themes/Wordpress/templates/editpage.tmpl
 trunk/themes/default/templates/editpage.tmpl
 trunk/themes/fusionforge/templates/editpage.tmpl
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2015年01月14日 16:37:46 UTC (rev 9478)
+++ trunk/themes/Crao/templates/editpage.tmpl	2015年01月15日 14:06:13 UTC (rev 9479)
@@ -21,7 +21,12 @@
 <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
 <br class="clear-floats" />
 <table class="fullwidth">
- <tr><td><?php if (isset($EDIT_TOOLBAR)) echo $EDIT_TOOLBAR ?></td>
+ <tr>
+ <td>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
+ </td>
 <td class="align-right"><div id="editarea-size">
 <?php echo _("Size")._(":") ?>
 <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2015年01月14日 16:37:46 UTC (rev 9478)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2015年01月15日 14:06:13 UTC (rev 9479)
@@ -22,7 +22,12 @@
 </tr>
 </table>
 <table class="fullwidth">
- <tr><td><?php echo $EDIT_TOOLBAR ?></td>
+ <tr>
+ <td>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
+ </td>
 <td class="align-right"><div id="editarea-size">
 <?php echo _("Size")._(":") ?>
 <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2015年01月14日 16:37:46 UTC (rev 9478)
+++ trunk/themes/default/templates/editpage.tmpl	2015年01月15日 14:06:13 UTC (rev 9479)
@@ -21,10 +21,11 @@
 <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
 <br class="clear-floats" />
 <table class="fullwidth">
- <tr><td>
- <?php if (isset($EDIT_TOOLBAR)) { ?>
- <?php echo $EDIT_TOOLBAR ?>
- <?php } ?>
+ <tr>
+ <td>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
 </td>
 <td class="align-right"><div id="editarea-size">
 <?php echo _("Size")._(":") ?>
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2015年01月14日 16:37:46 UTC (rev 9478)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2015年01月15日 14:06:13 UTC (rev 9479)
@@ -64,7 +64,12 @@
 <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
 <br class="clear-floats" />
 <table class="fullwidth">
- <tr><td><?php if (isset($EDIT_TOOLBAR)) echo $EDIT_TOOLBAR ?></td>
+ <tr>
+ <td>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
+ </td>
 <td class="align-right"><div id="editarea-size">
 <?php echo _("Size")._(":") ?>
 <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9478
 http://sourceforge.net/p/phpwiki/code/9478
Author: vargenau
Date: 2015年01月14日 16:37:46 +0000 (2015年1月14日)
Log Message:
-----------
functions most_popular and most_recent are public
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/ADODB.php
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiDB/backend/PearDB.php
 trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
 trunk/lib/WikiDB/backend/cvs.php
 trunk/lib/WikiDB/backend.php
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2015年01月14日 15:48:57 UTC (rev 9477)
+++ trunk/lib/WikiDB/backend/ADODB.php	2015年01月14日 16:37:46 UTC (rev 9478)
@@ -974,7 +974,7 @@
 /**
 * Find highest or lowest hit counts.
 */
- function most_popular($limit = 20, $sortby = '-hits')
+ public function most_popular($limit = 20, $sortby = '-hits')
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
@@ -1010,7 +1010,7 @@
 /**
 * Find recent changes.
 */
- function most_recent($params)
+ public function most_recent($params)
 {
 $limit = 0;
 $since = 0;
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2015年01月14日 15:48:57 UTC (rev 9477)
+++ trunk/lib/WikiDB/backend/PDO.php	2015年01月14日 16:37:46 UTC (rev 9478)
@@ -948,7 +948,7 @@
 /**
 * Find highest or lowest hit counts.
 */
- function most_popular($limit = 20, $sortby = '-hits')
+ public function most_popular($limit = 20, $sortby = '-hits')
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
@@ -984,7 +984,7 @@
 /**
 * Find recent changes.
 */
- function most_recent($params)
+ public function most_recent($params)
 {
 $limit = 0;
 $since = 0;
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2015年01月14日 15:48:57 UTC (rev 9477)
+++ trunk/lib/WikiDB/backend/PearDB.php	2015年01月14日 16:37:46 UTC (rev 9478)
@@ -798,7 +798,7 @@
 /**
 * Find highest or lowest hit counts.
 */
- function most_popular($limit = 20, $sortby = '-hits')
+ public function most_popular($limit = 20, $sortby = '-hits')
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
@@ -836,7 +836,7 @@
 /**
 * Find recent changes.
 */
- function most_recent($params)
+ public function most_recent($params)
 {
 $limit = 0;
 $since = 0;
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年01月14日 15:48:57 UTC (rev 9477)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015年01月14日 16:37:46 UTC (rev 9478)
@@ -385,7 +385,7 @@
 return new WikiDB_backend_PearDB_iter($this, $result, $options);
 }
 
- function most_popular($limit = 20, $sortby = '-hits')
+ public function most_popular($limit = 20, $sortby = '-hits')
 {
 $dbh = &$this->_dbh;
 extract($this->_table_names);
@@ -424,7 +424,7 @@
 return new WikiDB_backend_PearDB_iter($this, $result);
 }
 
- function most_recent($params)
+ public function most_recent($params)
 {
 $limit = 0;
 $since = 0;
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php	2015年01月14日 15:48:57 UTC (rev 9477)
+++ trunk/lib/WikiDB/backend/cvs.php	2015年01月14日 16:37:46 UTC (rev 9478)
@@ -432,7 +432,7 @@
 }
 }
 
- function most_popular($limit, $sortby = '')
+ public function most_popular($limit = 20, $sortby = '')
 {
 // TODO: needs to be tested ...
 $mp = $this->_getMostPopular();
@@ -455,7 +455,7 @@
 * This only accepts the 'since' and 'limit' attributes, everything
 * else is ignored.
 */
- function most_recent($params)
+ public function most_recent($params)
 {
 // TODO: needs to be tested ...
 // most recent are those pages with the highest time value ...
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2015年01月14日 15:48:57 UTC (rev 9477)
+++ trunk/lib/WikiDB/backend.php	2015年01月14日 16:37:46 UTC (rev 9478)
@@ -388,7 +388,7 @@
 * @param string $sortby
 * @return object A WikiDB_backend_iterator.
 */
- protected function most_popular($limit, $sortby = '-hits')
+ public function most_popular($limit = 20, $sortby = '-hits')
 {
 // This is method fetches all pages, then
 // sorts them by hit count.
@@ -409,7 +409,7 @@
 * @return object A WikiDB_backend_iterator.
 * @see WikiDB::mostRecent
 */
- protected function most_recent($params)
+ public function most_recent($params)
 {
 // This method is very inefficient and searches through
 // all pages for the most recent changes.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.