mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 05:15:16 +00:00
registration dangling code fragment that should've been removed
This commit is contained in:
parent
f7c6a6ff90
commit
5b547ae991
3 changed files with 45 additions and 40 deletions
|
@ -7,6 +7,36 @@ require_once('include/text.php');
|
||||||
require_once('include/language.php');
|
require_once('include/language.php');
|
||||||
require_once('include/datetime.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) {
|
function create_account($arr) {
|
||||||
|
|
||||||
// Required: { email, password }
|
// Required: { email, password }
|
||||||
|
@ -40,24 +70,13 @@ function create_account($arr) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! allowed_email($email))
|
$email_result = check_account_email($email);
|
||||||
$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
|
|
||||||
|
|
||||||
if((! valid_email($email)) || (! validate_email($email)))
|
if(! $email_result['error']) {
|
||||||
$result['message'] .= t('Not a valid email address.') . EOL;
|
$result['message'] = $email_result['message'];
|
||||||
|
|
||||||
$r = q("select account_email, account_password from account where email = '%s' limit 1",
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(strlen($result['message'])) {
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$password_encoded = hash('whirlpool',$password);
|
$password_encoded = hash('whirlpool',$password);
|
||||||
|
|
||||||
$r = q("INSERT INTO account
|
$r = q("INSERT INTO account
|
||||||
|
|
|
@ -428,30 +428,36 @@ function get_item_elements($j) {
|
||||||
$arr['obj_type'] = (($j->objtype) ? htmlentities($j->objtype, ENT_COMPAT,'UTF-8') : '');
|
$arr['obj_type'] = (($j->objtype) ? htmlentities($j->objtype, ENT_COMPAT,'UTF-8') : '');
|
||||||
$arr['tgt_type'] = (($j->tgttype) ? htmlentities($j->tgttype, ENT_COMPAT,'UTF-8') : '');
|
$arr['tgt_type'] = (($j->tgttype) ? htmlentities($j->tgttype, ENT_COMPAT,'UTF-8') : '');
|
||||||
|
|
||||||
$arr['obj'] = $j->obj;
|
$arr['object'] = $j->object;
|
||||||
$arr['tgt'] = $j->tgt;
|
$arr['target'] = $j->target;
|
||||||
|
|
||||||
$arr['attach'] = $j->attach;
|
$arr['attach'] = $j->attach;
|
||||||
$arr['tags'] = $j->tags;
|
$arr['tags'] = $j->tags;
|
||||||
|
|
||||||
$arr['privacy'] = $j->privacy;
|
$arr['private'] = $j->private;
|
||||||
|
|
||||||
$arr['flags'] = intval($j->flags);
|
$arr['flags'] = intval($j->flags);
|
||||||
$arr['types'] = intval($j->types);
|
|
||||||
|
|
||||||
$arr['author'] = $j->author;
|
$arr['author'] = $j->author;
|
||||||
|
|
||||||
$arr['new'] = 1;
|
// needed still: owner and contact, map flags
|
||||||
|
|
||||||
return $arr;
|
return $arr;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function encode_item($item) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
return json_encode($item);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function get_atom_elements($feed,$item) {
|
function get_atom_elements($feed,$item) {
|
||||||
|
|
||||||
|
|
|
@ -7,27 +7,7 @@ function zregister_init(&$a) {
|
||||||
$cmd = ((argc() > 1) ? argv(1) : '');
|
$cmd = ((argc() > 1) ? argv(1) : '');
|
||||||
|
|
||||||
if($cmd === 'email_check.json') {
|
if($cmd === 'email_check.json') {
|
||||||
$result = array('error' => false, 'message' => '');
|
$result = check_account_email($_REQUEST['email']);
|
||||||
$email = $_REQUEST['email'];
|
|
||||||
if(! strlen($email))
|
|
||||||
json_return_and_die($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;
|
|
||||||
|
|
||||||
|
|
||||||
json_return_and_die($result);
|
json_return_and_die($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue