phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[10900] trunk

[<var...@us...>]

Revision: 10900
          http://sourceforge.net/p/phpwiki/code/10900
Author:   vargenau
Date:     2022-01-14 14:33:17 +0000 (Fri, 14 Jan 2022)
Log Message:
-----------
themes/Portland/templates/actionbar.tmpl: add separator, better link message

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo
    trunk/themes/Portland/templates/actionbar.tmpl

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/de.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5737,6 +5737,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Diese Seite bearbeiten"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s von dieser Seite"
@@ -5806,9 +5809,6 @@
 #~ msgid "EditText"
 #~ msgstr "TextBearbeiten"
 
-#~ msgid "Edit this page"
-#~ msgstr "Diese Seite bearbeiten"
-
 #~ msgid "Invalid filename."
 #~ msgstr "Ungültiger Dateiname."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/es.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5612,6 +5612,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Corrija esta página"
+
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5666,9 +5669,6 @@
 #~ msgid "EditText"
 #~ msgstr "Editar"
 
-#~ msgid "Edit this page"
-#~ msgstr "Corrija esta página"
-
 #~ msgid "Invalid filename."
 #~ msgstr "Nombre de archivo inválido."
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/fr.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5726,6 +5726,9 @@
 msgid "Favorite Categories"
 msgstr "Catégories populaires"
 
+msgid "Edit this page"
+msgstr "Modifier cette page"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s de cette page"
@@ -5799,9 +5802,6 @@
 #~ msgid "EditText"
 #~ msgstr "ÉditerLeContenu"
 
-#~ msgid "Edit this page"
-#~ msgstr "Modifier cette page"
-
 #~ msgid "Invalid filename."
 #~ msgstr "Nom de fichier incorrect."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/it.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -5572,6 +5572,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Modifica la pagina"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s di questa pagina"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/ja.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5558,6 +5558,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "ページを編集しています"
+
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5621,9 +5624,6 @@
 #~ msgid "Language"
 #~ msgstr "言語"
 
-#~ msgid "Edit this page"
-#~ msgstr "ページを編集しています"
-
 #~ msgid "Deleted"
 #~ msgstr "削除しました"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/nl.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -5564,6 +5564,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Verander pagina"
+
 #, php-format
 msgid "%s of this page"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/phpwiki.pot	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5558,6 +5558,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr ""
+
 #, php-format
 msgid "%s of this page"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/sv.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5559,6 +5559,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Redigera den här sidan"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s för den här sidan"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/zh.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5586,6 +5586,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "編輯此頁面"
+
 #, php-format
 msgid "%s of this page"
 msgstr "此頁面的 %s"
@@ -5649,9 +5652,6 @@
 #~ msgid "Language"
 #~ msgstr "語言"
 
-#~ msgid "Edit this page"
-#~ msgstr "編輯此頁面"
-
 #~ msgid "Deleted"
 #~ msgstr "已刪除"
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/themes/Portland/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/actionbar.tmpl	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/themes/Portland/templates/actionbar.tmpl	2022-01-14 14:33:17 UTC (rev 10900)
@@ -1,15 +1,21 @@
 <?php
 if ($revision && (!$page->get('locked') || $user->isAdmin())) {
-    $EditB = Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
+    if ($revision->isCurrent()) {
+        $EditB = Button("edit", _("Edit this page"));
+    } else {
+        $EditB = Button("edit", _("Edit Old Revision"));
+        $EditB = fmt("%s of this page", $EditB);
+    }
 } else {
     $EditB = Button("viewsource", _("View Source"));
+    $EditB = fmt("%s of this page", $EditB);
 }
-$EditB = fmt("%s of this page", $EditB);
 if (empty($revision)) {
     $revision = $page->getCurrentRevision(false);
 }
 ?>
 <?php echo $EditB ?>
+<?php echo $SEP?>
 <a href="<?php echo WikiURL($revision,array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
 <?php echo $SEP?>
 <?php echo Button(__("PageHistory"), _("Page History")) ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10899] trunk/themes/default/templates/editpage.tmpl

[<var...@us...>]

Revision: 10899
          http://sourceforge.net/p/phpwiki/code/10899
Author:   vargenau
Date:     2022-01-14 12:33:00 +0000 (Fri, 14 Jan 2022)
Log Message:
-----------
Warn user also after Preview or Changes

Modified Paths:
--------------
    trunk/themes/default/templates/editpage.tmpl

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2022-01-14 11:44:43 UTC (rev 10898)
+++ trunk/themes/default/templates/editpage.tmpl	2022-01-14 12:33:00 UTC (rev 10899)
@@ -19,7 +19,13 @@
 <script type="text/javascript">
 <!--//
 $(document).ready(function() {
-    wiki_modified=0;
+    ret=window.sessionStorage.getItem('wiki_modified');
+    if (ret) {
+        wiki_modified=ret;
+    } else {
+        wiki_modified=0;
+    }
+    sessionStorage.removeItem('wiki_modified');
     $('form *').change(function(){
         wiki_modified=1;
     });
@@ -29,9 +35,14 @@
             return "Warning: leaving the page will lose all your modifications!";
         }
     }
-    $("input[name='edit[save]'],input[name='edit[preview]'],input[name='edit[diff]']").click(function() {
+    $("input[name='edit[save]']").click(function() {
         wiki_modified=0;
+        sessionStorage.removeItem('wiki_modified');
     });
+    $("input[name='edit[preview]'],input[name='edit[diff]']").click(function() {
+        window.sessionStorage.setItem('wiki_modified', wiki_modified);
+        wiki_modified=0;
+    });
 });
 // --></script>
 <form method="post" id="editpage" name="editpage"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10898] trunk/themes/default/templates/editpage.tmpl

[<var...@us...>]

Revision: 10898
          http://sourceforge.net/p/phpwiki/code/10898
Author:   vargenau
Date:     2022-01-14 11:44:43 +0000 (Fri, 14 Jan 2022)
Log Message:
-----------
Warn user that leaving the page will lose modifications

Modified Paths:
--------------
    trunk/themes/default/templates/editpage.tmpl

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2022-01-13 17:42:53 UTC (rev 10897)
+++ trunk/themes/default/templates/editpage.tmpl	2022-01-14 11:44:43 UTC (rev 10898)
@@ -16,6 +16,24 @@
       <?php echo _("Saving this page will overwrite the current version.") ?>
       </p>
 <?php } ?>
+<script type="text/javascript">
+<!--//
+$(document).ready(function() {
+    wiki_modified=0;
+    $('form *').change(function(){
+        wiki_modified=1;
+    });
+    window.onbeforeunload = confirmExit;
+    function confirmExit() {
+        if (wiki_modified == 1) {
+            return "Warning: leaving the page will lose all your modifications!";
+        }
+    }
+    $("input[name='edit[save]'],input[name='edit[preview]'],input[name='edit[diff]']").click(function() {
+        wiki_modified=0;
+    });
+});
+// --></script>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10897] trunk

[<var...@us...>]

Revision: 10897
          http://sourceforge.net/p/phpwiki/code/10897
Author:   vargenau
Date:     2022-01-13 17:42:53 +0000 (Thu, 13 Jan 2022)
Log Message:
-----------
UserPreferences plugin: check if user isAuthenticated

Modified Paths:
--------------
    trunk/lib/plugin/UserPreferences.php
    trunk/pgsrc/Help%2FUserPreferencesPlugin

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2022-01-13 16:58:32 UTC (rev 10896)
+++ trunk/lib/plugin/UserPreferences.php	2022-01-13 17:42:53 UTC (rev 10897)
@@ -60,11 +60,9 @@
         $user =& $request->_user;
         $user->_request = $request;
         $iserror = false;
-        if (defined('FUSIONFORGE') && FUSIONFORGE) {
-            if (!($user->isAuthenticated())) {
-                return HTML::p(array('class' => 'error'),
-                    _("Error: You are not logged in, cannot display UserPreferences."));
-            }
+        if (!($user->isAuthenticated())) {
+            return HTML::p(array('class' => 'error'),
+                _("Error: You are not logged in, cannot display UserPreferences."));
         }
         if ((!isActionPage($request->getArg('pagename'))
             and (!isset($user->_prefs->_method)

Modified: trunk/pgsrc/Help%2FUserPreferencesPlugin
===================================================================
--- trunk/pgsrc/Help%2FUserPreferencesPlugin	2022-01-13 16:58:32 UTC (rev 10896)
+++ trunk/pgsrc/Help%2FUserPreferencesPlugin	2022-01-13 17:42:53 UTC (rev 10897)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Jan 2022 16:16:14 +0000
+Date: Thu, 13 Jan 2022 18:39:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FUserPreferencesPlugin;
@@ -25,6 +25,8 @@
 <<UserPreferences>>
 }}}
 
+<<UserPreferences>>
+
 == Author ==
 * [[Help:Reini Urban|Reini Urban]]
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10896] trunk/lib/plugin

[<var...@us...>]

Revision: 10896
          http://sourceforge.net/p/phpwiki/code/10896
Author:   vargenau
Date:     2022-01-13 16:58:32 +0000 (Thu, 13 Jan 2022)
Log Message:
-----------
function redirect does not return

Modified Paths:
--------------
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/WikiTranslation.php

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/AppendText.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -52,7 +52,7 @@
         );
     }
 
-    private function fallback($addtext, $oldtext, $notfound, &$message)
+    private function fallback($addtext, $oldtext, $notfound, $message)
     {
         $message->pushContent(sprintf(_("“%s” not found"), $notfound) . ". " .
             _("Appending at the end.") . "\n");
@@ -64,11 +64,10 @@
      * @param string $argstr
      * @param WikiRequest $request
      * @param string $basepage
-     * @return mixed
+     * @return HTML|XmlContent
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-
         $args = $this->getArgs($argstr, $request);
 
         $redirect = $args['redirect'];
@@ -95,12 +94,13 @@
         }
     }
 
