X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=b13ec225098837ea33d39ccba714ea81cf71eb4c;hb=5fdc9097a24262101b0a967fcc45d8339b7b06ef;hp=81919df105d605252151534443a7055f9fe33c01;hpb=69300291f03fe85502df9907014f0ad68ee07c9c;p=friendica.git
diff --git a/mod/register.php b/mod/register.php
index 81919df105..b13ec22509 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -4,24 +4,23 @@
*/
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\User;
+use Friendica\Model;
use Friendica\Module\Tos;
-use Friendica\Util\DateTimeFormat;
-
-require_once 'include/enotify.php';
+use Friendica\Util\Strings;
function register_post(App $a)
{
- check_form_security_token_redirectOnErr('/register', 'register');
-
- global $lang;
+ BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
$verified = 0;
$blocked = 1;
@@ -37,7 +36,7 @@ function register_post(App $a)
}
}
- switch ($a->config['register_policy']) {
+ switch (Config::get('config', 'register_policy')) {
case REGISTER_OPEN:
$blocked = 0;
$verified = 1;
@@ -50,7 +49,7 @@ function register_post(App $a)
default:
case REGISTER_CLOSED:
- if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) {
+ if (empty($_SESSION['authenticated']) && empty($_SESSION['administrator'])) {
notice(L10n::t('Permission denied.') . EOL);
return;
}
@@ -65,10 +64,10 @@ function register_post(App $a)
$arr['blocked'] = $blocked;
$arr['verified'] = $verified;
- $arr['language'] = L10n::getBrowserLanguage();
+ $arr['language'] = L10n::detectLanguage();
try {
- $result = User::create($arr);
+ $result = Model\User::create($arr);
} catch (Exception $e) {
notice($e->getMessage());
return;
@@ -76,29 +75,33 @@ function register_post(App $a)
$user = $result['user'];
- if ($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
- $url = System::baseUrl() . '/profile/' . $user['nickname'];
+ if ($netpublish && intval(Config::get('config', 'register_policy')) !== REGISTER_APPROVE) {
+ $url = $a->getBaseUrl() . '/profile/' . $user['nickname'];
Worker::add(PRIORITY_LOW, "Directory", $url);
}
$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 ($a->config['register_policy'] == REGISTER_OPEN) {
+ if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
if ($using_invites && $invite_id) {
- q("delete * from register where hash = '%s' limit 1", dbesc($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 = User::sendRegisterOpenEmail(
- $user['email'], $a->config['sitename'], System::baseUrl(), $user['username'], $result['password']);
+ if (empty($_POST['password1']) || empty($_POST['confirm'])) {
+ $res = Model\User::sendRegisterOpenEmail(
+ $user,
+ Config::get('config', 'sitename'),
+ $a->getBaseUrl(),
+ $result['password']
+ );
if ($res) {
info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL);
- goaway(System::baseUrl());
+ $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.',
@@ -109,32 +112,24 @@ function register_post(App $a)
}
} else {
info(L10n::t('Registration successful.') . EOL);
- goaway(System::baseUrl());
+ $a->internalRedirect();
}
- } elseif ($a->config['register_policy'] == REGISTER_APPROVE) {
- if (!strlen($a->config['admin_email'])) {
+ } 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(System::baseUrl());
+ $a->internalRedirect();
}
- $hash = random_string();
- $r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language`, `note` ) VALUES ( '%s', '%s', %d, '%s', '%s', '%s' ) ",
- dbesc($hash),
- dbesc(DateTimeFormat::utcNow()),
- intval($user['uid']),
- dbesc($result['password']),
- dbesc($lang),
- dbesc($_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", dbesc($invite_id));
+ Model\Register::deleteByHash($invite_id);
PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
}
// send email to admins
- $admin_mail_list = "'" . implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email'])))) . "'";
+ $admin_mail_list = "'" . implode("','", array_map(['Friendica\Database\DBA', 'escape'], explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))))) . "'";
$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
$admin_mail_list
);
@@ -147,9 +142,9 @@ function register_post(App $a)
'source_name' => $user['username'],
'source_mail' => $user['email'],
'source_nick' => $user['nickname'],
- 'source_link' => System::baseUrl() . "/admin/users/",
- 'link' => System::baseUrl() . "/admin/users/",
- 'source_photo' => System::baseUrl() . "/photo/avatar/" . $user['uid'] . ".jpg",
+ 'source_link' => $a->getBaseUrl() . "/admin/users/",
+ 'link' => $a->getBaseUrl() . "/admin/users/",
+ 'source_photo' => $a->getBaseUrl() . "/photo/avatar/" . $user['uid'] . ".jpg",
'to_email' => $admin['email'],
'uid' => $admin['uid'],
'language' => $admin['language'] ? $admin['language'] : 'en',
@@ -157,11 +152,15 @@ function register_post(App $a)
]);
}
// send notification to the user, that the registration is pending
- User::sendRegisterPendingEmail(
- $user['email'], $a->config['sitename'], $user['username']);
+ Model\User::sendRegisterPendingEmail(
+ $user,
+ Config::get('config', 'sitename'),
+ $a->getBaseURL(),
+ $result['password']
+ );
info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
- goaway(System::baseUrl());
+ $a->internalRedirect();
}
return;
@@ -179,7 +178,7 @@ function register_content(App $a)
return;
}
- if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
+ if ((!local_user()) && (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED)) {
notice("Permission denied." . EOL);
return;
}
@@ -188,49 +187,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 = '';
$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 = '';
} 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' => '',
@@ -243,9 +237,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];
@@ -255,15 +247,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' => $a->config['register_policy'] == REGISTER_APPROVE,
+ '$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,
@@ -275,7 +265,7 @@ function register_content(App $a)
'$passwords' => $passwords,
'$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()),
+ '$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->getHostName()),
'$nicklabel' => L10n::t('Choose a nickname: '),
'$photo' => $photo,
'$publish' => $profile_publish,
@@ -283,8 +273,7 @@ function register_content(App $a)
'$username' => $username,
'$email' => $email,
'$nickname' => $nickname,
- '$license' => $license,
- '$sitename' => $a->get_hostname(),
+ '$sitename' => $a->getHostName(),
'$importh' => L10n::t('Import'),
'$importt' => L10n::t('Import your profile to this friendica instance'),
'$showtoslink' => Config::get('system', 'tosdisplay'),
@@ -292,7 +281,9 @@ 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')
]);
return $o;
}