From 2046a6546c8ed62b9a7b33305b6201458f2f8291 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 12 Mar 2014 15:38:28 +0000 Subject: Allow user info to be retrieved without groups Some parts of dokuwiki (e.g. recent changes, old revisions) can requests lots of user info (to provide editor names) without requiring any group information. This change also implements caching of user info by authmysql & authpgsql plugins to avoid repeated querying of the DB to retrieve the same user information. --- lib/plugins/authpgsql/auth.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authpgsql') diff --git a/lib/plugins/authpgsql/auth.php b/lib/plugins/authpgsql/auth.php index e51b39858..99f3ed443 100644 --- a/lib/plugins/authpgsql/auth.php +++ b/lib/plugins/authpgsql/auth.php @@ -160,7 +160,7 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql { $result = $this->_queryDB($sql); foreach($result as $user) - if(($info = $this->_getUserInfo($user['user']))) + if(($info = $this->_getCachedUserInfo($user['user']))) $out[$user['user']] = $info; $this->_unlockTables(); @@ -212,7 +212,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 +270,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 -- cgit v1.2.3 From 1b4623e76a474977d730f37c3c54ff1cf66489ac Mon Sep 17 00:00:00 2001 From: Mati Date: Wed, 14 May 2014 07:45:56 +0200 Subject: translation update --- lib/plugins/authpgsql/lang/pl/settings.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 lib/plugins/authpgsql/lang/pl/settings.php (limited to 'lib/plugins/authpgsql') 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 @@ + + */ +$lang['server'] = 'Twój serwer PostgreSQL'; +$lang['database'] = 'Baza danych do użycia'; -- cgit v1.2.3 From 33cfab00505903e3bee37020f5e099e5c0fd70a9 Mon Sep 17 00:00:00 2001 From: Francesco Date: Wed, 14 May 2014 21:20:56 +0200 Subject: translation update --- lib/plugins/authpgsql/lang/it/settings.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lib/plugins/authpgsql/lang/it/settings.php (limited to 'lib/plugins/authpgsql') 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 @@ + + */ +$lang['server'] = 'Il tuo server PostgreSQL '; +$lang['port'] = 'La porta del tuo server PostgreSQL '; +$lang['user'] = 'Lo username PostgreSQL'; +$lang['database'] = 'Database da usare'; -- cgit v1.2.3 From 84c50c494ac3b4f524ce81304691d7fed3975b68 Mon Sep 17 00:00:00 2001 From: Antonio Castilla Date: Thu, 29 May 2014 12:46:31 +0200 Subject: translation update --- lib/plugins/authpgsql/lang/es/settings.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'lib/plugins/authpgsql') diff --git a/lib/plugins/authpgsql/lang/es/settings.php b/lib/plugins/authpgsql/lang/es/settings.php index bee2211f3..9e593df66 100644 --- a/lib/plugins/authpgsql/lang/es/settings.php +++ b/lib/plugins/authpgsql/lang/es/settings.php @@ -4,6 +4,22 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Antonio Bueno + * @author Antonio Castilla */ +$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['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'; -- cgit v1.2.3 From 3e5c46655be43b0d32ccbec276c6abdea1080b95 Mon Sep 17 00:00:00 2001 From: Antonio Castilla Date: Thu, 29 May 2014 13:21:31 +0200 Subject: translation update --- lib/plugins/authpgsql/lang/es/settings.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/authpgsql') diff --git a/lib/plugins/authpgsql/lang/es/settings.php b/lib/plugins/authpgsql/lang/es/settings.php index 9e593df66..2e02fc0ec 100644 --- a/lib/plugins/authpgsql/lang/es/settings.php +++ b/lib/plugins/authpgsql/lang/es/settings.php @@ -23,3 +23,4 @@ $lang['addUserGroup'] = 'Sentencia SQL para agregar un usuario a un gru $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['getGroupID'] = 'Sentencia SQL para obtener la clave principal de un grupo dado'; -- cgit v1.2.3 From 9a72776194fc27b31238ade37ba590b4e0217cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lker=20R=2E=20Kapa=C3=A7?= Date: Sat, 31 May 2014 00:11:23 +0200 Subject: translation update --- lib/plugins/authpgsql/lang/tr/settings.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 lib/plugins/authpgsql/lang/tr/settings.php (limited to 'lib/plugins/authpgsql') 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 @@ + + */ +$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'; -- cgit v1.2.3 From e1f856bac8f154dbb5a51c739630e38115fbbe0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aivars=20Mi=C5=A1ka?= Date: Tue, 10 Jun 2014 16:51:41 +0200 Subject: translation update --- lib/plugins/authpgsql/lang/lv/settings.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 lib/plugins/authpgsql/lang/lv/settings.php (limited to 'lib/plugins/authpgsql') 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 @@ + + */ +$lang['password'] = 'Lietotāja parole'; +$lang['delUser'] = 'SQL pieprasījums lietotāja dzēšanai'; -- cgit v1.2.3 From 19accab588843292613a1e12b22b773f07b511ba Mon Sep 17 00:00:00 2001 From: Davor Turkalj Date: Thu, 10 Jul 2014 13:46:11 +0200 Subject: translation update --- lib/plugins/authpgsql/lang/hr/settings.php | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 lib/plugins/authpgsql/lang/hr/settings.php (limited to 'lib/plugins/authpgsql') 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 @@ + + */ +$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'; -- cgit v1.2.3 From 75112fc56c5237220d4fe1b104317f62eda8a561 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 2 Aug 2014 12:19:38 +0100 Subject: updated dates in info.txt of various plugins and template --- lib/plugins/authpgsql/plugin.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/authpgsql') 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 -- cgit v1.2.3 From 0a6d5cdea39d334a56833c94edc57174ccfc033d Mon Sep 17 00:00:00 2001 From: pokesakura Date: Thu, 28 Aug 2014 01:36:05 +0200 Subject: translation update --- lib/plugins/authpgsql/lang/es/settings.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib/plugins/authpgsql') diff --git a/lib/plugins/authpgsql/lang/es/settings.php b/lib/plugins/authpgsql/lang/es/settings.php index 2e02fc0ec..abfb00d38 100644 --- a/lib/plugins/authpgsql/lang/es/settings.php +++ b/lib/plugins/authpgsql/lang/es/settings.php @@ -5,6 +5,7 @@ * * @author Antonio Bueno * @author Antonio Castilla + * @author pokesakura */ $lang['server'] = 'Su servidor PostgreSQL'; $lang['port'] = 'Puerto de su servidor PostgreSQL'; @@ -17,10 +18,21 @@ $lang['checkPass'] = 'Sentencia SQL para el control de las contrase $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'; -- cgit v1.2.3 From 2c917972fa1601d7765e56a079884f4a24a69a7e Mon Sep 17 00:00:00 2001 From: Mohamad Mehdi Habibi Date: Wed, 10 Sep 2014 09:50:56 +0200 Subject: translation update --- lib/plugins/authpgsql/lang/fa/settings.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/plugins/authpgsql/lang/fa/settings.php (limited to 'lib/plugins/authpgsql') 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 @@ + + */ +$lang['database'] = 'پایگاه داده مورد استفاده'; -- cgit v1.2.3