Menu
▾
▴
phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.
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
|
|
From: <var...@us...> - 2021-12-08 18:47:42
|
Revision: 10750
http://sourceforge.net/p/phpwiki/code/10750
Author: vargenau
Date: 2021-12-08 18:47:39 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Generic messages with %s
Modified Paths:
--------------
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/Video.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/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/lib/plugin/RedirectTo.php 2021-12-08 18:47:39 UTC (rev 10750)
@@ -67,9 +67,9 @@
$page = $args['page'];
if (!$href && !$page) {
- return $this->error(_("Both 'href' and 'page' parameters missing."));
+ return $this->error(sprintf(_("Both '%s' and '%s' parameters missing."), 'href', 'page'));
} elseif ($href && $page) {
- return $this->error(_("Choose only one of 'href' or 'page' parameters."));
+ return $this->error(sprintf(_("Choose only one of '%s' or '%s' parameters."), 'href', 'page'));
}
if ($href) {
@@ -90,8 +90,6 @@
}
} elseif ($page) {
$url = WikiURL($page, array('redirectfrom' => $request->getArg('pagename')));
- } else {
- return $this->error(_("'href' or 'page' parameter missing."));
}
if ($page == $request->getArg('pagename')) {
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/lib/plugin/Video.php 2021-12-08 18:47:39 UTC (rev 10750)
@@ -91,9 +91,9 @@
}
if (!$url && !$file) {
- return $this->error(_("Both 'url' and 'file' parameters missing."));
+ return $this->error(sprintf(_("Both '%s' and '%s' parameters missing."), 'url', 'file'));
} elseif ($url && $file) {
- return $this->error(_("Choose only one of 'url' or 'file' parameters."));
+ return $this->error(sprintf(_("Choose only one of '%s' or '%s' parameters."), 'url', 'file'));
} elseif ($file) {
// $url = SERVER_URL . getUploadDataPath() . '/' . $file;
$url = getUploadDataPath() . '/' . $file;
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:34:56 UTC (rev 10749)
+++ trunk/locale/po/de.po 2021-12-08 18:47:39 UTC (rev 10750)
@@ -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:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2698,10 +2698,12 @@
msgid "Redirect to another URL or page."
msgstr ""
-msgid "Both 'href' and 'page' parameters missing."
-msgstr "'href' oder 'page' Argument fehlt."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
+msgstr "'%s' oder '%s' Argument fehlt."
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
msgstr ""
msgid "Illegal characters in external URL."
@@ -2715,9 +2717,6 @@
msgstr ""
"Weiterleitung zu einer externen URL ist nur in gesperrten Seiten erlaubt."
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
#, php-format
msgid "Recursive redirect to self: “%s”"
msgstr "Eigenbezogene Selbstrückleitung: »%s«"
@@ -3374,12 +3373,6 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' and 'file' parameters missing."
-msgstr "'url' oder 'file' Argument fehlt."
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/es.po 2021-12-08 18:47:39 UTC (rev 10750)
@@ -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:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -2634,10 +2634,12 @@
msgid "Redirect to another URL or page."
msgstr ""
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
msgstr ""
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
msgstr ""
msgid "Illegal characters in external URL."
@@ -2650,9 +2652,6 @@
msgid "Redirect to an external URL is only allowed in locked pages."
msgstr ""
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
#, php-format
msgid "Recursive redirect to self: “%s”"
msgstr ""
@@ -3296,12 +3295,6 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/fr.po 2021-12-08 18:47:39 UTC (rev 10750)
@@ -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:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2684,11 +2684,13 @@
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."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
+msgstr "Les paramètres « %s » et « %s » manquent tous les deux."
-msgid "Choose only one of 'href' or 'page' parameters."
-msgstr "Choissez un seul des deux paramètres « href » ou « page »."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
+msgstr "Choissez un seul des deux paramètres « %s » ou « %s »."
msgid "Illegal characters in external URL."
msgstr "Caractère interdit dans une URL externe."
@@ -2700,9 +2702,6 @@
msgid "Redirect to an external URL is only allowed in locked pages."
msgstr ""
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
#, php-format
msgid "Recursive redirect to self: “%s”"
msgstr "Redirection récursive vers soi-même : « %s »"
@@ -3364,12 +3363,6 @@
msgid "Display video in HTML5."
msgstr "Afficher une vidéo en HTML5."
-msgid "Both 'url' and 'file' parameters missing."
-msgstr "Les paramètres « url » et « file » manquent tous les deux."
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr "Choissez un seul des deux paramètres « url » ou «file»."
-
msgid "Your browser does not understand the HTML 5 video tag."
msgstr "Votre navigateur ne reconnaît pas la balise video du HTML 5."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/it.po 2021-12-08 18:47:39 UTC (rev 10750)
@@ -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:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+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,10 +2611,12 @@
msgid "Redirect to another URL or page."
msgstr ""
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
msgstr ""
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
msgstr ""
msgid "Illegal characters in external URL."
@@ -2627,9 +2629,6 @@
msgid "Redirect to an external URL is only allowed in locked pages."
msgstr ""
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
#, php-format
msgid "Recursive redirect to self: “%s”"
msgstr ""
@@ -3273,12 +3272,6 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/ja.po 2021-12-08 18:47:39 UTC (rev 10750)
@@ -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:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2597,10 +2597,12 @@
msgid "Redirect to another URL or page."
msgstr ""
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
msgstr ""
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
msgstr ""
msgid "Illegal characters in external URL."
@@ -2613,9 +2615,6 @@
msgid "Redirect to an external URL is only allowed in locked pages."
msgstr ""
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
#, php-format
msgid "Recursive redirect to self: “%s”"
msgstr ""
@@ -3259,12 +3258,6 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/nl.po 2021-12-08 18:47:39 UTC (rev 10750)
@@ -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:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -2603,10 +2603,12 @@
msgid "Redirect to another URL or page."
msgstr ""
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
msgstr ""
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
msgstr ""
msgid "Illegal characters in external URL."
@@ -2619,9 +2621,6 @@
msgid "Redirect to an external URL is only allowed in locked pages."
msgstr ""
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
#, php-format
msgid "Recursive redirect to self: “%s”"
msgstr ""
@@ -3265,12 +3264,6 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/phpwiki.pot 2021-12-08 18:47:39 UTC (rev 10750)
@@ -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:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2597,10 +2597,12 @@
msgid "Redirect to another URL or page."
msgstr ""
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
msgstr ""
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
msgstr ""
msgid "Illegal characters in external URL."
@@ -2613,9 +2615,6 @@
msgid "Redirect to an external URL is only allowed in locked pages."
msgstr ""
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
#, php-format
msgid "Recursive redirect to self: “%s”"
msgstr ""
@@ -3259,12 +3258,6 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/sv.po 2021-12-08 18:47:39 UTC (rev 10750)
@@ -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:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -2598,10 +2598,12 @@
msgid "Redirect to another URL or page."
msgstr ""
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
msgstr ""
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
msgstr ""
msgid "Illegal characters in external URL."
@@ -2614,9 +2616,6 @@
msgid "Redirect to an external URL is only allowed in locked pages."
msgstr ""
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
#, php-format
msgid "Recursive redirect to self: “%s”"
msgstr ""
@@ -3260,12 +3259,6 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/zh.po 2021-12-08 18:47:39 UTC (rev 10750)
@@ -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:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -2606,10 +2606,12 @@
msgid "Redirect to another URL or page."
msgstr "重導向到另一個 url 或頁面."
-msgid "Both 'href' and 'page' parameters missing."
-msgstr "'href' 或 'page' 參數遺漏."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
+msgstr "'%s' 或 '%s' 參數遺漏."
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
msgstr ""
msgid "Illegal characters in external URL."
@@ -2622,9 +2624,6 @@
msgid "Redirect to an external URL is only allowed in locked pages."
msgstr ""
-msgid "'href' or 'page' parameter missing."
-msgstr "'href' 或 'page' 參數遺漏."
-
#, php-format
msgid "Recursive redirect to self: “%s”"
msgstr "遞迴重導向到自己: “%s”"
@@ -3270,12 +3269,6 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' and 'file' parameters missing."
-msgstr "'url' 或 'file' 參數遺漏."
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
msgid "Your browser does not understand the HTML 5 video tag."
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.
|
|
From: <var...@us...> - 2021-12-08 18:34:59
|
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 <ru...@x-...>, Carsten Klapp "
"<car...@us...>, 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 <pr...@cl...>\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 <mei...@wa...>, Roland "
"Trique <rol...@fr...>, 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 <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\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 <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\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 <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\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 <jo...@he...>\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 <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\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.
|
|
From: <var...@us...> - 2021-12-08 18:13:25
|
Revision: 10748
http://sourceforge.net/p/phpwiki/code/10748
Author: vargenau
Date: 2021-12-08 18:13:22 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Update help page and error message for Video plugin
Modified Paths:
--------------
trunk/lib/plugin/Video.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%2FVideoPlugin
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/lib/plugin/Video.php 2021-12-08 18:13:22 UTC (rev 10748)
@@ -91,7 +91,7 @@
}
if (!$url && !$file) {
- return $this->error(_("Both 'url' or 'file' parameters missing."));
+ return $this->error(_("Both 'url' and 'file' parameters missing."));
} elseif ($url && $file) {
return $this->error(_("Choose only one of 'url' or 'file' parameters."));
} elseif ($file) {
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 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/de.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2709,7 +2709,6 @@
msgstr ""
"Weiterleitung zu einer externen URL ist nur in gesperrten Seiten erlaubt."
-# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
msgid "'href' or 'page' parameter missing."
msgstr ""
@@ -3369,8 +3368,7 @@
msgid "Display video in HTML5."
msgstr ""
-# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
@@ -6059,7 +6057,6 @@
#~ msgid "Recursive inclusion of page %s"
#~ msgstr "Rekursiver Selbstaufruf der Seite %s"
-# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
#~ msgid "%s or %s parameter missing"
#~ msgstr "%s oder %s Argument fehlt"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/es.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -3290,7 +3290,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/fr.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3358,7 +3358,7 @@
msgid "Display video in HTML5."
msgstr "Afficher une vidéo en HTML5."
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr "Les paramètres « url » et « file » manquent tous les deux."
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/it.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+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"
@@ -3267,7 +3267,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/ja.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3253,7 +3253,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/nl.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -3259,7 +3259,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/phpwiki.pot 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3253,7 +3253,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/sv.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -3254,7 +3254,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/zh.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -3264,7 +3264,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
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%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/pgsrc/Help%2FVideoPlugin 2021-12-08 18:13:22 UTC (rev 10748)
@@ -1,4 +1,4 @@
-Date: Wed, 16 Jun 2021 19:20:34 +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%2FVideoPlugin;
@@ -7,7 +7,7 @@
Content-Transfer-Encoding: binary
The **~Video** [[Help:WikiPlugin|plugin]] allows to include video in a wiki page.
-Video file must be an HTML 5 format:
+Video file must be in an HTML 5 format:
* [[WikiPedia:Ogg|Ogg]] (##.ogg## suffix),
* [[WikiPedia:MP4|MP4]] (##.mp4## suffix),
* [[WikiPedia:WebM|WebM]] (##.webm## suffix).
@@ -16,7 +16,7 @@
== Arguments ==
-Use only one of ##url## or ##file## arguments at a time.
+You must provide a ##url## or a ##file## argument (but not both).
{| class="bordered"
|-
@@ -25,12 +25,12 @@
! Default value
|-
| **url**
-| The url of a video file.
-| none
+| The URL of a video file.
+| //empty//
|-
| **file**
| The name of a video file that has been uploaded.
-| none
+| //empty//
|-
| **width**
| The width of the video (in pixels).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-08 09:28:49
|
Revision: 10747
http://sourceforge.net/p/phpwiki/code/10747
Author: vargenau
Date: 2021-12-08 09:28:46 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Update pgsrc/Help%2FPhotoAlbumPlugin and translations
Modified Paths:
--------------
trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
trunk/locale/fr/pgsrc/Aide%2FGreffonAlbumPhotos
trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2021-12-07 15:15:12 UTC (rev 10746)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2021-12-08 09:28:46 UTC (rev 10747)
@@ -1,4 +1,4 @@
-Date: Wed, 24 Nov 2021 15:45:48 +0000
+Date: Wed, 8 Dec 2021 10:26:58 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhotoAlbumPlugin;
@@ -73,10 +73,9 @@
|-
| **link**
|
-true or false
-
-If true, each image will be hyperlinked to a page where the single
-photo will be shown full-size. Only works when mode != 'normal'
+Boolean. If true, each image will be hyperlinked to a page where
+the single photo will be shown full-size. Only works when mode
+is different from 'normal'
| true
|-
| **attrib**
@@ -90,7 +89,7 @@
| center
|-
| **desc**
-| Display any descriptions given in the text file
+| Boolean. If true, display any descriptions given in the text file
| true
|-
| **sort**
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonAlbumPhotos
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonAlbumPhotos 2021-12-07 15:15:12 UTC (rev 10746)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonAlbumPhotos 2021-12-08 09:28:46 UTC (rev 10747)
@@ -1,4 +1,4 @@
-Date: Wed, 24 Nov 2021 15:45:48 +0000
+Date: Wed, 8 Dec 2021 10:26:58 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonAlbumPhotos;
@@ -74,10 +74,9 @@
|-
| **link**
|
-true or false
-
-If true, each image will be hyperlinked to a page where the single
-photo will be shown full-size. Only works when mode != 'normal'
+Boolean. If true, each image will be hyperlinked to a page where
+the single photo will be shown full-size. Only works when mode
+is different from 'normal'
| true
|-
| **attrib**
@@ -95,7 +94,7 @@
| true
|-
| **sort**
-| Tri les images par nom de fichier
+| Trie les images par nom de fichier
| Par défaut, c'est l'ordre dans le fichier texte qui est suivi.
|-
| **bgcolor**
@@ -181,7 +180,7 @@
duration=1
>>
-ou par une adresse extérieure :
+ou par une URL externe :
{{{
<<PhotoAlbum
src="http://phpwiki.demo.free.fr/themes/Hawaiian/images/pictures/PhotoAlbum.csv"
Modified: trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin 2021-12-07 15:15:12 UTC (rev 10746)
+++ trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin 2021-12-08 09:28:46 UTC (rev 10747)
@@ -1,4 +1,4 @@
-Date: Wed, 24 Nov 2021 15:45:48 +0000
+Date: Wed, 8 Dec 2021 10:26:58 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FPhotoAlbumPlugin;
@@ -72,10 +72,9 @@
|-
| **link**
|
-true or false
-
-If true, each image will be hyperlinked to a page where the single
-photo will be shown full-size. Only works when mode != 'normal'
+Boolean. If true, each image will be hyperlinked to a page where
+the single photo will be shown full-size. Only works when mode
+is different from 'normal'
| true
|-
| **attrib**
Modified: trunk/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhotoAlbumPlugin 2021-12-07 15:15:12 UTC (rev 10746)
+++ trunk/pgsrc/Help%2FPhotoAlbumPlugin 2021-12-08 09:28:46 UTC (rev 10747)
@@ -1,4 +1,4 @@
-Date: Wed, 24 Nov 2021 12:34:13 +0000
+Date: Wed, 8 Dec 2021 10:26:58 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FPhotoAlbumPlugin;
@@ -73,10 +73,9 @@
|-
| **link**
|
-true or false
-
-If true, each image will be hyperlinked to a page where the single
-photo will be shown full-size. Only works when mode != 'normal'
+Boolean. If true, each image will be hyperlinked to a page where
+the single photo will be shown full-size. Only works when mode
+is different from 'normal'
| true
|-
| **attrib**
@@ -90,7 +89,7 @@
| center
|-
| **desc**
-| Display any descriptions given in the text file
+| Boolean. If true, display any descriptions given in the text file
| true
|-
| **sort**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-07 15:15:15
|
Revision: 10746
http://sourceforge.net/p/phpwiki/code/10746
Author: vargenau
Date: 2021-12-07 15:15:12 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: avoid nested <a>
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-07 14:51:42 UTC (rev 10745)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-07 15:15:12 UTC (rev 10746)
@@ -378,8 +378,7 @@
} elseif ($mode == 'thumbs') {
$desc = ($showdesc != 'none') ?
- HTML::p(HTML::a(array("href" => "$url"),
- $url_text)) : '';
+ HTML::p($url_text) : '';
$row->pushContent(
(HTML::td($cell,
$url_image,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-07 14:51:43
|
Revision: 10745
http://sourceforge.net/p/phpwiki/code/10745
Author: vargenau
Date: 2021-12-07 14:51:42 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: use CSS
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-07 14:02:01 UTC (rev 10744)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-07 14:51:42 UTC (rev 10745)
@@ -255,7 +255,10 @@
$size = getimagesize($value["src"]); // try " " => "\\ "
$newwidth = $this->newSize($size[0], $width);
if ($width != 'auto' && $newwidth > 0) {
- $params = array_merge($params, array("width" => $newwidth));
+ if (is_numeric($newwidth)) {
+ $newwidth = $newwidth.'px';
+ }
+ $params = array_merge($params, array("style" => 'width: '.$newwidth));
}
if (($mode == 'thumbs' || $mode == 'tiles' || $mode == 'list')) {
if (!empty($size[0])) {
@@ -287,6 +290,9 @@
} else {
$newcellwidth = $cellwidth;
}
+ if (is_numeric($newcellwidth)) {
+ $newcellwidth = $newcellwidth.'px';
+ }
$cell = array_merge($cell, array("style" => 'width: '.$newcellwidth));
}
if (in_array("nowrap", $attributes)) {
@@ -639,7 +645,7 @@
}
if (array_key_exists('width', $params)) {
return HTML::img(array('src' => $src,
- 'width' => $params['width'],
+ 'style' => 'width: '.$params['width'],
'alt' => $params['alt']));
} else {
return HTML::img(array('src' => $src,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-07 14:02:03
|
Revision: 10744
http://sourceforge.net/p/phpwiki/code/10744
Author: vargenau
Date: 2021-12-07 14:02:01 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: no / in front of URL
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-07 08:17:20 UTC (rev 10743)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-07 14:02:01 UTC (rev 10744)
@@ -632,12 +632,17 @@
private function image_tile($params)
{
+ if (IsSafeURL($params['src'], true)) {
+ $src = $params['src'];
+ } else {
+ $src = '/'.$params['src'];
+ }
if (array_key_exists('width', $params)) {
- return HTML::img(array('src' => '/'.$params['src'],
+ return HTML::img(array('src' => $src,
'width' => $params['width'],
'alt' => $params['alt']));
} else {
- return HTML::img(array('src' => '/'.$params['src'],
+ return HTML::img(array('src' => $src,
'alt' => $params['alt']));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-07 08:17:22
|
Revision: 10743
http://sourceforge.net/p/phpwiki/code/10743
Author: vargenau
Date: 2021-12-07 08:17:20 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
Fix Javascript function display_slides
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-07 07:58:31 UTC (rev 10742)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-07 08:17:20 UTC (rev 10743)
@@ -208,14 +208,14 @@
i = 0;
function display_slides() {
j = i - 1;
- cell0 = document.getElementsById('wikislide' + j);
- cell = document.getElementsById('wikislide' + i);
- if (cell0.item(0) != null)
- cell0.item(0).style.display='none';
- if (cell.item(0) != null)
- cell.item(0).style.display='block';
+ cell0 = document.getElementById('wikislide' + j);
+ cell = document.getElementById('wikislide' + i);
+ if (cell0 != null)
+ cell0.style.display='none';
+ if (cell != null)
+ cell.style.display='block';
i += 1;
- if (cell.item(0) == null) i = 0;
+ if (cell == null) i = 0;
setTimeout('display_slides()',$duration);
}
display_slides();"));
@@ -396,16 +396,16 @@
if ($count == 0)
$cell = array('style' => 'display: block; '
. 'position: absolute; '
- . 'left: 50% ; '
- . 'margin-left: -' . round($newwidth / 2) . 'px;'
+ . 'left: 50%; '
+ . 'margin-left: -' . round($newwidth / 2) . 'px; '
. 'text-align: center; '
. 'vertical-align: top',
'id' => "wikislide" . $count);
else
$cell = array('style' => 'display: none; '
- . 'position: absolute ;'
- . 'left: 50% ;'
- . 'margin-left: -' . round($newwidth / 2) . 'px;'
+ . 'position: absolute; '
+ . 'left: 50%; '
+ . 'margin-left: -' . round($newwidth / 2) . 'px; '
. 'text-align: center; '
. 'vertical-align: top',
'id' => "wikislide" . $count);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-07 07:58:33
|
Revision: 10742
http://sourceforge.net/p/phpwiki/code/10742
Author: vargenau
Date: 2021-12-07 07:58:31 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
Remove ImageTile.php, no longer used
Modified Paths:
--------------
trunk/locale/Makefile
Removed Paths:
-------------
trunk/ImageTile.php
Deleted: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php 2021-12-06 17:47:56 UTC (rev 10741)
+++ trunk/ImageTile.php 2021-12-07 07:58:31 UTC (rev 10742)
@@ -1,190 +0,0 @@
-<?php
-/**
- * Copyright © 2005,2007 Reini Urban
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- */
-
-// FIXME! This is a mess. Everything.
-require_once 'lib/stdlib.php';
-
-$remove = 0;
-if (preg_match('/^(http|ftp|https):\/\//i', $_REQUEST['url'])) {
-
- $data_path = '';
- list($usec, $sec) = explode(" ", microtime());
-
- $fp = fopen('config/config.ini', 'r');
- while ($config = fgetcsv($fp, 1024, ';')) {
- if (preg_match('/DATA_PATH/', $config[0])) {
- list($key, $value) = explode('=', $config[0]);
- $data_path = trim($value) . '/';
- break;
- }
- }
- fclose($fp);
- @mkdir($data_path . "uploads/thumbs", 0775);
- $file = $data_path . "uploads/thumbs/image_" . ((float)$usec + (float)$sec);
- $source = url_get_contents($_REQUEST['url']);
-
- @$fp = fopen($file, 'w+');
- if (!$fp) {
- header("Content-type: text/html");
- echo "<!DOCTYPE html>\n";
- echo "<html xml:lang=\"en\" lang=\"en\">\n";
- echo "<head>\n";
- echo "<title>ERROR: unable to open $file in write mode</title>\n";
- echo "</head>\n";
- echo "<body>\n";
- echo "<p>ERROR: unable to open $file in write mode</p>\n";
- echo "</body>\n";
- echo "</html>";
- }
- fwrite($fp, $source);
- $remove = 1;
-
-} else {
- @$fp = fopen($_REQUEST['url'], "r");
-
- if (!$fp) {
-
- header("Content-type: text/html");
- echo "<!DOCTYPE html>\n";
- echo "<html xml:lang=\"en\" lang=\"en\">\n";
- echo "<head>\n";
- echo "<title>Not an image</title>\n";
- echo "</head>\n";
- echo "<body>\n";
- echo "<p>Not an image</p>\n";
- echo "</body>\n";
- echo "</html>";
- exit();
-
- } else {
- $file = $_REQUEST['url'];
- fclose($fp);
- }
-}
-list ($a, $b, $type, $attr) = @getimagesize($file);
-
-if (!$type) {
- $type = basename($_REQUEST['url']);
- $type = preg_split('/\./', $type);
- $type = array_pop($type);
-}
-
-switch ($type) {
- case '2':
- if (function_exists("imagecreatefromjpeg"))
- $img = @imagecreatefromjpeg($file);
- else
- show_plain();
- break;
- case '3':
- if (function_exists("imagecreatefrompng"))
- $img = @imagecreatefrompng($file);
- else
- show_plain();
- break;
- case '1':
- if (function_exists("imagecreatefromgif"))
- $img = @imagecreatefromgif($file);
- else
- show_plain();
- break;
- case '15':
- if (function_exists("imagecreatefromwbmp"))
- $img = @imagecreatefromwbmp($file);
- else
- show_plain();
- break;
- case '16':
- if (function_exists("imagecreatefromxbm"))
- $img = @imagecreatefromxbm($file);
- else
- show_plain();
- break;
- case 'xpm':
- if (function_exists("imagecreatefromxpm"))
- $img = @imagecreatefromxpm($file);
- else
- show_plain();
- break;
- case 'gd':
- if (function_exists("imagecreatefromgd"))
- $img = @imagecreatefromgd($file);
- else
- show_plain();
- break;
- case 'gd2':
- if (function_exists("imagecreatefromgd2"))
- $img = @imagecreatefromgd2($file);
- else
- show_plain();
- break;
- default:
- //we are not stupid...
- header("Content-type: text/html");
- echo "<!DOCTYPE html>\n";
- echo "<html xml:lang=\"en\" lang=\"en\">\n";
- echo "<head>\n";
- echo "<title>Not an image</title>\n";
- echo "</head>\n";
- echo "<body>\n";
- echo "<p>Not an image</p>\n";
- echo "</body>\n";
- echo "</html>";
- exit();
- break;
-}
-
-$width = @imagesx($img);
-$height = @imagesy($img);
-
-$newwidth = $_REQUEST['width'];
-if (empty($newidth)) $newidth = 50;
-
-$newheight = $_REQUEST['height'];
-if (empty($newheight)) $newheight = round($newwidth * ($height / $width));
-
-// php-4.2.x is stupid enough to define on gd only a stub for imagecopyresampled.
-// So function_exists('imagecopyresampled') will fail.
-if (!extension_loaded('gd2') and (substr(PHP_OS, 0, 3) != 'WIN'))
- loadPhpExtension('gd2');
-if (extension_loaded('gd2')) {
- $thumb = imagecreatetruecolor($newwidth, $newheight);
- $img = imagecopyresampled($thumb, $img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-} else {
- $thumb = imagecreate($newwidth, $newheight);
- $img = imagecopyresized($thumb, $img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-}
-
-if ($remove == 1) unlink($file);
-
-header("Content-type: image/png");
-imagepng($thumb);
-
-function show_plain()
-{
- $mime = mime_content_type($_REQUEST['url']);
- header("Content-type: $mime");
- readfile($_REQUEST['url']);
- exit();
-}
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile 2021-12-06 17:47:56 UTC (rev 10741)
+++ trunk/locale/Makefile 2021-12-07 07:58:31 UTC (rev 10742)
@@ -72,7 +72,6 @@
${POT_FILE}: .././admin/wiki2public.php
${POT_FILE}: .././configurator.php
${POT_FILE}: .././getimg.php
-${POT_FILE}: .././ImageTile.php
${POT_FILE}: .././index.php
${POT_FILE}: .././lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
${POT_FILE}: .././lib/ASCIIMathPHP/ASCIIMathPHP.class.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 17:47:57
|
Revision: 10741
http://sourceforge.net/p/phpwiki/code/10741
Author: vargenau
Date: 2021-12-06 17:47:56 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
PageTrail plugin: check it is a wiki page (to avoid wrong links in PhotoAlbum)
Modified Paths:
--------------
trunk/lib/plugin/PageTrail.php
Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php 2021-12-06 17:16:51 UTC (rev 10740)
+++ trunk/lib/plugin/PageTrail.php 2021-12-06 17:47:56 UTC (rev 10741)
@@ -73,24 +73,31 @@
// Get name of the current page we are on
$thispage = $request->getArg('pagename');
- $Pages = $request->session->get("PageTrail");
- if (!is_array($Pages)) {
- $Pages = array();
+ $pages = $request->session->get("PageTrail");
+ if (!is_array($pages)) {
+ $pages = array();
}
- if (!isset($Pages[0]) or ($duplicates || ($thispage != $Pages[0]))) {
- array_unshift($Pages, $thispage);
- $request->session->set("PageTrail", $Pages);
+ $wikipages = array();
+ foreach ($pages as $page) {
+ if ($dbi->isWikiPage($page)) {
+ $wikipages[] = $page;
+ }
}
- $numberlinks = min(count($Pages), $numberlinks);
+ if (!isset($wikipages[0]) or ($duplicates || ($thispage != $wikipages[0]))) {
+ array_unshift($wikipages, $thispage);
+ $request->session->set("PageTrail", $wikipages);
+ }
+
+ $numberlinks = min(count($wikipages), $numberlinks);
if (!$invisible and $numberlinks) {
$html = HTML::span(array('class' => 'pagetrail'));
- $html->pushContent(WikiLink($Pages[$numberlinks - 1], 'auto'));
+ $html->pushContent(WikiLink($wikipages[$numberlinks - 1], 'auto'));
for ($i = $numberlinks - 2; $i >= 0; $i--) {
- if (!empty($Pages[$i]))
+ if (!empty($wikipages[$i]))
$html->pushContent(PAGETRAIL_ARROW,
- WikiLink($Pages[$i], 'auto'));
+ WikiLink($wikipages[$i], 'auto'));
}
return $html;
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 17:16:52
|
Revision: 10740
http://sourceforge.net/p/phpwiki/code/10740
Author: vargenau
Date: 2021-12-06 17:16:51 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: use id instead of name for wikislide
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-06 17:04:47 UTC (rev 10739)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-06 17:16:51 UTC (rev 10740)
@@ -208,8 +208,8 @@
i = 0;
function display_slides() {
j = i - 1;
- cell0 = document.getElementsByName('wikislide' + j);
- cell = document.getElementsByName('wikislide' + i);
+ cell0 = document.getElementsById('wikislide' + j);
+ cell = document.getElementsById('wikislide' + i);
if (cell0.item(0) != null)
cell0.item(0).style.display='none';
if (cell.item(0) != null)
@@ -400,7 +400,7 @@
. 'margin-left: -' . round($newwidth / 2) . 'px;'
. 'text-align: center; '
. 'vertical-align: top',
- 'name' => "wikislide" . $count);
+ 'id' => "wikislide" . $count);
else
$cell = array('style' => 'display: none; '
. 'position: absolute ;'
@@ -408,7 +408,7 @@
. 'margin-left: -' . round($newwidth / 2) . 'px;'
. 'text-align: center; '
. 'vertical-align: top',
- 'name' => "wikislide" . $count);
+ 'id' => "wikislide" . $count);
if ($align == 'left' || $align == 'right') {
if ($count == 0)
$cell = array('style' => 'display: block; '
@@ -415,13 +415,13 @@
. 'position: absolute; '
. $align . ': 50px; '
. 'vertical-align: top',
- 'name' => "wikislide" . $count);
+ 'id' => "wikislide" . $count);
else
$cell = array('style' => 'display: none; '
. 'position: absolute; '
. $align . ': 50px; '
. 'vertical-align: top',
- 'name' => "wikislide" . $count);
+ 'id' => "wikislide" . $count);
}
$row->pushContent(
(HTML::td($cell,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 17:04:49
|
Revision: 10739
http://sourceforge.net/p/phpwiki/code/10739
Author: vargenau
Date: 2021-12-06 17:04:47 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: add random number in id in case plugin is called several times
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-06 16:54:00 UTC (rev 10738)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-06 17:04:47 UTC (rev 10739)
@@ -309,7 +309,7 @@
if ($mode == 'normal' || $mode == 'slide') {
if (!@empty($params['location'])) $params['src'] = $params['location'];
unset ($params['location'], $params['src_tile']);
- $url_image = $link ? HTML::a(array("id" => rawurlencode(basename($value["name"])),
+ $url_image = $link ? HTML::a(array("id" => rawurlencode(basename($value["name"])).'-'.rand(),
"href" => "$url"), HTML::img($params))
: HTML::img($params);
} else {
@@ -317,7 +317,7 @@
if (!@empty ($params['src_tile']))
$params['src'] = $params['src_tile'];
unset ($params['location'], $params['src_tile']);
- $url_image = $link ? HTML::a(array("id" => rawurlencode(basename($value["name"])),
+ $url_image = $link ? HTML::a(array("id" => rawurlencode(basename($value["name"])).'-'.rand(),
"href" => "$url"),
$this->image_tile($params))
: HTML::img($params);
@@ -327,7 +327,7 @@
} else {
if (!@empty($params['location'])) $params['src'] = $params['location'];
unset ($params['location'], $params['src_tile']);
- $url_image = $link ? HTML::a(array("id" => rawurlencode(basename($value["name"])),
+ $url_image = $link ? HTML::a(array("id" => rawurlencode(basename($value["name"])).'-'.rand(),
"href" => "$b_url"), HTML::img($params))
: HTML::img($params);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 16:54:03
|
Revision: 10738
http://sourceforge.net/p/phpwiki/code/10738
Author: vargenau
Date: 2021-12-06 16:54:00 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: rawurlencode id in case image name contains a space
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-06 16:13:44 UTC (rev 10737)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-06 16:54:00 UTC (rev 10738)
@@ -309,7 +309,7 @@
if ($mode == 'normal' || $mode == 'slide') {
if (!@empty($params['location'])) $params['src'] = $params['location'];
unset ($params['location'], $params['src_tile']);
- $url_image = $link ? HTML::a(array("id" => basename($value["name"]),
+ $url_image = $link ? HTML::a(array("id" => rawurlencode(basename($value["name"])),
"href" => "$url"), HTML::img($params))
: HTML::img($params);
} else {
@@ -317,7 +317,7 @@
if (!@empty ($params['src_tile']))
$params['src'] = $params['src_tile'];
unset ($params['location'], $params['src_tile']);
- $url_image = $link ? HTML::a(array("id" => basename($value["name"]),
+ $url_image = $link ? HTML::a(array("id" => rawurlencode(basename($value["name"])),
"href" => "$url"),
$this->image_tile($params))
: HTML::img($params);
@@ -327,7 +327,7 @@
} else {
if (!@empty($params['location'])) $params['src'] = $params['location'];
unset ($params['location'], $params['src_tile']);
- $url_image = $link ? HTML::a(array("id" => basename($value["name"]),
+ $url_image = $link ? HTML::a(array("id" => rawurlencode(basename($value["name"])),
"href" => "$b_url"), HTML::img($params))
: HTML::img($params);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 16:13:47
|
Revision: 10737
http://sourceforge.net/p/phpwiki/code/10737
Author: vargenau
Date: 2021-12-06 16:13:44 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: replace class ImageTile by function image_tile to display tiles
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-06 15:33:23 UTC (rev 10736)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-06 16:13:44 UTC (rev 10737)
@@ -62,38 +62,10 @@
* TODO:
* - specify picture(s) as parameter(s)
* - limit amount of pictures on one page
- * - use PHP to really resize or greyscale images (only where GD library supports it)
- * (quite done for resize with "ImageTile.php")
*
- * KNOWN ISSUES:
- * - reading height and width from images with spaces in their names fails.
- *
* Fixed album location idea by Philip J. Hollenback. Thanks!
*/
-class ImageTile extends HtmlElement
-{
- // go away, hack!
- static function image_tile( /*...*/)
- {
- $el = new HTML ('img');
- $tag = func_get_args();
- $path = DATA_PATH . "/ImageTile.php";
- $params = "<img src=\"$path?url=" . $tag[0]['src'];
- if (!@empty($tag[0]['width']))
- $params .= "&width=" . $tag[0]['width'];
- if (!@empty($tag[0]['height']))
- $params .= "&height=" . $tag[0]['height'];
- if (!@empty($tag[0]['width']))
- $params .= '" width="' . $tag[0]['width'];
- if (!@empty($tag[0]['height']))
- $params .= '" height="' . $tag[0]['height'];
-
- $params .= '" alt="' . $tag[0]['alt'] . '" />';
- return $el->raw($params);
- }
-}
-
class WikiPlugin_PhotoAlbum
extends WikiPlugin
{
@@ -347,7 +319,7 @@
unset ($params['location'], $params['src_tile']);
$url_image = $link ? HTML::a(array("id" => basename($value["name"]),
"href" => "$url"),
- ImageTile::image_tile($params))
+ $this->image_tile($params))
: HTML::img($params);
$params = $keep;
unset ($keep);
@@ -507,7 +479,7 @@
* @param mixed $value Either absolute no. or HTML percentage e.g. '50%'
* @return integer New size in pixels
*/
- function newSize($oldSize, $value)
+ private function newSize($oldSize, $value)
{
if (trim(substr($value, strlen($value) - 1)) != "%") {
return $value;
@@ -524,7 +496,7 @@
* @param array $photos
* @return string Error if fixed location is not allowed
*/
- function fromLocation($src, &$photos)
+ private function fromLocation($src, &$photos)
{
//FIXME!
if (!IsSafeURL($src)) {
@@ -540,10 +512,10 @@
*
* @param string $src path to dir or textfile (local or remote)
* @param array $photos
- * @param string $webpath
+ * @param string $webpath
* @return string Error when bad URL or file couldn't be opened
*/
- function fromFile($src, &$photos, $webpath = '')
+ private function fromFile($src, &$photos, $webpath = '')
{
$src_bak = $src;
if (preg_match("/^Upload:(.*)$/", $src, $m)) {
@@ -565,7 +537,7 @@
if (string_ends_with($src, "/"))
$src = substr($src, 0, -1);
}
- if (!file_exists($src)
+ if (!file_exists($src)
&& defined('PHPWIKI_DIR')
&& file_exists(PHPWIKI_DIR . "/$src")) {
$src = PHPWIKI_DIR . "/$src";
@@ -657,4 +629,16 @@
}
return '';
}
+
+ private function image_tile($params)
+ {
+ if (array_key_exists('width', $params)) {
+ return HTML::img(array('src' => '/'.$params['src'],
+ 'width' => $params['width'],
+ 'alt' => $params['alt']));
+ } else {
+ return HTML::img(array('src' => '/'.$params['src'],
+ 'alt' => $params['alt']));
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 15:33:25
|
Revision: 10736
http://sourceforge.net/p/phpwiki/code/10736
Author: vargenau
Date: 2021-12-06 15:33:23 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: remove duplicate array key, add braces, remove old comments
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-06 14:50:45 UTC (rev 10735)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-06 15:33:23 UTC (rev 10736)
@@ -102,12 +102,6 @@
return _("Display a set of photos listed in a text file with optional descriptions.");
}
-// Avoid nameclash, so it's disabled. We allow any url.
-// define('allow_album_location', true);
-// define('album_location', 'http://kw.jouwfeestje.com/foto/redactie');
-// define('album_default_extension', '.jpg');
-// define('desc_separator', ';');
-
function getDefaultArguments()
{
return array('src' => '', // textfile of image list, or local dir.
@@ -165,7 +159,6 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
-
extract($this->getArgs($argstr, $request));
$attributes = $attrib ? explode(",", $attrib) : array();
@@ -210,11 +203,15 @@
$attributes = array_merge($attributes, array('alt' => ''));
$attributes = array_merge($attributes, array('nowrap' => 'nowrap'));
$cellwidth = 'auto'; // else cell won't nowrap
- if ($width == 'auto') $width = 70;
+ if ($width == 'auto') {
+ $width = 70;
+ }
} elseif ($mode == 'list') {
$numcols = 1;
$cellwidth = "auto";
- if ($width == 'auto') $width = 50;
+ if ($width == 'auto') {
+ $width = 50;
+ }
} elseif ($mode == 'slide') {
$tableheight = 0;
$cell_width = 0;
@@ -293,8 +290,12 @@
$newheight = round($newwidth * $size[1] / $size[0]);
$params['width'] = $newwidth;
$params['height'] = $newheight;
- } else $newheight = '';
- if ($height == 'auto') $height = 150;
+ } else {
+ $newheight = '';
+ }
+ if ($height == 'auto') {
+ $height = 150;
+ }
} else {
$newheight = $this->newSize($size[1], $height);
if ($height != 'auto' && $newheight > 0) {
@@ -404,9 +405,6 @@
$row->pushContent(
(HTML::td($cell,
$url_image,
- // FIXME: no HtmlElement for fontsizes?
- // rurban: use ->setAttr("style","font-size:small;")
- // but better use a css class
HTML::div(array('class' => 'gensmall'), $desc)
)));
} elseif ($mode == 'normal') {
@@ -414,7 +412,6 @@
$row->pushContent(
(HTML::td($cell,
$url_image,
- // FIXME: no HtmlElement for fontsizes?
HTML::div(array('class' => 'gensmall'), $desc)
)));
} elseif ($mode == 'slide') {
@@ -520,7 +517,7 @@
}
/**
- * fromLocation - read only one picture from fixed album_location
+ * fromLocation - read only one picture from fixed album location
* and return it in array $photos
*
* @param string $src Name of page
@@ -529,15 +526,11 @@
*/
function fromLocation($src, &$photos)
{
- /*if (!allow_album_location) {
- return $this->error(_("Fixed album location is not allowed. Please specify parameter src."));
- }*/
//FIXME!
if (!IsSafeURL($src)) {
return $this->error(_("Bad URL in src"));
}
- $photos[] = array("name" => $src, //album_location."/$src".album_default_extension,
- "desc" => "");
+ $photos[] = array("name" => $src, "desc" => "");
return '';
}
@@ -593,7 +586,7 @@
}
foreach ($list as $file) {
// convert local path to webpath
- $photos[] = array("src" => $file,
+ $photos[] = array(
"name" => $webpath . "/$file",
"name_tile" => $src . "/$file",
"src" => $src . "/$file",
@@ -627,7 +620,7 @@
}
}
if ($web_location == 0) {
- $fp = @fopen($src, "r");
+ $fp = fopen($src, "r");
if (!$fp) {
return $this->error(fmt("Unable to read src=“%s”", $src));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 14:50:48
|
Revision: 10735
http://sourceforge.net/p/phpwiki/code/10735
Author: vargenau
Date: 2021-12-06 14:50:45 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: avoid nested <a> in list mode
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-06 14:34:32 UTC (rev 10734)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-06 14:50:45 UTC (rev 10735)
@@ -358,9 +358,6 @@
"href" => "$b_url"), HTML::img($params))
: HTML::img($params);
}
- if ($mode == 'list')
- $url_text = HTML::a(array("id" => basename($value["name"])),
- $url_text);
// here we use different modes
if ($mode == 'tiles') {
$row->pushContent(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 14:34:33
|
Revision: 10734
http://sourceforge.net/p/phpwiki/code/10734
Author: vargenau
Date: 2021-12-06 14:34:32 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: fix getimagesize
Modified Paths:
--------------
trunk/lib/plugin/PhotoAlbum.php
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2021-12-06 13:34:26 UTC (rev 10733)
+++ trunk/lib/plugin/PhotoAlbum.php 2021-12-06 14:34:32 UTC (rev 10734)
@@ -283,15 +283,7 @@
break;
}
- // FIXME: get getimagesize to work with names with spaces in it.
- // convert $value["name"] from webpath to local path
- $size = @getimagesize($value["name"]); // try " " => "\\ "
- if (!$size and !empty($value["src"])) {
- $size = @getimagesize($value["src"]);
- if (!$size) {
- trigger_error("Unable to getimagesize(" . $value["name"] . ")");
- }
- }
+ $size = getimagesize($value["src"]); // try " " => "\\ "
$newwidth = $this->newSize($size[0], $width);
if ($width != 'auto' && $newwidth > 0) {
$params = array_merge($params, array("width" => $newwidth));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 13:34:28
|
Revision: 10733
http://sourceforge.net/p/phpwiki/code/10733
Author: vargenau
Date: 2021-12-06 13:34:26 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
Remove ENABLE_MARKUP_MEDIAWIKI_TABLE
Modified Paths:
--------------
trunk/lib/IniConfig.php
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2021-12-06 13:00:41 UTC (rev 10732)
+++ trunk/lib/IniConfig.php 2021-12-06 13:34:26 UTC (rev 10733)
@@ -144,7 +144,6 @@
'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA',
'ENABLE_WYSIWYG', 'WYSIWYG_DEFAULT_PAGETYPE_HTML',
'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE',
- 'ENABLE_MARKUP_MEDIAWIKI_TABLE',
'ENABLE_MARKUP_DIVSPAN', 'USE_BYTEA', 'UPLOAD_USERDIR', 'DISABLE_UNITS',
'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS',
'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 13:00:44
|
Revision: 10732
http://sourceforge.net/p/phpwiki/code/10732
Author: vargenau
Date: 2021-12-06 13:00:41 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
Remove old WikiUser options
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/lib/IniConfig.php
trunk/lib/plugin/DebugAuthInfo.php
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2021-12-06 12:49:15 UTC (rev 10731)
+++ trunk/config/config-default.ini 2021-12-06 13:00:41 UTC (rev 10732)
@@ -101,10 +101,6 @@
DBAUTH_IS_MEMBER = "SELECT userid FROM pref WHERE userid='$userid' AND groupname='$groupname'"
DBAUTH_GROUP_MEMBERS = "SELECT userid FROM pref WHERE groupname='$groupname'"
DBAUTH_USER_GROUPS = "SELECT groupname FROM pref WHERE userid='$userid'"
-; old WikiUser options:
-ALLOW_HTTP_AUTH_LOGIN = false
-ALLOW_LDAP_LOGIN = false
-ALLOW_IMAP_LOGIN = false
THEME = Sidebar
; DEFAULT_LANGUAGE =
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2021-12-06 12:49:15 UTC (rev 10731)
+++ trunk/lib/IniConfig.php 2021-12-06 13:00:41 UTC (rev 10732)
@@ -135,8 +135,8 @@
'STRICT_MAILABLE_PAGEDUMPS', 'COMPRESS_OUTPUT',
'ALLOW_ANON_USER', 'ALLOW_ANON_EDIT',
'ALLOW_BOGO_LOGIN', 'ALLOW_USER_PASSWORDS',
- 'AUTH_USER_FILE_STORABLE', 'ALLOW_HTTP_AUTH_LOGIN',
- 'ALLOW_USER_LOGIN', 'ALLOW_LDAP_LOGIN', 'ALLOW_IMAP_LOGIN',
+ 'AUTH_USER_FILE_STORABLE',
+ 'ALLOW_USER_LOGIN',
'WARN_NONPUBLIC_INTERWIKIMAP', 'USE_PATH_INFO',
'PLUGIN_CACHED_USECACHE', 'PLUGIN_CACHED_FORCE_SYNCMAP',
'BLOG_DEFAULT_EMPTY_PREFIX', 'DATABASE_PERSISTENT',
@@ -211,8 +211,7 @@
// calculate them later: old or dynamic constants
if (!array_key_exists($item, $rs) and
in_array($item, array('USE_PATH_INFO', 'USE_DB_SESSION',
- 'ALLOW_HTTP_AUTH_LOGIN', 'ALLOW_LDAP_LOGIN',
- 'ALLOW_IMAP_LOGIN', 'ALLOW_USER_LOGIN',
+ 'ALLOW_USER_LOGIN',
'REQUIRE_SIGNIN_BEFORE_EDIT',
'WIKIDB_NOCACHE_MARKUP',
'COMPRESS_OUTPUT', 'USE_BYTEA', 'ISREADONLY',
Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php 2021-12-06 12:49:15 UTC (rev 10731)
+++ trunk/lib/plugin/DebugAuthInfo.php 2021-12-06 13:00:41 UTC (rev 10732)
@@ -75,10 +75,10 @@
"ALLOW_ANON_EDIT", "ALLOW_BOGO_LOGIN",
"REQUIRE_SIGNIN_BEFORE_EDIT", "ALLOW_USER_PASSWORDS",
"PASSWORD_LENGTH_MINIMUM", "USE_DB_SESSION"))));
- if ((defined('ALLOW_LDAP_LOGIN') && ALLOW_LDAP_LOGIN) or in_array("LDAP", $GLOBALS['USER_AUTH_ORDER']))
+ if (in_array("LDAP", $GLOBALS['USER_AUTH_ORDER']))
$table->pushContent($this->show_hash("LDAP DEFINES",
$this->buildConstHash(array("LDAP_AUTH_HOST", "LDAP_BASE_DN"))));
- if ((defined('ALLOW_IMAP_LOGIN') && ALLOW_IMAP_LOGIN) or in_array("IMAP", $GLOBALS['USER_AUTH_ORDER']))
+ if (in_array("IMAP", $GLOBALS['USER_AUTH_ORDER']))
$table->pushContent($this->show_hash("IMAP DEFINES", array("IMAP_AUTH_HOST" => IMAP_AUTH_HOST)));
if (defined('AUTH_USER_FILE') or in_array("File", $GLOBALS['USER_AUTH_ORDER']))
$table->pushContent($this->show_hash("AUTH_USER_FILE",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 12:49:18
|
Revision: 10731
http://sourceforge.net/p/phpwiki/code/10731
Author: vargenau
Date: 2021-12-06 12:49:15 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
Remove EDITING_POLICY
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/lib/IniConfig.php
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/pgsrc/ReleaseNotes
trunk/themes/Crao/templates/signin.tmpl
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/default/templates/signin.tmpl
trunk/themes/smaller/templates/signin.tmpl
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/config/config-default.ini 2021-12-06 12:49:15 UTC (rev 10731)
@@ -101,7 +101,6 @@
DBAUTH_IS_MEMBER = "SELECT userid FROM pref WHERE userid='$userid' AND groupname='$groupname'"
DBAUTH_GROUP_MEMBERS = "SELECT userid FROM pref WHERE groupname='$groupname'"
DBAUTH_USER_GROUPS = "SELECT groupname FROM pref WHERE userid='$userid'"
-EDITING_POLICY = "EditingPolicy"
; old WikiUser options:
ALLOW_HTTP_AUTH_LOGIN = false
ALLOW_LDAP_LOGIN = false
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/config/config-dist.ini 2021-12-06 12:49:15 UTC (rev 10731)
@@ -1070,9 +1070,6 @@
; to prevent from external 1 pixel spam.
;DISABLE_GETIMAGESIZE = true
-; A interim page which gets displayed on every edit attempt, if it exists.
-;EDITING_POLICY = EditingPolicy
-
; Enable random quotes from a fortune directory when adding a new page.
; Usually at /usr/share/fortune or /usr/share/games/fortune
; If empty no quotes are inserted.
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/configurator.php 2021-12-06 12:49:15 UTC (rev 10731)
@@ -1457,9 +1457,6 @@
$properties["Disable GETIMAGESIZE"] =
new boolean_define_commented_optional('DISABLE_GETIMAGESIZE');
-$properties["EDITING_POLICY"] =
- new _define_optional('EDITING_POLICY');
-
$properties["TOOLBAR_PAGELINK_PULLDOWN"] =
new _define_commented_optional('TOOLBAR_PAGELINK_PULLDOWN');
$properties["TOOLBAR_TEMPLATE_PULLDOWN"] =
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/lib/IniConfig.php 2021-12-06 12:49:15 UTC (rev 10731)
@@ -89,7 +89,7 @@
'COOKIE_EXPIRATION_DAYS', 'COOKIE_DOMAIN',
'PASSWORD_LENGTH_MINIMUM', 'USER_AUTH_POLICY',
'GROUP_METHOD',
- 'EDITING_POLICY', 'THEME',
+ 'THEME',
'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC',
'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', /*'KEYWORDS',*/
// extra logic:
Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/locale/it/pgsrc/NoteDiRilascio 2021-12-06 12:49:15 UTC (rev 10731)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Nov 2021 17:01:34 +0000
+Date: Mon, 6 Dec 2021 12:42:19 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=NoteDiRilascio;
@@ -8,7 +8,7 @@
<<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
-== 1.6.1 2021-XX-XX Marc-Etienne Vargenau ==
+== 1.6.1 2021-12-XX Marc-Etienne Vargenau ==
This release makes ~PhpWiki compatible with PHP 8.1.
##READONLY## is renamed as ##ISREADONLY##, since ##readonly## is now a keyword in PHP 8.1.
@@ -20,6 +20,7 @@
* Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
* Add “Rename” tab in Sidebar theme.
* Add sample images for ~PhotoAlbum in blog theme
+* Remove EDITING_POLICY
* More translations
=== Plugins ===
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/pgsrc/ReleaseNotes 2021-12-06 12:49:15 UTC (rev 10731)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Nov 2021 17:01:34 +0000
+Date: Mon, 6 Dec 2021 12:42:19 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -8,7 +8,7 @@
<<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
-== 1.6.1 2021-XX-XX Marc-Etienne Vargenau ==
+== 1.6.1 2021-12-XX Marc-Etienne Vargenau ==
This release makes ~PhpWiki compatible with PHP 8.1.
##READONLY## is renamed as ##ISREADONLY##, since ##readonly## is now a keyword in PHP 8.1.
@@ -20,6 +20,7 @@
* Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
* Add “Rename” tab in Sidebar theme.
* Add sample images for ~PhotoAlbum in blog theme
+* Remove EDITING_POLICY
* More translations
=== Plugins ===
Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/themes/Crao/templates/signin.tmpl 2021-12-06 12:49:15 UTC (rev 10731)
@@ -37,13 +37,6 @@
?>
<script type="text/javascript"> <!--
function SignIn(form) {
- <?php /* (comment out:)
- if (window.focus) {
- window.open('/EditingPolicy.html',<!-- url -->
- 'PleaseReadThisFirst',<!-- window name -->
- 'width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes');
- }
- */ ?>
form.submit();
}
//-->
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/themes/Wordpress/templates/signin.tmpl 2021-12-06 12:49:15 UTC (rev 10731)
@@ -48,13 +48,6 @@
?>
<script type="text/javascript"> <!--
function SignIn(form,userid) {
- <?php if (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY)) { ?>
- if (window.focus) {
- window.open('<?php echo WikiURL(EDITING_POLICY) ?>',<!-- url -->
- 'PleaseReadThisFirst',<!-- window name -->
- 'width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes');
- }
- <?php } ?>
if (userid) {
form.elements["auth[userid]"].value = userid;
}
Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/themes/default/templates/signin.tmpl 2021-12-06 12:49:15 UTC (rev 10731)
@@ -41,12 +41,7 @@
}
$editing_policy = (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY));
$SignInJS = JavaScript('
- function SignIn(form,userid) {'.($editing_policy ? '
- if (window.focus) {
- window.open("' . WikiURL(EDITING_POLICY) . '",<!-- url -->
- "PleaseReadThisFirst",<!-- window name -->
- "width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes");
- }':'').'
+ function SignIn(form,userid) {
if (userid) {
form.elements["auth[userid]"].value = userid;
}
Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/themes/smaller/templates/signin.tmpl 2021-12-06 12:49:15 UTC (rev 10731)
@@ -34,12 +34,7 @@
$SignInInput->addTooltip(_("Enter your UserId to sign in"));
$editing_policy = (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY));
$SignInJS = JavaScript('
- function SignIn(form,userid) {'.($editing_policy ? '
- if (window.focus) {
- window.open("' . WikiURL(EDITING_POLICY) . '",<!-- url -->
- "PleaseReadThisFirst",<!-- window name -->
- "width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes");
- }':'').'
+ function SignIn(form,userid) {
if (userid) {
form.elements["auth[userid]"].value = userid;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 10:53:33
|
Revision: 10730
http://sourceforge.net/p/phpwiki/code/10730
Author: vargenau
Date: 2021-12-06 10:53:32 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
merge themes/Wordpress/templates/signin.tmpl with themes/default/templates/signin.tmpl
Modified Paths:
--------------
trunk/themes/Wordpress/templates/signin.tmpl
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl 2021-12-06 10:31:29 UTC (rev 10729)
+++ trunk/themes/Wordpress/templates/signin.tmpl 2021-12-06 10:53:32 UTC (rev 10730)
@@ -1,6 +1,4 @@
<?php
-// MPickering: modified; this will be enclosed within an ul
-
if (empty($FORMNAME))
$FORMNAME = 'signin';
else
@@ -8,7 +6,7 @@
?>
<?php if (empty($NOFORM)) { ?>
<li>
- <form method="post" action="<?php echo $request->getPostURL()?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
+ <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
<?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
<?php } ?>
<?php
@@ -39,13 +37,14 @@
'onchange' => "SignIn(this.form,false);"));
$SignInInput->addTooltip(_("Enter your UserId to sign in"));
$userid = $user->getId();
- if ($user->isSignedIn())
- echo sprintf(_("You are signed but not authenticated as %s. "),
+ if ($user->isSignedIn()) {
+ echo sprintf(_("You are signed but not authenticated as %s. "),
asXML(HTML::a(array(
'href'=>'#',
'title' => sprintf(_("Click to authenticate as %s"),$userid),
'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
- $userid)));
+ $userid)));
+ }
?>
<script type="text/javascript"> <!--
function SignIn(form,userid) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 10:31:30
|
Revision: 10729
http://sourceforge.net/p/phpwiki/code/10729
Author: vargenau
Date: 2021-12-06 10:31:29 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
There is no blog/signin template
Modified Paths:
--------------
trunk/themes/blog/templates/navbar.tmpl
Modified: trunk/themes/blog/templates/navbar.tmpl
===================================================================
--- trunk/themes/blog/templates/navbar.tmpl 2021-12-06 10:30:56 UTC (rev 10728)
+++ trunk/themes/blog/templates/navbar.tmpl 2021-12-06 10:31:29 UTC (rev 10729)
@@ -16,7 +16,7 @@
<li><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?></li>
<?php } ?>
</ul>
-<?php echo Template("blog/signin") ?>
+<?php echo Template("signin") ?>
</div>
</div>
</nav>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 10:30:57
|
Revision: 10728
http://sourceforge.net/p/phpwiki/code/10728
Author: vargenau
Date: 2021-12-06 10:30:56 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
Remove old comment
Modified Paths:
--------------
trunk/themes/smaller/templates/signin.tmpl
Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl 2021-12-06 10:09:04 UTC (rev 10727)
+++ trunk/themes/smaller/templates/signin.tmpl 2021-12-06 10:30:56 UTC (rev 10728)
@@ -12,7 +12,6 @@
if ($user->isAuthenticated()) {
$Sep = $WikiTheme->getButtonSeparator();
$SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
- // fails on gecko!
$SignOutJS = JavaScript(' document.write(\'<input type="hidden" name="auth[logout]" value="0" />\');
function SignOut() {
var form = document.forms["'.$FORMNAME.'"];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 10:09:06
|
Revision: 10727
http://sourceforge.net/p/phpwiki/code/10727
Author: vargenau
Date: 2021-12-06 10:09:04 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
blog: improve layout for PhpWikiAdministration page
Modified Paths:
--------------
trunk/themes/blog/Kubrick.css
Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css 2021-12-06 09:50:43 UTC (rev 10726)
+++ trunk/themes/blog/Kubrick.css 2021-12-06 10:09:04 UTC (rev 10727)
@@ -78,6 +78,10 @@
font-size: 11px; /* we need pixel units here to match the background */
}
+table a.wiki {
+ font-size: 90%;
+}
+
#pagetrail {
margin-left: 19px;
width: 540px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-06 09:50:44
|
Revision: 10726
http://sourceforge.net/p/phpwiki/code/10726
Author: vargenau
Date: 2021-12-06 09:50:43 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
blog: add div id=content in viewsource.tmpl to apply padding-left
Modified Paths:
--------------
trunk/themes/blog/templates/viewsource.tmpl
Modified: trunk/themes/blog/templates/viewsource.tmpl
===================================================================
--- trunk/themes/blog/templates/viewsource.tmpl 2021-12-06 09:26:30 UTC (rev 10725)
+++ trunk/themes/blog/templates/viewsource.tmpl 2021-12-06 09:50:43 UTC (rev 10726)
@@ -11,9 +11,12 @@
</p>
<?php } ?>
<br class="clear-floats" />
+<div id="content" class="narrowcolumn">
<textarea class="wikiedit"
name="content"
rows="<?php echo $request->getPref('editHeight')?>"
cols="<?php echo $request->getPref('editWidth')?>"
readonly="readonly"
-><?php echo $PAGE_SOURCE ?></textarea>
+><?php echo $PAGE_SOURCE ?>
+</textarea>
+</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
286 messages has been excluded from this view by a project administrator.
