X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FLogin.php;h=966ded57faa3b94ffd6b086eb63f165914b7eb16;hb=18807ae21d3f18e187a524ea2dfb12830feb8ca3;hp=92b0daed13d2c40abc77f1bccd6227f76728d0ac;hpb=2ef81108b37a85642e1f3380044a03cb1cd8719a;p=friendica.git
diff --git a/src/Module/Login.php b/src/Module/Login.php
index 92b0daed13..966ded57fa 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -6,20 +6,21 @@ namespace Friendica\Module;
use Exception;
use Friendica\BaseModule;
-use Friendica\Core\Addon;
use Friendica\Core\Authentication;
use Friendica\Core\Config;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
+use Friendica\Util\Strings;
use LightOpenID;
-require_once 'boot.php';
-require_once 'include/text.php';
-
/**
* Login module
*
@@ -31,27 +32,22 @@ class Login extends BaseModule
{
$a = self::getApp();
- if (x($_SESSION, 'theme')) {
- unset($_SESSION['theme']);
- }
-
- if (x($_SESSION, 'mobile-theme')) {
- unset($_SESSION['mobile-theme']);
- }
+ Session::remove('theme');
+ Session::remove('mobile-theme');
if (local_user()) {
- $a->redirect();
+ $a->internalRedirect();
}
- return self::form($_SESSION['return_url'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
+ return self::form(Session::get('return_path'), intval(Config::get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED);
}
public static function post()
{
- $return_url = $_SESSION['return_url'];
+ $return_path = Session::get('return_path');
session_unset();
- $_SESSION['return_url'] = $return_url;
-
+ Session::set('return_path', $return_path);
+
// OpenId Login
if (
empty($_POST['password'])
@@ -65,7 +61,7 @@ class Login extends BaseModule
self::openIdAuthentication($openid_url, !empty($_POST['remember']));
}
- if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
+ if (!empty($_POST['auth-params']) && $_POST['auth-params'] === 'login') {
self::passwordAuthentication(
trim($_POST['username']),
trim($_POST['password']),
@@ -79,6 +75,7 @@ class Login extends BaseModule
*
* @param string $openid_url OpenID URL string
* @param bool $remember Whether to set the session remember flag
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function openIdAuthentication($openid_url, $remember)
{
@@ -89,19 +86,18 @@ class Login extends BaseModule
// if it's an email address or doesn't resolve to a URL, fail.
if ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) {
notice(L10n::t('Login failed.') . EOL);
- $a->redirect();
+ $a->internalRedirect();
// NOTREACHED
}
// Otherwise it's probably an openid.
try {
- $a = get_app();
$openid = new LightOpenID($a->getHostName());
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$_SESSION['remember'] = $remember;
- $openid->returnUrl = self::getApp()->getBaseURL(true) . '/openid';
- $a->redirect($openid->authUrl());
+ $openid->returnUrl = $a->getBaseURL(true) . '/openid';
+ System::externalRedirect($openid->authUrl());
} catch (Exception $e) {
notice(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '
' . L10n::t('The error message was:') . ' ' . $e->getMessage());
}
@@ -113,6 +109,7 @@ class Login extends BaseModule
* @param string $username User name
* @param string $password Clear password
* @param bool $remember Whether to set the session remember flag
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function passwordAuthentication($username, $password, $remember)
{
@@ -132,7 +129,7 @@ class Login extends BaseModule
* Addons should never set 'authenticated' except to indicate success - as hooks may be chained
* and later addons should not interfere with an earlier one that succeeded.
*/
- Addon::callHooks('authenticate', $addon_auth);
+ Hook::callAll('authenticate', $addon_auth);
try {
if ($addon_auth['authenticated']) {
@@ -147,9 +144,9 @@ class Login extends BaseModule
);
}
} catch (Exception $e) {
- logger('authenticate: failed login attempt: ' . notags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
+ Logger::warning('authenticate: failed login attempt', ['action' => 'login', 'username' => Strings::escapeTags($username), 'ip' => $_SERVER['REMOTE_ADDR']]);
info('Login failed. Please check your credentials.' . EOL);
- $a->redirect();
+ $a->internalRedirect();
}
if (!$remember) {
@@ -157,18 +154,15 @@ class Login extends BaseModule
}
// if we haven't failed up this point, log them in.
- $_SESSION['remember'] = $remember;
- $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
- Authentication::setAuthenticatedSessionForUser($record, true, true);
+ Session::set('remember', $remember);
+ Session::set('last_login_date', DateTimeFormat::utcNow());
- if (x($_SESSION, 'return_url')) {
- $return_url = $_SESSION['return_url'];
- unset($_SESSION['return_url']);
- } else {
- $return_url = '';
- }
+ Session::setAuthenticatedForUser($a, $record, true, true);
- $a->redirect($return_url);
+ $return_path = Session::get('return_path', '');
+ Session::remove('return_path');
+
+ $a->internalRedirect($return_path);
}
/**
@@ -196,9 +190,9 @@ class Login extends BaseModule
);
if (DBA::isResult($user)) {
if ($data->hash != Authentication::getCookieHashForUser($user)) {
- logger("Hash for user " . $data->uid . " doesn't fit.");
+ Logger::log("Hash for user " . $data->uid . " doesn't fit.");
Authentication::deleteSession();
- $a->redirect();
+ $a->internalRedirect();
}
// Renew the cookie
@@ -209,7 +203,7 @@ class Login extends BaseModule
// Do the authentification if not done by now
if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
- Authentication::setAuthenticatedSessionForUser($user);
+ Session::setAuthenticatedForUser($a, $user);
if (Config::get('system', 'paranoia')) {
$_SESSION['addr'] = $data->ip;
@@ -219,23 +213,23 @@ class Login extends BaseModule
}
}
- if (isset($_SESSION) && x($_SESSION, 'authenticated')) {
- if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
+ if (!empty($_SESSION['authenticated'])) {
+ if (!empty($_SESSION['visitor_id']) && empty($_SESSION['uid'])) {
$contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id']]);
if (DBA::isResult($contact)) {
self::getApp()->contact = $contact;
}
}
- if (x($_SESSION, 'uid')) {
+ if (!empty($_SESSION['uid'])) {
// already logged in user returning
$check = Config::get('system', 'paranoia');
// extra paranoia - if the IP changed, log them out
if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
- logger('Session address changed. Paranoid setting in effect, blocking session. ' .
+ Logger::log('Session address changed. Paranoid setting in effect, blocking session. ' .
$_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
Authentication::deleteSession();
- $a->redirect();
+ $a->internalRedirect();
}
$user = DBA::selectFirst('user', [],
@@ -249,7 +243,7 @@ class Login extends BaseModule
);
if (!DBA::isResult($user)) {
Authentication::deleteSession();
- $a->redirect();
+ $a->internalRedirect();
}
// Make sure to refresh the last login time for the user if the user
@@ -262,7 +256,8 @@ class Login extends BaseModule
$_SESSION['last_login_date'] = DateTimeFormat::utcNow();
$login_refresh = true;
}
- Authentication::setAuthenticatedSessionForUser($user, false, false, $login_refresh);
+
+ Session::setAuthenticatedForUser($a, $user, false, false, $login_refresh);
}
}
}
@@ -270,22 +265,23 @@ class Login extends BaseModule
/**
* @brief Wrapper for adding a login box.
*
- * @param string $return_url The url relative to the base the user should be sent
- * back to after login completes
- * @param bool $register If $register == true provide a registration link.
- * This will most always depend on the value of config.register_policy.
- * @param array $hiddens optional
+ * @param string $return_path The path relative to the base the user should be sent
+ * back to after login completes
+ * @param bool $register If $register == true provide a registration link.
+ * This will most always depend on the value of config.register_policy.
+ * @param array $hiddens optional
*
* @return string Returns the complete html for inserting into the page
*
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @hooks 'login_hook' string $o
*/
- public static function form($return_url = null, $register = false, $hiddens = [])
+ public static function form($return_path = null, $register = false, $hiddens = [])
{
$a = self::getApp();
$o = '';
$reg = false;
- if ($register) {
+ if ($register && intval($a->getConfig()->get('config', 'register_policy')) !== Register::CLOSED) {
$reg = [
'title' => L10n::t('Create a New Account'),
'desc' => L10n::t('Register')
@@ -294,25 +290,25 @@ class Login extends BaseModule
$noid = Config::get('system', 'no_openid');
- if (is_null($return_url)) {
- $return_url = $a->query_string;
+ if (is_null($return_path)) {
+ $return_path = $a->query_string;
}
if (local_user()) {
- $tpl = get_markup_template('logout.tpl');
+ $tpl = Renderer::getMarkupTemplate('logout.tpl');
} else {
- $a->page['htmlhead'] .= replace_macros(
- get_markup_template('login_head.tpl'),
+ $a->page['htmlhead'] .= Renderer::replaceMacros(
+ Renderer::getMarkupTemplate('login_head.tpl'),
[
'$baseurl' => $a->getBaseURL(true)
]
);
- $tpl = get_markup_template('login.tpl');
- $_SESSION['return_url'] = $return_url;
+ $tpl = Renderer::getMarkupTemplate('login.tpl');
+ $_SESSION['return_path'] = $return_path;
}
- $o .= replace_macros(
+ $o .= Renderer::replaceMacros(
$tpl,
[
'$dest_url' => self::getApp()->getBaseURL(true) . '/login',
@@ -341,7 +337,7 @@ class Login extends BaseModule
]
);
- Addon::callHooks('login_hook', $o);
+ Hook::callAll('login_hook', $o);
return $o;
}