X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FLogin.php;h=b0897f2d76b841166fc5b328f4d17254b6276916;hb=3cd654e76f32dbcf505aef6a60a3e42d318f8b61;hp=deb6afcfbc03e0dae8624f88ffe53a4918e03fb4;hpb=ac19a9cddc9e9cee323bb46123d95cfc02ffef0e;p=friendica.git
diff --git a/src/Module/Login.php b/src/Module/Login.php
index deb6afcfbc..b0897f2d76 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -6,19 +6,20 @@ 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\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
*
@@ -30,27 +31,27 @@ class Login extends BaseModule
{
$a = self::getApp();
- 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']);
}
if (local_user()) {
- goaway(self::getApp()->getBaseURL());
+ $a->internalRedirect();
}
- return self::form($_SESSION['return_url'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
+ return self::form(defaults($_SESSION, 'return_path', null), intval(Config::get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED);
}
public static function post()
{
- $return_url = $_SESSION['return_url'];
+ $return_path = defaults($_SESSION, 'return_path', '');
session_unset();
- $_SESSION['return_url'] = $return_url;
-
+ $_SESSION['return_path'] = $return_path;
+
// OpenId Login
if (
empty($_POST['password'])
@@ -64,7 +65,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']),
@@ -78,27 +79,29 @@ 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)
{
$noid = Config::get('system', 'no_openid');
+ $a = self::getApp();
+
// 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);
- goaway(self::getApp()->getBaseURL());
+ $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';
- goaway($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());
}
@@ -110,6 +113,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)
{
@@ -122,12 +126,14 @@ class Login extends BaseModule
'user_record' => null
];
+ $a = self::getApp();
+
/*
* An addon indicates successful login by setting 'authenticated' to non-zero value and returning a user record
* 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']) {
@@ -142,9 +148,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);
- goaway('/');
+ $a->internalRedirect();
}
if (!$remember) {
@@ -156,14 +162,14 @@ class Login extends BaseModule
$_SESSION['last_login_date'] = DateTimeFormat::utcNow();
Authentication::setAuthenticatedSessionForUser($record, true, true);
- if (x($_SESSION, 'return_url')) {
- $return_url = $_SESSION['return_url'];
- unset($_SESSION['return_url']);
+ if (!empty($_SESSION['return_path'])) {
+ $return_path = $_SESSION['return_path'];
+ unset($_SESSION['return_path']);
} else {
- $return_url = '';
+ $return_path = '';
}
- goaway($return_url);
+ $a->internalRedirect($return_path);
}
/**
@@ -173,6 +179,8 @@ class Login extends BaseModule
*/
public static function sessionAuth()
{
+ $a = self::getApp();
+
// When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.
if (isset($_COOKIE["Friendica"])) {
$data = json_decode($_COOKIE["Friendica"]);
@@ -189,9 +197,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();
- goaway(self::getApp()->getBaseURL());
+ $a->internalRedirect();
}
// Renew the cookie
@@ -212,23 +220,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();
- goaway(self::getApp()->getBaseURL());
+ $a->internalRedirect();
}
$user = DBA::selectFirst('user', [],
@@ -242,7 +250,7 @@ class Login extends BaseModule
);
if (!DBA::isResult($user)) {
Authentication::deleteSession();
- goaway(self::getApp()->getBaseURL());
+ $a->internalRedirect();
}
// Make sure to refresh the last login time for the user if the user
@@ -263,17 +271,18 @@ 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 = '';
@@ -287,25 +296,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',
@@ -334,7 +343,7 @@ class Login extends BaseModule
]
);
- Addon::callHooks('login_hook', $o);
+ Hook::callAll('login_hook', $o);
return $o;
}