X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=aa0f2f59bc1ece7c3f48562455ab9f7e0046f734;hb=303aef34f0804f9becc10610ae85985835f9d9bf;hp=2bd09aca92db55da4ecb54d5ad18b5498a2c00ce;hpb=745bc7cf3f3990a8887fcc806a16d218f82e35db;p=friendica.git diff --git a/mod/register.php b/mod/register.php index 2bd09aca92..aa0f2f59bc 100644 --- a/mod/register.php +++ b/mod/register.php @@ -1,22 +1,26 @@ config['register_policy']) { + switch (Config::get('config', 'register_policy')) { case REGISTER_OPEN: $blocked = 0; $verified = 1; @@ -44,8 +48,8 @@ function register_post(App $a) default: case REGISTER_CLOSED: - if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) { - notice(t('Permission denied.') . EOL); + if (empty($_SESSION['authenticated']) && empty($_SESSION['administrator'])) { + notice(L10n::t('Permission denied.') . EOL); return; } $blocked = 1; @@ -53,12 +57,13 @@ function register_post(App $a) break; } + $netpublish = !empty($_POST['profile_publish_reg']); $arr = $_POST; $arr['blocked'] = $blocked; $arr['verified'] = $verified; - $arr['language'] = get_browser_language(); + $arr['language'] = L10n::getBrowserLanguage(); try { $result = User::create($arr); @@ -69,7 +74,7 @@ function register_post(App $a) $user = $result['user']; - if ($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) { + if ($netpublish && intval(Config::get('config', 'register_policy')) !== REGISTER_APPROVE) { $url = System::baseUrl() . '/profile/' . $user['nickname']; Worker::add(PRIORITY_LOW, "Directory", $url); } @@ -78,7 +83,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 (intval(Config::get('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); @@ -87,36 +92,36 @@ 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'], Config::get('config', 'sitename'), System::baseUrl(), $user['username'], $result['password']); if ($res) { - info(t('Registration successful. Please check your email for further instructions.') . EOL); + info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL); goaway(System::baseUrl()); } else { notice( - t('Failed to send email message. Here your accout details:
login: %s
password: %s

You can change your password after login.', + L10n::t('Failed to send email message. Here your accout details:
login: %s
password: %s

You can change your password after login.', $user['email'], $result['password']) . EOL ); } } else { - info(t('Registration successful.') . EOL); + info(L10n::t('Registration successful.') . EOL); goaway(System::baseUrl()); } - } elseif ($a->config['register_policy'] == REGISTER_APPROVE) { - if (!strlen($a->config['admin_email'])) { - notice(t('Your registration can not be processed.') . EOL); + } elseif (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE) { + if (!strlen(Config::get('config', 'admin_email'))) { + notice(L10n::t('Your registration can not be processed.') . EOL); goaway(System::baseUrl()); } $hash = random_string(); $r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language`, `note` ) VALUES ( '%s', '%s', %d, '%s', '%s', '%s' ) ", dbesc($hash), - dbesc(datetime_convert()), + dbesc(DateTimeFormat::utcNow()), intval($user['uid']), dbesc($result['password']), - dbesc($lang), + dbesc(Config::get('system', 'language')), dbesc($_POST['permonlybox']) ); @@ -127,7 +132,7 @@ function register_post(App $a) } // 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(" ", "", Config::get('config', 'admin_email'))))) . "'"; $adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)", $admin_mail_list ); @@ -151,9 +156,9 @@ function register_post(App $a) } // send notification to the user, that the registration is pending User::sendRegisterPendingEmail( - $user['email'], $a->config['sitename'], $user['username']); + $user['email'], Config::get('config', 'sitename'), $user['username']); - info(t('Your registration is pending approval by the site owner.') . EOL); + info(L10n::t('Your registration is pending approval by the site owner.') . EOL); goaway(System::baseUrl()); } @@ -172,7 +177,7 @@ function register_content(App $a) return; } - if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) { + if ((!local_user()) && (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED)) { notice("Permission denied." . EOL); return; } @@ -182,7 +187,7 @@ function register_content(App $a) $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); if ($r && $r[0]['total'] >= $max_dailies) { logger('max daily registrations exceeded.'); - notice(t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); + notice(L10n::t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); return; } } @@ -211,13 +216,13 @@ function register_content(App $a) $oidlabel = ''; } else { $oidhtml = ''; - $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.'); - $oidlabel = t("Your OpenID \x28optional\x29: "); + $fillwith = L10n::t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."); + $fillext = L10n::t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'); + $oidlabel = L10n::t("Your OpenID \x28optional\x29: "); } // 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 = ''; // L10n::t('Members of this network prefer to communicate with real people who use their real names.'); if (Config::get('system', 'publish_all')) { $profile_publish = ''; @@ -225,11 +230,11 @@ function register_content(App $a) $publish_tpl = get_markup_template("profile_publish.tpl"); $profile_publish = replace_macros($publish_tpl, [ '$instance' => 'reg', - '$pubdesc' => t('Include your profile in member directory?'), - '$yes_selected' => ' checked="checked" ', - '$no_selected' => '', - '$str_yes' => t('Yes'), - '$str_no' => t('No'), + '$pubdesc' => L10n::t('Include your profile in member directory?'), + '$yes_selected' => '', + '$no_selected' => ' checked="checked"', + '$str_yes' => L10n::t('Yes'), + '$str_no' => L10n::t('No'), ]); } @@ -246,39 +251,48 @@ function register_content(App $a) $tpl = $arr['template']; + $tos = new Tos(); + $o = replace_macros($tpl, [ '$oidhtml' => $oidhtml, '$invitations' => Config::get('system', 'invitation_only'), - '$permonly' => $a->config['register_policy'] == REGISTER_APPROVE, - '$permonlybox' => ['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_label' => t('Your invitation ID: '), + '$permonly' => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE, + '$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')], + '$invite_desc' => L10n::t('Membership on this site is by invitation only.'), + '$invite_label' => L10n::t('Your invitation code: '), '$invite_id' => $invite_id, '$realpeople' => $realpeople, - '$regtitle' => t('Registration'), - '$registertext' => x($a->config, 'register_text') ? bbcode($a->config['register_text']) : "", + '$regtitle' => L10n::t('Registration'), + '$registertext' => BBCode::convert(Config::get('config', 'register_text', '')), '$fillwith' => $fillwith, '$fillext' => $fillext, '$oidlabel' => $oidlabel, '$openid' => $openid_url, - '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith, real or real-looking' . "\x29" . ': '), - '$addrlabel' => t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'), + '$namelabel' => L10n::t('Your Full Name ' . "\x28" . 'e.g. Joe Smith, real or real-looking' . "\x29" . ': '), + '$addrlabel' => L10n::t("Your Email Address: \x28Initial information will be send there, so this has to be an existing address.\x29"), '$passwords' => $passwords, - '$password1' => ['password1', t('New Password:'), '', t('Leave empty for an auto generated password.')], - '$password2' => ['confirm', t('Confirm:'), '', ''], - '$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@%s\'.', $a->get_hostname()), - '$nicklabel' => t('Choose a nickname: '), + '$password1' => ['password1', L10n::t('New Password:'), '', L10n::t('Leave empty for an auto generated password.')], + '$password2' => ['confirm', L10n::t('Confirm:'), '', ''], + '$nickdesc' => L10n::t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@%s\'.', $a->get_hostname()), + '$nicklabel' => L10n::t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, - '$regbutt' => t('Register'), + '$regbutt' => L10n::t('Register'), '$username' => $username, '$email' => $email, '$nickname' => $nickname, '$license' => $license, '$sitename' => $a->get_hostname(), - '$importh' => t('Import'), - '$importt' => t('Import your profile to this friendica instance'), - '$form_security_token' => get_form_security_token("register") + '$importh' => L10n::t('Import'), + '$importt' => L10n::t('Import your profile to this friendica instance'), + '$showtoslink' => Config::get('system', 'tosdisplay'), + '$tostext' => L10n::t('Terms of Service'), + '$showprivstatement' => Config::get('system', 'tosprivstatement'), + '$privstatement' => $tos->privacy_complete, + '$baseurl' => System::baseurl(), + '$form_security_token' => get_form_security_token("register"), + '$explicit_content' => Config::get('system', 'explicit_content', false), + '$explicit_content_note' => L10n::t('Note: This node explicitly contains adult content') ]); return $o; }