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

[phpwiki-checkins] SF.net SVN: phpwiki:[10023] trunk/lib/WikiDB/backend/PearDB.php

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

Revision: 10023
          http://sourceforge.net/p/phpwiki/code/10023
Author:   vargenau
Date:     2017-07-11 13:47:03 +0000 (Tue, 11 Jul 2017)
Log Message:
-----------
Indent

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB.php

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2017-07-10 16:26:33 UTC (rev 10022)
+++ trunk/lib/WikiDB/backend/PearDB.php	2017-07-11 13:47:03 UTC (rev 10023)
@@ -399,7 +399,8 @@
         if (isset($query_result['content']))
             $data['%content'] = $query_result['content'];
         elseif ($query_result['have_content'])
-            $data['%content'] = true; else
+            $data['%content'] = true;
+        else
             $data['%content'] = '';
 
         // FIXME: this is ugly.

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

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

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

Revision: 10022
          http://sourceforge.net/p/phpwiki/code/10022
Author:   vargenau
Date:     2017-07-10 16:26:33 +0000 (Mon, 10 Jul 2017)
Log Message:
-----------
PDO patch by Sebastien Le Callonnec

Modified Paths:
--------------
    trunk/lib/DbSession/PDO.php
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/wikilens/RatingsDb.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2017-07-07 12:14:48 UTC (rev 10021)
+++ trunk/lib/DbSession/PDO.php	2017-07-10 16:26:33 UTC (rev 10022)
@@ -175,8 +175,10 @@
          */
         if (USE_SAFE_DBSESSION) {
             $this->_backend->beginTransaction();
-            $rs = $this->query("DELETE FROM $table"
-                . " WHERE sess_id=$id");
+            $delete = $this->prepare("DELETE FROM $table"
+                . " WHERE sess_id=?");
+            $delete->bindParam(1, $id, PDO::PARAM_STR, 32);
+            $delete->execute();
             $sth = $dbh->prepare("INSERT INTO $table"
                 . " (sess_id, sess_data, sess_date, sess_ip)"
                 . " VALUES (?, ?, ?, ?)");

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2017-07-07 12:14:48 UTC (rev 10021)
+++ trunk/lib/WikiDB/backend/PDO.php	2017-07-10 16:26:33 UTC (rev 10022)
@@ -385,6 +385,7 @@
         $page_tbl = $this->_table_names['page_tbl'];
         $sth = $dbh->prepare("SELECT id FROM $page_tbl WHERE pagename=? LIMIT 1");
         $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->execute();
         $id = $sth->fetchColumn();
         if (!$create_if_missing) {
             return $id;
@@ -937,7 +938,7 @@
     {
         $s = '(';
         foreach ($pagenames as $p) {
-            $s .= ($this->_dbh->qstr($p) . ",");
+            $s .= ($this->_dbh->quote($p) . ",");
         }
         return substr($s, 0, -1) . ")";
     }
@@ -1326,7 +1327,7 @@
         $sth = $dbh->prepare("INSERT INTO $log_tbl"
             . " (time_stamp,remote_host,remote_user,request_method,request_line,request_args,"
             . "request_file,request_uri,request_time,status,bytes_sent,referer,agent,request_duration)"
-            . " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)");
+            . " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
         // Either use unixtime as %d (long), or the native timestamp format.
         $sth->bindParam(1, $entry->time, PDO::PARAM_INT);
         $sth->bindParam(2, $entry->host, PDO::PARAM_STR, 100);
@@ -1341,7 +1342,7 @@
         $sth->bindParam(11, $entry->size, PDO::PARAM_INT);
         $sth->bindParam(12, $entry->referer, PDO::PARAM_STR, 255);
         $sth->bindParam(13, $entry->user_agent, PDO::PARAM_STR, 255);
-        $sth->bindParam(14, $entry->duration, PDO::PARAM_FLOAT);
+        $sth->bindParam(14, $entry->duration, PDO::PARAM_STR);
         $sth->execute();
     }
 }

Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php	2017-07-07 12:14:48 UTC (rev 10021)
+++ trunk/lib/wikilens/RatingsDb.php	2017-07-10 16:26:33 UTC (rev 10022)
@@ -90,6 +90,9 @@
             } elseif (is_a($this->_backend, 'WikiDB_backend_ADODOB')) {
                 $this->_sqlbackend = &$this->_backend;
                 $this->dbtype = "ADODB";
+            } elseif (is_a($this->_backend, 'WikiDB_backend_PDO')) {
+                $this->_sqlbackend = &$this->_backend;
+                $this->dbtype = "PDO";
             } else {
                 include_once 'lib/WikiDB/backend/ADODB.php';
                 // It is not possible to decouple a ref from the source again. (4.3.11)

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2017-07-07 12:14:48 UTC (rev 10021)
+++ trunk/pgsrc/ReleaseNotes	2017-07-10 16:26:33 UTC (rev 10022)
@@ -1,4 +1,4 @@
-Date: Wed, 24 May 2017 19:26:59 +0000
+Date: Mon, 10 Jul 2017 18:25:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -26,6 +26,7 @@
 * Valid HTML5 and CSS3 logos (in debug mode)
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
 * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php)
+* PDO patch by Sébastien Le Callonnec
 * Bugs:
 ** Make function IsSafeURL more strict
 ** Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3)

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

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

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

Revision: 10021
          http://sourceforge.net/p/phpwiki/code/10021
Author:   vargenau
Date:     2017-07-07 12:14:48 +0000 (Fri, 07 Jul 2017)
Log Message:
-----------
Update French translation

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	2017-07-06 11:22:30 UTC (rev 10020)
+++ trunk/locale/po/de.po	2017-07-07 12:14:48 UTC (rev 10021)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 12:06+0200\n"
+"POT-Creation-Date: 2017-07-06 15:10+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2017-07-06 11:22:30 UTC (rev 10020)
+++ trunk/locale/po/es.po	2017-07-07 12:14:48 UTC (rev 10021)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 12:06+0200\n"
+"POT-Creation-Date: 2017-07-06 15:10+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2017-07-06 11:22:30 UTC (rev 10020)
+++ trunk/locale/po/fr.po	2017-07-07 12:14:48 UTC (rev 10021)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 12:06+0200\n"
+"POT-Creation-Date: 2017-07-06 15:10+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -311,7 +311,7 @@
 msgstr "Annuler"
 
 msgid "Undo disabled"
-msgstr "Annuler dernière action désactivé."
+msgstr "Annulation désactivée"
 
 msgid "Operation undone"
 msgstr "Opération annulée"
@@ -1647,6 +1647,8 @@
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""
+"Sortie supprimée. Le greffon FileInfo avec des fichiers locaux nécessite une "
+"page verrouillée."
 
 msgid "page not locked"
 msgstr "page déverrouillée"
@@ -1941,13 +1943,13 @@
 msgstr "Sous-pages de %s :"
 
 msgid "Layout tables using a Mediawiki-like markup style."
-msgstr ""
+msgstr "Tables avec une syntaxe similaire à Mediawiki."
 
 msgid "Support moderated pages."
 msgstr ""
 
 msgid "No e-mails for the moderators defined"
-msgstr ""
+msgstr "Pas d'adresses électroniques définies pour les modérateurs"
 
 #, php-format
 msgid ""
@@ -2056,10 +2058,10 @@
 msgstr "(format pour les développeurs, pas pour la sauvegarde)"
 
 msgid "Preview as normal format"
-msgstr "Prévisualisation au format de sauvegarde"
+msgstr "Prévisualisation au format normal"
 
 msgid "Preview as backup format"
-msgstr ""
+msgstr "Prévisualisation au format de sauvegarde"
 
 msgid "(formatted for backing up: all revisions)"
 msgstr "(format de sauvegarde : toutes les versions)"
@@ -2068,7 +2070,7 @@
 msgstr "Prévisualisation au format développeurs"
 
 msgid "(normal formatting: latest revision only)"
-msgstr ""
+msgstr "(format normal : seulement la dernière version)"
 
 msgid ""
 "Please use one of the downloadable versions rather than copying and pasting "
@@ -2196,7 +2198,7 @@
 msgstr ""
 
 msgid "Verify"
-msgstr ""
+msgstr "Vérifier"
 
 msgid "Already logged in"
 msgstr "Déjà connecté"
@@ -2206,7 +2208,7 @@
 
 #, php-format
 msgid "No e-mail stored for user %s."
-msgstr ""
+msgstr "Pas d'adresse électronique enregistrée pour %s."
 
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
@@ -2213,6 +2215,7 @@
 
 msgid "Warning: This users email address is unverified!"
 msgstr ""
+"Attention : l'adresse électronique de cet utilsateur n'a pas été vérifiée !"
 
 #, php-format
 msgid "Do you really want to reset the password of user %s?"
@@ -2231,7 +2234,7 @@
 msgstr "URL incorrecte dans la source"
 
 msgid "File extension for csv file has to be '.csv'"
-msgstr ""
+msgstr "L'extension pour un fichier CSV doit être « .csv »"
 
 #, php-format
 msgid "Unable to find src=“%s”"
@@ -2263,7 +2266,7 @@
 msgstr "%s ne connaît pas la langue « %s », utilisation de « en » à la place."
 
 msgid "Submit country"
-msgstr ""
+msgstr "Soumettre le pays"
 
 msgid "Change country"
 msgstr "Changer le pays"
@@ -2315,7 +2318,7 @@
 msgstr "%d pages les plus visitées aux alentours : "
 
 msgid "List the most popular tags."
-msgstr ""
+msgstr "Lister les étiquettes les plus populaires."
 
 msgid "CategoryCategory"
 msgstr "CatégorieCatégorie"
@@ -2342,7 +2345,7 @@
 
 #, php-format
 msgid "Nobody has used %s on their homepage"
-msgstr ""
+msgstr "Personne n'a utilisé %s sur sa page d'accueil"
 
 msgid "Total Units"
 msgstr ""
@@ -2387,7 +2390,7 @@
 msgstr ""
 
 msgid "Your current rating: "
-msgstr "Votre note actuelle : "
+msgstr "Votre évaluation actuelle : "
 
 msgid "Your current prediction: "
 msgstr ""
@@ -2399,7 +2402,7 @@
 msgstr " à "
 
 msgid "Add your rating: "
-msgstr ""
+msgstr "Ajoutez votre évaluation : "
 
 msgid "Thanks!"
 msgstr "Merci !"
@@ -2427,13 +2430,13 @@
 msgstr "Prédiction : %.1f"
 
 msgid "RateIt"
-msgstr "ClassezLa"
+msgstr "ÉvaluezLa"
 
 msgid "Rate It"
-msgstr "Notez-la"
+msgstr "Évaluez-la"
 
 msgid "Cancel your rating"
-msgstr "Annuler la notation"
+msgstr "Annulez votre évaluation"
 
 msgid "Provide for raw HTML within wiki pages."
 msgstr "Un greffon pour intégrer du code HTML dans les pages wiki."
@@ -3323,19 +3326,19 @@
 msgstr ""
 
 msgid "Rate"
-msgstr "Note"
+msgstr "Évaluer"
 
 msgid "Display video in Flash or HTML5."
 msgstr "Afficher une vidéo en Flash ou HTML5."
 
 msgid "Both 'url' or 'file' parameters missing."
-msgstr ""
+msgstr "Les paramètres « url » et « file » manquent tous les deux."
 
 msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
+msgstr "Choissez un seul des deux paramètres « url » ou «file»."
 
 msgid "Your browser does not understand the HTML 5 video tag."
