X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FRegister.php;h=d415abf74cab69243fba1c7cb0f5c6b4b8ec06b6;hb=35e2ae39252f6713a09c80026eeacf184f68437a;hp=9530d29f147daf1a296386f32fca7ed2f35e4451;hpb=2838635d648cee828f1f2dc29a499e0a61a3b9a1;p=friendica.git diff --git a/src/Module/Register.php b/src/Module/Register.php index 9530d29f14..d415abf74c 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -1,20 +1,42 @@ . + * + */ namespace Friendica\Module; +use Friendica\App; use Friendica\BaseModule; use Friendica\Content\Text\BBCode; -use Friendica\Core\Config; +use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\L10n as L10nClass; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model; -use Friendica\Util\Strings; +use Friendica\Model\User; +use Friendica\Util\Profiler; +use Friendica\Util\Proxy; +use Psr\Log\LoggerInterface; /** * @author Hypolite Petovan @@ -25,6 +47,16 @@ class Register extends BaseModule const APPROVE = 1; const OPEN = 2; + /** @var Tos */ + protected $tos; + + public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = []) + { + parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + + $this->tos = new Tos($l10n, $baseUrl, $args, $logger, $profiler, $response, $config, $server, $parameters); + } + /** * Module GET method to display any content * @@ -34,12 +66,12 @@ class Register extends BaseModule * * @return string */ - public static function content(array $parameters = []) + protected function content(array $request = []): string { // logged in users can register others (people/pages/groups) // even with closed registrations, unless specifically prohibited by site policy. // 'block_extended_register' blocks all registrations, period. - $block = Config::get('system', 'block_extended_register'); + $block = DI::config()->get('system', 'block_extended_register'); if (local_user() && $block) { notice(DI::l10n()->t('Permission denied.')); @@ -54,16 +86,16 @@ class Register extends BaseModule } } - if (!local_user() && (intval(Config::get('config', 'register_policy')) === self::CLOSED)) { + if (!local_user() && (intval(DI::config()->get('config', 'register_policy')) === self::CLOSED)) { notice(DI::l10n()->t('Permission denied.')); return ''; } - $max_dailies = intval(Config::get('system', 'max_daily_registrations')); + $max_dailies = intval(DI::config()->get('system', 'max_daily_registrations')); if ($max_dailies) { $count = DBA::count('user', ['`register_date` > UTC_TIMESTAMP - INTERVAL 1 day']); if ($count >= $max_dailies) { - Logger::log('max daily registrations exceeded.'); + Logger::notice('max daily registrations exceeded.'); notice(DI::l10n()->t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.')); return ''; } @@ -76,7 +108,7 @@ class Register extends BaseModule $photo = $_REQUEST['photo'] ?? ''; $invite_id = $_REQUEST['invite_id'] ?? ''; - if (local_user() || Config::get('system', 'no_openid')) { + if (local_user() || DI::config()->get('system', 'no_openid')) { $fillwith = ''; $fillext = ''; $oidlabel = ''; @@ -86,10 +118,10 @@ class Register extends BaseModule $oidlabel = DI::l10n()->t('Your OpenID (optional): '); } - if (Config::get('system', 'publish_all')) { + if (DI::config()->get('system', 'publish_all')) { $profile_publish = ''; } else { - $publish_tpl = Renderer::getMarkupTemplate('profile_publish.tpl'); + $publish_tpl = Renderer::getMarkupTemplate('profile/publish.tpl'); $profile_publish = Renderer::replaceMacros($publish_tpl, [ '$instance' => 'reg', '$pubdesc' => DI::l10n()->t('Include your profile in member directory?'), @@ -110,17 +142,15 @@ class Register extends BaseModule $tpl = $arr['template']; - $tos = new Tos(); - $o = Renderer::replaceMacros($tpl, [ - '$invitations' => Config::get('system', 'invitation_only'), - '$permonly' => intval(Config::get('config', 'register_policy')) === self::APPROVE, - '$permonlybox' => ['permonlybox', DI::l10n()->t('Note for the admin'), '', DI::l10n()->t('Leave a message for the admin, why you want to join this node'), 'required'], + '$invitations' => DI::config()->get('system', 'invitation_only'), + '$permonly' => intval(DI::config()->get('config', 'register_policy')) === self::APPROVE, + '$permonlybox' => ['permonlybox', DI::l10n()->t('Note for the admin'), '', DI::l10n()->t('Leave a message for the admin, why you want to join this node'), DI::l10n()->t('Required')], '$invite_desc' => DI::l10n()->t('Membership on this site is by invitation only.'), '$invite_label' => DI::l10n()->t('Your invitation code: '), '$invite_id' => $invite_id, '$regtitle' => DI::l10n()->t('Registration'), - '$registertext' => BBCode::convert(Config::get('config', 'register_text', '')), + '$registertext' => BBCode::convert(DI::config()->get('config', 'register_text', '')), '$fillwith' => $fillwith, '$fillext' => $fillext, '$oidlabel' => $oidlabel, @@ -142,12 +172,12 @@ class Register extends BaseModule '$sitename' => DI::baseUrl()->getHostname(), '$importh' => DI::l10n()->t('Import'), '$importt' => DI::l10n()->t('Import your profile to this friendica instance'), - '$showtoslink' => Config::get('system', 'tosdisplay'), + '$showtoslink' => DI::config()->get('system', 'tosdisplay'), '$tostext' => DI::l10n()->t('Terms of Service'), - '$showprivstatement' => Config::get('system', 'tosprivstatement'), - '$privstatement'=> $tos->privacy_complete, + '$showprivstatement' => DI::config()->get('system', 'tosprivstatement'), + '$privstatement'=> $this->tos->privacy_complete, '$form_security_token' => BaseModule::getFormSecurityToken('register'), - '$explicit_content' => Config::get('system', 'explicit_content', false), + '$explicit_content' => DI::config()->get('system', 'explicit_content', false), '$explicit_content_note' => DI::l10n()->t('Note: This node explicitly contains adult content'), '$additional' => !empty(local_user()), '$parent_password' => ['parent_password', DI::l10n()->t('Parent Password:'), '', DI::l10n()->t('Please enter the password of the parent account to legitimize your request.')] @@ -163,12 +193,10 @@ class Register extends BaseModule * Extend this method if the module is supposed to process POST requests. * Doesn't display any content */ - public static function post(array $parameters = []) + protected function post(array $request = []) { BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register'); - $a = DI::app(); - $arr = ['post' => $_POST]; Hook::callAll('register_post', $arr); @@ -192,7 +220,7 @@ class Register extends BaseModule DI::baseUrl()->redirect('register?' . http_build_query($regdata)); } - $max_dailies = intval(Config::get('system', 'max_daily_registrations')); + $max_dailies = intval(DI::config()->get('system', 'max_daily_registrations')); if ($max_dailies) { $count = DBA::count('user', ['`register_date` > UTC_TIMESTAMP - INTERVAL 1 day']); if ($count >= $max_dailies) { @@ -200,7 +228,7 @@ class Register extends BaseModule } } - switch (Config::get('config', 'register_policy')) { + switch (DI::config()->get('config', 'register_policy')) { case self::OPEN: $blocked = 0; $verified = 1; @@ -233,10 +261,6 @@ class Register extends BaseModule DI::baseUrl()->redirect('register/'); } - - // Overwriting the "tar pit" field with the real one - $arr['email'] = $arr['field1']; - if ($additional_account) { $user = DBA::selectFirst('user', ['email'], ['uid' => local_user()]); if (!DBA::isResult($user)) { @@ -249,6 +273,9 @@ class Register extends BaseModule $arr['password1'] = $arr['confirm'] = $arr['parent_password']; $arr['repeat'] = $arr['email'] = $user['email']; + } else { + // Overwriting the "tar pit" field with the real one + $arr['email'] = $arr['field1']; } if ($arr['email'] != $arr['repeat']) { @@ -260,7 +287,7 @@ class Register extends BaseModule $arr['blocked'] = $blocked; $arr['verified'] = $verified; - $arr['language'] = L10nClass::detectLanguage($_SERVER, $_GET, DI::config()->get('system', 'language')); + $arr['language'] = L10n::detectLanguage($_SERVER, $_GET, DI::config()->get('system', 'language')); try { $result = Model\User::create($arr); @@ -273,7 +300,7 @@ class Register extends BaseModule $base_url = DI::baseUrl()->get(); - if ($netpublish && intval(Config::get('config', 'register_policy')) !== self::APPROVE) { + if ($netpublish && intval(DI::config()->get('config', 'register_policy')) !== self::APPROVE) { $url = $base_url . '/profile/' . $user['nickname']; Worker::add(PRIORITY_LOW, 'Directory', $url); } @@ -284,11 +311,11 @@ class Register extends BaseModule DI::baseUrl()->redirect('delegation'); } - $using_invites = Config::get('system', 'invitation_only'); - $num_invites = Config::get('system', 'number_invites'); - $invite_id = (!empty($_POST['invite_id']) ? Strings::escapeTags(trim($_POST['invite_id'])) : ''); + $using_invites = DI::config()->get('system', 'invitation_only'); + $num_invites = DI::config()->get('system', 'number_invites'); + $invite_id = (!empty($_POST['invite_id']) ? trim($_POST['invite_id']) : ''); - if (intval(Config::get('config', 'register_policy')) === self::OPEN) { + if (intval(DI::config()->get('config', 'register_policy')) === self::OPEN) { if ($using_invites && $invite_id) { Model\Register::deleteByHash($invite_id); DI::pConfig()->set($user['uid'], 'system', 'invites_remaining', $num_invites); @@ -299,7 +326,7 @@ class Register extends BaseModule $res = Model\User::sendRegisterOpenEmail( DI::l10n()->withLang($arr['language']), $user, - Config::get('config', 'sitename'), + DI::config()->get('config', 'sitename'), $base_url, $result['password'] ); @@ -318,8 +345,8 @@ class Register extends BaseModule info(DI::l10n()->t('Registration successful.')); DI::baseUrl()->redirect(); } - } elseif (intval(Config::get('config', 'register_policy')) === self::APPROVE) { - if (!strlen(Config::get('config', 'admin_email'))) { + } elseif (intval(DI::config()->get('config', 'register_policy')) === self::APPROVE) { + if (!strlen(DI::config()->get('config', 'admin_email'))) { notice(DI::l10n()->t('Your registration can not be processed.')); DI::baseUrl()->redirect(); } @@ -332,7 +359,7 @@ class Register extends BaseModule DI::baseUrl()->redirect('register/'); } - Model\Register::createForApproval($user['uid'], Config::get('system', 'language'), $_POST['permonlybox']); + Model\Register::createForApproval($user['uid'], DI::config()->get('system', 'language'), $_POST['permonlybox']); // invite system if ($using_invites && $invite_id) { @@ -344,23 +371,21 @@ class Register extends BaseModule $admins_stmt = DBA::select( 'user', ['uid', 'language', 'email'], - ['email' => explode(',', str_replace(' ', '', Config::get('config', 'admin_email')))] + ['email' => explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')))] ); // send notification to admins while ($admin = DBA::fetch($admins_stmt)) { - \notification([ - 'type' => NOTIFY_SYSTEM, + DI::notify()->createFromArray([ + 'type' => Model\Notification\Type::SYSTEM, 'event' => 'SYSTEM_REGISTER_REQUEST', + 'uid' => $admin['uid'], + 'link' => $base_url . '/admin/users/', 'source_name' => $user['username'], 'source_mail' => $user['email'], 'source_nick' => $user['nickname'], 'source_link' => $base_url . '/admin/users/', - 'link' => $base_url . '/admin/users/', - 'source_photo' => $base_url . '/photo/avatar/' . $user['uid'] . '.jpg', - 'to_email' => $admin['email'], - 'uid' => $admin['uid'], - 'language' => ($admin['language'] ?? '') ?: 'en', + 'source_photo' => User::getAvatarUrl($user, Proxy::SIZE_THUMB), 'show_in_notification_page' => false ]); } @@ -369,7 +394,7 @@ class Register extends BaseModule // send notification to the user, that the registration is pending Model\User::sendRegisterPendingEmail( $user, - Config::get('config', 'sitename'), + DI::config()->get('config', 'sitename'), $base_url, $result['password'] );