PsychoticNinja/Stikked
1
0
Fork 0
mirror of https://github.com/claudehohl/Stikked.git synced 2025-04-26 13:01:08 -05:00
Code Issues Projects Releases Wiki Activity

Fix spamadmin undefined value

Browse Source 
Also changed != to !==, because 's' == 1. Yay PHP.
This commit is contained in:
Rob Thomas 2018-03-16 05:45:46 +00:00
parent 7128b94377
commit 71a42842f1
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,10 +22,25 @@ class Spamadmin extends CI_Controller
$user = $this->config->item('spamadmin_user'); $user = $this->config->item('spamadmin_user');
$pass = $this->config->item('spamadmin_pass'); $pass = $this->config->item('spamadmin_pass');
// basic auth for fastcgi // 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))); list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
}
}
if ($user == '' || $pass == '' || !isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER'] != $user || $_SERVER['PHP_AUTH_PW'] != $pass) // 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 === '' || $_SERVER['PHP_AUTH_USER'] !== $user || $_SERVER['PHP_AUTH_PW'] !== $pass)
{ {
header('WWW-Authenticate: Basic realm="Spamadmin"'); header('WWW-Authenticate: Basic realm="Spamadmin"');
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');