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

Issue #3616 Tweaked

Browse Source
This commit is contained in:
Cameron
2019-01-13 12:40:25 -08:00
parent 0df3fa4672
commit 96a4dc3683
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_admin/auth.php
View File

@@ -420,18 +420,13 @@ class auth
if (!$reason) if (!$reason)
{ {
if ($sql_auth->db_Select("user", "*", "user_loginname='{$authname}' AND user_admin='1' ")) if ($sql_auth->select("user", "*", "user_loginname='{$authname}' AND user_admin = 1 "))
{ {
$row = $sql_auth->db_Fetch(); $row = $sql_auth->fetch();
} }
elseif ($sql_auth->db_Select("user", "*", "user_name='{$authname}' AND user_admin='1' ")) elseif ($sql_auth->select("user", "*", "(user_name='{$authname}' OR user_email='{$authname}' ) AND user_admin=1 "))
{ {
$row = $sql_auth->db_Fetch(); $row = $sql_auth->fetch();
$authname = $row['user_loginname'];
}
elseif ($sql_auth->db_Select("user", "*", "user_email='{$authname}' AND user_admin='1' "))
{
$row = $sql_auth->db_Fetch();
$authname = $row['user_loginname']; $authname = $row['user_loginname'];
} }
else else

2
e107_handlers/form_handler.php
View File

@@ -6926,7 +6926,7 @@ class e_form
{ {
$required = $this->getRequiredString(); $required = $this->getRequiredString();
$required_class = ' class="required-label" title="'.LAN_REQUIRED.'"'; $required_class = ' class="required-label" title="'.LAN_REQUIRED.'"';
$required_help = true; $required_help = true;
if(!empty($att['validate'])) if(!empty($att['validate']))