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 Simplified discovery of webserver during install

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108568 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sharvey 2010-07-27 05:05:27 +00:00 committed by Sam Minnee
parent e5ce99f4ad
commit 48a301266a
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
install.php
View File

@ -277,40 +277,34 @@ class InstallRequirements {
* @return boolean
*/
function isIIS() {
if(isset($_SERVER['SERVER_SOFTWARE'])) {
if(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS/7') !== false) {
if(strpos($this->findWebserver(), 'IIS/7') !== false) {
return true;
}
}
} else {
return false;
}
}
function isApache() {
$signature = !empty($_SERVER['SERVER_SIGNATURE'])
? $_SERVER['SERVER_SIGNATURE']
: @$_SERVER['SERVER_SOFTWARE'];
$signature = strip_tags(trim($signature));
if($signature && strpos($signature, 'Apache') !== false) {
if(strpos($this->findWebserver(), 'Apache') !== false) {
return true;
} else {
return false;
}
}
/**
* Find the webserver software running on the PHP host.
* @return string Server software ("Unknown" if not able to find)
*/
function findWebserver() {
$webserver = strip_tags(trim(@$_SERVER['SERVER_SIGNATURE']));
if(!$webserver) {
if(isset($_SERVER['SERVER_SOFTWARE'])) {
if(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS/7') !== false ||
strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
$webserver = $_SERVER['SERVER_SOFTWARE'];
}
} else {
$webserver = "I can't tell what webserver you are running";
}
}
return $webserver;
// 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));
}
/**