blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-28 09:29:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved the code in fhcauth_helper

Browse Source
This commit is contained in:
Paolo
2018-05-09 12:02:31 +02:00
parent aa278e89f0
commit 8c00fb7be5
1 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/helpers/fhcauth_helper.php
+3 -36
View File
@@ -60,41 +60,8 @@ if ( ! function_exists('auth'))
*/
function getAuthUID()
{
$uid = false;
$ci =& get_instance(); // get CI instance
$ci->load->library('session'); // load session library
$ci->load->library('AuthLib'); // load session library
// If uid hasn't never been set and is present in CI session
if ($uid === false && isset($ci->session->uid))
{
$uid = $ci->session->uid;
}
else
{
// Try to check if uid is stored elsewhere
if (isset($_SERVER['PHP_AUTH_USER']))
{
$uid = $_SERVER['PHP_AUTH_USER'];
}
else if (isset($_SESSION['uid']))
{
$uid = $_SESSION['uid'];
}
// Workaround for a strange behavior
// Sometimes $_SERVER['PHP_AUTH_USER'] is not set here, but is set when
// used by authentication object
else
{
$auth = new authentication();
$uid = $auth->getUser();
}
}
// If uid is set and uid in CI session is not set
if ($uid !== false && !isset($ci->session->uid))
{
$ci->session->uid = $uid;
}
return $uid;
}
return $ci->authlib->getUser();
}