-msgstr ""
+msgstr "Votre navigateur ne reconnaît pas la balise video du HTML 5."
 
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
@@ -3537,7 +3540,7 @@
 
 #, php-format
 msgid "%d pages have been removed:"
-msgstr ""
+msgstr "%d pages ont été supprimées :"
 
 msgid "No pages removed."
 msgstr "Aucune page n'a été supprimée."
@@ -3585,7 +3588,7 @@
 msgstr "Sélectionnez les pages à renommer :"
 
 msgid "Cannot rename. New page name too long."
-msgstr "Impossible de renommer. Le nom de la page est trop long."
+msgstr "Impossible de renommer. Le nouveau nom de la page est trop long."
 
 #, php-format
 msgid "Page “%s” already exists. Ignored."
@@ -3691,7 +3694,7 @@
 
 #, php-format
 msgid "Selected page “%s” passed to “%s”."
-msgstr ""
+msgstr "La page sélectionnée « %s » est passée à « %s »."
 
 msgid "Set individual page permissions."
 msgstr "Modifier les permissions individuelles de la page."
@@ -3726,7 +3729,7 @@
 msgstr "Modifier les droits d'accès"
 
 msgid "Select the pages where to change access rights"
-msgstr ""
+msgstr "Sélectionnez les pages dont vous voulez changer les droits d'accès"
 
 msgid "Selected Pages: "
 msgstr "Pages sélectionnées : "
@@ -3754,7 +3757,7 @@
 "(désactive les permissions individuelles par page, activer l'héritage) ?"
 
 msgid "(Currently not working)"
-msgstr ""
+msgstr "(Actuellement en panne)"
 
 msgid "Set simple individual page permissions."
 msgstr "Appliquer les permissions individuelles simples à la page."
@@ -3766,17 +3769,17 @@
 msgstr "Appliquer les droits d'accès restrictifs"
 
 msgid "Mark selected pages as external."
-msgstr ""
+msgstr "Marquer les pages sélectionnées comme externes."
 
 #, php-format
 msgid "change page “%s” to external."
-msgstr ""
+msgstr "marquer la page « %s » comme externe."
 
 msgid "Set pages to external"
-msgstr ""
+msgstr "Marquer des pages comme externes"
 
 msgid "Select the pages to set as external"
-msgstr ""
+msgstr "Sélectionnez les pages que vous voulez marquer comme externes"
 
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr "Plusieurs fonctions pour l'administration d'un wiki."
@@ -3808,10 +3811,10 @@
 msgstr ""
 
 msgid "DB Check"
-msgstr ""
+msgstr "Vérification de la base de données"
 
 msgid "Db Rebuild"
-msgstr ""
+msgstr "Régénération de la base de données"
 
 msgid "Markup cache purged!"
 msgstr "Cache de marques purgé !"
@@ -3821,7 +3824,7 @@
 
 #, php-format
 msgid "Deleted %d pages with invalid names:"
-msgstr "%d pages ont été supprimées à cause de leur nom invalide:"
+msgstr "%d pages ont été supprimées à cause de leur nom invalide :"
 
 msgid "[purged]"
 msgstr "[purgé]"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2017-07-06 11:22:30 UTC (rev 10020)
+++ trunk/locale/po/it.po	2017-07-07 12:14:48 UTC (rev 10021)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 12:06+0200\n"
+"POT-Creation-Date: 2017-07-06 15:10+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2017-07-06 11:22:30 UTC (rev 10020)
+++ trunk/locale/po/ja.po	2017-07-07 12:14:48 UTC (rev 10021)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 12:06+0200\n"
+"POT-Creation-Date: 2017-07-06 15:10+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2017-07-06 11:22:30 UTC (rev 10020)
+++ trunk/locale/po/nl.po	2017-07-07 12:14:48 UTC (rev 10021)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 12:06+0200\n"
+"POT-Creation-Date: 2017-07-06 15:10+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2017-07-06 11:22:30 UTC (rev 10020)
+++ trunk/locale/po/phpwiki.pot	2017-07-07 12:14:48 UTC (rev 10021)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 12:06+0200\n"
+"POT-Creation-Date: 2017-07-06 15:10+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2017-07-06 11:22:30 UTC (rev 10020)
+++ trunk/locale/po/sv.po	2017-07-07 12:14:48 UTC (rev 10021)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 12:06+0200\n"
+"POT-Creation-Date: 2017-07-06 15:10+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2017-07-06 11:22:30 UTC (rev 10020)
+++ trunk/locale/po/zh.po	2017-07-07 12:14:48 UTC (rev 10021)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 12:06+0200\n"
+"POT-Creation-Date: 2017-07-06 15:10+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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:[10020] trunk/locale

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

Revision: 10020
          http://sourceforge.net/p/phpwiki/code/10020
