nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-23 02:14:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove chance of unset variable warning.

Browse Source
This commit is contained in:
Andrew McMillan 2012-03-16 12:57:56 +13:00
parent 6c5f5157d6
commit 863b4ac87f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inc/HTTPAuthSession.php
View File

@ -73,9 +73,9 @@ class HTTPAuthSession {
global $c; global $c;
if ( $auth_header == "" ) { if ( $auth_header == "" ) {
$auth_realm = $c->system_name; $auth_realm = $c->system_name;
if ( isset($c->per_principal_realm) && $c->per_principal_realm ) { if ( isset($c->per_principal_realm) && $c->per_principal_realm && !empty($_SERVER['PATH_INFO']) ) {
$principal_name = preg_replace( '{^/(.*?)/.*$}', '$1', $_SERVER["PATH_INFO"]); $principal_name = preg_replace( '{^/(.*?)/.*$}', '$1', $_SERVER['PATH_INFO']);
if ( $principal_name != $_SERVER["PATH_INFO"] ) { if ( $principal_name != $_SERVER['PATH_INFO'] ) {
$auth_realm .= ' - ' . $principal_name; $auth_realm .= ' - ' . $principal_name;
} }
} }
@ -101,9 +101,9 @@ class HTTPAuthSession {
/** /**
* Get HTTP Auth to work with PHP+FastCGI * Get HTTP Auth to work with PHP+FastCGI
*/ */
if ( !isset($_SERVER["AUTHORIZATION"]) && isset($_SERVER["HTTP_AUTHORIZATION"]) && !empty($_SERVER["HTTP_AUTHORIZATION"])) if ( !isset($_SERVER['AUTHORIZATION']) && isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION']))
$_SERVER["AUTHORIZATION"] = $_SERVER["HTTP_AUTHORIZATION"]; $_SERVER['AUTHORIZATION'] = $_SERVER['HTTP_AUTHORIZATION'];
if (isset($_SERVER["AUTHORIZATION"]) && !empty($_SERVER["AUTHORIZATION"])) { if (isset($_SERVER['AUTHORIZATION']) && !empty($_SERVER['AUTHORIZATION'])) {
list ($type, $cred) = split (" ", $_SERVER['AUTHORIZATION']); list ($type, $cred) = split (" ", $_SERVER['AUTHORIZATION']);
if ($type == 'Basic') { if ($type == 'Basic') {
list ($user, $pass) = explode (":", base64_decode($cred)); list ($user, $pass) = explode (":", base64_decode($cred));
@ -112,7 +112,7 @@ class HTTPAuthSession {
} }
} }
else if ( isset($c->authenticate_hook['server_auth_type']) else if ( isset($c->authenticate_hook['server_auth_type'])
&& isset($_SERVER["REMOTE_USER"]) && !empty($_SERVER["REMOTE_USER"])) { && isset($_SERVER['REMOTE_USER']) && !empty($_SERVER['REMOTE_USER'])) {
if ( ( is_array($c->authenticate_hook['server_auth_type']) if ( ( is_array($c->authenticate_hook['server_auth_type'])
&& in_array($_SERVER['AUTH_TYPE'], $c->authenticate_hook['server_auth_type']) ) && in_array($_SERVER['AUTH_TYPE'], $c->authenticate_hook['server_auth_type']) )
|| ||