mirror of https://github.com/friendica/friendica
Fix formatting of mod/register
This commit is contained in:
Hypolite Petovan
parent
3c2d3d5073
commit
e44abb6c2a
|
|
@ -10,8 +10,8 @@ use Friendica\Model\User;
|
|||
require_once 'include/enotify.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');
|
||||
|
||||
global $lang;
|
||||
|
|
@ -31,8 +31,6 @@ function register_post(App $a) {
|
|||
}
|
||||
|
||||
switch ($a->config['register_policy']) {
|
||||
|
||||
|
||||
case REGISTER_OPEN:
|
||||
$blocked = 0;
|
||||
$verified = 1;
|
||||
|
|
@ -79,9 +77,7 @@ function register_post(App $a) {
|
|||
$num_invites = Config::get('system', 'number_invites');
|
||||
$invite_id = ((x($_POST, 'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
|
||||
|
||||
|
||||
if ($a->config['register_policy'] == REGISTER_OPEN) {
|
||||
|
||||
if ($using_invites && $invite_id) {
|
||||
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
||||
PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
|
||||
|
|
@ -90,30 +86,24 @@ function register_post(App $a) {
|
|||
// Only send a password mail when the password wasn't manually provided
|
||||
if (!x($_POST, 'password1') || !x($_POST, 'confirm')) {
|
||||
$res = User::sendRegisterOpenEmail(
|
||||
$user['email'],
|
||||
$a->config['sitename'],
|
||||
System::baseUrl(),
|
||||
$user['username'],
|
||||
$result['password']);
|
||||
$user['email'], $a->config['sitename'], System::baseUrl(), $user['username'], $result['password']);
|
||||
|
||||
if ($res) {
|
||||
info(t('Registration successful. Please check your email for further instructions.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
} else {
|
||||
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'],
|
||||
$result['password']
|
||||
). EOL
|
||||
$result['password'])
|
||||
. EOL
|
||||
);
|
||||
}
|
||||
} else {
|
||||
info(t('Registration successful.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
}
|
||||
elseif($a->config['register_policy'] == REGISTER_APPROVE) {
|
||||
} elseif ($a->config['register_policy'] == REGISTER_APPROVE) {
|
||||
if (!strlen($a->config['admin_email'])) {
|
||||
notice(t('Your registration can not be processed.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
|
|
@ -131,7 +121,7 @@ function register_post(App $a) {
|
|||
|
||||
// invite system
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
@ -154,37 +144,26 @@ function register_post(App $a) {
|
|||
'source_photo' => System::baseUrl() . "/photo/avatar/" . $user['uid'] . ".jpg",
|
||||
'to_email' => $admin['email'],
|
||||
'uid' => $admin['uid'],
|
||||
'language' => ($admin['language']?$admin['language']:'en'),
|
||||
'language' => $admin['language'] ? $admin['language'] : 'en',
|
||||
'show_in_notification_page' => false
|
||||
));
|
||||
}
|
||||
// send notification to the user, that the registration is pending
|
||||
User::sendRegisterPendingEmail(
|
||||
$user['email'],
|
||||
$a->config['sitename'],
|
||||
$user['username']);
|
||||
$user['email'], $a->config['sitename'], $user['username']);
|
||||
|
||||
info(t('Your registration is pending approval by the site owner.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
|
||||
|
||||
}
|
||||
|
||||
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)
|
||||
// even with closed registrations, unless specifically prohibited by site policy.
|
||||
// 'block_extended_register' blocks all registrations, period.
|
||||
|
||||
$block = Config::get('system', 'block_extended_register');
|
||||
|
||||
if (local_user() && ($block)) {
|
||||
|
|
@ -207,18 +186,20 @@ function register_content(App $a) {
|
|||
}
|
||||
}
|
||||
|
||||
if(x($_SESSION,'theme'))
|
||||
if (x($_SESSION, 'theme')) {
|
||||
unset($_SESSION['theme']);
|
||||
if(x($_SESSION,'mobile-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'] : ''));
|
||||
$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');
|
||||
|
||||
|
|
@ -227,8 +208,7 @@ function register_content(App $a) {
|
|||
$fillwith = '';
|
||||
$fillext = '';
|
||||
$oidlabel = '';
|
||||
}
|
||||
else {
|
||||
} 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'.");
|
||||
$fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
|
||||
|
|
@ -236,13 +216,11 @@ function register_content(App $a) {
|
|||
}
|
||||
|
||||
// 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.');
|
||||
|
||||
if (Config::get('system', 'publish_all')) {
|
||||
$profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />';
|
||||
}
|
||||
else {
|
||||
$profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
|
||||
} else {
|
||||
$publish_tpl = get_markup_template("profile_publish.tpl");
|
||||
$profile_publish = replace_macros($publish_tpl, array(
|
||||
'$instance' => 'reg',
|
||||
|
|
@ -254,7 +232,7 @@ function register_content(App $a) {
|
|||
));
|
||||
}
|
||||
|
||||
$r = q("SELECT count(*) AS `contacts` FROM `contact`");
|
||||
$r = q("SELECT COUNT(*) AS `contacts` FROM `contact`");
|
||||
$passwords = !$r[0]["contacts"];
|
||||
|
||||
$license = '';
|
||||
|
|
@ -267,7 +245,7 @@ function register_content(App $a) {
|
|||
|
||||
$o = $arr['template'];
|
||||
|
||||
$o = replace_macros($o, array(
|
||||
$o = replace_macros($o, [
|
||||
'$oidhtml' => $oidhtml,
|
||||
'$invitations' => Config::get('system', 'invitation_only'),
|
||||
'$permonly' => $a->config['register_policy'] == REGISTER_APPROVE,
|
||||
|
|
@ -277,9 +255,7 @@ function register_content(App $a) {
|
|||
'$invite_id' => $invite_id,
|
||||
'$realpeople' => $realpeople,
|
||||
'$regtitle' => t('Registration'),
|
||||
'$registertext' =>((x($a->config,'register_text'))
|
||||
? bbcode($a->config['register_text'])
|
||||
: "" ),
|
||||
'$registertext' => x($a->config, 'register_text') ? bbcode($a->config['register_text']) : "",
|
||||
'$fillwith' => $fillwith,
|
||||
'$fillext' => $fillext,
|
||||
'$oidlabel' => $oidlabel,
|
||||
|
|
@ -289,7 +265,7 @@ function register_content(App $a) {
|
|||
'$passwords' => $passwords,
|
||||
'$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')),
|
||||
'$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: '),
|
||||
'$photo' => $photo,
|
||||
'$publish' => $profile_publish,
|
||||
|
|
@ -302,8 +278,6 @@ function register_content(App $a) {
|
|||
'$importh' => t('Import'),
|
||||
'$importt' => t('Import your profile to this friendica instance'),
|
||||
'$form_security_token' => get_form_security_token("register")
|
||||
));
|
||||
]);
|
||||
return $o;
|
||||
|
||||
}}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue