tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 15:05:33 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Removed double up of similar logic in InstallRequirements (from r108569)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112410 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sminnee 2010-10-15 01:17:53 +00:00
parent f9d29bd9d6
commit 83567dccdd
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
install.php
View File

@ -305,17 +305,15 @@ class InstallRequirements {
/**
* Find the webserver software running on the PHP host.
* @return string Server software ("Unknown" if not able to find)
* @return string|boolean Server software or boolean FALSE
*/
function findWebserver() {
// Try finding from SERVER_SIGNATURE or SERVER_SOFTWARE
$webserver = @$_SERVER['SERVER_SIGNATURE'];
if(!$webserver) $webserver = @$_SERVER['SERVER_SOFTWARE'];
// If we still can't find it, this is a completely unknown server
if(!$webserver) $webserver = 'Unknown';
return strip_tags(trim($webserver));
if($webserver) return strip_tags(trim($webserver));
else return false;
}
/**
@ -793,12 +791,10 @@ class InstallRequirements {
$this->error($testDetails);
}
}
function isRunningWebServer($testDetails) {
$this->testing($testDetails);
if(function_exists('apache_get_modules') || stristr(@$_SERVER['SERVER_SIGNATURE'], 'Apache')) {
return true;
} elseif(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS/7') !== false) {
if($testDetails[3]) {
return true;
} else {
$this->warning($testDetails);
@ -806,7 +802,6 @@ class InstallRequirements {
}
}
// Must be PHP4 compatible
var $baseDir;
function getBaseDir() {