X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=f1f8b7caa928d0a47c9acc96514f75cc808efd37;hb=132653ac562d28bdc10eb836628daec8175cd378;hp=4edf3ee6a651415eff0378b59421adb5d3c26ba7;hpb=4a20bcd6f05c65c6d167415ec75b97c7b2205bd2;p=friendica.git diff --git a/mod/register.php b/mod/register.php index 4edf3ee6a6..f1f8b7caa9 100644 --- a/mod/register.php +++ b/mod/register.php @@ -1,14 +1,21 @@ $_POST); - call_hooks('register_post', $arr); + $arr = ['post' => $_POST]; + Addon::callHooks('register_post', $arr); $max_dailies = intval(Config::get('system', 'max_daily_registrations')); if ($max_dailies) { @@ -44,7 +51,7 @@ function register_post(App $a) default: case REGISTER_CLOSED: if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) { - notice(t('Permission denied.') . EOL); + notice(L10n::t('Permission denied.') . EOL); return; } $blocked = 1; @@ -52,12 +59,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); @@ -89,30 +97,30 @@ function register_post(App $a) $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); + 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); + 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), @@ -133,7 +141,7 @@ function register_post(App $a) // send notification to admins foreach ($adminlist as $admin) { - notification(array( + notification([ 'type' => NOTIFY_SYSTEM, 'event' => 'SYSTEM_REGISTER_REQUEST', 'source_name' => $user['username'], @@ -146,13 +154,13 @@ function register_post(App $a) 'uid' => $admin['uid'], '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']); - 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()); } @@ -181,7 +189,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; } } @@ -210,26 +218,26 @@ 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 = ''; } else { $publish_tpl = get_markup_template("profile_publish.tpl"); - $profile_publish = replace_macros($publish_tpl, array( + $profile_publish = replace_macros($publish_tpl, [ '$instance' => 'reg', - '$pubdesc' => t('Include your profile in member directory?'), + '$pubdesc' => L10n::t('Include your profile in member directory?'), '$yes_selected' => ' checked="checked" ', '$no_selected' => '', - '$str_yes' => t('Yes'), - '$str_no' => t('No'), - )); + '$str_yes' => L10n::t('Yes'), + '$str_no' => L10n::t('No'), + ]); } $r = q("SELECT COUNT(*) AS `contacts` FROM `contact`"); @@ -239,44 +247,51 @@ function register_content(App $a) $tpl = get_markup_template("register.tpl"); - $arr = array('template' => $tpl); + $arr = ['template' => $tpl]; - call_hooks('register_form', $arr); + Addon::callHooks('register_form', $arr); $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' => 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_label' => t('Your invitation ID: '), + '$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' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')), - '$password2' => array('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'), + '$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") ]); return $o;