mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Issue #4356 Admin login issue.

Browse Source
This commit is contained in:
Cameron
2021-01-27 16:19:37 -08:00
parent 4098a03698
commit 94f3162d94
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_admin/auth.php
View File

@@ -137,17 +137,20 @@ else
} }
} }
if(!$result = e107::getUser()->login($_POST['authname'], $_POST['authpass'], false, varset($_POST['hashchallenge']), true)) if(e107::getUser()->login($_POST['authname'], $_POST['authpass'], false, varset($_POST['hashchallenge']), true)!==false)
{ {
e107::coreLan('log_messages', true); e107::getRedirect()->go('admin');
e107::getLog()->addEvent(4, __FILE__."|".__FUNCTION__."@".__LINE__, "LOGIN", LAN_ROLL_LOG_11, "U: ".$tp->toDB($_POST['authname']), FALSE, LOG_TO_ROLLING); // var_dump($_COOKIE);
echo "<script type='text/javascript'>document.location.href='../index.php'</script>\n"; }
else
{
e107::coreLan('log_messages', true);
e107::getLog()->addEvent(4, __FILE__."|".__FUNCTION__."@".__LINE__, "LOGIN", LAN_ROLL_LOG_11, "U: ".$tp->toDB($_POST['authname']), FALSE, LOG_TO_ROLLING);
echo "<script type='text/javascript'>document.location.href='../index.php'</script>\n";
e107::getRedirect()->redirect('admin.php?failed');
e107::getRedirect()->redirect('admin.php?failed');
exit;
} }
e107::getRedirect()->go('admin');
exit; exit;
} }

2
e107_handlers/user_handler.php
View File

@@ -712,7 +712,7 @@ class UserHandler
} }
$cookieval = $lode['user_id'].'.'.md5($lode['user_password']); // (Use extra md5 on cookie value to obscure hashed value for password) $cookieval = $lode['user_id'].'.'.md5($lode['user_password']); // (Use extra md5 on cookie value to obscure hashed value for password)
if (e107::getPref('user_tracking') == 'session'|| e_ADMIN_AREA) if (e107::getPref('user_tracking','session') == 'session')
{ {
$_SESSION[e107::getPref('cookie_name')] = $cookieval; $_SESSION[e107::getPref('cookie_name')] = $cookieval;
} }

11
e107_handlers/user_model.php
View File

@@ -1779,14 +1779,21 @@ class e_user extends e_user_model
*/ */
final public function login($uname, $upass_plain, $uauto = false, $uchallange = false, $noredirect = true) final public function login($uname, $upass_plain, $uauto = false, $uchallange = false, $noredirect = true)
{ {
if($this->isUser()) return false; if($this->isUser())
{
return false;
}
$userlogin = new userlogin(); $userlogin = new userlogin();
$loginSuccess = $userlogin->login($uname, $upass_plain, $uauto, $uchallange, $noredirect); $loginSuccess = $userlogin->login($uname, $upass_plain, $uauto, $uchallange, $noredirect);
$userdata = $userlogin->getUserData(); $userdata = $userlogin->getUserData();
$this->setSessionData(true)->setData($userdata); $this->setSessionData(true)->setData($userdata);
if ($loginSuccess === false) return false;
if ($loginSuccess === false)
{
return false;
}
e107::getEvent()->trigger('user_login', $userdata); e107::getEvent()->trigger('user_login', $userdata);