Author:   vargenau
Date:     2017-07-06 11:22:30 +0000 (Thu, 06 Jul 2017)
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	2017-07-06 10:23:09 UTC (rev 10019)
+++ trunk/locale/po/de.po	2017-07-06 11:22:30 UTC (rev 10020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 16:44+0200\n"
+"POT-Creation-Date: 2017-07-06 12:06+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -3535,7 +3535,7 @@
 msgid "Confirm purge"
 msgstr ""
 
-msgid "Are you sure you want to permanently purge the following files?"
+msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
 
@@ -3542,8 +3542,8 @@
 msgid "Permanently purge selected pages"
 msgstr "Endgültige Löschung aller ausgewählten Seiten."
 
-msgid "Select the files to purge"
-msgstr "Wählen Sie die Seiten zum Löschen:"
+msgid "Select the pages to purge"
+msgstr "Wählen Sie die Seiten zum Löschen"
 
 msgid "Permanently remove all selected pages."
 msgstr "Endgültige Löschung aller ausgewählten Seiten."
@@ -3572,7 +3572,7 @@
 msgid "Confirm removal"
 msgstr ""
 
-msgid "Are you sure you want to remove the selected files?"
+msgid "Are you sure you want to remove the selected pages?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
 
@@ -3579,8 +3579,8 @@
 msgid "Remove selected pages"
 msgstr "Ausgewählte Seiten löschen"
 
-msgid "Select the files to remove"
-msgstr "Wähle Seiten zum Umbenennen aus:"
+msgid "Select the pages to remove"
+msgstr "Wähle Seiten zum Umbenennen aus"
 
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
@@ -3672,12 +3672,12 @@
 msgstr "Achtung! Das Suchwort darf nicht leer sein!"
 
 msgid "Select the pages to search and replace"
-msgstr "Seiten auswählen:"
+msgstr "Seiten auswählen"
 
 msgid "Replace"
 msgstr "Ersetze"
 
-msgid "Are you sure you want to replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected pages?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen "
 "wollen?"
@@ -3742,7 +3742,7 @@
 
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
-"files?"
+"pages?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
 
@@ -3750,7 +3750,7 @@
 msgstr ""
 
 msgid "Select the pages where to change access rights"
-msgstr "Wählen Sie die Seiten zum Ändern:"
+msgstr "Wählen Sie die Seiten zum Ändern"
 
 msgid "Selected Pages: "
 msgstr "Ausgewählte Seiten: "
@@ -6184,13 +6184,6 @@
 #~ msgid "Error: Empty search string."
 #~ msgstr "Fehler: Leeres Suchwort."
 
-#~ msgid "Are you sure you want to permanently change the selected files?"
-#~ msgstr ""
-#~ "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
-
-#~ msgid "Select the pages to change:"
-#~ msgstr "Wählen Sie die Seiten zum Ändern:"
-
 #~ msgid "AdminAclDelete"
 #~ msgstr "AdminAclLöschen"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2017-07-06 10:23:09 UTC (rev 10019)
+++ trunk/locale/po/es.po	2017-07-06 11:22:30 UTC (rev 10020)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 16:44+0200\n"
+"POT-Creation-Date: 2017-07-06 12:06+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3436,13 +3436,13 @@
 msgid "Confirm purge"
 msgstr ""
 
-msgid "Are you sure you want to permanently purge the following files?"
+msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
 
 msgid "Permanently purge selected pages"
 msgstr ""
 
-msgid "Select the files to purge"
+msgid "Select the pages to purge"
 msgstr ""
 
 msgid "Permanently remove all selected pages."
@@ -3472,13 +3472,13 @@
 msgid "Confirm removal"
 msgstr ""
 
-msgid "Are you sure you want to remove the selected files?"
+msgid "Are you sure you want to remove the selected pages?"
 msgstr ""
 
 msgid "Remove selected pages"
 msgstr ""
 
-msgid "Select the files to remove"
+msgid "Select the pages to remove"
 msgstr ""
 
 #, php-format
@@ -3573,7 +3573,7 @@
 msgid "Replace"
 msgstr "Substituya"
 
-msgid "Are you sure you want to replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected pages?"
 msgstr ""
 
 #, php-format
@@ -3634,7 +3634,7 @@
 
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
-"files?"
+"pages?"
 msgstr ""
 
 msgid "Change Access Rights"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2017-07-06 10:23:09 UTC (rev 10019)
+++ trunk/locale/po/fr.po	2017-07-06 11:22:30 UTC (rev 10020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 16:44+0200\n"
+"POT-Creation-Date: 2017-07-06 12:06+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3511,7 +3511,7 @@
 msgid "Confirm purge"
 msgstr "Confirmer la purge"
 
-msgid "Are you sure you want to permanently purge the following files?"
+msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
 "Êtes-vous certain de vouloir purger définitivement les pages suivantes ?"
 
@@ -3518,11 +3518,11 @@
 msgid "Permanently purge selected pages"
 msgstr "Purger définitivement les pages sélectionnées"
 
-msgid "Select the files to purge"
-msgstr "Sélectionnez les fichiers à purger"
+msgid "Select the pages to purge"
+msgstr "Sélectionnez les pages à purger"
 
 msgid "Permanently remove all selected pages."
-msgstr "Supprimer toutes les pages sélectionnées en permanence."
+msgstr "Supprimer définitivement toutes les pages sélectionnées."
 
 #, php-format
 msgid "Removed page “%s” successfully."
@@ -3548,14 +3548,14 @@
 msgid "Confirm removal"
 msgstr "Confirmer la suppression"
 
-msgid "Are you sure you want to remove the selected files?"
-msgstr "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?"
+msgid "Are you sure you want to remove the selected pages?"
+msgstr "Êtes-vous certain de vouloir supprimer les pages sélectionnées ?"
 
 msgid "Remove selected pages"
 msgstr "Supprimer les pages sélectionnées"
 
-msgid "Select the files to remove"
-msgstr "Sélectionner les fichiers à supprimer"
+msgid "Select the pages to remove"
+msgstr "Sélectionner les pages à supprimer"
 
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
@@ -3650,10 +3650,10 @@
 msgid "Replace"
 msgstr "Remplacer"
 
-msgid "Are you sure you want to replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected pages?"
 msgstr ""
-"Êtes-vous sur de vouloir rechercher et remplacer dans les fichiers "
-"sélectionnés ?"
+"Êtes-vous sur de vouloir rechercher et remplacer dans les pages "
+"sélectionnées ?"
 
 #, php-format
 msgid "Replace “%s” by “%s”"
@@ -3717,13 +3717,13 @@
 
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
-"files?"
+"pages?"
 msgstr ""
-"Êtes-vous certain de vouloir définitivement modifier l'accès aux fichiers "
-"sélectionnés ?"
+"Êtes-vous certain de vouloir définitivement modifier l'accès aux pages "
+"sélectionnées ?"
 
 msgid "Change Access Rights"
-msgstr "Droits d'accès"
+msgstr "Modifier les droits d'accès"
 
 msgid "Select the pages where to change access rights"
 msgstr ""
@@ -3736,13 +3736,15 @@
 
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
-msgstr "Les cases sélectionnées autorisent l'accès, sinon elles l'interdisent."
+msgstr ""
+"Les cases « Accorder » sélectionnées autorisent l'accès, sinon elles "
+"l'interdisent."
 
 msgid "To ignore delete the line."
 msgstr "Pour ignorer effacez la ligne."
 
 msgid "To add check 'Add' near the dropdown list."
-msgstr "Pour ajouter cocher 'Add' près de la liste déroulante."
+msgstr "Pour ajouter cocher « Ajouter » près de la liste déroulante."
 
 msgid "Propagate new permissions to all subpages?"
 msgstr "Propager les nouvelles permissions aux sous-pages ?"
@@ -6201,13 +6203,5 @@
 #~ msgid "Error: Empty search string."
 #~ msgstr "Erreur : la chaîne à rechercher est vide."
 
-#~ msgid "Are you sure you want to permanently change the selected files?"
-#~ msgstr ""
-#~ "Êtes-vous certain de vouloir modifier de manière permanente les fichiers "
-#~ "sélectionnés ?"
-
-#~ msgid "Select the pages to change:"
-#~ msgstr "Sélectionnez les pages à modifier :"
-
 #~ msgid "Spell Checker"
 #~ msgstr "Correcteur orthographique"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2017-07-06 10:23:09 UTC (rev 10019)
+++ trunk/locale/po/it.po	2017-07-06 11:22:30 UTC (rev 10020)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 16:44+0200\n"
+"POT-Creation-Date: 2017-07-06 12:06+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -3413,13 +3413,13 @@
 msgid "Confirm purge"
 msgstr ""
 
-msgid "Are you sure you want to permanently purge the following files?"
+msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
 
 msgid "Permanently purge selected pages"
 msgstr ""
 
-msgid "Select the files to purge"
+msgid "Select the pages to purge"
 msgstr ""
 
 msgid "Permanently remove all selected pages."
@@ -3449,13 +3449,13 @@
 msgid "Confirm removal"
 msgstr ""
 
-msgid "Are you sure you want to remove the selected files?"
+msgid "Are you sure you want to remove the selected pages?"
 msgstr ""
 
 msgid "Remove selected pages"
 msgstr ""
 
-msgid "Select the files to remove"
+msgid "Select the pages to remove"
 msgstr ""
 
 #, php-format
@@ -3550,7 +3550,7 @@
 msgid "Replace"
 msgstr ""
 
-msgid "Are you sure you want to replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected pages?"
 msgstr ""
 
 #, php-format
@@ -3611,7 +3611,7 @@
 
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
-"files?"
+"pages?"
 msgstr ""
 
 msgid "Change Access Rights"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2017-07-06 10:23:09 UTC (rev 10019)
+++ trunk/locale/po/ja.po	2017-07-06 11:22:30 UTC (rev 10020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 16:44+0200\n"
+"POT-Creation-Date: 2017-07-06 12:06+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3399,13 +3399,13 @@
 msgid "Confirm purge"
 msgstr ""
 
-msgid "Are you sure you want to permanently purge the following files?"
+msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
 
 msgid "Permanently purge selected pages"
 msgstr ""
 
-msgid "Select the files to purge"
+msgid "Select the pages to purge"
 msgstr ""
 
 msgid "Permanently remove all selected pages."
@@ -3435,13 +3435,13 @@
 msgid "Confirm removal"
 msgstr ""
 
-msgid "Are you sure you want to remove the selected files?"
+msgid "Are you sure you want to remove the selected pages?"
 msgstr ""
 
 msgid "Remove selected pages"
 msgstr "選択ページを全て削除"
 
-msgid "Select the files to remove"
+msgid "Select the pages to remove"
 msgstr ""
 
 #, php-format
@@ -3536,7 +3536,7 @@
 msgid "Replace"
 msgstr ""
 
-msgid "Are you sure you want to replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected pages?"
 msgstr ""
 
 #, php-format
@@ -3597,7 +3597,7 @@
 
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
-"files?"
+"pages?"
 msgstr ""
 
 msgid "Change Access Rights"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2017-07-06 10:23:09 UTC (rev 10019)
+++ trunk/locale/po/nl.po	2017-07-06 11:22:30 UTC (rev 10020)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 16:44+0200\n"
+"POT-Creation-Date: 2017-07-06 12:06+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -3405,13 +3405,13 @@
 msgid "Confirm purge"
 msgstr ""
 
-msgid "Are you sure you want to permanently purge the following files?"
+msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
 
 msgid "Permanently purge selected pages"
 msgstr ""
 
-msgid "Select the files to purge"
+msgid "Select the pages to purge"
 msgstr ""
 
 msgid "Permanently remove all selected pages."
@@ -3441,13 +3441,13 @@
 msgid "Confirm removal"
 msgstr ""
 
-msgid "Are you sure you want to remove the selected files?"
+msgid "Are you sure you want to remove the selected pages?"
 msgstr ""
 
 msgid "Remove selected pages"
 msgstr ""
 
-msgid "Select the files to remove"
+msgid "Select the pages to remove"
 msgstr ""
 
 #, php-format
@@ -3542,7 +3542,7 @@
 msgid "Replace"
 msgstr "Vervangt"
 
-msgid "Are you sure you want to replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected pages?"
 msgstr ""
 
 #, php-format
@@ -3603,7 +3603,7 @@
 
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
-"files?"
+"pages?"
 msgstr ""
 
 msgid "Change Access Rights"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2017-07-06 10:23:09 UTC (rev 10019)
+++ trunk/locale/po/phpwiki.pot	2017-07-06 11:22:30 UTC (rev 10020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 16:44+0200\n"
+"POT-Creation-Date: 2017-07-06 12:06+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3399,13 +3399,13 @@
 msgid "Confirm purge"
 msgstr ""
 
-msgid "Are you sure you want to permanently purge the following files?"
+msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
 
 msgid "Permanently purge selected pages"
 msgstr ""
 
-msgid "Select the files to purge"
+msgid "Select the pages to purge"
 msgstr ""
 
 msgid "Permanently remove all selected pages."
@@ -3435,13 +3435,13 @@
 msgid "Confirm removal"
 msgstr ""
 
-msgid "Are you sure you want to remove the selected files?"
+msgid "Are you sure you want to remove the selected pages?"
 msgstr ""
 
 msgid "Remove selected pages"
 msgstr ""
 
-msgid "Select the files to remove"
+msgid "Select the pages to remove"
 msgstr ""
 
 #, php-format
@@ -3536,7 +3536,7 @@
 msgid "Replace"
 msgstr ""
 
-msgid "Are you sure you want to replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected pages?"
 msgstr ""
 
 #, php-format
@@ -3597,7 +3597,7 @@
 
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
-"files?"
+"pages?"
 msgstr ""
 
 msgid "Change Access Rights"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2017-07-06 10:23:09 UTC (rev 10019)
+++ trunk/locale/po/sv.po	2017-07-06 11:22:30 UTC (rev 10020)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 16:44+0200\n"
+"POT-Creation-Date: 2017-07-06 12:06+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3400,13 +3400,13 @@
 msgid "Confirm purge"
 msgstr ""
 
-msgid "Are you sure you want to permanently purge the following files?"
+msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
 
 msgid "Permanently purge selected pages"
 msgstr ""
 
-msgid "Select the files to purge"
+msgid "Select the pages to purge"
 msgstr ""
 
 msgid "Permanently remove all selected pages."
@@ -3436,13 +3436,13 @@
 msgid "Confirm removal"
 msgstr ""
 
-msgid "Are you sure you want to remove the selected files?"
+msgid "Are you sure you want to remove the selected pages?"
 msgstr ""
 
 msgid "Remove selected pages"
 msgstr ""
 
-msgid "Select the files to remove"
+msgid "Select the pages to remove"
 msgstr ""
 
 #, php-format
@@ -3537,7 +3537,7 @@
 msgid "Replace"
 msgstr ""
 
-msgid "Are you sure you want to replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected pages?"
 msgstr ""
 
 #, php-format
@@ -3598,7 +3598,7 @@
 
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
-"files?"
+"pages?"
 msgstr ""
 
 msgid "Change Access Rights"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2017-07-06 10:23:09 UTC (rev 10019)
+++ trunk/locale/po/zh.po	2017-07-06 11:22:30 UTC (rev 10020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 16:44+0200\n"
+"POT-Creation-Date: 2017-07-06 12:06+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3412,13 +3412,13 @@
 msgid "Confirm purge"
 msgstr ""
 
-msgid "Are you sure you want to permanently purge the following files?"
+msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
 
 msgid "Permanently purge selected pages"
 msgstr ""
 
-msgid "Select the files to purge"
+msgid "Select the pages to purge"
 msgstr ""
 
 msgid "Permanently remove all selected pages."
@@ -3448,13 +3448,13 @@
 msgid "Confirm removal"
 msgstr ""
 
-msgid "Are you sure you want to remove the selected files?"
+msgid "Are you sure you want to remove the selected pages?"
 msgstr ""
 
 msgid "Remove selected pages"
 msgstr "移除選定頁面"
 
-msgid "Select the files to remove"
+msgid "Select the pages to remove"
 msgstr ""
 
 #, php-format
@@ -3549,7 +3549,7 @@
 msgid "Replace"
 msgstr "取代"
 
-msgid "Are you sure you want to replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected pages?"
 msgstr "你確定你想要永久新增並取代選定檔案中的文字?"
 
 #, php-format
@@ -3610,7 +3610,7 @@
 
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
-"files?"
+"pages?"
 msgstr ""
 
 msgid "Change Access Rights"
@@ -5879,8 +5879,5 @@
 #~ msgid "Error: Empty search string."
 #~ msgstr "錯誤: 空白的搜尋字串."
 
-#~ msgid "Are you sure you want to permanently change the selected files?"
-#~ msgstr "你確定你想要永久變更選定的檔案?"
-
 #~ msgid "This plugin is currently under development and does not work!"
 #~ msgstr "此 plugin 正在開發還不能運作!"

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:[10019] trunk/lib/plugin

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

Revision: 10019
          http://sourceforge.net/p/phpwiki/code/10019
Author:   vargenau
Date:     2017-07-06 10:23:09 +0000 (Thu, 06 Jul 2017)
Log Message:
-----------
It's pages, not files

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSetAcl.php

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2017-05-30 15:41:35 UTC (rev 10018)
+++ trunk/lib/plugin/WikiAdminPurge.php	2017-07-06 10:23:09 UTC (rev 10019)
@@ -153,12 +153,12 @@
             $button_label = _("Yes");
             $header->pushContent(HTML::legend(_("Confirm purge")));
             $header->pushContent(HTML::p(HTML::strong(
-                    _("Are you sure you want to permanently purge the following files?"))));
+                    _("Are you sure you want to permanently purge the following pages?"))));
         } else {
             $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array());
             $pagelist->addPageList($pages);
             $button_label = _("Permanently purge selected pages");
-            $header->pushContent(HTML::legend(_("Select the files to purge")));
+            $header->pushContent(HTML::legend(_("Select the pages to purge")));
         }
 
         $buttons = HTML::p(Button('submit:admin_purge[purge]', $button_label, 'wikiadmin'),

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2017-05-30 15:41:35 UTC (rev 10018)
+++ trunk/lib/plugin/WikiAdminRemove.php	2017-07-06 10:23:09 UTC (rev 10019)
@@ -207,7 +207,7 @@
             $button_label = _("Yes");
             $header->pushContent(HTML::legend(_("Confirm removal")));
             $header->pushContent(HTML::p(HTML::strong(
-                _("Are you sure you want to remove the selected files?"))));
+                _("Are you sure you want to remove the selected pages?"))));
         } else {
             $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
                 array('types' =>
@@ -215,7 +215,7 @@
                 => new _PageList_Column_remove('remove', _("Remove")))));
             $pagelist->addPageList($pages);
             $button_label = _("Remove selected pages");
