Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2021-11-29 13:15:17
|
Revision: 10701
http://sourceforge.net/p/phpwiki/code/10701
Author: vargenau
Date: 2021-11-29 13:15:14 +0000 (Mon, 29 Nov 2021)
Log Message:
-----------
WhoIsOnline plugin: remove unused arguments pagename, allow_detail, dispose_admin
Modified Paths:
--------------
trunk/lib/plugin/WhoIsOnline.php
trunk/locale/de/pgsrc/WerIstOnline
trunk/locale/fr/pgsrc/QuiEstEnLigne
trunk/pgsrc/Help%2FWhoIsOnlinePlugin
trunk/pgsrc/WhoIsOnline
Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php 2021-11-29 11:44:02 UTC (rev 10700)
+++ trunk/lib/plugin/WhoIsOnline.php 2021-11-29 13:15:14 UTC (rev 10701)
@@ -46,9 +46,6 @@
// two modes: summary and detail, page links to the page with the other mode
return array(
'mode' => 'summary', // or "detail"
- 'pagename' => '[pagename]', // refer to the page with the other mode
- 'allow_detail' => false, // if false, page is ignored
- 'dispose_admin' => false,
);
}
@@ -191,8 +188,6 @@
}
$num_users = $num_guests + $num_registered;
- //TODO: get and sets max stats in global_data
- //$page = $dbi->getPage($request->getArg('pagename'));
$stats = array();
$stats['max_online_num'] = 0;
if ($stats = $dbi->get('stats')) {
Modified: trunk/locale/de/pgsrc/WerIstOnline
===================================================================
--- trunk/locale/de/pgsrc/WerIstOnline 2021-11-29 11:44:02 UTC (rev 10700)
+++ trunk/locale/de/pgsrc/WerIstOnline 2021-11-29 13:15:14 UTC (rev 10701)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Apr 2019 16:39:09 +0000
+Date: Mon, 29 Nov 2021 14:11:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=WerIstOnline;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<WhoIsOnline allow_detail=1>>
+<<WhoIsOnline>>
----
[[KategorieAktionSeite]]
Modified: trunk/locale/fr/pgsrc/QuiEstEnLigne
===================================================================
--- trunk/locale/fr/pgsrc/QuiEstEnLigne 2021-11-29 11:44:02 UTC (rev 10700)
+++ trunk/locale/fr/pgsrc/QuiEstEnLigne 2021-11-29 13:15:14 UTC (rev 10701)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:17 +0000
+Date: Mon, 29 Nov 2021 14:11:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=QuiEstEnLigne;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<WhoIsOnline allow_detail=1>>
+<<WhoIsOnline>>
----
[[CatégoriePageDAction]]
Modified: trunk/pgsrc/Help%2FWhoIsOnlinePlugin
===================================================================
--- trunk/pgsrc/Help%2FWhoIsOnlinePlugin 2021-11-29 11:44:02 UTC (rev 10700)
+++ trunk/pgsrc/Help%2FWhoIsOnlinePlugin 2021-11-29 13:15:14 UTC (rev 10701)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 29 Nov 2021 14:11:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWhoIsOnlinePlugin;
@@ -24,18 +24,6 @@
| **mode**
| summary or detail
| summary
-|-
-| **pagename**
-| Refer to the page with the other mode
-| [pagename]
-|-
-| **allow_detail**
-| If false, page is ignored
-| false
-|-
-| **mode**
-|
-| false
|}
== Example ==
Modified: trunk/pgsrc/WhoIsOnline
===================================================================
--- trunk/pgsrc/WhoIsOnline 2021-11-29 11:44:02 UTC (rev 10700)
+++ trunk/pgsrc/WhoIsOnline 2021-11-29 13:15:14 UTC (rev 10701)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 29 Nov 2021 14:11:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=WhoIsOnline;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<WhoIsOnline allow_detail=1>>
+<<WhoIsOnline>>
----
[[CategoryActionPage]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-11-30 09:00:27
|
Revision: 10702
http://sourceforge.net/p/phpwiki/code/10702
Author: vargenau
Date: 2021-11-30 09:00:23 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
Arguments pagename, allow_detail, dispose_admin are used in themes/default/templates/online.tmpl
Modified Paths:
--------------
trunk/lib/plugin/WhoIsOnline.php
trunk/locale/de/pgsrc/WerIstOnline
trunk/locale/fr/pgsrc/QuiEstEnLigne
trunk/pgsrc/Help%2FWhoIsOnlinePlugin
trunk/pgsrc/WhoIsOnline
Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php 2021-11-29 13:15:14 UTC (rev 10701)
+++ trunk/lib/plugin/WhoIsOnline.php 2021-11-30 09:00:23 UTC (rev 10702)
@@ -46,6 +46,9 @@
// two modes: summary and detail, page links to the page with the other mode
return array(
'mode' => 'summary', // or "detail"
+ 'pagename' => '[pagename]', // refer to the page with the other mode
+ 'allow_detail' => false, // if false, page is ignored
+ 'dispose_admin' => false,
);
}
@@ -54,19 +57,44 @@
* @param string $argstr
* @param WikiRequest $request
* @param string $basepage
- * @return mixed
+ * @return Template
*/
function run($dbi, $argstr, &$request, $basepage)
{
global $WikiTheme;
+
$request->setArg('nocache', 1);
$args = $this->getArgs($argstr, $request);
+ extract($args);
+
+ if (!is_bool($allow_detail)) {
+ if (($allow_detail == '0') || ($allow_detail == 'false')) {
+ $allow_detail = false;
+ } elseif (($allow_detail == '1') || ($allow_detail == 'true')) {
+ $allow_detail = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "allow_detail"));
+ }
+ }
+
+ if (!is_bool($dispose_admin)) {
+ if (($dispose_admin == '0') || ($dispose_admin == 'false')) {
+ $dispose_admin = false;
+ } elseif (($dispose_admin == '1') || ($dispose_admin == 'true')) {
+ $dispose_admin = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "dispose_admin"));
+ }
+ }
+
// use the "online.tmpl" template
// todo: check which arguments are really needed in the template.
$stats = $this->getStats($dbi, $request, $args['mode']);
- if ($src = $WikiTheme->getImageURL("whosonline"))
+ if ($src = $WikiTheme->getImageURL("whosonline")) {
$img = HTML::img(array('src' => $src, 'alt' => $this->getName()));
- else $img = '';
+ } else {
+ $img = '';
+ }
$other = array();
$other['ONLINE_ICON'] = $img;
return new Template('online', $request, array_merge($args, $stats, $other));
@@ -79,7 +107,7 @@
* @param string $args
* @param WikiRequest $request
* @param string $basepage
- * @return $this|HtmlElement
+ * @return HTML
*/
function box($args = '', $request = null, $basepage = '')
{
@@ -92,13 +120,8 @@
$stats['NUM_USERS']))))));
}
- function getSessions($dbi, &$request)
- {
- // check the current user sessions and what they are doing
- }
-
// check the current sessions
- function getStats($dbi, &$request, $mode = 'summary')
+ function getStats($dbi, $request, $mode = 'summary')
{
$num_pages = 0;
$num_users = 0;
@@ -188,6 +211,8 @@
}
$num_users = $num_guests + $num_registered;
+ //TODO: get and sets max stats in global_data
+ //$page = $dbi->getPage($request->getArg('pagename'));
$stats = array();
$stats['max_online_num'] = 0;
if ($stats = $dbi->get('stats')) {
Modified: trunk/locale/de/pgsrc/WerIstOnline
===================================================================
--- trunk/locale/de/pgsrc/WerIstOnline 2021-11-29 13:15:14 UTC (rev 10701)
+++ trunk/locale/de/pgsrc/WerIstOnline 2021-11-30 09:00:23 UTC (rev 10702)
@@ -1,4 +1,4 @@
-Date: Mon, 29 Nov 2021 14:11:05 +0000
+Date: Wed, 10 Apr 2019 16:39:09 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=WerIstOnline;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<WhoIsOnline>>
+<<WhoIsOnline allow_detail=1>>
----
[[KategorieAktionSeite]]
Modified: trunk/locale/fr/pgsrc/QuiEstEnLigne
===================================================================
--- trunk/locale/fr/pgsrc/QuiEstEnLigne 2021-11-29 13:15:14 UTC (rev 10701)
+++ trunk/locale/fr/pgsrc/QuiEstEnLigne 2021-11-30 09:00:23 UTC (rev 10702)
@@ -1,4 +1,4 @@
-Date: Mon, 29 Nov 2021 14:11:05 +0000
+Date: Thu, 13 Oct 2016 15:09:17 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=QuiEstEnLigne;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<WhoIsOnline>>
+<<WhoIsOnline allow_detail=1>>
----
[[CatégoriePageDAction]]
Modified: trunk/pgsrc/Help%2FWhoIsOnlinePlugin
===================================================================
--- trunk/pgsrc/Help%2FWhoIsOnlinePlugin 2021-11-29 13:15:14 UTC (rev 10701)
+++ trunk/pgsrc/Help%2FWhoIsOnlinePlugin 2021-11-30 09:00:23 UTC (rev 10702)
@@ -1,4 +1,4 @@
-Date: Mon, 29 Nov 2021 14:11:05 +0000
+Date: Mon, 29 Nov 2021 19:45:46 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWhoIsOnlinePlugin;
@@ -24,8 +24,26 @@
| **mode**
| summary or detail
| summary
+|-
+| **pagename**
+| Refer to the page with the other mode.
+| ~[pagename]
+|-
+| **allow_detail**
+| Boolean. If true, in summary mode, add a link to the detail mode.
+| false
+|-
+| **dispose_admin**
+| Boolean. If true, also display the fact that admin is online.
+| false
|}
+**Note:** if you use ##allow_detail## with mode ##detail##, use the
+following syntax to be able to switch between modes:
+{{{
+<<WhoIsOnline mode||=detail allow_detail=true>>
+}}}
+
== Example ==
{{{
Modified: trunk/pgsrc/WhoIsOnline
===================================================================
--- trunk/pgsrc/WhoIsOnline 2021-11-29 13:15:14 UTC (rev 10701)
+++ trunk/pgsrc/WhoIsOnline 2021-11-30 09:00:23 UTC (rev 10702)
@@ -1,4 +1,4 @@
-Date: Mon, 29 Nov 2021 14:11:05 +0000
+Date: Thu, 13 Oct 2016 15:09:28 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=WhoIsOnline;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<WhoIsOnline>>
+<<WhoIsOnline allow_detail=1>>
----
[[CategoryActionPage]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-11-30 09:14:57
|
Revision: 10703
http://sourceforge.net/p/phpwiki/code/10703
Author: vargenau
Date: 2021-11-30 09:14:54 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
Better message in themes/default/templates/online.tmpl
Modified Paths:
--------------
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/themes/default/templates/online.tmpl
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-11-30 09:00:23 UTC (rev 10702)
+++ trunk/locale/po/de.po 2021-11-30 09:14:54 UTC (rev 10703)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 12:58+0100\n"
+"POT-Creation-Date: 2021-11-30 10:11+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."
@@ -5357,11 +5357,10 @@
#, php-format
msgid ""
-"In total there are %d user sessions online. :: Unique %d Registered and %d "
-"Guests"
+"In total there are %d user sessions online: %d registered and %d guests."
msgstr ""
-"Insgesamt sind %d Benutzersessions online. :: %d verschiedene Registrierte "
-"und %d Gäste"
+"Insgesamt sind %d Benutzersessions online: %d verschiedene Registrierte und "
+"%d Gäste."
#, php-format
msgid "Most users ever online was %d at %s."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2021-11-30 09:00:23 UTC (rev 10702)
+++ trunk/locale/po/es.po 2021-11-30 09:14:54 UTC (rev 10703)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 12:58+0100\n"
+"POT-Creation-Date: 2021-11-30 10:11+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -5243,8 +5243,7 @@
#, php-format
msgid ""
-"In total there are %d user sessions online. :: Unique %d Registered and %d "
-"Guests"
+"In total there are %d user sessions online: %d registered and %d guests."
msgstr ""
#, php-format
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2021-11-30 09:00:23 UTC (rev 10702)
+++ trunk/locale/po/fr.po 2021-11-30 09:14:54 UTC (rev 10703)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 12:58+0100\n"
+"POT-Creation-Date: 2021-11-30 10:11+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."
@@ -5343,14 +5343,12 @@
#, php-format
msgid ""
-"In total there are %d user sessions online. :: Unique %d Registered and %d "
-"Guests"
-msgstr ""
-"Au total: %d utilisateurs en ligne. :: %d enregistré(s) et %d invité(s)"
+"In total there are %d user sessions online: %d registered and %d guests."
+msgstr "Au total: %d utilisateurs en ligne: %d enregistrés et %d invités."
#, php-format
msgid "Most users ever online was %d at %s."
-msgstr "Record du nombre d'utilisateur: %d le %s."
+msgstr "Record du nombre d'utilisateurs : %d le %s."
msgid "Registered Users Online: "
msgstr "Utilisateurs enregistrés en ligne : "
@@ -5363,7 +5361,7 @@
msgstr "Ces données sont basées sur les utilisateurs actifs depuis %s."
msgid "Sorry, no dynamic DB Session support."
-msgstr "Désolé, Session dynamique non supportées."
+msgstr "Désolé, les sessions dynamiques ne sont pas supportées."
msgid "Switch to summary"
msgstr "Aller au résumé"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2021-11-30 09:00:23 UTC (rev 10702)
+++ trunk/locale/po/it.po 2021-11-30 09:14:54 UTC (rev 10703)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 12:58+0100\n"
+"POT-Creation-Date: 2021-11-30 10:11+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"
@@ -5203,8 +5203,7 @@
#, php-format
msgid ""
-"In total there are %d user sessions online. :: Unique %d Registered and %d "
-"Guests"
+"In total there are %d user sessions online: %d registered and %d guests."
msgstr ""
#, php-format
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2021-11-30 09:00:23 UTC (rev 10702)
+++ trunk/locale/po/ja.po 2021-11-30 09:14:54 UTC (rev 10703)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 12:58+0100\n"
+"POT-Creation-Date: 2021-11-30 10:11+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"
@@ -5189,8 +5189,7 @@
#, php-format
msgid ""
-"In total there are %d user sessions online. :: Unique %d Registered and %d "
-"Guests"
+"In total there are %d user sessions online: %d registered and %d guests."
msgstr ""
#, php-format
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2021-11-30 09:00:23 UTC (rev 10702)
+++ trunk/locale/po/nl.po 2021-11-30 09:14:54 UTC (rev 10703)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 12:58+0100\n"
+"POT-Creation-Date: 2021-11-30 10:11+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"
@@ -5195,8 +5195,7 @@
#, php-format
msgid ""
-"In total there are %d user sessions online. :: Unique %d Registered and %d "
-"Guests"
+"In total there are %d user sessions online: %d registered and %d guests."
msgstr ""
#, php-format
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2021-11-30 09:00:23 UTC (rev 10702)
+++ trunk/locale/po/phpwiki.pot 2021-11-30 09:14:54 UTC (rev 10703)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 12:58+0100\n"
+"POT-Creation-Date: 2021-11-30 10:11+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"
@@ -5189,8 +5189,7 @@
#, php-format
msgid ""
-"In total there are %d user sessions online. :: Unique %d Registered and %d "
-"Guests"
+"In total there are %d user sessions online: %d registered and %d guests."
msgstr ""
#, php-format
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2021-11-30 09:00:23 UTC (rev 10702)
+++ trunk/locale/po/sv.po 2021-11-30 09:14:54 UTC (rev 10703)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 12:58+0100\n"
+"POT-Creation-Date: 2021-11-30 10:11+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -5190,8 +5190,7 @@
#, php-format
msgid ""
-"In total there are %d user sessions online. :: Unique %d Registered and %d "
-"Guests"
+"In total there are %d user sessions online: %d registered and %d guests."
msgstr ""
#, php-format
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2021-11-30 09:00:23 UTC (rev 10702)
+++ trunk/locale/po/zh.po 2021-11-30 09:14:54 UTC (rev 10703)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 12:58+0100\n"
+"POT-Creation-Date: 2021-11-30 10:11+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -5213,8 +5213,7 @@
#, php-format
msgid ""
-"In total there are %d user sessions online. :: Unique %d Registered and %d "
-"Guests"
+"In total there are %d user sessions online: %d registered and %d guests."
msgstr ""
#, php-format
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl 2021-11-30 09:00:23 UTC (rev 10702)
+++ trunk/themes/default/templates/online.tmpl 2021-11-30 09:14:54 UTC (rev 10703)
@@ -23,7 +23,7 @@
</td></tr>
<?php if ($SESSDATA_BOOL) { ?>
<tr><td class="row1 gensmall">
- <?php echo fmt("In total there are %d user sessions online. :: Unique %d Registered and %d Guests",
+ <?php echo fmt("In total there are %d user sessions online: %d registered and %d guests.",
$NUM_ONLINE,$NUM_REGISTERED,$NUM_GUESTS) ?><br />
<?php echo $MAX_ONLINE_NUM ? fmt("Most users ever online was %d at %s.",$MAX_ONLINE_NUM,$MAX_ONLINE_TIME) : '' ?><br />
<?php echo fmt("Registered Users Online: ") ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-11-30 17:30:33
|
Revision: 10713
http://sourceforge.net/p/phpwiki/code/10713
Author: vargenau
Date: 2021-11-30 17:30:27 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
FileInfo plugin: remove Windows stuff, update help page
Modified Paths:
--------------
trunk/lib/plugin/FileInfo.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%2FFileInfoPlugin
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/lib/plugin/FileInfo.php 2021-11-30 17:30:27 UTC (rev 10713)
@@ -24,13 +24,13 @@
*/
/**
- * This plugin displays the version, date, size, perms of an uploaded file.
+ * This plugin displays the date, size, path, etc. of an uploaded file.
* Only files relative and below to the uploads path can be handled.
*
* Usage:
- * <<FileInfo file=Upload:setup.exe display=version,date >>
- * <<FileInfo file=Upload:setup.exe display=name,version,date
- * format="%s (version: %s, date: %s)" >>
+ * <<FileInfo file=Upload:image.png display=size,date >>
+ * <<FileInfo file=Upload:image.png display=name,size,date
+ * format="%s (size: %s, date: %s)" >>
*
* @author: Reini Urban
*/
@@ -40,7 +40,7 @@
{
function getDescription()
{
- return _("Display file information like version, size, date... of uploaded files.");
+ return _("Display file information like size, date... of uploaded files.");
}
function getDefaultArguments()
@@ -47,7 +47,7 @@
{
return array(
'file' => false, // relative path from PHPWIKI_DIR. (required)
- 'display' => false, // version,phonysize,size,date,mtime,owner,name,path,dirname,link. (required)
+ 'display' => false, // size,phonysize,date,mtime,owner,group,name,path,dirname,magic,link (required)
'format' => false, // printf format string with %s only, all display modes
'quiet' => false // print no error if file not found
// from above vars return strings (optional)
@@ -107,9 +107,6 @@
$modes = explode(",", $display);
foreach ($modes as $mode) {
switch ($mode) {
- case 'version':
- $s[] = $this->exeversion($file);
- break;
case 'size':
$s[] = filesize($file);
break;
@@ -142,9 +139,6 @@
case 'magic':
$s[] = $this->magic($file);
break;
- case 'mime-typ':
- $s[] = $this->mime_type($file);
- break;
case 'link':
if ($is_Upload) {
$s[] = " [" . $args['file'] . "]";
@@ -192,11 +186,6 @@
return $result;
}
- function mime_type($file)
- {
- return '';
- }
-
private function _formatsize($n, $factor, $suffix = '')
{
if ($n > $factor) {
@@ -207,7 +196,7 @@
return '';
}
- function phonysize($a)
+ private function phonysize($a)
{
$factor = 1024 * 1024 * 1000;
if ($a > $factor)
@@ -223,131 +212,4 @@
else
return $a;
}
-
- function exeversion($file)
- {
- if (!isWindows()) return "?";
- if (class_exists('ffi') or loadPhpExtension('ffi'))
- return $this->exeversion_ffi($file);
- if (function_exists('res_list_type') or loadPhpExtension('win32std'))
- return $this->exeversion_resopen($file);
- return exeversion_showver($file);
- }
-
- // http://www.codeproject.com/dll/showver.asp
- function exeversion_showver($file)
- {
- $path = realpath($file);
- $result = `showver $path`;
- return "?";
- }
-
- function exeversion_ffi($file)
- {
- if (!DEBUG)
- return "?"; // not yet stable
-
- if (function_exists('ffi') or loadPhpExtension('ffi')) {
- $win32_idl = "
-struct VS_FIXEDFILEINFO {
- DWORD dwSignature;
- DWORD dwStrucVersion;
- DWORD dwFileVersionMS;
- DWORD dwFileVersionLS;
- DWORD dwProductVersionMS;
- DWORD dwProductVersionLS;
- DWORD dwFileFlagsMask;
- DWORD dwFileFlags;
- DWORD dwFileOS;
- DWORD dwFileType;
- DWORD dwFileSubtype;
- DWORD dwFileDateMS;
- DWORD dwFileDateLS;
-};
-struct VS_VERSIONINFO { struct VS_VERSIONINFO
- WORD wLength;
- WORD wValueLength;
- WORD wType;
- WCHAR szKey[1];
- WORD Padding1[1];
- VS_FIXEDFILEINFO Value;
- WORD Padding2[1];
- WORD Children[1];
-};
-[lib='kernel32.dll'] DWORD GetFileVersionInfoSizeA(char *szFileName, DWORD *dwVerHnd);
-[lib='kernel32.dll'] int GetFileVersionInfoA(char *sfnFile, DWORD dummy, DWORD size, struct VS_VERSIONINFO *pVer);
-";
- $ffi = new ffi($win32_idl);
- $dummy = 0; // &DWORD
- $size = $ffi->GetFileVersionInfoSizeA($file, $dummy);
- //$pVer = str_repeat($size+1);
- $pVer = new ffi_struct($ffi, "VS_VERSIONINFO");
- if ($ffi->GetFileVersionInfoA($file, 0, $size, $pVer)
- and $pVer->wValueLength
- ) {
- // analyze the VS_FIXEDFILEINFO(Value);
- // $pValue = new ffi_struct($ffi, "VS_FIXEDFILEINFO");
- $pValue =& $pVer->Value;
- return sprintf("%d.%d.%d.%d",
- $pValue->dwFileVersionMS >> 16,
- $pValue->dwFileVersionMS & 0xFFFF,
- $pValue->dwFileVersionLS >> 16,
- $pValue->dwFileVersionLS & 0xFFFF);
- }
- }
- return '';
- }
-
- // Read "RT_VERSION/VERSIONINFO" exe/dll resource info for MSWin32 binaries
- // The "win32std" extension is not ready yet to pass back a VERSIONINFO struct
- function exeversion_resopen($file)
- {
- if (function_exists('res_list_type') or loadPhpExtension('win32std')) {
- // See http://msdn.microsoft.com/workshop/networking/predefined/res.asp
- $v = file_get_contents('res://' . realpath($file) . urlencode('/RT_VERSION/#1'));
- if ($v) {
- // This is really a binary VERSIONINFO block, with lots of
- // nul bytes (widechar) which cannot be transported as string.
- return "$v";
- } else {
- $h = res_open(realpath($file));
- $v = res_get($h, 'RT_VERSION', 'FileVersion');
- res_close($h);
- if ($v) return $v;
-
- $h = res_open(realpath($file));
- $v = res_get($h, '#1', 'RT_VERSION', 1);
- res_close($h);
- if ($v) return $v;
- }
-
- /* The version consists of two 32-bit integers, defined by four 16-bit integers.
- For example, "FILEVERSION 3,10,0,61" is translated into two doublewords:
- 0x0003000a and 0x0000003d, in that order. */
- /*
- $h = res_open(realpath($file));
-
- echo "Res list of '$file': \n";
- $list= res_list_type($h, true);
- if( $list===FALSE ) err( "Can't list type" );
-
- for( $i= 0; $i<count($list); $i++ ) {
- echo $list[$i]."\n";
- $res= res_list($h, $list[$i]);
- for( $j= 0; $j<count($res); $j++ ) {
- echo "\t".$res[$j]."\n";
- }
- }
- echo "Res get: ".res_get( $h, 'A_TYPE', 'A_RC_NAME' )."\n\n";
- res_close( $h );
- */
- if ($v)
- return "$v";
- else
- return "";
- } else {
- return "";
- }
-
- }
}
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-11-30 16:55:09 UTC (rev 10712)
+++ trunk/locale/po/de.po 2021-11-30 17:30:27 UTC (rev 10713)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 10:11+0100\n"
+"POT-Creation-Date: 2021-11-30 18:25+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."
@@ -1684,7 +1684,7 @@
msgid "Display a Facebook Like button."
msgstr ""
-msgid "Display file information like version, size, date... of uploaded files."
+msgid "Display file information like size, date... of uploaded files."
msgstr ""
msgid ""
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/locale/po/es.po 2021-11-30 17:30:27 UTC (rev 10713)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 10:11+0100\n"
+"POT-Creation-Date: 2021-11-30 18:25+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -1654,7 +1654,7 @@
msgid "Display a Facebook Like button."
msgstr ""
-msgid "Display file information like version, size, date... of uploaded files."
+msgid "Display file information like size, date... of uploaded files."
msgstr ""
msgid ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/locale/po/fr.po 2021-11-30 17:30:27 UTC (rev 10713)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 10:11+0100\n"
+"POT-Creation-Date: 2021-11-30 18:25+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."
@@ -1677,10 +1677,10 @@
msgid "Display a Facebook Like button."
msgstr "Afficher un bouton Facebook « J'aime »."
-msgid "Display file information like version, size, date... of uploaded files."
+msgid "Display file information like size, date... of uploaded files."
msgstr ""
-"Afficher des informations telles que la version, la taille, la date... des "
-"fichiers téléchargés."
+"Afficher des informations telles que la taille, la date... des fichiers "
+"téléchargés."
msgid ""
"Output suppressed. FileInfoPlugin with local files require a locked page."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/locale/po/it.po 2021-11-30 17:30:27 UTC (rev 10713)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 10:11+0100\n"
+"POT-Creation-Date: 2021-11-30 18:25+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"
@@ -1637,7 +1637,7 @@
msgid "Display a Facebook Like button."
msgstr ""
-msgid "Display file information like version, size, date... of uploaded files."
+msgid "Display file information like size, date... of uploaded files."
msgstr ""
msgid ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/locale/po/ja.po 2021-11-30 17:30:27 UTC (rev 10713)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 10:11+0100\n"
+"POT-Creation-Date: 2021-11-30 18:25+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"
@@ -1623,7 +1623,7 @@
msgid "Display a Facebook Like button."
msgstr ""
-msgid "Display file information like version, size, date... of uploaded files."
+msgid "Display file information like size, date... of uploaded files."
msgstr ""
msgid ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/locale/po/nl.po 2021-11-30 17:30:27 UTC (rev 10713)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 10:11+0100\n"
+"POT-Creation-Date: 2021-11-30 18:25+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"
@@ -1629,7 +1629,7 @@
msgid "Display a Facebook Like button."
msgstr ""
-msgid "Display file information like version, size, date... of uploaded files."
+msgid "Display file information like size, date... of uploaded files."
msgstr ""
msgid ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/locale/po/phpwiki.pot 2021-11-30 17:30:27 UTC (rev 10713)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 10:11+0100\n"
+"POT-Creation-Date: 2021-11-30 18:25+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"
@@ -1623,7 +1623,7 @@
msgid "Display a Facebook Like button."
msgstr ""
-msgid "Display file information like version, size, date... of uploaded files."
+msgid "Display file information like size, date... of uploaded files."
msgstr ""
msgid ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/locale/po/sv.po 2021-11-30 17:30:27 UTC (rev 10713)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 10:11+0100\n"
+"POT-Creation-Date: 2021-11-30 18:25+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -1624,7 +1624,7 @@
msgid "Display a Facebook Like button."
msgstr ""
-msgid "Display file information like version, size, date... of uploaded files."
+msgid "Display file information like size, date... of uploaded files."
msgstr ""
msgid ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/locale/po/zh.po 2021-11-30 17:30:27 UTC (rev 10713)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 10:11+0100\n"
+"POT-Creation-Date: 2021-11-30 18:25+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -1630,7 +1630,7 @@
msgid "Display a Facebook Like button."
msgstr ""
-msgid "Display file information like version, size, date... of uploaded files."
+msgid "Display file information like size, date... of uploaded files."
msgstr ""
msgid ""
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%2FFileInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FFileInfoPlugin 2021-11-30 16:55:09 UTC (rev 10712)
+++ trunk/pgsrc/Help%2FFileInfoPlugin 2021-11-30 17:30:27 UTC (rev 10713)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 13:09:40 +0000
+Date: Tue, 30 Nov 2021 18:23:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FFileInfoPlugin;
@@ -6,18 +6,15 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-The **~FileInfo** [[Help:WikiPlugin|plugin]] displays the version, date, size,
-perms of an uploaded file. Only files relative and below to the uploads path
-can be handled.
+The **~FileInfo** [[Help:WikiPlugin|plugin]] displays the date, size, path, etc.
+of an uploaded file. Only files relative and below to the uploads path can be handled.
-For exe files the **version** argument might work to display the VERSIONINFO ressource string. (highly experimental).
-
== Typical Usage ==
{{{
-<<FileInfo file=uploads/setup.exe display=version,date>>
-<<FileInfo file=uploads/setup.exe display=name,version,date
- format="%s (version: %s, date: %s)">>
+<<FileInfo file=Upload:image.png display=size,date >>
+<<FileInfo file=Upload:image.png display=name,size,date
+ format="%s (size: %s, date: %s)" >>
}}}
== Arguments ==
@@ -33,7 +30,7 @@
| //None// (required argument)
|-
| **display**
-| Comma-separated string of version, size, phonysize, date, mtime, owner, name, path, dirname, link, mime-typ, magic.
+| Comma-separated string of size, phonysize, date, mtime, owner, group, name, path, dirname, magic, link
| //None// (required argument)
|-
| **format**
@@ -41,14 +38,18 @@
| (optional)
|-
| **quiet**
-| Boolean. If true, print no error if file is not found
+| Boolean. If true, print no error if file is not found.
| false
|}
-== Examples ==
+== Example ==
+{{{
This wiki was installed at <<FileInfo file=config/config.ini display=date>>.
+}}}
+This wiki was installed at <<FileInfo file=config/config.ini display=date>>.
+
<noinclude>
----
[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-11-30 18:03:39
|
Revision: 10714
http://sourceforge.net/p/phpwiki/code/10714
Author: vargenau
Date: 2021-11-30 17:50:13 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
FileInfo plugin: magic renamed as mime, fix corresponding code
Modified Paths:
--------------
trunk/lib/plugin/FileInfo.php
trunk/pgsrc/Help%2FFileInfoPlugin
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2021-11-30 17:30:27 UTC (rev 10713)
+++ trunk/lib/plugin/FileInfo.php 2021-11-30 17:50:13 UTC (rev 10714)
@@ -47,7 +47,7 @@
{
return array(
'file' => false, // relative path from PHPWIKI_DIR. (required)
- 'display' => false, // size,phonysize,date,mtime,owner,group,name,path,dirname,magic,link (required)
+ 'display' => false, // size,phonysize,date,mtime,owner,group,name,path,dirname,mime,link (required)
'format' => false, // printf format string with %s only, all display modes
'quiet' => false // print no error if file not found
// from above vars return strings (optional)
@@ -136,8 +136,8 @@
case 'dirname':
$s[] = dirname($file);
break;
- case 'magic':
- $s[] = $this->magic($file);
+ case 'mime':
+ $s[] = $this->mime($file);
break;
case 'link':
if ($is_Upload) {
@@ -175,14 +175,12 @@
}
}
- function magic($file)
+ private function mime($file)
{
- // Valid finfo_open (i.e. libmagic) options:
- // FILEINFO_NONE | FILEINFO_SYMLINK | FILEINFO_MIME | FILEINFO_COMPRESS | FILEINFO_DEVICES |
- // FILEINFO_CONTINUE | FILEINFO_PRESERVE_ATIME | FILEINFO_RAW
- $f = finfo_open( /*FILEINFO_MIME*/);
- $result = finfo_file(realpath($file));
- finfo_close($res);
+ // mime type and mime encoding as defined by RFC 2045
+ $f = finfo_open(FILEINFO_MIME);
+ $result = finfo_file($f, realpath($file));
+ finfo_close($f);
return $result;
}
Modified: trunk/pgsrc/Help%2FFileInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FFileInfoPlugin 2021-11-30 17:30:27 UTC (rev 10713)
+++ trunk/pgsrc/Help%2FFileInfoPlugin 2021-11-30 17:50:13 UTC (rev 10714)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 18:23:12 +0000
+Date: Tue, 30 Nov 2021 18:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FFileInfoPlugin;
@@ -30,7 +30,7 @@
| //None// (required argument)
|-
| **display**
-| Comma-separated string of size, phonysize, date, mtime, owner, group, name, path, dirname, magic, link
+| Comma-separated string of size, phonysize, date, mtime, owner, group, name, path, dirname, mime, link
| //None// (required argument)
|-
| **format**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-11-30 18:18:04
|
Revision: 10715
http://sourceforge.net/p/phpwiki/code/10715
Author: vargenau
Date: 2021-11-30 18:18:01 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
FileInfo plugin: posix_getpwuid() and posix_getgrgid() functions are not available by default on CentOS 7
Modified Paths:
--------------
trunk/INSTALL
trunk/lib/plugin/FileInfo.php
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2021-11-30 17:50:13 UTC (rev 10714)
+++ trunk/INSTALL 2021-11-30 18:18:01 UTC (rev 10715)
@@ -79,6 +79,10 @@
or
apt install php-soap
+FileInfo plugin requires posix_getpwuid() and posix_getgrgid() functions
+that are not available by default on CentOS 7. You might need to do:
+yum install php-process
+
QUICK START INSTRUCTIONS
Copy 'config/config-dist.ini' to 'config/config.ini' and edit the
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2021-11-30 17:50:13 UTC (rev 10714)
+++ trunk/lib/plugin/FileInfo.php 2021-11-30 18:18:01 UTC (rev 10715)
@@ -35,6 +35,23 @@
* @author: Reini Urban
*/
+// posix_getpwuid() and posix_getgrgid() are not impremented in CentOS 7
+// you need to do:
+// yum install php-process
+if (!function_exists('posix_getpwuid')) {
+ function posix_getpwuid()
+ {
+ return false;
+ }
+}
+
+if (!function_exists('posix_getgrgid')) {
+ function posix_getgrgid()
+ {
+ return false;
+ }
+}
+
class WikiPlugin_FileInfo
extends WikiPlugin
{
@@ -121,11 +138,19 @@
break;
case 'owner':
$o = posix_getpwuid(fileowner($file));
- $s[] = $o['name'];
+ if ($o === false) {
+ $s[] = 'not implemented';
+ } else {
+ $s[] = $o['name'];
+ }
break;
case 'group':
$o = posix_getgrgid(filegroup($file));
- $s[] = $o['name'];
+ if ($o === false) {
+ $s[] = 'not implemented';
+ } else {
+ $s[] = $o['name'];
+ }
break;
case 'name':
$s[] = basename($file);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-11-30 18:45:38
|
Revision: 10716
http://sourceforge.net/p/phpwiki/code/10716
Author: vargenau
Date: 2021-11-30 18:45:36 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
FileInfo plugin: use binary prefixes
Modified Paths:
--------------
trunk/lib/plugin/FileInfo.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/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/lib/plugin/FileInfo.php 2021-11-30 18:45:36 UTC (rev 10716)
@@ -209,12 +209,12 @@
return $result;
}
- private function _formatsize($n, $factor, $suffix = '')
+ private function formatsize($n, $factor, $suffix)
{
if ($n > $factor) {
$b = $n / $factor;
$n -= floor($factor * $b);
- return number_format($b, $n ? 3 : 0) . $suffix;
+ return number_format($b, $n ? 3 : 0) . ' ' . $suffix;
}
return '';
}
@@ -221,17 +221,17 @@
private function phonysize($a)
{
- $factor = 1024 * 1024 * 1000;
+ $factor = 1024 * 1024 * 1024;
if ($a > $factor)
- return $this->_formatsize($a, $factor, ' GB');
- $factor = 1024 * 1000;
+ return $this->formatsize($a, $factor, _('GiB'));
+ $factor = 1024 * 1024;
if ($a > $factor)
- return $this->_formatsize($a, $factor, ' MB');
+ return $this->formatsize($a, $factor, _('MiB'));
$factor = 1024;
if ($a > $factor)
- return $this->_formatsize($a, $factor, ' KB');
+ return $this->formatsize($a, $factor, _('KiB'));
if ($a > 1)
- return $this->_formatsize($a, 1, ' byte');
+ return $this->formatsize($a, 1, _('bytes'));
else
return $a;
}
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-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/de.po 2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+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."
@@ -1694,6 +1694,18 @@
msgid "page not locked"
msgstr "Seite nicht gesperrt"
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr "Bytes"
+
msgid "Parse an RDF FOAF file and extract information to render as HTML."
msgstr ""
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/es.po 2021-11-30 18:45:36 UTC (rev 10716)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -619,7 +619,7 @@
#, php-format
msgid "%s bytes written"
-msgstr "%s octetos"
+msgstr "%s octetos escritos"
msgid "PhpWikiAdministration"
msgstr "AdministraciónDePhpWiki"
@@ -1664,6 +1664,18 @@
msgid "page not locked"
msgstr "página no está bloqueada"
+msgid "GiB"
+msgstr "Gio"
+
+msgid "MiB"
+msgstr "Mio"
+
+msgid "KiB"
+msgstr "Kio"
+
+msgid "bytes"
+msgstr "octetos"
+
msgid "Parse an RDF FOAF file and extract information to render as HTML."
msgstr ""
@@ -4485,7 +4497,7 @@
#, php-format
msgid "%s B"
-msgstr ""
+msgstr "%s o"
#, php-format
msgid "%s bytes"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/fr.po 2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+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."
@@ -1691,6 +1691,18 @@
msgid "page not locked"
msgstr "page déverrouillée"
+msgid "GiB"
+msgstr "Gio"
+
+msgid "MiB"
+msgstr "Mio"
+
+msgid "KiB"
+msgstr "Kio"
+
+msgid "bytes"
+msgstr "octets"
+
msgid "Parse an RDF FOAF file and extract information to render as HTML."
msgstr ""
"Analyser un fichier RDF FOAF et extraire les informations à afficher en HTML."
@@ -4585,7 +4597,7 @@
#, php-format
msgid "%s B"
-msgstr ""
+msgstr "%s o"
#, php-format
msgid "%s bytes"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/it.po 2021-11-30 18:45:36 UTC (rev 10716)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+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"
@@ -1647,6 +1647,18 @@
msgid "page not locked"
msgstr "pagina non bloccata"
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr "byte"
+
msgid "Parse an RDF FOAF file and extract information to render as HTML."
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/ja.po 2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+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"
@@ -1633,6 +1633,18 @@
msgid "page not locked"
msgstr ""
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr "キロバイト"
+
+msgid "bytes"
+msgstr "バイト"
+
msgid "Parse an RDF FOAF file and extract information to render as HTML."
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/nl.po 2021-11-30 18:45:36 UTC (rev 10716)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+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"
@@ -1639,6 +1639,18 @@
msgid "page not locked"
msgstr ""
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr ""
+
msgid "Parse an RDF FOAF file and extract information to render as HTML."
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/phpwiki.pot 2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+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"
@@ -1633,6 +1633,18 @@
msgid "page not locked"
msgstr ""
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr ""
+
msgid "Parse an RDF FOAF file and extract information to render as HTML."
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/sv.po 2021-11-30 18:45:36 UTC (rev 10716)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -1634,6 +1634,18 @@
msgid "page not locked"
msgstr ""
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr ""
+
msgid "Parse an RDF FOAF file and extract information to render as HTML."
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/zh.po 2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -1640,6 +1640,18 @@
msgid "page not locked"
msgstr "頁面已被解鎖定"
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr ""
+
msgid "Parse an RDF FOAF file and extract information to render as HTML."
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-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 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-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-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-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 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: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-09 17:12:01
|
Revision: 10762
http://sourceforge.net/p/phpwiki/code/10762
Author: vargenau
Date: 2021-12-09 17:11:59 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
TitleSearch: argument "s" is mandatory, it is a string
Modified Paths:
--------------
trunk/lib/plugin/TitleSearch.php
trunk/pgsrc/Help%2FTitleSearchPlugin
Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php 2021-12-09 17:08:08 UTC (rev 10761)
+++ trunk/lib/plugin/TitleSearch.php 2021-12-09 17:11:59 UTC (rev 10762)
@@ -53,7 +53,7 @@
// All PageList::supportedArgs, except 'pagename'
$args = array_merge(
PageList::supportedArgs(), // paging and more.
- array('s' => false,
+ array('s' => '',
'auto_redirect' => false,
'noheader' => false,
'exclude' => false,
@@ -115,12 +115,12 @@
}
if (isset($args['limit']) && !is_limit($args['limit'])) {
- return HTML::p(array('class' => "error"),
+ return HTML::p(array('class' => 'error'),
_("Illegal “limit” argument: must be an integer or two integers separated by comma"));
}
if (empty($args['s'])) {
- return HTML::p(array('class' => 'warning'),
+ return HTML::p(array('class' => 'error'),
_("You must enter a search term."));
}
Modified: trunk/pgsrc/Help%2FTitleSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FTitleSearchPlugin 2021-12-09 17:08:08 UTC (rev 10761)
+++ trunk/pgsrc/Help%2FTitleSearchPlugin 2021-12-09 17:11:59 UTC (rev 10762)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Feb 2021 14:45:30 +0000
+Date: Thu, 9 Dec 2021 18:08:50 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FTitleSearchPlugin;
@@ -29,7 +29,7 @@
|-
| **s**
| String to search
-| //none//
+| //none// (mandatory argument)
|-
| **auto_redirect**
| Boolean. If true and only one page is found, this page is displayed immediately
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-09 17:14:11
|
Revision: 10763
http://sourceforge.net/p/phpwiki/code/10763
Author: vargenau
Date: 2021-12-09 17:14:09 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
FullTextSearch: argument "s" is mandatory, it is a string
Modified Paths:
--------------
trunk/lib/plugin/FullTextSearch.php
trunk/pgsrc/Help%2FFullTextSearchPlugin
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2021-12-09 17:11:59 UTC (rev 10762)
+++ trunk/lib/plugin/FullTextSearch.php 2021-12-09 17:14:09 UTC (rev 10763)
@@ -49,13 +49,13 @@
// All PageList::supportedArgs, except 'pagename'
$args = array_merge(
PageList::supportedArgs(), // paging and more.
- array('s' => false,
+ array('s' => '',
'hilight' => true,
'case_exact' => false,
'regex' => 'auto',
'sortby' => '-hi_content',
'noheader' => false,
- 'exclude' => false, // comma-separated list of glob
+ 'exclude' => '', // comma-separated list of glob
'quiet' => true)); // be less verbose
unset($args['pagename']);
return $args;
@@ -73,7 +73,7 @@
$args = $this->getArgs($argstr, $request);
if (empty($args['s'])) {
- return HTML::p(array('class' => 'warning'),
+ return HTML::p(array('class' => 'error'),
_("You must enter a search term."));
}
extract($args);
Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FFullTextSearchPlugin 2021-12-09 17:11:59 UTC (rev 10762)
+++ trunk/pgsrc/Help%2FFullTextSearchPlugin 2021-12-09 17:14:09 UTC (rev 10763)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:08:50 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FFullTextSearchPlugin;
@@ -26,7 +26,7 @@
|-
| **s**
| The search term
-| //none//
+| //none// (mandatory argument)
|-
| **hilight**
| Boolean. If true, highlight results.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-09 17:15:53
|
Revision: 10764
http://sourceforge.net/p/phpwiki/code/10764
Author: vargenau
Date: 2021-12-09 17:15:52 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
FuzzyPages: argument "s" is mandatory
Modified Paths:
--------------
trunk/lib/plugin/FuzzyPages.php
trunk/pgsrc/Help%2FFuzzyPagesPlugin
Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php 2021-12-09 17:14:09 UTC (rev 10763)
+++ trunk/lib/plugin/FuzzyPages.php 2021-12-09 17:15:52 UTC (rev 10764)
@@ -198,7 +198,7 @@
}
if (empty($s)) {
- return HTML::p(array('class' => 'warning'),
+ return HTML::p(array('class' => 'error'),
_("You must enter a search term."));
}
Modified: trunk/pgsrc/Help%2FFuzzyPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FFuzzyPagesPlugin 2021-12-09 17:14:09 UTC (rev 10763)
+++ trunk/pgsrc/Help%2FFuzzyPagesPlugin 2021-12-09 17:15:52 UTC (rev 10764)
@@ -1,4 +1,4 @@
-Date: Wed, 6 Oct 2021 17:59:01 +0000
+Date: Thu, 9 Dec 2021 18:08:50 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FFuzzyPagesPlugin;
@@ -31,7 +31,7 @@
|-
| **s**
| Pagename to look for
-| //None// (mandatory argument)
+| //none// (mandatory argument)
|}
== Example ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-09 17:41:42
|
Revision: 10765
http://sourceforge.net/p/phpwiki/code/10765
Author: vargenau
Date: 2021-12-09 17:41:41 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
SearchHighlight plugin: add noheader and hits arguments in Help page, test they are booleans
Modified Paths:
--------------
trunk/lib/plugin/SearchHighlight.php
trunk/pgsrc/Help%2FSearchHighlightPlugin
Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php 2021-12-09 17:15:52 UTC (rev 10764)
+++ trunk/lib/plugin/SearchHighlight.php 2021-12-09 17:41:41 UTC (rev 10765)
@@ -46,11 +46,12 @@
function getDefaultArguments()
{
// s, engine and engine_url are picked from the request
- return array('noheader' => false, //don't print the header
- 'hits' => false, //print the list of lines with lines terms additionally
- 's' => false,
- 'case_exact' => false, //not yet supported
- 'regex' => false, //not yet supported
+ return array(
+ 's' => '', // search term
+ 'noheader' => false, // don't print the header
+ 'hits' => false, // print the list of lines with lines terms additionally
+ 'case_exact' => false, // not yet supported
+ 'regex' => '', // not yet supported
);
}
@@ -72,6 +73,24 @@
}
extract($args);
+ if (!is_bool($noheader)) {
+ if (($noheader == '0') || ($noheader == 'false')) {
+ $noheader = false;
+ } elseif (($noheader == '1') || ($noheader == 'true')) {
+ $noheader = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader"));
+ }
+ }
+ if (!is_bool($hits)) {
+ if (($hits == '0') || ($hits == 'false')) {
+ $hits = false;
+ } elseif (($hits == '1') || ($hits == 'true')) {
+ $hits = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "hits"));
+ }
+ }
if (!is_bool($case_exact)) {
if (($case_exact == '0') || ($case_exact == 'false')) {
$case_exact = false;
Modified: trunk/pgsrc/Help%2FSearchHighlightPlugin
===================================================================
--- trunk/pgsrc/Help%2FSearchHighlightPlugin 2021-12-09 17:15:52 UTC (rev 10764)
+++ trunk/pgsrc/Help%2FSearchHighlightPlugin 2021-12-09 17:41:41 UTC (rev 10765)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Feb 2021 09:05:00 +0000
+Date: Thu, 9 Dec 2021 18:39:25 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FSearchHighlightPlugin;
@@ -10,8 +10,7 @@
which is only used internally.
When someone is referred from a search engine like Google, Yahoo
-or our own fulltextsearch, the terms the user searched for are highlighted.
-See also [[http://wordpress.org/about/shots/1.2/plugins.png]].
+or our own FullTextSearch, the terms the user searched for are highlighted.
== Arguments ==
@@ -23,15 +22,23 @@
|-
| **s**
| The search term
-| //none//
+| //empty//
|-
+| **noheader**
+| Boolean. If true, header should be omitted.
+| false
+|-
+| **hits**
+| Boolean. If true, print the list of lines with lines terms additionally.
+| false
+|-
| **case_exact**
-| Boolean. If true, highlight only case exact searches.
+| Boolean. If true, highlight only case exact searches. Not yet supported.
| false
|-
| **regex**
-| not yet supported
-| false
+| Not yet supported.
+| //empty//
|}
<noinclude>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-09 17:45:42
|
Revision: 10766
http://sourceforge.net/p/phpwiki/code/10766
Author: vargenau
Date: 2021-12-09 17:45:40 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
ListSubpages plugin: add exclude argument in Help page, maxpages is a number
Modified Paths:
--------------
trunk/lib/plugin/ListSubpages.php
trunk/pgsrc/Help%2FListSubpagesPlugin
Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php 2021-12-09 17:41:41 UTC (rev 10765)
+++ trunk/lib/plugin/ListSubpages.php 2021-12-09 17:45:40 UTC (rev 10766)
@@ -45,9 +45,8 @@
PageList::supportedArgs(),
array('noheader' => false, // no header
'basepage' => false, // subpages of which page, default: current
- 'maxpages' => '', // maximum number of pages to include, change that to limit
- //'exclude' => '',
- /*'relative' => false, */
+ 'maxpages' => 0, // maximum number of pages to include, change that to limit
+ 'exclude' => '',
'info' => ''
));
}
@@ -123,9 +122,6 @@
continue;
}
array_push($included_pages, $page);
- //if ($relative) {
- // TODO: add relative subpage name display to PageList class
- //}
$pagelist->addPage($page);
array_pop($included_pages);
Modified: trunk/pgsrc/Help%2FListSubpagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FListSubpagesPlugin 2021-12-09 17:41:41 UTC (rev 10765)
+++ trunk/pgsrc/Help%2FListSubpagesPlugin 2021-12-09 17:45:40 UTC (rev 10766)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:39:25 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FListSubpagesPlugin;
@@ -31,15 +31,19 @@
|-
| **maxpages**
| Maximum number of pages to include
-| none
+| 0
|-
| **noheader**
-| Boolean. If true, do not display header.
+| Boolean. If true, header should be omitted.
| false
|-
| **info**
| List of columns to display
-| none
+| //empty//
+|-
+| **exclude**
+| Comma-separated list of pages to exclude
+| //empty//
|}
== Example ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-09 17:49:47
|
Revision: 10767
http://sourceforge.net/p/phpwiki/code/10767
Author: vargenau
Date: 2021-12-09 17:49:44 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
IncludePages plugin: pages and exclude arguments are strings
Modified Paths:
--------------
trunk/lib/plugin/IncludePages.php
trunk/pgsrc/Help%2FIncludePagesPlugin
Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php 2021-12-09 17:45:40 UTC (rev 10766)
+++ trunk/lib/plugin/IncludePages.php 2021-12-09 17:49:44 UTC (rev 10767)
@@ -40,8 +40,8 @@
function getDefaultArguments()
{
- return array_merge(array('pages' => false, // the pages to include
- 'exclude' => false), // the pages to exclude
+ return array_merge(array('pages' => '', // the pages to include
+ 'exclude' => ''), // the pages to exclude
WikiPlugin_IncludePage::getDefaultArguments()
);
}
Modified: trunk/pgsrc/Help%2FIncludePagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagesPlugin 2021-12-09 17:45:40 UTC (rev 10766)
+++ trunk/pgsrc/Help%2FIncludePagesPlugin 2021-12-09 17:49:44 UTC (rev 10767)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 19:16:32 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FIncludePagesPlugin;
@@ -24,12 +24,12 @@
! Default value
|-
| **pages**
-| The pages to include
-| //none//
+| The pages to include.
+| //empty//
|-
| **exclude**
-| Comma-separated list of pages to exclude
-| false
+| Comma-separated list of pages to exclude.
+| //empty//
|}
== Example ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-09 18:28:40
|
Revision: 10769
http://sourceforge.net/p/phpwiki/code/10769
Author: vargenau
Date: 2021-12-09 18:28:38 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
Update pgsrc
Modified Paths:
--------------
trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
trunk/pgsrc/Help%2FAllPagesPlugin
trunk/pgsrc/Help%2FAllUsersPlugin
trunk/pgsrc/Help%2FAtomFeedPlugin
trunk/pgsrc/Help%2FAuthorHistoryPlugin
trunk/pgsrc/Help%2FBackLinksPlugin
trunk/pgsrc/Help%2FChartPlugin
trunk/pgsrc/Help%2FCreateBibPlugin
trunk/pgsrc/Help%2FCreateTocPlugin
trunk/pgsrc/Help%2FFileInfoPlugin
trunk/pgsrc/Help%2FFullTextSearchPlugin
trunk/pgsrc/Help%2FGoogleMapsPlugin
trunk/pgsrc/Help%2FIncludePagePlugin
trunk/pgsrc/Help%2FInterWikiSearchPlugin
trunk/pgsrc/Help%2FMostPopularPlugin
trunk/pgsrc/Help%2FNewPagesPerUserPlugin
trunk/pgsrc/Help%2FOrphanedPagesPlugin
trunk/pgsrc/Help%2FPageGroupPlugin
trunk/pgsrc/Help%2FPasswordResetPlugin
trunk/pgsrc/Help%2FRssFeedPlugin
trunk/pgsrc/Help%2FSiteMapPlugin
trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
trunk/pgsrc/Help%2FTemplatePlugin
trunk/pgsrc/Help%2FTranscludePlugin
trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
trunk/pgsrc/Help%2FUserRatingsPlugin
trunk/pgsrc/Help%2FWikiAdminChownPlugin
trunk/pgsrc/Help%2FWikiAdminDeleteAclPlugin
trunk/pgsrc/Help%2FWikiAdminPurgePlugin
trunk/pgsrc/Help%2FWikiAdminRemovePlugin
trunk/pgsrc/Help%2FWikiAdminRenamePlugin
trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin
trunk/pgsrc/Help%2FWikiAdminSetAclPlugin
trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin
trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 13:29:00 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FInhaltsVerzeichnisPlugin;
@@ -99,9 +99,9 @@
|-
| 3 || ~! || ~=~=~=~= || h4
|-
-| 4 || //None// || ~=~=~=~=~= || h5
+| 4 || //none// || ~=~=~=~=~= || h5
|-
-| 5 || //None// || ~=~=~=~=~=~= || h6
+| 5 || //none// || ~=~=~=~=~=~= || h6
|}
== Beispiele ==
Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 26 Dec 2020 12:40:06 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FVorlagePlugin;
@@ -61,11 +61,11 @@
|-
| **page**
| pagename to be included as template
-| //None// (required argument)
+| //none// (required argument)
|-
| **vars**
| optional parameters to be expanded inside the template
-| (empty)
+| //empty//
|-
| **rev**
| page revision
@@ -73,11 +73,11 @@
|-
| **section**
| just include a named section
-| (empty)
+| //empty//
|-
| **sectionhead**
| when including a named section show the heading
-| (empty)
+| //empty//
|}
=== Page to include ===
Modified: trunk/pgsrc/Help%2FAllPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllPagesPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FAllPagesPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FAllPagesPlugin;
@@ -33,7 +33,7 @@
|-
| **info**
| Allows multiple columns: info=mtime,hits,summary,version,author,locked,minor or all
-| none
+| //empty//
|-
| **userpages**
| Boolean. If true, display only pages created by users (not the ones created at initialisation of the wiki).
Modified: trunk/pgsrc/Help%2FAllUsersPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllUsersPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FAllUsersPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FAllUsersPlugin;
@@ -25,7 +25,7 @@
! Default value
|-
| **noheader**
-| Boolean. If true, do not display the header.
+| Boolean. If true, header should be omitted.
| false
|-
| **include_empty**
Modified: trunk/pgsrc/Help%2FAtomFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FAtomFeedPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FAtomFeedPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FAtomFeedPlugin;
@@ -24,15 +24,15 @@
|-
| **url**
| Atom feed URL
-| (empty)
+| //empty//
|-
| **feed**
| Name of the Atom feed
-| (empty)
+| //empty//
|-
| **description**
| Description of the feed.
-| (empty)
+| //empty//
|-
| **maxitem**
| Max. number of entries (0 = unlimited)
Modified: trunk/pgsrc/Help%2FAuthorHistoryPlugin
===================================================================
--- trunk/pgsrc/Help%2FAuthorHistoryPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FAuthorHistoryPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FAuthorHistoryPlugin;
@@ -24,10 +24,10 @@
|-
| **exclude**
| Comma-separated list of pages to exclude
-| none
+| //empty//
|-
| **noheader**
-| Boolean. If true, do not display page header.
+| Boolean. If true, page header should be omitted.
| false
|-
| **includeminor**
Modified: trunk/pgsrc/Help%2FBackLinksPlugin
===================================================================
--- trunk/pgsrc/Help%2FBackLinksPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FBackLinksPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 12:51:19 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FBackLinksPlugin;
@@ -41,7 +41,7 @@
| false
|-
| **noheader**
-| Boolean. If true, do not display header.
+| Boolean. If true, header should be omitted.
| false
|-
| **linkmore**
Modified: trunk/pgsrc/Help%2FChartPlugin
===================================================================
--- trunk/pgsrc/Help%2FChartPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FChartPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 28 Sep 2021 17:38:55 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FChartPlugin;
@@ -37,7 +37,7 @@
|-
| **legend**
| Legend of the chart
-| //None//
+| //none//
|-
| **type**
| line, bar or pie
@@ -45,7 +45,7 @@
|-
| **data**
| Graph data: a list of numbers separated by comma
-| //None// (required argument)
+| //none// (required argument)
|}
== Examples ==
Modified: trunk/pgsrc/Help%2FCreateBibPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateBibPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FCreateBibPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FCreateBibPlugin;
@@ -26,7 +26,7 @@
|-
| **pagename**
| The page from which the ~BibTex file is generated
-| //None// (required argument)
+| //none// (required argument)
|}
== Example ==
Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FCreateTocPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FCreateTocPlugin;
@@ -99,9 +99,9 @@
|-
| 3 || ~! || ~=~=~=~= || h4
|-
-| 4 || //None// || ~=~=~=~=~= || h5
+| 4 || //none// || ~=~=~=~=~= || h5
|-
-| 5 || //None// || ~=~=~=~=~=~= || h6
+| 5 || //none// || ~=~=~=~=~=~= || h6
|}
== Examples ==
Modified: trunk/pgsrc/Help%2FFileInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FFileInfoPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FFileInfoPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 18:48:42 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FFileInfoPlugin;
@@ -27,11 +27,11 @@
|-
| **file**
| Relative path from PHPWIKI_DIR.
-| //None// (required argument)
+| //none// (required argument)
|-
| **display**
| Comma-separated string of size, phonysize, date, mtime, owner, group, name, path, dirname, mime, link
-| //None// (required argument)
+| //none// (required argument)
|-
| **format**
| printf format string with %s only, all display modes from above vars return strings
Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FFullTextSearchPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FFullTextSearchPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 9 Dec 2021 18:08:50 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FFullTextSearchPlugin;
@@ -45,7 +45,7 @@
| ~-hi_content
|-
| **noheader**
-| Boolean. If true, do not display header.
+| Boolean. If true, header should be omitted.
| false
|-
| **exclude**
Modified: trunk/pgsrc/Help%2FGoogleMapsPlugin
===================================================================
--- trunk/pgsrc/Help%2FGoogleMapsPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FGoogleMapsPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 10 Aug 2021 10:45:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FGoogleMapsPlugin;
@@ -31,11 +31,11 @@
|-
| **Longitude**
| Longitude
-| //None// (required argument)
+| //none// (required argument)
|-
| **Latitude**
| Latitude
-| //None// (required argument)
+| //none// (required argument)
|-
| **~ZoomFactor**
| Zoom factor
@@ -47,7 +47,7 @@
|-
| **~InfoText**
|
-| //None//
+| //none//
|-
| **~MapType**
| Map or Satellite or Hybrid
Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FIncludePagePlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FIncludePagePlugin;
@@ -25,7 +25,7 @@
|-
| **page**
| The page to include
-| //None// (required argument)
+| //none// (required argument)
|-
| **rev**
| The revision
@@ -37,23 +37,23 @@
|-
| **bytes**
| Maximum number of bytes to include
-| //None// (include whole page)
+| //none// (include whole page)
|-
| **words**
| Maximum number of words to include
-| //None// (include whole page)
+| //none// (include whole page)
|-
| **lines**
| Maximum number of lines to include
-| //None// (include whole page)
+| //none// (include whole page)
|-
| **sections**
| Maximum number of sections to include
-| //None// (include all sections)
+| //none// (include all sections)
|-
| **section**
| Include a named section
-| //None//
+| //none//
|-
| **sectionhead**
| Boolean. If true, when including a named section show the heading
Modified: trunk/pgsrc/Help%2FInterWikiSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FInterWikiSearchPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FInterWikiSearchPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FInterWikiSearchPlugin;
@@ -23,7 +23,7 @@
|-
| **s**
| The search term
-| //none//
+| //none// (mandatory argument)
|-
| **formsize**
|
Modified: trunk/pgsrc/Help%2FMostPopularPlugin
===================================================================
--- trunk/pgsrc/Help%2FMostPopularPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FMostPopularPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FMostPopularPlugin;
@@ -33,7 +33,7 @@
| ~-hits
|-
| **noheader**
-| Boolean. If true, do not display header.
+| Boolean. If true, header should be omitted.
| false
|-
| **info**
Modified: trunk/pgsrc/Help%2FNewPagesPerUserPlugin
===================================================================
--- trunk/pgsrc/Help%2FNewPagesPerUserPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FNewPagesPerUserPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2021 11:53:01 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FNewPagesPerUserPlugin;
@@ -24,19 +24,19 @@
|-
| **userid**
| Limit to the pages created by a specific user.
-| //none//
+| //empty//
|-
| **month**
| Limit to the pages created during a specific month.
-| //none//
+| //empty//
|-
| **since**
| Limit to the pages created after a specific date.
-| //none//
+| //empty//
|-
| **until**
| Limit to the pages created before a specific date.
-| //none//
+| //empty//
|-
| **comments**
| Boolean. If true, pages that are comments are included (page names that include "/Comment").
Modified: trunk/pgsrc/Help%2FOrphanedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FOrphanedPagesPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FOrphanedPagesPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 21:27:53 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FOrphanedPagesPlugin;
@@ -31,11 +31,11 @@
|-
| **exclude**
| Comma-separated list of pages to exclude
-| empty
+| //empty//
|-
| **info**
| List of columns to display
-| empty
+| //empty//
|-
| **sortby**
|
Modified: trunk/pgsrc/Help%2FPageGroupPlugin
===================================================================
--- trunk/pgsrc/Help%2FPageGroupPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FPageGroupPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FPageGroupPlugin;
@@ -23,7 +23,7 @@
|-
| **parent**
|
-| //None// (required argument)
+| //none// (required argument)
|-
| **rev**
|
Modified: trunk/pgsrc/Help%2FPasswordResetPlugin
===================================================================
--- trunk/pgsrc/Help%2FPasswordResetPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FPasswordResetPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FPasswordResetPlugin;
@@ -32,8 +32,8 @@
! Default value
|-
| user
-| username to reset the password. (optional)
-| none
+| Username to reset the password (optional)
+| //empty//
|}
<noinclude>
Modified: trunk/pgsrc/Help%2FRssFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FRssFeedPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FRssFeedPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FRssFeedPlugin;
@@ -24,15 +24,15 @@
|-
| **url**
| RSS Feed URL
-| (empty)
+| //empty//
|-
| **feed**
| RSS Feed Name
-| (empty)
+| //empty//
|-
| **description**
| Description of the RSS Feed
-| (empty)
+| //empty//
|-
| **maxitem**
| Max. number of entries (0 = unlimited)
Modified: trunk/pgsrc/Help%2FSiteMapPlugin
===================================================================
--- trunk/pgsrc/Help%2FSiteMapPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FSiteMapPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 19:16:32 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FSiteMapPlugin;
@@ -41,7 +41,7 @@
|-
| **exclude**
| List of pagenames to exclude, separated by comma
-| (empty)
+| //empty//
|-
| **include_self**
| Boolean. If true, include yourself in the results.
Modified: trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
===================================================================
--- trunk/pgsrc/Help%2FSyntaxHighlighterPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FSyntaxHighlighterPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 18 Apr 2019 15:07:59 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FSyntaxHighlighterPlugin;
@@ -64,7 +64,7 @@
|-
| **syntax**
|
-| //None// (required argument), see http://www.andre-simon.de/doku/highlight/highlight.html
+| //none// (required argument), see http://www.andre-simon.de/doku/highlight/highlight.html
|-
| **style**
|
Modified: trunk/pgsrc/Help%2FTemplatePlugin
===================================================================
--- trunk/pgsrc/Help%2FTemplatePlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FTemplatePlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FTemplatePlugin;
@@ -61,11 +61,11 @@
|-
| **page**
| pagename to be included as template
-| //None// (required argument)
+| //none// (required argument)
|-
| **vars**
| optional parameters to be expanded inside the template
-| (empty)
+| //empty//
|-
| **rev**
| page revision
@@ -73,11 +73,11 @@
|-
| **section**
| just include a named section
-| (empty)
+| //empty//
|-
| **sectionhead**
| when including a named section show the heading
-| (empty)
+| //empty//
|}
=== Page to include ===
Modified: trunk/pgsrc/Help%2FTranscludePlugin
===================================================================
--- trunk/pgsrc/Help%2FTranscludePlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FTranscludePlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 2 Dec 2021 12:30:31 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FTranscludePlugin;
@@ -20,7 +20,7 @@
|-
| **src**
| The URL of the page to transclude
-| //none//
+| //none// (mandatory argument)
|-
| **title**
| The title of the page to transclude
Modified: trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FUnfoldSubpagesPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FUnfoldSubpagesPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 13:09:40 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FUnfoldSubpagesPlugin;
@@ -40,7 +40,7 @@
| empty
|-
| **quiet**
-| Boolean. If true, print no header.
+| Boolean. If true, header should be omitted.
| false
|-
| **sortby**
Modified: trunk/pgsrc/Help%2FUserRatingsPlugin
===================================================================
--- trunk/pgsrc/Help%2FUserRatingsPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FUserRatingsPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Feb 2021 18:51:32 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FUserRatingsPlugin;
@@ -44,7 +44,7 @@
|-
| **exclude**
| Pages to exclude (allows multiple pagenames exclude=HomePage,RecentChanges)
-| none
+| //empty//
|-
| **limit**
| limit of <=0 is show-all
Modified: trunk/pgsrc/Help%2FWikiAdminChownPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminChownPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminChownPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminChownPlugin;
@@ -23,11 +23,11 @@
|-
| **s**
| Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
|-
| **user**
| User name
-| //None//
+| //empty//
|}
Modified: trunk/pgsrc/Help%2FWikiAdminDeleteAclPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminDeleteAclPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminDeleteAclPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminDeleteAclPlugin;
@@ -23,7 +23,7 @@
|-
| **s**
| Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
|-
| **info**
| Columns to include in listing
Modified: trunk/pgsrc/Help%2FWikiAdminPurgePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminPurgePlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminPurgePlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminPurgePlugin;
@@ -23,7 +23,7 @@
|-
| **s**
| Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
|}
== Example ==
Modified: trunk/pgsrc/Help%2FWikiAdminRemovePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminRemovePlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminRemovePlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminRemovePlugin;
@@ -23,7 +23,7 @@
|-
| **s**
| Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
|}
== Example ==
Modified: trunk/pgsrc/Help%2FWikiAdminRenamePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminRenamePlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminRenamePlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminRenamePlugin;
@@ -23,14 +23,13 @@
|-
| **s**
| Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
|-
| **updatelinks**
-| Change pagename in all linked pages also?
+| Boolean. If true, change pagename in all linked pages also
| false
|}
-
== Example ==
{{{
Modified: trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminSearchReplacePlugin;
@@ -23,7 +23,7 @@
|-
| **s**
| Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
|}
== Example ==
Modified: trunk/pgsrc/Help%2FWikiAdminSetAclPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSetAclPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminSetAclPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminSetAclPlugin;
@@ -23,7 +23,7 @@
|-
| **s**
| Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
|-
| **info**
| Columns to include in listing
Modified: trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminSetAclSimplePlugin;
@@ -23,7 +23,7 @@
|-
| **s**
| Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
|-
| **info**
| Columns to include in listing
Modified: trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminSetExternalPlugin;
@@ -27,7 +27,7 @@
|-
| **s**
| Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
|-
| **info**
| Columns to include in listing
Modified: trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminUtilsPlugin 2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminUtilsPlugin 2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Fri, 6 Aug 2021 16:19:21 +0000
+Date: Thu, 9 Dec 2021 18:48:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiAdminUtilsPlugin;
@@ -28,7 +28,7 @@
|-
| **action**
| Valid action are: "purge-cache", "purge-bad-pagenames", "purge-empty-pages", "email-verification", "db-check" and "db-rebuild"
-| //None//
+| //none// (mandatory argument)
|-
| **label**
| Custom button text
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-10 19:59:08
|
Revision: 10772
http://sourceforge.net/p/phpwiki/code/10772
Author: vargenau
Date: 2021-12-10 19:59:05 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
Replace strftime by date when possible
Modified Paths:
--------------
trunk/lib/WikiTheme.php
trunk/themes/Crao/templates/head.tmpl
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/Wordpress/templates/actionbar.tmpl
trunk/themes/default/templates/head.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/wikilens/templates/head.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/lib/WikiTheme.php 2021-12-10 19:59:05 UTC (rev 10772)
@@ -1582,8 +1582,7 @@
function calendarLink($date = false)
{
- return $this->calendarBase() . '/' .
- strftime("%Y-%m-%d", $date ? $date : time());
+ return $this->calendarBase() . '/' . date("Y-m-d", $date ? $date : time());
}
function calendarBase()
Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/Crao/templates/head.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -67,7 +67,7 @@
?>
<?php /* Today's calendar page for the user if it exists
*/
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/Crao/templates/navbar.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -28,7 +28,7 @@
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?>
<?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -31,7 +31,7 @@
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
?>
<li>
<?php echo $SEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/default/templates/head.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -73,7 +73,7 @@
?>
<?php /* Today's calendar page for the user if it exists
*/
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/default/templates/navbar.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -29,7 +29,7 @@
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?>
<?php echo $SEP?>
Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/wikilens/templates/head.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -66,7 +66,7 @@
?>
<?php /* Today's calendar page for the user if it exists
*/
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/wikilens/templates/navbar.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -25,7 +25,7 @@
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?><?php echo $NSEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
<?php }} ?><?php if (!empty($user) && $user->isAdmin()) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-15 08:19:15
|
Revision: 10777
http://sourceforge.net/p/phpwiki/code/10777
Author: vargenau
Date: 2021-12-15 08:19:13 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Remove unused template themes/wikilens/templates/newuserwelcomepage.tmpl
Modified Paths:
--------------
trunk/TODO
trunk/locale/Makefile
Removed Paths:
-------------
trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2021-12-14 18:00:57 UTC (rev 10776)
+++ trunk/TODO 2021-12-15 08:19:13 UTC (rev 10777)
@@ -62,7 +62,6 @@
to statically define predicates used by PhpWiki:SemanticWeb
(semantically enriched links, like interwiki links).
* SqlResult paging (finished?)
-* plugin\NewUserWelcomePage.php (some better template solution)
* plugin\SearchHighlight
* logfile stuff:
* plugin\RecentReferrers
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile 2021-12-14 18:00:57 UTC (rev 10776)
+++ trunk/locale/Makefile 2021-12-15 08:19:13 UTC (rev 10777)
@@ -510,7 +510,6 @@
${POT_FILE}: .././themes/wikilens/templates/body.tmpl
${POT_FILE}: .././themes/wikilens/templates/head.tmpl
${POT_FILE}: .././themes/wikilens/templates/navbar.tmpl
-${POT_FILE}: .././themes/wikilens/templates/newuserwelcomepage.tmpl
${POT_FILE}: .././themes/wikilens/templates/ratings.tmpl
${POT_FILE}: .././themes/wikilens/templates/top.tmpl
${POT_FILE}: .././themes/wikilens/themeinfo.php
Deleted: trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/newuserwelcomepage.tmpl 2021-12-14 18:00:57 UTC (rev 10776)
+++ trunk/themes/wikilens/templates/newuserwelcomepage.tmpl 2021-12-15 08:19:13 UTC (rev 10777)
@@ -1,27 +0,0 @@
-<?php
- $dbi = $request->getDbh();
-?>
-<div>
-<h2>Welcome <?php echo $FRIEND ?></h2>
-<p>Welcome to <?php echo WIKI_NAME ?>. A good place to learn about <?php echo WIKI_NAME ?> is to check out the <a href="<?php echo WikiURL(WIKI_NAME.'/'
-._("Tutorial"), '', true); ?>"><?php echo WIKI_NAME ?> Tutorial</a></p>
-<br />
-<?php if ($PAGE1 || $PAGE2 || $PAGE3) { ?>
-Here are pages on <?php echo WIKI_NAME ?> that <?php echo $SENDER ?> thinks you will be interested in:<br />
-<?php
- foreach (array($PAGE1, $PAGE2, $PAGE3) as $pagename) {
- if ($dbi->isWikiPage($pagename)) {
-?>
- <a href="<?php echo WikiURL($pagename, '', true); ?>"><?php echo $pagename ?></a><br>
-<?php
- }
- }
- }
-?>
-<br />
-<?php if ($dbi->isWikiPage($SENDERUSERNAME)) { ?>
-<p>Also, <?php echo $SENDER; ?> has his own homepage at <?php echo WIKI_NAME._(': ') ?><a href="<?php echo WikiURL($SENDERUSERNAME, '', true); ?>"><?php echo $SENDER ?>'s page</a></p>
-<?php } ?>
-<br>
-<p>To create your own login on <?php echo WIKI_NAME ?>, you can <a href="<?php echo WikiURL('NewUserRegister', '', true) ?>">Register</a></p>
-</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-15 09:28:35
|
Revision: 10778
http://sourceforge.net/p/phpwiki/code/10778
Author: vargenau
Date: 2021-12-15 09:28:33 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Remove ENABLE_XHTML_XML
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/lib/HtmlElement.php
trunk/lib/IniConfig.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/WysiwygEdit.php
trunk/lib/plugin/AsciiMath.php
trunk/lib/plugin/AsciiSVG.php
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/pgsrc/Help%2FAsciiSVGPlugin
trunk/pgsrc/ReleaseNotes
trunk/themes/default/templates/head.tmpl
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/config/config-default.ini 2021-12-15 09:28:33 UTC (rev 10778)
@@ -6,7 +6,6 @@
ENABLE_EDIT_TOOLBAR = true
JS_SEARCHREPLACE = true
ENABLE_DOUBLECLICKEDIT = false
-ENABLE_XHTML_XML = false
ENABLE_OPEN_GRAPH = false
USECACHE = true
ISREADONLY = false
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/config/config-dist.ini 2021-12-15 09:28:33 UTC (rev 10778)
@@ -85,11 +85,6 @@
; Install e.g. with Homebrew: brew install gnu-units
;UNITS_EXE = /usr/local/bin/gunits
-; Needed for inlined SVG and MathM, but conflicts with document.write().
-; Experimental. Default: false.
-; See http://hixie.ch/advocacy/xhtml
-;ENABLE_XHTML_XML = true
-
; Needed for FacebookLike plugin
;ENABLE_OPEN_GRAPH = true
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/configurator.php 2021-12-15 09:28:33 UTC (rev 10778)
@@ -453,9 +453,6 @@
$properties["UNITS_EXE"] =
new _define_commented_optional('UNITS_EXE');
-$properties["ENABLE_XHTML_XML"] =
- new boolean_define_commented_optional('ENABLE_XHTML_XML');
-
$properties["ENABLE_OPEN_GRAPH"] =
new boolean_define_commented_optional('ENABLE_OPEN_GRAPH');
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/HtmlElement.php 2021-12-15 09:28:33 UTC (rev 10778)
@@ -677,9 +677,7 @@
return HTML(HTML::script($script_args), "\n");
else
return HTML(HTML::script($script_args,
- new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
- . "\n" . trim($js) . "\n"
- . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))), "\n");
+ new RawXml("\n<!--//" . "\n" . trim($js) . "\n" . "// -->")), "\n");
}
/** Conditionally display content based of whether javascript is supported.
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/IniConfig.php 2021-12-15 09:28:33 UTC (rev 10778)
@@ -128,7 +128,7 @@
// List of all valid config options to be define()d which take booleans.
$_IC_VALID_BOOL = array
('ENABLE_PAGEPERM', 'ENABLE_EDIT_TOOLBAR', 'JS_SEARCHREPLACE',
- 'ENABLE_XHTML_XML', 'ENABLE_DOUBLECLICKEDIT',
+ 'ENABLE_DOUBLECLICKEDIT',
'USECACHE', 'WIKIDB_NOCACHE_MARKUP',
'ENABLE_REVERSE_DNS', 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH',
'ENABLE_RAW_HTML', 'ENABLE_RAW_HTML_LOCKEDONLY', 'ENABLE_RAW_HTML_SAFE',
Modified: trunk/lib/WysiwygEdit/tinymce.php
===================================================================
--- trunk/lib/WysiwygEdit/tinymce.php 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/WysiwygEdit/tinymce.php 2021-12-15 09:28:33 UTC (rev 10778)
@@ -30,8 +30,6 @@
* Suggested installation of the jscripts subdirectory
* tinymce/jscripts/tiny_mce/ into themes/default/tiny_mce/
*
- * WARNING! Probably incompatible with ENABLE_XHTML_XML
- *
* @package WysiwygEdit
* @author Reini Urban
*/
Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/WysiwygEdit.php 2021-12-15 09:28:33 UTC (rev 10778)
@@ -37,8 +37,6 @@
* when HtmlParser is finished.
* Based upon htmlarea3.php and tinymce.php
*
- * WARNING! Probably incompatible with ENABLE_XHTML_XML (TestMe)
- *
* @package WysiwygEdit
* @author Reini Urban
*/
Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/plugin/AsciiMath.php 2021-12-15 09:28:33 UTC (rev 10778)
@@ -27,7 +27,6 @@
/**
* Render ASCII math as MathML
- * Requires ENABLE_XHTML_XML = true
* See http://www.jcphysics.com/ASCIIMath/
* Syntax: http://www1.chapman.edu/~jipsen/mathml/asciimathsyntax.xml
* Example: "int_-1^1 sqrt(1-x^2)dx = pi/2"
Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/plugin/AsciiSVG.php 2021-12-15 09:28:33 UTC (rev 10778)
@@ -24,7 +24,6 @@
/**
* Interface to http://www1.chapman.edu/~jipsen/svg/asciisvg.html
- * Requires ENABLE_XHTML_XML = true
* Syntax: http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html
*/
Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/locale/it/pgsrc/NoteDiRilascio 2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,4 +1,4 @@
-Date: Mon, 6 Dec 2021 12:42:19 +0000
+Date: Wed, 15 Dec 2021 10:20:21 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=NoteDiRilascio;
@@ -21,6 +21,7 @@
* Add “Rename” tab in Sidebar theme.
* Add sample images for ~PhotoAlbum in blog theme
* Remove EDITING_POLICY
+* Remove ENABLE_XHTML_XML
* More translations
=== Plugins ===
Modified: trunk/pgsrc/Help%2FAsciiSVGPlugin
===================================================================
--- trunk/pgsrc/Help%2FAsciiSVGPlugin 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/pgsrc/Help%2FAsciiSVGPlugin 2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Wed, 15 Dec 2021 10:20:21 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FAsciiSVGPlugin;
@@ -9,8 +9,6 @@
The **~AsciiSVGPlugin** [[Help:WikiPlugin|plugin]] is an interface to
[[http://www1.chapman.edu/~jipsen/svg/asciisvg.html]]
-Requires ENABLE_XHTML_XML = true
-
Syntax: [[http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html]]
The browser must support SVG in order graphs to be displayed.
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/pgsrc/ReleaseNotes 2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,4 +1,4 @@
-Date: Mon, 6 Dec 2021 12:42:19 +0000
+Date: Wed, 15 Dec 2021 10:20:21 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -21,6 +21,7 @@
* Add “Rename” tab in Sidebar theme.
* Add sample images for ~PhotoAlbum in blog theme
* Remove EDITING_POLICY
+* Remove ENABLE_XHTML_XML
* More translations
=== Plugins ===
Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl 2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/themes/default/templates/head.tmpl 2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,9 +1,5 @@
<head>
-<?php if (ENABLE_XHTML_XML and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<?php } else { ?>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<?php } ?>
<?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
<meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
<?php if (!empty($PAGE_DESCRIPTION)) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-12-15 15:46:37
|
Revision: 10786
http://sourceforge.net/p/phpwiki/code/10786
Author: vargenau
Date: 2021-12-15 15:46:35 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Update translations; less strings
Modified Paths:
--------------
trunk/config/config-dist.ini
trunk/lib/plugin/WikiAdminUtils.php
trunk/locale/Makefile
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/locale/zh/pgsrc/PhpWikiDebug
trunk/pgsrc/PhpWikiDebug
trunk/themes/Crao/templates/actionbar.tmpl
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/Sidebar/templates/actionbar.tmpl
trunk/themes/default/templates/actionbar.tmpl
trunk/themes/smaller/templates/info.tmpl
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/config/config-dist.ini 2021-12-15 15:46:35 UTC (rev 10786)
@@ -354,7 +354,7 @@
; to the URL to the page or by adding a NoCache plugin line.
; Use '?nocache=purge' to completely discard the cached version of the page.
; You can also purge the cached markup globally by using the
-; "Purge HTML Cache" button on the PhpWikiDebug page.
+; "Purge HTML cache" button on the PhpWikiDebug page.
; Enable only for old php's with low memory or memory_limit=8MB.
; Default: false
;WIKIDB_NOCACHE_MARKUP = true
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/lib/plugin/WikiAdminUtils.php 2021-12-15 15:46:35 UTC (rev 10786)
@@ -120,11 +120,11 @@
{
switch ($action) {
case 'purge-cache':
- return _("Purge HTML Cache");
+ return _("Purge HTML cache");
case 'purge-bad-pagenames':
- return _("Purge all Pages With Invalid Names");
+ return _("Purge all pages with invalid names");
case 'purge-empty-pages':
- return _("Purge all empty, unreferenced Pages");
+ return _("Purge all empty, unreferenced pages");
case 'email-verification':
return _("E-mail Verification");
case 'db-check':
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/Makefile 2021-12-15 15:46:35 UTC (rev 10786)
@@ -394,7 +394,6 @@
${POT_FILE}: .././themes/Crao/templates/bottom.tmpl
${POT_FILE}: .././themes/Crao/templates/browse.tmpl
${POT_FILE}: .././themes/Crao/templates/editpage.tmpl
-${POT_FILE}: .././themes/Crao/templates/head.tmpl
${POT_FILE}: .././themes/Crao/templates/htmldump.tmpl
${POT_FILE}: .././themes/Crao/templates/navbar.tmpl
${POT_FILE}: .././themes/Crao/templates/signin.tmpl
@@ -490,7 +489,6 @@
${POT_FILE}: .././themes/Sidebar/templates/debug.tmpl
${POT_FILE}: .././themes/Sidebar/templates/dump-footer.tmpl
${POT_FILE}: .././themes/Sidebar/templates/htmldump.tmpl
-${POT_FILE}: .././themes/Sidebar/templates/html.tmpl
${POT_FILE}: .././themes/Sidebar/templates/logo.tmpl
${POT_FILE}: .././themes/Sidebar/templates/navbar.tmpl
${POT_FILE}: .././themes/Sidebar/templates/ratings.tmpl
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-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/de.po 2021-12-15 15:46:35 UTC (rev 10786)
@@ -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:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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."
@@ -3823,13 +3823,13 @@
msgid "Back"
msgstr "Zurück"
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
msgstr "HTML-Cachedatei Säubern"
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
msgstr "Alle Seiten mit ungültigen Namen endgültig entfernen"
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
msgstr "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind."
msgid "E-mail Verification"
@@ -5713,9 +5713,6 @@
msgid "Author History"
msgstr "Autoren Protokoll"
-msgid "Purge HTML cache"
-msgstr "HTML-Cachedatei Säubern"
-
#, php-format
msgid "Statistics about %s."
msgstr "Statistik über %s."
@@ -5837,9 +5834,6 @@
msgid "Sidebar"
msgstr "Sidebar"
-msgid "Tutorial"
-msgstr ""
-
msgid "Edit this page"
msgstr "Diese Seite bearbeiten"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/es.po 2021-12-15 15:46:35 UTC (rev 10786)
@@ -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:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -3731,13 +3731,13 @@
msgid "Back"
msgstr ""
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
msgstr ""
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
msgstr ""
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
msgstr ""
msgid "E-mail Verification"
@@ -5586,9 +5586,6 @@
msgid "Author History"
msgstr ""
-msgid "Purge HTML cache"
-msgstr ""
-
#, php-format
msgid "Statistics about %s."
msgstr ""
@@ -5707,9 +5704,6 @@
msgid "Sidebar"
msgstr ""
-msgid "Tutorial"
-msgstr ""
-
msgid "Edit this page"
msgstr "Corrija esta página"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/fr.po 2021-12-15 15:46:35 UTC (rev 10786)
@@ -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:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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."
@@ -3819,13 +3819,13 @@
msgid "Back"
msgstr "Retour"
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
msgstr "Purger le cache HTML"
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
msgstr "Supprimer les pages dont le nom n'est pas valide"
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
msgstr "Supprimer les pages vides et non référencées"
msgid "E-mail Verification"
@@ -5707,9 +5707,6 @@
msgid "Author History"
msgstr "Historique des auteurs"
-msgid "Purge HTML cache"
-msgstr "Purger le cache HTML"
-
#, php-format
msgid "Statistics about %s."
msgstr "Statistiques sur %s."
@@ -5832,12 +5829,12 @@
msgid "Sidebar"
msgstr "Barre latérale"
-msgid "Tutorial"
-msgstr "Tutoriel"
-
msgid "Edit this page"
msgstr "Modifier cette page"
+#~ msgid "Tutorial"
+#~ msgstr "Tutoriel"
+
#~ msgid "External Links"
#~ msgstr "Liens externes"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/it.po 2021-12-15 15:46:35 UTC (rev 10786)
@@ -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:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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"
@@ -3708,13 +3708,13 @@
msgid "Back"
msgstr ""
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
msgstr "Rimuovi dalla cache HTML"
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
msgstr ""
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
msgstr ""
msgid "E-mail Verification"
@@ -5546,9 +5546,6 @@
msgid "Author History"
msgstr ""
-msgid "Purge HTML cache"
-msgstr "RimuoviDallaCacheHtml"
-
#, php-format
msgid "Statistics about %s."
msgstr ""
@@ -5667,9 +5664,6 @@
msgid "Sidebar"
msgstr ""
-msgid "Tutorial"
-msgstr ""
-
msgid "Edit this page"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/ja.po 2021-12-15 15:46:35 UTC (rev 10786)
@@ -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:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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"
@@ -3694,13 +3694,13 @@
msgid "Back"
msgstr ""
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
msgstr "マークアップキャッシュの破棄"
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
msgstr ""
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
msgstr ""
msgid "E-mail Verification"
@@ -5532,9 +5532,6 @@
msgid "Author History"
msgstr ""
-msgid "Purge HTML cache"
-msgstr ""
-
#, php-format
msgid "Statistics about %s."
msgstr ""
@@ -5653,9 +5650,6 @@
msgid "Sidebar"
msgstr "スライドバー"
-msgid "Tutorial"
-msgstr ""
-
msgid "Edit this page"
msgstr "ページを編集しています"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/nl.po 2021-12-15 15:46:35 UTC (rev 10786)
@@ -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:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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"
@@ -3700,13 +3700,13 @@
msgid "Back"
msgstr "Terug"
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
msgstr ""
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
msgstr ""
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
msgstr ""
msgid "E-mail Verification"
@@ -5538,9 +5538,6 @@
msgid "Author History"
msgstr ""
-msgid "Purge HTML cache"
-msgstr ""
-
#, php-format
msgid "Statistics about %s."
msgstr ""
@@ -5659,9 +5656,6 @@
msgid "Sidebar"
msgstr "Zoek"
-msgid "Tutorial"
-msgstr ""
-
msgid "Edit this page"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/phpwiki.pot 2021-12-15 15:46:35 UTC (rev 10786)
@@ -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:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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"
@@ -3694,13 +3694,13 @@
msgid "Back"
msgstr ""
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
msgstr ""
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
msgstr ""
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
msgstr ""
msgid "E-mail Verification"
@@ -5532,9 +5532,6 @@
msgid "Author History"
msgstr ""
-msgid "Purge HTML cache"
-msgstr ""
-
#, php-format
msgid "Statistics about %s."
msgstr ""
@@ -5653,8 +5650,5 @@
msgid "Sidebar"
msgstr ""
-msgid "Tutorial"
-msgstr ""
-
msgid "Edit this page"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/sv.po 2021-12-15 15:46:35 UTC (rev 10786)
@@ -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:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -3695,13 +3695,13 @@
msgid "Back"
msgstr ""
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
msgstr ""
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
msgstr ""
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
msgstr ""
msgid "E-mail Verification"
@@ -5533,9 +5533,6 @@
msgid "Author History"
msgstr ""
-msgid "Purge HTML cache"
-msgstr ""
-
#, php-format
msgid "Statistics about %s."
msgstr ""
@@ -5654,9 +5651,6 @@
msgid "Sidebar"
msgstr ""
-msgid "Tutorial"
-msgstr ""
-
msgid "Edit this page"
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/zh.po 2021-12-15 15:46:35 UTC (rev 10786)
@@ -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:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -3705,13 +3705,13 @@
msgid "Back"
msgstr ""
-msgid "Purge HTML Cache"
-msgstr "清除標記快取"
+msgid "Purge HTML cache"
+msgstr ""
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
msgstr "用錯誤的名稱刪除頁面"
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
msgstr ""
msgid "E-mail Verification"
@@ -5560,9 +5560,6 @@
msgid "Author History"
msgstr "作者歷程"
-msgid "Purge HTML cache"
-msgstr ""
-
#, php-format
msgid "Statistics about %s."
msgstr "關於 %s 的統計."
@@ -5681,9 +5678,6 @@
msgid "Sidebar"
msgstr ""
-msgid "Tutorial"
-msgstr ""
-
msgid "Edit this page"
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/locale/zh/pgsrc/PhpWikiDebug
===================================================================
--- trunk/locale/zh/pgsrc/PhpWikiDebug 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/zh/pgsrc/PhpWikiDebug 2021-12-15 15:46:35 UTC (rev 10786)
@@ -1,4 +1,4 @@
-Date: Sat, 6 Nov 2021 09:39:42 +0000
+Date: Wed, 15 Dec 2021 16:41:34 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiDebug;
@@ -15,7 +15,7 @@
在正常情況下,你不需要使用這些,不過他們應該也不會造成任何損害.
-== 清理標記快取 Purge HTML Cache ==
+== 清理標記快取 Purge HTML cache ==
(如果你的 wiki 已經設置,) 每個頁面的最新版本的轉換內容(幾乎是 HTML)都被
快取了. 這會避免再剖析 wiki-text ,而使得頁面輸出的速度加快一些.
Modified: trunk/pgsrc/PhpWikiDebug
===================================================================
--- trunk/pgsrc/PhpWikiDebug 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/pgsrc/PhpWikiDebug 2021-12-15 15:46:35 UTC (rev 10786)
@@ -1,4 +1,4 @@
-Date: Sat, 6 Nov 2021 09:39:42 +0000
+Date: Wed, 15 Dec 2021 16:26:27 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiDebug;
@@ -16,7 +16,7 @@
In normal use, you should not need to use these, though, then again,
they should not really do any harm.
-== Purge HTML Cache ==
+== Purge HTML cache ==
(If your wiki is so configured,) the transformed (almost-HTML) content
of the most recent version of each page is cached. This speeds up page
Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/Crao/templates/actionbar.tmpl 2021-12-15 15:46:35 UTC (rev 10786)
@@ -25,7 +25,7 @@
<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
<?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
<?php $purgeb = Button(array('nocache' => 'purge'),
- _("Purge HTML Cache"), $page->getName());
+ _("Purge HTML cache"), $page->getName());
$purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
?>
<?php echo $SEP?><?php echo $purgeb ?>
Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/MonoBook/templates/info.tmpl 2021-12-15 15:46:35 UTC (rev 10786)
@@ -179,7 +179,7 @@
<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
<?php
$PurgeCache = Button(array('nocache' => 'purge'),
- _("Purge HTML Cache"), $page->getName());
+ _("Purge HTML cache"), $page->getName());
$PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
?>
<?php echo $SEP?><?php echo $PurgeCache ?>
Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl 2021-12-15 15:46:35 UTC (rev 10786)
@@ -63,7 +63,7 @@
<?php if ($isAdmin) { ?>
<?php echo ActionButton(__("PageDump"), _("Page Dump")) ?>
<?php if (USECACHE) { ?>
- <?php echo ActionButton(array('nocache' => 'purge'), _("Purge HTML Cache"), $pagename,
+ <?php echo ActionButton(array('nocache' => 'purge'), _("Purge HTML cache"), $pagename,
array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?>
<?php }} ?>
</ul>
Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/default/templates/actionbar.tmpl 2021-12-15 15:46:35 UTC (rev 10786)
@@ -33,7 +33,7 @@
<?php
if (DEBUG & _DEBUG_SQL and USECACHE) {
$PurgeCache = Button(array('nocache' => 'purge'),
- _("Purge HTML Cache"), $page->getName());
+ _("Purge HTML cache"), $page->getName());
$PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
?>
<?php echo $SEP?><?php echo $PurgeCache ?>
Modified: trunk/themes/smaller/templates/info.tmpl
===================================================================
--- trunk/themes/smaller/templates/info.tmpl 2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/smaller/templates/info.tmpl 2021-12-15 15:46:35 UTC (rev 10786)
@@ -13,7 +13,7 @@
<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
<?php
$PurgeCache = Button(array('nocache' => 'purge'),
- _("Purge HTML Cache"), $page->getName());
+ _("Purge HTML cache"), $page->getName());
$PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
?>
<?php echo $SEP?><?php echo $PurgeCache ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X