Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2019-04-24 15:24:07
|
Revision: 10118
http://sourceforge.net/p/phpwiki/code/10118
Author: vargenau
Date: 2019-04-24 15:24:05 +0000 (Wed, 24 Apr 2019)
Log Message:
-----------
Fix grammar of error message
Modified Paths:
--------------
trunk/lib/plugin/TranslateText.php
trunk/locale/fr/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/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/lib/plugin/TranslateText.php 2019-04-24 15:24:05 UTC (rev 10118)
@@ -70,7 +70,7 @@
extract($this->getArgs($argstr, $request));
if (!$lang)
return $this->error(
- _("This internal action page cannot viewed.") . "\n" .
+ _("This internal action page cannot be viewed.") . "\n" .
_("You can only use it via the WikiTranslation plugin."));
$this->lang = $lang;
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/locale/po/de.po 2019-04-24 15:24:05 UTC (rev 10118)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 18:31+0200\n"
+"POT-Creation-Date: 2019-04-24 17:17+0200\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -3163,7 +3163,7 @@
msgid "Define a translation for a specified text."
msgstr "Definiere die Übersetzung für einen gegebenen Text."
-msgid "This internal action page cannot viewed."
+msgid "This internal action page cannot be viewed."
msgstr ""
msgid "You can only use it via the WikiTranslation plugin."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/locale/po/es.po 2019-04-24 15:24:05 UTC (rev 10118)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 18:31+0200\n"
+"POT-Creation-Date: 2019-04-24 17:17+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -3072,7 +3072,7 @@
msgid "Define a translation for a specified text."
msgstr ""
-msgid "This internal action page cannot viewed."
+msgid "This internal action page cannot be viewed."
msgstr ""
msgid "You can only use it via the WikiTranslation plugin."
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/locale/po/fr.po 2019-04-24 15:24:05 UTC (rev 10118)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 18:31+0200\n"
+"POT-Creation-Date: 2019-04-24 17:17+0200\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3132,8 +3132,8 @@
msgid "Define a translation for a specified text."
msgstr "Définir la traduction d'un texte spécifique."
-msgid "This internal action page cannot viewed."
-msgstr "Cette page ne peut être vue."
+msgid "This internal action page cannot be viewed."
+msgstr "Cette page d'action interne ne peut être vue."
msgid "You can only use it via the WikiTranslation plugin."
msgstr "Vous pouvez uniquement l'utiliser via le greffon WikiTranslation."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/locale/po/it.po 2019-04-24 15:24:05 UTC (rev 10118)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 18:31+0200\n"
+"POT-Creation-Date: 2019-04-24 17:17+0200\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -3049,7 +3049,7 @@
msgid "Define a translation for a specified text."
msgstr ""
-msgid "This internal action page cannot viewed."
+msgid "This internal action page cannot be viewed."
msgstr ""
msgid "You can only use it via the WikiTranslation plugin."
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/locale/po/ja.po 2019-04-24 15:24:05 UTC (rev 10118)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 18:31+0200\n"
+"POT-Creation-Date: 2019-04-24 17:17+0200\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3035,7 +3035,7 @@
msgid "Define a translation for a specified text."
msgstr ""
-msgid "This internal action page cannot viewed."
+msgid "This internal action page cannot be viewed."
msgstr ""
msgid "You can only use it via the WikiTranslation plugin."
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/locale/po/nl.po 2019-04-24 15:24:05 UTC (rev 10118)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 18:31+0200\n"
+"POT-Creation-Date: 2019-04-24 17:17+0200\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -3041,7 +3041,7 @@
msgid "Define a translation for a specified text."
msgstr ""
-msgid "This internal action page cannot viewed."
+msgid "This internal action page cannot be viewed."
msgstr ""
msgid "You can only use it via the WikiTranslation plugin."
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/locale/po/phpwiki.pot 2019-04-24 15:24:05 UTC (rev 10118)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 18:31+0200\n"
+"POT-Creation-Date: 2019-04-24 17:17+0200\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3035,7 +3035,7 @@
msgid "Define a translation for a specified text."
msgstr ""
-msgid "This internal action page cannot viewed."
+msgid "This internal action page cannot be viewed."
msgstr ""
msgid "You can only use it via the WikiTranslation plugin."
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/locale/po/sv.po 2019-04-24 15:24:05 UTC (rev 10118)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 18:31+0200\n"
+"POT-Creation-Date: 2019-04-24 17:17+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -3036,7 +3036,7 @@
msgid "Define a translation for a specified text."
msgstr ""
-msgid "This internal action page cannot viewed."
+msgid "This internal action page cannot be viewed."
msgstr ""
msgid "You can only use it via the WikiTranslation plugin."
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2019-04-24 14:41:01 UTC (rev 10117)
+++ trunk/locale/po/zh.po 2019-04-24 15:24:05 UTC (rev 10118)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 18:31+0200\n"
+"POT-Creation-Date: 2019-04-24 17:17+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -3047,7 +3047,7 @@
msgid "Define a translation for a specified text."
msgstr "為特定文字定義轉換."
-msgid "This internal action page cannot viewed."
+msgid "This internal action page cannot be viewed."
msgstr "內部動作頁面無法瀏覽."
msgid "You can only use it via the WikiTranslation plugin."
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...> - 2019-04-26 14:14:19
|
Revision: 10124
http://sourceforge.net/p/phpwiki/code/10124
Author: vargenau
Date: 2019-04-26 14:14:17 +0000 (Fri, 26 Apr 2019)
Log Message:
-----------
Use CSS
Modified Paths:
--------------
trunk/pgsrc/SpecialPages
trunk/themes/fusionforge/pgsrc/SpecialPages
Modified: trunk/pgsrc/SpecialPages
===================================================================
--- trunk/pgsrc/SpecialPages 2019-04-26 12:58:47 UTC (rev 10123)
+++ trunk/pgsrc/SpecialPages 2019-04-26 14:14:17 UTC (rev 10124)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Fri, 26 Apr 2019 16:12:18 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=SpecialPages;
@@ -6,13 +6,13 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-{| cellpadding="5"
-|- valign="top"
-|
+{|
+|- style="vertical-align: top"
+| style="padding-right: 10px" |
== Help ==
* [[Help:Help|Help]]
* [[Help:PhpWikiManual|PhpWikiManual]]
-|
+| style="padding-right: 10px" |
== Pages ==
* [[AllPages]]
* [[AllUserPages]]
@@ -27,7 +27,7 @@
* [[LeastPopular]]
* [[WantedPages]]
* [[RandomPage]]
-|
+| style="padding-right: 10px" |
== Users ==
* [[AllUsers]]
@@ -36,7 +36,7 @@
== Interwikis ==
* [[InterWikiMap]]
-|
+| style="padding-right: 10px" |
== Changes ==
* [[RecentChanges]]
* [[FullRecentChanges]]
Modified: trunk/themes/fusionforge/pgsrc/SpecialPages
===================================================================
--- trunk/themes/fusionforge/pgsrc/SpecialPages 2019-04-26 12:58:47 UTC (rev 10123)
+++ trunk/themes/fusionforge/pgsrc/SpecialPages 2019-04-26 14:14:17 UTC (rev 10124)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:36 +0000
+Date: Fri, 26 Apr 2019 16:12:18 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=SpecialPages;
@@ -6,13 +6,13 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-{| cellpadding="5"
-|- valign="top"
-|
+{|
+|- style="vertical-align: top"
+| style="padding-right: 10px" |
== Help ==
* [[Help:../Help|Help]]
* [[Help:../PhpWikiManual|PhpWikiManual]]
-|
+| style="padding-right: 10px" |
== Pages ==
* [[AllPages]]
* [[AllUserPages]]
@@ -29,7 +29,7 @@
* [[RandomPage]]
* [[RateIt]]
* [[MyRatings]]
-|
+| style="padding-right: 10px" |
== Users ==
* [[AllUsers]]
@@ -38,7 +38,7 @@
== Interwikis ==
* [[InterWikiMap]]
-|
+| style="padding-right: 10px" |
== Changes ==
* [[RecentChanges]]
* [[FullRecentChanges]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2019-07-25 13:36:11
|
Revision: 10132
http://sourceforge.net/p/phpwiki/code/10132
Author: vargenau
Date: 2019-07-25 13:36:08 +0000 (Thu, 25 Jul 2019)
Log Message:
-----------
Update pgsrc/FindPage locale/de/pgsrc/SeiteFinden
Modified Paths:
--------------
trunk/locale/de/pgsrc/SeiteFinden
trunk/pgsrc/FindPage
Modified: trunk/locale/de/pgsrc/SeiteFinden
===================================================================
--- trunk/locale/de/pgsrc/SeiteFinden 2019-07-25 09:45:56 UTC (rev 10131)
+++ trunk/locale/de/pgsrc/SeiteFinden 2019-07-25 13:36:08 UTC (rev 10132)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2019 15:27:59 +0000
+Date: Thu, 25 Jul 2019 15:34:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=SeiteFinden;
@@ -24,9 +24,8 @@
== Volltextsuche ==
-Und hier ist eine Volltextsuche. Die Suche dauert ein paar Sekunden.
-Im Suchergebnis werden die Zeilen aus den gefundenen Seiten
-angezeigt, in denen ein Suchbegriff gefunden wurde.
+Und hier ist eine Volltextsuche.
+Im Suchergebnis werden die Zeilen aus den gefundenen Seiten angezeigt, in denen ein Suchbegriff gefunden wurde.
<<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction
editbox[] name=s text=""
@@ -36,21 +35,31 @@
== Fuzzysuche ==
-Mit der FuzzySuche findet man alle Seitentitel, die ähnlich
+Mit der Fuzzysuche findet man alle Seitentitel, die ähnlich
ausgesprochen werden.
-<?plugin-form FuzzyPages ?>
+<<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction
+ editbox[] name=s text=""
+ submit[]
+ checkbox[] name=case_exact>>
------
== Tips ==
-Wörter mit Leerzeichen trennen. Alle Wörter müssen enthalten sein.
-(UND-Verknüpfung)
-%%%Um Seiten zu finden, in denen ein Wort nicht vorkommt, ein '-'
-davor hängen.
-%%%Beispiel: 'wiki text -php' sucht nach Seiten mit dem Wörtern
-'wiki' **und** 'text', die das Wort 'php' **nicht** enthalten.
+* Wörter mit Leerzeichen trennen. Alle Wörter müssen enthalten sein.
+* '##OR##', grouping with parenthesis, string-quoting and some glob-style wildcard characters are also supported.
+* Um Seiten zu finden, in denen ein Wort nicht vorkommt, ein ##-## davor hängen.
+* Use '##^xx##' or '##xx~*##' to match words starting with '##xx##'.
+* Use '##~*xx##' or '##xx$##' to match words ending with '##xx##'.
+* Use '##^word$##' to match exact words.
+* Use //regex=auto// and '##re:##' like '##re:word.*xx##' or //regex=posix// to use Posix regular expressions. (not yet)
+* Use //regex=auto// and '##//##' like '##/^word$/##' or //regex=pcre// to match using Perl-style regular expressions.
+* Use //regex=sql// to match using SQL-style wildcards '##%##' and '##_##'.
+* Use //regex=none// to match any wildcards verbatim.
+=== Beispiel ===
+* ##wiki text -php## sucht nach Seiten mit dem Wörtern '##wiki##' und '##text##', die das Wort '##php##' **nicht** enthalten.
+
----
[[PhpWikiDokumentation]]
Modified: trunk/pgsrc/FindPage
===================================================================
--- trunk/pgsrc/FindPage 2019-07-25 09:45:56 UTC (rev 10131)
+++ trunk/pgsrc/FindPage 2019-07-25 13:36:08 UTC (rev 10132)
@@ -1,4 +1,4 @@
-Date: Tue, 9 Apr 2019 16:10:27 +0000
+Date: Thu, 25 Jul 2019 15:34:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=FindPage;
@@ -38,7 +38,10 @@
In a fuzzy pages search the titles of all pages are examined to find
those which are similarly spelled or similar sounding (English).
-<?plugin-form FuzzyPages ?>
+<<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction
+ editbox[] name=s text=""
+ submit[]
+ checkbox[] name=case_exact>>
------
@@ -56,7 +59,7 @@
* Use //regex=none// to match any wildcards verbatim.
=== Example ===
-* '##wiki text -php##' looks for all pages containing the words '##wiki##' and '##text##', but not containing the word '##php##'.
+* '##wiki text -php##' looks for all pages containing the words '##wiki##' and '##text##', but **not** containing the word '##php##'.
----
[[PhpWikiDocumentation]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2019-07-26 08:53:08
|
Revision: 10134
http://sourceforge.net/p/phpwiki/code/10134
Author: vargenau
Date: 2019-07-26 08:53:06 +0000 (Fri, 26 Jul 2019)
Log Message:
-----------
Update locale/de/pgsrc
Modified Paths:
--------------
trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
trunk/pgsrc/Help%2FAddCommentPlugin
Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2019-07-25 13:50:13 UTC (rev 10133)
+++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2019-07-26 08:53:06 UTC (rev 10134)
@@ -1,4 +1,4 @@
-Date: Fri, 19 Apr 2019 17:28:11 +0000
+Date: Fri, 26 Jul 2019 10:46:32 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHalloWeltPlugin;
@@ -20,8 +20,7 @@
~PhpWiki's Plugin Architektur erlaubt dir benutzerdefinierte HTML Elemente deinem Wiki hinzuzufügen. Du mußt nur eine neue Klasse (Unterklasse) von der ~WikiPlugin Klasse ableiten, wie mit dem Namen unterhalb, und mit der run() Methode ja nach Wiki- oder Request Argumenten die HTML Ausgabe zu erzeugen.
* Entweder man erzeugt sie über die HTML Klassen,
-* oder über ein theme Template (Vorlage). Templates sind unübersichtlicher, und Verleiten zum
- Erzeugen von ungültigem XHTML code, sind aber leichter anpassbar.
+* oder über ein theme Template (Vorlage). Templates sind unübersichtlicher, und Verleiten zum Erzeugen von ungültigem XHTML code, sind aber leichter anpassbar.
<<PhpHighlight
Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2019-07-25 13:50:13 UTC (rev 10133)
+++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2019-07-26 08:53:06 UTC (rev 10134)
@@ -1,4 +1,4 @@
-Date: Thu, 20 Jun 2019 16:47:21 +0000
+Date: Fri, 26 Jul 2019 10:46:32 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHochLadenPlugin;
@@ -7,14 +7,10 @@
Content-Transfer-Encoding: binary
Das **~HochLaden** (//UpLoad//) [[Hilfe:WikiPlugin|WikiPlugin]] zeigt eine Eingabebox und zwei Knöpfe.
-Mit dem ersten Knopf "Durchsuchen..." kann man eine Datei aus dem
-lokalem Dateisystem auswählen, die man hochladen möchte.
-Der Textwert dieses Knopfes ("Durchsuchen...") hängt von Ihrem Browser ab.
-Der zweite "HochLaden" Knopf lädt die Datei dann in das upload Verzeichnis auf dem
-Server hoch.
-Der Inhalt dieses Verzeichnis ist geheim, jede Datei dort kann mit dem "Upload~:"
-[[InterWikiKarte]]n Prefix zum Dateinamen verwendet werden.
-So können Sie z.B. leicht hochgeladene Bilder anzeigen.
+* Mit dem ersten Knopf »Durchsuchen...« kann man eine Datei aus dem lokalem Dateisystem auswählen, die man hochladen möchte. Der Textwert dieses Knopfes (»Durchsuchen...«) hängt von Ihrem Browser ab.
+* Der zweite »HochLaden« Knopf lädt die Datei dann in das upload Verzeichnis auf dem Server hoch.
+Der Inhalt dieses Verzeichnis ist geheim, jede Datei dort kann mit dem »Upload~:«
+[[InterWikiKarte]]n Prefix zum Dateinamen verwendet werden. So können Sie z.B. leicht hochgeladene Bilder anzeigen.
== Benutzung ==
Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2019-07-25 13:50:13 UTC (rev 10133)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2019-07-26 08:53:06 UTC (rev 10134)
@@ -1,4 +1,4 @@
-Date: Thu, 20 Jun 2019 16:47:21 +0000
+Date: Fri, 26 Jul 2019 10:46:32 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FNeuerKommentarPlugin;
@@ -8,7 +8,7 @@
Der **~NeuerKommentarPlugin** (//AddComment//)) [[Hilfe:WikiPlugin|WikiPlugin]] um Benutzer Kommentare zu Seiten ans Ende einer Seite anhängen zu lassen.
Anpassungs des Layouts über die Vorlagen comment.tmpl und addcomment.tmpl, und die CSS Klassen
-wikicomment, wikicomment-header, wikicomment-body, wikicomment-footer
+wikicomment, wikicomment-header, wikicomment-body, wikicomment-footer.
== Benutzung ==
{{{
@@ -32,11 +32,11 @@
| normal
|-
| **mode**
-| Liste von "add" und/oder "show".
+| Liste von »add« und/oder »show«.
| add,show
|-
| **noheader**
-| Bool'sche Variable, ob die "Kommentare" h2 Überschrift weggelassen soll.
+| Bool'sche Variable, ob die »Kommentare« h2 Überschrift weggelassen soll.
| 0
|-
| **pagename**
Modified: trunk/pgsrc/Help%2FAddCommentPlugin
===================================================================
--- trunk/pgsrc/Help%2FAddCommentPlugin 2019-07-25 13:50:13 UTC (rev 10133)
+++ trunk/pgsrc/Help%2FAddCommentPlugin 2019-07-26 08:53:06 UTC (rev 10134)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 12:12:33 +0000
+Date: Fri, 26 Jul 2019 10:46:32 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FAddCommentPlugin;
@@ -32,7 +32,7 @@
| normal
|-
| **mode**
-| List of add and/or show.
+| List of “add” and/or “show”.
| add,show
|-
| **noheader**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2019-09-02 13:50:05
|
Revision: 10141
http://sourceforge.net/p/phpwiki/code/10141
Author: vargenau
Date: 2019-09-02 13:50:03 +0000 (Mon, 02 Sep 2019)
Log Message:
-----------
Less strings
Modified Paths:
--------------
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/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/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/lib/plugin/WikiAdminChown.php 2019-09-02 13:50:03 UTC (rev 10141)
@@ -37,7 +37,7 @@
{
function getDescription()
{
- return _("Change owner of selected pages.");
+ return _("Change owner of selected pages").".";
}
function getDefaultArguments()
@@ -170,7 +170,7 @@
} else {
$pagelist = new PageList_Selectable($args['info'], $args['exclude'], $args);
$pagelist->addPageList($pages);
- $button_label = _("Change owner of selected pages.");
+ $button_label = _("Change owner of selected pages");
$header->pushContent(HTML::legend(_("Select the pages to change the owner")));
}
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/lib/plugin/WikiAdminPurge.php 2019-09-02 13:50:03 UTC (rev 10141)
@@ -35,7 +35,7 @@
{
function getDescription()
{
- return _("Permanently purge all selected pages.");
+ return _("Permanently purge selected pages").".";
}
/* getDefaultArguments() is inherited from WikiAdminSelect class */
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/lib/plugin/WikiAdminRemove.php 2019-09-02 13:50:03 UTC (rev 10141)
@@ -40,7 +40,7 @@
{
function getDescription()
{
- return _("Permanently remove all selected pages.");
+ return _("Remove selected pages").".";
}
function getDefaultArguments()
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/lib/plugin/WikiAdminRename.php 2019-09-02 13:50:03 UTC (rev 10141)
@@ -37,7 +37,7 @@
{
function getDescription()
{
- return _("Rename selected pages.");
+ return _("Rename selected pages").".";
}
function getDefaultArguments()
Modified: trunk/locale/de/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/po/de.po
===================================================================
--- trunk/locale/po/de.po 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/locale/po/de.po 2019-09-02 13:50:03 UTC (rev 10141)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 17:17+0200\n"
+"POT-Creation-Date: 2019-09-02 15:47+0200\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -3459,8 +3459,8 @@
msgid "%d minutes"
msgstr "%d Minuten"
-msgid "Change owner of selected pages."
-msgstr "Den Besitzer ausgewählte Seiten ändern."
+msgid "Change owner of selected pages"
+msgstr "Den Besitzer der ausgewählte Seiten ändern"
#, php-format
msgid "Access denied to change page “%s”."
@@ -3514,7 +3514,7 @@
msgid "Select the pages where to delete access rights"
msgstr "Wählen Sie die Seiten zum ACL löschen"
-msgid "Permanently purge all selected pages."
+msgid "Permanently purge selected pages"
msgstr "Endgültige Löschung aller ausgewählten Seiten."
#, php-format
@@ -3542,14 +3542,11 @@
msgstr ""
"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
-msgid "Permanently purge selected pages"
-msgstr "Endgültige Löschung aller ausgewählten Seiten."
-
msgid "Select the pages to purge"
msgstr "Wählen Sie die Seiten zum Löschen"
-msgid "Permanently remove all selected pages."
-msgstr "Endgültige Löschung aller ausgewählten Seiten."
+msgid "Remove selected pages"
+msgstr "Ausgewählte Seiten löschen"
#, php-format
msgid "Removed page “%s” successfully."
@@ -3579,9 +3576,6 @@
msgstr ""
"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
-msgid "Remove selected pages"
-msgstr "Ausgewählte Seiten löschen"
-
msgid "Select the pages to remove"
msgstr "Wähle Seiten zum Umbenennen aus"
@@ -3594,8 +3588,8 @@
msgstr ""
"Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits ausgewählt."
-msgid "Rename selected pages."
-msgstr "Ausgewählte Seiten umbenennen."
+msgid "Rename selected pages"
+msgstr "Ausgewählte Seiten umbenennen"
msgid "Rename to"
msgstr "Umbennen zu"
@@ -3607,9 +3601,6 @@
msgid "Rename Page"
msgstr "Seite Umbenennen"
-msgid "Rename selected pages"
-msgstr "Ausgewählte Seiten umbenennen"
-
msgid "Select the pages to rename:"
msgstr "Wähle Seiten zum Umbenennen aus:"
@@ -6016,6 +6007,21 @@
msgid "Edit this page"
msgstr "Diese Seite bearbeiten"
+#~ msgid "Change owner of selected pages."
+#~ msgstr "Den Besitzer ausgewählte Seiten ändern."
+
+#~ msgid "Permanently purge selected pages."
+#~ msgstr "Endgültige Löschung ausgewählten Seiten."
+
+#~ msgid "Permanently remove all selected pages."
+#~ msgstr "Endgültige Löschung aller ausgewählten Seiten."
+
+#~ msgid "Rename selected pages."
+#~ msgstr "Ausgewählte Seiten umbenennen."
+
+#~ msgid "Permanently purge all selected pages."
+#~ msgstr "Endgültige Löschung aller ausgewählten Seiten."
+
#~ msgid "See: %s"
#~ msgstr "Siehe: %s"
@@ -6235,9 +6241,6 @@
#~ msgid "Dump pages as XHTML"
#~ msgstr "Seiten als XHTML Dateien speichern"
-#~ msgid "Change owner of selected pages"
-#~ msgstr "Den Besitzer der ausgewählte Seiten ändern"
-
#~ msgid "CANCEL"
#~ msgstr "ABBRUCH"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/locale/po/es.po 2019-09-02 13:50:03 UTC (rev 10141)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 17:17+0200\n"
+"POT-Creation-Date: 2019-09-02 15:47+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -3361,7 +3361,7 @@
msgid "%d minutes"
msgstr "%d minutas"
-msgid "Change owner of selected pages."
+msgid "Change owner of selected pages"
msgstr ""
#, php-format
@@ -3415,7 +3415,7 @@
msgid "Select the pages where to delete access rights"
msgstr ""
-msgid "Permanently purge all selected pages."
+msgid "Permanently purge selected pages"
msgstr ""
#, php-format
@@ -3442,13 +3442,10 @@
msgid "Are you sure you want to permanently purge the following pages?"
msgstr ""
-msgid "Permanently purge selected pages"
-msgstr ""
-
msgid "Select the pages to purge"
msgstr ""
-msgid "Permanently remove all selected pages."
+msgid "Remove selected pages"
msgstr ""
#, php-format
@@ -3478,9 +3475,6 @@
msgid "Are you sure you want to remove the selected pages?"
msgstr ""
-msgid "Remove selected pages"
-msgstr ""
-
msgid "Select the pages to remove"
msgstr ""
@@ -3492,7 +3486,7 @@
msgid "Pages which have been deleted at least %s days are already checked."
msgstr ""
-msgid "Rename selected pages."
+msgid "Rename selected pages"
msgstr ""
msgid "Rename to"
@@ -3504,9 +3498,6 @@
msgid "Rename Page"
msgstr ""
-msgid "Rename selected pages"
-msgstr ""
-
msgid "Select the pages to rename:"
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/locale/po/fr.po 2019-09-02 13:50:03 UTC (rev 10141)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 17:17+0200\n"
+"POT-Creation-Date: 2019-09-02 15:47+0200\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3437,8 +3437,8 @@
msgid "%d minutes"
msgstr "%d minutes"
-msgid "Change owner of selected pages."
-msgstr "Changer le propriétaire des pages sélectionnées."
+msgid "Change owner of selected pages"
+msgstr "Changer le propriétaire des pages sélectionnées"
#, php-format
msgid "Access denied to change page “%s”."
@@ -3493,8 +3493,8 @@
msgid "Select the pages where to delete access rights"
msgstr "Sélectionnez les pages dont vous voulez supprimer les droits d'accès"
-msgid "Permanently purge all selected pages."
-msgstr "Purger définitivement toutes les pages sélectionnées."
+msgid "Permanently purge selected pages"
+msgstr "Purger définitivement les pages sélectionnées"
#, php-format
msgid "Purged page “%s” successfully."
@@ -3521,14 +3521,11 @@
msgstr ""
"Êtes-vous certain de vouloir purger définitivement les pages suivantes ?"
-msgid "Permanently purge selected pages"
-msgstr "Purger définitivement les pages sélectionnées"
-
msgid "Select the pages to purge"
msgstr "Sélectionnez les pages à purger"
-msgid "Permanently remove all selected pages."
-msgstr "Supprimer définitivement toutes les pages sélectionnées."
+msgid "Remove selected pages"
+msgstr "Supprimer les pages sélectionnées"
#, php-format
msgid "Removed page “%s” successfully."
@@ -3557,9 +3554,6 @@
msgid "Are you sure you want to remove the selected pages?"
msgstr "Êtes-vous certain de vouloir supprimer les pages sélectionnées ?"
-msgid "Remove selected pages"
-msgstr "Supprimer les pages sélectionnées"
-
msgid "Select the pages to remove"
msgstr "Sélectionner les pages à supprimer"
@@ -3572,8 +3566,8 @@
msgstr ""
"Les pages qui ont été supprimées il y a au plus %s jours sont déjà cochées."
-msgid "Rename selected pages."
-msgstr "Renommer les pages sélectionnées."
+msgid "Rename selected pages"
+msgstr "Renommer les pages sélectionnées"
msgid "Rename to"
msgstr "Renommer en"
@@ -3584,9 +3578,6 @@
msgid "Rename Page"
msgstr "Renommer la page"
-msgid "Rename selected pages"
-msgstr "Renommer les pages sélectionnées"
-
msgid "Select the pages to rename:"
msgstr "Sélectionnez les pages à renommer :"
@@ -5960,6 +5951,18 @@
msgid "Edit this page"
msgstr "Modifier cette page"
+#~ msgid "Permanently purge selected pages."
+#~ msgstr "Purger définitivement les pages sélectionnées."
+
+#~ msgid "Permanently remove all selected pages."
+#~ msgstr "Supprimer définitivement toutes les pages sélectionnées."
+
+#~ msgid "Rename selected pages."
+#~ msgstr "Renommer les pages sélectionnées."
+
+#~ msgid "Permanently purge all selected pages."
+#~ msgstr "Purger définitivement toutes les pages sélectionnées."
+
#~ msgid "See: %s"
#~ msgstr "Voir : %s"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/locale/po/it.po 2019-09-02 13:50:03 UTC (rev 10141)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 17:17+0200\n"
+"POT-Creation-Date: 2019-09-02 15:47+0200\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -3338,7 +3338,7 @@
msgid "%d minutes"
msgstr ""
-msgid "Change owner of selected pages."
+msgid "Change owner of selected pages"
msgstr ""
#, php-format
@@ -3392,7 +3392,7 @@
msgid "Select the pages where to delete access rights"
msgstr ""
-msgid "Permanently purge all selected pages."
+msgid "Permanently purge selected pages"
msgstr ""
#, php-format
@@ -3419,13 +3419,10 @@
msgid "Are you sure you want to permanently purge the following pages?"
msgstr ""
-msgid "Permanently purge selected pages"
-msgstr ""
-
msgid "Select the pages to purge"
msgstr ""
-msgid "Permanently remove all selected pages."
+msgid "Remove selected pages"
msgstr ""
#, php-format
@@ -3455,9 +3452,6 @@
msgid "Are you sure you want to remove the selected pages?"
msgstr ""
-msgid "Remove selected pages"
-msgstr ""
-
msgid "Select the pages to remove"
msgstr ""
@@ -3469,8 +3463,8 @@
msgid "Pages which have been deleted at least %s days are already checked."
msgstr ""
-msgid "Rename selected pages."
-msgstr "Rinominare pagine selezionate."
+msgid "Rename selected pages"
+msgstr ""
msgid "Rename to"
msgstr ""
@@ -3481,9 +3475,6 @@
msgid "Rename Page"
msgstr ""
-msgid "Rename selected pages"
-msgstr ""
-
msgid "Select the pages to rename:"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/locale/po/ja.po 2019-09-02 13:50:03 UTC (rev 10141)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 17:17+0200\n"
+"POT-Creation-Date: 2019-09-02 15:47+0200\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3324,7 +3324,7 @@
msgid "%d minutes"
msgstr ""
-msgid "Change owner of selected pages."
+msgid "Change owner of selected pages"
msgstr ""
#, php-format
@@ -3378,7 +3378,7 @@
msgid "Select the pages where to delete access rights"
msgstr ""
-msgid "Permanently purge all selected pages."
+msgid "Permanently purge selected pages"
msgstr ""
#, php-format
@@ -3405,14 +3405,11 @@
msgid "Are you sure you want to permanently purge the following pages?"
msgstr ""
-msgid "Permanently purge selected pages"
-msgstr ""
-
msgid "Select the pages to purge"
msgstr ""
-msgid "Permanently remove all selected pages."
-msgstr ""
+msgid "Remove selected pages"
+msgstr "選択ページを全て削除"
#, php-format
msgid "Removed page “%s” successfully."
@@ -3441,9 +3438,6 @@
msgid "Are you sure you want to remove the selected pages?"
msgstr ""
-msgid "Remove selected pages"
-msgstr "選択ページを全て削除"
-
msgid "Select the pages to remove"
msgstr ""
@@ -3455,7 +3449,7 @@
msgid "Pages which have been deleted at least %s days are already checked."
msgstr ""
-msgid "Rename selected pages."
+msgid "Rename selected pages"
msgstr ""
msgid "Rename to"
@@ -3467,9 +3461,6 @@
msgid "Rename Page"
msgstr ""
-msgid "Rename selected pages"
-msgstr ""
-
msgid "Select the pages to rename:"
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/locale/po/nl.po 2019-09-02 13:50:03 UTC (rev 10141)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 17:17+0200\n"
+"POT-Creation-Date: 2019-09-02 15:47+0200\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -3330,7 +3330,7 @@
msgid "%d minutes"
msgstr ""
-msgid "Change owner of selected pages."
+msgid "Change owner of selected pages"
msgstr ""
#, php-format
@@ -3384,7 +3384,7 @@
msgid "Select the pages where to delete access rights"
msgstr ""
-msgid "Permanently purge all selected pages."
+msgid "Permanently purge selected pages"
msgstr ""
#, php-format
@@ -3411,13 +3411,10 @@
msgid "Are you sure you want to permanently purge the following pages?"
msgstr ""
-msgid "Permanently purge selected pages"
-msgstr ""
-
msgid "Select the pages to purge"
msgstr ""
-msgid "Permanently remove all selected pages."
+msgid "Remove selected pages"
msgstr ""
#, php-format
@@ -3447,9 +3444,6 @@
msgid "Are you sure you want to remove the selected pages?"
msgstr ""
-msgid "Remove selected pages"
-msgstr ""
-
msgid "Select the pages to remove"
msgstr ""
@@ -3461,7 +3455,7 @@
msgid "Pages which have been deleted at least %s days are already checked."
msgstr ""
-msgid "Rename selected pages."
+msgid "Rename selected pages"
msgstr ""
msgid "Rename to"
@@ -3473,9 +3467,6 @@
msgid "Rename Page"
msgstr ""
-msgid "Rename selected pages"
-msgstr ""
-
msgid "Select the pages to rename:"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/locale/po/phpwiki.pot 2019-09-02 13:50:03 UTC (rev 10141)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 17:17+0200\n"
+"POT-Creation-Date: 2019-09-02 15:47+0200\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3324,7 +3324,7 @@
msgid "%d minutes"
msgstr ""
-msgid "Change owner of selected pages."
+msgid "Change owner of selected pages"
msgstr ""
#, php-format
@@ -3378,7 +3378,7 @@
msgid "Select the pages where to delete access rights"
msgstr ""
-msgid "Permanently purge all selected pages."
+msgid "Permanently purge selected pages"
msgstr ""
#, php-format
@@ -3405,13 +3405,10 @@
msgid "Are you sure you want to permanently purge the following pages?"
msgstr ""
-msgid "Permanently purge selected pages"
-msgstr ""
-
msgid "Select the pages to purge"
msgstr ""
-msgid "Permanently remove all selected pages."
+msgid "Remove selected pages"
msgstr ""
#, php-format
@@ -3441,9 +3438,6 @@
msgid "Are you sure you want to remove the selected pages?"
msgstr ""
-msgid "Remove selected pages"
-msgstr ""
-
msgid "Select the pages to remove"
msgstr ""
@@ -3455,7 +3449,7 @@
msgid "Pages which have been deleted at least %s days are already checked."
msgstr ""
-msgid "Rename selected pages."
+msgid "Rename selected pages"
msgstr ""
msgid "Rename to"
@@ -3467,9 +3461,6 @@
msgid "Rename Page"
msgstr ""
-msgid "Rename selected pages"
-msgstr ""
-
msgid "Select the pages to rename:"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/locale/po/sv.po 2019-09-02 13:50:03 UTC (rev 10141)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 17:17+0200\n"
+"POT-Creation-Date: 2019-09-02 15:47+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -3325,7 +3325,7 @@
msgid "%d minutes"
msgstr ""
-msgid "Change owner of selected pages."
+msgid "Change owner of selected pages"
msgstr ""
#, php-format
@@ -3379,7 +3379,7 @@
msgid "Select the pages where to delete access rights"
msgstr ""
-msgid "Permanently purge all selected pages."
+msgid "Permanently purge selected pages"
msgstr ""
#, php-format
@@ -3406,13 +3406,10 @@
msgid "Are you sure you want to permanently purge the following pages?"
msgstr ""
-msgid "Permanently purge selected pages"
-msgstr ""
-
msgid "Select the pages to purge"
msgstr ""
-msgid "Permanently remove all selected pages."
+msgid "Remove selected pages"
msgstr ""
#, php-format
@@ -3442,9 +3439,6 @@
msgid "Are you sure you want to remove the selected pages?"
msgstr ""
-msgid "Remove selected pages"
-msgstr ""
-
msgid "Select the pages to remove"
msgstr ""
@@ -3456,7 +3450,7 @@
msgid "Pages which have been deleted at least %s days are already checked."
msgstr ""
-msgid "Rename selected pages."
+msgid "Rename selected pages"
msgstr ""
msgid "Rename to"
@@ -3468,9 +3462,6 @@
msgid "Rename Page"
msgstr ""
-msgid "Rename selected pages"
-msgstr ""
-
msgid "Select the pages to rename:"
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2019-09-02 08:50:38 UTC (rev 10140)
+++ trunk/locale/po/zh.po 2019-09-02 13:50:03 UTC (rev 10141)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 17:17+0200\n"
+"POT-Creation-Date: 2019-09-02 15:47+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -3337,7 +3337,7 @@
msgid "%d minutes"
msgstr "%d 分鐘"
-msgid "Change owner of selected pages."
+msgid "Change owner of selected pages"
msgstr ""
#, php-format
@@ -3391,7 +3391,7 @@
msgid "Select the pages where to delete access rights"
msgstr ""
-msgid "Permanently purge all selected pages."
+msgid "Permanently purge selected pages"
msgstr ""
#, php-format
@@ -3418,14 +3418,11 @@
msgid "Are you sure you want to permanently purge the following pages?"
msgstr ""
-msgid "Permanently purge selected pages"
-msgstr ""
-
msgid "Select the pages to purge"
msgstr ""
-msgid "Permanently remove all selected pages."
-msgstr "永久移除選定的頁面."
+msgid "Remove selected pages"
+msgstr "移除選定頁面"
#, php-format
msgid "Removed page “%s” successfully."
@@ -3454,9 +3451,6 @@
msgid "Are you sure you want to remove the selected pages?"
msgstr ""
-msgid "Remove selected pages"
-msgstr "移除選定頁面"
-
msgid "Select the pages to remove"
msgstr ""
@@ -3468,8 +3462,8 @@
msgid "Pages which have been deleted at least %s days are already checked."
msgstr "列出過去 %s 天內已被刪除且檢查過的頁面."
-msgid "Rename selected pages."
-msgstr "更名已選定的頁面."
+msgid "Rename selected pages"
+msgstr "更名已選定的頁面"
msgid "Rename to"
msgstr "更名為"
@@ -3480,9 +3474,6 @@
msgid "Rename Page"
msgstr ""
-msgid "Rename selected pages"
-msgstr "更名已選定的頁面"
-
msgid "Select the pages to rename:"
msgstr "選擇頁面以進行更名:"
@@ -5807,6 +5798,12 @@
msgid "Edit this page"
msgstr "編輯此頁面"
+#~ msgid "Permanently remove all selected pages."
+#~ msgstr "永久移除選定的頁面."
+
+#~ msgid "Rename selected pages."
+#~ msgstr "更名已選定的頁面."
+
#~ msgid "See: %s"
#~ msgstr "參閱: %s"
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...> - 2019-09-02 16:02:33
|
Revision: 10144
http://sourceforge.net/p/phpwiki/code/10144
Author: vargenau
Date: 2019-09-02 16:02:31 +0000 (Mon, 02 Sep 2019)
Log Message:
-----------
Update pgsrc in various languages
Modified Paths:
--------------
trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
trunk/locale/de/pgsrc/PhpWikiSystemverwalten
trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
trunk/locale/fr/pgsrc/AdministrationDePhpWiki
trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki
trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
trunk/locale/fr/pgsrc/Aide%2FGreffon%C3%89diterMetaData
trunk/locale/fr/pgsrc/Aide%2FGreffonAjouterDesCommentaires
trunk/locale/fr/pgsrc/Aide%2FGreffonAlbumPhotos
trunk/locale/fr/pgsrc/Aide%2FGreffonBeauTableau
trunk/locale/fr/pgsrc/Aide%2FGreffonCalendrier
trunk/locale/fr/pgsrc/Aide%2FGreffonColorationPhp
trunk/locale/fr/pgsrc/Aide%2FGreffonCommenter
trunk/locale/fr/pgsrc/Aide%2FGreffonCr%C3%A9erUnePage
trunk/locale/fr/pgsrc/Aide%2FGreffonCr%C3%A9erUneTdm
trunk/locale/fr/pgsrc/Aide%2FGreffonD%C3%A9plierLesSousPages
trunk/locale/fr/pgsrc/Aide%2FGreffonHistoriqueAuteur
trunk/locale/fr/pgsrc/Aide%2FGreffonInclureUnePage
trunk/locale/fr/pgsrc/Aide%2FGreffonInfosSyst%C3%A8me
trunk/locale/fr/pgsrc/Aide%2FGreffonIns%C3%A9rer
trunk/locale/fr/pgsrc/Aide%2FGreffonListeDesSousPages
trunk/locale/fr/pgsrc/Aide%2FGreffonM%C3%A9t%C3%A9oPhp
trunk/locale/fr/pgsrc/Aide%2FGreffonRechercheExterne
trunk/locale/fr/pgsrc/Aide%2FGreffonRedirection
trunk/locale/fr/pgsrc/Aide%2FGreffonRessourcesRss
trunk/locale/fr/pgsrc/Aide%2FGreffonTeX2png
trunk/locale/fr/pgsrc/Aide%2FGreffonWiki
trunk/locale/fr/pgsrc/Aide%2FInterWiki
trunk/locale/fr/pgsrc/Aide%2FLienGoogle
trunk/locale/fr/pgsrc/ChercherUnePage
trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki
trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki
trunk/locale/zh/pgsrc/Help%2FHowToUseWiki
trunk/pgsrc/Help%2FHowToUseWiki
Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Fri, 19 Apr 2019 17:28:11 +0000
+Date: Mon, 2 Sep 2019 17:46:19 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FTextFormatierungsRegeln;
@@ -10,21 +10,16 @@
== Übersicht ==
-*Hervorhebung:* <tt>~_</tt> for _italics_, <tt>~*</tt> for *bold*,
-<tt>~_~*</tt> for _*both*_, <tt>~=</tt> for =fixed width=.%%%
-*Listen:* <tt>~*</tt> for bullet lists, <tt>#</tt> for numbered lists,
-_Term<b>:</b>~<new-line> definition_ for definition lists.%%%
-*Unformatiert:* Enclose text in <tt>~<pre>~</pre></tt> or
-<tt>~<verbatim>~</verbatim></tt>.%%%
-*Text einrücken:* Indent the paragraph with whitespaces.%%%
-*Querverweise:* ~JoinCapitalizedWords or use square brackets for a
-<tt>~[page link]</tt> or URL <tt>~[~http://cool.wiki.int/]</tt>.%%%
-*Links verhindern:* Prefix with "<tt>~~</tt>":
-<tt>~~~DoNotHyperlink</tt>, name links like <tt>~[text | URL]</tt>.%%%
-*Verschiedenes:* "<tt>!</tt>", "<tt>!!</tt>", "<tt>!!!</tt>" make headings,
-"<tt>~%%%</tt>" or "<tt>~<br></tt>" makes a linebreak,
-"<tt>~----</tt>" makes a horizontal rule.%%%
-*Erlaubte HTML Tags:* <b>b</b> <big>big</big> <i>i</i>
+**Hervorhebung:** ##~/~/## für //italics//, ##~*~*## für **bold**, ##~*~*~/~/...~/~/~*~*## für **//both//**, ##~#~### for ##fixed width##. \\
+**Lists:** ##~*## for bullet lists, ##~### for numbered lists; use multiple ##~*## or ##~### for nested lists. \\
+**Headings:** "##~=~=##", "##~=~=~=##", "##~=~=~=~=##", etc. make headings. \\
+**Unformatiert:** Enclose text in ##~<pre>~</pre>## or##~<verbatim>~</verbatim>##.%%%
+**Text einrücken:** Indent the paragraph with whitespaces. \\
+**Querverweise:** ~JoinCapitalizedWords or use square brackets for a##~[page link]## or URL ##~[~http://cool.wiki.int/]##.%%%
+
+**Links verhindern:** Prefix with "##~~##":##~~~DoNotHyperlink##, name links like ##~[text | URL]##.%%%
+**Verschiedenes:** "##!##", "##!!##", "##!!!##" make headings,"##~%%%##" or "##~<br>##" makes a linebreak,"##~----##" makes a horizontal rule.%%%
+**Erlaubte HTML Tags:** <b>b</b> <big>big</big> <i>i</i>
<small>small</small> <tt>tt</tt> <em>em</em> <strong>strong</strong>
<s>s</s> <strike>strike</strike>
<abbr>abbr</abbr> <acronym>acronym</acronym> <cite>cite</cite>
@@ -33,7 +28,8 @@
**More:** [[Help:TextFormattingRules#Tables|tables]], [[Help:TextFormattingRules#Images|images]],
[[Help:CreateTocPlugin|table of contents]], [[Help:TextFormattingRules#Inserting_plugins|plugins]]
-----
+More explanations: [[Hilfe:TextFormatierungsRegeln]]
+
== Tip ==
Schau dir am besten auch den »Quelltext« dieser Seite an, indem du unten auf den Link zum Editieren klickst. Dann verstehst du die Beispiele besser.
@@ -45,70 +41,228 @@
* Vier oder mehr Minuszeichen am Zeilenanfang erzeugen eine horizontale Linie
* =~%%%= oder =~<br>= erstellt einen Zeilenumbruch (auch in Überschriften und Listen)
+== Hervorhebung ==
+
+* Verwende einen Unterstrich (##~_##) für _Betonung_ (wird normalerweise _kursiv_ dargestellt)
+* Verwende Sternchen (##~*##) für *starke Betonung* (wird normalerweise *fett* dargestellt)
+* Du kannst sie auch zusammen verwenden: *_fett & kursiv_*
+* _Betonungen_ können _mehrfach_ in einer Zeile verwendet werden, aber sie können _nicht_ über das Zeilenende hinausgehen:
+
+// So etwas
+
+funktioniert nicht//
+
+=== Monospace ===
+
+Monospace text is made using two hashes:
+
+{{{
+This sentence contains ##monospace text##.
+}}}
+
+This sentence contains ##monospace text##.
+
+=== Superscript ===
+
+Superscript text is made using two carets:
+
+{{{
+The XX^^th^^ century.
+}}}
+
+The XX^^th^^ century.
+
+=== Subscript ===
+
+Subscript text is made using two commas:
+
+{{{
+Water is H,,2,,O.
+}}}
+
+Water is H,,2,,O.
+
+=== Fonts ===
+
+There's no syntax for font tags.
+
+=== Color Text ===
+
+Is it possible to write text in color.
+
+{{{
+%color=green% green text %% and back to normal
+}}}
+will give:
+%%%
+%color=green% green text %% and back to normal
+
+The easiest way to do it is to use the COLOR button in the Edit Toolbar.
+The text will be in green by default. You can then change the color.
+
+Allowed colors are:
+* an HTML color number (# followed by 3 or 6 digits),
+* the following predefined color names:
+{| class="bordered"
+|-
+| %color=aqua% aqua %%
+| style="background-color:#565c5e" | %color=beige% beige %%
+| %color=black% black %%
+| %color=blue% blue %%
+| %color=brown% brown %%
+| %color=chocolate% chocolate %%
+| %color=cyan% cyan %%
+| %color=fuchsia% fuchsia %%
+| %color=gold% gold %%
+| %color=gray% gray %%
+|-
+| %color=green% green %%
+| style="background-color:#565c5e" | %color=ivory% ivory %%
+| %color=indigo% indigo %%
+| %color=lime% lime %%
+| %color=magenta% magenta %%
+| %color=maroon% maroon %%
+| %color=navy% navy %%
+| %color=olive% olive %%
+| %color=orange% orange %%
+| %color=pink% pink %%
+|-
+| %color=purple% purple %%
+| %color=red% red %%
+| %color=salmon% salmon %%
+| %color=silver% silver %%
+| style="background-color:#565c5e" | %color=snow% snow %%
+| %color=teal% teal %%
+| %color=turquoise% turquoise %%
+| %color=violet% violet %%
+| style="background-color:#565c5e" | %color=white% white %%
+| %color=yellow% yellow %%
+|}
+
+Note: you can put the headers in color, but only if you do not have a table of content. For now, the table of content is incompatible with color headers.
+
+=== Escape Character ===
+
+The tilde '~~' is the //Escape Character//:
+* A single tilde '~~' followed by nothing gets rendered as a single tilde. => ~
+* Two tilde '~~~~' get rendered as a single tilde. => ~~
+* A single tilde before a link ('~~http~:~/~/foo.bar') prevents linking. => ~http://foo.bar
+* Two tildes before a link ('~~~~http~:~/~/foo.bar') produce a tilde followed by the hyperlinked URL. => ~~http://foo.bar
+* A tilde inside an URL gets removed, unless it's formatted inside square brackets.
+* Two tildes inside an URL (without brackets) become a single tilde. => [[http://foo.bar/~user]] or http://foo.bar/~~user
+
+=== Special Characters ===
+
+All special non-whitespace HTML characters are displayed as-is. Exceptions below.
+
+== Paragraphs ==
+
+* Don't indent paragraphs
+* Words wrap and fill as needed
+* Use blank lines as separators
+* Four or more minus signs make a horizontal rule
+* "##~\~\##", "##~%%%##" or "##~<br>##" makes a linebreak (in headings and lists too)
+
== Listen ==
+=== Aufzählungslisten ===
+
+Recommended syntax (Wikicreole):
* Ein Sternchen für die erste Ebene
- * eingerückte Sternchen (mind 2 Zeichen) für die zweite Ebene, usw.
-* Verwende <tt>~*</tt>, <tt>-</tt>, <tt>+</tt> oder <tt>o</tt> für Aufzählungslisten, <tt>#</tt> für numerierte Listen (auch durcheinander)
-* Definitions Listen:
- <pre>
- Term:
- Definition
- </pre>
- ergibt
- Term:
- Definition
- wie in einer =<DL><DT><DD>= Liste
-* Andere Leerzeichen als Tab am Zeilenanfang erstellen vorformatierten Text mit einer anderen Schriftart
+* double asterisk for second level, etc.
+Be sure to **put a space after the asterisk**.
+
+Sie können auch eingerückte Sternchen für die zweite Ebene verwenden (mind 2 Zeichen) für die zweite Ebene, usw.
+
+=== Numerierte Listen ===
+
+Recommended syntax (Wikicreole):
+* ##~### für die erste Ebene
+* double ##~### for second level, etc.
+
+Be sure to **put a space after the hash sign**.
+
+You can also use indented ##~### for second level (indent at least two spaces).
+
+=== Definitions Listen ===
+
+{{{
+Term:
+ Definition
+}}}
+
+ergibt
+
+Term:
+ Definition
+
+=== Remark ===
+
+Items may contain multiple paragraphs and other multi-lined content, just indent the items
+
== Überschriften ==
-* '=!=' am Zeilenanfang erstellt eine kleine Überschrift ''H3''
-* '=!!=' eine mittlere ''H2''
-* '=!!!='' eine große ''H1''
+=== Wikicreole syntax (recommended) ===
+* '~=~=' am Zeilenanfang erstellt eine große Überschrift (h2)
+* '~=~=~=' am Zeilenanfang erstellt eine mittlere Überschrift (h3)
+* '~=~=~=~=' am Zeilenanfang erstellt eine kleine Überschrift (h4)
+* '~=~=~=~=~=' am Zeilenanfang erstellt eine kleiner Überschrift (h5)
+* '~=~=~=~=~=~=' am Zeilenanfang erstellt eine winzige Überschrift (h6)
+
+=== Classic Phpwiki syntax ===
+
+* '##!!!##' am Zeilenanfang erstellt eine große Überschrift (h2)
+* '##!!##' am Zeilenanfang erstellt eine mittlere Überschrift (h3)
+* '##!##' am Zeilenanfang erstellt eine kleine Überschrift (h4)
+
== Unformatierter Text ==
-* Setze die Zeilen in =~<pre>=:
- <verbatim>
- <pre>
- Preformatted text. WikiLinks still work.
- </pre>
- </verbatim>
- gives
- <pre>
- Preformatted text. WikiLinks still work.
- </pre>
-* If you want text with no Wiki interaction, use the =~<verbatim>= tag:
- <pre>
- <verbatim>
- Preformatted text. ~WikiLinks do not work.
- </verbatim>
- </pre>
- gives
- <verbatim>
- Preformatted text. WikiLinks do not work.
- </verbatim>
+Setzen Sie den vorformatierten Text zwischen drei öffnenden geschweiften Klammern und drei schließenden geschweiften Klammern
+<verbatim>
+{{{
+Preformatted text. ~WikiLinks do not work.
+}}}
+</verbatim>
+
+gives
+
+{{{
+Preformatted text. WikiLinks do not work.
+}}}
+
+If you want Wiki interaction, place preformatted lines inside ##~<pre>##:
+
+{{{
+<pre>
+Preformatted text. WikiLinks still work.
+</pre>
+}}}
+
+gives
+
+<pre>
+Preformatted text. WikiLinks still work.
+</pre>
+
== Eingerückte Absätze ==
-* Zwei oder mehr Leerzeichen am Anfgang erzeugen eingerückte Absätze. Einrückungen dürfen sich steigern.
+Zwei oder mehr Leerzeichen am Anfgang erzeugen eingerückte Absätze. Einrückungen dürfen sich steigern.
Dieser Absatz ist eingerückt.
Dieser Absatz ist noch mehr eingerückt.
-== Hervorhebung ==
+E-mail style block-quoting is supported as well:
+{{{
+> This is block-quoted text.
+}}}
+renders as
-* Verwende einen Unterstrich (<tt>~_</tt>) für _Betonung_ (wird normalerweise _kursiv_ dargestellt)
-* Verwende Sternchen (<tt>~*</tt>) für *starke Betonung* (wird normalerweise *fett* dargestellt)
-* Du kannst sie auch zusammen verwenden: *_fett & kursiv_*
-* _Betonungen_ können _mehrfach_ in einer Zeile verwendet werden, aber sie können _nicht_ über das Zeilenende hinausgehen:
+> This is block-quoted text.
- _So etwas
-
- funktioniert nicht_
-
== Querverweise (Links) ==
* Hyperlinks zu anderen Seiten im Wiki werden erstellt, indem man den Namen in eckige Klammern
@@ -118,9 +272,8 @@
den Namen und dann, getrennt durch einen senkrechten Strich (|), die Adresse angibst:
[PhpWiki Homepage | http://phpwiki.sourceforge.net/] ---
[Die Start Seite | StartSeite]
-
* Du kannst das Erstellen eines Links verhindern, indem du vor das Wort eine
- Tilde '<tt>~~</tt>' setzt, zum Beispiel ~DasIstKeinLink.
+ Tilde '##~~##' setzt, zum Beispiel ~DasIstKeinLink.
~http://not.linked.to/
* You can create footnotes by using ~[1], ~[2], ~[3], ... like this here #[|ftnt
_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart. (If the ~[ is
@@ -131,8 +284,51 @@
* Adressen, die mit **.png** oder **.jpg** enden (d.h. Bilder) werden in die Seite
eingefügt, wenn sie in eckige Klammern gesetzt werden, z. B.: [[http://phpwiki.demo.free.fr/themes/default/images/png.png]]
+== Images ==
+
+An inline image is created with curly brackets.
+An alternate text can be put after a pipe. If there is none, an empty alternate text will be created.
+
+{{{
+{{myimage.png}}
+{{myimage.png|this is the alt text for my image}}
+[[some link|{{myimage.png}}]] - if you click on the image, will goto "some link"
+[[some link|{{myimage.png|alt text}}]] - same with alternative
+[[http://example.com/|{{myimage.png}}]] - same as above: picture links to url
+[[http://example.com/|{{myimage.png|alt text}}]] - same with alternative
+}}}
+
== Tabellen ==
+=== Wikicreole tables ===
+
+All cells are separated by single pipes.
+Leading spaces are permitted before the first cell of a row and trailing spaces are permitted at the end of a line.
+The ending pipe is optional.
+
+You can embed links, bold, italics, line breaks, and nowiki in table cells.
+
+Equal sign directly following pipe defines a header.
+Headers can be arranged horizontally or vertically.
+
+{{{
+|=Heading Col 1 |=Heading Col 2 |
+|Cell 1.1 |Two lines\\in Cell 1.2 |
+|Cell 2.1 |Cell 2.2 |
+}}}
+
+will give:
+
+|=Heading Col 1 |=Heading Col 2 |
+|Cell 1.1 |Two lines\\in Cell 1.2 |
+|Cell 2.1 |Cell 2.2 |
+
+=== Mediawiki tables ===
+
+See [[Help:MediawikiTablePlugin]].
+
+=== Definition list style tables ===
+
Definition list style tables are written just like definition lists,
except that you replace the trailing colon on the term with a "pipe" (##|##).
Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Fri, 19 Apr 2019 17:28:11 +0000
+Date: Mon, 2 Sep 2019 14:57:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FVorlagePlugin;
@@ -6,79 +6,145 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Vorlage = Parametrische Blöcke.
+Der **Vorlage** (//Template//) [[Hilfe:WikiPlugin|WikiPlugin]]...
-Include text from a wiki page and replace certain placeholders by parameters.
-Similiar to CreatePage with the template argument, but at run-time.
+Parametrische Blöcke...
-Similiar to the Mediawiki templates but not with the "|" parameter separator.
-Note: The Mediawiki syntax is also supported.
+There are two syntaxes to call a template, the usual Phpwiki syntax for plugins, and a more
+concise syntax similar to Mediawiki templates.
== Benutzung ==
+=== Without parameters ===
+
+Plugin syntax:
{{{
-<<Template page=Template/Footer>>
+<<Template page=Footer>>
+}}}
-<<Template page=Template/Film vars="title=SomeFilm&year=1999" >>
-
-{{Template/Film|title=SomeFilm|year=1999}}
+Short syntax:
+{{{
+{{Footer}}
}}}
-== Plugin Argumente ==
+=== With parameters ===
-Argument|
- Vorgabewert|
- Beschreibung
+Plugin syntax:
+{{{
+<<Template page=Film vars="title=SomeFilm&year=1999">>
+}}}
-page|
- (empty)|
- pagename to be included as template
-
-vars|
- (empty)|
- optional parameters to be expanded inside the template
-
-==== Parameter expansion:
- vars="var1=value1&var2=value2"
-
-We only support named parameters, not numbered ones as in mediawiki, and
-the placeholder is %%var%% and not {{~{var~}}} as in mediawiki.
-
-The following predefined variables are automatically expanded if existing:
+Short syntax:
{{{
- pagename
- mtime - last modified date + time
- ctime - creation date + time
- author - last author
- owner
- creator - first author
- SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
+{{Film|title=SomeFilm|year=1999}}
}}}
-<noinclude> .. </noinclude> is stripped
+=== With a specific revision of the page ===
-==== In work:
- Support a mediawiki-style syntax extension which maps
+Plugin syntax:
{{{
- {{Template/Film|title=Some Good Film|year=1999}}
+<<Template page=somepage rev=5>>
}}}
- to
+
+Short syntax:
{{{
- <<Template page=Template/Film vars="title=Some Good Film&year=1999" >>
+{{somepage?version=5}}
}}}
-=== Beispiele ===
+== Argumente ==
+{| class="bordered"
+|-
+! Argument
+! Beschreibung
+! Vorgabe
+|-
+| **page**
+| pagename to be included as template
+| //None// (required argument)
+|-
+| **vars**
+| optional parameters to be expanded inside the template
+| (empty)
+|-
+| **rev**
+| page revision
+| most recent revision
+|-
+| **section**
+| just include a named section
+| (empty)
+|-
+| **sectionhead**
+| when including a named section show the heading
+| (empty)
+|}
+
+=== Page to include ===
+
+If "Template:$page" exists, it is used.
+
+Else, if "Template/$page" exists, it is used.
+
+Else "$page" is used.
+
+This allows compatibility with Mediawiki that puts templates in the "Template:" namespace.
+
+=== Parameter expansion ===
+
+We only support named parameters, not numbered ones as in Mediawiki, and
+the placeholder is %%var%% and not ~{~{~{var~}~}~} as in Mediawiki.
+
{{{
- <<Template page=Vorlage/Beispiel vars="title=TestTitle" >>
+vars="var1=value1&var2=value2"
}}}
-Standard syntax:
- <<Template page=Vorlage/Beispiel vars="title=TestTitle" >>
+The following predefined variables are automatically expanded if existing:
+{| class="bordered"
+|-
+! Variable
+! Description
+|-
+| pagename
+|
+|-
+| mtime
+| last modified date + time
+|-
+| ctime
+| creation date + time
+|-
+| author
+| last author
+|-
+| owner
+|
+|-
+| creator
+| first author
+|-
+| SERVER_URL
+|
+|-
+| DATA_PATH
+|
+|-
+| SCRIPT_NAME
+|
+|-
+| PHPWIKI_BASE_URL
+|
+|-
+| BASE_URL
+|
+|}
-Shorter syntax:
- {{Vorlage/Beispiel|title=TestTitel}}
+== Inclusion ==
+~<noinclude> .. ~</noinclude> is stripped.
+
+~<includeonly> .. ~</includeonly> is only expanded in pages using the template, not in the template itself.
+
<noinclude>
----
[[PhpWikiDokumentation]] [[KategorieWikiPlugin]]
Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Fri, 19 Apr 2019 17:28:11 +0000
+Date: Mon, 2 Sep 2019 14:11:56 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWieManWikiBenutzt;
@@ -13,6 +13,7 @@
* Kursiven Text bekommt man, indem man Wörter in jeweils zwei Apostrophen ' einschließt, ''wie in diesem Beispiel''.
* Fette Schrift bekommt man, indem man Wörter in jeweils zwei untergesetzten Strichen einschließt, **wie in diesem Beispiel**
* Und beides, indem man **//beides verwendet//**.
+* You get ##monospaced text## by using two hash signs on either side.
* Eine Liste erhält man, indem man eine Zeile mit einem Sternchen »*« startet.
* Vorformatierten Text rückt man mit mindestens einem Leerzeichen ein:
{{{
@@ -33,12 +34,12 @@
* Links kann man erzeugen, indem man einzelne Wörter, deren Anfangsbuchstabe groß geschrieben wird, zusammenfügt. Wenn du also etwa eine Seite darüber schreiben willst, dass Arno Ratten mag, schreibst du: ArnoMagRatten. Falls die Seite noch nicht existiert erscheint dahinter ein Fragezeichen, das dir die Möglichkeit gibt die Seite zu erzeugen: DieseSeiteSollteNichtExistieren. (Und bitte verdirb das Beispiel nicht, indem du diese Seite erzeugst).
* Um externe Links zu setzen, kannst du einfach die Adresse eintippen und PhpWiki erzeugt einen passenden Link, z.B. http://www.diezeit.de/
-* Um Bilder einzufügen, schließt man deren Adresse in eckigen Klammern ein, wie hier: [[!http://www.deinhost.de/bilder/bild.png]. Falls die Adresse des Bildes nicht in eckigen Klammern steht, wird einfach nur die Adresse (nicht aber das Bild) angezeigt.
+* Um Bilder einzufügen, schließt man deren Adresse in eckigen Klammern ein, wie hier: ~[~[~http://www.deinhost.de/bilder/bild.png]]. Falls die Adresse des Bildes nicht in eckigen Klammern steht, wird einfach nur die Adresse (nicht aber das Bild) angezeigt.
* Jetzt kann es eigentlich schon mit dem SeitenErzeugen losgehen!
----
-WikiWikiWeb soll schnell und einfach zu editieren sein. Es hat eine sehr
+Ein [[Hilfe:WikiWikiWeb|WikiWikiWeb]] soll schnell und einfach zu editieren sein. Es hat eine sehr
einfache Syntax, über die du in TextFormatierungsRegeln mehr erfahren kannst.
----
Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2019 15:27:59 +0000
+Date: Mon, 2 Sep 2019 14:45:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWikiTechnik;
@@ -10,22 +10,18 @@
([[http://www.php.net/]]) geschrieben. PHP hat eine ähnliche Syntax wie
Perl oder C und funktioniert ähnlich wie ASP, ~EmbPerl oder JSP.
-~PhpWiki besteht aus etwa einem Dutzend Dateien mit gemischtem PHP und
-HTML. Die Webseiten, aus denen ein WikiWikiWeb besteht, werden von
-PHP live in einer Datenbank gespeichert, außerdem werden
-Sicherungskopien der vorherigen Versionen aller Seiten auch
-gespeichert. (PhpWiki unterstützt inzwischen neben DBM auch
-Datenbankserver wie MySQL oder PostgreSQL, und einfache
-Textdateien.)
+~PhpWiki besteht aus etwa einem Dutzend Dateien mit gemischtem PHP und HTML. Die
+Webseiten, aus denen ein [[Hilfe:WikiWikiWeb|WikiWikiWeb]] besteht, werden von PHP live in einer Datenbank
+gespeichert, außerdem werden Sicherungskopien der vorherigen Versionen aller Seiten auch gespeichert. (~PhpWiki
+unterstützt inzwischen neben DBM auch Datenbankserver wie MySQL oder PostgreSQL, und einfache Textdateien.)
Immer wenn ein Benutzer eine Seite anfordert wird sie aus der
Datenbank geholt und fliegender erstellt. Anwender fragen wirklich
-nur die Seite index.php ab, die automatisch feststellt, welche
+nur die Seite ##index.php## ab, die automatisch feststellt, welche
weiteren Seiten eingebunden werden müssen.
-Links auf andere Seiten in einem Wiki werden automatisch erstellt:
-[SeitenNamen|DseWiki:SeitenNamen]. Die Möglichkeit, neue Seiten zu
-erstellen, indem man einfach einen Link zu diesen erstellt, ist eine
+Links auf andere Seiten in einem Wiki werden automatisch erstellt: [[SeiteFinden]].
+Die Möglichkeit, neue Seiten zu erstellen, indem man einfach einen Link zu diesen erstellt, ist eine
der wichtigsten Eigenschaften eines Wikis. Außerdem sind Links auf
externe Seiten genauso einfach zu erstellen:
# http://www.wcsb.org/
@@ -35,13 +31,12 @@
# http://theregister.co.uk/
In Verbindung mit einem einzigen Namensraum und einfachen
-Textformatierungen besitzt ein Wiki viele Eigenschaften von
-WabiSabi.
+Textformatierungen besitzt ein Wiki viele Eigenschaften von [[Hilfe:WabiSabi|WabiSabi]].
~PhpWiki ist freie Software unter der GNU General Public License, die
unter dieser Adresse zu finden ist:
[[http://agnes.dida.physik.uni-essen.de/~gnu-pascal/gpl-ger.html]]
-(und auf Englisch: [[http://www.gnu.org/copyleft/gpl.html]]).
+(und auf Englisch: [[http://www.gnu.org/copyleft/gpl.txt]]).
<noinclude>
----
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Apr 2019 18:24:49 +0000
+Date: Mon, 2 Sep 2019 17:16:31 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten;
@@ -7,11 +7,9 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-**//Beachte://** //Du mußt den Systemverwalter-Zugang zuerst mit einem
-Passwort schützen, sonst werden die meisten Links auf dieser Seite
-nicht funktionieren.//
+**//Beachte://** //Du mußt den Systemverwalter-Zugang zuerst mit einem Passwort schützen, sonst werden die meisten Links auf dieser Seite nicht funktionieren.//
-<<CreateToc jshide||=1 with_toclink||=1 >>
+<<CreateToc jshide||=0 with_toclink||=1 position=right with_counter=1>>
== Seiten Explorer ==
@@ -21,64 +19,59 @@
oder rufe die möglichen ~WikiAdmin Aktionen direkt auf:
-| [[/Löschen]] | [[/Umbenennen]] | [[/SuchenErsetzen]] | [[/AclSetzen]] | [[/Chown]]
+| [[/Chown]] | [[/Entfernen]] | [[/Löschen]] | [[/Umbenennen]] | [[/SuchenErsetzen]] | [[/AclSetzen]] | [[/SetAclSimple]] | [[/DeleteAcl]]
+== Global Access Rights ==
+
+These action pages will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+* [[SetGlobalAccessRightsSimple]]
+* [[SetGlobalAccessRights]]
+
== Benutzerverwaltung ==
-Setze ein Benutzer Passwort zurück:
+=== Setze ein Benutzer Passwort zurück ===
- <?plugin-form PasswordReset textinput=user method=post ?>
+<?plugin-form PasswordReset textinput=user method=post ?>
-Email Verification:
+=== Email Verification ===
- Die EmailVerification ist momentan nicht strikt, d.h. einige mögliche falsche Ergebnisse der
- automatischen Überprüfung auf gültige E-Mail Addressen kann hier verwaltet werden. Manche Domains oder
- Email server können nicht automatisch überprüft werden.
+Die EmailVerification ist momentan nicht strikt, d.h. einige mögliche falsche Ergebnisse der
+automatischen Überprüfung auf gültige E-Mail Addressen kann hier verwaltet werden. Manche Domains oder
+Email server können nicht automatisch überprüft werden.
- Dieser Link zeigt eine Liste aller mit E-Mail registrierten Benutzer, und Checkboxes um die
- Verifizierung manuell zu ändern.
+Dieser Link zeigt eine Liste aller mit E-Mail registrierten Benutzer, und Checkboxes um die Verifizierung manuell zu ändern.
- <<WikiAdminUtils
- action=email-verification
- label="E-Mail Verifizierung"
- >>
+<<WikiAdminUtils action=email-verification label="E-Mail Verifizierung">>
== Aufräumen ==
-Räume die Wiki SandKiste auf. Hiermit kann man die Seite mit der
+Räume die Wiki [[SandKiste]] auf. Hiermit kann man die Seite mit der
Version von locale/de/pgsrc/SandKiste erneut initialisieren:
-[ SandKiste löschen | phpwiki:?action=loadfile&overwrite=1&source=locale/de/pgsrc/SandKiste ].
+**[[phpwiki:?action=loadfile&overwrite=1&source=locale/de/pgsrc/SandKiste|SandKiste löschen]]**
== Speichern und Archivieren ==
-==== Backup der PhpWiki Datenbank als ZIP Dateien
+=== Backup der PhpWiki Datenbank als ZIP Dateien ===
Diese Links erzeugen automatisch ZIP Archive, mit allen Seiten in
deinem Wiki. Die ZIP Datei wird auf deinen lokalen Computer
heruntergeladen, und muß dort gespeichert werden.
-Diese **[ kleine ZIP Datei | phpwiki:?action=zip]** enthält nur die
-aktuellste Versionen aller Seiten, und diese **[ große ZIP Datei |
-phpwiki:?action=zip&include=all]** enthält zusätzlich alle
-archivierten, vorigen Versionen.%%%
+Diese **[[phpwiki:?action=zip|kleine ZIP Datei]]** enthält nur die
+aktuellste Versionen aller Seiten, und diese **[[phpwiki:?action=zip&include=all|große ZIP Datei]]** enthält zusätzlich alle archivierten, vorigen Versionen.
+
(Wenn dein PhpWiki insoweit konfiguriert ist, darf jeder die ZIP Datei herunterladen.)
-Wenn von diesem PHP die _zlib_ Bibliothek unterstützt wird, werden
-alle Seiten in dem Archiv komprimiert, ansonsten nur unkomprimiert
-gespeichert.
+=== Wiki Seiten als Dateien in lokales Verzeichnis speichern ===
-==== Wiki Seiten als Dateien in lokales Verzeichnis speichern
+Hier kannst du alle Seiten aus deinem Wiki in eine lokales Verzeichnis deiner Wahl herunterladen.
-Hier kannst du alle Seiten aus deinem Wiki in eine lokales Verzeichnis
-deiner Wahl herunterladen.
+<<WikiForm action=dumpserial>>
- <<WikiForm action=dumpserial>>
+Nur die neuesten Versionen aller Seiten wird als Einzeldatei in dieses Verzeichnis geschrieben. Beachte, dass evtl. deine Benutzerrechte dazu ausreichen müssen.
-Nur die neuesten Versionen aller Seiten wird als Einzeldatei in dieses
-Verzeichnis geschrieben. Beachte, dass evtl. deine Benutzerrechte dazu
-ausreichen müssen.
-
== Wiederherstellen ==
Wenn du ein PhpWiki Backup besitzt, kannst du dieses hier wieder
@@ -88,13 +81,15 @@
einzelne Dateien zu restaurieren, musst du dein Verzeichnis oder ZIP
Archiv insosoweit anpassen.
-==== Datei Hochladen
+=== Datei Hochladen ===
-Hier kannst du ein ZIP Archiv hochladen, oder einzelne Dateien von deinem Computer.
+Hier kannst du ein ZIP Archiv hochladen, oder einzelne Dateien von deinem
+Computer.
- <<WikiForm action=upload>>
+<<WikiForm action=upload>>
+<<WikiForm action=upload buttontext="Upload & Overwrite" overwrite=1>>
-==== Datei Laden
+=== Datei Laden ===
Hier kann man ZIP Archive, einzelne Dateien oder ganze Verzeichnisse
ins Wiki laden. Die Dateien oder Verzeichnisse müssen lokal auf dem
@@ -101,138 +96,39 @@
HTTP Server bestehen. Du kannst den Pfad allerdings auch mit der http:
oder einer ftp: URL von externen Quellen laden.
- <<WikiForm action=loadfile>>
- <<WikiForm action=loadfile buttontext="Laden & Überschreiben" overwrite=1>>
+<<WikiForm action=loadfile>>
+<<WikiForm action=loadfile buttontext="Laden & Überschreiben" overwrite=1>>
+=== Updaten ===
-=== Updaten
-
Führe einige Systemchecks aus und bringe geänderte Seiten auf den letzten Stand,
nachdem Sie die PhpWiki Version auf den letzten Stand gebracht haben:
* Upgrade neue oder geänderte Seiten von pgsrc,
-* Upgrade das Datenbank Schema (mysql _page.id auto_increment_, ADD _session.sess_ip_, ...),
+* Upgrade das Datenbank Schema (mysql //page.id auto_increment//, ADD //session.sess_ip//),
-;:[ Upgrade | phpwiki:HomePage?action=upgrade ]
+You can force overwrite or not:
+* **[[phpwiki:HomePage?action=upgrade|Upgrade]]**
+* **[[phpwiki:HomePage?action=upgrade&overwrite=1|Upgrade & Overwrite]]**
== Daten-Format ==
Momentan werden alle Seiten dateiweise als MIME (RFC:2045) E-Mail's
-(RFC:822) gespeichert. Der Content-type _application/x-phpwiki_ wird
+(RFC:822) gespeichert. Der Content-type //application/x-phpwiki// wird
benutzt, und die Seiten Meta Daten sind als Content-type Parameter
codiert. (Wenn die Datei mehrere Versionen der Seite enthält, wird der
-MIME Typ _multipart/mixed_ verwendet, und jede Version als Teil
-_application/x-phpwiki_ codiert). Der Email Body enthält die aktuelle
+MIME Typ //multipart/mixed// verwendet, und jede Version als Teil
+//application/x-phpwiki// codiert). Der Email Body enthält die aktuelle
Version des Seiteninhaltes, der Kopf die anderen Daten aus der
Datenbank. (Datum, Autor, ...)
-==== Alte Daten-Formate
-
-**Serialisierte Dateien**
-
- Der alte Dump-To-Directory Befehl schrieb alle Seiten als PHP
- _serialized()_ Zeichenketten hinaus, die erstens unleserlich sind,
- und zweitens schwer bis gar nicht zu editieren sind.
-
-**Textdateien**
-
- Davor wurde der Seiteninhalt als einfache Textdatei gespeichert,
- d.h. alle zusätzlichen Daten (Meta-Daten) gingen verloren. (Datum,
- Autor, Version, ...). Der Seitenname entsprach dem Dateinamen.
-
-Die Hochlade- und Lade-Funktionen erkennen jeden dieser drei
-Dateitypen automatisch. Es werden noch alle unterstützt. (ZIP,
-Verzeichnis oder Einzeldateien als MIME E-Mail, Serialisiert oder
-einfache Textdatei.)
-
== Seiten als XHTML Dateien speichern ==
- <<WikiForm action=dumphtml>>
+<<WikiForm action=dumphtml>>
Erzeugt ein Verzeichnis aller Wiki Dateien als statische XHTML Dateien, die
auch ohne Webserver und Datenbank betrachtbar sind.
- Das XHTML-Verzeichnis kann auch heruntergeladen werden als eine
- **[XHTML ZIP Datei | phpwiki:?action=ziphtml]**.
+Das XHTML-Verzeichnis kann auch heruntergeladen werden als eine **[[phpwiki:?action=ziphtml|XHTML ZIP Datei]]**.
-== PhpWiki Internals ==
-
-These are here mostly for debugging purposes (at least, that's the
-hope.)
-
-In normal use, you shouldn't need to use these, though, then again,
-they shouldn't really do any harm.
-
-=== Purge Markup 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
-rendering since parsing of the wiki-text takes a fair amount of juice.
-
- Hitting this button will delete all cached transformed
- content. (Each pages content will be transformed and re-cached next
- time someone views it.)
-
- <<WikiAdminUtils
- action=purge-cache
- label="Cache Löschen"
- >>
-
-=== Clean WikiDB of Illegal Filenames
-
-Page names beginning with the subpage-separator, usually a slash
-(=/=), are not allowed. Sometimes though an errant plugin or something
-might create one....
-
- This button will delete any pages with illegal page names.
-
- <<WikiAdminUtils
- action=purge-bad-pagenames
- label="WikiDB Bereinigen"
- >>
-
-
-=== Clean WikiDB of empty and unreferenced pages
-
- *Warning!* This button will delete every empty and unreferenced page, without any possibility to restore them again.
- This will disable the possibility to revert or get back any deleted page.
-
- <<WikiAdminUtils
- action=purge-empty-pages
- label="Purge all empty unreferenced pages"
- >>
-
-=== Convert cached_html to new SQL column
-
- This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the
- new page.cached_html field separately, and now you want to move this data from
- page.pagedata over to page.cached_html.
-
- <<WikiAdminUtils
- action=convert-cached-html
- label="Convert cached_html"
- >>
-
-
-=== Check WikiDB
-
- This button will check the Wiki page database for consistency. This can last several minutes.
-
- <<WikiAdminUtils
- action=db-check
- label="Check WikiDB"
- >>
-
-=== Rebuild WikiDB
-
- This will retransform all pages and rebuild the Wiki database on consistency errors or parser updates.
- This can last several minutes, eat a lot of memory and possibly times out===
-
- <<WikiAdminUtils
- action=db-rebuild
- label="Rebuild WikiDB"
- >>
-
-<noinclude>
----
-[[PhpWikiDokumentation]]
-</noinclude>
+[[CategoryActionPage]]
Modified: trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 8 Apr 2019 18:49:20 +0000
+Date: Mon, 2 Sep 2019 14:11:56 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Ayuda%2FComoUsarWiki;
@@ -37,7 +37,7 @@
* Para crear hipervínculos solamente hay que poner las palabras juntas y capitalizarlas. Imaginemonos que quiere crear una página sobre como Steve Wainstead come gusanos. Todo lo que tiene que hacer es algo parecido a: SteveWainsteadComeGusanos. Si la página no existe, entonces aparecerá un simbolo ? después del vínculo, invitandole a crear la página: EstaPaginaNoDeberiaExistir. (Y por favor no arruine este ejemplo creando una aquí)
* Para vincular páginas fuera del Wiki, simplementa hay que poner la URL y Wiki lo vinculará por usted: http://www.nytimes.com/
-* Para poner imágenes, simplemente ponga el hipervínculo entre corchetes, por ejemplo: [[http://www.yourhost.yourdomain/images/picture.png]. Las URL de imagenes que no esten entre corchetes aparecerán como vínculos a la imagen.
+* Para poner imágenes, simplemente ponga el hipervínculo entre corchetes, por ejemplo: ~[~[~http://www.yourhost.yourdomain/images/picture.png]]. Las URL de imagenes que no esten entre corchetes aparecerán como vínculos a la imagen.
* Ahora está listo para comenzar a AgregarPaginas.
----
Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Thu, 11 Apr 2019 16:07:57 +0000
+Date: Mon, 2 Sep 2019 14:11:56 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=AdministrationDePhpWiki;
@@ -34,9 +34,10 @@
<?plugin-form PasswordReset textinput=user method=post ?>
-== Vérification du courriel ==
+=== Vérification du courriel ===
-La vérification de courriel est habituellement non stricte laissant ainsi des trous possibles qui peuvent être administrés ci-dessous.
+La vérification de courriel est actuellement non stricte, laissant ainsi des trous possibles
+qui peuvent être administrés ci-dessous.
Ce bouton affichera la liste de tous les utilisateurs qui ont une adresse reconnue et les boutons pour effectuer une vérification manuelle.
@@ -53,11 +54,14 @@
=== Fichiers ZIP de la base de données ===
-Ces liens mènent à des fichiers compressés au format ZIP, générés à la volée et contenant toutes les pages de votre Wiki. Le fichier ZIP sera téléchargé sur votre ordinateur.
+Ces liens mènent à des fichiers compressés au format ZIP, générés à la volée et
+contenant toutes les pages de votre Wiki. Le fichier ZIP sera téléchargé sur
+votre ordinateur.
-Cette **[[phpwiki:?action=zip|Sauvegarde ZIP]]** ne contient que la dernière version de chaque page, tandis que cet **[[phpwiki:?action=zip&include=all|Archivage ZIP]]** contient toutes les versions archivées.
+Cette **[[phpwiki:?action=zip|Sauvegarde ZIP]]** ne contient que la
+dernière version de chaque page, tandis que cet **[[phpwiki:?action=zip&include=all|Archivage ZIP]]** contient toutes les versions archivées.
-Si le PhpWiki est configuré pour le permettre, n'importe qui peut télécharger un fichier ZIP.
+(Si le PhpWiki est configuré pour le permettre, n'importe qui peut télécharger un fichier ZIP.)
=== Sauvegarde dans un répertoire ===
@@ -69,7 +73,7 @@
== Restauration ==
-Si vous avez sauvegardé un ensemble de pages de PhpWiki, vous pouvez les recharger
+Si vous avez sauvegardé un ensemble de pages de ~PhpWiki, vous pouvez les recharger
ici. Notez que les pages dans votre base de données seront écrasées ; ainsi, si
vous avez récupéré votre [[PageAccueil]], lorsque vous le rechargerez depuis ce formulaire,
il écrasera celui qui est actuellement dans votre base de données. Si vous désirez être sélectif,
@@ -78,7 +82,8 @@
=== Déposer un fichier sur le serveur ===
-Ici vous pouvez déposer des archives ZIP ou des fichiers simples depuis votre machine cliente.
+Ici vous pouvez déposer des archives ZIP ou des fichiers simples depuis votre
+machine cliente.
<<WikiForm action=upload>>
<<WikiForm action=upload buttontext="Upload & Overwrite" overwrite=1>>
@@ -96,10 +101,10 @@
Fait quelques vérifications et mises à jours automatiquement après avoir installé
un nouveau moteur phpwiki de mise à jour
-* Met à jour les nouvelles pages ou les pages révisées depuis pgsrc
+* Met à jour les nouvelles pages ou les pages révisées depuis pgsrc,
* Met à jour la base de données (mysql //page.id auto_increment//, ADD //session.sess_ip//),
-Vous pouvez force le remplacement ou non :
+Vous pouvez forcer le remplacement ou non :
* **[[phpwiki:HomePage?action=upgrade|Mettre à jour]]**
* **[[phpwiki:HomePage?action=upgrade&overwrite=1|Mettre à jour et remplacer]]**
Modified: trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Fri, 12 Apr 2019 15:24:57 +0000
+Date: Mon, 2 Sep 2019 13:34:37 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FAjouterDesPages;
@@ -9,29 +9,28 @@
Pour ajouter une nouvelle page à Wiki, vous n'avez qu'à trouver un titre
parlant et le mettre entre {{{[[double crochets]]}}}.
-Vous pouvez alors y aller et CliquerSurLePointdInterrogation au bout de votre
+Vous pouvez alors y aller et cliquer sur le point d'interrogation au bout de votre
nouvel hyperlien, et le Wiki vous donnera une fenêtre pour créer la nouvelle page.
-The page name can contain any character, except:
-* angle brackets (<>),
-* square brackets ([]),
-* curly brackets ({}),
-* double quotes ("),
-* pipe (|),
-* and hash sign (#) that is used for anchors.
+Le nom de la page peut contenir tous les caractères, sauf :
+* les signes inférieur et supérieur (<>),
+* les crochets ([]),
+* les accolades ({}),
+* les guillemets droits ("),
+* la barre verticale (|),
+* et le dièse (#) qui est utilisé pour les ancres.
Si vous désirez ajouter au Wiki un document complexe, vous vous en sortirez
-probablement mieux en fournissant l'URL pointant vers lui plutôt qu'en essayant
-d'ajouter ici le texte du document. Voici par exemple un lien vers la page
-d'accueil du projet PhpWiki :
+probablement mieux en fournissant son URL plutôt qu'en essayant
+d'ajouter ici le texte du document, comme ceci :
{{{
[[http://phpwiki.sourceforge.net/|PhpWiki project homepage]]
}}}
[[http://phpwiki.sourceforge.net/|PhpWiki project homepage]]
-Le Wiki ne gère pas les balises HTML (voir [[RèglesDeFormatageDesTextes]]). <tags>Ils
-sortiront juste sous forme de texte.</tags> Le wiki est conçu pour être aussi simple
-que possible pour encourager son utilisation.
+Le Wiki ne gère pas les balises HTML (voir [[Aide:RèglesDeFormatageDesTextes|RèglesDeFormatageDesTextes]]).
+<tags>Ils sortiront juste sous forme de texte.</tags> Le wiki est conçu pour être aussi
+simple que possible pour encourager son utilisation.
Notez qu'il existe une fonctionnalité que votre administrateur système peut valider
pour autoriser le HTML incorporé, mais cela implique des risques de sécurité.
Modified: trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Fri, 12 Apr 2019 15:24:57 +0000
+Date: Mon, 2 Sep 2019 14:11:56 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FCommentUtiliserUnWiki;
@@ -9,13 +9,13 @@
//« Wiki wiki »// signifie « vite » en hawaïien.
**Ce qu'il est suffisant de savoir :**
-
-* Pour éditer n'importe quelle page autorisée, cliquez sur le lien Éditer au bas de la page. Vous devriez faire cela tout de suite et lire le code source de cette page, cela aura plus de sens.
+* Pour modifier n'importe quelle page, cliquez sur le lien //Modifier//. Vous devriez faire cela tout de suite et lire le code source de cette page, cela aura plus de sens.
* Vous obtenez de l'italique en encadrant les mots par des paires de barres obliques //comme ceci//.
* Vous obtenez du **texte en gras** en utilisant deux étoiles de chaque côté.
* Et l'**//italique gras//** en combinant les deux.
* Vous aurez des puces en utilisant un astérisque * en début de ligne.
-* Pour avoir une police à chasse fixe, indentez avec une espace :
+* Vous aurez des puces en mettant un astérique en début de ligne.
+* Pour avoir un paragraphe avec une police à chasse fixe, commencez-le avec ~{~{~{ terminez avec ~}~}~} :
{{{
ceci est certainement un poème
au sujet de la chasse fixe
@@ -22,7 +22,7 @@
je l'éditai de velours blême
sans trouver de rime pour fixe
}}}
-* Vous pouvez séparer les paragraphes à l'aide d'une ligne blanche. Exemple :
+* Vous séparez les paragraphes à l'aide d'une ligne blanche. Exemple :
Je suis un paragraphe.
@@ -32,16 +32,30 @@
---------
-* Pour créer des hyperliens, vous n'avez qu'à capitaliser les initiales des mots et les coller ensemble. Supposons que vous voulez créer une page sur la façon dont Steve Wainstead mange des vers, alors vous mettez les initiales en majuscules et collez les mots ensemble comme ceci : SteveWainsteadMangeDesVersVivants. Si la page n'existe pas encore, un point d'interrogation apparaît après le lien, vous invitant à créer cette page : CettePageNeDevraitPasExister (et s'il-vous-plaît, ne détruisez pas l'exemple en la créant).
-* Pour lier des pages hors du Wiki, vous pouvez simplement taper l'URL et Wiki créera le lien pour vous : http://www.lemonde.fr/
-* Pour insérer des images, fournissez juste le lien entre crochets comme ceci : **[[!http://www.votremachine.votredomaine/images/photo.png]**. Les URL d'image qui ne sont pas entre crochets apparaissent juste comme des hyperliens vers l'image.
+* Pour créer des hyperliens, vous n'avez qu'à capitaliser les initiales des mots
+ et les coller ensemble. Supposons que vous voulez créer une page sur la façon
+ dont Steve Wainstead mange des vers, alors vous mettez les initiales en majuscules
+ et collez les mots ensemble comme ceci : SteveWainsteadMangeDesVersVivants. Si la
+ page n'existe pas encore, un point d'interrogation apparaît après le lien,
+ vous invitant à créer cette page : CettePageNeDevraitPasExister (et s'il vous plaît,
+ ne détruisez pas l'exemple en la créant).
+* Pour lier des pages hors du Wiki, vous pouvez simplement taper l'URL et le wiki
+ créera le lien pour vous : http://www.lemonde.fr/
+* Pour insérer des images, fournissez juste le lien entre crochets comme ceci :
+ ~[~[~http://www.votremachine.votredomaine/images/photo.png]]. Les URL d'image
+ qui ne sont pas entre crochets apparaissent juste comme des hyperliens vers l'image.
* Maintenant vous êtes prêt pour [[Aide:AjouterDesPages|AjouterDesPages]].
----
-Un [[Aide:WikiWikiWeb|WikiWikiWeb]] est conçu pour être édité vite et facilement. Il dispose d'un marquage très simple décrit dans [[Aide:RèglesDeFormatageDesTextes|RèglesDeFormatageDesTextes]].
+
+Un [[Aide:WikiWikiWeb|WikiWikiWeb]] est conçu pour être édité vite et facilement. Il dispose
+d'un marquage très simple décrit dans [[Aide:RèglesDeFormatageDesTextes|RèglesDeFormatageDesTextes]].
+
----
-Si vous n'aimez pas la taille de la fenêtre d'édition de texte que vous obtenez, vous pouvez la changer. Voir [[PréférencesUtilisateurs]].
+Si vous n'aimez pas la taille de la fenêtre d'édition de texte que vous obtenez,
+vous pouvez la changer. Voir [[PréférencesUtilisateur]].
+
<noinclude>
----
[[DocumentationDePhpWiki]]
Modified: trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 8 Apr 2019 18:49:20 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FD%C3%A9tailsTechniques;
@@ -17,9 +17,9 @@
Chaque fois qu'un utilisateur utilise le site, la page demandée est extraite de la DBM
et rendue à la volée. L'utilisateur ne demande jamais que le fichier index.php, qui
-décide alors quels sont les fichiers php à inclure.
+décide alors quels sont les fichiers PHP à inclure.
-Les liens vers des pages au sein du wiki sont ajoutés automatiquement.
+Les liens vers des pages au sein du wiki sont ajoutés automatiquement : [[ChercherUnePage]].
Ceci peut être l'aspect le plus intéressant d'un wiki, la capacité à ajouter des
pages simplement en créant des liens vers elles. L'autre caractéristique la plus
intéressante est la facilité avec laquelle on peut créer des URL externes tels que :
@@ -32,7 +32,7 @@
Combiné avec un seul espace de noms et un système de marquage simple, un Wiki exhibe
nombre des caractéristiques du [[Aide:WabiSabi|WabiSabi]].
-PhpWiki est publié sous Licence Publique Générale GNU (GNU GPL), que vous devriez
+~PhpWiki est publié sous Licence Publique Générale GNU (GNU GPL), que vous devriez
pouvoir lire ici : [[http://www.gnu.org/copyleft/gpl.txt]].
<noinclude>
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffon%C3%89diterMetaData
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffon%C3%89diterMetaData 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffon%C3%89diterMetaData 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 12:12:33 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffon%C3%89diterMetaData;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Le greffon **~ÉditerMetaData** (//EditMetaData//) vous permet
+Le [[Aide:GreffonWiki|greffon]] **~ÉditerMetaData** (//EditMetaData//) vous permet
d'ajouter/modifier/effacer des paires clé/valeur
pour une page donnée. Vous devez être connecté comme administrateur pour le faire.
La page de métadonnées contient des choses comme le compteur de visites,
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonAjouterDesCommentaires
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonAjouterDesCommentaires 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonAjouterDesCommentaires 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 12:12:33 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonAjouterDesCommentaires;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Le greffon **~AjouterDesCommentaires** (//AddComment//) permet aux utilisateurs d'ajouter des commentaires à
+Le [[Aide:GreffonWiki|greffon]] **~AjouterDesCommentaires** (//AddComment//) permet aux utilisateurs d'ajouter des commentaires à
la fin de la page. On peut changer l'apparence via les modèles
comment.tmpl et addcomment.tmpl, et les classes CSS wikicomment,
wikicomment-header, wikicomment-body, wikicomment-footer.
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonAlbumPhotos
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonAlbumPhotos 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonAlbumPhotos 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 12:12:33 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonAlbumPhotos;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Faire un album en affichant un ensemble de photos dont la liste est
+Le [[Aide:GreffonWiki|greffon]] **~AlbumPhotos** (//PhotoAlbum//) fabrique un album en affichant un ensemble de photos dont la liste est
un fichier de texte avec des descriptions optionnelles.
== Utilisation ==
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonBeauTableau
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonBeauTableau 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonBeauTableau 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 14:46:57 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonBeauTableau;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Le greffon **~BeauTableau** (//RichTable//) remplace le greffon ~TableauAncienStyle. Il permet
+Le [[Aide:GreffonWiki|greffon]] **~BeauTableau** (//RichTable//) remplace le greffon ~TableauAncienStyle. Il permet
à l'utilisateur de spécifier des propriétés arbitraires pour ##<table>##,
##<tr>## et ##<td>## par un marquage très simple.
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonCalendrier
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonCalendrier 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonCalendrier 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 11:27:23 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonCalendrier;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Le greffon **Calendrier** peut être utilisé pour générer un calendrier mensuel
+Le [[Aide:GreffonWiki|greffon]] **Calendrier** (//Calendar//) peut être utilisé pour générer un calendrier mensuel
au sein d'une page du wiki. C'est pratique pour des wiki personnels.
Les dates individuelles dans le calendrier sont liées à des pages wiki spécialement nommées.
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonColorationPhp
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonColorationPhp 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonColorationPhp 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 11:27:23 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonColorationPhp;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Le greffon **~ColorationPhp** (//PhpHighlight//) affiche le code PHP en coloration syntaxique
+Le [[Aide:GreffonWiki|greffon]] **~ColorationPhp** (//PhpHighlight//) affiche le code PHP en coloration syntaxique
en utilisant la fonction [[php-function:highlight-string]].
== Utilisation ==
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonCommenter
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonCommenter 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonCommenter 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 11:27:23 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonCommenter;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Le greffon **Commenter** (//Comment//) vous permet de cacher une partie d'une page Wiki sans
+Le [[Aide:GreffonWiki|greffon]] **Commenter** (//Comment//) vous permet de cacher une partie d'une page Wiki sans
avoir à effacer le texte. Ce genre de commentaire sera seulement visible
dans l'édition de la source de la page.
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonCr%C3%A9erUnePage
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonCr%C3%A9erUnePage 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonCr%C3%A9erUnePage 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 11:27:23 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonCr%C3%A9erUnePage;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Le greffon **~CréerUnePage** (//CreatePage//) vous permet de créer facilement de nouvelles
+Le [[Aide:GreffonWiki|greffon]] **~CréerUnePage** (//CreatePage//) vous permet de créer facilement de nouvelles
pages, éventuellement avec un contenu par défaut
Il vous permet de créer une page avec un nouveau nom depuis un formulaire et éventuellement
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonCr%C3%A9erUneTdm
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonCr%C3%A9erUneTdm 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonCr%C3%A9erUneTdm 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 11:27:23 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonCr%C3%A9erUneTdm;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Le greffon **~CréerUneTdm** (//CreateToc//) vous permet de créer automatiquement une **table des matières** dynamique de tous les en-têtes (titres et sous-titres).
+Le [[Aide:GreffonWiki|greffon]] **~CréerUneTdm** (//CreateToc//) vous permet de créer automatiquement une **table des matières** dynamique de tous les en-têtes (titres et sous-titres).
Les en-têtes peuvent être en syntaxe classique Phpwiki ou en syntaxe Wikicreole/Mediawiki (voir ci-dessous).
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonD%C3%A9plierLesSousPages
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonD%C3%A9plierLesSousPages 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonD%C3%A9plierLesSousPages 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 14:46:57 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=locale/fr/pgsrc/Aide%2FGreffonD%C3%A9plierLesSousPages;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Le greffon **~DéplierLesSousPages** (//UnfoldSubpages//) est utilisé pour afficher le contenu d'une partie ou
+Le [[Aide:GreffonWiki|greffon]] **~DéplierLesSousPages** (//UnfoldSubpages//) est utilisé pour afficher le contenu d'une partie ou
de toutes les sous-pages de la page courante ou d'une page donnée. Ceci peut
être utilisé pour obtenir un aperçu pour les greffons ~WikiBlog, Calendrier
ou des ensembles de sous-pages similaires.
Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonHistoriqueAuteur
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonHistoriqueAuteur 2019-09-02 15:11:52 UTC (rev 10143)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonHistoriqueAuteur 2019-09-02 16:02:31 UTC (rev 10144)
@@ -1,4 +1,4 @@
-Date: Mon, 15 Apr 2019 11:27:23 +0000
+Date: Thu, 23 May 2019 18:18:07 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FGreffonHistoriqueAuteur;
@@ -6,...
[truncated message content] |
|
From: <var...@us...> - 2020-03-23 13:03:26
|
Revision: 10157
http://sourceforge.net/p/phpwiki/code/10157
Author: vargenau
Date: 2020-03-23 13:03:24 +0000 (Mon, 23 Mar 2020)
Log Message:
-----------
replace deprecated "each" -- patches by Christof Meerwald
Modified Paths:
--------------
trunk/lib/ExternalReferrer.php
trunk/lib/PageList.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiUser.php
trunk/lib/difflib.php
trunk/lib/mimelib.php
trunk/lib/pear/Cache/Container/file.php
trunk/lib/pear/DB/storage.php
trunk/lib/pear/PEAR.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/TexToPng.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/stdlib.php
trunk/lib/wikilens/PageListColumns.php
trunk/themes/blog/jscalendar/calendar.php
Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/ExternalReferrer.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -109,7 +109,7 @@
}
$url = strtolower($url);
$ref = $url;
- while (list($key, $var) = @each($this->searchEngines)) {
+ foreach ($this->searchEngines as $key => $var) {
if (strstr($ref, $key)) {
unset($ref);
$ref["engine"] = $var["engine"];
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/PageList.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -1911,7 +1911,7 @@
function addPageList($array)
{
- while (list($pagename, $selected) = each($array)) {
+ foreach ($array as $pagename => $selected) {
if ($selected) $this->addPageSelected((string)$pagename);
$this->addPage((string)$pagename);
}
@@ -1940,7 +1940,7 @@
function addPageList($array)
{
- while (list($pagename, $selected) = each($array)) {
+ foreach ($array as $pagename => $selected) {
if ($selected) $this->addPageSelected((string)$pagename);
$this->addPage((string)$pagename);
}
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/WikiPluginCached.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -607,7 +607,7 @@
{
if (!empty($argarray)) {
$argstr = '';
- while (list($key, $value) = each($argarray)) {
+ foreach ($argarray as $key => $value) {
$argstr .= $key . '=' . '"' . $value . '" ';
// FIXME: How are values quoted? Can a value contain '"'?
// TODO: rawurlencode(value)
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/WikiUser.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -2233,7 +2233,8 @@
// fix old-style prefs
} elseif (is_numeric($name) and is_array($packed_pref)) {
if (count($packed_pref) == 1) {
- list($name, $value) = each($packed_pref);
+ $name = key($packed_pref);
+ $value = current($packed_pref);
$prefs[$name] = $value;
}
} else {
Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/difflib.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -286,7 +286,7 @@
continue;
$matches = $ymatches[$line];
reset($matches);
- while (list ($junk, $y) = each($matches))
+ foreach ($matches as $junk => $y)
if (empty($this->in_seq[$y])) {
$k = $this->lcs_pos($y);
assert($k > 0);
@@ -293,7 +293,7 @@
$ymids[$k] = $ymids[$k - 1];
break;
}
- while (list ($junk, $y) = each($matches)) {
+ foreach ($matches as $junk => $y) {
if ($y > $this->seq[$k - 1]) {
assert($y < $this->seq[$k]);
// Optimization: this is a common case:
Modified: trunk/lib/mimelib.php
===================================================================
--- trunk/lib/mimelib.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/mimelib.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -72,7 +72,7 @@
{
$header = "Content-Type: $type/$subtype";
reset($params);
- while (list($key, $val) = each($params)) {
+ foreach ($params as $key => $val) {
//FIXME: what about non-ascii printables in $val?
if (!preg_match('/^' . MIME_TOKEN_REGEXP . '$/', $val))
$val = '"' . addslashes($val) . '"';
@@ -276,7 +276,7 @@
{
$footnotes = array();
reset($params);
- while (list($p, $reference) = each($params)) {
+ foreach ($params as $p => $reference) {
if (preg_match('/^ref([1-9][0-9]*)$/', $p, $m))
$footnotes[$m[1]] = sprintf(_("[%d] See [%s]"),
$m[1], rawurldecode($reference));
Modified: trunk/lib/pear/Cache/Container/file.php
===================================================================
--- trunk/lib/pear/Cache/Container/file.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/pear/Cache/Container/file.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -275,7 +275,8 @@
krsort($this->entries);
reset($this->entries);
- while ($this->total_size > $this->lowwater && list($lastmod, $entry) = each($this->entries)) {
+ foreach ($this->entries as $lastmod => $entry) {
+ if ($this->total_size <= $this->lowwater) break;
if (@unlink($entry['file'])) {
$this->total_size -= $entry['size'];
} else {
Modified: trunk/lib/pear/DB/storage.php
===================================================================
--- trunk/lib/pear/DB/storage.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/pear/DB/storage.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -336,7 +336,7 @@
}
reset($rowdata);
$found_keycolumn = false;
- while (list($key, $value) = each($rowdata)) {
+ foreach ($rowdata as $key => $value) {
if ($key == $this->_keycolumn) {
$found_keycolumn = true;
}
Modified: trunk/lib/pear/PEAR.php
===================================================================
--- trunk/lib/pear/PEAR.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/pear/PEAR.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -782,7 +782,7 @@
$_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
}
- while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
+ foreach ($_PEAR_destructor_object_list as $k => $objref) {
$classname = get_class($objref);
while ($classname) {
$destructor = "_$classname";
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/plugin/PhotoAlbum.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -220,7 +220,7 @@
$cell_width = 0;
$numcols = count($photos);
$keep = $photos;
- while (list($key, $value) = each($photos)) {
+ foreach ($photos as $key => $value) {
list($x, $y, $s, $t) = @getimagesize($value['src']);
if ($height != 'auto') $y = $this->newSize($y, $height);
if ($width != 'auto') $y = round($y * $this->newSize($x, $width) / $x);
@@ -251,7 +251,7 @@
}
display_slides();"));
- while (list($key, $value) = each($photos)) {
+ foreach ($photos as $key => $value) {
if ($p && basename($value["name"]) != "$p") {
continue;
}
@@ -654,7 +654,7 @@
} elseif ($web_location == 1) {
//TODO: check if the file is an image
$contents = preg_split('/\n/', $contents);
- while (list($key, $value) = each($contents)) {
+ foreach ($contents as $key => $value) {
$data = preg_split('/\;/', $value);
if (count($data) == 0 || empty($data[0])
|| preg_match('/^#/', $data[0])
Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/plugin/SiteMap.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -205,7 +205,7 @@
$nothing = '';
}
- while (list($key, $link) = each($pagearr)) {
+ foreach ($pagearr as $key => $link) {
if (!empty($includepages)) {
$a = substr_count($key, '*');
$indenter = str_pad($nothing, $a);
Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/plugin/TexToPng.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -226,7 +226,7 @@
$this->dbg('Error during execution of ' . $cmd);
}
;
- while (list($key, $value) = each($errortxt)) {
+ foreach ($errortxt as $key => $value) {
if ($complainvisibly) {
$this->complain($value . "\n");
} else {
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/plugin/VisualWiki.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -381,10 +381,10 @@
// remove dead links and collect links
reset($pages);
- while (list($name, $page) = each($pages)) {
+ foreach ($pages as $name => $page) {
if (is_array($page['backlinks'])) {
reset($page['backlinks']);
- while (list($index, $link) = each($page['backlinks'])) {
+ foreach ($page['backlinks'] as $index => $link) {
if (!isset($pages[$link]) || $link == $name) {
unset($pages[$name]['backlinks'][$index]);
} else {
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -76,7 +76,7 @@
if (isset($acl['_del_group'])) {
//del groups with perm
foreach ($acl['_del_group'] as $access => $del) {
- while (list($group, $dummy) = each($del))
+ foreach ($del as $group => $dummy)
unset($acl[$access][$group]);
}
unset($acl['_del_group']);
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/stdlib.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -714,7 +714,7 @@
// FIXME: use the arg-separator which might not be &
$split_args = explode('&', $query_args);
$args = array();
- while (list($key, $val) = each($split_args))
+ foreach ($split_args as $key => $val)
if (preg_match('/^ ([^=]+) =? (.*) /x', $val, $m))
$args[$m[1]] = $m[2];
return $args;
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/lib/wikilens/PageListColumns.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -376,8 +376,8 @@
$numToShow = count($recs);
}
$html = HTML();
- while ((list($key, $val) = each($recs)) && $counter < $numToShow) {
- if ($val < 3) {
+ foreach ($recs as $key => $val) {
+ if (($counter >= $numToShow) || ($val < 3)) {
break;
}
if ($counter > 0) {
Modified: trunk/themes/blog/jscalendar/calendar.php
===================================================================
--- trunk/themes/blog/jscalendar/calendar.php 2020-03-23 12:01:44 UTC (rev 10156)
+++ trunk/themes/blog/jscalendar/calendar.php 2020-03-23 13:03:24 UTC (rev 10157)
@@ -95,7 +95,7 @@
function _make_js_hash($array) {
$jstr = '';
reset($array);
- while (list($key, $val) = each($array)) {
+ foreach ($array as $key => $value) {
if (is_bool($val))
$val = $val ? 'true' : 'false';
else if (!is_numeric($val))
@@ -109,7 +109,7 @@
function _make_html_attr($array) {
$attrstr = '';
reset($array);
- while (list($key, $val) = each($array)) {
+ foreach ($array as $key => $value) {
$attrstr .= $key . '="' . $val . '" ';
}
return $attrstr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2020-12-04 16:59:25
|
Revision: 10172
http://sourceforge.net/p/phpwiki/code/10172
Author: vargenau
Date: 2020-12-04 16:59:21 +0000 (Fri, 04 Dec 2020)
Log Message:
-----------
replace "GPL-2.0+" by "GPL-2.0-or-later" (deprecated since SPDX 2.0
Modified Paths:
--------------
trunk/ImageTile.php
trunk/RPC2.php
trunk/SOAP.php
trunk/configurator.php
trunk/index.php
trunk/lib/ArchiveCleaner.php
trunk/lib/AtomParser.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/Captcha.php
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession/dba.php
trunk/lib/DbSession.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaPartition.php
trunk/lib/ErrorManager.php
trunk/lib/ExternalReferrer.php
trunk/lib/FileFinder.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlParser.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter091.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/SpamBlocklist.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysqli.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/dba.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WikiDB.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/AdoDb.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/Facebook.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/Forbidden.php
trunk/lib/WikiUser/FusionForge.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/IMAP.php
trunk/lib/WikiUser/LDAP.php
trunk/lib/WikiUser/LdapUpper.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/WikiUser/POP3.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser/PersonalPage.php
trunk/lib/WikiUser/Session.php
trunk/lib/WikiUser.php
trunk/lib/WysiwygEdit/CKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/htmlarea3.php
trunk/lib/WysiwygEdit/spaw.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/WysiwygEdit.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/config.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/imagecache.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/mimelib.php
trunk/lib/pdf.php
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/AllUsers.php
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/AsciiMath.php
trunk/lib/plugin/AsciiSVG.php
trunk/lib/plugin/AtomFeed.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/BlogJournal.php
trunk/lib/plugin/BoxRight.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CategoryPage.php
trunk/lib/plugin/Chart.php
trunk/lib/plugin/Comment.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/CurrentTime.php
trunk/lib/plugin/DeadEndPages.php
trunk/lib/plugin/DebugAuthInfo.php
trunk/lib/plugin/DebugBackendInfo.php
trunk/lib/plugin/DebugGroupInfo.php
trunk/lib/plugin/DebugRetransform.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/DynamicIncludePage.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/FacebookLike.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FoafViewer.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/FuzzyPages.php
trunk/lib/plugin/GoTo.php
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/GooglePlugin.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/HelloWorld.php
trunk/lib/plugin/HtmlConverter.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/IncludePages.php
trunk/lib/plugin/IncludeSiteMap.php
trunk/lib/plugin/IncludeTree.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/JabberPresence.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/LikePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/ListRelations.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/NewPagesPerUser.php
trunk/lib/plugin/NoCache.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/OrphanedPages.php
trunk/lib/plugin/PageDump.php
trunk/lib/plugin/PageGroup.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PageInfo.php
trunk/lib/plugin/PageTrail.php
trunk/lib/plugin/PasswordReset.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PhpHighlight.php
trunk/lib/plugin/PhpWeather.php
trunk/lib/plugin/Ploticus.php
trunk/lib/plugin/PluginManager.php
trunk/lib/plugin/PopUp.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/PopularTags.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/PreferencesInfo.php
trunk/lib/plugin/PrevNext.php
trunk/lib/plugin/Processing.php
trunk/lib/plugin/RandomPage.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RawHtml.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/RecentComments.php
trunk/lib/plugin/RecentEdits.php
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/RelatedChanges.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/RssFeed.php
trunk/lib/plugin/SearchHighlight.php
trunk/lib/plugin/SemanticRelations.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/SqlResult.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/SyntaxHighlighter.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/TeX2png.php
trunk/lib/plugin/Template.php
trunk/lib/plugin/TexToPng.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/Transclude.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UnfoldSubpages.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/UriResolver.php
trunk/lib/plugin/UserPreferences.php
trunk/lib/plugin/UserRatings.php
trunk/lib/plugin/Video.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WhoIsOnline.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminDeleteAcl.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikiForm.php
trunk/lib/plugin/WikiFormRich.php
trunk/lib/plugin/WikiForum.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/WikiTranslation.php
trunk/lib/plugin/WikicreoleTable.php
trunk/lib/plugin/YouTube.php
trunk/lib/plugin/text2png.php
trunk/lib/prepend.php
trunk/lib/purgepage.php
trunk/lib/removepage.php
trunk/lib/spam_babycart.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/wikilens/Buddy.php
trunk/lib/wikilens/CustomPrefs.php
trunk/lib/wikilens/PageListColumns.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/wikilens/RatingsUser.php
trunk/lib/wikilens/Utils.php
trunk/passencrypt.php
trunk/themes/Crao/themeinfo.php
trunk/themes/Hawaiian/lib/random.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/Portland/themeinfo.php
trunk/themes/Sidebar/clock.php
trunk/themes/Sidebar/hyperapplet.php
trunk/themes/Sidebar/hyperwiki.php
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/lib/RecentChanges.php
trunk/themes/Wordpress/themeinfo.php
trunk/themes/blog/lib/RecentChanges.php
trunk/themes/blog/themeinfo.php
trunk/themes/default/themeinfo.php
trunk/themes/fusionforge/themeinfo.php
trunk/themes/shamino_com/themeinfo.php
trunk/themes/smaller/themeinfo.php
trunk/themes/wikilens/themeinfo.php
Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/ImageTile.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/RPC2.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/SOAP.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/configurator.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -22,7 +22,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/index.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -27,7 +27,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/ArchiveCleaner.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/AtomParser.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
/**
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/BlockParser.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
require_once 'lib/CachedMarkup.php';
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/CachedMarkup.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/Captcha.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* with This File; 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/DbSession/ADODB.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/DbSession/PDO.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/DbSession/SQL.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/DbSession/dba.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/DbSession.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/DbaDatabase.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/DbaPartition.php
===================================================================
--- trunk/lib/DbaPartition.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/DbaPartition.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/ErrorManager.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/ExternalReferrer.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/FileFinder.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/HtmlElement.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/HtmlParser.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/IniConfig.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/InlineParser.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/MailNotify.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/PageList.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/PagePerm.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/PageType.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/Request.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/RssParser.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -16,7 +16,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/RssWriter.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/RssWriter091.php
===================================================================
--- trunk/lib/RssWriter091.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/RssWriter091.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/RssWriter2.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/SemanticWeb.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/SpamBlocklist.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*
*/
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/Template.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/TextSearchQuery.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/Units.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiCallback.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/ADODB.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/PDO.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/SQL.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/ADODB.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssql.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/ADODB_mssql.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -16,7 +16,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PDO.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_pgsql.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PearDB.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -17,7 +17,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -17,7 +17,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/PearDB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_sqlite.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/PearDB_sqlite.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/dba.php
===================================================================
--- trunk/lib/WikiDB/backend/dba.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/dba.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/dbaBase.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/file.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend/flatfile.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/backend.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/dba.php
===================================================================
--- trunk/lib/WikiDB/dba.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/dba.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -21,7 +21,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/file.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB/flatfile.php
===================================================================
--- trunk/lib/WikiDB/flatfile.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB/flatfile.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiDB.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -21,7 +21,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiGroup.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiPlugin.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiPluginCached.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -19,7 +19,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiTheme.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/AdoDb.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/BogoLogin.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/Db.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/Facebook.php
===================================================================
--- trunk/lib/WikiUser/Facebook.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/Facebook.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*
* From http://developeronline.blogspot.com/2008/10/using-perl-against-facebook-part-i.html:
Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/File.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/Forbidden.php
===================================================================
--- trunk/lib/WikiUser/Forbidden.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/Forbidden.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/FusionForge.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/HttpAuth.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/HttpAuthUpper.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/IMAP.php
===================================================================
--- trunk/lib/WikiUser/IMAP.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/IMAP.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/LDAP.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/LdapUpper.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
include_once 'lib/WikiUser/LDAP.php';
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/OpenID.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*
* This is not yet finished. We do not want to use zend extensions.
Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/POP3.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/PdoDb.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/PearDb.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/PersonalPage.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser/Session.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -18,7 +18,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2020-04-21 12:40:38 UTC (rev 10171)
+++ trunk/lib/WikiUser.php 2020-12-04 16:59:21 UTC (rev 10172)
@@ -20,7 +20,7 @@
* 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+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
Modified: trunk/lib/WysiwygEdit/CKeditor.php
===================================================================
--- trunk/lib/WysiwygEdit/CKe...
[truncated message content] |
|
From: <var...@us...> - 2020-12-10 16:34:10
|
Revision: 10177
http://sourceforge.net/p/phpwiki/code/10177
Author: vargenau
Date: 2020-12-10 16:34:03 +0000 (Thu, 10 Dec 2020)
Log Message:
-----------
Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
Modified Paths:
--------------
trunk/lib/editpage.php
trunk/pgsrc/Help%2FWikicreoleTablePlugin
trunk/pgsrc/ReleaseNotes
trunk/themes/default/toolbar.js
Added Paths:
-----------
trunk/themes/default/images/ed_tab_to_table.png
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2020-12-04 17:21:15 UTC (rev 10176)
+++ trunk/lib/editpage.php 2020-12-10 16:34:03 UTC (rev 10177)
@@ -766,6 +766,11 @@
'alt' => _('Sample table'),
'title' => _('Sample table'),
'onclick' => 'insertTags("\n{| class=\"bordered\"\n|+ This is the table caption\n|-\n! Header A !! Header B !! Header C\n|-\n| Cell A1 || Cell B1 || Cell C1\n|-\n| Cell A2 || Cell B2 || Cell C2\n|-\n| Cell A3 || Cell B3 || Cell C3\n|}\n","",""); return true;')));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_tab_to_table.png"),
+ 'class' => 'toolbar',
+ 'alt' => _('Convert tab to table'),
+ 'title' => _('Convert tab to table'),
+ 'onclick' => "convert_tab_to_table();")));
$toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_enumlist.png"),
'class' => 'toolbar',
'alt' => _('Enumeration'),
Modified: trunk/pgsrc/Help%2FWikicreoleTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikicreoleTablePlugin 2020-12-04 17:21:15 UTC (rev 10176)
+++ trunk/pgsrc/Help%2FWikicreoleTablePlugin 2020-12-10 16:34:03 UTC (rev 10177)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 10 Dec 2020 15:18:32 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikicreoleTablePlugin;
@@ -32,6 +32,21 @@
|Cell 1.1 |Two lines\\in Cell 1.2 |
|Cell 2.1 |Cell 2.2 |
+== Toolbar ==
+
+In the Edit Toolbar, the {{/themes/default/images/ed_tab_to_table.png}}
+icon allows to create a Wikicreole table from Tab Separated Values.
+
+You have to select the lines containing the Tab Separated Values and
+click on the icon. The resulting table will contain only normal cells,
+you can add headers if needed.
+
+This feature is expecially useful when you copy spreadsheet cells from
+Libreoffice Calc or Excel. If Excel cells contain multiple lines, the
+results will be wrong, you will need to manually convert these multiline
+cells. In Libreoffice Calc, there is no such issue, but the newlines
+will be lost.
+
== Author ==
* Marc-Etienne Vargenau, Alcatel-Lucent
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2020-12-04 17:21:15 UTC (rev 10176)
+++ trunk/pgsrc/ReleaseNotes 2020-12-10 16:34:03 UTC (rev 10177)
@@ -1,4 +1,4 @@
-Date: Thu, 18 Apr 2019 21:22:30 +0000
+Date: Thu, 10 Dec 2020 15:11:30 +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.0 2019-0X-XX Marc-Etienne Vargenau ==
+== 1.6.0 2020-12-XX Marc-Etienne Vargenau ==
Major release:
* PHP 7 compatible
@@ -30,6 +30,7 @@
* Updated pgsrc pages in all languages
* Security fixes
* Adding SPDX-License-Identifier in PHP source files
+* Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
=== Bugs ===
* Make function IsSafeURL more strict
Added: trunk/themes/default/images/ed_tab_to_table.png
===================================================================
(Binary files differ)
Index: trunk/themes/default/images/ed_tab_to_table.png
===================================================================
--- trunk/themes/default/images/ed_tab_to_table.png 2020-12-04 17:21:15 UTC (rev 10176)
+++ trunk/themes/default/images/ed_tab_to_table.png 2020-12-10 16:34:03 UTC (rev 10177)
Property changes on: trunk/themes/default/images/ed_tab_to_table.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js 2020-12-04 17:21:15 UTC (rev 10176)
+++ trunk/themes/default/toolbar.js 2020-12-10 16:34:03 UTC (rev 10177)
@@ -137,6 +137,30 @@
if (txtarea.createTextRange) txtarea.caretPos = document.selection.createRange().duplicate();
}
+function convert_tab_to_table() {
+
+ // obtain the object reference for the <textarea>
+ var txtarea = document.getElementById('edit-content');
+ // obtain the index of the first selected character
+ var start = txtarea.selectionStart;
+ // obtain the index of the last selected character
+ var finish = txtarea.selectionEnd;
+ //obtain all Text
+ var allText = txtarea.value;
+ // obtain the selected text
+ var theSelection = allText.substring(start, finish);
+
+ // replace tabs by pipe surrounded by spaces
+ theSelection = theSelection.replace(/\t/g, ' | ');
+ // add pipe followed by space at beginning of lines
+ theSelection = theSelection.replace(/^/g, '| ');
+ theSelection = theSelection.replace(/\n/g, '\n| ');
+
+ // append the text
+ var newText=allText.substring(0, start)+theSelection+allText.substring(finish, allText.length);
+ txtarea.value=newText;
+}
+
// JS_SEARCHREPLACE from walterzorn.de
var f, sr_undo, replacewin, undo_buffer=new Array(), undo_buffer_index=0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2020-12-18 15:29:10
|
Revision: 10184
http://sourceforge.net/p/phpwiki/code/10184
Author: vargenau
Date: 2020-12-18 15:29:04 +0000 (Fri, 18 Dec 2020)
Log Message:
-----------
http://grazr.com is dead
Modified Paths:
--------------
trunk/lib/plugin/RecentChanges.php
Removed Paths:
-------------
trunk/themes/default/buttons/grazr-it.png
trunk/themes/default/buttons/grazr.png
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2020-12-16 17:00:49 UTC (rev 10183)
+++ trunk/lib/plugin/RecentChanges.php 2020-12-18 15:29:04 UTC (rev 10184)
@@ -296,28 +296,6 @@
return DEBUG ? $this->format_icon("rdf", $args) : '';
}
- function rdfs_icon($args = array())
- {
- return DEBUG ? $this->format_icon("rdfs", $args) : '';
- }
-
- function owl_icon($args = array())
- {
- return DEBUG ? $this->format_icon("owl", $args) : '';
- }
-
- function grazr_icon($args = array())
- {
- global $request, $WikiTheme;
- if (is_localhost()) return '';
- if (SERVER_PROTOCOL == "https") return '';
- $our_url = WikiURL($request->getArg('pagename'),
- array_merge(array('action' => $this->action, 'format' => 'rss2'), $args),
- true);
- $rss_url = 'http://grazr.com/gzpanel.html?' . $our_url;
- return $WikiTheme->makeButton("grazr", $rss_url, 'rssicon');
- }
-
function pre_description()
{
extract($this->_args);
@@ -421,9 +399,6 @@
$this->rss2_icon(),
$this->atom_icon(),
$this->rdf_icon(),
- /*$this->rdfs_icon(),
- $this->owl_icon(),*/
- $this->grazr_icon(),
$this->sidebar_link());
}
@@ -585,7 +560,6 @@
$this->rss2_icon($author_args),
$this->atom_icon($author_args),
$this->rdf_icon($author_args),
- $this->grazr_icon($author_args));
}
function format($changes)
Deleted: trunk/themes/default/buttons/grazr-it.png
===================================================================
(Binary files differ)
Deleted: trunk/themes/default/buttons/grazr.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2020-12-26 16:01:47
|
Revision: 10206
http://sourceforge.net/p/phpwiki/code/10206
Author: vargenau
Date: 2020-12-26 16:01:39 +0000 (Sat, 26 Dec 2020)
Log Message:
-----------
Update Adodb to version 5.20.19
Modified Paths:
--------------
trunk/config/phpwiki.spec
trunk/lib/WikiDB/adodb/LICENSE.md
trunk/lib/WikiDB/adodb/README.md
trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
trunk/lib/WikiDB/adodb/adodb-error.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pager.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-perf.inc.php
trunk/lib/WikiDB/adodb/adodb-php4.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php
trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/adodb/composer.json
trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
trunk/lib/WikiDB/adodb/docs/changelog.md
trunk/lib/WikiDB/adodb/docs/changelog_v2.x.md
trunk/lib/WikiDB/adodb/docs/changelog_v3.x.md
trunk/lib/WikiDB/adodb/docs/changelog_v4+5.md
trunk/lib/WikiDB/adodb/docs/changelog_v4.x.md
trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ads.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql_n.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
trunk/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php
trunk/lib/WikiDB/adodb/perf/perf-db2.inc.php
trunk/lib/WikiDB/adodb/perf/perf-informix.inc.php
trunk/lib/WikiDB/adodb/perf/perf-mssql.inc.php
trunk/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/perf/perf-mysql.inc.php
trunk/lib/WikiDB/adodb/perf/perf-oci8.inc.php
trunk/lib/WikiDB/adodb/perf/perf-postgres.inc.php
trunk/lib/WikiDB/adodb/pivottable.inc.php
trunk/lib/WikiDB/adodb/rsfilter.inc.php
trunk/lib/WikiDB/adodb/server.php
trunk/lib/WikiDB/adodb/session/adodb-compress-bzip2.php
trunk/lib/WikiDB/adodb/session/adodb-compress-gzip.php
trunk/lib/WikiDB/adodb/session/adodb-cryptsession.php
trunk/lib/WikiDB/adodb/session/adodb-cryptsession2.php
trunk/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php
trunk/lib/WikiDB/adodb/session/adodb-encrypt-md5.php
trunk/lib/WikiDB/adodb/session/adodb-encrypt-secret.php
trunk/lib/WikiDB/adodb/session/adodb-session-clob.php
trunk/lib/WikiDB/adodb/session/adodb-session-clob2.php
trunk/lib/WikiDB/adodb/session/adodb-session.php
trunk/lib/WikiDB/adodb/session/adodb-session2.php
trunk/lib/WikiDB/adodb/session/crypt.inc.php
trunk/lib/WikiDB/adodb/session/old/adodb-cryptsession.php
trunk/lib/WikiDB/adodb/session/old/adodb-session-clob.php
trunk/lib/WikiDB/adodb/session/old/adodb-session.php
trunk/lib/WikiDB/adodb/session/old/crypt.inc.php
trunk/lib/WikiDB/adodb/toexport.inc.php
trunk/lib/WikiDB/adodb/tohtml.inc.php
trunk/pgsrc/ReleaseNotes
Modified: trunk/config/phpwiki.spec
===================================================================
--- trunk/config/phpwiki.spec 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/config/phpwiki.spec 2020-12-26 16:01:39 UTC (rev 10206)
@@ -40,7 +40,7 @@
# RPM spec preamble
Summary: PHP-based Wiki webapplication
Name: phpwiki
-Version: 1.6.0
+Version: @@VERSION@@
Release: 1
BuildArch: noarch
License: GPL
@@ -53,7 +53,7 @@
#Relocation!
Prefix: /var/www
-Requires: httpd, php, php-pear, units, graphviz, php-mysql
+Requires: httpd, php, php-pear, units, graphviz
Autoreq: 0
@@ -104,18 +104,6 @@
%post
-cd %{prefix}/%{name}
-mysqladmin create %{DB_NAME}
-
-echo 'GRANT select, insert, update, delete, lock tables
-ON %{DB_NAME}.*
-TO %{DB_USER}@localhost
-IDENTIFIED BY "%{DB_PASSWD}"' | mysql
-
-mysqladmin reload
-
-cat schemas/mysql-initialize.sql | mysql %{DB_NAME}
-
%files
%defattr(-, root, root)
%doc README UPGRADING LICENSE INSTALL doc Makefile
Modified: trunk/lib/WikiDB/adodb/LICENSE.md
===================================================================
--- trunk/lib/WikiDB/adodb/LICENSE.md 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/LICENSE.md 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,19 +1,22 @@
ADOdb License
=============
-ADOdb is dual licensed under BSD and LGPL.
+The ADOdb Library is dual-licensed, released under both the
+[BSD 3-clause](#bsd-3-clause-license) and the
+[GNU Lesser General Public License (LGPL) v2.1](#gnu-lesser-general-public-license)
+or, at your option, any later version.
In plain English, you do not need to distribute your application in source code form,
nor do you need to distribute ADOdb source code, provided you follow the rest of
terms of the BSD license.
-For more info about ADOdb, visit http://adodb.sourceforge.net/
+For more information about ADOdb, visit http://adodb.org/
BSD 3-Clause License
--------------------
-(c) 2000-2013 John Lim (jl...@na...)
-(c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+(c) 2000-2013 John Lim (jl...@na...)
+(c) 2014 Damien Regad, Mark Newnham and the ADOdb community
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
Modified: trunk/lib/WikiDB/adodb/README.md
===================================================================
--- trunk/lib/WikiDB/adodb/README.md 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/README.md 2020-12-26 16:01:39 UTC (rev 10206)
@@ -5,26 +5,20 @@
[](https://sourceforge.net/projects/adodb/files/latest/download)
(c) 2000-2013 John Lim (jl...@na...)
-(c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+(c) 2014 Damien Regad, Mark Newnham and the
+ [ADOdb community](https://github.com/ADOdb/ADOdb/graphs/contributors)
-Released under both [BSD 3-Clause](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#bsd-3-clause-license)
-and [GNU Lesser GPL library 2.1](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#gnu-lesser-general-public-license)
-licenses.
-This means you can use it in proprietary products;
+The ADOdb Library is dual-licensed, released under both the
+[BSD 3-Clause](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#bsd-3-clause-license)
+and the
+[GNU Lesser General Public Licence (LGPL) v2.1](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#gnu-lesser-general-public-license)
+or, at your option, any later version.
+This means you can use it in proprietary products;
see [License](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md) for details.
Home page: http://adodb.org/
-> **WARNING: known issue with Associative Fetch Mode in ADOdb v5.19
--- PLEASE UPGRADE TO v5.20 !**
-> When fetching data in Associative mode (i.e. when `$ADODB_FETCH_MODE` is
-> set to *ADODB_FETCH_ASSOC*), recordsets do not return any data (empty strings)
-> when using some database drivers. The problem has been reported on MSSQL,
-> Interbase and Foxpro, but possibly affects other drivers as well; all drivers
-> derived from the above are also impacted.
-> For further details, please refer to [Issue #20](https://github.com/ADOdb/ADOdb/issues/20).
-
Introduction
============
@@ -102,7 +96,6 @@
You may also find legacy issues in
-- the old [ADOdb forums](http://phplens.com/lens/lensforum/topics.php?id=4) on phplens.com
- the [SourceForge tickets section](http://sourceforge.net/p/adodb/_list/tickets)
However, please note that they are not actively monitored and should
Modified: trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-record.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-active-record.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,10 +1,10 @@
<?php
/*
-@version v5.20.9 21-Dec-2016
+@version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
- Latest version is available at http://adodb.sourceforge.net
+ Latest version is available at http://adodb.org/
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
@@ -46,7 +46,7 @@
// $db = database connection
// $index = name of index - can be associative, for an example see
-// http://phplens.com/lens/lensforum/msgs.php?id=17790
+// PHPLens Issue No: 17790
// returns index into $_ADODB_ACTIVE_DBS
function ADODB_SetDatabaseAdapter(&$db, $index=false)
{
@@ -120,7 +120,7 @@
// php5 constructor
function __construct($table = false, $pkeyarr=false, $db=false)
{
- global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
+ global $_ADODB_ACTIVE_DBS;
if ($db == false && is_object($pkeyarr)) {
$db = $pkeyarr;
@@ -374,7 +374,7 @@
// update metadata
function UpdateActiveTable($pkeys=false,$forceUpdate=false)
{
- global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
+ global $_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
global $ADODB_ACTIVE_DEFVALS,$ADODB_FETCH_MODE;
$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
@@ -463,8 +463,8 @@
$attr = array();
$keys = array();
- switch($ADODB_ASSOC_CASE) {
- case 0:
+ switch (ADODB_ASSOC_CASE) {
+ case ADODB_ASSOC_CASE_LOWER:
foreach($cols as $name => $fldobj) {
$name = strtolower($name);
if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
@@ -480,7 +480,7 @@
}
break;
- case 1:
+ case ADODB_ASSOC_CASE_UPPER:
foreach($cols as $name => $fldobj) {
$name = strtoupper($name);
@@ -510,7 +510,7 @@
$attr[$name] = $fldobj;
}
foreach($pkeys as $k => $name) {
- $keys[$name] = $cols[$name]->name;
+ $keys[$name] = $cols[strtoupper($name)]->name;
}
break;
}
@@ -813,7 +813,7 @@
}
# useful for multiple record inserts
- # see http://phplens.com/lens/lensforum/msgs.php?id=17795
+ # see PHPLens Issue No: 17795
function Reset()
{
$this->_where=null;
@@ -927,8 +927,6 @@
// returns 0 on error, 1 on update, 2 on insert
function Replace()
{
- global $ADODB_ASSOC_CASE;
-
$db = $this->DB();
if (!$db) {
return false;
@@ -968,15 +966,18 @@
$pkey = array($pkey);
}
- if ($ADODB_ASSOC_CASE == 0) {
- foreach($pkey as $k => $v)
- $pkey[$k] = strtolower($v);
+ switch (ADODB_ASSOC_CASE) {
+ case ADODB_ASSOC_CASE_LOWER:
+ foreach ($pkey as $k => $v) {
+ $pkey[$k] = strtolower($v);
+ }
+ break;
+ case ADODB_ASSOC_CASE_UPPER:
+ foreach ($pkey as $k => $v) {
+ $pkey[$k] = strtoupper($v);
+ }
+ break;
}
- elseif ($ADODB_ASSOC_CASE == 1) {
- foreach($pkey as $k => $v) {
- $pkey[$k] = strtoupper($v);
- }
- }
$ok = $db->Replace($this->_table,$arr,$pkey);
if ($ok) {
Modified: trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,10 +1,10 @@
<?php
/*
-@version v5.20.9 21-Dec-2016
+@version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
- Latest version is available at http://adodb.sourceforge.net
+ Latest version is available at http://adodb.org/
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
@@ -137,7 +137,7 @@
// if $options['new'] is true, we forget all relations
function __construct($table = false, $pkeyarr=false, $db=false, $options=array())
{
- global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
+ global $_ADODB_ACTIVE_DBS;
if ($db == false && is_object($pkeyarr)) {
$db = $pkeyarr;
@@ -410,7 +410,7 @@
// update metadata
function UpdateActiveTable($pkeys=false,$forceUpdate=false)
{
- global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
+ global $_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
global $ADODB_ACTIVE_DEFVALS, $ADODB_FETCH_MODE;
$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
@@ -491,8 +491,8 @@
$attr = array();
$keys = array();
- switch($ADODB_ASSOC_CASE) {
- case 0:
+ switch (ADODB_ASSOC_CASE) {
+ case ADODB_ASSOC_CASE_LOWER:
foreach($cols as $name => $fldobj) {
$name = strtolower($name);
if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
@@ -508,7 +508,7 @@
}
break;
- case 1:
+ case ADODB_ASSOC_CASE_UPPER:
foreach($cols as $name => $fldobj) {
$name = strtoupper($name);
@@ -1060,8 +1060,6 @@
// returns 0 on error, 1 on update, 2 on insert
function Replace()
{
- global $ADODB_ASSOC_CASE;
-
$db = $this->DB();
if (!$db) {
return false;
@@ -1097,7 +1095,7 @@
}
- switch ($ADODB_ASSOC_CASE == 0) {
+ switch (ADODB_ASSOC_CASE) {
case ADODB_ASSOC_CASE_LOWER:
foreach($pkey as $k => $v) {
$pkey[$k] = strtolower($v);
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -8,7 +8,7 @@
/*
- @version v5.20.9 21-Dec-2016
+ @version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -16,14 +16,10 @@
the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
- Latest version is available at http://adodb.sourceforge.net
+ Latest version is available at http://adodb.org/
Library for CSV serialization. This is used by the csv/proxy driver and is the
CacheExecute() serialization format.
-
- ==== NOTE ====
- Format documented at http://php.weblogs.com/ADODB_CSV
- ==============
*/
/**
Modified: trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-datadict.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-datadict.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.9 21-Dec-2016
+ @version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -520,7 +520,7 @@
list($lines,$pkey,$idxs) = $this->_GenFields($flds);
// genfields can return FALSE at times
if ($lines == null) $lines = array();
- list(,$first) = each($lines);
+ $first = current($lines);
list(,$column_def) = preg_split("/[\t ]+/",$first,2);
}
return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
Modified: trunk/lib/WikiDB/adodb/adodb-error.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-error.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-error.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.9 21-Dec-2016
+ * @version v5.20.19 13-Dec-2020
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
@@ -111,7 +111,7 @@
'could not serialize access due to' => DB_ERROR_SERIALIZATION_FAILURE
);
reset($error_regexps);
- while (list($regexp,$code) = each($error_regexps)) {
+ foreach ($error_regexps as $regexp => $code) {
if (preg_match("/$regexp/mi", $errormsg)) {
return $code;
}
Modified: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.9 21-Dec-2016
+ * @version v5.20.19 13-Dec-2020
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
@@ -9,7 +9,7 @@
*
* Set tabs to 4 for best viewing.
*
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
*
*/
Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.9 21-Dec-2016
+ * @version v5.20.19 13-Dec-2020
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
@@ -9,7 +9,7 @@
*
* Set tabs to 4 for best viewing.
*
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
*
*/
include_once('PEAR.php');
Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
<?php
/**
- * @version v5.20.9 21-Dec-2016
+ * @version v5.20.19 13-Dec-2020
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
@@ -10,7 +10,7 @@
*
* Set tabs to 4 for best viewing.
*
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
*
* Exception-handling code using PHP5 exceptions (try-catch-throw).
*/
Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
<?php
/*
- @version v5.20.9 21-Dec-2016
+ @version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -6,7 +6,7 @@
$ADODB_INCLUDED_LIB = 1;
/*
- @version v5.20.9 21-Dec-2016
+ @version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -177,7 +177,7 @@
if ($zthis->poorAffectedRows) {
/*
The Select count(*) wipes out any errors that the update would have returned.
- http://phplens.com/lens/lensforum/msgs.php?id=5696
+ PHPLens Issue No: 5696
*/
if ($zthis->ErrorNo()<>0) return 0;
@@ -212,122 +212,66 @@
return ($rs) ? 2 : 0;
}
-// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false,
$size=0, $selectAttr='',$compareFields0=true)
{
- $hasvalue = false;
+ global $ADODB_FETCH_MODE;
- if ($multiple or is_array($defstr)) {
- if ($size==0) $size=5;
- $attr = ' multiple size="'.$size.'"';
- if (!strpos($name,'[]')) $name .= '[]';
- } else if ($size) $attr = ' size="'.$size.'"';
- else $attr ='';
+ $s = _adodb_getmenu_select($name, $defstr, $blank1stItem, $multiple, $size, $selectAttr);
- $s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
- if ($blank1stItem)
- if (is_string($blank1stItem)) {
- $barr = explode(':',$blank1stItem);
- if (sizeof($barr) == 1) $barr[] = '';
- $s .= "\n<option value=\"".$barr[0]."\">".$barr[1]."</option>";
- } else $s .= "\n<option></option>";
+ $hasvalue = $zthis->FieldCount() > 1;
+ if (!$hasvalue) {
+ $compareFields0 = true;
+ }
- if ($zthis->FieldCount() > 1) $hasvalue=true;
- else $compareFields0 = true;
-
$value = '';
- $optgroup = null;
- $firstgroup = true;
- $fieldsize = $zthis->FieldCount();
while(!$zthis->EOF) {
$zval = rtrim(reset($zthis->fields));
- if ($blank1stItem && $zval=="") {
+ if ($blank1stItem && $zval == "") {
$zthis->MoveNext();
continue;
}
- if ($fieldsize > 1) {
- if (isset($zthis->fields[1]))
- $zval2 = rtrim($zthis->fields[1]);
- else
- $zval2 = rtrim(next($zthis->fields));
+ if ($hasvalue) {
+ if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC) {
+ // Get 2nd field's value regardless of its name
+ $zval2 = current(array_slice($zthis->fields, 1, 1));
+ } else {
+ // With NUM or BOTH fetch modes, we have a numeric index
+ $zval2 = $zthis->fields[1];
+ }
+ $zval2 = trim($zval2);
+ $value = 'value="' . htmlspecialchars($zval2) . '"';
}
- $selected = ($compareFields0) ? $zval : $zval2;
- $group = '';
- if ($fieldsize > 2) {
- $group = rtrim($zthis->fields[2]);
- }
-/*
- if ($optgroup != $group) {
- $optgroup = $group;
- if ($firstgroup) {
- $firstgroup = false;
- $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
- } else {
- $s .="\n</optgroup>";
- $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
- }
- }
-*/
- if ($hasvalue)
- $value = " value='".htmlspecialchars($zval2)."'";
+ $s .= _adodb_getmenu_option($defstr, $compareFields0 ? $zval : $zval2, $value, $zval);
- if (is_array($defstr)) {
-
- if (in_array($selected,$defstr))
- $s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
- else
- $s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
- }
- else {
- if (strcasecmp($selected,$defstr)==0)
- $s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
- else
- $s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
- }
$zthis->MoveNext();
} // while
- // closing last optgroup
- if($optgroup != null) {
- $s .= "\n</optgroup>";
- }
return $s ."\n</select>\n";
}
-// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false,
$size=0, $selectAttr='',$compareFields0=true)
{
- $hasvalue = false;
+ global $ADODB_FETCH_MODE;
- if ($multiple or is_array($defstr)) {
- if ($size==0) $size=5;
- $attr = ' multiple size="'.$size.'"';
- if (!strpos($name,'[]')) $name .= '[]';
- } else if ($size) $attr = ' size="'.$size.'"';
- else $attr ='';
+ $s = _adodb_getmenu_select($name, $defstr, $blank1stItem, $multiple, $size, $selectAttr);
- $s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
- if ($blank1stItem)
- if (is_string($blank1stItem)) {
- $barr = explode(':',$blank1stItem);
- if (sizeof($barr) == 1) $barr[] = '';
- $s .= "\n<option value=\"".$barr[0]."\">".$barr[1]."</option>";
- } else $s .= "\n<option></option>";
+ $hasvalue = $zthis->FieldCount() > 1;
+ $hasgroup = $zthis->FieldCount() > 2;
+ if (!$hasvalue) {
+ $compareFields0 = true;
+ }
- if ($zthis->FieldCount() > 1) $hasvalue=true;
- else $compareFields0 = true;
-
$value = '';
- $optgroup = null;
- $firstgroup = true;
- $fieldsize = sizeof($zthis->fields);
+ $optgroup = null;
+ $firstgroup = true;
while(!$zthis->EOF) {
$zval = rtrim(reset($zthis->fields));
+ $group = '';
if ($blank1stItem && $zval=="") {
$zthis->MoveNext();
@@ -334,57 +278,119 @@
continue;
}
- if ($fieldsize > 1) {
- if (isset($zthis->fields[1]))
- $zval2 = rtrim($zthis->fields[1]);
- else
- $zval2 = rtrim(next($zthis->fields));
+ if ($hasvalue) {
+ if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC) {
+ // Get 2nd field's value regardless of its name
+ $fields = array_slice($zthis->fields, 1);
+ $zval2 = current($fields);
+ if ($hasgroup) {
+ $group = trim(next($fields));
+ }
+ } else {
+ // With NUM or BOTH fetch modes, we have a numeric index
+ $zval2 = $zthis->fields[1];
+ if ($hasgroup) {
+ $group = trim($zthis->fields[2]);
+ }
+ }
+ $zval2 = trim($zval2);
+ $value = "value='".htmlspecialchars($zval2)."'";
}
- $selected = ($compareFields0) ? $zval : $zval2;
- $group = '';
- if (isset($zthis->fields[2])) {
- $group = rtrim($zthis->fields[2]);
- }
-
- if ($optgroup != $group) {
- $optgroup = $group;
- if ($firstgroup) {
- $firstgroup = false;
- $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
- } else {
- $s .="\n</optgroup>";
- $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
- }
+ if ($optgroup != $group) {
+ $optgroup = $group;
+ if ($firstgroup) {
+ $firstgroup = false;
+ } else {
+ $s .="\n</optgroup>";
+ }
+ $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
}
- if ($hasvalue)
- $value = " value='".htmlspecialchars($zval2)."'";
+ $s .= _adodb_getmenu_option($defstr, $compareFields0 ? $zval : $zval2, $value, $zval);
- if (is_array($defstr)) {
-
- if (in_array($selected,$defstr))
- $s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
- else
- $s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
- }
- else {
- if (strcasecmp($selected,$defstr)==0)
- $s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
- else
- $s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
- }
$zthis->MoveNext();
} // while
- // closing last optgroup
- if($optgroup != null) {
- $s .= "\n</optgroup>";
+ // closing last optgroup
+ if($optgroup != null) {
+ $s .= "\n</optgroup>";
}
return $s ."\n</select>\n";
}
+/**
+ * Generate the opening SELECT tag for getmenu functions.
+ *
+ * ADOdb internal function, used by _adodb_getmenu() and _adodb_getmenu_gp().
+ *
+ * @param string $name
+ * @param string $defstr
+ * @param bool $blank1stItem
+ * @param bool $multiple
+ * @param int $size
+ * @param string $selectAttr
+ *
+ * @return string HTML
+ */
+function _adodb_getmenu_select($name, $defstr = '', $blank1stItem = true,
+ $multiple = false, $size = 0, $selectAttr = '')
+{
+ if ($multiple || is_array($defstr)) {
+ if ($size == 0 ) {
+ $size = 5;
+ }
+ $attr = ' multiple size="' . $size . '"';
+ if (!strpos($name,'[]')) {
+ $name .= '[]';
+ }
+ } elseif ($size) {
+ $attr = ' size="' . $size . '"';
+ } else {
+ $attr = '';
+ }
+ $html = '<select name="' . $name . '"' . $attr . ' ' . $selectAttr . '>';
+ if ($blank1stItem) {
+ if (is_string($blank1stItem)) {
+ $barr = explode(':',$blank1stItem);
+ if (sizeof($barr) == 1) {
+ $barr[] = '';
+ }
+ $html .= "\n<option value=\"" . $barr[0] . "\">" . $barr[1] . "</option>";
+ } else {
+ $html .= "\n<option></option>";
+ }
+ }
+
+ return $html;
+}
+
+/**
+ * Print the OPTION tags for getmenu functions.
+ *
+ * ADOdb internal function, used by _adodb_getmenu() and _adodb_getmenu_gp().
+ *
+ * @param string $defstr Default values
+ * @param string $compare Value to compare against defaults
+ * @param string $value Ready-to-print `value="xxx"` (or empty) string
+ * @param string $display Display value
+ *
+ * @return string HTML
+ */
+function _adodb_getmenu_option($defstr, $compare, $value, $display)
+{
+ if ( is_array($defstr) && in_array($compare, $defstr)
+ || !is_array($defstr) && strcasecmp($compare, $defstr) == 0
+ ) {
+ $selected = ' selected="selected"';
+ } else {
+ $selected = '';
+ }
+
+ return "\n<option $value$selected>" . htmlspecialchars($display) . '</option>';
+}
+
/*
Count the number of records this sql statement will return by using
query rewriting heuristics...
@@ -416,7 +422,12 @@
} else
$rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")";
- } else if (strncmp($zthis->databaseType,'postgres',8) == 0 || strncmp($zthis->databaseType,'mysql',5) == 0) {
+ } else if (strncmp($zthis->databaseType,'postgres',8) == 0
+ || strncmp($zthis->databaseType,'mysql',5) == 0
+ || strncmp($zthis->databaseType,'mssql',5) == 0
+ || strncmp($zthis->dsnType,'sqlsrv',5) == 0
+ || strncmp($zthis->dsnType,'mssql',5) == 0
+ ){
$rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_";
} else {
$rewritesql = "SELECT COUNT(*) FROM ($rewritesql)";
@@ -430,7 +441,7 @@
}
// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails
// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
- // also see http://phplens.com/lens/lensforum/msgs.php?id=12752
+ // also see PHPLens Issue No: 12752
$rewritesql = adodb_strip_order_by($rewritesql);
}
@@ -766,7 +777,7 @@
if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard));
else if (preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard));
else if (preg_match('/\s(FOR UPDATE.*)/is', $whereClause[1], $discard));
- else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976
+ else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see https://sourceforge.net/p/adodb/bugs/37/
} else
$whereClause = array(false,false);
Modified: trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -11,7 +11,7 @@
/*
- @version v5.20.9 21-Dec-2016
+ @version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -19,7 +19,7 @@
the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
- Latest version is available at http://adodb.sourceforge.net
+ Latest version is available at http://adodb.org/
Usage:
Modified: trunk/lib/WikiDB/adodb/adodb-pager.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pager.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-pager.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
<?php
/*
- @version v5.20.9 21-Dec-2016
+ @version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.9 21-Dec-2016
+ * @version v5.20.19 13-Dec-2020
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
@@ -358,7 +358,7 @@
*/
function assertExtension($name)
{
- if (!extension_loaded($name)) {
+ if (function_exists('dl') && !extension_loaded($name)) {
$dlext = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : '.so';
@dl($name . $dlext);
}
Modified: trunk/lib/WikiDB/adodb/adodb-perf.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-perf.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-perf.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
<?php
/*
-@version v5.20.9 21-Dec-2016
+@version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -8,7 +8,7 @@
the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
- Latest version is available at http://adodb.sourceforge.net
+ Latest version is available at http://adodb.org/
Library for basic performance monitoring and tuning.
@@ -147,7 +147,7 @@
if (empty($d)) $d = date("'Y-m-d H:i:s'");
if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
$isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)";
- } else if ($dbT == 'odbc_mssql' || $dbT == 'informix' || strncmp($dbT,'odbtp',4)==0) {
+ } else if ($dbT == 'mssqlnative' || $dbT == 'odbc_mssql' || $dbT == 'informix' || strncmp($dbT,'odbtp',4)==0) {
$timer = $arr['f'];
if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
@@ -166,6 +166,9 @@
global $ADODB_PERF_MIN;
if ($errN != 0 || $time >= $ADODB_PERF_MIN) {
+ if($conn instanceof ADODB_mysqli && $conn->_queryID) {
+ mysqli_free_result($conn->_queryID);
+ }
$ok = $conn->Execute($isql,$arr);
} else
$ok = true;
@@ -226,7 +229,7 @@
var $cliFormat = "%32s => %s \r\n";
var $sql1 = 'sql1'; // used for casting sql1 to text for mssql
var $explain = true;
- var $helpurl = '<a href="http://adodb.sourceforge.net/docs-adodb.htm#logsql">LogSQL help</a>';
+ var $helpurl = '<a href="http://adodb.org/dokuwiki/doku.php?id=v5:performance:logsql">LogSQL help</a>';
var $createTableSQL = false;
var $maxLength = 2000;
@@ -721,7 +724,7 @@
if (empty($_GET['hidem']))
echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
- <b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
+ <b><a href=http://adodb.org/dokuwiki/doku.php?id=v5:performance:performance_index>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
<a href=?do=stats><b>Performance Stats</b></a> <a href=?do=viewsql><b>View SQL</b></a>
<a href=?do=tables><b>View Tables</b></a> <a href=?do=poll><b>Poll Stats</b></a>",
$allowsql ? ' <a href=?do=dosql><b>Run SQL</b></a>' : '',
@@ -764,7 +767,6 @@
echo $this->Tables(); break;
}
global $ADODB_vers;
- echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
}
/*
Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
<?php
/*
- @version v5.20.9 21-Dec-2016
+ @version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,9 +1,10 @@
<?php
/*
ADOdb Date Library, part of the ADOdb abstraction library
-Download: http://adodb.sourceforge.net/#download
-@version v5.20.9 21-Dec-2016
+Latest version is available at http://adodb.org/
+
+@version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
@@ -65,14 +66,7 @@
jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
and originally found at http://www.php.net/manual/en/function.mktime.php
-=============================================================================
-BUG REPORTS
-
-These should be posted to the ADOdb forums at
-
- http://phplens.com/lens/lensforum/topics.php?id=4
-
=============================================================================
FUNCTION DESCRIPTIONS
@@ -347,7 +341,7 @@
- 9 Aug 2003 0.10
Fixed bug with dates after 2038.
-See http://phplens.com/lens/lensforum/msgs.php?id=6980
+See PHPLens Issue No: 6980
- 1 July 2003 0.09
Added support for Q (Quarter).
@@ -420,6 +414,9 @@
if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+if (!DEFINED('ADODB_FUTURE_DATE_CUTOFF_YEARS'))
+ DEFINE('ADODB_FUTURE_DATE_CUTOFF_YEARS',200);
+
function adodb_date_test_date($y1,$m,$d=13)
{
$h = round(rand()% 24);
@@ -816,7 +813,7 @@
if ($marr[$m] < $d) return false;
- if ($y < 1000 && $y > 3000) return false;
+ if ($y < 1000 || $y > 3000) return false;
return true;
}
@@ -829,13 +826,23 @@
function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
{
static $YRS;
-global $_month_table_normal,$_month_table_leaf;
+global $_month_table_normal,$_month_table_leaf, $_adodb_last_date_call_failed;
+ $_adodb_last_date_call_failed = false;
+
$d = $origd - ($is_gmt ? 0 : adodb_get_gmt_diff_ts($origd));
$_day_power = 86400;
$_hour_power = 3600;
$_min_power = 60;
+ $cutoffDate = time() + (60 * 60 * 24 * 365 * ADODB_FUTURE_DATE_CUTOFF_YEARS);
+
+ if ($d > $cutoffDate)
+ {
+ $d = $cutoffDate;
+ $_adodb_last_date_call_failed = true;
+ }
+
if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction
$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
@@ -1375,7 +1382,7 @@
$sep = substr($tstr,2,1);
$hasAM = strrpos($tstr,'M') !== false;
*/
- # see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24
+ # see PHPLens Issue No: 14865 for reasoning, and changelog for version 0.24
$dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am
$sep = substr($dstr,2,1);
$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
@@ -1460,3 +1467,16 @@
$ret = adodb_date($fmtdate, $ts, $is_gmt);
return $ret;
}
+
+/**
+* Returns the status of the last date calculation and whether it exceeds
+* the limit of ADODB_FUTURE_DATE_CUTOFF_YEARS
+*
+* @return boolean
+*/
+function adodb_last_date_status()
+{
+ global $_adodb_last_date_call_failed;
+
+ return $_adodb_last_date_call_failed;
+}
Modified: trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1305,8 +1305,9 @@
function __construct( $db ) {
// Initialize the environment
$this->mgq = get_magic_quotes_runtime();
- ini_set("magic_quotes_runtime", 0);
- #set_magic_quotes_runtime(0);
+ if ($this->mgq !== false) {
+ ini_set('magic_quotes_runtime', 0);
+ }
$this->db = $db;
$this->debug = $this->db->debug;
@@ -2195,8 +2196,9 @@
* @deprecated adoSchema now cleans up automatically.
*/
function Destroy() {
- ini_set("magic_quotes_runtime", $this->mgq );
- #set_magic_quotes_runtime( $this->mgq );
+ if ($this->mgq !== false) {
+ ini_set('magic_quotes_runtime', $this->mgq );
+ }
}
}
Modified: trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -1409,8 +1409,9 @@
function __construct( $db ) {
// Initialize the environment
$this->mgq = get_magic_quotes_runtime();
- #set_magic_quotes_runtime(0);
- ini_set("magic_quotes_runtime", 0);
+ if ($this->mgq !== false) {
+ ini_set('magic_quotes_runtime', 0 );
+ }
$this->db = $db;
$this->debug = $this->db->debug;
@@ -2377,8 +2378,9 @@
* @deprecated adoSchema now cleans up automatically.
*/
function Destroy() {
- ini_set("magic_quotes_runtime", $this->mgq );
- #set_magic_quotes_runtime( $this->mgq );
+ if ($this->mgq !== false) {
+ ini_set('magic_quotes_runtime', $this->mgq );
+ }
}
}
Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php 2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php 2020-12-26 16:01:39 UTC (rev 10206)
@@ -2,7 +2,7 @@
/*
* Set tabs to 4 for best viewing.
*
- * Latest version is available at http://adodb.sourceforge.net
+ * Latest version is available at http://adodb.org/
*
* This is the main include file for ADOdb.
* Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
@@ -14,7 +14,7 @@
/**
\mainpage
- @version v5.20.9 21-Dec-2016
+ @version v5.20.19 13-Dec-2020
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
@@ -29,9 +29,6 @@
Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland variants), Foxpro, Access,
ADO, SAP DB, SQLite and ODBC. We have had successful reports of connecting to Progress and
other databases via ODBC.
-
- Latest Download at http://adodb.sourceforge.net/
-
*/
if (!defined('_ADODB_LAYER')) {
@@ -224,15 +221,10 @@
}
}
-
- // Initialize random number generator for randomizing cache flushes
- // -- note Since PHP 4.2.0, the seed becomes optional and defaults to a random value if omitted.
- srand(((double)microtime())*1000000);
-
/**
* ADODB version as a string.
*/
- $ADODB_vers = 'v5.20.9 21-Dec-2016';
+ $ADODB_vers = 'v5.20.17 31-Mar-2020';
/**
* Determines whether recordset->RecordCount() is used.
@@ -310,8 +302,8 @@
//print "Errorno ($fn errno=$errno m=$errmsg) ";
$thisConnection->_transOK = false;
if ($thisConnection->_oldRaiseFn) {
- $fn = $thisConnection->_oldRaiseFn;
- $fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
+ $errfn = $thisConnection->_oldRaiseFn;
+ $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
}
}
@@ -431,6 +423,7 @@
var $databaseType = ''; /// RDBMS currently in use, eg. odbc, mysql, mssql
var $database = ''; /// Name of database to be used.
var $host = ''; /// The hostname of the database server
+ var $port = ''; /// The port of the database server
var $user = ''; /// The username which is used to connect to the database server.
var $password = ''; /// Password for the username. For security, we no longer store it.
var $debug = false; /// if set to true will output sql statements
@@ -633,6 +626,26 @@
}
/**
+ * Parses the hostname to extract the port.
+ * Overwrites $this->host and $this->port, only if a port is specified.
+ * The Hostname can be fully or partially qualified,
+ * ie: "db.mydomain.com:5432" or "ldaps://ldap.mydomain.com:636"
+ * Any specified scheme such as ldap:// or ldaps:// is maintained.
+ */
+ protected function parseHostNameAndPort() {
+ $parsed_url = parse_url($this->host);
+ if (is_array($parsed_url) && isset($parsed_url['host']) && isset($parsed_url['port'])) {
+ if ( isset($parsed_url['scheme']) ) {
+ // If scheme is specified (ie: ldap:// or ldaps://, make sure we retain that.
+ $this->host = $parsed_url['scheme'] . "://" . $parsed_url['host'];
+ } else {
+ $this->host = $parsed_url['host'];
+ }
+ $this->port = $parsed_url['port'];
+ }
+ }
+
+ /**
* Connect to database
*
* @param [argHostname] Host to connect to
@@ -647,9 +660,9 @@
if ($argHostname != "") {
$this->host = $argHostname;
}
- if ( strpos($this->host, ':') > 0 && isset($this->port) ) {
- list($this->host, $this->port) = explode(":", $this->host, 2);
- }
+ // Overwrites $this->host and $this->port if a port is specified.
+ $this->parseHostNameAndPort();
+
if ($argUsername != "") {
$this->user = $argUsername;
}
@@ -730,9 +743,9 @@
if ($argHostname != "") {
$this->host = $argHostname;
}
- if ( strpos($this->host, ':') > 0 && isset($this->port) ) {
- list($this->host, $this->port) = explode(":", $this->host, 2);
- }
+ // Overwrites $this->host and $this->port if a port is specified.
+ $this->parseHostNameAndPort();
+
if ($argUsername != "") {
$this->user = $argUsername;
}
@@ -1163,8 +1176,7 @@
foreach($inputarr as $arr) {
$sql = ''; $i = 0;
- //Use each() instead of foreach to reduce memory usage -mikefedyk
- while(list(, $v) = each($arr)) {
+ foreach ($arr as $v) {
$sql .= $sqlarr[$i];
// from Ron Baldwin <ron.baldwin#sourceprose.com>
// Only quote string types
@@ -1497,6 +1509,9 @@
* @return the recordset ($rs->databaseType == 'array')
*/
function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) {
+ $nrows = (int)$nrows;
+ $offset = (int)$offset;
+
if ($this->hasTop && $nrows > 0) {
// suggested by Reinhard Balling. Access requires top after distinct
// Informix requires first before distinct - F Riosa
@@ -1511,7 +1526,7 @@
// access includes ties in result
if ($isaccess) {
$sql = preg_replace(
- '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+ '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
if ($secs2cache != 0) {
$ret = $this->CacheExecute($secs2cache, $sql,$inputarr);
@@ -1521,10 +1536,10 @@
return $ret; // PHP5 fix
} else if ($ismssql){
$sql = preg_replace(
- '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+ '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
} else {
$sql = preg_replace(
- '/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+ '/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
}
} else {
$nn = $nrows + $offset;
@@ -2392,6 +2407,7 @@
*/
function Close() {
$rez = $this->_close();
+ $this->_queryID = false;
$this->_connectionID = false;
return $rez;
}
@@ -3039,6 +3055,61 @@
return $rs;
}
+ /**
+ * Get the last error recorded by PHP and clear the message.
+ *
+ * By clearing the message, it becomes possible to detect whether a new error
+ * has occurred, even when it is the same error as before being repeated.
+ *
+ * @return array|null Array if an error has previously occurred. Null otherwise.
+ */
+ protected function resetLastError() {
+ $error = error_get_last();
+
+ if (is_array($error)) {
+ $error['message'] = '';
+ }
+
+ return $error;
+ }
+
+ /**
+ * Compare a previously stored error message with the last error recorded by PHP
+ * to determine whether a new error has occured.
+ *
+ * @param array|null $old Optional. Previously stored return value of error_get_last().
+ *
+ * @return string The error message if a new error has occured
+ * or an empty string if no (new) errors have occured..
+ */
+ protected function getChangedErrorMsg($old = null) {
+ $new = error_get_last();
+
+ if (is_null($new)) {
+ // No error has occured yet at all.
+ return '';
+ }
+
+ if (is_null($old)) {
+ // First error recorded.
+ return $new['message'];
+ }
+
+ $changed = false;
+ foreach($new as $key => $value) {
+ if ($new[$key] !== $old[$key]) {
+ $changed = true;
+ break;
+ }
+ }
+
+ if ($changed === true) {
+ return $new['message'];
+ }
+
+ return '';
+ }
+
} // end class ADOConnection
@@ -3315,65 +3386,121 @@
/**
- * Generate a SELECT tag string from a recordset, and return the string.
- * If the recordset has 2 cols, we treat the 1st col as the containing
- * the text to display to the user, and 2nd col as the return value. Default
- * strings are compared with the FIRST column.
+ * Generate a SELECT tag from a recordset, and return the HTML markup.
*
- * @param name name of SELECT tag
- * @param [defstr] the value to hilite. Use an array for multiple hilites for listbox.
- * @param [blank1stItem] true to leave the 1st item in list empty
- * @param [multiple] true for listbox, false for popup
- * @param [size] #rows to show for listbox. not used by popup
- * @param [selectAttr] additional attributes to defined for SELECT tag.
- * useful for holding javascript onChange='...' handlers.
- & @param [compareFields0] when we have 2 cols in recordset, we compare the defstr with
- * column 0 (1st col) if this is true. This is not documented.
+ * If the recordset has 2 columns, we treat the first one as the text to
+ * display to the user, and the second as the return value. Extra columns
+ * are discarded.
*
- * @return HTML
+ * @param string $name Name of SELECT tag
+ * @param string|array $defstr The value to highlight. Use an array for multiple highlight values.
+ * @param bool|string $blank1stItem True to create an empty item (default), False not to add one;
+ * 'string' to set its label and 'value:string' to assign a value to it.
+ * @param bool $multiple True for multi-select list
+ * @param int $size Number of rows to show (applies to multi-select box only)
+ * @param string $selectAttr Additional attributes to defined for SELECT tag,
+ * useful for holding javascript onChange='...' handlers, CSS class, etc.
+ * @param bool $compareFirstCol When true (default), $defstr is compared against the value (column 2),
+ * while false will compare against the description (column 1).
*
- * changes by gle...@cc... to support multiple hilited items
+ * @return string HTML
*/
- function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
- $size=0, $selectAttr='',$compareFields0=true)
+ function getMenu($name, $defstr = '', $blank1stItem = true, $multiple = false,
+ $size = 0, $selectAttr = '', $compareFirstCol = true)
{
global $ADODB_INCLUDED_LIB;
if (empty($ADODB_INCLUDED_LIB)) {
include(ADODB_DIR.'/adodb-lib.inc.php');
}
- return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
- $size, $selectAttr,$compareFields0);
+ return _adodb_getmenu($this, $name, $defstr, $blank1stItem, $multiple,
+ $size, $selectAttr, $compareFirstCol);
}
-
-
/**
- * Generate a SELECT tag string from a recordset, and return the string.
- * If the recordset has 2 cols, we treat the 1st col as the containing
- * the text to display to the user, and 2nd col as the return value. Default
- * strings are compared with the SECOND column.
+ * Generate a SELECT tag with groups from a recordset, and return the HTML markup.
*
+ * The recordset must have 3 columns and be ordered by the 3rd column. The
+ * first column contains the text to display to the user, the second is the
+ * return value and the third is the option group. Extra columns are discarded.
+ * Default strings are compared with the SECOND column.
+ *
+ * @param string $name Name of SELECT tag
+ * @param string|array $defstr The value to highlight. Use an array for multiple highlight values.
+ * @param bool|string $blank1stItem True to create an empty item (default), False not to add one;
+ * 'string' to set its label and 'value:string' to assign a value to it.
+ * @param bool $multiple True for multi-select list
+ * @param int $size Number of rows to show (applies to multi-select box only)
+ * @param string $selectAttr Additional attributes to defined for SELECT tag,
+ * useful for holding javascript onChange='...' handlers, CSS class, etc.
+ * @param bool $compareFirstCol When true (default), $defstr is compared against the value (column 2),
+ * while false will compare against the description (column 1).
+ *
+ * @return string HTML
*/
- function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='') {
- return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
- $size, $selectAttr,false);
- }
-
- /*
- Grouped Menu
- */
- function GetMenu3($name,$defstr='',$blank1stItem=true,$multiple=false,
- $size=0, $selectAttr='')
+ function getMenuGrouped($name, $defstr = '', $blank1stItem = true, $multiple = false,
+ $size = 0, $selectAttr = '', $compareFirstCol = true)
{
global $ADODB_INCLUDED_LIB;
if (empty($ADODB_INCLUDED_LIB)) {
include(ADODB_DIR.'/adodb-lib.inc.php');
}
- return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple,
+ return _adodb_getmenu_gp($this, $name, $defstr, $blank1stItem, $multiple,
+ $size, $selectAttr, $compareFirstCol);
+ }
+
+ /**
+ * Generate a SELECT tag from a recordset, and return the HTML markup.
+ *
+ * Same as GetMenu(), except that default strings are compared with the
+ * FIRST column (the description).
+ *
+ * @param string $name Name of SELECT tag
+ * @param string|array $defstr The value to highlight. Use an array for multiple highlight values.
+ * @param bool|string $blank1stItem True to create an empty item (default), False not to add one;
+ * 'string' to set its label and 'value:string' to assign a value to it.
+ * @param bool $multiple True for multi-select list
+ * @param int $size Number of rows to show (applies to multi-select box only)
+ * @param string $selectAttr Additional attributes to defined for SELECT tag,
+ * useful for holding javascript onChange='...' handlers, CSS class, etc.
+ *
+ * @return string HTML
+ *
+ * @deprecated 5.21.0 Use getMenu() with $compareFirstCol = false instead.
+ */
+ function getMenu2($name, $defstr = '', $blank1stItem = true, $multiple = false,
+ $size = 0, $selectAttr = '')
+ {
+ return $this->getMenu($name, $defstr, $blank1stItem, $multiple,
$size, $selectAttr,false);
}
/**
+ * Generate a SELECT tag with groups from a recordset, and return the HTML ma...
[truncated message content] |
){kind=link}
|
From: <var...@us...> - 2020-12-28 18:58:10
|
Revision: 10209
http://sourceforge.net/p/phpwiki/code/10209
Author: vargenau
Date: 2020-12-28 18:58:08 +0000 (Mon, 28 Dec 2020)
Log Message:
-----------
Flash is dead
Modified Paths:
--------------
trunk/TODO
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiPluginCached.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/Ploticus.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/Video.php
trunk/lib/stdlib.php
trunk/locale/Makefile
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/pgsrc/NoteDiRilascio
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/pgsrc/Help%2FCalendarListPlugin
trunk/pgsrc/Help%2FImages
trunk/pgsrc/Help%2FPloticusPlugin
trunk/pgsrc/Help%2FTeX2pngPlugin
trunk/pgsrc/Help%2FVideoPlugin
trunk/pgsrc/Help%2FWikiPlugin
trunk/pgsrc/PhpWikiManual
trunk/pgsrc/ReleaseNotes
trunk/themes/blog/templates/top.tmpl
Removed Paths:
-------------
trunk/pgsrc/Help%2FAdobe%20Flash
trunk/themes/Sidebar/clock.php
trunk/themes/Sidebar/ora.swf
trunk/themes/default/flowplayer-3.2.4.swf
trunk/themes/default/flowplayer.controls-3.2.2.swf
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/TODO 2020-12-28 18:58:08 UTC (rev 10209)
@@ -84,7 +84,7 @@
* display login page on "$action is disallowed on this wiki for user ..."
* remove "Invalid username" warning on "sign in as" button click
* themes/blog, BlogArchivesPlugin
-* test WikiPluginCached support for image maps and svg, swf, eps, ...
+* test WikiPluginCached support for image maps and svg, eps, ...
defer header logic
* don't print php notices and warnings as red errors.
just green or grey
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/config/config-default.ini 2020-12-28 18:58:08 UTC (rev 10209)
@@ -130,7 +130,7 @@
DEFAULT_WIKI_PAGES = "ReleaseNotes"
ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
-INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
+INLINE_IMAGES = "png|jpg|jpeg|gif"
WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
INTERWIKI_MAP_FILE = lib/interwiki.map
WARN_NONPUBLIC_INTERWIKIMAP = false
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/config/config-dist.ini 2020-12-28 18:58:08 UTC (rev 10209)
@@ -932,11 +932,11 @@
; URLs ending with the following extension should be inlined as images.
; Specify as per ALLOWED_PROTOCOLS.
-; Note that you can now also allow class|svg|svgz|vrml|swf ...,
+; Note that you can now also allow class|svg|svgz|vrml...,
; which will create embedded object instead of img.
; Typical CGI extensions as pl or cgi maybe allowed too,
; but those two will be enforced to img.
-;INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
+;INLINE_IMAGES = "png|jpg|jpeg|gif"
; Perl regexp for WikiNames ("bumpy words"):
; (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/configurator.php 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1330,7 +1330,7 @@
within a named link [name|uri] one more protocol is defined: phpwiki");
$properties["Inline Images"] =
- new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif|swf');
+ new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif');
$properties["WikiName Regexp"] =
new _define('WIKI_NAME_REGEXP', "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])", "
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/WikiDB/backend.php 2020-12-28 18:58:08 UTC (rev 10209)
@@ -566,7 +566,7 @@
}
return array($from, $limit);
} else {
- if (!empty($limit) && !is_numeric($limit)) {
+ if (!empty($limit) && (!is_numeric($limit) || $limit > 2147483647)) {
trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma"));
return array(0, 0);
}
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/WikiPluginCached.php 2020-12-28 18:58:08 UTC (rev 10209)
@@ -37,7 +37,6 @@
define('PLUGIN_CACHED_MAP', 2); // area maps
define('PLUGIN_CACHED_SVG', 3); // special SVG/SVGZ object
define('PLUGIN_CACHED_SVG_PNG', 4); // special SVG/SVGZ object with PNG fallback
-define('PLUGIN_CACHED_SWF', 5); // special SWF (flash) object
define('PLUGIN_CACHED_PDF', 6); // special PDF object (inlinable?)
define('PLUGIN_CACHED_PS', 7); // special PS object (inlinable?)
// boolean tests:
@@ -441,7 +440,7 @@
}
/**
- * svg?, swf, ...
+ * svg?, ...
<object type="audio/x-wav" standby="Loading Audio" data="example.wav">
<param name="src" value="example.wav" valuetype="data"></param>
<param name="autostart" value="false" valuetype="data"></param>
@@ -524,7 +523,7 @@
}
$supportedtypes = array();
- // Todo: swf, pdf, ...
+ // Todo: pdf, ...
$imagetypes = array(
'png' => IMG_PNG,
'gif' => IMG_GIF,
@@ -591,7 +590,7 @@
'gd2' => 'Content-type: image/gd2',
'wbmp' => 'Content-type: image/vnd.wap.wbmp', // wireless bitmaps for PDA's and such.
'html' => 'Content-type: text/html');
- // Todo: swf, pdf, svg, svgz
+ // Todo: pdf, svg, svgz
header($IMAGEHEADER[$doctype]);
}
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/plugin/GraphViz.php 2020-12-28 18:58:08 UTC (rev 10209)
@@ -30,7 +30,7 @@
*
* Note:
* - We support only images supported by GD so far (PNG most likely).
- * EPS, PS, SWF, SVG or SVGZ and imagemaps need to be tested.
+ * EPS, PS, SVG or SVGZ and imagemaps need to be tested.
*
* TODO:
* - neato binary ?
@@ -97,13 +97,11 @@
$device = strtolower($this->_args['imgtype']);
if (in_array($device, $this->mapTypes()))
return PLUGIN_CACHED_MAP;
- if (in_array($device, array('svg', 'swf', 'svgz', 'eps', 'ps'))) {
+ if (in_array($device, array('svg', 'svgz', 'eps', 'ps'))) {
switch ($this->_args['imgtype']) {
case 'svg':
case 'svgz':
return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SVG_PNG;
- case 'swf':
- return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SWF;
default:
return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_HTML;
}
Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/plugin/Ploticus.php 2020-12-28 18:58:08 UTC (rev 10209)
@@ -24,7 +24,7 @@
/**
* The Ploticus plugin passes all its arguments to the ploticus
- * binary and displays the result as PNG, GIF, EPS, SVG or SWF.
+ * binary and displays the result as PNG, GIF, EPS or SVG.
* Ploticus is a free, GPL, non-interactive software package
* for producing plots, charts, and graphics from data.
* See http://ploticus.sourceforge.net/doc/welcome.html
@@ -35,7 +35,7 @@
* - For windows you need either a gd library with GIF support or
* a Ploticus with PNG support. This comes e.g. with the Cygwin build.
* - We support only images supported by GD so far (PNG most likely).
- * No EPS, PS, SWF, SVG or SVGZ support yet, due to limitations in WikiPluginCached.
+ * No EPS, PS, SVG or SVGZ support yet, due to limitations in WikiPluginCached.
* This will be fixed soon.
*
* Usage:
@@ -83,13 +83,11 @@
if ($type == $this->_args['device'])
return PLUGIN_CACHED_IMG_INLINE;
$device = strtolower($this->_args['device']);
- if (in_array($device, array('svg', 'swf', 'svgz', 'eps', 'ps', 'pdf', 'html'))) {
+ if (in_array($device, array('svg', 'svgz', 'eps', 'ps', 'pdf', 'html'))) {
switch ($this->_args['device']) {
case 'svg':
case 'svgz':
return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SVG_PNG;
- case 'swf':
- return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SWF;
default:
return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_HTML;
}
@@ -218,7 +216,7 @@
{
// Check device
$device = strtolower($argarray['device']);
- if (!in_array($device, array('gif', 'png', 'jpeg', 'svg', 'svgz', 'eps', 'swf', 'ps', 'pdf', 'html'))) {
+ if (!in_array($device, array('gif', 'png', 'jpeg', 'svg', 'svgz', 'eps', 'ps', 'pdf', 'html'))) {
$this->_errortext = _("wrong device");
return false;
}
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/plugin/UpLoad.php 2020-12-28 18:58:08 UTC (rev 10209)
@@ -67,7 +67,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
$this->allowed_extensions = explode(",",
- "7z,avi,bmp,bz2,c,cfg,diff,doc,docx,flv,gif,h,ics,ini,".
+ "7z,avi,bmp,bz2,c,cfg,diff,doc,docx,gif,h,ics,ini,".
"jpeg,jpg,kmz,mp3,odg,odp,ods,odt,ogg,patch,pdf,png,ppt,".
"pptx,rar,svg,tar,tar.gz,txt,xls,xlsx,xml,xsd,zip");
$this->disallowed_extensions = explode(",",
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/plugin/Video.php 2020-12-28 18:58:08 UTC (rev 10209)
@@ -49,7 +49,7 @@
{
function getDescription()
{
- return _("Display video in Flash or HTML5.");
+ return _("Display video in HTML5.");
}
function getDefaultArguments()
@@ -102,63 +102,6 @@
}
return $video;
}
-
- $html = HTML();
-
- if (isBrowserIE()) {
- $object = HTML::object(array('id' => 'flowplayer',
- 'classid' => 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000',
- 'width' => $width,
- 'height' => $height));
-
- $param = HTML::param(array('name' => 'movie',
- 'value' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf')));
- $object->pushContent($param);
-
- $param = HTML::param(array('name' => "allowfullscreen",
- 'value' => "true"));
- $object->pushContent($param);
-
- $param = HTML::param(array('name' => "allowscriptaccess",
- 'value' => "false"));
- $object->pushContent($param);
-
- $flashvars = "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}";
-
- $param = HTML::param(array('name' => 'flashvars',
- 'value' => $flashvars));
- $object->pushContent($param);
-
- $embed = HTML::embed(array('type' => 'application/x-shockwave-flash',
- 'width' => $width,
- 'height' => $height,
- 'src' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf'),
- 'flashvars' => $flashvars));
- $object->pushContent($embed);
-
- $html->pushContent($object);
-
- } else {
- $object = HTML::object(array('data' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf'),
- 'type' => "application/x-shockwave-flash",
- 'width' => $width,
- 'height' => $height));
-
- $param = HTML::param(array('name' => "allowfullscreen",
- 'value' => "true"));
- $object->pushContent($param);
-
- $param = HTML::param(array('name' => "allowscriptaccess",
- 'value' => "false"));
- $object->pushContent($param);
-
- $value = "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}";
- $param = HTML::param(array('name' => "flashvars",
- 'value' => $value));
- $object->pushContent($param);
-
- $html->pushContent($object);
- }
- return $html;
+ return HTML();
}
}
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/stdlib.php 2020-12-28 18:58:08 UTC (rev 10209)
@@ -272,7 +272,7 @@
// display apache style icon for file type instead of protocol icon
// - archive: unix:gz,bz2,tgz,tar,z; mac:dmg,dmgz,bin,img,cpt,sit; pc:zip;
// - document: html, htm, text, txt, rtf, pdf, doc
- // - non-inlined image: jpg,jpeg,png,gif,tiff,tif,swf,pict,psd,eps,ps
+ // - non-inlined image: jpg,jpeg,png,gif,tiff,tif,pict,psd,eps,ps
// - audio: mp3,mp2,aiff,aif,au
// - multimedia: mpeg,mpg,mov,qt
} else {
@@ -403,7 +403,7 @@
* Disallows sizes which are too small.
* Spammers may use such (typically invisible) image attributes to raise their GoogleRank.
*
- * Handle embeddable objects, like svg, class, vrml, swf, svgz, pdf, avi, wmv especially.
+ * Handle embeddable objects, like svg, class, vrml, svgz, pdf, avi, wmv especially.
*/
function LinkImage($url, $alt = "")
{
@@ -2080,7 +2080,7 @@
/**
* Returns true if the filename ends with an image suffix.
- * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif|swf"
+ * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif"
*/
function is_image($filename)
{
@@ -2088,7 +2088,7 @@
if (defined('INLINE_IMAGES')) {
$inline_images = INLINE_IMAGES;
} else {
- $inline_images = "png|jpg|jpeg|gif|swf";
+ $inline_images = "png|jpg|jpeg|gif";
}
foreach (explode("|", $inline_images) as $suffix) {
@@ -2101,13 +2101,12 @@
/**
* Returns true if the filename ends with an video suffix.
- * Currently FLV, OGG, MP4 and WebM.
+ * Currently OGG, MP4 and WebM.
*/
function is_video($filename)
{
- return string_ends_with(strtolower($filename), ".flv")
- or string_ends_with(strtolower($filename), ".ogg")
+ return string_ends_with(strtolower($filename), ".ogg")
or string_ends_with(strtolower($filename), ".mp4")
or string_ends_with(strtolower($filename), ".webm");
}
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/Makefile 2020-12-28 18:58:08 UTC (rev 10209)
@@ -773,7 +773,6 @@
${POT_FILE}: .././themes/shamino_com/templates/signin.tmpl
${POT_FILE}: .././themes/shamino_com/templates/top.tmpl
${POT_FILE}: .././themes/shamino_com/themeinfo.php
-${POT_FILE}: .././themes/Sidebar/clock.php
${POT_FILE}: .././themes/Sidebar/hyperapplet.php
${POT_FILE}: .././themes/Sidebar/hyperwiki.php
${POT_FILE}: .././themes/Sidebar/templates/actionbar.tmpl
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/it/pgsrc/NoteDiRilascio 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Thu, 16 Dec 2020 12:01:56 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=NoteDiRilascio;
@@ -13,14 +13,17 @@
Major release:
* PHP 7 compatible
* Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
+* Flash is dead
=== Changes ===
* Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
* Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
* Pear: use ##mysqli## instead of ##mysql##
-* Update Pear DB library to 1.9.3
+* Update PEAR.php to release 1.10.12
+* Update Pear DB library to 1.10.0
+* Update Pear Cache library to 1.5.6
* Replace ##ereg## functions
-* Update Adodb to version 5.20.14
+* Update Adodb to version 5.20.19
* Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com)
* Update highlight.js to version 9.15.6
* Allow Wikicreole syntax for plugins in theme templates
@@ -31,7 +34,6 @@
* Updated pgsrc pages in all languages
* Security fixes
* Adding SPDX-License-Identifier in PHP source files
-* More documentation translation
=== Bugs ===
* Make function IsSafeURL more strict
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/de.po 2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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."
@@ -3359,7 +3359,7 @@
msgid "Rate"
msgstr "Bewerte"
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
msgstr ""
# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/es.po 2020-12-28 18:58:08 UTC (rev 10209)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -3263,7 +3263,7 @@
msgid "Rate"
msgstr ""
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
msgstr ""
msgid "Both 'url' or 'file' parameters missing."
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/fr.po 2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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."
@@ -3334,8 +3334,8 @@
msgid "Rate"
msgstr "Évaluer"
-msgid "Display video in Flash or HTML5."
-msgstr "Afficher une vidéo en Flash ou HTML5."
+msgid "Display video in HTML5."
+msgstr "Afficher une vidéo en HTML5."
msgid "Both 'url' or 'file' parameters missing."
msgstr "Les paramètres « url » et « file » manquent tous les deux."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/it.po 2020-12-28 18:58:08 UTC (rev 10209)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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"
@@ -3240,7 +3240,7 @@
msgid "Rate"
msgstr ""
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
msgstr ""
msgid "Both 'url' or 'file' parameters missing."
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/ja.po 2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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"
@@ -3226,7 +3226,7 @@
msgid "Rate"
msgstr ""
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
msgstr ""
msgid "Both 'url' or 'file' parameters missing."
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/nl.po 2020-12-28 18:58:08 UTC (rev 10209)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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"
@@ -3232,7 +3232,7 @@
msgid "Rate"
msgstr ""
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
msgstr ""
msgid "Both 'url' or 'file' parameters missing."
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/phpwiki.pot 2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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"
@@ -3226,7 +3226,7 @@
msgid "Rate"
msgstr ""
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
msgstr ""
msgid "Both 'url' or 'file' parameters missing."
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/sv.po 2020-12-28 18:58:08 UTC (rev 10209)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -3227,7 +3227,7 @@
msgid "Rate"
msgstr ""
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
msgstr ""
msgid "Both 'url' or 'file' parameters missing."
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/zh.po 2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -3239,7 +3239,7 @@
msgid "Rate"
msgstr ""
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
msgstr ""
msgid "Both 'url' or 'file' parameters missing."
Deleted: trunk/pgsrc/Help%2FAdobe%20Flash
===================================================================
--- trunk/pgsrc/Help%2FAdobe%20Flash 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FAdobe%20Flash 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,76 +0,0 @@
-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=Help%2FAdobe%20Flash;
- flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-You can easily insert **Adobe Flash** (.swf) files in the wiki.
-
-== Uploading Flash files ==
-
-First, Flash files need to be uploaded in the wiki. For that purpose, you will use the
-[[Help:UpLoadPlugin|UpLoad]] plugin.
-
-=== Syntax ===
-
-You give access to the uploaded Flash files with the following syntax.
-
-{{{
-{{myflash.swf}}
-}}}
-or
-{{{
-[[Upload:myflash.swf]]
-}}}
-will inline the image.
-
-=== Options ===
-
-Using the {{{Upload:}}} syntax, options are allowed to change the appearance:
-{{{
-[[Upload:myflash.png size=40x25 align=center]]
-}}}
-
-Separate options by spaces. The allowed options are the following:
-* size: //width "x" height// or //num + "%"//
-* align: //string//
-* border: //number//
-* hspace: //number//
-* vspace: //number//
-
-== Examples ==
-
-=== Wikicreole syntax ===
-
-{{{
-{{ora.swf}}
-}}}
-
-{{/themes/Sidebar/ora.swf}}
-
-=== Upload syntax ===
-
-{{{
-[[Upload:ora.swf]]
-[[Upload:ora.swf size=50x50]]
-}}}
-
-=== URL syntax ===
-
-{{{
-[[http://www.freemahjong.org/mahjong.swf size=1000x600]]
-}}}
-
-[[http://www.freemahjong.org/mahjong.swf size=1000x600]]
-
-== See Also ==
-* [[Help:Images]]
-* [[Help:VideoPlugin]]
-* [[Help:Wikicreole]]
-
-<noinclude>
-----
-[[PhpWikiDocumentation]]
-</noinclude>
Modified: trunk/pgsrc/Help%2FCalendarListPlugin
===================================================================
--- trunk/pgsrc/Help%2FCalendarListPlugin 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FCalendarListPlugin 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sun, 29 Mar 2020 22:43:23 +0000
+Date: Sun, 29 Mar 2020 18:53:38 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FCalendarListPlugin;
Modified: trunk/pgsrc/Help%2FImages
===================================================================
--- trunk/pgsrc/Help%2FImages 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FImages 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sun, 27 Dec 2020 16:52:02 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FImages;
@@ -103,7 +103,6 @@
[[http://phpwiki.demo.free.fr/themes/default/images/poweredby_phpwiki_51x31.png]]
== See Also ==
-* [[Help:Adobe Flash]]
* [[Help:VideoPlugin]]
* [[Help:Wikicreole]]
Modified: trunk/pgsrc/Help%2FPloticusPlugin
===================================================================
--- trunk/pgsrc/Help%2FPloticusPlugin 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FPloticusPlugin 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FPloticusPlugin;
@@ -7,7 +7,7 @@
Content-Transfer-Encoding: binary
The **Ploticus** [[Help:WikiPlugin|plugin]] passes all its arguments to the Ploticus
-binary and displays the result as PNG, GIF, EPS, SVG, SVGZ or SWF.
+binary and displays the result as PNG, GIF, EPS, SVG or SVGZ.
Ploticus is a free, GPL, non-interactive software package
for producing plots, charts, and graphics from data.
See http://ploticus.sourceforge.net/doc/welcome.html
@@ -45,7 +45,7 @@
! Default value
|-
| **device**
-| gif, png, jpeg, svg, svgz, eps, swf. Any -T parameter supported by Ploticus.
+| gif, png, jpeg, svg, svgz, eps. Any -T parameter supported by Ploticus.
| png
|-
| **data**
Modified: trunk/pgsrc/Help%2FTeX2pngPlugin
===================================================================
--- trunk/pgsrc/Help%2FTeX2pngPlugin 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FTeX2pngPlugin 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sun, 29 Mar 2020 22:43:23 +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=Help%2FTeX2pngPlugin;
Modified: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FVideoPlugin 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FVideoPlugin;
@@ -7,12 +7,12 @@
Content-Transfer-Encoding: binary
The **~Video** [[Help:WikiPlugin|plugin]] allows to include video in a wiki page.
-Video file must be encoded in FLV format ([[WikiPedia:Flash Video|Flash Video]]) or in an HTML 5 format:
+Video file must be an HTML 5 format:
* [[WikiPedia:Ogg|Ogg]] (##.ogg## suffix),
* [[WikiPedia:MP4|MP4]] (##.mp4## suffix),
* [[WikiPedia:WebM|WebM]] (##.webm## suffix).
-The Video plugin can also be called with the ~{~{video.flv~}~} syntax.
+The Video plugin can also be called with the ~{~{video.ogg~}~} syntax.
== Arguments ==
@@ -49,17 +49,17 @@
A video:
{{{
-<<Video url=http://a.video.server/a_video.flv>>
+<<Video url=http://a.video.server/a_video.ogg>>
}}}
Another video:
{{{
-<<Video file=another_video.flv>>
+<<Video file=another_video.ogg>>
}}}
This is equivalent to:
{{{
-{{another_video.flv}}
+{{another_video.ogg}}
}}}
=== Big Buck Bunny ===
@@ -76,7 +76,6 @@
== See Also ==
* [[Help:Images]]
-* [[Help:Adobe Flash]]
* [[Help:Wikicreole]]
* [[http://tools.google.com/dlpage/webmmf/|WebM Video for Internet Explorer 9+]]
Modified: trunk/pgsrc/Help%2FWikiPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiPlugin 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FWikiPlugin 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sun, 29 Mar 2020 22:43:23 +0000
+Date: Sun, 29 Mar 2020 19:52:27 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FWikiPlugin;
Modified: trunk/pgsrc/PhpWikiManual
===================================================================
--- trunk/pgsrc/PhpWikiManual 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/PhpWikiManual 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiManual;
@@ -18,7 +18,6 @@
<<IncludePage page="Help/HowToUseWiki">>
<<IncludePage page="FindPage">>
<<IncludePage page="Help/Images">>
-<<IncludePage page="Help/Adobe Flash">>
<<IncludePage page="Help/Categories">>
<<IncludePage page="Help/InterWiki">>
<<IncludePage page="Help/LinkIcons">>
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/ReleaseNotes 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sat, 26 Dec 2020 16:56:04 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -13,12 +13,15 @@
Major release:
* PHP 7 compatible
* Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
+* Flash is dead
=== Changes ===
* Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
* Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
* Pear: use ##mysqli## instead of ##mysql##
+* Update PEAR.php to release 1.10.12
* Update Pear DB library to 1.10.0
+* Update Pear Cache library to 1.5.6
* Replace ##ereg## functions
* Update Adodb to version 5.20.19
* Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com)
Deleted: trunk/themes/Sidebar/clock.php
===================================================================
--- trunk/themes/Sidebar/clock.php 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/themes/Sidebar/clock.php 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright © 2004 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
- *
- */
-
-$ora = isset($GLOBALS['WikiTheme']) ? DATA_PATH . '/' . $GLOBALS['WikiTheme']->_findFile("ora.swf") : "ora.swf";
-?>
-<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
- codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,29,0" width="160"
- height="160" align="middle">
- <param name="movie" value="<?php echo $ora ?>">
- <param name="quality" value="high">
- <embed src="<?php echo $ora ?>" quality="high" type="application/x-shockwave-flash" width="160"
- height="160"></embed>
-</object>
Deleted: trunk/themes/Sidebar/ora.swf
===================================================================
--- trunk/themes/Sidebar/ora.swf 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/themes/Sidebar/ora.swf 2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,6 +0,0 @@
-FWS\xB6-V\xB9P\xA1-\ No newline at end of file
Modified: trunk/themes/blog/templates/top.tmpl
===================================================================
--- trunk/themes/blog/templates/top.tmpl 2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/themes/blog/templates/top.tmpl 2020-12-28 18:58:08 UTC (rev 10209)
@@ -2,7 +2,7 @@
<div id="header">
<?php if ( $request->getArg('action') == 'browse' ) { ?>
<div id="yoursiteheader">
-<?php // Insert Flash or Logo here ?>
+<?php // Insert Logo here ?>
<a href=""><?php echo WIKI_NAME ?></a>
</div>
<?php } ?>
Deleted: trunk/themes/default/flowplayer-3.2.4.swf
===================================================================
(Binary files differ)
Deleted: trunk/themes/default/flowplayer.controls-3.2.2.swf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2020-12-28 21:15:26
|
Revision: 10211
http://sourceforge.net/p/phpwiki/code/10211
Author: vargenau
Date: 2020-12-28 21:15:19 +0000 (Mon, 28 Dec 2020)
Log Message:
-----------
Update translations
Modified Paths:
--------------
trunk/lib/plugin/Video.php
trunk/locale/fr/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
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/lib/plugin/Video.php 2020-12-28 21:15:19 UTC (rev 10211)
@@ -102,7 +102,7 @@
}
return $video;
}
- return HTML::span(array('class' => 'error'),
+ return HTML::span(array('class' => 'error'),
_("Unknown video format"));
}
}
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/de.po 2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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."
@@ -3372,6 +3372,9 @@
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
+msgid "Unknown video format"
+msgstr ""
+
msgid ""
"Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
"from graphviz."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/es.po 2020-12-28 21:15:19 UTC (rev 10211)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -3275,6 +3275,9 @@
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
+msgid "Unknown video format"
+msgstr ""
+
msgid ""
"Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
"from graphviz."
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/fr.po 2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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."
@@ -3346,6 +3346,9 @@
msgid "Your browser does not understand the HTML 5 video tag."
msgstr "Votre navigateur ne reconnaît pas la balise video du HTML 5."
+msgid "Unknown video format"
+msgstr "Format vidéo inconnu"
+
msgid ""
"Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
"from graphviz."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/it.po 2020-12-28 21:15:19 UTC (rev 10211)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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"
@@ -3252,6 +3252,9 @@
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
+msgid "Unknown video format"
+msgstr ""
+
msgid ""
"Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
"from graphviz."
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/ja.po 2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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"
@@ -3238,6 +3238,9 @@
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
+msgid "Unknown video format"
+msgstr ""
+
msgid ""
"Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
"from graphviz."
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/nl.po 2020-12-28 21:15:19 UTC (rev 10211)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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"
@@ -3244,6 +3244,9 @@
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
+msgid "Unknown video format"
+msgstr ""
+
msgid ""
"Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
"from graphviz."
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/phpwiki.pot 2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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"
@@ -3238,6 +3238,9 @@
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
+msgid "Unknown video format"
+msgstr ""
+
msgid ""
"Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
"from graphviz."
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/sv.po 2020-12-28 21:15:19 UTC (rev 10211)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -3239,6 +3239,9 @@
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
+msgid "Unknown video format"
+msgstr ""
+
msgid ""
"Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
"from graphviz."
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/zh.po 2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -3251,6 +3251,9 @@
msgid "Your browser does not understand the HTML 5 video tag."
msgstr ""
+msgid "Unknown video format"
+msgstr ""
+
msgid ""
"Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
"from graphviz."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-01-02 20:28:07
|
Revision: 10219
http://sourceforge.net/p/phpwiki/code/10219
Author: vargenau
Date: 2021-01-02 20:28:05 +0000 (Sat, 02 Jan 2021)
Log Message:
-----------
Internet Explorer is dead
Modified Paths:
--------------
trunk/README
trunk/lib/config.php
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/pgsrc/ReleaseNotes
trunk/themes/Crao/crao.css
trunk/themes/Crao/templates/actionbar.tmpl
trunk/themes/MonoBook/themeinfo.php
trunk/themes/blog/Kubrick.css
trunk/themes/blog/templates/sidebar.tmpl
Modified: trunk/README
===================================================================
--- trunk/README 2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/README 2021-01-02 20:28:05 UTC (rev 10219)
@@ -13,7 +13,7 @@
* Opera >= 8
* Chrome >= 6
* Konqueror >= 3.5
-* Internet Explorer >= 9
+* Edge
Additional docs:
Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php 2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/lib/config.php 2021-01-02 20:28:05 UTC (rev 10219)
@@ -58,34 +58,6 @@
}
/**
- * Browser Detection Functions
- *
- * @author: Reini Urban
- */
-function browserAgent()
-{
- static $HTTP_USER_AGENT = false;
- if ($HTTP_USER_AGENT !== false) return $HTTP_USER_AGENT;
- if (!$HTTP_USER_AGENT)
- $HTTP_USER_AGENT = @$GLOBALS['HTTP_SERVER_VARS']['HTTP_USER_AGENT'];
- if (!$HTTP_USER_AGENT) // CGI
- $HTTP_USER_AGENT = @$GLOBALS['HTTP_ENV_VARS']['HTTP_USER_AGENT'];
- if (!$HTTP_USER_AGENT) // local CGI testing
- $HTTP_USER_AGENT = 'none';
- return $HTTP_USER_AGENT;
-}
-
-function browserDetect($match)
-{
- return (strpos(strtolower(browserAgent()), strtolower($match)) !== false);
-}
-
-function isBrowserIE()
-{
- return (browserDetect('Mozilla/') and browserDetect('MSIE'));
-}
-
-/**
* If $LANG is undefined:
* Smart client language detection, based on our supported languages
* HTTP_ACCEPT_LANGUAGE="de-at,en;q=0.5"
Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio 2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/locale/it/pgsrc/NoteDiRilascio 2021-01-02 20:28:05 UTC (rev 10219)
@@ -1,4 +1,4 @@
-Date: Mon, 28 Dec 2020 19:46:14 +0000
+Date: Sat, 2 Jan 2021 19:46:14 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=NoteDiRilascio;
@@ -14,10 +14,11 @@
* PHP 7 compatible
* Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
* Flash is dead
+* Internet Explorer is dead
=== Changes ===
* Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
-* Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
+* Update jQuery to 2.2.4
* Pear: use ##mysqli## instead of ##mysql##
* Update PEAR.php to release 1.10.12
* Update Pear DB library to 1.10.0
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/pgsrc/ReleaseNotes 2021-01-02 20:28:05 UTC (rev 10219)
@@ -1,4 +1,4 @@
-Date: Mon, 28 Dec 2020 19:46:14 +0000
+Date: Sat, 2 Jan 2021 19:46:14 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -14,10 +14,11 @@
* PHP 7 compatible
* Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
* Flash is dead
+* Internet Explorer is dead
=== Changes ===
* Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
-* Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
+* Update jQuery to 2.2.4
* Pear: use ##mysqli## instead of ##mysql##
* Update PEAR.php to release 1.10.12
* Update Pear DB library to 1.10.0
Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css 2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/Crao/crao.css 2021-01-02 20:28:05 UTC (rev 10219)
@@ -186,28 +186,8 @@
******************************
*****ACTION-BUTTONS
******************************
- with special IE fix
*/
-div.ie-actionbuttons {
- position: relative;
- height: 22px;
- right: 0;
- bottom: 0;
- margin: 0;
- background-color: transparent;
- background-image: url(images/BG.png);
- background-repeat: no-repeat;
- background-position: top right;
- text-align: right;
- vertical-align: bottom;
- padding-left: 2em;
- padding-right: 1em;
- padding-top: 0.5ex;
- padding-bottom: 0.5ex;
- border: 0 none;
-}
-
#actionbuttons {
position: fixed;
max-width: 30%;
Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl 2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/Crao/templates/actionbar.tmpl 2021-01-02 20:28:05 UTC (rev 10219)
@@ -6,11 +6,7 @@
$EditB = Button("viewsource", _("View Source"));
if (empty($revision)) $revision = $page->getCurrentRevision(false);
?>
-<?php if (isBrowserIE()) { ?>
-<div class="ie-actionbuttons">
-<?php } else { ?>
<div id="actionbuttons">
-<?php } ?>
<?php echo $EditB ?>
<?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
<?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php 2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/MonoBook/themeinfo.php 2021-01-02 20:28:05 UTC (rev 10219)
@@ -34,9 +34,6 @@
* Mediawiki 'monobook' style sheet for CSS2-capable browsers.
* Copyright Gabriel Wicke - http://www.aulinx.de/
* See main.css for more.
- *
- * Problems with IE: signin is at the left.
- *
*/
require_once 'lib/WikiTheme.php';
require_once 'themes/wikilens/themeinfo.php';
Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css 2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/blog/Kubrick.css 2021-01-02 20:28:05 UTC (rev 10219)
@@ -289,24 +289,6 @@
color: black;
}
-#moz-sidebar {
- font: 1em 'Lucida Grande', Verdana, Arial, sans-serif;
- margin-left: 560px;
- position: absolute;
- z-index: 2;
- top: 270px;
- /* top, right, bottom, left */
- padding: 0 10px 10px 0;
- width: 155px;
- background: white;
-}
-
-#moz-sidebar ul li {
- list-style-type: square;
- padding-left: 0;
- text-indent: 0;
-}
-
#sidebar form {
margin: 0;
}
@@ -527,11 +509,8 @@
/* End Images */
-/* Begin Lists
+/* Begin Lists */
- Special stylized non-IE bullets
- Do not work in Internet Explorer, which merely default to normal bullets. */
-
html>body ul {
margin-left: 0;
padding: 0 0 0 30px;
Modified: trunk/themes/blog/templates/sidebar.tmpl
===================================================================
--- trunk/themes/blog/templates/sidebar.tmpl 2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/blog/templates/sidebar.tmpl 2021-01-02 20:28:05 UTC (rev 10219)
@@ -1,8 +1,5 @@
+<div id="sidebar">
<?php
-$id = isBrowserIE() ? 'sidebar' : 'moz-sidebar';
-?>
-<div id="<?php echo $id?>">
-<?php
/* Today's Blogs page for the current or admin user, if the subpage is defined. */
$UserCalPageTitle = $user->getId() . '/' . _("Blog");
$dbi = $request->getDbh();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-01-04 08:55:28
|
Revision: 10222
http://sourceforge.net/p/phpwiki/code/10222
Author: vargenau
Date: 2021-01-04 08:55:25 +0000 (Mon, 04 Jan 2021)
Log Message:
-----------
Better time and date formats: 24-hour time, day month year
Modified Paths:
--------------
trunk/lib/WikiTheme.php
trunk/themes/Crao/themeinfo.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Portland/themeinfo.php
trunk/themes/Sidebar/themeinfo.php
trunk/themes/Wordpress/themeinfo.php
trunk/themes/blog/themeinfo.php
trunk/themes/shamino_com/themeinfo.php
trunk/themes/wikilens/themeinfo.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/lib/WikiTheme.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -353,8 +353,8 @@
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_strftime.2c_.wcsftime.asp
// As a result, we have to use %d, and strip out leading zeros ourselves.
- private $dateFormat = "%B %d, %Y";
- private $timeFormat = "%I:%M %p";
+ private $dateFormat = "%d %B %Y";
+ private $timeFormat = "%H:%M";
private $showModTime = true;
/**
@@ -407,7 +407,7 @@
}
/**
- * Format a date.
+ * Format a time.
*
* Any time zone offset specified in the users preferences is
* taken into account by this method.
@@ -1485,14 +1485,14 @@
* $this->setDateFormat("%x");
* $this->setTimeFormat("%X");
*/
- //$this->setDateFormat("%B %d, %Y");
- //$this->setTimeFormat("%I:%M %p");
+ //$this->setDateFormat("%d %B %Y");
+ //$this->setTimeFormat("%H:%M");
/*
* To suppress times in the "Last edited on" messages, give a
* give a second argument of false:
*/
- //$this->setDateFormat("%B %d, %Y", false);
+ //$this->setDateFormat("%d %B %Y", false);
/*
* Custom UserPreferences:
Modified: trunk/themes/Crao/themeinfo.php
===================================================================
--- trunk/themes/Crao/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Crao/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -85,14 +85,14 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- //$this->setDateFormat("%B %d, %Y");
- //$this->setTimeFormat("%I:%M %p");
+ //$this->setDateFormat("%d %B %Y");
+ //$this->setTimeFormat("%H:%M");
/*
* To suppress times in the "Last edited on" messages, give a
* give a second argument of false:
*/
- //$this->setDateFormat("%B %d, %Y", false);
+ //$this->setDateFormat("%d %B %Y", false);
$this->setDateFormat("%A %e %B %Y"); // must not contain time
//$this->setDateFormat("%x"); // must not contain time
$this->setTimeFormat("%H:%M:%S");
Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Hawaiian/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -110,7 +110,7 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- //$this->setDateFormat("%B %d, %Y"); // must not contain time
+ //$this->setDateFormat("%d %B %Y"); // must not contain time
}
}
Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/MacOSX/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -176,8 +176,8 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- $this->setDateFormat("%A, %B %d, %Y"); // must not contain time
- $this->setTimeFormat("%I:%M:%S %p");
+ $this->setDateFormat("%A, %d %B %Y"); // must not contain time
+ $this->setTimeFormat("%H:%M:%S");
}
}
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/MonoBook/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -138,7 +138,7 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- $this->setDateFormat("%B %d, %Y");
+ $this->setDateFormat("%d %B %Y");
$this->setTimeFormat("%H:%M");
/*
@@ -145,7 +145,7 @@
* To suppress times in the "Last edited on" messages, give a
* give a second argument of false:
*/
- //$this->setDateFormat("%B %d, %Y", false);
+ //$this->setDateFormat("%d %B %Y", false);
}
}
Modified: trunk/themes/Portland/themeinfo.php
===================================================================
--- trunk/themes/Portland/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Portland/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -124,7 +124,7 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- $this->setDateFormat("%B %d, %Y", false);
+ $this->setDateFormat("%d %B %Y", false);
}
}
Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Sidebar/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -197,7 +197,7 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- //$this->setDateFormat("%B %d, %Y");
+ //$this->setDateFormat("%d %B %Y");
/**
* Custom UserPreferences:
Modified: trunk/themes/Wordpress/themeinfo.php
===================================================================
--- trunk/themes/Wordpress/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Wordpress/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -123,7 +123,7 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- $this->setDateFormat("%B %d, %Y", false);
+ $this->setDateFormat("%d %B %Y", false);
}
}
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/blog/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -183,8 +183,8 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- //$this->setDateFormat("%B %d, %Y");
- $this->setDateFormat("%A, %B %e, %Y"); // must not contain time
+ //$this->setDateFormat("%d %B %Y");
+ $this->setDateFormat("%A, %e %B %Y"); // must not contain time
$this->setTimeFormat("%H:%M:%S");
}
}
Modified: trunk/themes/shamino_com/themeinfo.php
===================================================================
--- trunk/themes/shamino_com/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/shamino_com/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -122,7 +122,7 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- $this->setDateFormat("%B %d, %Y");
+ $this->setDateFormat("%d %B %Y");
$this->setTimeFormat("%H:%M");
/*
@@ -129,7 +129,7 @@
* To suppress times in the "Last edited on" messages, give a
* give a second argument of false:
*/
- //$this->setDateFormat("%B %d, %Y", false);
+ //$this->setDateFormat("%d %B %Y", false);
}
}
Modified: trunk/themes/wikilens/themeinfo.php
===================================================================
--- trunk/themes/wikilens/themeinfo.php 2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/wikilens/themeinfo.php 2021-01-04 08:55:25 UTC (rev 10222)
@@ -105,7 +105,7 @@
* Do not include the server's zone (%Z), times are converted to the
* user's time zone.
*/
- $this->setDateFormat("%B %d, %Y");
+ $this->setDateFormat("%d %B %Y");
$this->setTimeFormat("%H:%M");
/*
@@ -112,7 +112,7 @@
* To suppress times in the "Last edited on" messages, give a
* give a second argument of false:
*/
- //$this->setDateFormat("%B %d, %Y", false);
+ //$this->setDateFormat("%d %B %Y", false);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-01-07 17:20:02
|
Revision: 10232
http://sourceforge.net/p/phpwiki/code/10232
Author: vargenau
Date: 2021-01-07 17:19:50 +0000 (Thu, 07 Jan 2021)
Log Message:
-----------
lib/plugin/DebugBackendInfo.php: check "notallversions" is a boolean; update help page
Modified Paths:
--------------
trunk/lib/plugin/DebugBackendInfo.php
trunk/pgsrc/Help%2FDebugBackendInfoPlugin
Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php 2021-01-07 15:45:54 UTC (rev 10231)
+++ trunk/lib/plugin/DebugBackendInfo.php 2021-01-07 17:19:50 UTC (rev 10232)
@@ -39,7 +39,7 @@
function getDefaultArguments()
{
return array('page' => '[pagename]',
- 'notallversions' => 0);
+ 'notallversions' => false);
}
/**
@@ -62,8 +62,16 @@
$request->_notAuthorized(WIKIAUTH_ADMIN);
$this->disabled("! user->isAdmin");
}
- if (empty($page))
+ if (empty($page)) {
return $this->error("page missing");
+ }
+ if (($notallversions == '0') || ($notallversions == 'false')) {
+ $notallversions = false;
+ } elseif (($notallversions == '1') || ($notallversions == 'true')) {
+ $notallversions = true;
+ } else {
+ return $this->error(_("Argument 'notallversions' must be a boolean"));
+ }
$backend = &$dbi->_backend;
$this->chunk_split = true;
@@ -81,7 +89,7 @@
$this->_fixupData($pagedata);
$table->pushContent($this->_showhash("get_pagedata('$page')", $pagedata));
}
- if (!$notallversions) {
+ if ($notallversions) {
$version = $backend->get_latest_version($page);
$vdata = $backend->get_versiondata($page, $version, true);
$this->_fixupData($vdata);
Modified: trunk/pgsrc/Help%2FDebugBackendInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FDebugBackendInfoPlugin 2021-01-07 15:45:54 UTC (rev 10231)
+++ trunk/pgsrc/Help%2FDebugBackendInfoPlugin 2021-01-07 17:19:50 UTC (rev 10232)
@@ -1,4 +1,4 @@
-Date: Fri, 26 Apr 2019 14:58:16 +0000
+Date: Thu, 7 Jan 2021 14:58:16 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FDebugBackendInfoPlugin;
@@ -32,8 +32,8 @@
| Current pagename
|-
| **notallversions**
-|
-| 0
+| Boolean. If true, only display information for the last version of the page
+| false
|}
== Example ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-01-08 17:27:02
|
Revision: 10234
http://sourceforge.net/p/phpwiki/code/10234
Author: vargenau
Date: 2021-01-08 17:26:59 +0000 (Fri, 08 Jan 2021)
Log Message:
-----------
Make error message generic
Modified Paths:
--------------
trunk/lib/plugin/DebugBackendInfo.php
trunk/locale/fr/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
Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/lib/plugin/DebugBackendInfo.php 2021-01-08 17:26:59 UTC (rev 10234)
@@ -70,7 +70,7 @@
} elseif (($notallversions == '1') || ($notallversions == 'true')) {
$notallversions = true;
} else {
- return $this->error(_("Argument 'notallversions' must be a boolean"));
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "notallversions"));
}
$backend = &$dbi->_backend;
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/de.po 2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+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."
@@ -1568,7 +1568,8 @@
msgid "Get debugging information for %s."
msgstr "Debug-Informationen von %s."
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
msgstr ""
#, php-format
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/es.po 2021-01-08 17:26:59 UTC (rev 10234)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -1539,7 +1539,8 @@
msgid "Get debugging information for %s."
msgstr ""
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
msgstr ""
#, php-format
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/fr.po 2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+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."
@@ -1561,8 +1561,9 @@
msgid "Get debugging information for %s."
msgstr "Obtenir des informations de débogage pour %s."
-msgid "Argument 'notallversions' must be a boolean"
-msgstr "L'argument 'notallversions' doit être un booléen"
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr "L'argument '%s' doit être un booléen"
#, php-format
msgid "Querying backend directly for “%s”"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/it.po 2021-01-08 17:26:59 UTC (rev 10234)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+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"
@@ -1522,7 +1522,8 @@
msgid "Get debugging information for %s."
msgstr ""
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
msgstr ""
#, php-format
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/ja.po 2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+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"
@@ -1508,7 +1508,8 @@
msgid "Get debugging information for %s."
msgstr ""
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
msgstr ""
#, php-format
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/nl.po 2021-01-08 17:26:59 UTC (rev 10234)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+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"
@@ -1514,7 +1514,8 @@
msgid "Get debugging information for %s."
msgstr ""
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
msgstr ""
#, php-format
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/phpwiki.pot 2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+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"
@@ -1508,7 +1508,8 @@
msgid "Get debugging information for %s."
msgstr ""
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
msgstr ""
#, php-format
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/sv.po 2021-01-08 17:26:59 UTC (rev 10234)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -1509,7 +1509,8 @@
msgid "Get debugging information for %s."
msgstr ""
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
msgstr ""
#, php-format
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2021-01-07 17:26:41 UTC (rev 10233)
+++ trunk/locale/po/zh.po 2021-01-08 17:26:59 UTC (rev 10234)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:25+0100\n"
+"POT-Creation-Date: 2021-01-08 18:24+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -1513,7 +1513,8 @@
msgid "Get debugging information for %s."
msgstr "為 %s 取得除錯資訊."
-msgid "Argument 'notallversions' must be a boolean"
+#, php-format
+msgid "Argument '%s' must be a boolean"
msgstr ""
#, php-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-01-16 17:56:37
|
Revision: 10238
http://sourceforge.net/p/phpwiki/code/10238
Author: vargenau
Date: 2021-01-16 17:56:34 +0000 (Sat, 16 Jan 2021)
Log Message:
-----------
Remove USE_SAFE_DBSESSION
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/doc/INSTALL.mssqlnative
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession.php
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/config/config-default.ini 2021-01-16 17:56:34 UTC (rev 10238)
@@ -17,7 +17,6 @@
ENABLE_SPAMBLOCKLIST = false
GOOGLE_LINKS_NOFOLLOW = true
NUM_SPAM_LINKS = 20
-USE_SAFE_DBSESSION = false
ENABLE_DISCUSSION_LINK = false
ENABLE_CAPTCHA = false
ENABLE_MAILNOTIFY = true
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/config/config-dist.ini 2021-01-16 17:56:34 UTC (rev 10238)
@@ -138,12 +138,6 @@
; Captcha will use a random word, otherwise a dictionary word.
;USE_CAPTCHA_RANDOM_WORD = false
-; USE_SAFE_DBSESSION should be enabled, if you encounter session problems, with
-; duplicate INSERT sess_id warnings at the bottom of the page. Reason is a
-; unreliable affected_rows implementation() in the sql backend.
-; Default is Disabled, using the fastest DbSession UPDATE method.
-;USE_SAFE_DBSESSION = false
-
; If true don't use UserName/Blog/day/time pagenames for the ADMIN_USER, but
; Blog/day/time only. Convenience for a single-user blog theme.
;BLOG_DEFAULT_EMPTY_PREFIX = true
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/configurator.php 2021-01-16 17:56:34 UTC (rev 10238)
@@ -465,9 +465,6 @@
$properties["USE_CAPTCHA_RANDOM_WORD"] =
new boolean_define_commented_optional('USE_CAPTCHA_RANDOM_WORD');
-$properties["USE_SAFE_DBSESSION"] =
- new boolean_define_commented_optional('USE_SAFE_DBSESSION');
-
$properties["BLOG_DEFAULT_EMPTY_PREFIX"] =
new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX');
Modified: trunk/doc/INSTALL.mssqlnative
===================================================================
--- trunk/doc/INSTALL.mssqlnative 2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/doc/INSTALL.mssqlnative 2021-01-16 17:56:34 UTC (rev 10238)
@@ -43,7 +43,6 @@
have to edit schemas/sqlsrv-initialize.sql before you perform step
three (above). You might also edit schemas/sqlsrv-destroy.sql at the
same time, so you don't forget.
- d) USE_SAFE_DBSESSION should be set to 'true'
Note: DATABASE_DIRECTORY and DATABASE_DBA_HANDLER are ignored for mssql.
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php 2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/lib/DbSession/ADODB.php 2021-01-16 17:56:34 UTC (rev 10238)
@@ -172,26 +172,10 @@
$sess_data = base64_encode($sess_data);
$qdata = $dbh->qstr($sess_data);
- /* AffectedRows with sessions seems to be instable on certain platforms.
- * Enable the safe and slow USE_SAFE_DBSESSION then.
- */
- if (USE_SAFE_DBSESSION) {
- $dbh->Execute("DELETE FROM $table"
- . " WHERE sess_id=$qid");
- $rs = $dbh->Execute("INSERT INTO $table"
+ $dbh->execute("DELETE FROM $table WHERE sess_id=$qid");
+ $rs = $dbh->execute("INSERT INTO $table"
. " (sess_id, sess_data, sess_date, sess_ip)"
. " VALUES ($qid, $qdata, $time, $qip)");
- } else {
- $rs = $dbh->Execute("UPDATE $table"
- . " SET sess_data=$qdata, sess_date=$time, sess_ip=$qip"
- . " WHERE sess_id=$qid");
- $result = $dbh->Affected_Rows();
- if ($result === false or $result < 1) { // false or int > 0
- $rs = $dbh->Execute("INSERT INTO $table"
- . " (sess_id, sess_data, sess_date, sess_ip)"
- . " VALUES ($qid, $qdata, $time, $qip)");
- }
- }
$result = !$rs->EOF;
if ($result) $rs->free();
$this->_disconnect();
Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php 2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/lib/DbSession/PDO.php 2021-01-16 17:56:34 UTC (rev 10238)
@@ -168,46 +168,21 @@
if (is_a($dbh, 'ADODB_postgres64'))
$sess_data = base64_encode($sess_data);
- /* AffectedRows with sessions seems to be unstable on certain platforms.
- * Enable the safe and slow USE_SAFE_DBSESSION then.
- */
- if (USE_SAFE_DBSESSION) {
- $this->_backend->beginTransaction();
- $delete = $this->prepare("DELETE FROM $table"
- . " WHERE sess_id=?");
- $delete->bindParam(1, $id, PDO::PARAM_STR, 32);
- $delete->execute();
- $sth = $dbh->prepare("INSERT INTO $table"
- . " (sess_id, sess_data, sess_date, sess_ip)"
- . " VALUES (?, ?, ?, ?)");
- $sth->bindParam(1, $id, PDO::PARAM_STR, 32);
- $sth->bindParam(2, $sess_data, PDO::PARAM_LOB);
- $sth->bindParam(3, $time, PDO::PARAM_INT);
- $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
- if ($result = $sth->execute()) {
- $this->_backend->commit();
- } else {
- $this->_backend->rollBack();
- }
+ $this->_backend->beginTransaction();
+ $delete = $this->prepare("DELETE FROM $table WHERE sess_id=?");
+ $delete->bindParam(1, $id, PDO::PARAM_STR, 32);
+ $delete->execute();
+ $sth = $dbh->prepare("INSERT INTO $table"
+ . " (sess_id, sess_data, sess_date, sess_ip)"
+ . " VALUES (?, ?, ?, ?)");
+ $sth->bindParam(1, $id, PDO::PARAM_STR, 32);
+ $sth->bindParam(2, $sess_data, PDO::PARAM_LOB);
+ $sth->bindParam(3, $time, PDO::PARAM_INT);
+ $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
+ if ($result = $sth->execute()) {
+ $this->_backend->commit();
} else {
- $sth = $dbh->prepare("UPDATE $table"
- . " SET sess_data=?, sess_date=?, sess_ip=?"
- . " WHERE sess_id=?");
- $sth->bindParam(1, $sess_data, PDO::PARAM_LOB);
- $sth->bindParam(2, $time, PDO::PARAM_INT);
- $sth->bindParam(3, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
- $sth->bindParam(4, $id, PDO::PARAM_STR, 32);
- $result = $sth->execute(); // implicit affected rows
- if ($result === false or $result < 1) { // false or int > 0
- $sth = $dbh->prepare("INSERT INTO $table"
- . " (sess_id, sess_data, sess_date, sess_ip)"
- . " VALUES (?, ?, ?, ?)");
- $sth->bindParam(1, $id, PDO::PARAM_STR, 32);
- $sth->bindParam(2, $sess_data, PDO::PARAM_LOB);
- $sth->bindParam(3, $time, PDO::PARAM_INT);
- $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
- $result = $sth->execute();
- }
+ $this->_backend->rollBack();
}
$this->_disconnect();
return $result;
Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php 2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/lib/DbSession/SQL.php 2021-01-16 17:56:34 UTC (rev 10238)
@@ -178,26 +178,10 @@
$sess_data = base64_encode($sess_data);
$qdata = $dbh->quote($sess_data);
- /* AffectedRows with sessions seems to be unstable on certain platforms.
- * Enable the safe and slow USE_SAFE_DBSESSION then.
- */
- if (USE_SAFE_DBSESSION) {
- $dbh->query("DELETE FROM $table"
- . " WHERE sess_id=$qid");
- $res = $dbh->query("INSERT INTO $table"
- . " (sess_id, sess_data, sess_date, sess_ip)"
- . " VALUES ($qid, $qdata, $time, $qip)");
- } else {
- $res = $dbh->query("UPDATE $table"
- . " SET sess_data=$qdata, sess_date=$time, sess_ip=$qip"
- . " WHERE sess_id=$qid");
- $result = $dbh->AffectedRows();
- if ($result === false or $result < 1) { // 0 cannot happen: time, -1 (failure) on mysql
- $res = $dbh->query("INSERT INTO $table"
- . " (sess_id, sess_data, sess_date, sess_ip)"
- . " VALUES ($qid, $qdata, $time, $qip)");
- }
- }
+ $dbh->query("DELETE FROM $table WHERE sess_id=$qid");
+ $res = $dbh->query("INSERT INTO $table"
+ . " (sess_id, sess_data, sess_date, sess_ip)"
+ . " VALUES ($qid, $qdata, $time, $qip)");
$this->_disconnect();
return !DB::isError($res);
}
Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php 2021-01-16 17:44:56 UTC (rev 10237)
+++ trunk/lib/DbSession.php 2021-01-16 17:56:34 UTC (rev 10238)
@@ -33,7 +33,6 @@
* Quasi-major rewrite/decruft/fix by Jeff Dairiki <da...@da...>.
* ADODB, dba and PDO classes by Reini Urban.
*
- * Warning: Enable USE_SAFE_DBSESSION if you get INSERT duplicate id warnings.
*/
class DbSession
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-02-22 12:21:42
|
Revision: 10248
http://sourceforge.net/p/phpwiki/code/10248
Author: vargenau
Date: 2021-02-22 12:21:40 +0000 (Mon, 22 Feb 2021)
Log Message:
-----------
plugin RandomPage: better test boolean arguments "redirect" and "hidename"
Modified Paths:
--------------
trunk/lib/plugin/RandomPage.php
trunk/pgsrc/Help%2FRandomPagePlugin
Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php 2021-02-22 12:18:57 UTC (rev 10247)
+++ trunk/lib/plugin/RandomPage.php 2021-02-22 12:21:40 UTC (rev 10248)
@@ -63,6 +63,22 @@
$args = $this->getArgs($argstr, $request);
extract($args);
+ if (($redirect == '0') || ($redirect == 'false')) {
+ $redirect = false;
+ } elseif (($redirect == '1') || ($redirect == 'true')) {
+ $redirect = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "redirect"));
+ }
+
+ if (($hidename == '0') || ($hidename == 'false')) {
+ $hidename = false;
+ } elseif (($hidename == '1') || ($hidename == 'true')) {
+ $hidename = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "hidename"));
+ }
+
// Redirect would break HTML dump
if ($request->getArg('action') != 'browse') {
return $this->disabled(_("Plugin not run: not in browse mode"));
Modified: trunk/pgsrc/Help%2FRandomPagePlugin
===================================================================
--- trunk/pgsrc/Help%2FRandomPagePlugin 2021-02-22 12:18:57 UTC (rev 10247)
+++ trunk/pgsrc/Help%2FRandomPagePlugin 2021-02-22 12:21:40 UTC (rev 10248)
@@ -1,4 +1,4 @@
-Date: Tue, 9 Apr 2019 14:13:17 +0000
+Date: Mon, 22 Feb 2021 13:05:38 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FRandomPagePlugin;
@@ -28,9 +28,13 @@
| 20
|-
| **redirect**
-| Do not display random page link, redirect to random page.
-| empty
+| Boolean. If true, do not display random page link, redirect to random page.
+| false
|-
+| **hidename**
+| Boolean. If true, hide name (only for numpages=1)
+| false
+|-
| **exclude**
| Pages to exclude from random
| RandomPage, HomePage, AllPages, RecentChanges, RecentEdits, FullRecentChanges
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-02-23 08:07:23
|
Revision: 10266
http://sourceforge.net/p/phpwiki/code/10266
Author: vargenau
Date: 2021-02-23 08:07:16 +0000 (Tue, 23 Feb 2021)
Log Message:
-----------
plugin SearchHighlight: better test boolean argument "case_exact"
Modified Paths:
--------------
trunk/lib/plugin/SearchHighlight.php
trunk/pgsrc/Help%2FSearchHighlightPlugin
Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php 2021-02-22 20:47:09 UTC (rev 10265)
+++ trunk/lib/plugin/SearchHighlight.php 2021-02-23 08:07:16 UTC (rev 10266)
@@ -71,6 +71,15 @@
return HTML();
}
extract($args);
+
+ if (($case_exact == '0') || ($case_exact == 'false')) {
+ $case_exact = false;
+ } elseif (($case_exact == '1') || ($case_exact == 'true')) {
+ $case_exact = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "case_exact"));
+ }
+
$html = HTML();
if (!$noheader and isset($request->_searchhighlight)) {
$engine = $request->_searchhighlight['engine'];
Modified: trunk/pgsrc/Help%2FSearchHighlightPlugin
===================================================================
--- trunk/pgsrc/Help%2FSearchHighlightPlugin 2021-02-22 20:47:09 UTC (rev 10265)
+++ trunk/pgsrc/Help%2FSearchHighlightPlugin 2021-02-23 08:07:16 UTC (rev 10266)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Tue, 23 Feb 2021 09:05:00 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FSearchHighlightPlugin;
@@ -26,11 +26,11 @@
| //none//
|-
| **case_exact**
-| Boolean
+| Boolean. If true, highlight only case exact searches.
| false
|-
| **regex**
-| Boolean
+| not yet supported
| false
|}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-02-23 08:19:48
|
Revision: 10267
http://sourceforge.net/p/phpwiki/code/10267
Author: vargenau
Date: 2021-02-23 08:19:43 +0000 (Tue, 23 Feb 2021)
Log Message:
-----------
plugin SemanticRelations: better test boolean arguments "noheader" and "nohelp"
Modified Paths:
--------------
trunk/lib/plugin/SemanticRelations.php
trunk/pgsrc/Help%2FSemanticRelationsPlugin
Modified: trunk/lib/plugin/SemanticRelations.php
===================================================================
--- trunk/lib/plugin/SemanticRelations.php 2021-02-23 08:07:16 UTC (rev 10266)
+++ trunk/lib/plugin/SemanticRelations.php 2021-02-23 08:19:43 UTC (rev 10267)
@@ -63,6 +63,23 @@
global $WikiTheme;
$args = $this->getArgs($argstr, $request);
extract($args);
+
+ 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 (($nohelp == '0') || ($nohelp == 'false')) {
+ $nohelp = false;
+ } elseif (($nohelp == '1') || ($nohelp == 'true')) {
+ $nohelp = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "nohelp"));
+ }
+
if (empty($page))
$page = $request->getArg('pagename');
$relhtml = HTML();
Modified: trunk/pgsrc/Help%2FSemanticRelationsPlugin
===================================================================
--- trunk/pgsrc/Help%2FSemanticRelationsPlugin 2021-02-23 08:07:16 UTC (rev 10266)
+++ trunk/pgsrc/Help%2FSemanticRelationsPlugin 2021-02-23 08:19:43 UTC (rev 10267)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 19:16:32 +0000
+Date: Tue, 23 Feb 2021 09:16:17 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FSemanticRelationsPlugin;
@@ -34,8 +34,8 @@
| All
|-
| **units**
+| Not yet implemented.
|
-|
|-
| **noheader**
| Boolean. If true, header should be omitted.
@@ -42,11 +42,10 @@
| false
|-
| **nohelp**
-|
+| Boolean. If true, do not display help.
| false
|}
-
== Example ==
{{{
@@ -59,6 +58,8 @@
* [[Help:Reini Urban|Reini Urban]]
== See Also ==
+* [[SemanticRelations]], [[ListRelations]], [[SemanticSearch]]
+* [[Help:SemanticSearchPlugin|SemanticSearchPlugin]]
<noinclude>
----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-02-23 08:31:02
|
Revision: 10268
http://sourceforge.net/p/phpwiki/code/10268
Author: vargenau
Date: 2021-02-23 08:30:59 +0000 (Tue, 23 Feb 2021)
Log Message:
-----------
plugin SemanticSearchAdvanced: better test boolean arguments "case_exact", "noheader" and "noform"
Modified Paths:
--------------
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/pgsrc/Help%2FSemanticSearchAdvancedPlugin
Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php 2021-02-23 08:19:43 UTC (rev 10267)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php 2021-02-23 08:30:59 UTC (rev 10268)
@@ -148,7 +148,33 @@
if (isset($this->_norelations_warning))
$form->pushContent(HTML::div(array('class' => 'warning'),
_("Warning:") . $this->_norelations_warning));
+
extract($args);
+
+ if (($case_exact == '0') || ($case_exact == 'false')) {
+ $case_exact = false;
+ } elseif (($case_exact == '1') || ($case_exact == 'true')) {
+ $case_exact = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "case_exact"));
+ }
+
+ if (($noform == '0') || ($noform == 'false')) {
+ $noform = false;
+ } elseif (($noform == '1') || ($noform == 'true')) {
+ $noform = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noform"));
+ }
+
+ 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"));
+ }
+
// For convenience, peace and harmony we allow GET requests also.
if (!$args['s']) // check for good GET request
return $form; // nobody called us, so just display our form
Modified: trunk/pgsrc/Help%2FSemanticSearchAdvancedPlugin
===================================================================
--- trunk/pgsrc/Help%2FSemanticSearchAdvancedPlugin 2021-02-23 08:19:43 UTC (rev 10267)
+++ trunk/pgsrc/Help%2FSemanticSearchAdvancedPlugin 2021-02-23 08:30:59 UTC (rev 10268)
@@ -33,7 +33,7 @@
| ~* (all)
|-
| **case_exact**
-|
+| Boolean. If true, search with case exact.
| false
|-
| **regex**
@@ -41,7 +41,7 @@
| auto
|-
| **noform**
-| don't show form with results.
+| Boolean. If true, don't show form with results.
| false
|-
| **noheader**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-02-23 08:37:22
|
Revision: 10269
http://sourceforge.net/p/phpwiki/code/10269
Author: vargenau
Date: 2021-02-23 08:37:19 +0000 (Tue, 23 Feb 2021)
Log Message:
-----------
plugin SemanticSearch: better test boolean arguments "case_exact", "noheader" and "noform"
Modified Paths:
--------------
trunk/lib/plugin/SemanticSearch.php
trunk/pgsrc/Help%2FSemanticSearchPlugin
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2021-02-23 08:30:59 UTC (rev 10268)
+++ trunk/lib/plugin/SemanticSearch.php 2021-02-23 08:37:19 UTC (rev 10269)
@@ -294,6 +294,31 @@
, "\n"
, fmt("See %s", WikiLink(_("Help").":"._("SemanticRelations")))));
extract($args);
+
+ if (($case_exact == '0') || ($case_exact == 'false')) {
+ $case_exact = false;
+ } elseif (($case_exact == '1') || ($case_exact == 'true')) {
+ $case_exact = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "case_exact"));
+ }
+
+ if (($noform == '0') || ($noform == 'false')) {
+ $noform = false;
+ } elseif (($noform == '1') || ($noform == 'true')) {
+ $noform = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noform"));
+ }
+
+ 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"));
+ }
+
// for convenience and harmony we allow GET requests also.
if (!$request->isPost()) {
if ($relation or $attribute) // check for good GET request
Modified: trunk/pgsrc/Help%2FSemanticSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FSemanticSearchPlugin 2021-02-23 08:30:59 UTC (rev 10268)
+++ trunk/pgsrc/Help%2FSemanticSearchPlugin 2021-02-23 08:37:19 UTC (rev 10269)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 19:16:32 +0000
+Date: Tue, 23 Feb 2021 09:33:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FSemanticSearchPlugin;
@@ -67,7 +67,7 @@
|
|-
| **case_exact**
-|
+| Boolean. If true, search with case exact.
| true
|-
| **regex**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-02-23 17:56:48
|
Revision: 10272
http://sourceforge.net/p/phpwiki/code/10272
Author: vargenau
Date: 2021-02-23 17:56:45 +0000 (Tue, 23 Feb 2021)
Log Message:
-----------
plugin UserRatings: better test boolean arguments "noheader", "userPage" and "nobuds"
Modified Paths:
--------------
trunk/lib/plugin/UserRatings.php
trunk/pgsrc/Help%2FUserRatingsPlugin
Modified: trunk/lib/plugin/UserRatings.php
===================================================================
--- trunk/lib/plugin/UserRatings.php 2021-02-23 13:53:17 UTC (rev 10271)
+++ trunk/lib/plugin/UserRatings.php 2021-02-23 17:56:45 UTC (rev 10272)
@@ -58,7 +58,7 @@
'pagename' => '[pagename]', // hackish
'exclude' => '',
'limit' => 0, // limit of <=0 is show-all
- 'noheader' => 0,
+ 'noheader' => false,
'userPage' => false,
'nobuds' => false,
// rating columns are added later
@@ -82,6 +82,30 @@
{
extract($this->getArgs($argstr, $request));
+ 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 (($userPage == '0') || ($userPage == 'false')) {
+ $userPage = false;
+ } elseif (($userPage == '1') || ($userPage == 'true')) {
+ $userPage = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "userPage"));
+ }
+
+ if (($nobuds == '0') || ($nobuds == 'false')) {
+ $nobuds = false;
+ } elseif (($nobuds == '1') || ($nobuds == 'true')) {
+ $nobuds = true;
+ } else {
+ return $this->error(sprintf(_("Argument '%s' must be a boolean"), "nobuds"));
+ }
+
// XXX: fix to reflect multi-user ratings?
$caption = _("Displaying %d ratings:");
Modified: trunk/pgsrc/Help%2FUserRatingsPlugin
===================================================================
--- trunk/pgsrc/Help%2FUserRatingsPlugin 2021-02-23 13:53:17 UTC (rev 10271)
+++ trunk/pgsrc/Help%2FUserRatingsPlugin 2021-02-23 17:56:45 UTC (rev 10272)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 19:16:32 +0000
+Date: Tue, 23 Feb 2021 18:51:32 +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
|-
| **limit**
| limit of <=0 is show-all
@@ -55,9 +55,13 @@
| false
|-
| **userPage**
-|
+| Boolean. If true, we're on a user's homepage, get **their** ratings
| false
|-
+| **nobuds**
+| Boolean.
+| false
+|-
| **info**
| columns to display (hits, pagename, author, ratingwidget...)
| pagename
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-06-10 08:07:28
|
Revision: 10281
http://sourceforge.net/p/phpwiki/code/10281
Author: vargenau
Date: 2021-06-10 08:07:22 +0000 (Thu, 10 Jun 2021)
Log Message:
-----------
Revert Subversion commit 9111, bad side effects; Bug#607 BackLinks do not work inside a RichTable; Bug#636 Recursive include is not trapped
Modified Paths:
--------------
trunk/lib/InlineParser.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/Template.php
trunk/lib/plugin/WikicreoleTable.php
trunk/pgsrc/ReleaseNotes
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/InlineParser.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -443,10 +443,6 @@
$pagename = $link;
$anchor = false;
}
-
- global $backlinks;
- $backlinks[] = array('linkto' => $pagename);
-
return new Cached_WikiLink($pagename, $label, $anchor);
}
}
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/IncludePage.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -64,14 +64,7 @@
if (!$page or !$page->name)
return false;
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
-
- $backlinks[] = array('linkto' => $page->name);
- return $backlinks;
+ return array(array('linkto' => $page->name));
}
// Avoid warning in:
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/MediawikiTable.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -65,16 +65,6 @@
return array();
}
- function getWikiPageLinks($argstr, $basepage)
- {
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
- return $backlinks;
- }
-
/**
* @param WikiDB $dbi
* @param string $argstr
@@ -84,10 +74,6 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- global $backlinks;
-
- $backlinks = array();
-
include_once 'lib/BlockParser.php';
// We allow the compact Mediawiki syntax with:
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/OldStyleTable.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -68,16 +68,6 @@
return;
}
- function getWikiPageLinks($argstr, $basepage)
- {
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
- return $backlinks;
- }
-
/**
* @param WikiDB $dbi
* @param string $argstr
@@ -87,10 +77,6 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- global $backlinks;
-
- $backlinks = array();
-
include_once 'lib/InlineParser.php';
$args = $this->getArgs($argstr, $request);
Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/RichTable.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -42,16 +42,6 @@
return array();
}
- function getWikiPageLinks($argstr, $basepage)
- {
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
- return $backlinks;
- }
-
/**
* @param WikiDB $dbi
* @param string $argstr
@@ -61,10 +51,6 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- global $backlinks;
-
- $backlinks = array();
-
include_once 'lib/BlockParser.php';
$lines = preg_split('/\n/', $argstr);
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/Template.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -96,14 +96,7 @@
if (!$page or !$page->name)
return false;
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
-
- $backlinks[] = array('linkto' => $page->name);
- return $backlinks;
+ return array(array('linkto' => $page->name));
}
/**
Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/WikicreoleTable.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -68,16 +68,6 @@
return;
}
- function getWikiPageLinks($argstr, $basepage)
- {
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
- return $backlinks;
- }
-
/**
* @param WikiDB $dbi
* @param string $argstr
@@ -87,10 +77,6 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- global $backlinks;
-
- $backlinks = array();
-
include_once 'lib/InlineParser.php';
$table = array();
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/pgsrc/ReleaseNotes 2021-06-10 08:07:22 UTC (rev 10281)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Wed, 9 Jun 2021 19:50:57 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -23,6 +23,9 @@
* Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
* Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.
* Better check arguments for ~GoogleMaps plugin
+* Revert Subversion commit 9111, bad side effects:
+** Bug#607 BackLinks do not work inside a RichTable
+** Bug#636 Recursive include is not trapped
* Security fixes
=== Changes ===
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