-    private function work($pagename, $args, $dbi, &$request)
+    private function work($pagename, $args, $dbi, $request)
     {
         if (empty($args['s'])) {
             if ($request->isPost()) {
                 if ($pagename != _("AppendText"))
-                    return HTML($request->redirect(WikiURL($pagename, array(), 'absurl'), false));
+                    $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
+                    return HTML();
             }
             return HTML();
         }
@@ -151,16 +151,17 @@
 
         // AppendText has been called from the same page that got modified
         // so we directly show the page.
+        $redirect = $args['redirect'];
         if ($request->getArg($pagename) == $pagename) {
             // TODO: Just invalidate the cache, if AppendText didn't
             // change anything before.
             //
-            return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
-
+            $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
+            return HTML();
             // The user asked to be redirected to the modified page
         } elseif ($redirect) {
-            return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
-
+            $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
+            return HTML();
         } else {
             $link = HTML::em(WikiLink($pagename));
             $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXML())));

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/CreatePage.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -60,7 +60,7 @@
      * @param string $argstr
      * @param WikiRequest $request
      * @param string $basepage
-     * @return mixed
+     * @return HTML|XmlContent
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
@@ -137,6 +137,7 @@
                 $page->save($content, $version + 1, $meta);
             }
         }
-        return HTML($request->redirect($url));
+        $request->redirect($url);
+        return HTML();
     }
 }

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/RedirectTo.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -57,7 +57,7 @@
      * @param string $argstr
      * @param WikiRequest $request
      * @param string $basepage
-     * @return mixed
+     * @return HTML|XmlContent
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
@@ -111,6 +111,7 @@
             }
         }
 
-        return $request->redirect($url);
+        $request->redirect($url);
+        return HTML();
     }
 }

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/UserPreferences.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -93,7 +93,8 @@
                     $request->setArg("delete", false);
                     if ($old_theme != THEME) {
                         $url = WikiURL(__("UserPreferences"), array(), 'absurl')."?num=reset";
-                        return HTML($request->redirect($url, false));
+                        $request->redirect($url, false);
+                        return HTML();
                     }
 
                     $errmsg .= _("Your UserPreferences have been successfully reset to default.");
@@ -162,7 +163,8 @@
                         // (mix of old and new templates)
                         if ($new_theme && ($new_theme != $old_theme)) {
                             $url = WikiURL(__("UserPreferences"), array(), 'absurl').'?num='.$num;
-                            return HTML($request->redirect($url, false));
+                            $request->redirect($url, false);
+                            return HTML();
                         }
                     }
 

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/WikiTranslation.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -402,7 +402,8 @@
                 }
                 // redirect or transclude?
                 if ($url) {
-                    return $request->redirect($url);
+                    $request->redirect($url);
+                    return HTML();
                 }
                 return HTML(fmt("TODO: Google can only translate from english and french. Find a translation service for %s to language %s",
                     WikiURL($pagename, array(), true),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10895] trunk/lib/Template.php

[<var...@us...>]

Revision: 10895
          http://sourceforge.net/p/phpwiki/code/10895
Author:   vargenau
Date:     2022-01-13 16:08:30 +0000 (Thu, 13 Jan 2022)
Log Message:
-----------
check arguments for array_merge

Modified Paths:
--------------
    trunk/lib/Template.php

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2022-01-13 15:16:42 UTC (rev 10894)
+++ trunk/lib/Template.php	2022-01-13 16:08:30 UTC (rev 10895)
@@ -144,7 +144,11 @@
     {
         if (!is_array($defaults)) // HTML object or template object
             $defaults = array('CONTENT' => $defaults);
-        $this->_vars = array_merge($defaults, $this->_locals);
+        if (is_array($this->_locals)) {
+            $this->_vars = array_merge($defaults, $this->_locals);
+        } else {
+            $this->_vars = $defaults;
+        }
         extract($this->_vars);
 
         global $request;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10894] trunk/pgsrc

[<var...@us...>]

Revision: 10894
          http://sourceforge.net/p/phpwiki/code/10894
Author:   vargenau
Date:     2022-01-13 15:16:42 +0000 (Thu, 13 Jan 2022)
Log Message:
-----------
UserPreferences has no arguments

Modified Paths:
--------------
    trunk/pgsrc/Help%2FDebugGroupInfoPlugin
    trunk/pgsrc/Help%2FHtmlConverterPlugin
    trunk/pgsrc/Help%2FUserPreferencesPlugin

Modified: trunk/pgsrc/Help%2FDebugGroupInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FDebugGroupInfoPlugin	2022-01-12 17:10:47 UTC (rev 10893)
+++ trunk/pgsrc/Help%2FDebugGroupInfoPlugin	2022-01-13 15:16:42 UTC (rev 10894)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 13 Jan 2022 16:16:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FDebugGroupInfoPlugin;
@@ -21,7 +21,7 @@
 
 == Arguments ==
 
-None
+None.
 
 == Example ==
 

Modified: trunk/pgsrc/Help%2FHtmlConverterPlugin
===================================================================
--- trunk/pgsrc/Help%2FHtmlConverterPlugin	2022-01-12 17:10:47 UTC (rev 10893)
+++ trunk/pgsrc/Help%2FHtmlConverterPlugin	2022-01-13 15:16:42 UTC (rev 10894)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 13 Jan 2022 16:16:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FHtmlConverterPlugin;
@@ -15,7 +15,7 @@
 
 == Arguments ==
 
-None
+None.
 
 == Example ==
 

Modified: trunk/pgsrc/Help%2FUserPreferencesPlugin
===================================================================
--- trunk/pgsrc/Help%2FUserPreferencesPlugin	2022-01-12 17:10:47 UTC (rev 10893)
+++ trunk/pgsrc/Help%2FUserPreferencesPlugin	2022-01-13 15:16:42 UTC (rev 10894)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 13 Jan 2022 16:16:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FUserPreferencesPlugin;
@@ -17,6 +17,8 @@
 
 == Arguments ==
 
+None.
+
 == Example ==
 
 {{{
@@ -23,8 +25,6 @@
 <<UserPreferences>>
 }}}
 
-<<UserPreferences>>
-
 == Author ==
 * [[Help:Reini Urban|Reini Urban]]
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10893] trunk/locale

[<var...@us...>]

Revision: 10893
          http://sourceforge.net/p/phpwiki/code/10893
Author:   vargenau
Date:     2022-01-12 17:10:47 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2022-01-12 17:09:08 UTC (rev 10892)
+++ trunk/locale/po/de.po	2022-01-12 17:10:47 UTC (rev 10893)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 11:27+0100\n"
+"POT-Creation-Date: 2022-01-12 18:09+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5416,22 +5416,14 @@
 msgid "Personal language:"
 msgstr "Ihre Sprache:"
 
+msgid "User Preference for theme successfully updated."
+msgstr ""
+"BenutzerEinstellung für Darstellung erfolgreich auf neuesten Stand gebracht."
+
 #, php-format
 msgid "User preferences for user %s"
 msgstr "Einstellungen für Benutzer »%s«"
 
-msgid "Auth Level"
-msgstr "Auth. Ebene"
-
-msgid "Auth Method"
-msgstr "Auth. Methode"
-
-msgid "Theme"
-msgstr "Benutzeroberfläche"
-
-msgid "Language"
-msgstr "Sprache"
-
 msgid "Change Password"
 msgstr "Ändere Passwort"
 
@@ -5799,6 +5791,18 @@
 msgid "Sidebar"
 msgstr "Sidebar"
 
+#~ msgid "Auth Level"
+#~ msgstr "Auth. Ebene"
+
+#~ msgid "Auth Method"
+#~ msgstr "Auth. Methode"
+
+#~ msgid "Theme"
+#~ msgstr "Benutzeroberfläche"
+
+#~ msgid "Language"
+#~ msgstr "Sprache"
+
 #~ msgid "EditText"
 #~ msgstr "TextBearbeiten"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-12 17:09:08 UTC (rev 10892)
+++ trunk/locale/po/es.po	2022-01-12 17:10:47 UTC (rev 10893)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 11:27+0100\n"
+"POT-Creation-Date: 2022-01-12 18:09+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5304,22 +5304,13 @@
 msgid "Personal language:"
 msgstr ""
 
+msgid "User Preference for theme successfully updated."
+msgstr ""
+
 #, php-format
 msgid "User preferences for user %s"
 msgstr "Preferencias por usuario “%s”"
 
-msgid "Auth Level"
-msgstr ""
-
-msgid "Auth Method"
-msgstr ""
-
-msgid "Theme"
-msgstr ""
-
-msgid "Language"
-msgstr ""
-
 msgid "Change Password"
 msgstr "Change Contraseña"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-12 17:09:08 UTC (rev 10892)
+++ trunk/locale/po/fr.po	2022-01-12 17:10:47 UTC (rev 10893)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 11:27+0100\n"
+"POT-Creation-Date: 2022-01-12 18:09+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5399,22 +5399,13 @@
 msgid "Personal language:"
 msgstr "Ma langue :"
 
+msgid "User Preference for theme successfully updated."
+msgstr "La préférence du thème a été mise à jour avec succès."
+
 #, php-format
 msgid "User preferences for user %s"
 msgstr "Préférences de l'utilisateur %s"
 
-msgid "Auth Level"
-msgstr "Niveau d'autorisation"
-
-msgid "Auth Method"
-msgstr "Méthode d'authentification"
-
-msgid "Theme"
-msgstr "Thème"
-
-msgid "Language"
-msgstr "Langue"
-
 msgid "Change Password"
 msgstr "Modifier mon mot de passe"
 
@@ -5790,6 +5781,18 @@
 msgid "Sidebar"
 msgstr "Barre latérale"
 
+#~ msgid "Auth Level"
+#~ msgstr "Niveau d'autorisation"
+
+#~ msgid "Auth Method"
+#~ msgstr "Méthode d'authentification"
+
+#~ msgid "Theme"
+#~ msgstr "Thème"
+
+#~ msgid "Language"
+#~ msgstr "Langue"
+
 #~ msgid "Export to a separate public area?"
 #~ msgstr "Exporter dans une zone publique distincte ?"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-12 17:09:08 UTC (rev 10892)
+++ trunk/locale/po/it.po	2022-01-12 17:10:47 UTC (rev 10893)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 11:27+0100\n"
+"POT-Creation-Date: 2022-01-12 18:09+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -5264,22 +5264,13 @@
 msgid "Personal language:"
 msgstr ""
 
