X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=d8231bd21e0aa306f82903628ea62396bbf40df9;hb=8a46c786f37550160d81e7b7ecbcacb4c9fff493;hp=48fe67afc5a828f56b0e66ebccd6a89acba2765e;hpb=6d420dfe9eace9c5a9025983957fd2b6a9e82e08;p=friendica.git
diff --git a/mod/register.php b/mod/register.php
index 48fe67afc5..d8231bd21e 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -4,11 +4,14 @@
*/
use Friendica\App;
+use Friendica\BaseModule;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Model;
@@ -18,7 +21,7 @@ require_once 'include/enotify.php';
function register_post(App $a)
{
- check_form_security_token_redirectOnErr('/register', 'register');
+ BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
$verified = 0;
$blocked = 1;
@@ -62,7 +65,7 @@ function register_post(App $a)
$arr['blocked'] = $blocked;
$arr['verified'] = $verified;
- $arr['language'] = L10n::getBrowserLanguage();
+ $arr['language'] = L10n::detectLanguage();
try {
$result = Model\User::create($arr);
@@ -99,7 +102,7 @@ function register_post(App $a)
if ($res) {
info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL);
- goaway();
+ $a->internalRedirect();
} else {
notice(
L10n::t('Failed to send email message. Here your accout details:
login: %s
password: %s
You can change your password after login.',
@@ -110,12 +113,12 @@ function register_post(App $a)
}
} else {
info(L10n::t('Registration successful.') . EOL);
- goaway();
+ $a->internalRedirect();
}
} 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();
+ $a->internalRedirect();
}
Model\Register::createForApproval($user['uid'], Config::get('system', 'language'), $_POST['permonlybox']);
@@ -158,7 +161,7 @@ function register_post(App $a)
);
info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
- goaway();
+ $a->internalRedirect();
}
return;
@@ -185,7 +188,7 @@ function register_content(App $a)
if ($max_dailies) {
$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.');
+ Logger::log('max daily registrations exceeded.');
notice(L10n::t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
return;
}
@@ -226,8 +229,8 @@ function register_content(App $a)
if (Config::get('system', 'publish_all')) {
$profile_publish = '';
} else {
- $publish_tpl = get_markup_template("profile_publish.tpl");
- $profile_publish = replace_macros($publish_tpl, [
+ $publish_tpl = Renderer::getMarkupTemplate("profile_publish.tpl");
+ $profile_publish = Renderer::replaceMacros($publish_tpl, [
'$instance' => 'reg',
'$pubdesc' => L10n::t('Include your profile in member directory?'),
'$yes_selected' => '',
@@ -242,7 +245,7 @@ function register_content(App $a)
$license = '';
- $tpl = get_markup_template("register.tpl");
+ $tpl = Renderer::getMarkupTemplate("register.tpl");
$arr = ['template' => $tpl];
@@ -252,7 +255,7 @@ function register_content(App $a)
$tos = new Tos();
- $o = replace_macros($tpl, [
+ $o = Renderer::replaceMacros($tpl, [
'$oidhtml' => $oidhtml,
'$invitations' => Config::get('system', 'invitation_only'),
'$permonly' => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE,
@@ -289,7 +292,7 @@ function register_content(App $a)
'$showprivstatement' => Config::get('system', 'tosprivstatement'),
'$privstatement' => $tos->privacy_complete,
'$baseurl' => System::baseurl(),
- '$form_security_token' => get_form_security_token("register"),
+ '$form_security_token' => BaseModule::getFormSecurityToken("register"),
'$explicit_content' => Config::get('system', 'explicit_content', false),
'$explicit_content_note' => L10n::t('Note: This node explicitly contains adult content')
]);