Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 03:35:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats 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

16
include/items.php
View file

@ -428,30 +428,36 @@ function get_item_elements($j) {
$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['obj'] = $j->obj;
$arr['tgt'] = $j->tgt;
$arr['object'] = $j->object;
$arr['target'] = $j->target;
$arr['attach'] = $j->attach;
$arr['tags'] = $j->tags;
$arr['privacy'] = $j->privacy;
$arr['private'] = $j->private;
$arr['flags'] = intval($j->flags);
$arr['types'] = intval($j->types);
$arr['author'] = $j->author;
$arr['new'] = 1;
// needed still: owner and contact, map flags
return $arr;
}
function encode_item($item) {
return json_encode($item);
}
function get_atom_elements($feed,$item) {

22
mod/zregister.php
View file

@ -7,27 +7,7 @@ function zregister_init(&$a) {
$cmd = ((argc() > 1) ? argv(1) : '');
if($cmd === 'email_check.json') {
$result = array('error' => false, 'message' => '');
$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;
$result = check_account_email($_REQUEST['email']);
json_return_and_die($result);
}