phpwiki-checkins Mailing List for PhpWiki

Revision: 9732
 http://sourceforge.net/p/phpwiki/code/9732
Author: vargenau
Date: 2015年09月23日 08:37:53 +0000 (2015年9月23日)
Log Message:
-----------
Update ReleaseNotes
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年09月23日 08:32:30 UTC (rev 9731)
+++ trunk/pgsrc/ReleaseNotes	2015年09月23日 08:37:53 UTC (rev 9732)
@@ -1,4 +1,4 @@
-Date: Mon, 7 Sep 2015 18:26:37 +0000
+Date: 2015年9月23日 10:35:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -14,6 +14,9 @@
 * Remove access keys
 * Check MAX_PAGENAME_LENGTH in CreatePage
 * Fix fatal database error with multiple comma-delimited sortby args
+* Remove forbidden characters: ~<~>~[~]~{~}~"~|~# from pagename
+* New property: ALLOWED_LOAD giving list of directories from which it is allowed to load pages.
+* Upload: replace multiple spaces by single space
 
 == 1.5.4 2015年06月29日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9731
 http://sourceforge.net/p/phpwiki/code/9731
Author: vargenau
Date: 2015年09月23日 08:32:30 +0000 (2015年9月23日)
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年09月22日 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/de.po	2015年09月23日 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
+"POT-Creation-Date: 2015年09月23日 10:31+0200\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."
@@ -719,6 +719,10 @@
 msgstr "Ungültiger Dateityp: %s"
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading "%s""
 msgstr "»%s« wird geladen"
 
@@ -3262,7 +3266,9 @@
 msgid "File successfully uploaded."
 msgstr "Datei erfolgreich hochgeladen."
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年09月22日 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/es.po	2015年09月23日 08:32:30 UTC (rev 9731)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
+"POT-Creation-Date: 2015年09月23日 10:31+0200\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -702,6 +702,10 @@
 msgstr "Mal tipo del archivo: %s"
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading "%s""
 msgstr ""%s" que carga"
 
@@ -3170,7 +3174,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年09月22日 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/fr.po	2015年09月23日 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
+"POT-Creation-Date: 2015年09月23日 10:31+0200\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."
@@ -709,6 +709,10 @@
 msgstr "Mauvais type de fichier : %s"
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr "Pas dans la liste autorisée. Impossible de charger : %s"
+
+#, php-format
 msgid "Loading "%s""
 msgstr "Chargement de « %s »"
 
@@ -3225,10 +3229,13 @@
 msgid "File successfully uploaded."
 msgstr "Fichier téléchargé avec succès."
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
-"Note : certains caractères interdits dans les noms de fichier ont été "
-"remplacés par des tirets."
+"Note : le nom de fichier a été purifié : suppression des espaces au début et "
+"à la fin, espaces multiples remplacés par un espace unique, caractères "
+"interdits remplacés par des tirets."
 
 #, php-format
 msgid "uploaded %s"
@@ -6013,7 +6020,7 @@
 msgstr "Mettre à jour"
 
 #~ msgid "Click a button to get an example text"
-#~ msgstr "Cliquer sur un bouton pour obtenir une exemple de texte"
+#~ msgstr "Cliquer sur un bouton pour obtenir un exemple de texte"
 
 #~ msgid "Adjust"
 #~ msgstr "Ajuster"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年09月22日 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/it.po	2015年09月23日 08:32:30 UTC (rev 9731)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
+"POT-Creation-Date: 2015年09月23日 10:31+0200\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"
@@ -691,6 +691,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading "%s""
 msgstr ""
 
@@ -3143,7 +3147,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年09月22日 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/ja.po	2015年09月23日 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
+"POT-Creation-Date: 2015年09月23日 10:31+0200\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -680,6 +680,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading "%s""
 msgstr ""%s" を読込み中です。"
 
@@ -3184,7 +3188,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, fuzzy, php-format
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年09月22日 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/nl.po	2015年09月23日 08:32:30 UTC (rev 9731)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
+"POT-Creation-Date: 2015年09月23日 10:31+0200\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -680,6 +680,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading "%s""
 msgstr ""
 
@@ -3133,7 +3137,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年09月22日 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/phpwiki.pot	2015年09月23日 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
+"POT-Creation-Date: 2015年09月23日 10:31+0200\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -674,6 +674,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading "%s""
 msgstr ""
 
