summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2013-09-21 16:05:16 +0200
committerGerrit Uitslag <klapinklapin@gmail.com>2013-09-21 16:05:16 +0200
commit786dfb0e75bc29b381ce487ba9564fcc0f0fbed0 (patch)
treebe482acdb986e1d1c924265373aac49a414b4463
parentb59cff8b714aa11b5b1afd209e9d73f6803883cd (diff)
downloadrpg-786dfb0e75bc29b381ce487ba9564fcc0f0fbed0.tar.gz
rpg-786dfb0e75bc29b381ce487ba9564fcc0f0fbed0.tar.bz2
Use ->cleanUser everywhere in usermanager. Fixes FS#2849
Some auth backend have bad cleaning, but that is responsibility of these.
-rw-r--r--lib/plugins/usermanager/admin.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 4abef37ff..74eaee721 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -576,8 +576,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
private function _editUser($param) {
if (!checkSecurityToken()) return false;
if (!$this->_auth->canDo('UserMod')) return false;
-
- $user = cleanID(preg_replace('/.*:/','',$param));
+ $user = $this->_auth->cleanUser(preg_replace('/.*[:\/]/','',$param));
$userdata = $this->_auth->getUserData($user);
// no user found?
@@ -604,7 +603,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
if (!$this->_auth->canDo('UserMod')) return false;
// get currently valid user data
- $olduser = cleanID(preg_replace('/.*:/','',$INPUT->str('userid_old')));
+ $olduser = $this->_auth->cleanUser(preg_replace('/.*[:\/]/','',$INPUT->str('userid_old')));
$oldinfo = $this->_auth->getUserData($olduser);
// get new user data subject to change
@@ -890,7 +889,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
}
/**
- * Returns cleaned row data
+ * Returns cleaned user data
*
* @param array $candidate raw values of line from input file
* @param $error