SF.net SVN: phpwiki:[10749] trunk
vargenau--- via phpwiki-checkins <[email protected]>
| Newsgroups | gmane.comp.web.wiki.phpwiki.checkins |
|---|---|
| Message-ID | <[email protected]> |
Revision: 10749
http://sourceforge.net/p/phpwiki/code/10749
Author: vargenau
Date: 2021-12-08 18:34:56 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
RedirectTo plugin: check only one of 'page' and 'href' is present
Modified Paths:
--------------
trunk/lib/plugin/RedirectTo.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
trunk/pgsrc/Help%2FRedirectToPlugin
Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/lib/plugin/RedirectTo.php 2021-12-08 18:34:56 UTC (rev 10749)
@@ -49,8 +49,7 @@
function getDefaultArguments()
{
return array('href' => '',
- 'page' => false,
- );
+ 'page' => '');
}
/**
@@ -66,6 +65,13 @@
$href = $args['href'];
$page = $args['page'];
+
+ if (!$href && !$page) {
+ return $this->error(_("Both 'href' and 'page' parameters missing."));
+ } elseif ($href && $page) {
+ return $this->error(_("Choose only one of 'href' or 'page' parameters."));
+ }
+
if ($href) {
// If URL is urlencoded, decode it.
if (strpos('%', $href) !== false) {
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 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/locale/po/de.po 2021-12-08 18:34:56 UTC (rev 10749)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:09+0100\n"
+"POT-Creation-Date: 2021-12-08 19:31+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <[email protected]>, Carsten Klapp "
"<[email protected]>, Helmer Pardun <pardunpress@t-online."
@@ -2698,6 +2698,12 @@
msgid "Redirect to another URL or page."
msgstr ""
+msgid "Both 'href' and 'page' parameters missing."
+msgstr "'href' oder 'page' Argument fehlt."
+
+msgid "Choose only one of 'href' or 'page' parameters."
+msgstr ""
+
msgid "Illegal characters in external URL."
msgstr ""
@@ -3369,7 +3375,7 @@
msgstr ""
msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
+msgstr "'url' oder 'file' Argument fehlt."
msgid "Choose only one of 'url' or 'file' parameters."
msgstr ""
@@ -6057,9 +6063,6 @@
#~ msgid "Recursive inclusion of page %s"
#~ msgstr "Rekursiver Selbstaufruf der Seite %s"
-#~ msgid "%s or %s parameter missing"
-#~ msgstr "%s oder %s Argument fehlt"
-
#~ msgid "Edit aborted."
#~ msgstr "Bearbeiten abgebrochen."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/locale/po/es.po 2021-12-08 18:34:56 UTC (rev 10749)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:09+0100\n"
+"POT-Creation-Date: 2021-12-08 19:31+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <[email protected]>\n"
"Language-Team: \n"
@@ -2634,6 +2634,12 @@
msgid "Redirect to another URL or page."
msgstr ""
+msgid "Both 'href' and 'page' parameters missing."
+msgstr ""
+
+msgid "Choose only one of 'href' or 'page' parameters."
+msgstr ""
+
msgid "Illegal characters in external URL."
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/locale/po/fr.po 2021-12-08 18:34:56 UTC (rev 10749)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:09+0100\n"
+"POT-Creation-Date: 2021-12-08 19:31+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <[email protected]>, Roland "
"Trique <[email protected]>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2684,6 +2684,12 @@
msgid "Redirect to another URL or page."
msgstr "Redirige vers une autre URL ou page."
+msgid "Both 'href' and 'page' parameters missing."
+msgstr "Les paramètres « href » et « page » manquent tous les deux."
+
+msgid "Choose only one of 'href' or 'page' parameters."
+msgstr "Choissez un seul des deux paramètres « href » ou « page »."
+
msgid "Illegal characters in external URL."
msgstr "Caractère interdit dans une URL externe."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/locale/po/it.po 2021-12-08 18:34:56 UTC (rev 10749)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:09+0100\n"
+"POT-Creation-Date: 2021-12-08 19:31+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -2611,6 +2611,12 @@
msgid "Redirect to another URL or page."
msgstr ""
+msgid "Both 'href' and 'page' parameters missing."
+msgstr ""
+
+msgid "Choose only one of 'href' or 'page' parameters."
+msgstr ""
+
msgid "Illegal characters in external URL."
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/locale/po/ja.po 2021-12-08 18:34:56 UTC (rev 10749)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:09+0100\n"
+"POT-Creation-Date: 2021-12-08 19:31+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -2597,6 +2597,12 @@
msgid "Redirect to another URL or page."
msgstr ""
+msgid "Both 'href' and 'page' parameters missing."
+msgstr ""
+
+msgid "Choose only one of 'href' or 'page' parameters."
+msgstr ""
+
msgid "Illegal characters in external URL."
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/locale/po/nl.po 2021-12-08 18:34:56 UTC (rev 10749)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:09+0100\n"
+"POT-Creation-Date: 2021-12-08 19:31+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <[email protected]>\n"
"Language-Team: Dutch <[email protected]>\n"
@@ -2603,6 +2603,12 @@
msgid "Redirect to another URL or page."
msgstr ""
+msgid "Both 'href' and 'page' parameters missing."
+msgstr ""
+
+msgid "Choose only one of 'href' or 'page' parameters."
+msgstr ""
+
msgid "Illegal characters in external URL."
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/locale/po/phpwiki.pot 2021-12-08 18:34:56 UTC (rev 10749)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:09+0100\n"
+"POT-Creation-Date: 2021-12-08 19:31+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -2597,6 +2597,12 @@
msgid "Redirect to another URL or page."
msgstr ""
+msgid "Both 'href' and 'page' parameters missing."
+msgstr ""
+
+msgid "Choose only one of 'href' or 'page' parameters."
+msgstr ""
+
msgid "Illegal characters in external URL."
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/locale/po/sv.po 2021-12-08 18:34:56 UTC (rev 10749)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:09+0100\n"
+"POT-Creation-Date: 2021-12-08 19:31+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <[email protected]>\n"
"Language-Team: \n"
@@ -2598,6 +2598,12 @@
msgid "Redirect to another URL or page."
msgstr ""
+msgid "Both 'href' and 'page' parameters missing."
+msgstr ""
+
+msgid "Choose only one of 'href' or 'page' parameters."
+msgstr ""
+
msgid "Illegal characters in external URL."
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/locale/po/zh.po 2021-12-08 18:34:56 UTC (rev 10749)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:09+0100\n"
+"POT-Creation-Date: 2021-12-08 19:31+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <[email protected]>\n"
"Language-Team: DruryL <[email protected]>\n"
@@ -2606,6 +2606,12 @@
msgid "Redirect to another URL or page."
msgstr "重導向到另一個 url 或頁面."
+msgid "Both 'href' and 'page' parameters missing."
+msgstr "'href' 或 'page' 參數遺漏."
+
+msgid "Choose only one of 'href' or 'page' parameters."
+msgstr ""
+
msgid "Illegal characters in external URL."
msgstr ""
@@ -3265,7 +3271,7 @@
msgstr ""
msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
+msgstr "'url' 或 'file' 參數遺漏."
msgid "Choose only one of 'url' or 'file' parameters."
msgstr ""
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/pgsrc/Help%2FRedirectToPlugin
===================================================================
--- trunk/pgsrc/Help%2FRedirectToPlugin 2021-12-08 18:13:22 UTC (rev 10748)
+++ trunk/pgsrc/Help%2FRedirectToPlugin 2021-12-08 18:34:56 UTC (rev 10749)
@@ -1,4 +1,4 @@
-Date: Fri, 5 Apr 2019 10:48:21 +0000
+Date: Wed, 8 Dec 2021 19:01:09 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FRedirectToPlugin;
@@ -16,7 +16,7 @@
== Arguments ==
-Use only one of these arguments at a time.
+You must provide a ##page## or an ##href## argument (but not both).
{| class="bordered"
|-
@@ -26,11 +26,11 @@
|-
| **page**
| The page to redirect to (a wiki page name).
-| none
+| //empty//
|-
| **href**
| An external URL to redirect to. Redirection to external URLs will only work on locked pages. (If the URL contains funny characters, you'll probably have to put quotes around the URL.)
-| none
+| //empty//
|}
== Caveats ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
_______________________________________________
phpwiki-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpwiki-checkins