You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
S | M | T | W | T | F | S |
---|---|---|---|---|---|---|
|
1
|
2
|
3
|
4
|
5
|
6
|
7
|
8
|
9
|
10
|
11
|
12
|
13
|
14
|
15
|
16
|
17
|
18
(1) |
19
|
20
|
21
(1) |
22
|
23
(3) |
24
(2) |
25
(2) |
26
|
27
|
28
|
29
|
30
(5) |
31
|
|
|
|
Revision: 10018 http://sourceforge.net/p/phpwiki/code/10018 Author: vargenau Date: 2017年05月30日 15:41:35 +0000 (2017年5月30日) Log Message: ----------- Fix PHP syntax Modified Paths: -------------- trunk/lib/stdlib.php Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017年05月30日 14:55:08 UTC (rev 10017) +++ trunk/lib/stdlib.php 2017年05月30日 15:41:35 UTC (rev 10018) @@ -382,7 +382,7 @@ { // FIXME: Is this needed (or sufficient?) if (!IsSafeURL($url)) { - $link = HTML::span(array('class' => 'error'), _('Bad URL').' -- '._('Remove all of <, >, "'); + $link = HTML::span(array('class' => 'error'), _('Bad URL').' -- '._('Remove all of <, >, "')); return $link; } else { if (!$linktext) @@ -420,7 +420,7 @@ $arr = explode(' ', $url); if (!empty($arr)) $url = $arr[0]; if (!IsSafeURL($url)) { - $link = HTML::span(array('class' => 'error'), _('Bad URL for image').' -- '._('Remove all of <, >, "'); + $link = HTML::span(array('class' => 'error'), _('Bad URL for image').' -- '._('Remove all of <, >, "')); return $link; } // spaces in inline images must be %20 encoded! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 10017 http://sourceforge.net/p/phpwiki/code/10017 Author: vargenau Date: 2017年05月30日 14:55:08 +0000 (2017年5月30日) Log Message: ----------- More specific error message again Modified Paths: -------------- trunk/lib/stdlib.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/lib/stdlib.php 2017年05月30日 14:55:08 UTC (rev 10017) @@ -382,7 +382,7 @@ { // FIXME: Is this needed (or sufficient?) if (!IsSafeURL($url)) { - $link = HTML::span(array('class' => 'error'), _('Bad URL')); + $link = HTML::span(array('class' => 'error'), _('Bad URL').' -- '._('Remove all of <, >, "'); return $link; } else { if (!$linktext) @@ -420,7 +420,7 @@ $arr = explode(' ', $url); if (!empty($arr)) $url = $arr[0]; if (!IsSafeURL($url)) { - $link = HTML::span(array('class' => 'error'), _('Bad URL for image')); + $link = HTML::span(array('class' => 'error'), _('Bad URL for image').' -- '._('Remove all of <, >, "'); return $link; } // spaces in inline images must be %20 encoded! 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 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/locale/po/de.po 2017年05月30日 14:55:08 UTC (rev 10017) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月24日 19:46+0200\n" +"POT-Creation-Date: 2017年05月30日 16:44+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." @@ -3152,10 +3152,6 @@ msgid "Recursive inclusion of url %s" msgstr "Rekursiver Selbstaufruf der URL %s" -#, php-format -msgid "See: %s" -msgstr "Siehe: %s" - # Transclude is distinct from IncludePage #, php-format msgid "Transcluded from %s" @@ -4548,6 +4544,9 @@ msgid "Bad URL" msgstr "URL Formfehler" +msgid "Remove all of <, >, \"" +msgstr "Entfernen Sie alle Zeichen mit <, >, \"" + msgid "Bad URL for image" msgstr "URL Formfehler für Bild" @@ -6008,6 +6007,9 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "See: %s" +#~ msgstr "Siehe: %s" + #~ msgid "Check for mysql LOCK TABLE privilege" #~ msgstr "Prüfe mysql LOCK TABLE Rechte" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/locale/po/es.po 2017年05月30日 14:55:08 UTC (rev 10017) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月24日 19:46+0200\n" +"POT-Creation-Date: 2017年05月30日 16:44+0200\n" "PO-Revision-Date: 2000年02月01日 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -3063,10 +3063,6 @@ msgstr "" #, php-format -msgid "See: %s" -msgstr "" - -#, php-format msgid "Transcluded from %s" msgstr "" @@ -4416,6 +4412,9 @@ msgid "Bad URL" msgstr "" +msgid "Remove all of <, >, \"" +msgstr "" + msgid "Bad URL for image" msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/locale/po/fr.po 2017年05月30日 14:55:08 UTC (rev 10017) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月24日 19:46+0200\n" +"POT-Creation-Date: 2017年05月30日 16:44+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." @@ -3120,10 +3120,6 @@ msgstr "Insertion récursive de l'URL %s" #, php-format -msgid "See: %s" -msgstr "Voir : %s" - -#, php-format msgid "Transcluded from %s" msgstr "Inséré de %s" @@ -4513,6 +4509,9 @@ msgid "Bad URL" msgstr "URL incorrecte" +msgid "Remove all of <, >, \"" +msgstr "Retirez tous les <, >, \"" + msgid "Bad URL for image" msgstr "URL incorrecte pour l'image" @@ -5947,6 +5946,9 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "See: %s" +#~ msgstr "Voir : %s" + #~ msgid "version <em>%s</em> not affected" #~ msgstr "version <em>%s</em> non affectée" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/locale/po/it.po 2017年05月30日 14:55:08 UTC (rev 10017) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月24日 19:46+0200\n" +"POT-Creation-Date: 2017年05月30日 16:44+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" @@ -3040,10 +3040,6 @@ msgstr "" #, php-format -msgid "See: %s" -msgstr "" - -#, php-format msgid "Transcluded from %s" msgstr "Inserire dalla %s" @@ -4393,6 +4389,9 @@ msgid "Bad URL" msgstr "" +msgid "Remove all of <, >, \"" +msgstr "" + msgid "Bad URL for image" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/locale/po/ja.po 2017年05月30日 14:55:08 UTC (rev 10017) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月24日 19:46+0200\n" +"POT-Creation-Date: 2017年05月30日 16:44+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" @@ -3026,10 +3026,6 @@ msgstr "" #, php-format -msgid "See: %s" -msgstr "参照: %s" - -#, php-format msgid "Transcluded from %s" msgstr "" @@ -4379,6 +4375,9 @@ msgid "Bad URL" msgstr "" +msgid "Remove all of <, >, \"" +msgstr "" + msgid "Bad URL for image" msgstr "" @@ -5769,6 +5768,9 @@ msgid "Edit this page" msgstr "ページを編集しています" +#~ msgid "See: %s" +#~ msgstr "参照: %s" + #~ msgid "Synopsis" #~ msgstr "要約" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/locale/po/nl.po 2017年05月30日 14:55:08 UTC (rev 10017) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月24日 19:46+0200\n" +"POT-Creation-Date: 2017年05月30日 16:44+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" @@ -3032,10 +3032,6 @@ msgstr "" #, php-format -msgid "See: %s" -msgstr "" - -#, php-format msgid "Transcluded from %s" msgstr "" @@ -4385,6 +4381,9 @@ msgid "Bad URL" msgstr "" +msgid "Remove all of <, >, \"" +msgstr "" + msgid "Bad URL for image" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/locale/po/phpwiki.pot 2017年05月30日 14:55:08 UTC (rev 10017) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月24日 19:46+0200\n" +"POT-Creation-Date: 2017年05月30日 16:44+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" @@ -3026,10 +3026,6 @@ msgstr "" #, php-format -msgid "See: %s" -msgstr "" - -#, php-format msgid "Transcluded from %s" msgstr "" @@ -4379,6 +4375,9 @@ msgid "Bad URL" msgstr "" +msgid "Remove all of <, >, \"" +msgstr "" + msgid "Bad URL for image" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/locale/po/sv.po 2017年05月30日 14:55:08 UTC (rev 10017) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月24日 19:46+0200\n" +"POT-Creation-Date: 2017年05月30日 16:44+0200\n" "PO-Revision-Date: 2001年01月27日 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -3027,10 +3027,6 @@ msgstr "" #, php-format -msgid "See: %s" -msgstr "" - -#, php-format msgid "Transcluded from %s" msgstr "" @@ -4380,6 +4376,9 @@ msgid "Bad URL" msgstr "" +msgid "Remove all of <, >, \"" +msgstr "" + msgid "Bad URL for image" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2017年05月30日 14:27:31 UTC (rev 10016) +++ trunk/locale/po/zh.po 2017年05月30日 14:55:08 UTC (rev 10017) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月24日 19:46+0200\n" +"POT-Creation-Date: 2017年05月30日 16:44+0200\n" "PO-Revision-Date: 2004年04月21日 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -3038,10 +3038,6 @@ msgstr "遞迴含括 url %s" #, php-format -msgid "See: %s" -msgstr "參閱: %s" - -#, php-format msgid "Transcluded from %s" msgstr "Transcluded 從 %s" @@ -4396,6 +4392,9 @@ msgid "Bad URL" msgstr "錯誤 URL" +msgid "Remove all of <, >, \"" +msgstr "" + msgid "Bad URL for image" msgstr "" @@ -5799,6 +5798,9 @@ msgid "Edit this page" msgstr "編輯此頁面" +#~ msgid "See: %s" +#~ msgstr "參閱: %s" + #~ msgid "Synopsis" #~ 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: 10016 http://sourceforge.net/p/phpwiki/code/10016 Author: vargenau Date: 2017年05月30日 14:27:31 +0000 (2017年5月30日) Log Message: ----------- IsSafeURL: change default value of $http_only from true to false Modified Paths: -------------- trunk/lib/plugin/Transclude.php trunk/lib/stdlib.php Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2017年05月30日 12:33:34 UTC (rev 10015) +++ trunk/lib/plugin/Transclude.php 2017年05月30日 14:27:31 UTC (rev 10016) @@ -92,7 +92,7 @@ if ($src == $request->getURLtoSelf()) { return $this->error(fmt("Recursive inclusion of url %s", $src)); } - if (!IsSafeURL($src)) { + if (!IsSafeURL($src, true)) { // http or https only return $this->error(_("Bad URL in src")); } Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017年05月30日 12:33:34 UTC (rev 10015) +++ trunk/lib/stdlib.php 2017年05月30日 14:27:31 UTC (rev 10016) @@ -355,7 +355,7 @@ * @param bool $http_only if true, accept only http and https URLs * @return bool true if safe, false else. */ -function IsSafeURL($url, $http_only = true) +function IsSafeURL($url, $http_only = false) { if (preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url)) { return false; @@ -381,7 +381,7 @@ function LinkURL($url, $linktext = '') { // FIXME: Is this needed (or sufficient?) - if (!IsSafeURL($url, false)) { + if (!IsSafeURL($url)) { $link = HTML::span(array('class' => 'error'), _('Bad URL')); return $link; } else { @@ -419,7 +419,7 @@ // Extract URL $arr = explode(' ', $url); if (!empty($arr)) $url = $arr[0]; - if (!IsSafeURL($url, false)) { + if (!IsSafeURL($url)) { $link = HTML::span(array('class' => 'error'), _('Bad URL for image')); return $link; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 10015 http://sourceforge.net/p/phpwiki/code/10015 Author: vargenau Date: 2017年05月30日 12:33:34 +0000 (2017年5月30日) Log Message: ----------- URL for image can be /path/to/image.png Modified Paths: -------------- trunk/lib/stdlib.php Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017年05月30日 09:00:02 UTC (rev 10014) +++ trunk/lib/stdlib.php 2017年05月30日 12:33:34 UTC (rev 10015) @@ -357,10 +357,13 @@ */ function IsSafeURL($url, $http_only = true) { - if (preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url) || (filter_var($url, FILTER_VALIDATE_URL) === false)) { + if (preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url)) { return false; } if ($http_only) { + if (filter_var($url, FILTER_VALIDATE_URL) === false) { + return false; + } $scheme = parse_url($url, PHP_URL_SCHEME); return ($scheme == 'http') || ($scheme == 'https'); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 10014 http://sourceforge.net/p/phpwiki/code/10014 Author: vargenau Date: 2017年05月30日 09:00:02 +0000 (2017年5月30日) Log Message: ----------- URL for image can be /path/to/image.png Modified Paths: -------------- trunk/lib/stdlib.php Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017年05月25日 08:15:06 UTC (rev 10013) +++ trunk/lib/stdlib.php 2017年05月30日 09:00:02 UTC (rev 10014) @@ -416,7 +416,7 @@ // Extract URL $arr = explode(' ', $url); if (!empty($arr)) $url = $arr[0]; - if (!IsSafeURL($url)) { + if (!IsSafeURL($url, false)) { $link = HTML::span(array('class' => 'error'), _('Bad URL for image')); return $link; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 10013 http://sourceforge.net/p/phpwiki/code/10013 Author: vargenau Date: 2017年05月25日 08:15:06 +0000 (2017年5月25日) Log Message: ----------- link rel="copyright" --> link rel="license" Modified Paths: -------------- trunk/themes/Crao/templates/head.tmpl trunk/themes/Crao/templates/htmldump.tmpl trunk/themes/Sidebar/templates/htmldump.tmpl trunk/themes/default/templates/head.tmpl trunk/themes/default/templates/htmldump.tmpl trunk/themes/wikilens/templates/head.tmpl Modified: trunk/themes/Crao/templates/head.tmpl =================================================================== --- trunk/themes/Crao/templates/head.tmpl 2017年05月25日 08:09:20 UTC (rev 10012) +++ trunk/themes/Crao/templates/head.tmpl 2017年05月25日 08:15:06 UTC (rev 10013) @@ -17,7 +17,7 @@ <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL( _("HowToUseWiki"))?>" /> -<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> +<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" /> <link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL( Modified: trunk/themes/Crao/templates/htmldump.tmpl =================================================================== --- trunk/themes/Crao/templates/htmldump.tmpl 2017年05月25日 08:09:20 UTC (rev 10012) +++ trunk/themes/Crao/templates/htmldump.tmpl 2017年05月25日 08:15:06 UTC (rev 10013) @@ -9,7 +9,7 @@ <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> -<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> +<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" /> <?php echo $WikiTheme->getCSS() ?> Modified: trunk/themes/Sidebar/templates/htmldump.tmpl =================================================================== --- trunk/themes/Sidebar/templates/htmldump.tmpl 2017年05月25日 08:09:20 UTC (rev 10012) +++ trunk/themes/Sidebar/templates/htmldump.tmpl 2017年05月25日 08:15:06 UTC (rev 10013) @@ -10,7 +10,7 @@ <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> -<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> +<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" /> <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?> <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" /> Modified: trunk/themes/default/templates/head.tmpl =================================================================== --- trunk/themes/default/templates/head.tmpl 2017年05月25日 08:09:20 UTC (rev 10012) +++ trunk/themes/default/templates/head.tmpl 2017年05月25日 08:15:06 UTC (rev 10013) @@ -21,7 +21,7 @@ <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL( _("HowToUseWiki"))?>" /> -<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> +<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" /> <link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL( Modified: trunk/themes/default/templates/htmldump.tmpl =================================================================== --- trunk/themes/default/templates/htmldump.tmpl 2017年05月25日 08:09:20 UTC (rev 10012) +++ trunk/themes/default/templates/htmldump.tmpl 2017年05月25日 08:15:06 UTC (rev 10013) @@ -10,7 +10,7 @@ <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> -<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> +<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" /> <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?> <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" /> Modified: trunk/themes/wikilens/templates/head.tmpl =================================================================== --- trunk/themes/wikilens/templates/head.tmpl 2017年05月25日 08:09:20 UTC (rev 10012) +++ trunk/themes/wikilens/templates/head.tmpl 2017年05月25日 08:15:06 UTC (rev 10013) @@ -16,7 +16,7 @@ <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL( _("HowToUseWiki"))?>" /> -<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> +<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" /> <link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL( _("FindPage"))?>" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 10012 http://sourceforge.net/p/phpwiki/code/10012 Author: vargenau Date: 2017年05月25日 08:09:20 +0000 (2017年5月25日) Log Message: ----------- We assume a browser that supports <iframe> Modified Paths: -------------- trunk/lib/plugin/Transclude.php trunk/pgsrc/Help%2FTranscludePlugin Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2017年05月24日 18:19:28 UTC (rev 10011) +++ trunk/lib/plugin/Transclude.php 2017年05月25日 08:09:20 UTC (rev 10012) @@ -104,17 +104,8 @@ 'marginheight' => 0, 'class' => 'autoHeight transclude'); - $noframe_msg[] = fmt("See: %s", HTML::a(array('href' => $src), $src)); + $iframe = HTML::iframe($params); - $noframe_msg = HTML::div(array('class' => 'transclusion'), - HTML::p(array(), $noframe_msg)); - - $iframe = HTML::iframe($params, $noframe_msg); - - /* This doesn't work very well... maybe because CSS screws up NS4 anyway... - $iframe = new HtmlElement('ilayer', array('src' => $src), $iframe); - */ - if ($quiet) { return $iframe; } else { Modified: trunk/pgsrc/Help%2FTranscludePlugin =================================================================== --- trunk/pgsrc/Help%2FTranscludePlugin 2017年05月24日 18:19:28 UTC (rev 10011) +++ trunk/pgsrc/Help%2FTranscludePlugin 2017年05月25日 08:09:20 UTC (rev 10012) @@ -1,4 +1,4 @@ -Date: 2016年10月13日 15:09:28 +0000 +Date: 2016年10月25日 10:01:28 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Help%2FTranscludePlugin; @@ -8,6 +8,8 @@ The **Transclude** [[Help:WikiPlugin|plugin]] can be used to embed include whole (external) web pages within a wiki page. +Pages are transcluded using ##<iframe>## tags. + == Arguments == {| class="bordered" @@ -35,7 +37,6 @@ == Bugs / Caveats == -* Pages are transcluded using ##<iframe>## tags. Older browsers do not support //iframe//s. In that case the user will be presented with a link to the transcluded material. * When possible, Javascript code is used to adjust the height of the //iframe// so that it fits the entire transcluded page. Unfortunately, this seems possible only when the transcluded page comes from the same server as the wiki page. (This restriction is due to security checks built in to the Javascript language.) * The recursion detection code does not currently work. Be careful to avoid recursive transclusions, or you'll be sorry (or at least amused.) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 10011 http://sourceforge.net/p/phpwiki/code/10011 Author: vargenau Date: 2017年05月24日 18:19:28 +0000 (2017年5月24日) Log Message: ----------- Make function IsSafeURL more strict Modified Paths: -------------- trunk/lib/stdlib.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017年05月24日 18:05:08 UTC (rev 10010) +++ trunk/lib/stdlib.php 2017年05月24日 18:19:28 UTC (rev 10011) @@ -29,7 +29,7 @@ AbsoluteURL ($url) IconForLink ($protocol_or_url) PossiblyGlueIconToText($proto_or_url, $text) - IsSafeURL($url) + IsSafeURL($url, $http_only) LinkURL ($url, $linktext) LinkImage ($url, $alt) ImgObject ($img, $url) @@ -346,16 +346,26 @@ } /** - * Determines if the url passed to function is safe, by detecting if the characters - * '<', '>', or '"' are present. - * Check against their urlencoded values also. + * Determines if the url passed to function is safe + * 1) By detecting if the characters '<', '>', or '"' are present. + * Check against their urlencoded values also. + * 2) By checking the URL syntax is valid * - * @param string $url URL to check for unsafe characters. - * @return bool True if safe, false else. + * @param string $url URL to check + * @param bool $http_only if true, accept only http and https URLs + * @return bool true if safe, false else. */ -function IsSafeURL($url) +function IsSafeURL($url, $http_only = true) { - return !preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url); + if (preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url) || (filter_var($url, FILTER_VALIDATE_URL) === false)) { + return false; + } + if ($http_only) { + $scheme = parse_url($url, PHP_URL_SCHEME); + return ($scheme == 'http') || ($scheme == 'https'); + } else { + return true; + } } /** @@ -368,7 +378,7 @@ function LinkURL($url, $linktext = '') { // FIXME: Is this needed (or sufficient?) - if (!IsSafeURL($url)) { + if (!IsSafeURL($url, false)) { $link = HTML::span(array('class' => 'error'), _('Bad URL')); return $link; } else { Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2017年05月24日 18:05:08 UTC (rev 10010) +++ trunk/pgsrc/ReleaseNotes 2017年05月24日 18:19:28 UTC (rev 10011) @@ -1,4 +1,4 @@ -Date: 2017年5月23日 11:26:59 +0000 +Date: 2017年5月24日 19:26:59 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -27,6 +27,7 @@ * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth. * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php) * Bugs: +** Make function IsSafeURL more strict ** Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3) ** It was possible to rename a page to a name with illegal characters, like ~[~] ** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 10010 http://sourceforge.net/p/phpwiki/code/10010 Author: vargenau Date: 2017年05月24日 18:05:08 +0000 (2017年5月24日) Log Message: ----------- Require at leastPHP 5.3.3 Modified Paths: -------------- trunk/index.php trunk/lib/main.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/index.php =================================================================== --- trunk/index.php 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/index.php 2017年05月24日 18:05:08 UTC (rev 10010) @@ -35,8 +35,8 @@ require_once(dirname(__FILE__) . '/lib/IniConfig.php'); IniConfig(dirname(__FILE__) . "/config/config.ini"); -if (version_compare(PHP_VERSION, '5.3', '<')) { - exit(_("Your PHP version is too old. You must have at least PHP 5.3.")); +if (version_compare(PHP_VERSION, '5.3.3', '<')) { + exit(_("Your PHP version is too old. You must have at least PHP 5.3.3.")); } //////////////////////////////////////////////////////////////// Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/lib/main.php 2017年05月24日 18:05:08 UTC (rev 10010) @@ -1394,8 +1394,8 @@ function main() { - if (version_compare(PHP_VERSION, '5.3', '<')) { - exit(_("Your PHP version is too old. You must have at least PHP 5.3.")); + if (version_compare(PHP_VERSION, '5.3.3', '<')) { + exit(_("Your PHP version is too old. You must have at least PHP 5.3.3.")); } if (!USE_DB_SESSION) 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 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/locale/po/de.po 2017年05月24日 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月23日 11:33+0200\n" +"POT-Creation-Date: 2017年05月24日 19:46+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." @@ -20,7 +20,7 @@ msgid "CategoryGroup" msgstr "KategorieGruppen" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/locale/po/es.po 2017年05月24日 18:05:08 UTC (rev 10010) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月23日 11:33+0200\n" +"POT-Creation-Date: 2017年05月24日 19:46+0200\n" "PO-Revision-Date: 2000年02月01日 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -25,7 +25,7 @@ msgid "CategoryGroup" msgstr "GrupoCategoría" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/locale/po/fr.po 2017年05月24日 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月23日 11:33+0200\n" +"POT-Creation-Date: 2017年05月24日 19:46+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." @@ -22,9 +22,9 @@ msgid "CategoryGroup" msgstr "CatégorieGroupes" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" -"Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.3." +"Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.3.3." msgid "BAD semantic relation link" msgstr "MAUVAIS lien de relation sémantique" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/locale/po/it.po 2017年05月24日 18:05:08 UTC (rev 10010) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月23日 11:33+0200\n" +"POT-Creation-Date: 2017年05月24日 19:46+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" @@ -19,7 +19,7 @@ msgid "CategoryGroup" msgstr "CategoriaGruppo" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/locale/po/ja.po 2017年05月24日 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月23日 11:33+0200\n" +"POT-Creation-Date: 2017年05月24日 19:46+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" @@ -18,7 +18,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/locale/po/nl.po 2017年05月24日 18:05:08 UTC (rev 10010) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月23日 11:33+0200\n" +"POT-Creation-Date: 2017年05月24日 19:46+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" @@ -22,7 +22,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/locale/po/phpwiki.pot 2017年05月24日 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月23日 11:33+0200\n" +"POT-Creation-Date: 2017年05月24日 19:46+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" @@ -18,7 +18,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/locale/po/sv.po 2017年05月24日 18:05:08 UTC (rev 10010) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月23日 11:33+0200\n" +"POT-Creation-Date: 2017年05月24日 19:46+0200\n" "PO-Revision-Date: 2001年01月27日 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -19,7 +19,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2017年05月23日 13:47:42 UTC (rev 10009) +++ trunk/locale/po/zh.po 2017年05月24日 18:05:08 UTC (rev 10010) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月23日 11:33+0200\n" +"POT-Creation-Date: 2017年05月24日 19:46+0200\n" "PO-Revision-Date: 2004年04月21日 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -18,7 +18,7 @@ msgid "CategoryGroup" msgstr "" -msgid "Your PHP version is too old. You must have at least PHP 5.3." +msgid "Your PHP version is too old. You must have at least PHP 5.3.3." msgstr "" msgid "BAD semantic relation link" 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: 10009 http://sourceforge.net/p/phpwiki/code/10009 Author: vargenau Date: 2017年05月23日 13:47:42 +0000 (2017年5月23日) Log Message: ----------- label display inline-block: Summary in the edit page to be aligned Modified Paths: -------------- trunk/themes/fusionforge/fusionforge.css Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2017年05月23日 09:34:22 UTC (rev 10008) +++ trunk/themes/fusionforge/fusionforge.css 2017年05月23日 13:47:42 UTC (rev 10009) @@ -162,6 +162,10 @@ white-space: nowrap; } +label { + display: inline-block; +} + table.sortable th.header { background-image: url(../default/buttons/sort_none.gif); cursor: pointer; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 10008 http://sourceforge.net/p/phpwiki/code/10008 Author: vargenau Date: 2017年05月23日 09:34:22 +0000 (2017年5月23日) 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 2017年05月23日 09:30:02 UTC (rev 10007) +++ trunk/locale/po/de.po 2017年05月23日 09:34:22 UTC (rev 10008) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月21日 16:32+0200\n" +"POT-Creation-Date: 2017年05月23日 11:33+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." @@ -1735,6 +1735,12 @@ "Display a marker with further infos (when clicking) on given coordinates." msgstr "" +msgid "Longitude must be a number." +msgstr "" + +msgid "Latitude must be a number." +msgstr "" + #, php-format msgid "Invalid argument %s" msgstr "Ungültiger Parameter %s" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2017年05月23日 09:30:02 UTC (rev 10007) +++ trunk/locale/po/es.po 2017年05月23日 09:34:22 UTC (rev 10008) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月21日 16:32+0200\n" +"POT-Creation-Date: 2017年05月23日 11:33+0200\n" "PO-Revision-Date: 2000年02月01日 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -1703,6 +1703,12 @@ "Display a marker with further infos (when clicking) on given coordinates." msgstr "" +msgid "Longitude must be a number." +msgstr "" + +msgid "Latitude must be a number." +msgstr "" + #, php-format msgid "Invalid argument %s" msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2017年05月23日 09:30:02 UTC (rev 10007) +++ trunk/locale/po/fr.po 2017年05月23日 09:34:22 UTC (rev 10008) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月21日 16:32+0200\n" +"POT-Creation-Date: 2017年05月23日 11:33+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." @@ -1729,6 +1729,12 @@ "Display a marker with further infos (when clicking) on given coordinates." msgstr "" +msgid "Longitude must be a number." +msgstr "La longitude doit être un nombre." + +msgid "Latitude must be a number." +msgstr "La latitude doit être un nombre." + #, php-format msgid "Invalid argument %s" msgstr "Argument non valable %s" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2017年05月23日 09:30:02 UTC (rev 10007) +++ trunk/locale/po/it.po 2017年05月23日 09:34:22 UTC (rev 10008) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月21日 16:32+0200\n" +"POT-Creation-Date: 2017年05月23日 11:33+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" @@ -1686,6 +1686,12 @@ "Display a marker with further infos (when clicking) on given coordinates." msgstr "" +msgid "Longitude must be a number." +msgstr "" + +msgid "Latitude must be a number." +msgstr "" + #, php-format msgid "Invalid argument %s" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2017年05月23日 09:30:02 UTC (rev 10007) +++ trunk/locale/po/ja.po 2017年05月23日 09:34:22 UTC (rev 10008) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月21日 16:32+0200\n" +"POT-Creation-Date: 2017年05月23日 11:33+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" @@ -1672,6 +1672,12 @@ "Display a marker with further infos (when clicking) on given coordinates." msgstr "" +msgid "Longitude must be a number." +msgstr "" + +msgid "Latitude must be a number." +msgstr "" + #, php-format msgid "Invalid argument %s" msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2017年05月23日 09:30:02 UTC (rev 10007) +++ trunk/locale/po/nl.po 2017年05月23日 09:34:22 UTC (rev 10008) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月21日 16:32+0200\n" +"POT-Creation-Date: 2017年05月23日 11:33+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" @@ -1678,6 +1678,12 @@ "Display a marker with further infos (when clicking) on given coordinates." msgstr "" +msgid "Longitude must be a number." +msgstr "" + +msgid "Latitude must be a number." +msgstr "" + #, php-format msgid "Invalid argument %s" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2017年05月23日 09:30:02 UTC (rev 10007) +++ trunk/locale/po/phpwiki.pot 2017年05月23日 09:34:22 UTC (rev 10008) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月21日 16:32+0200\n" +"POT-Creation-Date: 2017年05月23日 11:33+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" @@ -1672,6 +1672,12 @@ "Display a marker with further infos (when clicking) on given coordinates." msgstr "" +msgid "Longitude must be a number." +msgstr "" + +msgid "Latitude must be a number." +msgstr "" + #, php-format msgid "Invalid argument %s" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2017年05月23日 09:30:02 UTC (rev 10007) +++ trunk/locale/po/sv.po 2017年05月23日 09:34:22 UTC (rev 10008) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月21日 16:32+0200\n" +"POT-Creation-Date: 2017年05月23日 11:33+0200\n" "PO-Revision-Date: 2001年01月27日 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -1673,6 +1673,12 @@ "Display a marker with further infos (when clicking) on given coordinates." msgstr "" +msgid "Longitude must be a number." +msgstr "" + +msgid "Latitude must be a number." +msgstr "" + #, php-format msgid "Invalid argument %s" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2017年05月23日 09:30:02 UTC (rev 10007) +++ trunk/locale/po/zh.po 2017年05月23日 09:34:22 UTC (rev 10008) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017年05月21日 16:32+0200\n" +"POT-Creation-Date: 2017年05月23日 11:33+0200\n" "PO-Revision-Date: 2004年04月21日 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -1679,6 +1679,12 @@ "Display a marker with further infos (when clicking) on given coordinates." msgstr "" +msgid "Longitude must be a number." +msgstr "" + +msgid "Latitude must be a number." +msgstr "" + #, php-format msgid "Invalid argument %s" 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: 10007 http://sourceforge.net/p/phpwiki/code/10007 Author: vargenau Date: 2017年05月23日 09:30:02 +0000 (2017年5月23日) Log Message: ----------- Better check arguments for GoogleMaps plugin Modified Paths: -------------- trunk/lib/plugin/GoogleMaps.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2017年05月21日 14:33:38 UTC (rev 10006) +++ trunk/lib/plugin/GoogleMaps.php 2017年05月23日 09:30:02 UTC (rev 10007) @@ -97,9 +97,15 @@ if ($Longitude === '') { return $this->error(sprintf(_("A required argument "%s" is missing."), 'Longitude')); } + if (!is_numeric($Longitude)) { + return $this->error(_('Longitude must be a number.')); + } if ($Latitude === '') { return $this->error(sprintf(_("A required argument "%s" is missing."), 'Latitude')); } + if (!is_numeric($Latitude)) { + return $this->error(_('Latitude must be a number.')); + } $maps = JavaScript('', array('src' => "http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY)); $id = GenerateId("googlemap"); Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2017年05月21日 14:33:38 UTC (rev 10006) +++ trunk/pgsrc/ReleaseNotes 2017年05月23日 09:30:02 UTC (rev 10007) @@ -1,4 +1,4 @@ -Date: 2017年3月13日 15:59:30 +0000 +Date: 2017年5月23日 11:26:59 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -31,6 +31,7 @@ ** It was possible to rename a page to a name with illegal characters, like ~[~] ** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen) ** Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael. +** Better check arguments for ~GoogleMaps plugin * Plugins: ** ~UpLoad plugin: put date and author in history ** ~UpLoad plugin: don't inline images This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 10006 http://sourceforge.net/p/phpwiki/code/10006 Author: vargenau Date: 2017年05月21日 14:33:38 +0000 (2017年5月21日) Log Message: ----------- More generic error message for IsSafeURL Modified Paths: -------------- trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/Transclude.php trunk/lib/stdlib.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/lib/plugin/PhotoAlbum.php 2017年05月21日 14:33:38 UTC (rev 10006) @@ -546,7 +546,7 @@ }*/ //FIXME! if (!IsSafeURL($src)) { - return $this->error(_("Bad url in src: remove all of <, >, \"")); + return $this->error(_("Bad URL in src")); } $photos[] = array("name" => $src, //album_location."/$src".album_default_extension, "desc" => ""); @@ -560,7 +560,7 @@ * @param string $src path to dir or textfile (local or remote) * @param array $photos * @param string $webpath - * @return string Error when bad url or file couldn't be opened + * @return string Error when bad URL or file couldn't be opened */ function fromFile($src, &$photos, $webpath = '') { @@ -574,7 +574,7 @@ return $this->error(_("File extension for csv file has to be '.csv'")); } if (!IsSafeURL($src)) { - return $this->error(_("Bad url in src: remove all of <, >, \"")); + return $this->error(_("Bad URL in src")); } if (preg_match('/^(http|ftp|https):\/\//i', $src)) { $contents = url_get_contents($src); Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/lib/plugin/Transclude.php 2017年05月21日 14:33:38 UTC (rev 10006) @@ -93,7 +93,7 @@ return $this->error(fmt("Recursive inclusion of url %s", $src)); } if (!IsSafeURL($src)) { - return $this->error(_("Bad url in src: remove all of <, >, \"")); + return $this->error(_("Bad URL in src")); } $params = array('title' => $title, Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/lib/stdlib.php 2017年05月21日 14:33:38 UTC (rev 10006) @@ -369,7 +369,7 @@ { // FIXME: Is this needed (or sufficient?) if (!IsSafeURL($url)) { - $link = HTML::span(array('class' => 'error'), _('Bad URL -- remove all of <, >, "')); + $link = HTML::span(array('class' => 'error'), _('Bad URL')); return $link; } else { if (!$linktext) @@ -407,7 +407,7 @@ $arr = explode(' ', $url); if (!empty($arr)) $url = $arr[0]; if (!IsSafeURL($url)) { - $link = HTML::span(array('class' => 'error'), _('Bad URL for image -- remove all of <, >, "')); + $link = HTML::span(array('class' => 'error'), _('Bad URL for image')); return $link; } // spaces in inline images must be %20 encoded! 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 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/locale/po/de.po 2017年05月21日 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016年12月16日 15:45+0100\n" +"POT-Creation-Date: 2017年05月21日 16:32+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." @@ -2242,9 +2242,8 @@ "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen " "Beschreibungen." -msgid "Bad url in src: remove all of <, >, \"" -msgstr "" -"URL Formfehler in Quellcode: alle der folgenden Zeichen entfernen <, >, \"" +msgid "Bad URL in src" +msgstr "URL Formfehler in Quellcode" msgid "File extension for csv file has to be '.csv'" msgstr "" @@ -4540,11 +4539,11 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" -msgstr "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \"" +msgid "Bad URL" +msgstr "URL Formfehler" -msgid "Bad URL for image -- remove all of <, >, \"" -msgstr "URL Formfehler für Bild - Entfernen Sie alle Zeichen mit <, >, \"" +msgid "Bad URL for image" +msgstr "URL Formfehler für Bild" #, php-format msgid "Invalid attribute %s=%s for image %s" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/locale/po/es.po 2017年05月21日 14:33:38 UTC (rev 10006) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016年12月16日 15:45+0100\n" +"POT-Creation-Date: 2017年05月21日 16:32+0200\n" "PO-Revision-Date: 2000年02月01日 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -2180,7 +2180,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4407,10 +4407,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/locale/po/fr.po 2017年05月21日 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016年12月16日 15:45+0100\n" +"POT-Creation-Date: 2017年05月21日 16:32+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." @@ -2221,8 +2221,8 @@ "Affiche un groupe de photos listées dans un fichier texte avec des " "descriptions facultatives." -msgid "Bad url in src: remove all of <, >, \"" -msgstr "Mauvaise URL dans la source : retirez tous les <, >, \"" +msgid "Bad URL in src" +msgstr "URL incorrecte dans la source" msgid "File extension for csv file has to be '.csv'" msgstr "" @@ -4504,11 +4504,11 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" -msgstr "Mauvaise URL -- retirez tous les <, >, \"" +msgid "Bad URL" +msgstr "URL incorrecte" -msgid "Bad URL for image -- remove all of <, >, \"" -msgstr "Mauvaise URL pour l'image -- retirez tous les <, >, \"" +msgid "Bad URL for image" +msgstr "URL incorrecte pour l'image" #, php-format msgid "Invalid attribute %s=%s for image %s" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/locale/po/it.po 2017年05月21日 14:33:38 UTC (rev 10006) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016年12月16日 15:45+0100\n" +"POT-Creation-Date: 2017年05月21日 16:32+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" @@ -2161,7 +2161,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4384,10 +4384,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/locale/po/ja.po 2017年05月21日 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016年12月16日 15:45+0100\n" +"POT-Creation-Date: 2017年05月21日 16:32+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" @@ -2147,7 +2147,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4370,10 +4370,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/locale/po/nl.po 2017年05月21日 14:33:38 UTC (rev 10006) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016年12月16日 15:45+0100\n" +"POT-Creation-Date: 2017年05月21日 16:32+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" @@ -2153,7 +2153,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4376,10 +4376,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/locale/po/phpwiki.pot 2017年05月21日 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016年12月16日 15:45+0100\n" +"POT-Creation-Date: 2017年05月21日 16:32+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" @@ -2147,7 +2147,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4370,10 +4370,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/locale/po/sv.po 2017年05月21日 14:33:38 UTC (rev 10006) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016年12月16日 15:45+0100\n" +"POT-Creation-Date: 2017年05月21日 16:32+0200\n" "PO-Revision-Date: 2001年01月27日 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -2148,7 +2148,7 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "" -msgid "Bad url in src: remove all of <, >, \"" +msgid "Bad URL in src" msgstr "" msgid "File extension for csv file has to be '.csv'" @@ -4371,10 +4371,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" +msgid "Bad URL" msgstr "" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" msgstr "" #, php-format Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2017年05月18日 18:36:34 UTC (rev 10005) +++ trunk/locale/po/zh.po 2017年05月21日 14:33:38 UTC (rev 10006) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016年12月16日 15:45+0100\n" +"POT-Creation-Date: 2017年05月21日 16:32+0200\n" "PO-Revision-Date: 2004年04月21日 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -2156,8 +2156,8 @@ "Display a set of photos listed in a text file with optional descriptions." msgstr "顯示帶有簡單描述的文字檔內的相片集合." -msgid "Bad url in src: remove all of <, >, \"" -msgstr "在 src 中錯誤的 url: 移除所有的 <, .>, \"" +msgid "Bad URL in src" +msgstr "在 src 中錯誤的 URL" msgid "File extension for csv file has to be '.csv'" msgstr "" @@ -4387,10 +4387,10 @@ "ADODB or PDO." msgstr "" -msgid "Bad URL -- remove all of <, >, \"" -msgstr "錯誤 URL -- 移除所有的 <, >, \"" +msgid "Bad URL" +msgstr "錯誤 URL" -msgid "Bad URL for image -- remove all of <, >, \"" +msgid "Bad URL for image" 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: 10005 http://sourceforge.net/p/phpwiki/code/10005 Author: vargenau Date: 2017年05月18日 18:36:34 +0000 (2017年5月18日) Log Message: ----------- PHP Doc Modified Paths: -------------- trunk/lib/stdlib.php Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017年03月13日 16:10:12 UTC (rev 10004) +++ trunk/lib/stdlib.php 2017年05月18日 18:36:34 UTC (rev 10005) @@ -351,7 +351,7 @@ * Check against their urlencoded values also. * * @param string $url URL to check for unsafe characters. - * @return boolean True if same, false else. + * @return bool True if safe, false else. */ function IsSafeURL($url) { @@ -1188,8 +1188,8 @@ * Short format is used for PageList * Long format is used in PageInfo * - * @param $bytes int. Default: 0. - * @param $longformat bool. Default: false. + * @param int $bytes Default: 0. + * @param bool $longformat Default: false. * @return FormattedText (XmlElement.php). */ function ByteFormatter($bytes = 0, $longformat = false) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.