X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fregister.php;h=73b57124a21613219d5f4363f05991a3eb789f81;hb=f2ca3e5be44192c486e8e3af2a993e065ad40a7d;hp=48fe67afc5a828f56b0e66ebccd6a89acba2765e;hpb=a19f8d642d6078b2a9f43770fcc863b5c006c026;p=friendica.git

diff --git a/mod/register.php b/mod/register.php
index 48fe67afc5..73b57124a2 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -4,10 +4,12 @@
  */
 
 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\System;
 use Friendica\Core\Worker;
@@ -18,7 +20,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 +64,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 +101,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:<br> login: %s<br> password: %s<br><br>You can change your password after login.',
@@ -110,12 +112,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 +160,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 +187,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;
 		}
@@ -289,7 +291,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')
 	]);