|
@@ -12,20 +12,20 @@ |
|
|
block discarded – undo |
|
12
|
12
|
require dirname(__FILE__) . '/config_local.php'; |
|
13
|
13
|
} |
|
14
|
14
|
|
|
15
|
|
-$remote_user = array_key_exists('PHP_AUTH_USER', $_SERVER) ? $_SERVER['PHP_AUTH_USER'] : ''; |
|
|
15
|
+$remote_user = array_key_exists('PHP_AUTH_USER', $_SERVER)?$_SERVER['PHP_AUTH_USER']:''; |
|
16
|
16
|
// Clean username, only allow a-z, A-Z, 0-9, -_ chars |
|
17
|
|
-$remote_user = preg_replace( '/[^a-zA-Z0-9_-]/', '', $remote_user); |
|
|
17
|
+$remote_user = preg_replace('/[^a-zA-Z0-9_-]/', '', $remote_user); |
|
18
|
18
|
$user_config_file = 'config_local.' . $remote_user . '.php'; |
|
19
|
19
|
if (file_exists(dirname(__FILE__) . '/' . $user_config_file) && (php_sapi_name() !== 'cli')) { |
|
20
|
20
|
require dirname(__FILE__) . '/' . $user_config_file; |
|
21
|
21
|
} |
|
22
|
22
|
|
|
23
|
|
-if(!is_null($config['cops_basic_authentication']) && |
|
|
23
|
+if (!is_null($config['cops_basic_authentication']) && |
|
24
|
24
|
is_array($config['cops_basic_authentication'])) |
|
25
|
25
|
{ |
|
26
|
26
|
if (!isset($_SERVER['PHP_AUTH_USER']) || |
|
27
|
27
|
(isset($_SERVER['PHP_AUTH_USER']) && |
|
28
|
|
- ($_SERVER['PHP_AUTH_USER']!=$config['cops_basic_authentication']['username'] || |
|
|
28
|
+ ($_SERVER['PHP_AUTH_USER'] != $config['cops_basic_authentication']['username'] || |
|
29
|
29
|
$_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password']))) |
|
30
|
30
|
{ |
|
31
|
31
|
header('WWW-Authenticate: Basic realm="COPS Authentication"'); |
Please login to merge, or discard this patch.