diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-02-06 18:00:12 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-02-06 18:01:18 +0100 |
| commit | 7441e340554a7a982047997cf61f72adaefacc99 (patch) | |
| tree | 31bdc23458c565d4961c889035f4c324c77f6d39 /lib | |
| parent | 9f881d099df700f068e5cc014d089dd9639db731 (diff) | |
| download | rpg-7441e340554a7a982047997cf61f72adaefacc99.tar.gz rpg-7441e340554a7a982047997cf61f72adaefacc99.tar.bz2 | |
apply cleanUser and cleanGroup in user manager FS#1859
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/plugins/usermanager/admin.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index df13f65e3..e40ee9b7e 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -562,16 +562,19 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { * @return array(user, password, full name, email, array(groups)) */ function _retrieveUser($clean=true) { + global $auth; - $user[0] = ($clean) ? cleanID(preg_replace('/.*:/','',$_REQUEST['userid'])) : $_REQUEST['userid']; + $user[0] = ($clean) ? $auth->cleanUser($_REQUEST['userid']) : $_REQUEST['userid']; $user[1] = $_REQUEST['userpass']; $user[2] = $_REQUEST['username']; $user[3] = $_REQUEST['usermail']; - $user[4] = preg_split('/\s*,\s*/',$_REQUEST['usergroups'],-1,PREG_SPLIT_NO_EMPTY); + $user[4] = explode(',',$_REQUEST['usergroups']); - if (empty($user[4]) || (is_array($user[4]) && (count($user[4]) == 1) && (trim($user[4][0]) == ''))) { - $user[4] = null; - } + $user[4] = array_map('trim',$user[4]); + if($clean) $user[4] = array_map(array($auth,'cleanGroup'),$user[4]); + $user[4] = array_filter($user[4]); + $user[4] = array_unique($user[4]); + if(!count($user[4])) $user[4] = null; return $user; } |