X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=03d4cb02f66196600c0ae6cdb98a14dfd522e3f3;hb=1938ec3ebecd71c806d1cddf2400786a649a8c40;hp=41d39f4158204b09792e084f9c732d790bd3066a;hpb=ac19a9cddc9e9cee323bb46123d95cfc02ffef0e;p=friendica.git

diff --git a/mod/register.php b/mod/register.php
index 41d39f4158..03d4cb02f6 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -9,11 +9,14 @@ 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;
 use Friendica\Module\Tos;
+use Friendica\Util\Strings;
 
 require_once 'include/enotify.php';
 
@@ -63,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);
@@ -81,7 +84,7 @@ 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 = (!empty($_POST['invite_id']) ? Strings::escapeTags(trim($_POST['invite_id'])) : '');
 
 	if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
 		if ($using_invites && $invite_id) {
@@ -90,7 +93,7 @@ function register_post(App $a)
 		}
 
 		// Only send a password mail when the password wasn't manually provided
-		if (!x($_POST, 'password1') || !x($_POST, 'confirm')) {
+		if (empty($_POST['password1']) || empty($_POST['confirm'])) {
 			$res = Model\User::sendRegisterOpenEmail(
 				$user,
 				Config::get('config', 'sitename'),
@@ -100,7 +103,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.',
@@ -111,12 +114,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']);
@@ -159,7 +162,7 @@ function register_post(App $a)
 		);
 
 		info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
-		goaway();
+		$a->internalRedirect();
 	}
 
 	return;
@@ -186,49 +189,44 @@ 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;
 		}
 	}
 
-	if (x($_SESSION, 'theme')) {
+	if (!empty($_SESSION['theme'])) {
 		unset($_SESSION['theme']);
 	}
-	if (x($_SESSION, 'mobile-theme')) {
+	if (!empty($_SESSION['mobile-theme'])) {
 		unset($_SESSION['mobile-theme']);
 	}
 
 
-	$username   = x($_REQUEST, 'username')   ? $_REQUEST['username']   : '';
-	$email      = x($_REQUEST, 'email')      ? $_REQUEST['email']      : '';
-	$openid_url = x($_REQUEST, 'openid_url') ? $_REQUEST['openid_url'] : '';
-	$nickname   = x($_REQUEST, 'nickname')   ? $_REQUEST['nickname']   : '';
-	$photo      = x($_REQUEST, 'photo')      ? $_REQUEST['photo']      : '';
-	$invite_id  = x($_REQUEST, 'invite_id')  ? $_REQUEST['invite_id']  : '';
+	$username   = defaults($_REQUEST, 'username'  , '');
+	$email      = defaults($_REQUEST, 'email'     , '');
+	$openid_url = defaults($_REQUEST, 'openid_url', '');
+	$nickname   = defaults($_REQUEST, 'nickname'  , '');
+	$photo      = defaults($_REQUEST, 'photo'     , '');
+	$invite_id  = defaults($_REQUEST, 'invite_id' , '');
 
 	$noid = Config::get('system', 'no_openid');
 
 	if ($noid) {
-		$oidhtml  = '';
 		$fillwith = '';
 		$fillext  = '';
 		$oidlabel = '';
 	} else {
-		$oidhtml  = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
 		$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 = ''; // 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 = '<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' => '',
@@ -241,9 +239,7 @@ function register_content(App $a)
 	$r = q("SELECT COUNT(*) AS `contacts` FROM `contact`");
 	$passwords = !$r[0]["contacts"];
 
-	$license = '';
-
-	$tpl = get_markup_template("register.tpl");
+	$tpl = Renderer::getMarkupTemplate("register.tpl");
 
 	$arr = ['template' => $tpl];
 
@@ -253,15 +249,13 @@ function register_content(App $a)
 
 	$tos = new Tos();
 
-	$o = replace_macros($tpl, [
-		'$oidhtml' => $oidhtml,
+	$o = Renderer::replaceMacros($tpl, [
 		'$invitations' => Config::get('system', 'invitation_only'),
 		'$permonly'    => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE,
 		'$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'  => L10n::t('Registration'),
 		'$registertext' => BBCode::convert(Config::get('config', 'register_text', '')),
 		'$fillwith'  => $fillwith,
@@ -281,7 +275,6 @@ function register_content(App $a)
 		'$username'  => $username,
 		'$email'     => $email,
 		'$nickname'  => $nickname,
-		'$license'   => $license,
 		'$sitename'  => $a->getHostName(),
 		'$importh'   => L10n::t('Import'),
 		'$importt'   => L10n::t('Import your profile to this friendica instance'),