Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[10006] trunk
|
From: <var...@us...> - 2017-05-21 14:33:41
|
Revision: 10006
http://sourceforge.net/p/phpwiki/code/10006
Author: vargenau
Date: 2017-05-21 14:33:38 +0000 (Sun, 21 May 2017)
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.
|
