X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=2b0d87ca9921c651c6921dc88f1f191f9acfa061;hb=e88781164a2e60c439c755d96a639ef2093a7305;hp=2b3522234e84adfb749cbc8865e526b42aea6745;hpb=0563a284381bb9dabf851731479f6293337617dd;p=friendica.git

diff --git a/mod/register.php b/mod/register.php
index 2b3522234e..2b0d87ca99 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -4,23 +4,25 @@
  */
 
 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\Database\DBA;
 use Friendica\Model;
 use Friendica\Module\Tos;
-use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 
 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;
@@ -64,7 +66,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);
@@ -82,28 +84,26 @@ function register_post(App $a)
 
 	$using_invites = Config::get('system', 'invitation_only');
 	$num_invites   = Config::get('system', 'number_invites');
-	$invite_id = ((x($_POST, 'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
+	$invite_id = ((x($_POST, 'invite_id')) ? Strings::escapeTags(trim($_POST['invite_id'])) : '');
 
 	if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
 		if ($using_invites && $invite_id) {
-			q("delete * from register where hash = '%s' limit 1", DBA::escape($invite_id));
+			Model\Register::deleteByHash($invite_id);
 			PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
 		}
 
 		// Only send a password mail when the password wasn't manually provided
 		if (!x($_POST, 'password1') || !x($_POST, 'confirm')) {
 			$res = Model\User::sendRegisterOpenEmail(
-				$user['email'],
+				$user,
 				Config::get('config', 'sitename'),
 				$a->getBaseUrl(),
-				$user['username'],
-				$result['password'],
-				$user
+				$result['password']
 			);
 
 			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.',
@@ -114,27 +114,19 @@ 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();
 		}
 
-		$hash = random_string();
-		$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language`, `note` ) VALUES ( '%s', '%s', %d, '%s', '%s', '%s' ) ",
-			DBA::escape($hash),
-			DBA::escape(DateTimeFormat::utcNow()),
-			intval($user['uid']),
-			DBA::escape($result['password']),
-			DBA::escape(Config::get('system', 'language')),
-			DBA::escape($_POST['permonlybox'])
-		);
+		Model\Register::createForApproval($user['uid'], Config::get('system', 'language'), $_POST['permonlybox']);
 
 		// invite system
 		if ($using_invites && $invite_id) {
-			q("DELETE * FROM `register` WHERE `hash` = '%s' LIMIT 1", DBA::escape($invite_id));
+			Model\Register::deleteByHash($invite_id);
 			PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
 		}
 
@@ -163,16 +155,14 @@ function register_post(App $a)
 		}
 		// send notification to the user, that the registration is pending
 		Model\User::sendRegisterPendingEmail(
-			$user['email'],
+			$user,
 			Config::get('config', 'sitename'),
-			$user['username'],
 			$a->getBaseURL(),
-			$user['nickname'],
 			$result['password']
 		);
 
 		info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
-		goaway();
+		$a->internalRedirect();
 	}
 
 	return;
@@ -199,7 +189,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;
 		}
@@ -240,8 +230,8 @@ function register_content(App $a)
 	if (Config::get('system', 'publish_all')) {
 		$profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
 	} 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' => '',
@@ -256,7 +246,7 @@ function register_content(App $a)
 
 	$license = '';
 
-	$tpl = get_markup_template("register.tpl");
+	$tpl = Renderer::getMarkupTemplate("register.tpl");
 
 	$arr = ['template' => $tpl];
 
@@ -266,7 +256,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,
@@ -303,7 +293,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')
 	]);