From 513314c0214eca5d0438bb70f271ba4f19ca30e9 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 22 Jul 2006 03:05:16 +0000 Subject: [PATCH] r923: Fixing some bugs in the UserAPI --- includes/api_user.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/includes/api_user.php b/includes/api_user.php index 57403f6..1d8e694 100644 --- a/includes/api_user.php +++ b/includes/api_user.php @@ -44,7 +44,7 @@ class UserAPI extends API 'email' => array(TYPE_STR, REQ_YES, ':self'), 'displayname' => array(TYPE_STR, REQ_YES, ':self'), 'usergroupid' => array(TYPE_UINT, REQ_YES, ':self'), - 'password' => array(TYPE_STR, REQ_YES, 'verify_noempty'), + 'password' => array(TYPE_STR, REQ_YES), 'salt' => array(TYPE_STR, REQ_SET), 'authkey' => array(TYPE_STR, REQ_SET), 'showemail' => array(TYPE_BOOL, REQ_NO), @@ -120,7 +120,10 @@ class UserAPI extends API */ function verify_email() { - $this->verify_noempty('displayname'); + if (!($ne = $this->verify_noempty('displayname'))) + { + return $ne; + } if ($this->registry->funct->is_valid_email($this->values['email'])) { @@ -141,7 +144,10 @@ class UserAPI extends API */ function verify_displayname() { - $this->verify_noempty('displayname'); + if (!($ne = $this->verify_noempty('displayname'))) + { + return $ne; + } if ($this->registry->db->query_first("SELECT * FROM " . TABLE_PREFIX . "user WHERE displayname = '" . $this->registry->db->escape_string($this->values['displayname']) . "' AND userid <> " . $this->values['userid'])) { -- 2.22.5