From: jerome Date: Fri, 30 Jan 2009 00:57:34 +0000 (+0000) Subject: web service MDL-12886 update user/lib.php to be consitent with other lib.php X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=965a0eb68ad4acc9d8b701898bb04e70b06ecf87;p=moodle.git web service MDL-12886 update user/lib.php to be consitent with other lib.php --- diff --git a/user/external.php b/user/external.php index 774b61eba3..f1e7739065 100644 --- a/user/external.php +++ b/user/external.php @@ -79,7 +79,7 @@ final class user_external extends moodle_external { $user['lastname'] = $params['lastname']; $user['email'] = $params['email']; $user['password'] = $params['password']; - return user_lib::tmp_create_user($user); + return tmp_create_user($user); } else { throw new moodle_exception('wscouldnotcreateeuser'); @@ -127,7 +127,7 @@ final class user_external extends moodle_external { if (!empty($params['firstname'])) { $user->firstname = $params['firstname']; } - return user_lib::tmp_update_user($user); + return tmp_update_user($user); } else { throw new moodle_exception('wscouldnotupdateuser'); diff --git a/user/lib.php b/user/lib.php index 189e7b3279..bcc86af6cd 100644 --- a/user/lib.php +++ b/user/lib.php @@ -10,7 +10,6 @@ /** * DO NOT USE ANYTHING FROM THIS FILE - WORK IN PROGRESS */ -final class user_lib { /** * Returns a subset of users (DO NOT COUNT) @@ -27,7 +26,7 @@ final class user_lib { * ->lastinitial string ? * @return array|false Array of {@link $USER} objects. False is returned if an error is encountered. */ - static function tmp_get_users($sort='firstname ASC', $recordsperpage=999999, $page=0, $fields='*', $selectioncriteria=NULL) { + function tmp_get_users($sort='firstname ASC', $recordsperpage=999999, $page=0, $fields='*', $selectioncriteria=NULL) { global $DB; ///WS: convert array into an object @@ -102,7 +101,7 @@ final class user_lib { * * @return userid or thrown exceptions */ - static function tmp_create_user($user) { + function tmp_create_user($user) { global $CFG, $DB; ///WS: convert user array into an user object if (is_array($user)) { @@ -143,7 +142,7 @@ final class user_lib { * Warning: no checks are done on the data!!! * @param object $user */ - static function tmp_update_user($user) { + function tmp_update_user($user) { global $DB; if ($DB->update_record('user', $user)) { $DB->commit_sql(); @@ -155,6 +154,6 @@ final class user_lib { } } -} + ?>