-            $header->pushContent(HTML::legend(_("Select the files to remove")));
+            $header->pushContent(HTML::legend(_("Select the pages to remove")));
             if ($args['min_age'] > 0) {
                 $header->pushContent(
                     fmt("Also pages which have been deleted at least %s days.",

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2017-05-30 15:41:35 UTC (rev 10018)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2017-07-06 10:23:09 UTC (rev 10019)
@@ -132,7 +132,7 @@
             $button_label = _("Replace");
             $header->pushContent(
                 HTML::p(HTML::strong(
-                    _("Are you sure you want to replace text in the selected files?"))));
+                    _("Are you sure you want to replace text in the selected pages?"))));
             $this->replaceForm($header, $post_args);
         } else {
             $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns);

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2017-05-30 15:41:35 UTC (rev 10018)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2017-07-06 10:23:09 UTC (rev 10019)
@@ -207,7 +207,7 @@
             $header = $this->setaclForm($header, $post_args, $pages);
             $header->pushContent(
                 HTML::p(HTML::strong(
-                    _("Are you sure you want to permanently change access rights to the selected files?"))));
+                    _("Are you sure you want to permanently change access rights to the selected pages?"))));
         } else {
             $pagelist = new PageList_Selectable($args['info'],
                 $args['exclude'],
@@ -269,9 +269,9 @@
         $header->pushContent(HTML::strong(_("ACL") . _(": ")), HTML::samp($perm->asAclLines()), HTML::br());
 
         $header->pushContent(HTML::p(HTML::strong(_("Description") . _(": ")),
-            _("Selected Grant checkboxes allow access, unselected checkboxes deny access."),
-            _("To ignore delete the line."),
-            _("To add check 'Add' near the dropdown list.")
+            _("Selected Grant checkboxes allow access, unselected checkboxes deny access.")
+            .' '._("To ignore delete the line.")
+            .' '._("To add check 'Add' near the dropdown list.")
         ));
         $header->pushContent($table);
         //

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10018] trunk/lib/stdlib.php

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

Revision: 10018
          http://sourceforge.net/p/phpwiki/code/10018
Author:   vargenau
Date:     2017-05-30 15:41:35 +0000 (Tue, 30 May 2017)
Log Message:
-----------
Fix PHP syntax

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2017-05-30 14:55:08 UTC (rev 10017)
+++ trunk/lib/stdlib.php	2017-05-30 15:41:35 UTC (rev 10018)
@@ -382,7 +382,7 @@
 {
     // FIXME: Is this needed (or sufficient?)
     if (!IsSafeURL($url)) {
-        $link = HTML::span(array('class' => 'error'), _('Bad URL').' -- '._('Remove all of <, >, "');
+        $link = HTML::span(array('class' => 'error'), _('Bad URL').' -- '._('Remove all of <, >, "'));
         return $link;
     } else {
         if (!$linktext)
@@ -420,7 +420,7 @@
     $arr = explode(' ', $url);
     if (!empty($arr)) $url = $arr[0];
     if (!IsSafeURL($url)) {
-        $link = HTML::span(array('class' => 'error'), _('Bad URL for image').' -- '._('Remove all of <, >, "');
+        $link = HTML::span(array('class' => 'error'), _('Bad URL for image').' -- '._('Remove all of <, >, "'));
         return $link;
     }
     // spaces in inline images must be %20 encoded!

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

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

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

Revision: 10017
          http://sourceforge.net/p/phpwiki/code/10017
Author:   vargenau
Date:     2017-05-30 14:55:08 +0000 (Tue, 30 May 2017)
Log Message:
-----------
More specific error message again

Modified Paths:
--------------
    trunk/lib/stdlib.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/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/lib/stdlib.php	2017-05-30 14:55:08 UTC (rev 10017)
@@ -382,7 +382,7 @@
 {
     // FIXME: Is this needed (or sufficient?)
     if (!IsSafeURL($url)) {
-        $link = HTML::span(array('class' => 'error'), _('Bad URL'));
+        $link = HTML::span(array('class' => 'error'), _('Bad URL').' -- '._('Remove all of <, >, "');
         return $link;
     } else {
         if (!$linktext)
@@ -420,7 +420,7 @@
     $arr = explode(' ', $url);
     if (!empty($arr)) $url = $arr[0];
     if (!IsSafeURL($url)) {
-        $link = HTML::span(array('class' => 'error'), _('Bad URL for image'));
+        $link = HTML::span(array('class' => 'error'), _('Bad URL for image').' -- '._('Remove all of <, >, "');
         return $link;
     }
     // spaces in inline images must be %20 encoded!

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	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/locale/po/de.po	2017-05-30 14:55:08 UTC (rev 10017)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 19:46+0200\n"
+"POT-Creation-Date: 2017-05-30 16:44+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -3152,10 +3152,6 @@
 msgid "Recursive inclusion of url %s"
 msgstr "Rekursiver Selbstaufruf der URL %s"
 
-#, php-format
-msgid "See: %s"
-msgstr "Siehe: %s"
-
 # Transclude is distinct from IncludePage
 #, php-format
 msgid "Transcluded from %s"
@@ -4548,6 +4544,9 @@
 msgid "Bad URL"
 msgstr "URL Formfehler"
 
+msgid "Remove all of <, >, \""
+msgstr "Entfernen Sie alle Zeichen mit <, >, \""
+
 msgid "Bad URL for image"
 msgstr "URL Formfehler für Bild"
 
@@ -6008,6 +6007,9 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "See: %s"
+#~ msgstr "Siehe: %s"
+
 #~ msgid "Check for mysql LOCK TABLE privilege"
 #~ msgstr "Prüfe mysql LOCK TABLE Rechte"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/locale/po/es.po	2017-05-30 14:55:08 UTC (rev 10017)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 19:46+0200\n"
+"POT-Creation-Date: 2017-05-30 16:44+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3063,10 +3063,6 @@
 msgstr ""
 
 #, php-format
-msgid "See: %s"
-msgstr ""
-
-#, php-format
 msgid "Transcluded from %s"
 msgstr ""
 
@@ -4416,6 +4412,9 @@
 msgid "Bad URL"
 msgstr ""
 
+msgid "Remove all of <, >, \""
+msgstr ""
+
 msgid "Bad URL for image"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/locale/po/fr.po	2017-05-30 14:55:08 UTC (rev 10017)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 19:46+0200\n"
+"POT-Creation-Date: 2017-05-30 16:44+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3120,10 +3120,6 @@
 msgstr "Insertion récursive de l'URL %s"
 
 #, php-format
-msgid "See: %s"
-msgstr "Voir : %s"
-
-#, php-format
 msgid "Transcluded from %s"
 msgstr "Inséré de %s"
 
@@ -4513,6 +4509,9 @@
 msgid "Bad URL"
 msgstr "URL incorrecte"
 
+msgid "Remove all of <, >, \""
+msgstr "Retirez tous les <, >, \""
+
 msgid "Bad URL for image"
 msgstr "URL incorrecte pour l'image"
 
@@ -5947,6 +5946,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "See: %s"
+#~ msgstr "Voir : %s"
+
 #~ msgid "version <em>%s</em> not affected"
 #~ msgstr "version <em>%s</em> non affectée"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/locale/po/it.po	2017-05-30 14:55:08 UTC (rev 10017)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 19:46+0200\n"
+"POT-Creation-Date: 2017-05-30 16:44+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -3040,10 +3040,6 @@
 msgstr ""
 
 #, php-format
-msgid "See: %s"
-msgstr ""
-
-#, php-format
 msgid "Transcluded from %s"
 msgstr "Inserire dalla %s"
 
@@ -4393,6 +4389,9 @@
 msgid "Bad URL"
 msgstr ""
 
+msgid "Remove all of <, >, \""
+msgstr ""
+
 msgid "Bad URL for image"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/locale/po/ja.po	2017-05-30 14:55:08 UTC (rev 10017)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 19:46+0200\n"
+"POT-Creation-Date: 2017-05-30 16:44+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3026,10 +3026,6 @@
 msgstr ""
 
 #, php-format
-msgid "See: %s"
-msgstr "参照: %s"
-
-#, php-format
 msgid "Transcluded from %s"
 msgstr ""
 
@@ -4379,6 +4375,9 @@
 msgid "Bad URL"
 msgstr ""
 
+msgid "Remove all of <, >, \""
+msgstr ""
+
 msgid "Bad URL for image"
 msgstr ""
 
@@ -5769,6 +5768,9 @@
 msgid "Edit this page"
 msgstr "ページを編集しています"
 
+#~ msgid "See: %s"
+#~ msgstr "参照: %s"
+
 #~ msgid "Synopsis"
 #~ msgstr "要約"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/locale/po/nl.po	2017-05-30 14:55:08 UTC (rev 10017)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 19:46+0200\n"
+"POT-Creation-Date: 2017-05-30 16:44+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -3032,10 +3032,6 @@
 msgstr ""
 
 #, php-format
-msgid "See: %s"
-msgstr ""
-
-#, php-format
 msgid "Transcluded from %s"
 msgstr ""
 
@@ -4385,6 +4381,9 @@
 msgid "Bad URL"
 msgstr ""
 
+msgid "Remove all of <, >, \""
+msgstr ""
+
 msgid "Bad URL for image"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/locale/po/phpwiki.pot	2017-05-30 14:55:08 UTC (rev 10017)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 19:46+0200\n"
+"POT-Creation-Date: 2017-05-30 16:44+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3026,10 +3026,6 @@
 msgstr ""
 
 #, php-format
-msgid "See: %s"
-msgstr ""
-
-#, php-format
 msgid "Transcluded from %s"
 msgstr ""
 
@@ -4379,6 +4375,9 @@
 msgid "Bad URL"
 msgstr ""
 
+msgid "Remove all of <, >, \""
+msgstr ""
+
 msgid "Bad URL for image"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/locale/po/sv.po	2017-05-30 14:55:08 UTC (rev 10017)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 19:46+0200\n"
+"POT-Creation-Date: 2017-05-30 16:44+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3027,10 +3027,6 @@
 msgstr ""
 
 #, php-format
-msgid "See: %s"
-msgstr ""
-
-#, php-format
 msgid "Transcluded from %s"
 msgstr ""
 
@@ -4380,6 +4376,9 @@
 msgid "Bad URL"
 msgstr ""
 
+msgid "Remove all of <, >, \""
+msgstr ""
+
 msgid "Bad URL for image"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2017-05-30 14:27:31 UTC (rev 10016)
+++ trunk/locale/po/zh.po	2017-05-30 14:55:08 UTC (rev 10017)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-24 19:46+0200\n"
+"POT-Creation-Date: 2017-05-30 16:44+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3038,10 +3038,6 @@
 msgstr "遞迴含括 url %s"
 
 #, php-format
-msgid "See: %s"
-msgstr "參閱: %s"
-
-#, php-format
 msgid "Transcluded from %s"
 msgstr "Transcluded 從 %s"
 
@@ -4396,6 +4392,9 @@
 msgid "Bad URL"
 msgstr "錯誤 URL"
 
+msgid "Remove all of <, >, \""
+msgstr ""
+
 msgid "Bad URL for image"
 msgstr ""
 
@@ -5799,6 +5798,9 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "See: %s"
+#~ msgstr "參閱: %s"
+
 #~ msgid "Synopsis"
 #~ 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:[10016] trunk/lib

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

Revision: 10016
          http://sourceforge.net/p/phpwiki/code/10016
Author:   vargenau
Date:     2017-05-30 14:27:31 +0000 (Tue, 30 May 2017)
Log Message:
-----------
IsSafeURL: change default value of $http_only from true to false

Modified Paths:
--------------
    trunk/lib/plugin/Transclude.php
    trunk/lib/stdlib.php

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2017-05-30 12:33:34 UTC (rev 10015)
+++ trunk/lib/plugin/Transclude.php	2017-05-30 14:27:31 UTC (rev 10016)
@@ -92,7 +92,7 @@
         if ($src == $request->getURLtoSelf()) {
             return $this->error(fmt("Recursive inclusion of url %s", $src));
         }
-        if (!IsSafeURL($src)) {
+        if (!IsSafeURL($src, true)) { // http or https only
             return $this->error(_("Bad URL in src"));
         }
 

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2017-05-30 12:33:34 UTC (rev 10015)
+++ trunk/lib/stdlib.php	2017-05-30 14:27:31 UTC (rev 10016)
@@ -355,7 +355,7 @@
  * @param bool $http_only if true, accept only http and https URLs
  * @return bool true if safe, false else.
  */
-function IsSafeURL($url, $http_only = true)
+function IsSafeURL($url, $http_only = false)
 {
     if (preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url)) {
         return false;
@@ -381,7 +381,7 @@
 function LinkURL($url, $linktext = '')
 {
     // FIXME: Is this needed (or sufficient?)
-    if (!IsSafeURL($url, false)) {
+    if (!IsSafeURL($url)) {
         $link = HTML::span(array('class' => 'error'), _('Bad URL'));
         return $link;
     } else {
@@ -419,7 +419,7 @@
     // Extract URL
     $arr = explode(' ', $url);
     if (!empty($arr)) $url = $arr[0];
-    if (!IsSafeURL($url, false)) {
+    if (!IsSafeURL($url)) {
         $link = HTML::span(array('class' => 'error'), _('Bad URL for image'));
         return $link;
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10015] trunk/lib/stdlib.php

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

Revision: 10015
          http://sourceforge.net/p/phpwiki/code/10015
Author:   vargenau
Date:     2017-05-30 12:33:34 +0000 (Tue, 30 May 2017)
Log Message:
-----------
URL for image can be /path/to/image.png

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2017-05-30 09:00:02 UTC (rev 10014)
+++ trunk/lib/stdlib.php	2017-05-30 12:33:34 UTC (rev 10015)
@@ -357,10 +357,13 @@
  */
 function IsSafeURL($url, $http_only = true)
 {
-    if (preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url) || (filter_var($url, FILTER_VALIDATE_URL) === false)) {
+    if (preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url)) {
         return false;
     }
     if ($http_only) {
+        if (filter_var($url, FILTER_VALIDATE_URL) === false) {
+            return false;
+        }
         $scheme = parse_url($url, PHP_URL_SCHEME);
         return ($scheme == 'http') || ($scheme == 'https');
     } 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:[10014] trunk/lib/stdlib.php

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

Revision: 10014
          http://sourceforge.net/p/phpwiki/code/10014
Author:   vargenau
Date:     2017-05-30 09:00:02 +0000 (Tue, 30 May 2017)
Log Message:
-----------
URL for image can be /path/to/image.png

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2017-05-25 08:15:06 UTC (rev 10013)
+++ trunk/lib/stdlib.php	2017-05-30 09:00:02 UTC (rev 10014)
@@ -416,7 +416,7 @@
     // Extract URL
     $arr = explode(' ', $url);
     if (!empty($arr)) $url = $arr[0];
-    if (!IsSafeURL($url)) {
+    if (!IsSafeURL($url, false)) {
         $link = HTML::span(array('class' => 'error'), _('Bad URL for image'));
         return $link;
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10013] trunk/themes

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

Revision: 10013
          http://sourceforge.net/p/phpwiki/code/10013
Author:   vargenau
Date:     2017-05-25 08:15:06 +0000 (Thu, 25 May 2017)
Log Message:
-----------
link rel="copyright" --> link rel="license"

Modified Paths:
--------------
    trunk/themes/Crao/templates/head.tmpl
    trunk/themes/Crao/templates/htmldump.tmpl
    trunk/themes/Sidebar/templates/htmldump.tmpl
    trunk/themes/default/templates/head.tmpl
    trunk/themes/default/templates/htmldump.tmpl
    trunk/themes/wikilens/templates/head.tmpl

Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl	2017-05-25 08:09:20 UTC (rev 10012)
+++ trunk/themes/Crao/templates/head.tmpl	2017-05-25 08:15:06 UTC (rev 10013)
@@ -17,7 +17,7 @@
 <link rel="help" title="<?php echo
 _("HowToUseWiki")?>" href="<?php echo WikiURL(
 _("HowToUseWiki"))?>" />
-<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
+<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <link rel="search" title="<?php echo
 _("FindPage")?>" href="<?php echo WikiURL(

Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl	2017-05-25 08:09:20 UTC (rev 10012)
+++ trunk/themes/Crao/templates/htmldump.tmpl	2017-05-25 08:15:06 UTC (rev 10013)
@@ -9,7 +9,7 @@
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
-<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
+<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 
 <?php echo $WikiTheme->getCSS() ?>

Modified: trunk/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/htmldump.tmpl	2017-05-25 08:09:20 UTC (rev 10012)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl	2017-05-25 08:15:06 UTC (rev 10013)
@@ -10,7 +10,7 @@
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
-<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
+<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2017-05-25 08:09:20 UTC (rev 10012)
+++ trunk/themes/default/templates/head.tmpl	2017-05-25 08:15:06 UTC (rev 10013)
@@ -21,7 +21,7 @@
 <link rel="help" title="<?php echo
 _("HowToUseWiki")?>" href="<?php echo WikiURL(
 _("HowToUseWiki"))?>" />
-<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
+<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <link rel="search" title="<?php echo
 _("FindPage")?>" href="<?php echo WikiURL(

Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl	2017-05-25 08:09:20 UTC (rev 10012)
+++ trunk/themes/default/templates/htmldump.tmpl	2017-05-25 08:15:06 UTC (rev 10013)
@@ -10,7 +10,7 @@
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
-<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
+<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />

Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl	2017-05-25 08:09:20 UTC (rev 10012)
+++ trunk/themes/wikilens/templates/head.tmpl	2017-05-25 08:15:06 UTC (rev 10013)
@@ -16,7 +16,7 @@
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(
 _("HowToUseWiki"))?>" />
-<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
+<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL(
 _("FindPage"))?>" />

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

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

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

Revision: 10012
          http://sourceforge.net/p/phpwiki/code/10012
Author:   vargenau
Date:     2017-05-25 08:09:20 +0000 (Thu, 25 May 2017)
Log Message:
-----------
We assume a browser that supports <iframe>

Modified Paths:
--------------
    trunk/lib/plugin/Transclude.php
    trunk/pgsrc/Help%2FTranscludePlugin

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2017-05-24 18:19:28 UTC (rev 10011)
+++ trunk/lib/plugin/Transclude.php	2017-05-25 08:09:20 UTC (rev 10012)
@@ -104,17 +104,8 @@
             'marginheight' => 0,
             'class' => 'autoHeight transclude');
 
-        $noframe_msg[] = fmt("See: %s", HTML::a(array('href' => $src), $src));
+        $iframe = HTML::iframe($params);
 
-        $noframe_msg = HTML::div(array('class' => 'transclusion'),
-            HTML::p(array(), $noframe_msg));
-
-        $iframe = HTML::iframe($params, $noframe_msg);
-
-        /* This doesn't work very well...  maybe because CSS screws up NS4 anyway...
-        $iframe = new HtmlElement('ilayer', array('src' => $src), $iframe);
-        */
-
         if ($quiet) {
             return $iframe;
         } else {

Modified: trunk/pgsrc/Help%2FTranscludePlugin
===================================================================
--- trunk/pgsrc/Help%2FTranscludePlugin	2017-05-24 18:19:28 UTC (rev 10011)
+++ trunk/pgsrc/Help%2FTranscludePlugin	2017-05-25 08:09:20 UTC (rev 10012)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 25 Oct 2016 10:01:28 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTranscludePlugin;
@@ -8,6 +8,8 @@
 
 The **Transclude** [[Help:WikiPlugin|plugin]] can be used to embed include whole (external) web pages within a wiki page.
 
+Pages are transcluded using ##<iframe>## tags.
+
 == Arguments ==
 
 {| class="bordered"
@@ -35,7 +37,6 @@
 
 == Bugs / Caveats ==
 
-* Pages are transcluded using ##<iframe>## tags.  Older browsers do not support //iframe//s.  In that case the user will be presented with a link to the transcluded material.
 * When possible, Javascript code is used to adjust the height of the //iframe// so that it fits the entire transcluded page.  Unfortunately, this seems possible only when the transcluded page comes from the same server as the wiki page.  (This restriction is due to security checks built in to the Javascript language.)
 * The recursion detection code does not currently work.  Be careful to avoid recursive transclusions, or you'll be sorry (or at least amused.)
 

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

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

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

Revision: 10011
          http://sourceforge.net/p/phpwiki/code/10011
Author:   vargenau
Date:     2017-05-24 18:19:28 +0000 (Wed, 24 May 2017)
Log Message:
-----------
Make function IsSafeURL more strict

Modified Paths:
--------------
    trunk/lib/stdlib.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2017-05-24 18:05:08 UTC (rev 10010)
+++ trunk/lib/stdlib.php	2017-05-24 18:19:28 UTC (rev 10011)
@@ -29,7 +29,7 @@
     AbsoluteURL ($url)
     IconForLink ($protocol_or_url)
     PossiblyGlueIconToText($proto_or_url, $text)
-    IsSafeURL($url)
+    IsSafeURL($url, $http_only)
     LinkURL ($url, $linktext)
     LinkImage ($url, $alt)
     ImgObject ($img, $url)
@@ -346,16 +346,26 @@
 }
 
 /**
- * Determines if the url passed to function is safe, by detecting if the characters
- * '<', '>', or '"' are present.
- * Check against their urlencoded values also.
+ * Determines if the url passed to function is safe
+ * 1) By detecting if the characters '<', '>', or '"' are present.
+ *    Check against their urlencoded values also.
+ * 2) By checking the URL syntax is valid
  *
- * @param string $url URL to check for unsafe characters.
- * @return bool True if safe, false else.
+ * @param string $url URL to check
+ * @param bool $http_only if true, accept only http and https URLs
+ * @return bool true if safe, false else.
  */
-function IsSafeURL($url)
+function IsSafeURL($url, $http_only = true)
 {
-    return !preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url);
+    if (preg_match('/([<>"])|(%3C)|(%3E)|(%22)/', $url) || (filter_var($url, FILTER_VALIDATE_URL) === false)) {
+        return false;
+    }
+    if ($http_only) {
+        $scheme = parse_url($url, PHP_URL_SCHEME);
+        return ($scheme == 'http') || ($scheme == 'https');
+    } else {
+        return true;
+    }
 }
 
 /**
@@ -368,7 +378,7 @@
 function LinkURL($url, $linktext = '')
 {
     // FIXME: Is this needed (or sufficient?)
-    if (!IsSafeURL($url)) {
+    if (!IsSafeURL($url, false)) {
         $link = HTML::span(array('class' => 'error'), _('Bad URL'));
         return $link;
     } else {

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2017-05-24 18:05:08 UTC (rev 10010)
+++ trunk/pgsrc/ReleaseNotes	2017-05-24 18:19:28 UTC (rev 10011)
@@ -1,4 +1,4 @@
-Date: Tue, 23 May 2017 11:26:59 +0000
+Date: Wed, 24 May 2017 19:26:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -27,6 +27,7 @@
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
 * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php)
 * Bugs:
+** Make function IsSafeURL more strict
 ** Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3)
 ** It was possible to rename a page to a name with illegal characters, like ~[~]
 ** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)

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

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

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

Revision: 10010
          http://sourceforge.net/p/phpwiki/code/10010
Author:   vargenau
Date:     2017-05-24 18:05:08 +0000 (Wed, 24 May 2017)
Log Message:
-----------
Require at leastPHP 5.3.3

Modified Paths:
--------------
    trunk/index.php
    trunk/lib/main.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/index.php
===================================================================
--- trunk/index.php	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/index.php	2017-05-24 18:05:08 UTC (rev 10010)
@@ -35,8 +35,8 @@
 require_once(dirname(__FILE__) . '/lib/IniConfig.php');
 IniConfig(dirname(__FILE__) . "/config/config.ini");
 
-if (version_compare(PHP_VERSION, '5.3', '<')) {
-    exit(_("Your PHP version is too old. You must have at least PHP 5.3."));
+if (version_compare(PHP_VERSION, '5.3.3', '<')) {
+    exit(_("Your PHP version is too old. You must have at least PHP 5.3.3."));
 }
 
 ////////////////////////////////////////////////////////////////

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/lib/main.php	2017-05-24 18:05:08 UTC (rev 10010)
@@ -1394,8 +1394,8 @@
 
 function main()
 {
-    if (version_compare(PHP_VERSION, '5.3', '<')) {
-        exit(_("Your PHP version is too old. You must have at least PHP 5.3."));
+    if (version_compare(PHP_VERSION, '5.3.3', '<')) {
+        exit(_("Your PHP version is too old. You must have at least PHP 5.3.3."));
     }
 
     if (!USE_DB_SESSION)

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	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/locale/po/de.po	2017-05-24 18:05:08 UTC (rev 10010)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 11:33+0200\n"
+"POT-Creation-Date: 2017-05-24 19:46+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -20,7 +20,7 @@
 msgid "CategoryGroup"
 msgstr "KategorieGruppen"
 
-msgid "Your PHP version is too old. You must have at least PHP 5.3."
+msgid "Your PHP version is too old. You must have at least PHP 5.3.3."
 msgstr ""
 
 msgid "BAD semantic relation link"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/locale/po/es.po	2017-05-24 18:05:08 UTC (rev 10010)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 11:33+0200\n"
+"POT-Creation-Date: 2017-05-24 19:46+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -25,7 +25,7 @@
 msgid "CategoryGroup"
 msgstr "GrupoCategoría"
 
-msgid "Your PHP version is too old. You must have at least PHP 5.3."
+msgid "Your PHP version is too old. You must have at least PHP 5.3.3."
 msgstr ""
 
 msgid "BAD semantic relation link"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/locale/po/fr.po	2017-05-24 18:05:08 UTC (rev 10010)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 11:33+0200\n"
+"POT-Creation-Date: 2017-05-24 19:46+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -22,9 +22,9 @@
 msgid "CategoryGroup"
 msgstr "CatégorieGroupes"
 
-msgid "Your PHP version is too old. You must have at least PHP 5.3."
+msgid "Your PHP version is too old. You must have at least PHP 5.3.3."
 msgstr ""
-"Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.3."
+"Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.3.3."
 
 msgid "BAD semantic relation link"
 msgstr "MAUVAIS lien de relation sémantique"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/locale/po/it.po	2017-05-24 18:05:08 UTC (rev 10010)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 11:33+0200\n"
+"POT-Creation-Date: 2017-05-24 19:46+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -19,7 +19,7 @@
 msgid "CategoryGroup"
 msgstr "CategoriaGruppo"
 
-msgid "Your PHP version is too old. You must have at least PHP 5.3."
+msgid "Your PHP version is too old. You must have at least PHP 5.3.3."
 msgstr ""
 
 msgid "BAD semantic relation link"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/locale/po/ja.po	2017-05-24 18:05:08 UTC (rev 10010)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 11:33+0200\n"
+"POT-Creation-Date: 2017-05-24 19:46+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -18,7 +18,7 @@
 msgid "CategoryGroup"
 msgstr ""
 
-msgid "Your PHP version is too old. You must have at least PHP 5.3."
+msgid "Your PHP version is too old. You must have at least PHP 5.3.3."
 msgstr ""
 
 msgid "BAD semantic relation link"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/locale/po/nl.po	2017-05-24 18:05:08 UTC (rev 10010)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 11:33+0200\n"
+"POT-Creation-Date: 2017-05-24 19:46+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -22,7 +22,7 @@
 msgid "CategoryGroup"
 msgstr ""
 
-msgid "Your PHP version is too old. You must have at least PHP 5.3."
+msgid "Your PHP version is too old. You must have at least PHP 5.3.3."
 msgstr ""
 
 msgid "BAD semantic relation link"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/locale/po/phpwiki.pot	2017-05-24 18:05:08 UTC (rev 10010)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 11:33+0200\n"
+"POT-Creation-Date: 2017-05-24 19:46+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -18,7 +18,7 @@
 msgid "CategoryGroup"
 msgstr ""
 
-msgid "Your PHP version is too old. You must have at least PHP 5.3."
+msgid "Your PHP version is too old. You must have at least PHP 5.3.3."
 msgstr ""
 
 msgid "BAD semantic relation link"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/locale/po/sv.po	2017-05-24 18:05:08 UTC (rev 10010)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 11:33+0200\n"
+"POT-Creation-Date: 2017-05-24 19:46+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -19,7 +19,7 @@
 msgid "CategoryGroup"
 msgstr ""
 
-msgid "Your PHP version is too old. You must have at least PHP 5.3."
+msgid "Your PHP version is too old. You must have at least PHP 5.3.3."
 msgstr ""
 
 msgid "BAD semantic relation link"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2017-05-23 13:47:42 UTC (rev 10009)
+++ trunk/locale/po/zh.po	2017-05-24 18:05:08 UTC (rev 10010)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 11:33+0200\n"
+"POT-Creation-Date: 2017-05-24 19:46+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -18,7 +18,7 @@
 msgid "CategoryGroup"
 msgstr ""
 
-msgid "Your PHP version is too old. You must have at least PHP 5.3."
+msgid "Your PHP version is too old. You must have at least PHP 5.3.3."
 msgstr ""
 
 msgid "BAD semantic relation link"

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:[10009] trunk/themes/fusionforge/fusionforge.css

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

Revision: 10009
          http://sourceforge.net/p/phpwiki/code/10009
Author:   vargenau
Date:     2017-05-23 13:47:42 +0000 (Tue, 23 May 2017)
Log Message:
-----------
label display inline-block: Summary in the edit page to be aligned

Modified Paths:
--------------
    trunk/themes/fusionforge/fusionforge.css

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2017-05-23 09:34:22 UTC (rev 10008)
+++ trunk/themes/fusionforge/fusionforge.css	2017-05-23 13:47:42 UTC (rev 10009)
@@ -162,6 +162,10 @@
     white-space: nowrap;
 }
 
+label {
+    display: inline-block;
+}
+
 table.sortable th.header {
     background-image: url(../default/buttons/sort_none.gif);
     cursor: pointer;

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

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

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

Revision: 10008
          http://sourceforge.net/p/phpwiki/code/10008
Author:   vargenau
Date:     2017-05-23 09:34:22 +0000 (Tue, 23 May 2017)
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	2017-05-23 09:30:02 UTC (rev 10007)
+++ trunk/locale/po/de.po	2017-05-23 09:34:22 UTC (rev 10008)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 16:32+0200\n"
+"POT-Creation-Date: 2017-05-23 11:33+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1735,6 +1735,12 @@
 "Display a marker with further infos (when clicking) on given coordinates."
 msgstr ""
 
+msgid "Longitude must be a number."
+msgstr ""
+
+msgid "Latitude must be a number."
+msgstr ""
+
 #, php-format
 msgid "Invalid argument %s"
 msgstr "Ungültiger Parameter %s"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2017-05-23 09:30:02 UTC (rev 10007)
+++ trunk/locale/po/es.po	2017-05-23 09:34:22 UTC (rev 10008)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 16:32+0200\n"
+"POT-Creation-Date: 2017-05-23 11:33+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1703,6 +1703,12 @@
 "Display a marker with further infos (when clicking) on given coordinates."
 msgstr ""
 
+msgid "Longitude must be a number."
+msgstr ""
+
+msgid "Latitude must be a number."
+msgstr ""
+
 #, php-format
 msgid "Invalid argument %s"
 msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2017-05-23 09:30:02 UTC (rev 10007)
+++ trunk/locale/po/fr.po	2017-05-23 09:34:22 UTC (rev 10008)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 16:32+0200\n"
+"POT-Creation-Date: 2017-05-23 11:33+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1729,6 +1729,12 @@
 "Display a marker with further infos (when clicking) on given coordinates."
 msgstr ""
 
+msgid "Longitude must be a number."
+msgstr "La longitude doit être un nombre."
+
+msgid "Latitude must be a number."
+msgstr "La latitude doit être un nombre."
+
 #, php-format
 msgid "Invalid argument %s"
 msgstr "Argument non valable %s"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2017-05-23 09:30:02 UTC (rev 10007)
+++ trunk/locale/po/it.po	2017-05-23 09:34:22 UTC (rev 10008)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 16:32+0200\n"
+"POT-Creation-Date: 2017-05-23 11:33+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -1686,6 +1686,12 @@
 "Display a marker with further infos (when clicking) on given coordinates."
 msgstr ""
 
+msgid "Longitude must be a number."
+msgstr ""
+
+msgid "Latitude must be a number."
+msgstr ""
+
 #, php-format
 msgid "Invalid argument %s"
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2017-05-23 09:30:02 UTC (rev 10007)
+++ trunk/locale/po/ja.po	2017-05-23 09:34:22 UTC (rev 10008)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 16:32+0200\n"
+"POT-Creation-Date: 2017-05-23 11:33+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1672,6 +1672,12 @@
 "Display a marker with further infos (when clicking) on given coordinates."
 msgstr ""
 
+msgid "Longitude must be a number."
+msgstr ""
+
+msgid "Latitude must be a number."
+msgstr ""
+
 #, php-format
 msgid "Invalid argument %s"
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2017-05-23 09:30:02 UTC (rev 10007)
+++ trunk/locale/po/nl.po	2017-05-23 09:34:22 UTC (rev 10008)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 16:32+0200\n"
+"POT-Creation-Date: 2017-05-23 11:33+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1678,6 +1678,12 @@
 "Display a marker with further infos (when clicking) on given coordinates."
 msgstr ""
 
+msgid "Longitude must be a number."
+msgstr ""
+
+msgid "Latitude must be a number."
+msgstr ""
+
 #, php-format
 msgid "Invalid argument %s"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2017-05-23 09:30:02 UTC (rev 10007)
+++ trunk/locale/po/phpwiki.pot	2017-05-23 09:34:22 UTC (rev 10008)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 16:32+0200\n"
+"POT-Creation-Date: 2017-05-23 11:33+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1672,6 +1672,12 @@
 "Display a marker with further infos (when clicking) on given coordinates."
 msgstr ""
 
+msgid "Longitude must be a number."
+msgstr ""
+
+msgid "Latitude must be a number."
+msgstr ""
+
 #, php-format
 msgid "Invalid argument %s"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2017-05-23 09:30:02 UTC (rev 10007)
+++ trunk/locale/po/sv.po	2017-05-23 09:34:22 UTC (rev 10008)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 16:32+0200\n"
+"POT-Creation-Date: 2017-05-23 11:33+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1673,6 +1673,12 @@
 "Display a marker with further infos (when clicking) on given coordinates."
 msgstr ""
 
+msgid "Longitude must be a number."
+msgstr ""
+
+msgid "Latitude must be a number."
+msgstr ""
+
 #, php-format
 msgid "Invalid argument %s"
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2017-05-23 09:30:02 UTC (rev 10007)
+++ trunk/locale/po/zh.po	2017-05-23 09:34:22 UTC (rev 10008)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 16:32+0200\n"
+"POT-Creation-Date: 2017-05-23 11:33+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1679,6 +1679,12 @@
 "Display a marker with further infos (when clicking) on given coordinates."
 msgstr ""
 
+msgid "Longitude must be a number."
+msgstr ""
+
+msgid "Latitude must be a number."
+msgstr ""
+
 #, php-format
 msgid "Invalid argument %s"
 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:[10007] trunk

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

Revision: 10007
          http://sourceforge.net/p/phpwiki/code/10007
Author:   vargenau
Date:     2017-05-23 09:30:02 +0000 (Tue, 23 May 2017)
Log Message:
-----------
Better check arguments for GoogleMaps plugin

Modified Paths:
--------------
    trunk/lib/plugin/GoogleMaps.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2017-05-21 14:33:38 UTC (rev 10006)
+++ trunk/lib/plugin/GoogleMaps.php	2017-05-23 09:30:02 UTC (rev 10007)
@@ -97,9 +97,15 @@
         if ($Longitude === '') {
             return $this->error(sprintf(_("A required argument “%s” is missing."), 'Longitude'));
         }
+        if (!is_numeric($Longitude)) {
+            return $this->error(_('Longitude must be a number.'));
+        }
         if ($Latitude === '') {
             return $this->error(sprintf(_("A required argument “%s” is missing."), 'Latitude'));
         }
+        if (!is_numeric($Latitude)) {
+            return $this->error(_('Latitude must be a number.'));
+        }
 
         $maps = JavaScript('', array('src' => "http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY));
         $id = GenerateId("googlemap");

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2017-05-21 14:33:38 UTC (rev 10006)
+++ trunk/pgsrc/ReleaseNotes	2017-05-23 09:30:02 UTC (rev 10007)
@@ -1,4 +1,4 @@
-Date: Mon, 13 Mar 2017 15:59:30 +0000
+Date: Tue, 23 May 2017 11:26:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -31,6 +31,7 @@
 ** It was possible to rename a page to a name with illegal characters, like ~[~]
 ** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
 ** Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.
+** Better check arguments for ~GoogleMaps plugin
 * Plugins:
 ** ~UpLoad plugin: put date and author in history
 ** ~UpLoad plugin: don't inline images

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

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

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

Revision: 10006
          http://sourceforge.net/p/phpwiki/code/10006
Author:   vargenau
Date:     2017-05-21 14:33:38 +0000 (Sun, 21 May 2017)
Log Message:
-----------
More generic error message for IsSafeURL

Modified Paths:
--------------
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/Transclude.php
    trunk/lib/stdlib.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/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/lib/plugin/PhotoAlbum.php	2017-05-21 14:33:38 UTC (rev 10006)
@@ -546,7 +546,7 @@
     }*/
         //FIXME!
         if (!IsSafeURL($src)) {
-            return $this->error(_("Bad url in src: remove all of <, >, \""));
+            return $this->error(_("Bad URL in src"));
         }
         $photos[] = array("name" => $src, //album_location."/$src".album_default_extension,
             "desc" => "");
@@ -560,7 +560,7 @@
      * @param  string $src    path to dir or textfile (local or remote)
      * @param  array  $photos
      * @param string $webpath
-     * @return string Error when bad url or file couldn't be opened
+     * @return string Error when bad URL or file couldn't be opened
      */
     function fromFile($src, &$photos, $webpath = '')
     {
@@ -574,7 +574,7 @@
             return $this->error(_("File extension for csv file has to be '.csv'"));
         }
         if (!IsSafeURL($src)) {
-            return $this->error(_("Bad url in src: remove all of <, >, \""));
+            return $this->error(_("Bad URL in src"));
         }
         if (preg_match('/^(http|ftp|https):\/\//i', $src)) {
             $contents = url_get_contents($src);

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/lib/plugin/Transclude.php	2017-05-21 14:33:38 UTC (rev 10006)
@@ -93,7 +93,7 @@
             return $this->error(fmt("Recursive inclusion of url %s", $src));
         }
         if (!IsSafeURL($src)) {
-            return $this->error(_("Bad url in src: remove all of <, >, \""));
+            return $this->error(_("Bad URL in src"));
         }
 
         $params = array('title' => $title,

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/lib/stdlib.php	2017-05-21 14:33:38 UTC (rev 10006)
@@ -369,7 +369,7 @@
 {
     // FIXME: Is this needed (or sufficient?)
     if (!IsSafeURL($url)) {
-        $link = HTML::span(array('class' => 'error'), _('Bad URL -- remove all of <, >, "'));
+        $link = HTML::span(array('class' => 'error'), _('Bad URL'));
         return $link;
     } else {
         if (!$linktext)
@@ -407,7 +407,7 @@
     $arr = explode(' ', $url);
     if (!empty($arr)) $url = $arr[0];
     if (!IsSafeURL($url)) {
-        $link = HTML::span(array('class' => 'error'), _('Bad URL for image -- remove all of <, >, "'));
+        $link = HTML::span(array('class' => 'error'), _('Bad URL for image'));
         return $link;
     }
     // spaces in inline images must be %20 encoded!

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	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/locale/po/de.po	2017-05-21 14:33:38 UTC (rev 10006)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 15:45+0100\n"
+"POT-Creation-Date: 2017-05-21 16:32+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2242,9 +2242,8 @@
 "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen "
 "Beschreibungen."
 
-msgid "Bad url in src: remove all of <, >, \""
-msgstr ""
-"URL Formfehler in Quellcode: alle der folgenden Zeichen entfernen <, >, \""
+msgid "Bad URL in src"
+msgstr "URL Formfehler in Quellcode"
 
 msgid "File extension for csv file has to be '.csv'"
 msgstr ""
@@ -4540,11 +4539,11 @@
 "ADODB or PDO."
 msgstr ""
 
-msgid "Bad URL -- remove all of <, >, \""
-msgstr "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \""
+msgid "Bad URL"
+msgstr "URL Formfehler"
 
-msgid "Bad URL for image -- remove all of <, >, \""
-msgstr "URL Formfehler für Bild - Entfernen Sie alle Zeichen mit <, >, \""
+msgid "Bad URL for image"
+msgstr "URL Formfehler für Bild"
 
 #, php-format
 msgid "Invalid attribute %s=%s for image %s"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/locale/po/es.po	2017-05-21 14:33:38 UTC (rev 10006)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 15:45+0100\n"
+"POT-Creation-Date: 2017-05-21 16:32+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2180,7 +2180,7 @@
 "Display a set of photos listed in a text file with optional descriptions."
 msgstr ""
 
-msgid "Bad url in src: remove all of <, >, \""
+msgid "Bad URL in src"
 msgstr ""
 
 msgid "File extension for csv file has to be '.csv'"
@@ -4407,10 +4407,10 @@
 "ADODB or PDO."
 msgstr ""
 
-msgid "Bad URL -- remove all of <, >, \""
+msgid "Bad URL"
 msgstr ""
 
-msgid "Bad URL for image -- remove all of <, >, \""
+msgid "Bad URL for image"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/locale/po/fr.po	2017-05-21 14:33:38 UTC (rev 10006)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 15:45+0100\n"
+"POT-Creation-Date: 2017-05-21 16:32+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2221,8 +2221,8 @@
 "Affiche un groupe de photos listées dans un fichier texte avec des "
 "descriptions facultatives."
 
-msgid "Bad url in src: remove all of <, >, \""
-msgstr "Mauvaise URL dans la source : retirez tous les <, >, \""
+msgid "Bad URL in src"
+msgstr "URL incorrecte dans la source"
 
 msgid "File extension for csv file has to be '.csv'"
 msgstr ""
@@ -4504,11 +4504,11 @@
 "ADODB or PDO."
 msgstr ""
 
-msgid "Bad URL -- remove all of <, >, \""
-msgstr "Mauvaise URL -- retirez tous les <, >, \""
+msgid "Bad URL"
+msgstr "URL incorrecte"
 
-msgid "Bad URL for image -- remove all of <, >, \""
-msgstr "Mauvaise URL pour l'image -- retirez tous les <, >, \""
+msgid "Bad URL for image"
+msgstr "URL incorrecte pour l'image"
 
 #, php-format
 msgid "Invalid attribute %s=%s for image %s"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/locale/po/it.po	2017-05-21 14:33:38 UTC (rev 10006)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 15:45+0100\n"
+"POT-Creation-Date: 2017-05-21 16:32+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -2161,7 +2161,7 @@
 "Display a set of photos listed in a text file with optional descriptions."
 msgstr ""
 
-msgid "Bad url in src: remove all of <, >, \""
+msgid "Bad URL in src"
 msgstr ""
 
 msgid "File extension for csv file has to be '.csv'"
@@ -4384,10 +4384,10 @@
 "ADODB or PDO."
 msgstr ""
 
-msgid "Bad URL -- remove all of <, >, \""
+msgid "Bad URL"
 msgstr ""
 
-msgid "Bad URL for image -- remove all of <, >, \""
+msgid "Bad URL for image"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/locale/po/ja.po	2017-05-21 14:33:38 UTC (rev 10006)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 15:45+0100\n"
+"POT-Creation-Date: 2017-05-21 16:32+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2147,7 +2147,7 @@
 "Display a set of photos listed in a text file with optional descriptions."
 msgstr ""
 
-msgid "Bad url in src: remove all of <, >, \""
+msgid "Bad URL in src"
 msgstr ""
 
 msgid "File extension for csv file has to be '.csv'"
@@ -4370,10 +4370,10 @@
 "ADODB or PDO."
 msgstr ""
 
-msgid "Bad URL -- remove all of <, >, \""
+msgid "Bad URL"
 msgstr ""
 
-msgid "Bad URL for image -- remove all of <, >, \""
+msgid "Bad URL for image"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/locale/po/nl.po	2017-05-21 14:33:38 UTC (rev 10006)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 15:45+0100\n"
+"POT-Creation-Date: 2017-05-21 16:32+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -2153,7 +2153,7 @@
 "Display a set of photos listed in a text file with optional descriptions."
 msgstr ""
 
-msgid "Bad url in src: remove all of <, >, \""
+msgid "Bad URL in src"
 msgstr ""
 
 msgid "File extension for csv file has to be '.csv'"
@@ -4376,10 +4376,10 @@
 "ADODB or PDO."
 msgstr ""
 
-msgid "Bad URL -- remove all of <, >, \""
+msgid "Bad URL"
 msgstr ""
 
-msgid "Bad URL for image -- remove all of <, >, \""
+msgid "Bad URL for image"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/locale/po/phpwiki.pot	2017-05-21 14:33:38 UTC (rev 10006)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 15:45+0100\n"
+"POT-Creation-Date: 2017-05-21 16:32+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2147,7 +2147,7 @@
 "Display a set of photos listed in a text file with optional descriptions."
 msgstr ""
 
-msgid "Bad url in src: remove all of <, >, \""
+msgid "Bad URL in src"
 msgstr ""
 
 msgid "File extension for csv file has to be '.csv'"
@@ -4370,10 +4370,10 @@
 "ADODB or PDO."
 msgstr ""
 
-msgid "Bad URL -- remove all of <, >, \""
+msgid "Bad URL"
 msgstr ""
 
-msgid "Bad URL for image -- remove all of <, >, \""
+msgid "Bad URL for image"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/locale/po/sv.po	2017-05-21 14:33:38 UTC (rev 10006)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 15:45+0100\n"
+"POT-Creation-Date: 2017-05-21 16:32+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2148,7 +2148,7 @@
 "Display a set of photos listed in a text file with optional descriptions."
 msgstr ""
 
-msgid "Bad url in src: remove all of <, >, \""
+msgid "Bad URL in src"
 msgstr ""
 
 msgid "File extension for csv file has to be '.csv'"
@@ -4371,10 +4371,10 @@
 "ADODB or PDO."
 msgstr ""
 
-msgid "Bad URL -- remove all of <, >, \""
+msgid "Bad URL"
 msgstr ""
 
-msgid "Bad URL for image -- remove all of <, >, \""
+msgid "Bad URL for image"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2017-05-18 18:36:34 UTC (rev 10005)
+++ trunk/locale/po/zh.po	2017-05-21 14:33:38 UTC (rev 10006)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 15:45+0100\n"
+"POT-Creation-Date: 2017-05-21 16:32+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2156,8 +2156,8 @@
 "Display a set of photos listed in a text file with optional descriptions."
 msgstr "顯示帶有簡單描述的文字檔內的相片集合."
 
-msgid "Bad url in src: remove all of <, >, \""
-msgstr "在 src 中錯誤的 url: 移除所有的 <, .>, \""
+msgid "Bad URL in src"
+msgstr "在 src 中錯誤的 URL"
 
 msgid "File extension for csv file has to be '.csv'"
 msgstr ""
@@ -4387,10 +4387,10 @@
 "ADODB or PDO."
 msgstr ""
 
-msgid "Bad URL -- remove all of <, >, \""
-msgstr "錯誤 URL -- 移除所有的 <, >, \""
+msgid "Bad URL"
+msgstr "錯誤 URL"
 
-msgid "Bad URL for image -- remove all of <, >, \""
+msgid "Bad URL for image"
 msgstr ""
 
 #, php-format

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

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

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10005] trunk/lib/stdlib.php

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

Revision: 10005
          http://sourceforge.net/p/phpwiki/code/10005
Author:   vargenau
Date:     2017-05-18 18:36:34 +0000 (Thu, 18 May 2017)
Log Message:
-----------
PHP Doc

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2017-03-13 16:10:12 UTC (rev 10004)
+++ trunk/lib/stdlib.php	2017-05-18 18:36:34 UTC (rev 10005)
@@ -351,7 +351,7 @@
  * Check against their urlencoded values also.
  *
  * @param string $url URL to check for unsafe characters.
- * @return boolean True if same, false else.
+ * @return bool True if safe, false else.
  */
 function IsSafeURL($url)
 {
@@ -1188,8 +1188,8 @@
  * Short format is used for PageList
  * Long format is used in PageInfo
  *
- * @param $bytes       int.  Default: 0.
- * @param $longformat  bool. Default: false.
+ * @param int $bytes       Default: 0.
+ * @param bool $longformat Default: false.
  * @return FormattedText (XmlElement.php).
  */
 function ByteFormatter($bytes = 0, $longformat = 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:[10004] trunk

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

Revision: 10004
          http://sourceforge.net/p/phpwiki/code/10004
Author:   vargenau
Date:     2017-03-13 16:10:12 +0000 (Mon, 13 Mar 2017)
Log Message:
-----------
Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.

Modified Paths:
--------------
    trunk/lib/mimelib.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/mimelib.php
===================================================================
--- trunk/lib/mimelib.php	2017-01-18 15:49:41 UTC (rev 10003)
+++ trunk/lib/mimelib.php	2017-03-13 16:10:12 UTC (rev 10004)
@@ -58,7 +58,12 @@
 {
     // Eliminate soft line-breaks.
     $string = preg_replace('/=[ \t\r]*\n/', '', $string);
-    return quoted_printable_decode($string);
+    $decoded = quoted_printable_decode($string);
+    // When importing e.g. a ZIP from an old wiki in Latin 1 (ISO 8859-1)
+    if (!is_utf8($decoded)) {
+        $decoded = utf8_encode($decoded);
+    }
+    return $decoded;
 }
 
 define('MIME_TOKEN_REGEXP', "[-!#-'*+.0-9A-Z^-~]+");

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2017-01-18 15:49:41 UTC (rev 10003)
+++ trunk/pgsrc/ReleaseNotes	2017-03-13 16:10:12 UTC (rev 10004)
@@ -1,4 +1,4 @@
-Date: Wed, 14 Dec 2016 18:55:50 +0000
+Date: Mon, 13 Mar 2017 15:59:30 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -30,6 +30,7 @@
 ** Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3)
 ** It was possible to rename a page to a name with illegal characters, like ~[~]
 ** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
+** Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.
 * Plugins:
 ** ~UpLoad plugin: put date and author in history
 ** ~UpLoad plugin: don't inline images

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10003] trunk/lib/loadsave.php

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

Revision: 10003
          http://sourceforge.net/p/phpwiki/code/10003
Author:   vargenau
Date:     2017-01-18 15:49:41 +0000 (Wed, 18 Jan 2017)
Log Message:
-----------
Make XHTML ZIP Snapshot work again (real fix)

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2017-01-11 15:34:42 UTC (rev 10002)
+++ trunk/lib/loadsave.php	2017-01-18 15:49:41 UTC (rev 10003)
@@ -754,7 +754,7 @@
                     }
                 } else {
                     $target = "images/" . basename($from);
-                    $zip->addFile($target);
+                    $zip->addFile($from, $target);
                 }
             } elseif (!$silent) {
                 _copyMsg($from, _("... not found"));
@@ -789,7 +789,7 @@
                     }
                 } else {
                     $target = "images/buttons/" . basename($from);
-                    $zip->addFile($target);
+                    $zip->addFile($from, $target);
                 }
             } elseif (!$silent) {
                 _copyMsg($from, _("... not found"));
@@ -819,7 +819,7 @@
                 } else {
                     //$attrib = array('is_ascii' => 0);
                     $target = basename($css_file);
-                    $zip->addFile($target);
+                    $zip->addFile($from, $target);
                 }
             } elseif (!$silent) {
                 _copyMsg($from, _("... not found"));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10002] trunk/lib/WikiUser/FusionForge.php

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

Revision: 10002
          http://sourceforge.net/p/phpwiki/code/10002
Author:   vargenau
Date:     2017-01-11 15:34:42 +0000 (Wed, 11 Jan 2017)
Log Message:
-----------
Add braces

Modified Paths:
--------------
    trunk/lib/WikiUser/FusionForge.php

Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2017-01-11 15:29:56 UTC (rev 10001)
+++ trunk/lib/WikiUser/FusionForge.php	2017-01-11 15:34:42 UTC (rev 10002)
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright © 2006 Alain Peyrat
  *
  * This file is part of PhpWiki.
@@ -26,7 +26,8 @@
  *
  */
 
-class _FusionForgePassUser extends _PassUser
+class _FusionForgePassUser
+    extends _PassUser
 {
 
     public $_is_external = 0;
@@ -36,15 +37,17 @@
         if ($prefs) $this->_prefs = $prefs;
         if (!isset($this->_prefs->_method))
             parent::__construct($UserName);
-        if ($UserName) $this->_userid = $UserName;
+        if ($UserName)
+            $this->_userid = $UserName;
         $this->_authmethod = 'FusionForge';
 
         // Is this double check really needed?
         // It is not expensive so we keep it for now.
-        if ($this->userExists())
+        if ($this->userExists()) {
             return $this;
-        else
+        } else {
             return $GLOBALS['ForbiddenUser'];
+        }
     }
 
     function userExists()

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10001] trunk/lib/WikiUser/HttpAuth.php

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

Revision: 10001
          http://sourceforge.net/p/phpwiki/code/10001
Author:   vargenau
Date:     2017-01-11 15:29:56 +0000 (Wed, 11 Jan 2017)
Log Message:
-----------
Whitespace

Modified Paths:
--------------
    trunk/lib/WikiUser/HttpAuth.php

Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php	2017-01-11 15:10:19 UTC (rev 10000)
+++ trunk/lib/WikiUser/HttpAuth.php	2017-01-11 15:29:56 UTC (rev 10001)
@@ -23,7 +23,7 @@
  */
 
 /**
- * We have two possibilities here.
+ * We have two possibilities here:
  * 1) The webserver location is already HTTP protected. Usually Basic, but also
  *    NTLM or Digest. Then just use this username and do nothing.
  * 2) The webserver location is not protected, so we enforce basic HTTP Protection
@@ -43,7 +43,8 @@
         if ($prefs) $this->_prefs = $prefs;
         if (!isset($this->_prefs->_method))
             parent::__construct($UserName);
-        if ($UserName) $this->_userid = $UserName;
+        if ($UserName)
+            $this->_userid = $UserName;
         $this->_authmethod = 'HttpAuth';
 
         // Is this double check really needed?

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10000] trunk/lib/main.php

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

Revision: 10000
          http://sourceforge.net/p/phpwiki/code/10000
Author:   vargenau
Date:     2017-01-11 15:10:19 +0000 (Wed, 11 Jan 2017)
Log Message:
-----------
Remove unused USE_PREFS_IN_PAGE

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2017-01-11 15:08:45 UTC (rev 9999)
+++ trunk/lib/main.php	2017-01-11 15:10:19 UTC (rev 10000)
@@ -24,9 +24,6 @@
  *
  */
 
-define ('USE_PREFS_IN_PAGE', true);
-
-//include "lib/config.php";
 require_once 'lib/stdlib.php';
 require_once 'lib/Request.php';
 require_once 'lib/WikiDB.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:[9999] trunk/lib/config.php

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

Revision: 9999
          http://sourceforge.net/p/phpwiki/code/9999
Author:   vargenau
Date:     2017-01-11 15:08:45 +0000 (Wed, 11 Jan 2017)
Log Message:
-----------
Remove obsolete comment

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2017-01-11 15:07:17 UTC (rev 9998)
+++ trunk/lib/config.php	2017-01-11 15:08:45 UTC (rev 9999)
@@ -31,7 +31,6 @@
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php
- * The run-time code has been moved to lib/IniConfig.php:fix_configs()
  */
 
 if (!defined("LC_ALL")) {

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