X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=ee614f64d84d703735d1d8442c9221fe63ba48af;hb=62a61a95d3e1357a64b157136490c82aa4495d3e;hp=2bd09aca92db55da4ecb54d5ad18b5498a2c00ce;hpb=11cf36105ccd359c9d21a006e13b3767712196b6;p=friendica.git
diff --git a/mod/register.php b/mod/register.php
index 2bd09aca92..ee614f64d8 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -1,15 +1,21 @@
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),
@@ -127,7 +134,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(" ", "", $a->config['admin_email'])))) . "'";
$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
$admin_mail_list
);
@@ -153,7 +160,7 @@ function register_post(App $a)
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());
}
@@ -182,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;
}
}
@@ -211,13 +218,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 +232,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,38 +253,45 @@ 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: '),
+ '$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'),
+ '$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;