maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- bugfixing 'servername guessing' on installation

Browse Source 
- fixed undefined constant SERVER_SOFTWARE
- bugfixed form-validation on installation (thx to kTitan)
This commit is contained in:
Michael Kaufmann (d00p)
2010-04-15 10:13:41 +00:00
parent afe431b72f
commit 07b2c26bec
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
install/install.php
View File

@@ -289,7 +289,7 @@ else
{ {
if(!empty($_SERVER['SERVER_NAME'])) if(!empty($_SERVER['SERVER_NAME']))
{ {
if(preg_match('/^[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$/', $_SERVER['SERVER_NAME']) === false) if(preg_match('/^[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$/', $_SERVER['SERVER_NAME']) == false)
{ {
$servername = $_SERVER['SERVER_NAME']; $servername = $_SERVER['SERVER_NAME'];
} }
@@ -422,12 +422,12 @@ if(!empty($_POST['webserver']))
else else
{ {
if(strtoupper(@php_sapi_name()) == "APACHE2HANDLER" if(strtoupper(@php_sapi_name()) == "APACHE2HANDLER"
|| stristr($_SERVER[SERVER_SOFTWARE], "apache/2")) || stristr($_SERVER['SERVER_SOFTWARE'], "apache/2"))
{ {
$webserver = 'apache2'; $webserver = 'apache2';
} }
elseif(substr(strtoupper(@php_sapi_name()), 0, 8) == "LIGHTTPD" elseif(substr(strtoupper(@php_sapi_name()), 0, 8) == "LIGHTTPD"
|| stristr($_SERVER[SERVER_SOFTWARE], "lighttpd")) || stristr($_SERVER['SERVER_SOFTWARE'], "lighttpd"))
{ {
$webserver = 'lighttpd'; $webserver = 'lighttpd';
} }
@@ -763,9 +763,11 @@ if(isset($_POST['installstep'])
else else
{ {
if(isset($_GET['check']) if((isset($_GET['check'])
&& $_GET['check'] == '1') && $_GET['check'] == '1')
{ || (isset($_POST['installstep'])
&& $_POST['installstep'] == '1')
) {
page_header(); page_header();
?> ?>