+msgid "User Preference for theme successfully updated."
+msgstr "Preferenze dell'utente per il tema aggiornate correttamente."
+
 #, php-format
 msgid "User preferences for user %s"
 msgstr "Preferenze per l'utente %s"
 
-msgid "Auth Level"
-msgstr ""
-
-msgid "Auth Method"
-msgstr ""
-
-msgid "Theme"
-msgstr ""
-
-msgid "Language"
-msgstr ""
-
 msgid "Change Password"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-12 17:09:08 UTC (rev 10892)
+++ trunk/locale/po/ja.po	2022-01-12 17:10:47 UTC (rev 10893)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 11:27+0100\n"
+"POT-Creation-Date: 2022-01-12 18:09+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5250,22 +5250,13 @@
 msgid "Personal language:"
 msgstr "個人言語:"
 
+msgid "User Preference for theme successfully updated."
+msgstr ""
+
 #, php-format
 msgid "User preferences for user %s"
 msgstr ""
 
-msgid "Auth Level"
-msgstr "認証レベル"
-
-msgid "Auth Method"
-msgstr "認証方法"
-
-msgid "Theme"
-msgstr "テーマ"
-
-msgid "Language"
-msgstr "言語"
-
 msgid "Change Password"
 msgstr "パスワード変更"
 
@@ -5618,6 +5609,18 @@
 msgid "Sidebar"
 msgstr "スライドバー"
 
+#~ msgid "Auth Level"
+#~ msgstr "認証レベル"
+
+#~ msgid "Auth Method"
+#~ msgstr "認証方法"
+
+#~ msgid "Theme"
+#~ msgstr "テーマ"
+
+#~ msgid "Language"
+#~ msgstr "言語"
+
 #~ msgid "Edit this page"
 #~ msgstr "ページを編集しています"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-12 17:09:08 UTC (rev 10892)
+++ trunk/locale/po/nl.po	2022-01-12 17:10:47 UTC (rev 10893)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 11:27+0100\n"
+"POT-Creation-Date: 2022-01-12 18:09+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -5256,22 +5256,13 @@
 msgid "Personal language:"
 msgstr ""
 
+msgid "User Preference for theme successfully updated."
+msgstr ""
+
 #, php-format
 msgid "User preferences for user %s"
 msgstr ""
 
-msgid "Auth Level"
-msgstr ""
-
-msgid "Auth Method"
-msgstr ""
-
-msgid "Theme"
-msgstr ""
-
-msgid "Language"
-msgstr ""
-
 msgid "Change Password"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-12 17:09:08 UTC (rev 10892)
+++ trunk/locale/po/phpwiki.pot	2022-01-12 17:10:47 UTC (rev 10893)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 11:27+0100\n"
+"POT-Creation-Date: 2022-01-12 18:09+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5250,22 +5250,13 @@
 msgid "Personal language:"
 msgstr ""
 
+msgid "User Preference for theme successfully updated."
+msgstr ""
+
 #, php-format
 msgid "User preferences for user %s"
 msgstr ""
 
-msgid "Auth Level"
-msgstr ""
-
-msgid "Auth Method"
-msgstr ""
-
-msgid "Theme"
-msgstr ""
-
-msgid "Language"
-msgstr ""
-
 msgid "Change Password"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-12 17:09:08 UTC (rev 10892)
+++ trunk/locale/po/sv.po	2022-01-12 17:10:47 UTC (rev 10893)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 11:27+0100\n"
+"POT-Creation-Date: 2022-01-12 18:09+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5251,22 +5251,13 @@
 msgid "Personal language:"
 msgstr ""
 
+msgid "User Preference for theme successfully updated."
+msgstr ""
+
 #, php-format
 msgid "User preferences for user %s"
 msgstr ""
 
-msgid "Auth Level"
-msgstr ""
-
-msgid "Auth Method"
-msgstr ""
-
-msgid "Theme"
-msgstr ""
-
-msgid "Language"
-msgstr ""
-
 msgid "Change Password"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-12 17:09:08 UTC (rev 10892)
+++ trunk/locale/po/zh.po	2022-01-12 17:10:47 UTC (rev 10893)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 11:27+0100\n"
+"POT-Creation-Date: 2022-01-12 18:09+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5274,22 +5274,13 @@
 msgid "Personal language:"
 msgstr "個人語言:"
 
+msgid "User Preference for theme successfully updated."
+msgstr ""
+
 #, php-format
 msgid "User preferences for user %s"
 msgstr "使用者 “%s” 的偏好設定"
 
-msgid "Auth Level"
-msgstr "認證層級"
-
-msgid "Auth Method"
-msgstr "認證方式"
-
-msgid "Theme"
-msgstr "佈景主題"
-
-msgid "Language"
-msgstr "語言"
-
 msgid "Change Password"
 msgstr "改變密碼"
 
@@ -5646,6 +5637,18 @@
 msgid "Sidebar"
 msgstr ""
 
+#~ msgid "Auth Level"
+#~ msgstr "認證層級"
+
+#~ msgid "Auth Method"
+#~ msgstr "認證方式"
+
+#~ msgid "Theme"
+#~ msgstr "佈景主題"
+
+#~ msgid "Language"
+#~ msgstr "語言"
+
 #~ msgid "Edit this page"
 #~ msgstr "編輯此頁面"
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10892] trunk/themes/default/templates/userprefs.tmpl

[<var...@us...>]

Revision: 10892
          http://sourceforge.net/p/phpwiki/code/10892
Author:   vargenau
Date:     2022-01-12 17:09:08 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
themes/default/templates/userprefs.tmpl: only one variable left

Modified Paths:
--------------
    trunk/themes/default/templates/userprefs.tmpl

Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2022-01-12 17:08:23 UTC (rev 10891)
+++ trunk/themes/default/templates/userprefs.tmpl	2022-01-12 17:09:08 UTC (rev 10892)
@@ -1,9 +1,5 @@
 <?php
-// Todo: Move the logic and code to the plugin
-// This is very experimental and the read-only part an ugly hack so far.
-foreach (explode(',','errmsg') as $var) {
-    if (empty($$var)) $$var = false;
-}
+if (empty($errmsg)) $errmsg = '';
 
 $plugin = $request->getArg('pagename');
 $time = time();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10891] trunk/lib/plugin/UserPreferences.php

[<var...@us...>]

Revision: 10891
          http://sourceforge.net/p/phpwiki/code/10891
Author:   vargenau
Date:     2022-01-12 17:08:23 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
UserPreferences plugin has no arguements

Modified Paths:
--------------
    trunk/lib/plugin/UserPreferences.php

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2022-01-12 16:14:08 UTC (rev 10890)
+++ trunk/lib/plugin/UserPreferences.php	2022-01-12 17:08:23 UTC (rev 10891)
@@ -28,9 +28,6 @@
  * This must be used in the page "UserPreferences".
  * Prefs are stored in metadata in the current session,
  *  within the user's home page or in a database.
- *
- * WikiTheme extension: WikiThemes are able to extend the predefined list
- * of preferences.
  */
 
 class WikiPlugin_UserPreferences
