diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 23:15:43 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 23:15:43 +0000 |
| commit | 60c1387a16ea4944674b0c9da2273158d1fbf0b4 (patch) | |
| tree | 6f94aaf77a7d794f489212ff50f08f5211a18126 /engine/lib/users.php | |
| parent | ca08eb6d170d375ef4fca53604956f3474c7db19 (diff) | |
| download | elgg-60c1387a16ea4944674b0c9da2273158d1fbf0b4.tar.gz elgg-60c1387a16ea4944674b0c9da2273158d1fbf0b4.tar.bz2 | |
Merged r6757:6810 from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6850 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/users.php')
| -rw-r--r-- | engine/lib/users.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index 99ef15246..3722c8ed1 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -682,7 +682,7 @@ function remove_user_admin($user_guid) { * THIS FUNCTION IS DEPRECATED. * * Delete a user's extra data. - * + * @todo remove * @param int $guid */ function delete_user_entity($guid) { @@ -1362,7 +1362,7 @@ function request_user_validation($user_guid) { * @return bool */ function is_email_address($address) { - // TODO: Make this better! + // @todo Make this better! if (strpos($address, '@')=== false) { return false; @@ -1434,7 +1434,8 @@ function validate_username($username) { throw new RegistrationException(elgg_echo('registration:invalidchars')); } - // Belts and braces TODO: Tidy into main unicode + // Belts and braces + // @todo Tidy into main unicode $blacklist2 = '\'/\\"*& ?#%^(){}[]~?<>;|¬`@-+='; for ($n=0; $n < strlen($blacklist2); $n++) { if (strpos($username, $blacklist2[$n])!==false) { @@ -1718,7 +1719,7 @@ function set_last_login($user_guid) { * A permissions plugin hook that grants access to users if they are newly created - allows * for email activation. * - * TODO: Do this in a better way! + * @todo Do this in a better way! * * @param unknown_type $hook * @param unknown_type $entity_type @@ -1839,7 +1840,7 @@ function users_init() { register_elgg_event_handler('create', 'user', 'user_create_hook_add_site_relationship'); // Handle a special case for newly created users when the user is not logged in - // TODO: handle this better! + // @todo handle this better! register_plugin_hook('permissions_check','all','new_user_enable_permissions_check'); } |