tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

allow the dev servers and test servers to be set via Director

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.1.0@41573 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-09-11 23:28:13 +00:00 committed by Sam Minnee
parent 18decb4461
commit 557296b52a
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
core/control/Director.php
View File

@ -343,6 +343,19 @@ class Director {
return Director::$siteMode;
}
static $dev_servers = array(
'localhost',
'127.0.0.1'
);
static function set_dev_servers($servers) {
Director::$dev_servers = $servers;
}
static $test_servers = array();
static function set_test_servers($servers) {
Director::$test_servers = $servers;
}
static protected $environment_type;
/**
@ -360,6 +373,7 @@ class Director {
static function isLive() {
return !(Director::isDev() || Director::isTest());
}
static function isDev() {
if(self::$environment_type) return self::$environment_type == 'dev';
@ -375,17 +389,30 @@ class Director {
if(isset($_SESSION['isDev']) && $_SESSION['isDev']) return true;
// Anything running on localhost is automatically dev
if($_SERVER['SERVER_ADDR'] == '0.0.0.0' || $_SERVER['REMOTE_ADDR'] == $_SERVER['SERVER_ADDR']) return true;
$testURL = ".$_SERVER[HTTP_HOST].";
return (strpos($testURL, '.test.') === false) && (strpos($testURL, '.dev.') !== false) ;
}
static function isTest() {
if(self::$environment_type) return self::$environment_type == 'test';
// Check if we are running on one of the development servers
if(in_array($_SERVER['SERVER_ADDR'], Director::$dev_servers)) {
return true;
}
$testURL = ".$_SERVER[HTTP_HOST].";
return (strpos($testURL, '.test.') !== false);
// Check if we are running on one of the test servers
if(in_array($_SERVER['SERVER_ADDR'], Director::$test_servers)) {
return true;
}
return false;
}
static function isTest() {
if(self::$environment_type) {
return self::$environment_type == 'test';
}
// Check if we are running on one of the test servers
if(in_array($_SERVER['SERVER_ADDR'], Director::$test_servers)) {
return true;
}
return false;
}
/**