@@ -45,24 +42,7 @@
 
     function getDefaultArguments()
     {
-        global $request;
-        $user = $request->getUser();
-        if (isset($user->_prefs) and
-            isset($user->_prefs->_prefs) and
-                isset($user->_prefs->_method)
-        ) {
-            $pref =& $user->_prefs;
-        } else {
-            $pref = $user->getPreferences();
-        }
-        $prefs = array();
-        if ($pref) {
-            // We need a hash of pref => default_value
-            foreach ($pref->_prefs as $name => $obj) {
-                $prefs[$name] = $obj->default_value;
-            }
-        }
-        return $prefs;
+        return array();
     }
 
     /**
@@ -94,13 +74,11 @@
             $no_args = $this->getDefaultArguments();
             $no_args['errmsg'] = HTML::p(array('class' => 'error'),
                 _("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."));
-            $no_args['isForm'] = false;
             return Template('userprefs', $no_args);
         }
         $userid = $user->UserName();
         if ($user->isAuthenticated() and !empty($userid)) {
             $pref = &$request->_prefs;
-            $args['isForm'] = true;
 
             if ($request->isPost()) {
                 $errmsg = '';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10890] trunk/themes/default/templates/userprefs.tmpl

[<var...@us...>]

Revision: 10890
          http://sourceforge.net/p/phpwiki/code/10890
Author:   vargenau
Date:     2022-01-12 16:14:08 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
UserPreferences are always a form

Modified Paths:
--------------
    trunk/themes/default/templates/userprefs.tmpl

Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2022-01-12 15:37:39 UTC (rev 10889)
+++ trunk/themes/default/templates/userprefs.tmpl	2022-01-12 16:14:08 UTC (rev 10890)
@@ -1,30 +1,27 @@
 <?php
 // Todo: Move the logic and code to the plugin
 // This is very experimental and the read-only part an ugly hack so far.
-foreach (explode(',','errmsg,isForm') as $var) {
+foreach (explode(',','errmsg') as $var) {
     if (empty($$var)) $$var = false;
 }
 
 $plugin = $request->getArg('pagename');
 $time = time();
-$user =& $request->getUser();
-$pref =& $request->_prefs;
+$user = $request->getUser();
+$pref = $request->_prefs;
 $num = $request->getArg('num');
 
 if (!$pref) return;
+
 $offset = $pref->get('timeOffset');
 $serverTime = $time - $offset * 3600;
-if ($isForm)
-    $timeOffsetInput = HTML::input(array('type' => "text",
-                                         'id' => 'timeOffsetInput',
-                                         'size' => 6,
-                                         'maxlength' => 6,
-                                         'name' => "pref[timeOffset]",
-                                         'class' => "numeric",
-                                         'value' => $offset));
-else
-    $timeOffsetInput = $pref->get('timeOffset');
-
+$timeOffsetInput = HTML::input(array('type' => "text",
+                                     'id' => 'timeOffsetInput',
+                                     'size' => 6,
+                                     'maxlength' => 6,
+                                     'name' => "pref[timeOffset]",
+                                     'class' => "numeric",
+                                     'value' => $offset));
 $OwnModificationsCB = HTML::input(array('type' => 'checkbox',
                                      'id' => 'ownModifications',
                                      'name' => 'pref[ownModifications]',
@@ -66,57 +63,47 @@
 
 $SelectThemes = ''; $SelectLanguages = '';
 $SelectThemesDesc = ''; $SelectLanguagesDesc = '';
-if ($isForm) {
-    $SelectOptions = HTML();
-    if (!empty($available_themes) and is_array($available_themes)) {
-        if (!$pref->get('theme') or $pref->get('theme') == THEME) {
-            $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+$SelectOptions = HTML();
+if (!empty($available_themes) and is_array($available_themes)) {
+    if (!$pref->get('theme') or $pref->get('theme') == THEME) {
+        $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+    } else {
+        $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+    }
+    foreach ($available_themes as $theme) {
+        if ($theme == $pref->get('theme') and $theme != THEME) {
+            $SelectOptions->pushContent(selectedOption($theme));
         } else {
-            $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+            $SelectOptions->pushContent(unselectedOption($theme));
         }
-        foreach ($available_themes as $theme) {
-            if ($theme == $pref->get('theme') and $theme != THEME) {
-                $SelectOptions->pushContent(selectedOption($theme));
-            } else {
-                $SelectOptions->pushContent(unselectedOption($theme));
-            }
-        }
-        $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
-                         $SelectOptions);
-        $SelectThemesDesc = _("Personal theme:");
     }
+    $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'), $SelectOptions);
+    $SelectThemesDesc = _("Personal theme:");
+}
 
-    $SelectOptions = HTML();
-    if (!empty($available_languages) and is_array($available_languages)) {
-        if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE) {
-            $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+$SelectOptions = HTML();
+if (!empty($available_languages) and is_array($available_languages)) {
+    if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE) {
+        $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+    } else {
+        $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+    }
+    foreach ($available_languages as $lang) {
+        if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE) {
+            $SelectOptions->pushContent(selectedOption($lang));
         } else {
-            $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+            $SelectOptions->pushContent(unselectedOption($lang));
         }
-        foreach ($available_languages as $lang) {
-            if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE) {
-                $SelectOptions->pushContent(selectedOption($lang));
-            } else {
-                $SelectOptions->pushContent(unselectedOption($lang));
-            }
-        }
-        $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
-                        $SelectOptions);
-        $SelectLanguagesDesc = _("Personal language:");
-    } else {
-        if ($SelectThemes == '') {
-            $appearance = false;
-            $SelectThemesDesc = '';
-            $SelectLanguagesDesc = '';
-        }
     }
+    $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'), $SelectOptions);
+    $SelectLanguagesDesc = _("Personal language:");
 } else {
-    $SelectThemesDesc = _("Personal theme:");
-    $SelectLanguagesDesc = _("Personal language:");
-    $SelectThemes = $pref->get('theme');
-    $SelectLanguages = $pref->get('lang');
+    if ($SelectThemes == '') {
+        $appearance = false;
+        $SelectThemesDesc = '';
+        $SelectLanguagesDesc = '';
+    }
 }
-
 ?>
 <?php echo $errmsg ?>
 <?php if (empty($errmsg)) { ?>
@@ -123,7 +110,7 @@
 <?php if ($num=='reset') { ?>
 <div class="feedback"><p><?php echo _('Your UserPreferences have been successfully reset to default.') ?></p></div>
 <?php } elseif ($num==1) { ?>
-<div class="feedback"><p><?php echo _('One UserPreferences field successfully updated.') ?></p></div>
+<div class="feedback"><p><?php echo _('User Preference for theme successfully updated.') ?></p></div>
 <?php } elseif ($num) { ?>
 <div class="feedback"><p><?php echo sprintf(_("%d UserPreferences fields successfully updated."), $num) ?></p></div>
 <?php } ?>
@@ -131,36 +118,18 @@
 <p>
 <?php echo fmt("User preferences for user %s", WikiLink($user->UserName())) ?>
 </p>
-<?php if ($isForm) { ?>
 <form action="<?php echo $request->getPostURL() ?>" method="post">
-<?php } else {
-  $fill = "&nbsp;";
-  // See also plugin DebugAuthInfo
-  $authmethod = @$user->_authmethod;
-?>
-<?php echo HTML::pre(sprintf("%12s: [% 10s]  %s\n",_("UserId"),$pref->get('userid'), " from " . $authmethod),
-          sprintf("%12s: [% 10s]  %16s: [% 10s] | %8s: [%2s]\n","getId",$user->getId(),"getAuthenticatedId",$user->getAuthenticatedId(),"isSignedIn", $user->isSignedIn()),
-          //sprintf("%12s: [% 10s]\n",_("Password"),empty($pref->get('passwd')) ? _("<empty>") : _("<not empty>")),
-          sprintf("%12s: [% 10s]  %15s: [% 8s]\n",
-              _("Auth Level"),$user->_level,_("Auth Method"),$authmethod),
-          sprintf("%12s: [% 10s]\n",_("HomePage"),$user->hasHomePage() ? $user->_HomePagehandle->_pagename : ''),
-          sprintf("%12s: [% 10s]\n",_("E-mail"),$pref->get('email')),
-          //sprintf("%12s: [% 10s]\n",_("Notify"),$pref->get('notifyPages')),
-          sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Theme"), $pref->get('theme'), _("Current theme"),$WikiTheme->_name),
-          sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Language"),$pref->get('lang'),_("Current language"),$GLOBALS['LANG'])
-          ) ?>
-<?php } ?>
 
 <table>
-<?php if ($isForm and $user->mayChangePass()) { ?>
+<?php if ($user->mayChangePass()) { ?>
   <tr><td colspan="2"><h2><?php echo ($request->getPref('passwd') ?  _("Change Password") :  _("Set Password")) ?></h2></td></tr>
 
-    <tr><td class="align-right"><?php echo _("New password") . _(":")?></td>
-        <td><input type="password" name="pref[passwd]" size="16" maxlength="16" class="text" value="" /></td>
-        <td></td></tr>
-    <tr><td class="align-right"><?php echo _("Type it again") . _(":")?></td>
-        <td><input type="password" name="pref[passwd2]" size="16" maxlength="16" class="text" value="" /></td>
-        <td></td></tr>
+  <tr><td class="align-right"><?php echo _("New password") . _(":")?></td>
+      <td><input type="password" name="pref[passwd]" size="16" maxlength="16" class="text" value="" /></td>
+      <td></td></tr>
+  <tr><td class="align-right"><?php echo _("Type it again") . _(":")?></td>
+      <td><input type="password" name="pref[passwd2]" size="16" maxlength="16" class="text" value="" /></td>
+      <td></td></tr>
 <?php } ?>
 
   <tr><td colspan="2"><h2><?php echo _("E-mail")?></h2></td></tr>
@@ -167,17 +136,11 @@
 
   <tr><td>
   <p>
-  <?php if ($isForm) { ?>
   <label for="email">
-  <?php } ?>
   <?php echo _("Your e-mail"). _(": ")?>
-  <?php if ($isForm) { ?>
   </label>
      <input id="email" type="text" name="pref[email]" size="30" maxlength="60"
         value="<?php echo $pref->get('email')?>" />
-  <?php } else { ?>
-     '<?php echo $pref->get('email') ?>'
-  <?php } ?>
   </p>
   <p>
   <?php echo _("Status") . _(": ") ?>
@@ -194,7 +157,6 @@
   </td></tr>
 
   <tr>
-    <?php if ($isForm) { ?>
       <td>
         <label for="notifyPages">
         <textarea id="notifyPages" name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages') ?></textarea>
@@ -201,9 +163,6 @@
         </label>
       </td>
       <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.") ?></p></td>
-    <?php } else { ?>
-      <td colspan="2"><?php echo $pref->get('notifyPages') ?></td>
-    <?php } ?>
   </tr>
 
   <tr>
@@ -239,25 +198,17 @@
   <tr><td colspan="2"><?php echo _("Here you can override site-specific default values.") ?></td></tr>
       <tr>
           <td>
-          <?php if ($isForm) { ?>
           <label for="theme">
-          <?php } ?>
           <?php echo $SelectThemesDesc ?>
-          <?php if ($isForm) { ?>
           </label>
-          <?php } ?>
           <?php echo $SelectThemes ?>
           </td>
           <td><p class="hint"><?php echo _("System default:") ?> <?php echo THEME ?></p></td></tr>
       <tr>
           <td>
-          <?php if ($isForm) { ?>
           <label for="lang">
-          <?php } ?>
           <?php echo $SelectLanguagesDesc ?>
-          <?php if ($isForm) { ?>
           </label>
-          <?php } ?>
           <?php echo $SelectLanguages ?>
           </td>
       <td><p class="hint"><?php echo _("System default:") ?> <?php echo DEFAULT_LANGUAGE ?></p></td></tr>
@@ -297,28 +248,16 @@
   <tr><td colspan="2"><h2><?php echo _("Edit Area Size") ?></h2></td></tr>
 
   <tr><td>
-    <?php if ($isForm) { ?>
     <label for="height">
-    <?php } ?>
     <?php echo _("Height") . _(":") ?>
-    <?php if ($isForm) { ?>
     </label>
      <input id="height" type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric"
             value="<?php echo $pref->get('editHeight') ?>" />
-    <?php } else { ?>
-      <?php echo $pref->get('editHeight') ?>
-    <?php } ?>
-    <?php if ($isForm) { ?>
     <label for="width">
-    <?php } ?>
     <?php echo _("Width") . _(":") ?>
-    <?php if ($isForm) { ?>
     </label>
      <input id="width" type="text" name="pref[editWidth]" size="4" maxlength="4" class="numeric"
             value="<?php echo $pref->get('editWidth') ?>" />
-    <?php } else { ?>
-      <?php echo $pref->get('editWidth') ?>
-    <?php } ?>
     </td>
     <td><p class="hint">
       <?php echo _("Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window.  In this case, the width preference will be ignored.") ?></p>
@@ -356,7 +295,6 @@
   </td></tr>
 </table>
 
-<?php if ($isForm) { ?>
 <hr />
 <p>
   <?php echo Button("submit:", _("Update Preferences"), 'wikiadmin') ?>
@@ -365,4 +303,3 @@
   <?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?>
 </p>
 </form>
-<?php } ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10889] trunk/themes/smaller/templates/actionbar.tmpl

[<var...@us...>]

Revision: 10889
          http://sourceforge.net/p/phpwiki/code/10889
Author:   vargenau
Date:     2022-01-12 15:37:39 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
Whitespace

Modified Paths:
--------------
    trunk/themes/smaller/templates/actionbar.tmpl

Modified: trunk/themes/smaller/templates/actionbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/actionbar.tmpl	2022-01-12 15:36:30 UTC (rev 10888)
+++ trunk/themes/smaller/templates/actionbar.tmpl	2022-01-12 15:37:39 UTC (rev 10889)
@@ -1,39 +1,35 @@
-<?php
-if (!$WikiTheme->DUMP_MODE) {
-// Only [Info] button when not signed in.
-// The rest behind Info
-?>
+<?php if (!$WikiTheme->DUMP_MODE) { ?>
 <table class="fullwidth">
 <tr class="baseline">
   <td>
   <div id="actionbuttons">
-     <?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
-       <?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
-     <?php } else { ?>
-       <?php echo Button("viewsource", _("View Source")) ?>
-     <?php } ?>
-     <?php if ( $user->isSignedIn()) { ?>
-      <?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?>
-       <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
-       <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $page->getName())) { ?>
-        <?php echo $SEP?><?php echo Button('chown') ?>
-        <?php echo $SEP?><?php echo Button('setacl') ?>
-        <?php echo $SEP?><?php echo Button('rename') ?>
-     <?php }} ?>
-     <?php if ($revision and ($user->isAdmin() or mayAccessPage('remove', $page->getName()))) { ?>
-      <?php echo $SEP?><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
+    <?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
+      <?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
+      <?php } else { ?>
+      <?php echo Button("viewsource", _("View Source")) ?>
+    <?php } ?>
+    <?php if ( $user->isSignedIn()) { ?>
+    <?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?>
+      <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
+    <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $page->getName())) { ?>
+      <?php echo $SEP?><?php echo Button('chown') ?>
+      <?php echo $SEP?><?php echo Button('setacl') ?>
+      <?php echo $SEP?><?php echo Button('rename') ?>
+    <?php }} ?>
+    <?php if ($revision and ($user->isAdmin() or mayAccessPage('remove', $page->getName()))) { ?>
+      <?php echo $SEP?><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
       <?php echo $SEP?><?php echo Button('remove') ?>
-     <?php } ?>
-     <?php echo $SEP?>
     <?php } ?>
-   <?php echo Button(array('action'=>__('PageInfo')), _("Info"), $page->getName()) ?>
+    <?php echo $SEP?>
+    <?php } ?>
+   <?php echo Button(array('action'=>__("PageInfo")), _("Info"), $page->getName()) ?>
 <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?>
-      <?php // Buttons really only for debugging ?>
-      <?php echo $SEP?><?php echo Button(__("PageHistory"), _("Page History")) ?>
-      <?php echo $SEP?><?php echo Button("diff") ?>
-      <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
+    <?php // Buttons really only for debugging ?>
+    <?php echo $SEP?><?php echo Button(__("PageHistory"), _("Page History")) ?>
+    <?php echo $SEP?><?php echo Button("diff") ?>
+    <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
     <?php // End debugging buttons ?>
-    <?php } ?>
+<?php } ?>
 <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
     <?php echo $SEP?><?php echo Button("pdf") ?>
 <?php } ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10888] trunk/themes/Crao/templates/actionbar.tmpl

[<var...@us...>]

Revision: 10888
          http://sourceforge.net/p/phpwiki/code/10888
Author:   vargenau
Date:     2022-01-12 15:36:30 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
Add {}; whitespace; harmonize PurgeCache

Modified Paths:
--------------
    trunk/themes/Crao/templates/actionbar.tmpl

Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl	2022-01-12 15:34:38 UTC (rev 10887)
+++ trunk/themes/Crao/templates/actionbar.tmpl	2022-01-12 15:36:30 UTC (rev 10888)
@@ -1,14 +1,16 @@
 <?php
-  if ($revision && (!$page->get('locked') || $user->isAdmin()))
-      $EditB = Button("edit",
-                      $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
-  else
-      $EditB = Button("viewsource", _("View Source"));
-  if (empty($revision)) $revision = $page->getCurrentRevision(false);
+if ($revision && (!$page->get('locked') || $user->isAdmin())) {
+    $EditB = Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
+} else {
+    $EditB = Button("viewsource", _("View Source"));
+}
+if (empty($revision)) {
+    $revision = $page->getCurrentRevision(false);
+}
 ?>
 <div id="actionbuttons">
 <?php echo $EditB ?>
-<?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
+<?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?>
 <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
 <?php if (ENABLE_PAGEPERM) { ?>
 <?php echo $SEP?><?php echo Button('chown') ?>
@@ -24,11 +26,10 @@
 <?php // Buttons really only for debugging ?>
 <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
 <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
-<?php $purgeb = Button(array('nocache' => 'purge'),
-                       _("Purge HTML cache"), $page->getName());
-      $purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
+<?php $PurgeCache = Button(array('nocache' => 'purge'), _("Purge HTML cache"), $page->getName());
+      $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
 ?>
-<?php echo $SEP?><?php echo $purgeb ?>
+<?php echo $SEP?><?php echo $PurgeCache ?>
 <?php // End debugging buttons ?>
 <?php } ?>
 <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10887] trunk/themes/default/templates/actionbar.tmpl

[<var...@us...>]

Revision: 10887
          http://sourceforge.net/p/phpwiki/code/10887
Author:   vargenau
Date:     2022-01-12 15:34:38 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
Whitespace

Modified Paths:
--------------
    trunk/themes/default/templates/actionbar.tmpl

Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl	2022-01-12 13:35:42 UTC (rev 10886)
+++ trunk/themes/default/templates/actionbar.tmpl	2022-01-12 15:34:38 UTC (rev 10887)
@@ -41,7 +41,7 @@
     <?php // End debugging buttons ?>
 <?php } ?>
 <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
-      <?php echo $SEP?><?php echo Button("pdf", "Pdf", 'wikiclear', array('id'=>'btn-pdf')) ?>
+    <?php echo $SEP?><?php echo Button("pdf", "Pdf", 'wikiclear', array('id'=>'btn-pdf')) ?>
 <?php } ?>
   </div>
   </td>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10886] trunk

[<var...@us...>]

Revision: 10886
          http://sourceforge.net/p/phpwiki/code/10886
Author:   vargenau
Date:     2022-01-12 13:35:42 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
Better handling of theme change in ~UserPreferences.

Modified Paths:
--------------
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-12 12:19:57 UTC (rev 10885)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-12 13:35:42 UTC (rev 10886)
@@ -1,4 +1,4 @@
-Date: Mon,  3 Jan 2022 11:57:23 +0000
+Date: Wed, 12 Jan 2022 14:33:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -16,11 +16,12 @@
 === Fixes ===
 * Make list of pages work with PDO (~AllPages, ~MostPopular...)
 * blog theme improved
+* Better handling of theme change in ~UserPreferences.
 
 === Changes ===
 * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
 * Add “Rename” tab in Sidebar theme.
-* Page locking and unlocking is now saved in page history.
+* Page locking and unlocking is now saved in page history (in Edit mode).
 * Add sample images for ~PhotoAlbum in blog theme.
 * Remove EDITING_POLICY
 * Remove ENABLE_XHTML_XML

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2022-01-12 12:19:57 UTC (rev 10885)
+++ trunk/pgsrc/ReleaseNotes	2022-01-12 13:35:42 UTC (rev 10886)
@@ -1,4 +1,4 @@
-Date: Mon,  3 Jan 2022 11:57:23 +0000
+Date: Wed, 12 Jan 2022 14:33:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -16,11 +16,12 @@
 === Fixes ===
 * Make list of pages work with PDO (~AllPages, ~MostPopular...)
 * blog theme improved
+* Better handling of theme change in ~UserPreferences.
 
 === Changes ===
 * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
 * Add “Rename” tab in Sidebar theme.
-* Page locking and unlocking is now saved in page history.
+* Page locking and unlocking is now saved in page history (in Edit mode).
 * Add sample images for ~PhotoAlbum in blog theme.
 * Remove EDITING_POLICY
 * Remove ENABLE_XHTML_XML

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10885] trunk

[<var...@us...>]

Revision: 10885
          http://sourceforge.net/p/phpwiki/code/10885
Author:   vargenau
Date:     2022-01-12 12:19:57 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
UserPreferences: display feedback banner in case of redirect

Modified Paths:
--------------
    trunk/lib/plugin/UserPreferences.php
    trunk/themes/default/templates/userprefs.tmpl

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2022-01-12 11:36:57 UTC (rev 10884)
+++ trunk/lib/plugin/UserPreferences.php	2022-01-12 12:19:57 UTC (rev 10885)
@@ -114,7 +114,8 @@
                     $request->setArg("verify", false);
                     $request->setArg("delete", false);
                     if ($old_theme != THEME) {
-                        return HTML($request->redirect(WikiURL(__("UserPreferences"), array(), 'absurl'), false));
+                        $url = WikiURL(__("UserPreferences"), array(), 'absurl')."?num=reset";
+                        return HTML($request->redirect($url, false));
                     }
 
                     $errmsg .= _("Your UserPreferences have been successfully reset to default.");
@@ -182,7 +183,8 @@
                         // If user has changed theme, we redirect so that the display is not ugly
                         // (mix of old and new templates)
                         if ($new_theme && ($new_theme != $old_theme)) {
-                            return HTML($request->redirect(WikiURL(__("UserPreferences"), array(), 'absurl'), false));
+                            $url = WikiURL(__("UserPreferences"), array(), 'absurl').'?num='.$num;
+                            return HTML($request->redirect($url, false));
                         }
                     }
 

Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2022-01-12 11:36:57 UTC (rev 10884)
+++ trunk/themes/default/templates/userprefs.tmpl	2022-01-12 12:19:57 UTC (rev 10885)
@@ -9,6 +9,7 @@
 $time = time();
 $user =& $request->getUser();
 $pref =& $request->_prefs;
+$num = $request->getArg('num');
 
 if (!$pref) return;
 $offset = $pref->get('timeOffset');
@@ -118,6 +119,15 @@
 
 ?>
 <?php echo $errmsg ?>
+<?php if (empty($errmsg)) { ?>
+<?php if ($num=='reset') { ?>
+<div class="feedback"><p><?php echo _('Your UserPreferences have been successfully reset to default.') ?></p></div>
+<?php } elseif ($num==1) { ?>
+<div class="feedback"><p><?php echo _('One UserPreferences field successfully updated.') ?></p></div>
+<?php } elseif ($num) { ?>
+<div class="feedback"><p><?php echo sprintf(_("%d UserPreferences fields successfully updated."), $num) ?></p></div>
+<?php } ?>
+<?php } ?>
 <p>
 <?php echo fmt("User preferences for user %s", WikiLink($user->UserName())) ?>
 </p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10884] trunk/lib/plugin/UserPreferences.php

[<var...@us...>]

Revision: 10884
          http://sourceforge.net/p/phpwiki/code/10884
Author:   vargenau
Date:     2022-01-12 11:36:57 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
UserPreferences: If user has changed theme, we redirect so that the display is not ugly (mix of old and new templates)

Modified Paths:
--------------
    trunk/lib/plugin/UserPreferences.php

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2022-01-11 11:37:40 UTC (rev 10883)
+++ trunk/lib/plugin/UserPreferences.php	2022-01-12 11:36:57 UTC (rev 10884)
@@ -74,6 +74,8 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
+        $pref = &$request->_prefs;
+        $old_theme = $pref->get('theme');
         $args = $this->getArgs($argstr, $request);
         $user =& $request->_user;
         $user->_request = $request;
@@ -111,6 +113,10 @@
                     $request->_setUser($user);
                     $request->setArg("verify", false);
                     $request->setArg("delete", false);
+                    if ($old_theme != THEME) {
+                        return HTML($request->redirect(WikiURL(__("UserPreferences"), array(), 'absurl'), false));
+                    }
+
                     $errmsg .= _("Your UserPreferences have been successfully reset to default.");
                     $args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
                     return Template('userprefs', $args);
@@ -172,6 +178,12 @@
                         $args['errmsg'] = HTML::div(array('class' => 'error'), HTML::p($errmsg));
                     } else {
                         $args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
+                        $new_theme = $rp['theme'];
+                        // If user has changed theme, we redirect so that the display is not ugly
+                        // (mix of old and new templates)
+                        if ($new_theme && ($new_theme != $old_theme)) {
+                            return HTML($request->redirect(WikiURL(__("UserPreferences"), array(), 'absurl'), false));
+                        }
                     }
 
                 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10883] trunk/lib/plugin/UserPreferences.php

[<var...@us...>]

Revision: 10883
          http://sourceforge.net/p/phpwiki/code/10883
Author:   vargenau
Date:     2022-01-11 11:37:40 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
UserPreferences plugin: remove unused variable; no need to update_locale

Modified Paths:
--------------
    trunk/lib/plugin/UserPreferences.php

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2022-01-11 10:50:09 UTC (rev 10882)
+++ trunk/lib/plugin/UserPreferences.php	2022-01-11 11:37:40 UTC (rev 10883)
@@ -36,7 +36,6 @@
 class WikiPlugin_UserPreferences
     extends WikiPlugin
 {
-    public $bool_args;
     public $_request;
 
     function getDescription()
@@ -162,7 +161,6 @@
                         } else {
                             $request->_setUser($user);
                             $pref = $user->_prefs;
-                            update_locale($rp['lang']); // Update locale in case user has changed language
                             if ($num == 1) {
                                 $errmsg .= _("One UserPreferences field successfully updated.");
                             } else {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10882] trunk/themes/Crao/buttons

[<var...@us...>]

Revision: 10882
          http://sourceforge.net/p/phpwiki/code/10882
Author:   vargenau
Date:     2022-01-11 10:50:09 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
More Crao buttons

Added Paths:
-----------
    trunk/themes/Crao/buttons/de/Anmelden.png
    trunk/themes/Crao/buttons/es/Borrar+P%C3%A1gina.png
    trunk/themes/Crao/buttons/es/Desbloquear+P%C3%A1gina.png
    trunk/themes/Crao/buttons/es/Editar.png
    trunk/themes/Crao/buttons/fr/S%27identifier.png
    trunk/themes/Crao/buttons/it/Login.png
    trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%A4%E3%83%B3.png
    trunk/themes/Crao/buttons/ja/%E3%83%87%E3%83%90%E3%82%B0%E6%83%85%E5%A0%B1.png
    trunk/themes/Crao/buttons/ja/%E3%83%9E%E3%83%BC%E3%82%AF%E3%82%A2%E3%83%83%E3%83%97%E3%82%AD%E3%83%A3%E3%83%83%E3%82%B7%E3%83%A5%E3%81%AE%E7%A0%B4%E6%A3%84.png
    trunk/themes/Crao/buttons/sv/L%C3%A5s+upp+Sida.png
    trunk/themes/Crao/buttons/sv/Ta+bort+sida.png

Added: trunk/themes/Crao/buttons/de/Anmelden.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/de/Anmelden.png
===================================================================
--- trunk/themes/Crao/buttons/de/Anmelden.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/de/Anmelden.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/de/Anmelden.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/es/Borrar+P%C3%A1gina.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/es/Borrar+P%C3%A1gina.png
===================================================================
--- trunk/themes/Crao/buttons/es/Borrar+P%C3%A1gina.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/es/Borrar+P%C3%A1gina.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/es/Borrar+P%C3%A1gina.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/es/Desbloquear+P%C3%A1gina.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/es/Desbloquear+P%C3%A1gina.png
===================================================================
--- trunk/themes/Crao/buttons/es/Desbloquear+P%C3%A1gina.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/es/Desbloquear+P%C3%A1gina.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/es/Desbloquear+P%C3%A1gina.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/es/Editar.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/es/Editar.png
===================================================================
--- trunk/themes/Crao/buttons/es/Editar.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/es/Editar.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/es/Editar.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/fr/S%27identifier.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/fr/S%27identifier.png
===================================================================
--- trunk/themes/Crao/buttons/fr/S%27identifier.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/fr/S%27identifier.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/fr/S%27identifier.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/it/Login.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/it/Login.png
===================================================================
--- trunk/themes/Crao/buttons/it/Login.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/it/Login.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/it/Login.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%A4%E3%83%B3.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%A4%E3%83%B3.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%A4%E3%83%B3.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%A4%E3%83%B3.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%A4%E3%83%B3.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%83%87%E3%83%90%E3%82%B0%E6%83%85%E5%A0%B1.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%83%87%E3%83%90%E3%82%B0%E6%83%85%E5%A0%B1.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%83%87%E3%83%90%E3%82%B0%E6%83%85%E5%A0%B1.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/ja/%E3%83%87%E3%83%90%E3%82%B0%E6%83%85%E5%A0%B1.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%83%87%E3%83%90%E3%82%B0%E6%83%85%E5%A0%B1.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%83%9E%E3%83%BC%E3%82%AF%E3%82%A2%E3%83%83%E3%83%97%E3%82%AD%E3%83%A3%E3%83%83%E3%82%B7%E3%83%A5%E3%81%AE%E7%A0%B4%E6%A3%84.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%83%9E%E3%83%BC%E3%82%AF%E3%82%A2%E3%83%83%E3%83%97%E3%82%AD%E3%83%A3%E3%83%83%E3%82%B7%E3%83%A5%E3%81%AE%E7%A0%B4%E6%A3%84.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%83%9E%E3%83%BC%E3%82%AF%E3%82%A2%E3%83%83%E3%83%97%E3%82%AD%E3%83%A3%E3%83%83%E3%82%B7%E3%83%A5%E3%81%AE%E7%A0%B4%E6%A3%84.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/ja/%E3%83%9E%E3%83%BC%E3%82%AF%E3%82%A2%E3%83%83%E3%83%97%E3%82%AD%E3%83%A3%E3%83%83%E3%82%B7%E3%83%A5%E3%81%AE%E7%A0%B4%E6%A3%84.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%83%9E%E3%83%BC%E3%82%AF%E3%82%A2%E3%83%83%E3%83%97%E3%82%AD%E3%83%A3%E3%83%83%E3%82%B7%E3%83%A5%E3%81%AE%E7%A0%B4%E6%A3%84.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/sv/L%C3%A5s+upp+Sida.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/sv/L%C3%A5s+upp+Sida.png
===================================================================
--- trunk/themes/Crao/buttons/sv/L%C3%A5s+upp+Sida.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/sv/L%C3%A5s+upp+Sida.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/sv/L%C3%A5s+upp+Sida.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/sv/Ta+bort+sida.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/sv/Ta+bort+sida.png
===================================================================
--- trunk/themes/Crao/buttons/sv/Ta+bort+sida.png	2022-01-11 10:27:54 UTC (rev 10881)
+++ trunk/themes/Crao/buttons/sv/Ta+bort+sida.png	2022-01-11 10:50:09 UTC (rev 10882)

Property changes on: trunk/themes/Crao/buttons/sv/Ta+bort+sida.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10881] trunk

[<var...@us...>]

Revision: 10881
          http://sourceforge.net/p/phpwiki/code/10881
Author:   vargenau
Date:     2022-01-11 10:27:54 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
Use smart quotes

Modified Paths:
--------------
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/lib/plugin/SemanticSearch.php	2022-01-11 10:27:54 UTC (rev 10881)
@@ -459,7 +459,7 @@
             $pagelist->setCaption
             ( // on mozilla the form doesn't fit into the caption very well.
                 HTML($noform ? '' : HTML($form, HTML::hr()),
-                    fmt("Semantic %s Search Result for \"%s\" in pages \"%s\"",
+                    fmt("Semantic %s Search Result for “%s” in pages “%s”",
                         $searchtype, $querydesc, $page)));
         }
         return $pagelist;

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2022-01-11 10:27:54 UTC (rev 10881)
@@ -200,7 +200,7 @@
         if (!$noheader) {
             $pagelist->setCaption
             (HTML($noform ? '' : HTML($form, HTML::hr()),
-                fmt("Semantic %s Search Result for \"%s\" in pages \"%s\"",
+                fmt("Semantic %s Search Result for “%s” in pages “%s”",
                     '', $s, $page)));
         }
         if (!$regex and $missing = array_diff($parsed_relations, $allrelations))

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/locale/po/de.po	2022-01-11 10:27:54 UTC (rev 10881)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 12:06+0100\n"
+"POT-Creation-Date: 2022-01-11 11:27+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."
@@ -2782,7 +2782,7 @@
 msgstr ""
 
 #, php-format
-msgid "Semantic %s Search Result for \"%s\" in pages \"%s\""
+msgid "Semantic %s Search Result for “%s” in pages “%s”"
 msgstr ""
 
 msgid "Relation"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/locale/po/es.po	2022-01-11 10:27:54 UTC (rev 10881)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 12:06+0100\n"
+"POT-Creation-Date: 2022-01-11 11:27+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2715,7 +2715,7 @@
 msgstr ""
 
 #, php-format
-msgid "Semantic %s Search Result for \"%s\" in pages \"%s\""
+msgid "Semantic %s Search Result for “%s” in pages “%s”"
 msgstr ""
 
 msgid "Relation"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/locale/po/fr.po	2022-01-11 10:27:54 UTC (rev 10881)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 12:06+0100\n"
+"POT-Creation-Date: 2022-01-11 11:27+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."
@@ -2762,7 +2762,7 @@
 msgstr ""
 
 #, php-format
-msgid "Semantic %s Search Result for \"%s\" in pages \"%s\""
+msgid "Semantic %s Search Result for “%s” in pages “%s”"
 msgstr ""
 
 msgid "Relation"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/locale/po/it.po	2022-01-11 10:27:54 UTC (rev 10881)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 12:06+0100\n"
+"POT-Creation-Date: 2022-01-11 11:27+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"
@@ -2692,7 +2692,7 @@
 msgstr ""
 
 #, php-format
-msgid "Semantic %s Search Result for \"%s\" in pages \"%s\""
+msgid "Semantic %s Search Result for “%s” in pages “%s”"
 msgstr ""
 
 msgid "Relation"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/locale/po/ja.po	2022-01-11 10:27:54 UTC (rev 10881)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 12:06+0100\n"
+"POT-Creation-Date: 2022-01-11 11:27+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"
@@ -2678,7 +2678,7 @@
 msgstr ""
 
 #, php-format
-msgid "Semantic %s Search Result for \"%s\" in pages \"%s\""
+msgid "Semantic %s Search Result for “%s” in pages “%s”"
 msgstr ""
 
 msgid "Relation"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/locale/po/nl.po	2022-01-11 10:27:54 UTC (rev 10881)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 12:06+0100\n"
+"POT-Creation-Date: 2022-01-11 11:27+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"
@@ -2684,7 +2684,7 @@
 msgstr ""
 
 #, php-format
-msgid "Semantic %s Search Result for \"%s\" in pages \"%s\""
+msgid "Semantic %s Search Result for “%s” in pages “%s”"
 msgstr ""
 
 msgid "Relation"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/locale/po/phpwiki.pot	2022-01-11 10:27:54 UTC (rev 10881)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 12:06+0100\n"
+"POT-Creation-Date: 2022-01-11 11:27+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"
@@ -2678,7 +2678,7 @@
 msgstr ""
 
 #, php-format
-msgid "Semantic %s Search Result for \"%s\" in pages \"%s\""
+msgid "Semantic %s Search Result for “%s” in pages “%s”"
 msgstr ""
 
 msgid "Relation"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/locale/po/sv.po	2022-01-11 10:27:54 UTC (rev 10881)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 12:06+0100\n"
+"POT-Creation-Date: 2022-01-11 11:27+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2679,7 +2679,7 @@
 msgstr ""
 
 #, php-format
-msgid "Semantic %s Search Result for \"%s\" in pages \"%s\""
+msgid "Semantic %s Search Result for “%s” in pages “%s”"
 msgstr ""
 
 msgid "Relation"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-11 10:15:40 UTC (rev 10880)
+++ trunk/locale/po/zh.po	2022-01-11 10:27:54 UTC (rev 10881)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-06 12:06+0100\n"
+"POT-Creation-Date: 2022-01-11 11:27+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2687,7 +2687,7 @@
 msgstr ""
 
 #, php-format
-msgid "Semantic %s Search Result for \"%s\" in pages \"%s\""
+msgid "Semantic %s Search Result for “%s” in pages “%s”"
 msgstr ""
 
 msgid "Relation"

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10880] trunk/locale/po/sv.po

[<var...@us...>]

Revision: 10880
          http://sourceforge.net/p/phpwiki/code/10880
Author:   vargenau
Date:     2022-01-11 10:15:40 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
Fix Swedish translations

Modified Paths:
--------------
    trunk/locale/po/sv.po

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-11 09:36:29 UTC (rev 10879)
+++ trunk/locale/po/sv.po	2022-01-11 10:15:40 UTC (rev 10880)
@@ -1737,7 +1737,7 @@
 msgstr ""
 
 msgid "Go"
-msgstr "\"Gå till sidan\""
+msgstr "Gå"
 
 msgid "GraphViz image or imagemap creation of directed graphs."
 msgstr ""
@@ -2423,7 +2423,7 @@
 msgstr ""
 
 msgid "new pages"
-msgstr "Ta bort sida"
+msgstr ""
 
 msgid "edits"
 msgstr ""
@@ -4330,7 +4330,7 @@
 
 #, php-format
 msgid "You are about to purge “%s”!"
-msgstr "Du kommer att ta bort \"%s\" permanent!"
+msgstr "Du kommer att ta bort “%s” permanent!"
 
 msgid "Someone has edited the page!"
 msgstr ""
@@ -4350,7 +4350,7 @@
 
 #, php-format
 msgid "You are about to remove “%s”!"
-msgstr "Du kommer att ta bort \"%s\" permanent!"
+msgstr "Du kommer att ta bort “%s” permanent!"
 
 #, php-format
 msgid ""

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10879] trunk/themes/Crao/buttons

[<var...@us...>]

Revision: 10879
          http://sourceforge.net/p/phpwiki/code/10879
Author:   vargenau
Date:     2022-01-11 09:36:29 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
More Crao cancel buttons

Added Paths:
-----------
    trunk/themes/Crao/buttons/es/Cancelar.png
    trunk/themes/Crao/buttons/it/Annulla.png
    trunk/themes/Crao/buttons/nl/Annuleer.png
    trunk/themes/Crao/buttons/zh/%E5%8F%96%E6%B6%88.png

Added: trunk/themes/Crao/buttons/es/Cancelar.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/es/Cancelar.png
===================================================================
--- trunk/themes/Crao/buttons/es/Cancelar.png	2022-01-11 09:13:59 UTC (rev 10878)
+++ trunk/themes/Crao/buttons/es/Cancelar.png	2022-01-11 09:36:29 UTC (rev 10879)

Property changes on: trunk/themes/Crao/buttons/es/Cancelar.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/it/Annulla.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/it/Annulla.png
===================================================================
--- trunk/themes/Crao/buttons/it/Annulla.png	2022-01-11 09:13:59 UTC (rev 10878)
+++ trunk/themes/Crao/buttons/it/Annulla.png	2022-01-11 09:36:29 UTC (rev 10879)

Property changes on: trunk/themes/Crao/buttons/it/Annulla.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/nl/Annuleer.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/nl/Annuleer.png
===================================================================
--- trunk/themes/Crao/buttons/nl/Annuleer.png	2022-01-11 09:13:59 UTC (rev 10878)
+++ trunk/themes/Crao/buttons/nl/Annuleer.png	2022-01-11 09:36:29 UTC (rev 10879)

Property changes on: trunk/themes/Crao/buttons/nl/Annuleer.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/zh/%E5%8F%96%E6%B6%88.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/zh/%E5%8F%96%E6%B6%88.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E5%8F%96%E6%B6%88.png	2022-01-11 09:13:59 UTC (rev 10878)
+++ trunk/themes/Crao/buttons/zh/%E5%8F%96%E6%B6%88.png	2022-01-11 09:36:29 UTC (rev 10879)

Property changes on: trunk/themes/Crao/buttons/zh/%E5%8F%96%E6%B6%88.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10878] trunk/themes/Crao/buttons

[<var...@us...>]

Revision: 10878
          http://sourceforge.net/p/phpwiki/code/10878
Author:   vargenau
Date:     2022-01-11 09:13:59 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
Add Swedish Crao buttons

Added Paths:
-----------
    trunk/themes/Crao/buttons/sv/
    trunk/themes/Crao/buttons/sv/Anslut.png
    trunk/themes/Crao/buttons/sv/Avbyrt.png
    trunk/themes/Crao/buttons/sv/Logga+ut.png
    trunk/themes/Crao/buttons/sv/Redigera.png
    trunk/themes/Crao/buttons/sv/S%C3%B6kEfterSida.png
    trunk/themes/Crao/buttons/sv/Visa+K%C3%A4llkoden.png

Added: trunk/themes/Crao/buttons/sv/Anslut.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/sv/Anslut.png
===================================================================
--- trunk/themes/Crao/buttons/sv/Anslut.png	2022-01-11 08:59:09 UTC (rev 10877)
+++ trunk/themes/Crao/buttons/sv/Anslut.png	2022-01-11 09:13:59 UTC (rev 10878)

Property changes on: trunk/themes/Crao/buttons/sv/Anslut.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/sv/Avbyrt.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/sv/Avbyrt.png
===================================================================
--- trunk/themes/Crao/buttons/sv/Avbyrt.png	2022-01-11 08:59:09 UTC (rev 10877)
+++ trunk/themes/Crao/buttons/sv/Avbyrt.png	2022-01-11 09:13:59 UTC (rev 10878)

Property changes on: trunk/themes/Crao/buttons/sv/Avbyrt.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/sv/Logga+ut.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/sv/Logga+ut.png
===================================================================
--- trunk/themes/Crao/buttons/sv/Logga+ut.png	2022-01-11 08:59:09 UTC (rev 10877)
+++ trunk/themes/Crao/buttons/sv/Logga+ut.png	2022-01-11 09:13:59 UTC (rev 10878)

Property changes on: trunk/themes/Crao/buttons/sv/Logga+ut.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/sv/Redigera.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/sv/Redigera.png
===================================================================
--- trunk/themes/Crao/buttons/sv/Redigera.png	2022-01-11 08:59:09 UTC (rev 10877)
+++ trunk/themes/Crao/buttons/sv/Redigera.png	2022-01-11 09:13:59 UTC (rev 10878)

Property changes on: trunk/themes/Crao/buttons/sv/Redigera.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/sv/S%C3%B6kEfterSida.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/sv/S%C3%B6kEfterSida.png
===================================================================
--- trunk/themes/Crao/buttons/sv/S%C3%B6kEfterSida.png	2022-01-11 08:59:09 UTC (rev 10877)
+++ trunk/themes/Crao/buttons/sv/S%C3%B6kEfterSida.png	2022-01-11 09:13:59 UTC (rev 10878)

Property changes on: trunk/themes/Crao/buttons/sv/S%C3%B6kEfterSida.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/sv/Visa+K%C3%A4llkoden.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/sv/Visa+K%C3%A4llkoden.png
===================================================================
--- trunk/themes/Crao/buttons/sv/Visa+K%C3%A4llkoden.png	2022-01-11 08:59:09 UTC (rev 10877)
+++ trunk/themes/Crao/buttons/sv/Visa+K%C3%A4llkoden.png	2022-01-11 09:13:59 UTC (rev 10878)

Property changes on: trunk/themes/Crao/buttons/sv/Visa+K%C3%A4llkoden.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10877] trunk/themes/Crao/buttons

[<var...@us...>]

Revision: 10877
          http://sourceforge.net/p/phpwiki/code/10877
Author:   vargenau
Date:     2022-01-11 08:59:09 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
Add Dutch Crao buttons

Added Paths:
-----------
    trunk/themes/Crao/buttons/nl/
    trunk/themes/Crao/buttons/nl/Bron+Tekst.png
    trunk/themes/Crao/buttons/nl/Open+Pagina.png
    trunk/themes/Crao/buttons/nl/Pagina+Geschiedenis.png
    trunk/themes/Crao/buttons/nl/Sluit+Pagina+Af.png
    trunk/themes/Crao/buttons/nl/TerugLinks.png
    trunk/themes/Crao/buttons/nl/Verander.png
    trunk/themes/Crao/buttons/nl/Verwijder+Pagina.png
    trunk/themes/Crao/buttons/nl/ZoekPagina.png

Added: trunk/themes/Crao/buttons/nl/Bron+Tekst.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/nl/Bron+Tekst.png
===================================================================
--- trunk/themes/Crao/buttons/nl/Bron+Tekst.png	2022-01-11 08:32:25 UTC (rev 10876)
+++ trunk/themes/Crao/buttons/nl/Bron+Tekst.png	2022-01-11 08:59:09 UTC (rev 10877)

Property changes on: trunk/themes/Crao/buttons/nl/Bron+Tekst.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/nl/Open+Pagina.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/nl/Open+Pagina.png
===================================================================
--- trunk/themes/Crao/buttons/nl/Open+Pagina.png	2022-01-11 08:32:25 UTC (rev 10876)
+++ trunk/themes/Crao/buttons/nl/Open+Pagina.png	2022-01-11 08:59:09 UTC (rev 10877)

Property changes on: trunk/themes/Crao/buttons/nl/Open+Pagina.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/nl/Pagina+Geschiedenis.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/nl/Pagina+Geschiedenis.png
===================================================================
--- trunk/themes/Crao/buttons/nl/Pagina+Geschiedenis.png	2022-01-11 08:32:25 UTC (rev 10876)
+++ trunk/themes/Crao/buttons/nl/Pagina+Geschiedenis.png	2022-01-11 08:59:09 UTC (rev 10877)

Property changes on: trunk/themes/Crao/buttons/nl/Pagina+Geschiedenis.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/nl/Sluit+Pagina+Af.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/nl/Sluit+Pagina+Af.png
===================================================================
--- trunk/themes/Crao/buttons/nl/Sluit+Pagina+Af.png	2022-01-11 08:32:25 UTC (rev 10876)
+++ trunk/themes/Crao/buttons/nl/Sluit+Pagina+Af.png	2022-01-11 08:59:09 UTC (rev 10877)

Property changes on: trunk/themes/Crao/buttons/nl/Sluit+Pagina+Af.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/nl/TerugLinks.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/nl/TerugLinks.png
===================================================================
--- trunk/themes/Crao/buttons/nl/TerugLinks.png	2022-01-11 08:32:25 UTC (rev 10876)
+++ trunk/themes/Crao/buttons/nl/TerugLinks.png	2022-01-11 08:59:09 UTC (rev 10877)

Property changes on: trunk/themes/Crao/buttons/nl/TerugLinks.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/nl/Verander.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/nl/Verander.png
===================================================================
--- trunk/themes/Crao/buttons/nl/Verander.png	2022-01-11 08:32:25 UTC (rev 10876)
+++ trunk/themes/Crao/buttons/nl/Verander.png	2022-01-11 08:59:09 UTC (rev 10877)

Property changes on: trunk/themes/Crao/buttons/nl/Verander.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/nl/Verwijder+Pagina.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/nl/Verwijder+Pagina.png
===================================================================
--- trunk/themes/Crao/buttons/nl/Verwijder+Pagina.png	2022-01-11 08:32:25 UTC (rev 10876)
+++ trunk/themes/Crao/buttons/nl/Verwijder+Pagina.png	2022-01-11 08:59:09 UTC (rev 10877)

Property changes on: trunk/themes/Crao/buttons/nl/Verwijder+Pagina.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/nl/ZoekPagina.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/nl/ZoekPagina.png
===================================================================
--- trunk/themes/Crao/buttons/nl/ZoekPagina.png	2022-01-11 08:32:25 UTC (rev 10876)
+++ trunk/themes/Crao/buttons/nl/ZoekPagina.png	2022-01-11 08:59:09 UTC (rev 10877)

Property changes on: trunk/themes/Crao/buttons/nl/ZoekPagina.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10876] trunk/themes/Crao/buttons

[<var...@us...>]

Revision: 10876
          http://sourceforge.net/p/phpwiki/code/10876
Author:   vargenau
Date:     2022-01-11 08:32:25 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
Add Japanese Crao buttons

Added Paths:
-----------
    trunk/themes/Crao/buttons/ja/
    trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%B5%E3%82%A6%E3%83%88.png
    trunk/themes/Crao/buttons/ja/%E3%82%BD%E3%83%BC%E3%82%B9%E3%82%92%E8%A6%8B%E3%82%8B.png
    trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF%E8%A7%A3%E9%99%A4.png
    trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF.png
    trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%89%8A%E9%99%A4.png
    trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%B1%A5%E6%AD%B4.png
    trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%83%85%E5%A0%B1.png
    trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2.png
    trunk/themes/Crao/buttons/ja/%E5%B7%AE%E5%88%86.png
    trunk/themes/Crao/buttons/ja/%E7%B7%A8%E9%9B%86.png

Added: trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%B5%E3%82%A6%E3%83%88.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%B5%E3%82%A6%E3%83%88.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%B5%E3%82%A6%E3%83%88.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%B5%E3%82%A6%E3%83%88.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%82%B5%E3%82%A4%E3%83%B3%E3%82%B5%E3%82%A6%E3%83%88.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%82%BD%E3%83%BC%E3%82%B9%E3%82%92%E8%A6%8B%E3%82%8B.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%82%BD%E3%83%BC%E3%82%B9%E3%82%92%E8%A6%8B%E3%82%8B.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%82%BD%E3%83%BC%E3%82%B9%E3%82%92%E8%A6%8B%E3%82%8B.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E3%82%BD%E3%83%BC%E3%82%B9%E3%82%92%E8%A6%8B%E3%82%8B.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%82%BD%E3%83%BC%E3%82%B9%E3%82%92%E8%A6%8B%E3%82%8B.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF%E8%A7%A3%E9%99%A4.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF%E8%A7%A3%E9%99%A4.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF%E8%A7%A3%E9%99%A4.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF%E8%A7%A3%E9%99%A4.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF%E8%A7%A3%E9%99%A4.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E3%83%AD%E3%83%83%E3%82%AF.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%89%8A%E9%99%A4.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%89%8A%E9%99%A4.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%89%8A%E9%99%A4.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%89%8A%E9%99%A4.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%89%8A%E9%99%A4.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%B1%A5%E6%AD%B4.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%B1%A5%E6%AD%B4.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%B1%A5%E6%AD%B4.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%B1%A5%E6%AD%B4.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E5%B1%A5%E6%AD%B4.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%83%85%E5%A0%B1.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%83%85%E5%A0%B1.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%83%85%E5%A0%B1.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%83%85%E5%A0%B1.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%83%85%E5%A0%B1.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E5%B7%AE%E5%88%86.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E5%B7%AE%E5%88%86.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E5%B7%AE%E5%88%86.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E5%B7%AE%E5%88%86.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E5%B7%AE%E5%88%86.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/themes/Crao/buttons/ja/%E7%B7%A8%E9%9B%86.png
===================================================================
(Binary files differ)

Index: trunk/themes/Crao/buttons/ja/%E7%B7%A8%E9%9B%86.png
===================================================================
--- trunk/themes/Crao/buttons/ja/%E7%B7%A8%E9%9B%86.png	2022-01-10 18:40:40 UTC (rev 10875)
+++ trunk/themes/Crao/buttons/ja/%E7%B7%A8%E9%9B%86.png	2022-01-11 08:32:25 UTC (rev 10876)

Property changes on: trunk/themes/Crao/buttons/ja/%E7%B7%A8%E9%9B%86.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.