@@ -3125,7 +3129,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年09月22日 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/sv.po	2015年09月23日 08:32:30 UTC (rev 9731)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
+"POT-Creation-Date: 2015年09月23日 10:31+0200\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -675,6 +675,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading "%s""
 msgstr ""
 
@@ -3126,7 +3130,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年09月22日 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/zh.po	2015年09月23日 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
+"POT-Creation-Date: 2015年09月23日 10:31+0200\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -706,6 +706,10 @@
 msgstr "錯誤的檔案型態: %s"
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading "%s""
 msgstr "載入 "%s""
 
@@ -3258,7 +3262,9 @@
 msgid "File successfully uploaded."
 msgstr "檔案已經成功地上傳."
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format
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: 9730
 http://sourceforge.net/p/phpwiki/code/9730
Author: vargenau
Date: 2015年09月22日 15:51:48 +0000 (2015年9月22日)
Log Message:
-----------
Upload: replace multiple spaces by single space
Modified Paths:
--------------
 trunk/lib/plugin/UpLoad.php
 trunk/lib/stdlib.php
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2015年09月22日 15:27:07 UTC (rev 9729)
+++ trunk/lib/plugin/UpLoad.php	2015年09月22日 15:51:48 UTC (rev 9730)
@@ -129,7 +129,7 @@
 $userfile = $request->getUploadedFile('userfile');
 if ($userfile) {
 $userfile_name = $userfile->getName();
- $userfile_name = trim(basename($userfile_name));
+ $userfile_name = basename($userfile_name);
 if (UPLOAD_USERDIR) {
 $username = $request->_user->_userid;
 $file_dir .= $username;
@@ -197,7 +197,7 @@
 $message->pushContent(HTML::div(array('class' => 'feedback'),
 HTML::p(_("File successfully uploaded.")),
 HTML::p($link),
- HTML::p(_("Note: some forbidden characters in filename have been replaced by dash."))));
+ HTML::p(_("Note: filename was sanified: spaces from beginning and end removed, multiple spaces replaced by one, forbidden characters replaced by dash."))));
 } else {
 $message->pushContent(HTML::div(array('class' => 'feedback'),
 HTML::p(_("File successfully uploaded.")),
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2015年09月22日 15:27:07 UTC (rev 9729)
+++ trunk/lib/stdlib.php	2015年09月22日 15:51:48 UTC (rev 9730)
@@ -2113,10 +2113,15 @@
 }
 
 /**
- * Sanify filename: replace all disallowed characters with dashes
+ * Sanify filename: 
+ * - remove spaces from the beginning and end
+ * - replace multiple spaces by single space
+ * - replace all disallowed characters with dashes
 */
 function sanify_filename($filename)
 {
+ $filename = trim($filename);
+ $filename = preg_replace('!\s+!', ' ', $filename);
 return mb_ereg_replace('[^\w\. \-]', '-', $filename);
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9729
 http://sourceforge.net/p/phpwiki/code/9729
Author: vargenau
Date: 2015年09月22日 15:27:07 +0000 (2015年9月22日)
Log Message:
-----------
New property: ALLOWED_LOAD giving list of directories from which it is allowed to load pages.
Modified Paths:
--------------
 trunk/config/config-default.ini
 trunk/config/config-dist.ini
 trunk/configurator.php
 trunk/g
 trunk/lib/loadsave.php
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2015年09月22日 13:32:45 UTC (rev 9728)
+++ trunk/config/config-default.ini	2015年09月22日 15:27:07 UTC (rev 9729)
@@ -160,6 +160,7 @@
 ; VIRTUAL_PATH = 
 ; USE_PATH_INFO = 
 ; TEMP_DIR = /tmp
+; ALLOWED_LOAD = /tmp
 
 DISABLE_HTTP_REDIRECT = false
 DISABLE_GETIMAGESIZE = false
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2015年09月22日 13:32:45 UTC (rev 9728)
+++ trunk/config/config-dist.ini	2015年09月22日 15:27:07 UTC (rev 9729)
@@ -1106,6 +1106,11 @@
 ; better provide it here. E.g. needed for zipdumps.
 ;TEMP_DIR = /tmp
 
+; List of directories from which it is allowed to load pages
+; Directories are separated with ":"
+; It is always allowed to load from pgsrc directories
+;ALLOWED_LOAD = /tmp
+
 ;===========================================================================
 ; Part Seven: Miscellaneous settings
 ;===========================================================================
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2015年09月22日 13:32:45 UTC (rev 9728)
+++ trunk/configurator.php	2015年09月22日 15:27:07 UTC (rev 9729)
@@ -1487,6 +1487,10 @@
 $properties["TEMP_DIR"] =
 new _define_optional('TEMP_DIR', $temp);
 
+$properties["Allowed Load"] =
+ new _define_commented_optional('ALLOWED_LOAD', '/tmp',
+ 'List of directories from which it is allowed to load pages. Directories are separated with ":"');
+
 ///////////////////
 
 $properties["Part Seven"] =
Modified: trunk/g
===================================================================
--- trunk/g	2015年09月22日 13:32:45 UTC (rev 9728)
+++ trunk/g	2015年09月22日 15:27:07 UTC (rev 9729)
@@ -150,6 +150,9 @@
 // Do not use a directory per user but only one (per project)
 define('UPLOAD_USERDIR', false);
 
+ // Allow Load File only from /tmp
+ define('ALLOWED_LOAD', '/tmp');
+
 // Use black list of extensions instead of white list
 define('DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', true);
 
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015年09月22日 13:32:45 UTC (rev 9728)
+++ trunk/lib/loadsave.php	2015年09月22日 15:27:07 UTC (rev 9729)
@@ -1447,8 +1447,29 @@
 function LoadFileOrDir(&$request)
 {
 $source = $request->getArg('source');
- $finder = new FileFinder;
+ $finder = new FileFinder();
 $source = $finder->slashifyPath($source);
+ if (!(defined('ALLOWED_LOAD'))) {
+ define('ALLOWED_LOAD', '/tmp');
+ }
+ $allowed_dirs = explode(':', ALLOWED_LOAD);
+ if ($source[0] == '/') { // Absolute path
+ $allowed = false;
+ foreach ($allowed_dirs as $path) {
+ if (string_starts_with($source, $path)) {
+ $allowed = true;
+ }
+ }
+ if (!$allowed) {
+ $html = HTML::p(array('class' => 'error'),
+ _("Fatal PhpWiki Error")._(': ')
+ .sprintf(_("Not in allowed list. Unable to load: %s"), $source));
+ GeneratePage($html, $request->_deducePagename());
+ flush();
+ return;
+ }
+ }
+
 StartLoadDump($request, sprintf(_("Loading "%s""), $source));
 LoadAny($request, $source);
 EndLoadDump($request);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9728
 http://sourceforge.net/p/phpwiki/code/9728
Author: vargenau
Date: 2015年09月22日 13:32:45 +0000 (2015年9月22日)
Log Message:
-----------
Use class="error" for fail_message
Modified Paths:
--------------
 trunk/themes/default/templates/login.tmpl
Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2015年09月16日 16:48:10 UTC (rev 9727)
+++ trunk/themes/default/templates/login.tmpl	2015年09月22日 13:32:45 UTC (rev 9728)
@@ -1,5 +1,5 @@
 <?php if ($fail_message) { ?>
- <p><strong><?php echo $fail_message?></strong></p>
+ <p class="error"><?php echo $fail_message?></p>
 <hr />
 <?php } ?>
 <br class="clear-floats" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9727
 http://sourceforge.net/p/phpwiki/code/9727
Author: vargenau
Date: 2015年09月16日 16:48:10 +0000 (2015年9月16日)
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年09月16日 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/de.po	2015年09月16日 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年08月20日 18:25+0200\n"
+"POT-Creation-Date: 2015年09月16日 18:47+0200\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."
@@ -700,14 +700,17 @@
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
 
-#, fuzzy
 msgid "Cannot open ZIP archive for reading"
-msgstr "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen"
+msgstr "Konnte ZIP-Datei nicht zum Lesen öffnen"
 
 msgid "Skipping"
 msgstr "Übersprungen"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -955,6 +958,10 @@
 msgid "%s: Bad action"
 msgstr "%s: Ungültige Aktion"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr "Ungültiges Zeichen %s entfernt"
+
 msgid "PageDump"
 msgstr "SeiteSpeichern"
 
@@ -4569,10 +4576,6 @@
 msgid "Control characters not allowed"
 msgstr "Steuerzeichen nicht erlaubt"
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr "Ungültiges Zeichen %s entfernt"
-
 msgid "Revision Not Found"
 msgstr "Version nicht gefunden"
 
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年09月16日 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/es.po	2015年09月16日 16:48:10 UTC (rev 9727)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年08月20日 18:25+0200\n"
+"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -690,6 +690,10 @@
 msgstr "El saltar"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -935,6 +939,10 @@
 msgid "%s: Bad action"
 msgstr "%s: Mala acción"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr "Los carbones ilegales %s quitaron"
+
 msgid "PageDump"
 msgstr "DescargeDeLaPágina"
 
@@ -4445,10 +4453,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr "Los carbones ilegales %s quitaron"
-
 msgid "Revision Not Found"
 msgstr "Revisión No encontrada"
 
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年09月16日 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/fr.po	2015年09月16日 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年08月20日 18:25+0200\n"
+"POT-Creation-Date: 2015年09月16日 18:47+0200\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."
@@ -697,6 +697,10 @@
 msgstr "Ignoré"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr "Source inexistante. Impossible de charger : %s"
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr "Source vide ou inexistante. Impossible de charger : %s"
 
@@ -940,6 +944,10 @@
 msgid "%s: Bad action"
 msgstr "%s : mauvaise action"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr "Caractères interdits %s supprimés"
+
 msgid "PageDump"
 msgstr "RécupérationDeLaPage"
 
@@ -4526,10 +4534,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr "Caractères interdits %s supprimés"
-
 msgid "Revision Not Found"
 msgstr "Version non trouvée"
 
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年09月16日 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/it.po	2015年09月16日 16:48:10 UTC (rev 9727)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年08月20日 18:25+0200\n"
+"POT-Creation-Date: 2015年09月16日 18:47+0200\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"
@@ -679,6 +679,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -921,6 +925,10 @@
 msgid "%s: Bad action"
 msgstr ""
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4409,10 +4417,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr ""
 
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年09月16日 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/ja.po	2015年09月16日 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年08月20日 18:25+0200\n"
+"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -668,6 +668,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -919,6 +923,10 @@
 msgid "%s: Bad action"
 msgstr "%s: 正しくない操作です。"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4547,10 +4555,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr "リビジョンが見つかりません"
 
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年09月16日 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/nl.po	2015年09月16日 16:48:10 UTC (rev 9727)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年08月20日 18:25+0200\n"
+"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -668,6 +668,10 @@
 msgstr "Overgeslagen"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -910,6 +914,10 @@
 msgid "%s: Bad action"
 msgstr ""
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4399,10 +4407,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr ""
 
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年09月16日 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/phpwiki.pot	2015年09月16日 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年08月20日 18:25+0200\n"
+"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -662,6 +662,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -904,6 +908,10 @@
 msgid "%s: Bad action"
 msgstr ""
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4391,10 +4399,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr ""
 
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年09月16日 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/sv.po	2015年09月16日 16:48:10 UTC (rev 9727)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年08月20日 18:25+0200\n"
+"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -663,6 +663,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -905,6 +909,10 @@
 msgid "%s: Bad action"
 msgstr ""
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4392,10 +4400,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr ""
 
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年09月16日 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/zh.po	2015年09月16日 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年08月20日 18:25+0200\n"
+"POT-Creation-Date: 2015年09月16日 18:47+0200\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -694,6 +694,10 @@
 msgstr "跳過"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -945,6 +949,10 @@
 msgid "%s: Bad action"
 msgstr "%s: 錯誤的動作"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4625,10 +4633,6 @@
 msgid "Control characters not allowed"
 msgstr "控制字元是不被允許的"
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr "修訂未找到"
 
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: 9726
 http://sourceforge.net/p/phpwiki/code/9726
Author: vargenau
Date: 2015年09月16日 16:32:27 +0000 (2015年9月16日)
Log Message:
-----------
New function: close_tags
Modified Paths:
--------------
 trunk/lib/loadsave.php
 trunk/lib/main.php
 trunk/lib/stdlib.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015年09月16日 10:17:38 UTC (rev 9725)
+++ trunk/lib/loadsave.php	2015年09月16日 16:32:27 UTC (rev 9726)
@@ -63,8 +63,6 @@
 */
 function EndLoadDump(&$request)
 {
- global $WikiTheme;
-
 $action = $request->getArg('action');
 if ($action == 'browse') // loading virgin
 $pagelink = WikiLink(HOME_PAGE);
@@ -98,36 +96,7 @@
 
 PrintXML(HTML::p(HTML::strong(_("Complete."))),
 HTML::p(fmt("Return to %s", $pagelink)));
- // Ugly hack to get valid XHTML code
- if (is_a($WikiTheme, 'WikiTheme_fusionforge')) {
- echo "</div>\n";
- echo "</div>\n";
- echo "</main>\n";
- echo "</div>\n";
- } elseif (is_a($WikiTheme, 'WikiTheme_Sidebar')
- or is_a($WikiTheme, 'WikiTheme_MonoBook')
- ) {
- echo "</div>\n";
- echo "</div>\n";
- echo "</div>\n";
- echo "</div>\n";
- } elseif (is_a($WikiTheme, 'WikiTheme_wikilens')) {
- echo "</div>\n";
- echo "</td>\n";
- echo "</tr>\n";
- echo "</table>\n";
- } elseif (is_a($WikiTheme, 'WikiTheme_blog')) {
- echo "</div>\n";
- echo "</div>\n";
- } elseif (is_a($WikiTheme, 'WikiTheme_Crao')
- or is_a($WikiTheme, 'WikiTheme_Hawaiian')
- or is_a($WikiTheme, 'WikiTheme_MacOSX')
- or is_a($WikiTheme, 'WikiTheme_shamino_com')
- or is_a($WikiTheme, 'WikiTheme_smaller')
- ) {
- echo "</div>\n";
- }
- echo "</body></html>\n";
+ close_tags(); // HACK
 }
 
 ////////////////////////////////////////////////////////////////
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015年09月16日 10:17:38 UTC (rev 9725)
+++ trunk/lib/main.php	2015年09月16日 16:32:27 UTC (rev 9726)
@@ -849,8 +849,7 @@
 if (!empty($errormsg)) {
 PrintXML(HTML::p(array('class' => 'error'), 
 _("Fatal PhpWiki Error")._(': ').$errormsg));
- // HACK:
- echo "\n</div>\n</div>\n</div>\n</div>\n</body>\n</html>";
+ close_tags(); // HACK
 }
 if (is_object($this->_user)) {
 $this->_user->page = $this->getArg('pagename');
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2015年09月16日 10:17:38 UTC (rev 9725)
+++ trunk/lib/stdlib.php	2015年09月16日 16:32:27 UTC (rev 9726)
@@ -2119,3 +2119,42 @@
 {
 return mb_ereg_replace('[^\w\. \-]', '-', $filename);
 }
+
+/**
+ * Close all open tags depending on WikiTheme
+ */
+function close_tags()
+{
+ global $WikiTheme;
+
+ // Ugly hack to get valid XHTML code
+ if (is_a($WikiTheme, 'WikiTheme_fusionforge')) {
+ echo "</div>\n";
+ echo "</div>\n";
+ echo "</main>\n";
+ echo "</div>\n";
+ } elseif (is_a($WikiTheme, 'WikiTheme_Sidebar')
+ or is_a($WikiTheme, 'WikiTheme_MonoBook')
+ ) {
+ echo "</div>\n";
+ echo "</div>\n";
+ echo "</div>\n";
+ echo "</div>\n";
+ } elseif (is_a($WikiTheme, 'WikiTheme_wikilens')) {
+ echo "</div>\n";
+ echo "</td>\n";
+ echo "</tr>\n";
+ echo "</table>\n";
+ } elseif (is_a($WikiTheme, 'WikiTheme_blog')) {
+ echo "</div>\n";
+ echo "</div>\n";
+ } elseif (is_a($WikiTheme, 'WikiTheme_Crao')
+ or is_a($WikiTheme, 'WikiTheme_Hawaiian')
+ or is_a($WikiTheme, 'WikiTheme_MacOSX')
+ or is_a($WikiTheme, 'WikiTheme_shamino_com')
+ or is_a($WikiTheme, 'WikiTheme_smaller')
+ ) {
+ echo "</div>\n";
+ }
+ echo "</body></html>\n";
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9725
 http://sourceforge.net/p/phpwiki/code/9725
Author: vargenau
Date: 2015年09月16日 10:17:38 +0000 (2015年9月16日)
Log Message:
-----------
Use class error for Fatal PhpWiki Error message
Modified Paths:
--------------
 trunk/lib/main.php
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015年09月16日 09:45:49 UTC (rev 9724)
+++ trunk/lib/main.php	2015年09月16日 10:17:38 UTC (rev 9725)
@@ -778,13 +778,13 @@
 $pagename = $page->getName();
 if (strlen($pagename) > MAX_PAGENAME_LENGTH) {
 $pagename = substr($pagename, 0, MAX_PAGENAME_LENGTH - 1) . '...';
- $CONTENT = HTML::div(array('class' => 'error'),
+ $CONTENT = HTML::p(array('class' => 'error'),
 _('Page name too long'));
 GeneratePage($CONTENT, $pagename);
 $this->finish();
 }
 if (preg_match("/[<\[\{\|\"\}\]>]/", $pagename, $matches) > 0) {
- $CONTENT = HTML::div(
+ $CONTENT = HTML::p(
 array('class' => 'error'),
 sprintf(_("Illegal character "%s" in page name."),
 $matches[0]));
@@ -847,12 +847,10 @@
 $ErrorManager->flushPostponedErrors();
 
 if (!empty($errormsg)) {
- PrintXML(HTML::br(),
- HTML::hr(),
- HTML::h2(_("Fatal PhpWiki Error")),
- $errormsg);
+ PrintXML(HTML::p(array('class' => 'error'), 
+ _("Fatal PhpWiki Error")._(': ').$errormsg));
 // HACK:
- echo "\n</body></html>";
+ echo "\n</div>\n</div>\n</div>\n</div>\n</body>\n</html>";
 }
 if (is_object($this->_user)) {
 $this->_user->page = $this->getArg('pagename');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9724
 http://sourceforge.net/p/phpwiki/code/9724
Author: vargenau
Date: 2015年09月16日 09:45:49 +0000 (2015年9月16日)
Log Message:
-----------
Check that file to load exists
Modified Paths:
--------------
 trunk/lib/loadsave.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015年09月16日 09:23:24 UTC (rev 9723)
+++ trunk/lib/loadsave.php	2015年09月16日 09:45:49 UTC (rev 9724)
@@ -1443,6 +1443,10 @@
 }
 }
 
+ if (!file_exists($file_or_dir)) {
+ $request->finish(fmt("Not existing source. Unable to load: %s", $file_or_dir));
+ }
+
 $type = filetype($file_or_dir);
 if ($type == 'link') {
 // For symbolic links, use stat() to determine
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9723
 http://sourceforge.net/p/phpwiki/code/9723
Author: vargenau
Date: 2015年09月16日 09:23:24 +0000 (2015年9月16日)
Log Message:
-----------
Remove forbidden characters: <>[]{}"|# from pagename
Modified Paths:
--------------
 trunk/lib/main.php
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015年09月10日 16:42:44 UTC (rev 9722)
+++ trunk/lib/main.php	2015年09月16日 09:23:24 UTC (rev 9723)
@@ -874,8 +874,17 @@
 */
 function _deducePagename()
 {
- if (trim(rawurldecode($this->getArg('pagename'))))
- return rawurldecode($this->getArg('pagename'));
+ $raw_name = trim(rawurldecode($this->getArg('pagename')));
+ if ($raw_name) {
+ // Remove forbidden characters: <>[]{}"|#
+ $forbidden = array('<', '>', '[', ']', '{', '}', '"', '|', '#');
+ $safe_name = str_replace($forbidden, '', $raw_name);
+ if ($safe_name != $raw_name) {
+ trigger_error(sprintf(_('Illegal chars %s removed'),
+ '<>[]{}"|#'));
+ }
+ return $safe_name;
+ }
 
 if (USE_PATH_INFO) {
 $pathinfo = $this->get('PATH_INFO');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9722
 http://sourceforge.net/p/phpwiki/code/9722
Author: vargenau
Date: 2015年09月10日 16:42:44 +0000 (2015年9月10日)
Log Message:
-----------
Add public/private
Modified Paths:
--------------
 trunk/lib/FileFinder.php
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2015年09月07日 16:35:27 UTC (rev 9721)
+++ trunk/lib/FileFinder.php	2015年09月10日 16:42:44 UTC (rev 9722)
@@ -33,7 +33,7 @@
 * @param bool $missing_okay
 * @return string The filename (including path), if found, otherwise false.
 */
- function findFile($file, $missing_okay = false)
+ public function findFile($file, $missing_okay = false)
 {
 if ($this->_is_abs($file)) {
 if (file_exists($file))
@@ -52,7 +52,7 @@
 * @param string $path
 * @return mixed|string
 */
- function slashifyPath($path)
+ public function slashifyPath($path)
 {
 return $this->forcePathSlashes($path, $this->_pathsep);
 }
@@ -64,7 +64,7 @@
 * @param string $sep
 * @return mixed|string
 */
- function forcePathSlashes($path, $sep = '/')
+ public function forcePathSlashes($path, $sep = '/')
 {
 if (is_array($path)) {
 $result = array();
@@ -99,7 +99,7 @@
 * @param string $file File to include.
 * @return bool True if file was successfully included.
 */
- function includeOnce($file)
+ public function includeOnce($file)
 {
 if (($ret = @include_once($file)))
 return $ret;
@@ -113,7 +113,7 @@
 return $this->_not_found($file);
 }
 
- function _isOtherPathsep()
+ private function _isOtherPathsep()
 {
 return $this->_pathsep != '/';
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9721
 http://sourceforge.net/p/phpwiki/code/9721
Author: vargenau
Date: 2015年09月07日 16:35:27 +0000 (2015年9月07日)
Log Message:
-----------
Spelling
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
 trunk/lib/plugin/UnfoldSubpages.php
 trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2015年09月07日 16:28:13 UTC (rev 9720)
+++ trunk/lib/WikiTheme.php	2015年09月07日 16:35:27 UTC (rev 9721)
@@ -37,7 +37,7 @@
 *
 * @param string $type
 * One of:<dl>
- * <dt>'unknown'</dt><dd>Make link appropriate for a non-existant page.</dd>
+ * <dt>'unknown'</dt><dd>Make link appropriate for a nonexistent page.</dd>
 * <dt>'known'</dt><dd>Make link appropriate for an existing page.</dd>
 * <dt>'auto'</dt><dd>Either 'unknown' or 'known' as appropriate.</dd>
 * <dt>'button'</dt><dd>Make a button-style link.</dd>
Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2015年09月07日 16:28:13 UTC (rev 9720)
+++ trunk/lib/plugin/UnfoldSubpages.php	2015年09月07日 16:35:27 UTC (rev 9721)
@@ -23,7 +23,7 @@
 /**
 * UnfoldSubpages: Lists the content of all SubPages of the current page.
 * This is e.g. useful for the CalendarPlugin, to see all entries at once.
- * Warning: Better don't use it with non-existant sections!
+ * Warning: Better don't use it with nonexistent sections!
 * The section extractor is currently quite unstable.
 * Usage: <<UnfoldSubpages sortby=-mtime words=50 maxpages=5 >>
 * Author: Reini Urban <ru...@x-...>
@@ -110,7 +110,7 @@
 $cpagename));
 }
 
- // trap any remaining nonexistant subpages
+ // Trap any remaining nonexistent subpages
 if ($page->exists()) {
 $r = $page->getCurrentRevision();
 $c = $r->getContent(); // array of lines
Modified: trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FUnfoldSubpagesPlugin	2015年09月07日 16:28:13 UTC (rev 9720)
+++ trunk/pgsrc/Help%2FUnfoldSubpagesPlugin	2015年09月07日 16:35:27 UTC (rev 9721)
@@ -1,4 +1,4 @@
-Date: 2015年6月29日 12:04:28 +0000
+Date: Mon, 7 Sep 2015 18:33:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FUnfoldSubpagesPlugin;
@@ -10,7 +10,7 @@
 of the current or a given page. This gives an overview for a
 [[Help:WikiBlogPlugin]], [[Help:CalendarPlugin]] or similar subpages.
 
-Warning: Don't use it with subpages with non-existant sections!
+Warning: Don't use it with subpages with nonexistent sections!
 The section extractor is currently quite unstable.
 
 == Usage ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9720
 http://sourceforge.net/p/phpwiki/code/9720
Author: vargenau
Date: 2015年09月07日 16:28:13 +0000 (2015年9月07日)
Log Message:
-----------
Fix fatal database error with multiple comma-delimited sortby args
Modified Paths:
--------------
 trunk/lib/WikiDB/backend.php
 trunk/pgsrc/ReleaseNotes
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2015年09月07日 09:29:25 UTC (rev 9719)
+++ trunk/lib/WikiDB/backend.php	2015年09月07日 16:28:13 UTC (rev 9720)
@@ -589,16 +589,23 @@
 */
 global $request;
 
- if (empty($column))
+ if (empty($column)) {
 return '';
- //support multiple comma-delimited sortby args: "+hits,+pagename"
+ }
+ // Support multiple comma-delimited sortby args: "+hits,+pagename"
 if (strstr($column, ',')) {
 $result = array();
 foreach (explode(',', $column) as $col) {
- if (empty($this))
- $result[] = WikiDB_backend::sortby($col, $action);
- else
- $result[] = $this->sortby($col, $action);
+ if ($col) {
+ if (empty($this)) {
+ $res = WikiDB_backend::sortby($col, $action);
+ } else {
+ $res = $this->sortby($col, $action);
+ }
+ if ($res) {
+ $result[] = $res;
+ }
+ }
 }
 return join(",", $result);
 }
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年09月07日 09:29:25 UTC (rev 9719)
+++ trunk/pgsrc/ReleaseNotes	2015年09月07日 16:28:13 UTC (rev 9720)
@@ -1,4 +1,4 @@
-Date: Mon, 7 Sep 2015 11:28:19 +0000
+Date: Mon, 7 Sep 2015 18:26:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -13,6 +13,7 @@
 * Fix tooltip translation in ~CreateToc plugin
 * Remove access keys
 * Check MAX_PAGENAME_LENGTH in CreatePage
+* Fix fatal database error with multiple comma-delimited sortby args
 
 == 1.5.4 2015年06月29日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9719
 http://sourceforge.net/p/phpwiki/code/9719
Author: vargenau
Date: 2015年09月07日 09:29:25 +0000 (2015年9月07日)
Log Message:
-----------
Check MAX_PAGENAME_LENGTH in CreatePage
Modified Paths:
--------------
 trunk/lib/InlineParser.php
 trunk/lib/plugin/CreatePage.php
 trunk/pgsrc/ReleaseNotes
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2015年08月26日 16:10:37 UTC (rev 9718)
+++ trunk/lib/InlineParser.php	2015年09月07日 09:29:25 UTC (rev 9719)
@@ -332,7 +332,7 @@
 $rawlink = preg_replace("/%2F(%20)+\./i", "%2F.", $rawlink);
 }
 } else {
- // Check page name lenght
+ // Check page name length
 if (!string_starts_with($rawlink, "Upload:")) {
 if (strlen($rawlink) > MAX_PAGENAME_LENGTH) {
 return HTML::span(array('class' => 'error'),
Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2015年08月26日 16:10:37 UTC (rev 9718)
+++ trunk/lib/plugin/CreatePage.php	2015年09月07日 09:29:25 UTC (rev 9719)
@@ -71,6 +71,9 @@
 if (!$s) {
 return $this->error(_("Cannot create page with empty name!"));
 }
+ if (strlen($s) > MAX_PAGENAME_LENGTH) {
+ return $this->error(_("Page name too long"));
+ }
 // TODO: javascript warning if "/" in s
 if ($verify) {
 $head = _("CreatePage failed");
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年08月26日 16:10:37 UTC (rev 9718)
+++ trunk/pgsrc/ReleaseNotes	2015年09月07日 09:29:25 UTC (rev 9719)
@@ -1,4 +1,4 @@
-Date: 2015年8月20日 18:21:22 +0000
+Date: Mon, 7 Sep 2015 11:28:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -12,6 +12,7 @@
 
 * Fix tooltip translation in ~CreateToc plugin
 * Remove access keys
+* Check MAX_PAGENAME_LENGTH in CreatePage
 
 == 1.5.4 2015年06月29日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.