Merge branch 'master' into stable

* master: (214 commits)
  release preparations
  postgresql auth plugin: correct function name
  parse AT parameter: first strtotime then timestamp remove config option
  move more strings to lang.php
  move strings to lang.php
  add placeholders for create page text
  phpdocs parserutils
  improve some scrutinizer issues
  visibility plugin methods
  use config cascade for loading of localizations
  reformatting config cascade
  add lang files to cascading
  work around missing gzopen on certain systems #865
  translation update
  fix scrutinizer issues
  fixed typos in docblock comments
  do not allow empty passwords
  clean user credentials from control chars
  added filter method to INPUT class
  translation update
  ...

9 files changed, 127 insertions, 4 deletions

diff --git a/lib/plugins/authpgsql/auth.php b/lib/plugins/authpgsql/auth.php
index e51b39858..de41598e0 100644
--- a/lib/plugins/authpgsql/auth.php
+++ b/lib/plugins/authpgsql/auth.php
@@ -159,9 +159,11 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql {
             if($first) $sql .= " OFFSET $first";
             $result = $this->_queryDB($sql);
 
-            foreach($result as $user)
-                if(($info = $this->_getUserInfo($user['user'])))
+            foreach($result as $user) {
+                if(($info = $this->_getUserInfo($user['user']))) {
                     $out[$user['user']] = $info;
+                }
+            }
 
             $this->_unlockTables();
             $this->_closeDB();
@@ -212,7 +214,10 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql {
             $sql = str_replace('%{user}', addslashes($user), $sql);
             $sql = str_replace('%{gid}', addslashes($gid), $sql);
             $sql = str_replace('%{group}', addslashes($group), $sql);
-            if($this->_modifyDB($sql) !== false) return true;
+            if($this->_modifyDB($sql) !== false) {
+                $this->_flushUserInfoCache($user);
+                return true;
+            }
 
             if($newgroup) { // remove previously created group on error
                 $sql = str_replace('%{gid}', addslashes($gid), $this->conf['delGroup']);
@@ -267,6 +272,7 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql {
                 }
 
                 if($gid !== false){
+                    $this->_flushUserInfoCache($user);
                     return true;
                 } else {
                     /* remove the new user and all group relations if a group can't
diff --git a/lib/plugins/authpgsql/lang/es/settings.php b/lib/plugins/authpgsql/lang/es/settings.php
index bee2211f3..abfb00d38 100644
--- a/lib/plugins/authpgsql/lang/es/settings.php
+++ b/lib/plugins/authpgsql/lang/es/settings.php
@@ -4,6 +4,35 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Antonio Bueno <atnbueno@gmail.com>
+ * @author Antonio Castilla <antoniocastilla@trazoide.com>
+ * @author pokesakura <pokesakura@gmail.com>
  */
+$lang['server']                = 'Su servidor PostgreSQL';
+$lang['port']                  = 'Puerto de su servidor PostgreSQL';
+$lang['user']                  = 'Nombre de usuario PostgreSQL';
 $lang['password']              = 'Contraseña del usuario indicado';
 $lang['database']              = 'Base de datos a usar';
+$lang['debug']                 = 'Muestra la información de depuración adicional';
+$lang['forwardClearPass']      = 'Pasar las contraseñas de usuario en texto plano a las siguientes sentencias de SQL, en lugar de utilizar la opción passcrypt';
+$lang['checkPass']             = 'Sentencia SQL para el control de las contraseñas';
+$lang['getUserInfo']           = 'Sentencia SQL para recuperar información del usuario';
+$lang['getGroups']             = 'Sentencia SQL para recuperar la pertenencia a grupos de un usuario';
+$lang['getUsers']              = 'Sentencia SQL para enumerar todos los usuarios';
+$lang['FilterLogin']           = 'Sentencia SQL para filtrar a los usuarios por su login';
+$lang['FilterName']            = 'Sentencia SQL para filtrar a los usuarios por su nombre completo';
+$lang['FilterEmail']           = 'Sentencia SQL para filtrar a los usuarios por su correo electrónico';
+$lang['FilterGroup']           = 'Sentencia SQL para filtrar a los usuarios por su membresía en un grupo';
+$lang['SortOrder']             = 'Sentencia SQL para ordenar a los usuarios';
+$lang['addUser']               = 'Sentencia de SQL para agregar un nuevo usuario';
+$lang['addGroup']              = 'Sentencia de SQL para agregar un nuevo grupo';
+$lang['addUserGroup']          = 'Sentencia SQL para agregar un usuario a un grupo existente';
+$lang['delGroup']              = 'Instrucción SQL para eliminar un grupo';
+$lang['getUserID']             = 'Sentencia SQL para obtener la clave principal de un usuario';
+$lang['delUser']               = 'Sentencia SQL para eliminar un usuario';
+$lang['delUserRefs']           = 'Sentencia SQL para remover a un usuario de su memebresia en todos los grupos';
+$lang['updateUser']            = 'Sentencia SQL para actualizar los datos del usuario';
+$lang['UpdateLogin']           = 'Sentencia de actualizacion para el login del usuario';
+$lang['UpdatePass']            = 'Sentencia de actualizacion para el password del usuario';
+$lang['UpdateEmail']           = 'Sentencia de actualizacion del correo electrónico del usuario';
+$lang['UpdateName']            = 'Sentencia de actualizacion del nombre completo del usuario';
+$lang['getGroupID']            = 'Sentencia SQL para obtener la clave principal de un grupo dado';
diff --git a/lib/plugins/authpgsql/lang/fa/settings.php b/lib/plugins/authpgsql/lang/fa/settings.php
new file mode 100644
index 000000000..813493967
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/fa/settings.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Mohamad Mehdi Habibi <habibi.esf@gmail.com>
+ */
+$lang['database']              = 'پایگاه داده مورد استفاده';
diff --git a/lib/plugins/authpgsql/lang/hr/settings.php b/lib/plugins/authpgsql/lang/hr/settings.php
new file mode 100644
index 000000000..7ae4cec77
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/hr/settings.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Davor Turkalj <turki.bsc@gmail.com>
+ */
+$lang['server']                = 'Vaš PostgreSQL server';
+$lang['port']                  = 'Port vašeg PostgreSQL servera';
+$lang['user']                  = 'PostgreSQL korisničko ime';
+$lang['password']              = 'Lozinka gore navedenoga korisnika';
+$lang['database']              = 'Baza koja se koristi';
+$lang['debug']                 = 'Prikaz dodatnih dijagnostičkih informacija';
+$lang['forwardClearPass']      = 'Proslijed lozinku kao običan tekst u SQL izrazima koji slijede, umjesto korištenja passcrypt opcije';
+$lang['checkPass']             = 'SQL izraz za provjeru lozinke';
+$lang['getUserInfo']           = 'SQL izraz za dohvat korisničkih informacija';
+$lang['getGroups']             = 'SQL izraz za dohvat korisničkog članstva u grupama';
+$lang['getUsers']              = 'SQL izraz za ispis svih korisnika';
+$lang['FilterLogin']           = 'SQL izraz za filtriranje korisnika po korisničkom imenu';
+$lang['FilterName']            = 'SQL izraz za filtriranje korisnika po punom imenu';
+$lang['FilterEmail']           = 'SQL izraz za filtriranje korisnika po email adresi';
+$lang['FilterGroup']           = 'SQL izraz za filtriranje korisnika po članstvu u grupama';
+$lang['SortOrder']             = 'SQL izraz za sortiranje korisnika';
+$lang['addUser']               = 'SQL izraz za dodavanje novog korisnika';
+$lang['addGroup']              = 'SQL izraz za dodavanje nove grupe';
+$lang['addUserGroup']          = 'SQL izraz za dodavanje korisnika u postojeću grupu';
+$lang['delGroup']              = 'SQL izraz za brisanje grupe';
+$lang['getUserID']             = 'SQL izraz za dohvaćanje primarnog ključa korisnika';
+$lang['delUser']               = 'SQL izraz za brisanje korisnika';
+$lang['delUserRefs']           = 'SQL izraz za uklanjanje korisnika iz svih grupa';
+$lang['updateUser']            = 'SQL izraz za ažuriranje korisničkog profila';
+$lang['UpdateLogin']           = 'UPDATE izraz za ažuriranje korisničkog imena';
+$lang['UpdatePass']            = 'UPDATE izraz za ažuriranje korisničke lozinke';
+$lang['UpdateEmail']           = 'UPDATE izraz za ažuriranje korisničke email adrese';
+$lang['UpdateName']            = 'UPDATE izraz za ažuriranje korisničkog punog imena';
+$lang['UpdateTarget']          = 'Limitirajući izraz za identificiranje korisnika pri ažuriranju';
+$lang['delUserGroup']          = 'SQL izraz za uklanjanje korisnika iz navedenih grupa';
+$lang['getGroupID']            = 'SQL izraz za dobivanje primarnog ključa navedene grupe';
diff --git a/lib/plugins/authpgsql/lang/it/settings.php b/lib/plugins/authpgsql/lang/it/settings.php
new file mode 100644
index 000000000..baf40a468
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/it/settings.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Francesco <francesco.cavalli@hotmail.com>
+ */
+$lang['server']                = 'Il tuo server PostgreSQL ';
+$lang['port']                  = 'La porta del tuo server PostgreSQL ';
+$lang['user']                  = 'Lo username PostgreSQL';
+$lang['database']              = 'Database da usare';
diff --git a/lib/plugins/authpgsql/lang/lv/settings.php b/lib/plugins/authpgsql/lang/lv/settings.php
new file mode 100644
index 000000000..889b9566c
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/lv/settings.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Aivars Miška <allefm@gmail.com>
+ */
+$lang['password']              = 'Lietotāja parole';
+$lang['delUser']               = 'SQL pieprasījums lietotāja dzēšanai';
diff --git a/lib/plugins/authpgsql/lang/pl/settings.php b/lib/plugins/authpgsql/lang/pl/settings.php
new file mode 100644
index 000000000..25a2afd4f
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/pl/settings.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Mati <mackosa@wp.pl>
+ */
+$lang['server']                = 'Twój serwer PostgreSQL';
+$lang['database']              = 'Baza danych do użycia';
diff --git a/lib/plugins/authpgsql/lang/tr/settings.php b/lib/plugins/authpgsql/lang/tr/settings.php
new file mode 100644
index 000000000..f6fef9cde
--- /dev/null
+++ b/lib/plugins/authpgsql/lang/tr/settings.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author İlker R. Kapaç <irifat@gmail.com>
+ */
+$lang['server']                = 'PostgreSQL sunucunuz';
+$lang['port']                  = 'PostgreSQL sunucunuzun kapısı (port)';
+$lang['user']                  = 'PostgreSQL kullanıcısının adı';
+$lang['password']              = 'Yukarıdaki kullanıcı için şifre';
+$lang['database']              = 'Kullanılacak veritabanı';
+$lang['debug']                 = 'İlave hata ayıklama bilgisini görüntüle';
diff --git a/lib/plugins/authpgsql/plugin.info.txt b/lib/plugins/authpgsql/plugin.info.txt
index aecab914e..59b7d89a9 100644
--- a/lib/plugins/authpgsql/plugin.info.txt
+++ b/lib/plugins/authpgsql/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authpgsql
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2013-02-16
+date   2014-02-15
 name   PostgreSQL Auth Plugin
 desc   Provides user authentication against a PostgreSQL database
 url    http://www.dokuwiki.org/plugin:authpgsql