PsychoticNinja/Stikked
1
0
Fork 0
mirror of https://github.com/claudehohl/Stikked.git synced 2025-04-25 04:21:17 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #484 from xrobau/bugfix/spamadmin-undefined

Browse Source 
Fix spamadmin undefined value
This commit is contained in:
Claude 2018-09-29 17:14:20 +02:00 committed by GitHub
commit 5e433758d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/application/controllers/Spamadmin.php
View File

@ -22,10 +22,25 @@ class Spamadmin extends CI_Controller
$user = $this->config->item('spamadmin_user');
$pass = $this->config->item('spamadmin_pass');
// basic auth for fastcgi
list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
// FastCGI doesn't provide PHP_AUTH_USER and PHP_AUTH_PW, apparently?
if (empty($_SERVER['PHP_AUTH_USER']) && empty($_SERVER['PHP_AUTH_PW'])) {
if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
}
}
// If they're not set, set them to blank. The null coalesce operator would be handy here, but
// that's PHP 7.0 and higher...
if (empty($_SERVER['PHP_AUTH_USER']))
{
$_SERVER['PHP_AUTH_USER'] = "";
}
if (empty($_SERVER['PHP_AUTH_PW']))
{
$_SERVER['PHP_AUTH_PW'] = "";
}
if ($user == '' || $pass == '' || !isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER'] != $user || $_SERVER['PHP_AUTH_PW'] != $pass)
if ($user === '' || $pass === '' || $_SERVER['PHP_AUTH_USER'] !== $user || $_SERVER['PHP_AUTH_PW'] !== $pass)
{
header('WWW-Authenticate: Basic realm="Spamadmin"');
header('HTTP/1.0 401 Unauthorized');