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

Merge pull request #2236 from chillu/pulls/isdev-infinite-loop

Browse Source 
FIX Avoid infinite loops on ?isDev=1 and Deprecation class
This commit is contained in:
Sean Harvey 2013-10-31 15:59:31 -07:00
commit d8f29fcc04
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
control/Director.php
View File

@ -884,21 +884,25 @@ class Director implements TemplateGlobalProvider {
Director::$test_servers = $servers; Director::$test_servers = $servers;
} }
/* /**
* This function will return true if the site is in a live environment. * This function will return true if the site is in a live environment.
* For information about environment types, see {@link Director::set_environment_type()}. * For information about environment types, see {@link Director::set_environment_type()}.
*
* @param $skipDatabase Skips database checks for current login permissions if set to TRUE,
* which is useful for checks happening before the database is functional.
*/ */
public static function isLive() { public static function isLive($skipDatabase = false) {
return !(Director::isDev() || Director::isTest()); return !(Director::isDev($skipDatabase) || Director::isTest($skipDatabase));
} }
/** /**
* This function will return true if the site is in a development environment. * This function will return true if the site is in a development environment.
* For information about environment types, see {@link Director::set_environment_type()}. * For information about environment types, see {@link Director::set_environment_type()}.
* @param $dontTouchDB If true, the database checks are not performed, which allows certain DB checks *
* to not fail before the DB is ready. If false (default), DB checks are included. * @param $skipDatabase Skips database checks for current login permissions if set to TRUE,
* which is useful for checks happening before the database is functional.
*/ */
public static function isDev($dontTouchDB = false) { public static function isDev($skipDatabase = false) {
// This variable is used to supress repetitions of the isDev security message below. // This variable is used to supress repetitions of the isDev security message below.
static $firstTimeCheckingGetVar = true; static $firstTimeCheckingGetVar = true;
@ -908,7 +912,7 @@ class Director implements TemplateGlobalProvider {
if(self::$environment_type && self::$environment_type == 'dev') $result = true; if(self::$environment_type && self::$environment_type == 'dev') $result = true;
// Use ?isDev=1 to get development access on the live server // Use ?isDev=1 to get development access on the live server
if(!$dontTouchDB && !$result && isset($_GET['isDev'])) { if(!$skipDatabase && !$result && isset($_GET['isDev'])) {
if(Security::database_is_ready()) { if(Security::database_is_ready()) {
if($firstTimeCheckingGetVar && !Permission::check('ADMIN')){ if($firstTimeCheckingGetVar && !Permission::check('ADMIN')){
BasicAuth::requireLogin("SilverStripe developer access. Use your CMS login", "ADMIN"); BasicAuth::requireLogin("SilverStripe developer access. Use your CMS login", "ADMIN");
@ -933,10 +937,13 @@ class Director implements TemplateGlobalProvider {
/** /**
* This function will return true if the site is in a test environment. * This function will return true if the site is in a test environment.
* For information about environment types, see {@link Director::set_environment_type()}. * For information about environment types, see {@link Director::set_environment_type()}.
*
* @param $skipDatabase Skips database checks for current login permissions if set to TRUE,
* which is useful for checks happening before the database is functional.
*/ */
public static function isTest() { public static function isTest($skipDatabase = false) {
// Use ?isTest=1 to get test access on the live server, or explicitly set your environment // Use ?isTest=1 to get test access on the live server, or explicitly set your environment
if(isset($_GET['isTest'])) { if(!$skipDatabase && isset($_GET['isTest'])) {
if(Security::database_is_ready()) { if(Security::database_is_ready()) {
BasicAuth::requireLogin("SilverStripe developer access. Use your CMS login", "ADMIN"); BasicAuth::requireLogin("SilverStripe developer access. Use your CMS login", "ADMIN");
$_SESSION['isTest'] = $_GET['isTest']; $_SESSION['isTest'] = $_GET['isTest'];
@ -944,7 +951,10 @@ class Director implements TemplateGlobalProvider {
return true; return true;
} }
} }
if(self::isDev()) return false;
if(self::isDev($skipDatabase)) {
return false;
}
if(self::$environment_type) { if(self::$environment_type) {
return self::$environment_type == 'test'; return self::$environment_type == 'test';

2
dev/Deprecation.php
View File

@ -129,7 +129,7 @@ class Deprecation {
*/ */
public static function notice($atVersion, $string = '', $scope = Deprecation::SCOPE_METHOD) { public static function notice($atVersion, $string = '', $scope = Deprecation::SCOPE_METHOD) {
// Never raise deprecation notices in a live environment // Never raise deprecation notices in a live environment
if(Director::isLive()) return; if(Director::isLive(true)) return;
// If you pass #.#, assume #.#.0 // If you pass #.#, assume #.#.0
if(preg_match('/^[0-9]+\.[0-9]+$/', $atVersion)) $atVersion .= '.0'; if(preg_match('/^[0-9]+\.[0-9]+$/', $atVersion)) $atVersion .= '.0';