harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

registration dangling code fragment that should've been removed

Browse Source
This commit is contained in:
friendica
2012-08-15 23:15:29 -07:00
parent f7c6a6ff90
commit 5b547ae991
3 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
include/account.php
View File

@@ -7,6 +7,36 @@ require_once('include/text.php');
require_once('include/language.php');
require_once('include/datetime.php');
function check_account_email($email) {
$result = array('error' => false, 'message' => '');
// Caution: empty email isn't counted as an error in this function. Check emptiness separately.
if(! strlen($email))
return $result;
if((! valid_email($email)) || (! validate_email($email)))
$result['message'] .= t('Not a valid email address') . EOL;
elseif(! allowed_email($email))
$result['message'] = t('Your email domain is not among those allowed on this site');
else {
$r = q("select account_email from account where account_email = '%s' limit 1",
dbesc($email)
);
if(count($r)) {
$result['message'] .= t('Your email address is already registered at this site.');
}
}
if($result['message'])
$result['error'] = true;
return $result;
}
function create_account($arr) {
// Required: { email, password }
@@ -40,24 +70,13 @@ function create_account($arr) {
return;
}
if(! allowed_email($email))
$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
$email_result = check_account_email($email);
if((! valid_email($email)) || (! validate_email($email)))
$result['message'] .= t('Not a valid email address.') . EOL;
$r = q("select account_email, account_password from account where email = '%s' limit 1",
if(strlen($result['message'])) {
if(! $email_result['error']) {
$result['message'] = $email_result['message'];
return $result;
}
$password_encoded = hash('whirlpool',$password);
$r = q("INSERT INTO account