Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix formatting of mod/register

Browse source
This commit is contained in:
Hypolite Petovan 2017-12-08 19:24:43 -05:00
parent 3c2d3d5073
commit e44abb6c2a
1 changed files with 113 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

252
mod/register.php
View file

@ -10,8 +10,8 @@ use Friendica\Model\User;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
if(! function_exists('register_post')) { function register_post(App $a)
function register_post(App $a) { {
check_form_security_token_redirectOnErr('/register', 'register'); check_form_security_token_redirectOnErr('/register', 'register');
global $lang; global $lang;
@ -22,36 +22,34 @@ function register_post(App $a) {
$arr = array('post' => $_POST); $arr = array('post' => $_POST);
call_hooks('register_post', $arr); call_hooks('register_post', $arr);
$max_dailies = intval(Config::get('system','max_daily_registrations')); $max_dailies = intval(Config::get('system', 'max_daily_registrations'));
if($max_dailies) { if ($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) { if ($r && $r[0]['total'] >= $max_dailies) {
return; return;
} }
} }
switch($a->config['register_policy']) { switch ($a->config['register_policy']) {
case REGISTER_OPEN:
$blocked = 0;
$verified = 1;
break;
case REGISTER_APPROVE:
$blocked = 1;
$verified = 0;
break;
case REGISTER_OPEN: default:
$blocked = 0; case REGISTER_CLOSED:
$verified = 1; if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) {
break; notice(t('Permission denied.') . EOL);
return;
case REGISTER_APPROVE: }
$blocked = 1; $blocked = 1;
$verified = 0; $verified = 0;
break; break;
default:
case REGISTER_CLOSED:
if((! x($_SESSION,'authenticated') && (! x($_SESSION,'administrator')))) {
notice( t('Permission denied.') . EOL );
return;
}
$blocked = 1;
$verified = 0;
break;
} }
@ -63,59 +61,51 @@ function register_post(App $a) {
$result = User::create($arr); $result = User::create($arr);
if(! $result['success']) { if (!$result['success']) {
notice($result['message']); notice($result['message']);
return; return;
} }
$user = $result['user']; $user = $result['user'];
if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) { if ($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
$url = System::baseUrl() . '/profile/' . $user['nickname']; $url = System::baseUrl() . '/profile/' . $user['nickname'];
Worker::add(PRIORITY_LOW, "Directory", $url); Worker::add(PRIORITY_LOW, "Directory", $url);
} }
$using_invites = Config::get('system','invitation_only'); $using_invites = Config::get('system', 'invitation_only');
$num_invites = Config::get('system','number_invites'); $num_invites = Config::get('system', 'number_invites');
$invite_id = ((x($_POST,'invite_id')) ? notags(trim($_POST['invite_id'])) : ''); $invite_id = ((x($_POST, 'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
if ($a->config['register_policy'] == REGISTER_OPEN) {
if( $a->config['register_policy'] == REGISTER_OPEN ) { if ($using_invites && $invite_id) {
if($using_invites && $invite_id) {
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id)); q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
PConfig::set($user['uid'],'system','invites_remaining',$num_invites); PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
} }
// Only send a password mail when the password wasn't manually provided // Only send a password mail when the password wasn't manually provided
if (!x($_POST,'password1') || !x($_POST,'confirm')) { if (!x($_POST, 'password1') || !x($_POST, 'confirm')) {
$res = User::sendRegisterOpenEmail( $res = User::sendRegisterOpenEmail(
$user['email'], $user['email'], $a->config['sitename'], System::baseUrl(), $user['username'], $result['password']);
$a->config['sitename'],
System::baseUrl(),
$user['username'],
$result['password']);
if($res) { if ($res) {
info( t('Registration successful. Please check your email for further instructions.') . EOL ) ; info(t('Registration successful. Please check your email for further instructions.') . EOL);
goaway(System::baseUrl()); goaway(System::baseUrl());
} else { } else {
notice( notice(
sprintf( t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.',
t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.'), $user['email'],
$user['email'], $result['password'])
$result['password'] . EOL
). EOL
); );
} }
} else { } else {
info( t('Registration successful.') . EOL ) ; info(t('Registration successful.') . EOL);
goaway(System::baseUrl()); goaway(System::baseUrl());
} }
} } elseif ($a->config['register_policy'] == REGISTER_APPROVE) {
elseif($a->config['register_policy'] == REGISTER_APPROVE) { if (!strlen($a->config['admin_email'])) {
if(! strlen($a->config['admin_email'])) { notice(t('Your registration can not be processed.') . EOL);
notice( t('Your registration can not be processed.') . EOL);
goaway(System::baseUrl()); goaway(System::baseUrl());
} }
@ -130,13 +120,13 @@ function register_post(App $a) {
); );
// invite system // invite system
if($using_invites && $invite_id) { if ($using_invites && $invite_id) {
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id)); q("DELETE * FROM `register` WHERE `hash` = '%s' LIMIT 1", dbesc($invite_id));
PConfig::set($user['uid'],'system','invites_remaining',$num_invites); PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
} }
// send email to admins // send email to admins
$admin_mail_list = "'".implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email']))))."'"; $admin_mail_list = "'" . implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email'])))) . "'";
$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)", $adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
$admin_mail_list $admin_mail_list
); );
@ -144,117 +134,105 @@ function register_post(App $a) {
// send notification to admins // send notification to admins
foreach ($adminlist as $admin) { foreach ($adminlist as $admin) {
notification(array( notification(array(
'type' => NOTIFY_SYSTEM, 'type' => NOTIFY_SYSTEM,
'event' => 'SYSTEM_REGISTER_REQUEST', 'event' => 'SYSTEM_REGISTER_REQUEST',
'source_name' => $user['username'], 'source_name' => $user['username'],
'source_mail' => $user['email'], 'source_mail' => $user['email'],
'source_nick' => $user['nickname'], 'source_nick' => $user['nickname'],
'source_link' => System::baseUrl()."/admin/users/", 'source_link' => System::baseUrl() . "/admin/users/",
'link' => System::baseUrl()."/admin/users/", 'link' => System::baseUrl() . "/admin/users/",
'source_photo' => System::baseUrl() . "/photo/avatar/".$user['uid'].".jpg", 'source_photo' => System::baseUrl() . "/photo/avatar/" . $user['uid'] . ".jpg",
'to_email' => $admin['email'], 'to_email' => $admin['email'],
'uid' => $admin['uid'], 'uid' => $admin['uid'],
'language' => ($admin['language']?$admin['language']:'en'), 'language' => $admin['language'] ? $admin['language'] : 'en',
'show_in_notification_page' => false 'show_in_notification_page' => false
)); ));
} }
// send notification to the user, that the registration is pending // send notification to the user, that the registration is pending
User::sendRegisterPendingEmail( User::sendRegisterPendingEmail(
$user['email'], $user['email'], $a->config['sitename'], $user['username']);
$a->config['sitename'],
$user['username']);
info( t('Your registration is pending approval by the site owner.') . EOL ) ; info(t('Your registration is pending approval by the site owner.') . EOL);
goaway(System::baseUrl()); goaway(System::baseUrl());
} }
return; return;
}} }
if(! function_exists('register_content')) {
function register_content(App $a) {
function register_content(App $a)
{
// logged in users can register others (people/pages/groups) // logged in users can register others (people/pages/groups)
// even with closed registrations, unless specifically prohibited by site policy. // even with closed registrations, unless specifically prohibited by site policy.
// 'block_extended_register' blocks all registrations, period. // 'block_extended_register' blocks all registrations, period.
$block = Config::get('system', 'block_extended_register');
$block = Config::get('system','block_extended_register'); if (local_user() && ($block)) {
if(local_user() && ($block)) {
notice("Permission denied." . EOL); notice("Permission denied." . EOL);
return; return;
} }
if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) { if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
notice("Permission denied." . EOL); notice("Permission denied." . EOL);
return; return;
} }
$max_dailies = intval(Config::get('system','max_daily_registrations')); $max_dailies = intval(Config::get('system', 'max_daily_registrations'));
if($max_dailies) { if ($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) { if ($r && $r[0]['total'] >= $max_dailies) {
logger('max daily registrations exceeded.'); logger('max daily registrations exceeded.');
notice( t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); notice(t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
return; return;
} }
} }
if(x($_SESSION,'theme')) if (x($_SESSION, 'theme')) {
unset($_SESSION['theme']); unset($_SESSION['theme']);
if(x($_SESSION,'mobile-theme'))
unset($_SESSION['mobile-theme']);
$username = ((x($_POST,'username')) ? $_POST['username'] : ((x($_GET,'username')) ? $_GET['username'] : ''));
$email = ((x($_POST,'email')) ? $_POST['email'] : ((x($_GET,'email')) ? $_GET['email'] : ''));
$openid_url = ((x($_POST,'openid_url')) ? $_POST['openid_url'] : ((x($_GET,'openid_url')) ? $_GET['openid_url'] : ''));
$nickname = ((x($_POST,'nickname')) ? $_POST['nickname'] : ((x($_GET,'nickname')) ? $_GET['nickname'] : ''));
$photo = ((x($_POST,'photo')) ? $_POST['photo'] : ((x($_GET,'photo')) ? hex2bin($_GET['photo']) : ''));
$invite_id = ((x($_POST,'invite_id')) ? $_POST['invite_id'] : ((x($_GET,'invite_id')) ? $_GET['invite_id'] : ''));
$noid = Config::get('system','no_openid');
if($noid) {
$oidhtml = '';
$fillwith = '';
$fillext = '';
$oidlabel = '';
} }
else { if (x($_SESSION, 'mobile-theme')) {
$oidhtml = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >'; unset($_SESSION['mobile-theme']);
}
$username = x($_REQUEST, 'username') ? $_REQUEST['username'] : '';
$email = x($_REQUEST, 'email') ? $_REQUEST['email'] : '';
$openid_url = x($_REQUEST, 'openid_url') ? $_REQUEST['openid_url'] : '';
$nickname = x($_REQUEST, 'nickname') ? $_REQUEST['nickname'] : '';
$photo = x($_REQUEST, 'photo') ? $_REQUEST['photo'] : '';
$invite_id = x($_REQUEST, 'invite_id') ? $_REQUEST['invite_id'] : '';
$noid = Config::get('system', 'no_openid');
if ($noid) {
$oidhtml = '';
$fillwith = '';
$fillext = '';
$oidlabel = '';
} else {
$oidhtml = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
$fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."); $fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
$fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'); $fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
$oidlabel = t("Your OpenID \x28optional\x29: "); $oidlabel = t("Your OpenID \x28optional\x29: ");
} }
// I set this and got even more fake names than before... // I set this and got even more fake names than before...
$realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.'); $realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.');
if(Config::get('system','publish_all')) { if (Config::get('system', 'publish_all')) {
$profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />'; $profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
} } else {
else {
$publish_tpl = get_markup_template("profile_publish.tpl"); $publish_tpl = get_markup_template("profile_publish.tpl");
$profile_publish = replace_macros($publish_tpl,array( $profile_publish = replace_macros($publish_tpl, array(
'$instance' => 'reg', '$instance' => 'reg',
'$pubdesc' => t('Include your profile in member directory?'), '$pubdesc' => t('Include your profile in member directory?'),
'$yes_selected' => ' checked="checked" ', '$yes_selected' => ' checked="checked" ',
'$no_selected' => '', '$no_selected' => '',
'$str_yes' => t('Yes'), '$str_yes' => t('Yes'),
'$str_no' => t('No'), '$str_no' => t('No'),
)); ));
} }
$r = q("SELECT count(*) AS `contacts` FROM `contact`"); $r = q("SELECT COUNT(*) AS `contacts` FROM `contact`");
$passwords = !$r[0]["contacts"]; $passwords = !$r[0]["contacts"];
$license = ''; $license = '';
@ -263,23 +241,21 @@ function register_content(App $a) {
$arr = array('template' => $o); $arr = array('template' => $o);
call_hooks('register_form',$arr); call_hooks('register_form', $arr);
$o = $arr['template']; $o = $arr['template'];
$o = replace_macros($o, array( $o = replace_macros($o, [
'$oidhtml' => $oidhtml, '$oidhtml' => $oidhtml,
'$invitations' => Config::get('system','invitation_only'), '$invitations' => Config::get('system', 'invitation_only'),
'$permonly' => $a->config['register_policy'] == REGISTER_APPROVE, '$permonly' => $a->config['register_policy'] == REGISTER_APPROVE,
'$permonlybox' => array('permonlybox', t('Note for the admin'), '', t('Leave a message for the admin, why you want to join this node')), '$permonlybox' => array('permonlybox', t('Note for the admin'), '', t('Leave a message for the admin, why you want to join this node')),
'$invite_desc' => t('Membership on this site is by invitation only.'), '$invite_desc' => t('Membership on this site is by invitation only.'),
'$invite_label' => t('Your invitation ID: '), '$invite_label' => t('Your invitation ID: '),
'$invite_id' => $invite_id, '$invite_id' => $invite_id,
'$realpeople' => $realpeople, '$realpeople' => $realpeople,
'$regtitle' => t('Registration'), '$regtitle' => t('Registration'),
'$registertext' =>((x($a->config,'register_text')) '$registertext' => x($a->config, 'register_text') ? bbcode($a->config['register_text']) : "",
? bbcode($a->config['register_text'])
: "" ),
'$fillwith' => $fillwith, '$fillwith' => $fillwith,
'$fillext' => $fillext, '$fillext' => $fillext,
'$oidlabel' => $oidlabel, '$oidlabel' => $oidlabel,
@ -289,7 +265,7 @@ function register_content(App $a) {
'$passwords' => $passwords, '$passwords' => $passwords,
'$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')), '$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')),
'$password2' => array('confirm', t('Confirm:'), '', ''), '$password2' => array('confirm', t('Confirm:'), '', ''),
'$nickdesc' => str_replace('$sitename',$a->get_hostname(), t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.')), '$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@%s</strong>\'.', $a->get_hostname()),
'$nicklabel' => t('Choose a nickname: '), '$nicklabel' => t('Choose a nickname: '),
'$photo' => $photo, '$photo' => $photo,
'$publish' => $profile_publish, '$publish' => $profile_publish,
@ -301,9 +277,7 @@ function register_content(App $a) {
'$sitename' => $a->get_hostname(), '$sitename' => $a->get_hostname(),
'$importh' => t('Import'), '$importh' => t('Import'),
'$importt' => t('Import your profile to this friendica instance'), '$importt' => t('Import your profile to this friendica instance'),
'$form_security_token' => get_form_security_token("register") '$form_security_token' => get_form_security_token("register")
)); ]);
return $o; return $o;
}
}}