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

ENHANCEMENT #2875: Make CLI execution more robust when FILE_TO_URL_MAPPING not set

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63526 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-10-02 09:48:56 +00:00
parent c57f8c2793
commit 61ab10a8d8
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/control/Director.php
View File

@ -300,7 +300,14 @@ class Director {
if(isset($_SERVER['HTTP_HOST'])) { if(isset($_SERVER['HTTP_HOST'])) {
return "http$s://" . $_SERVER['HTTP_HOST']; return "http$s://" . $_SERVER['HTTP_HOST'];
} else { } else {
user_error("Director::protocolAndHost() lacks sufficient information - HTTP_HOST not set.", E_USER_WARNING); global $_FILE_TO_URL_MAPPING;
if(Director::is_cli() && isset($_FILE_TO_URL_MAPPING)) $errorSuggestion = ' You probably want to define '.
'an entry in $_FILE_TO_URL_MAPPING that covers "' . Director::baseFolder() . '"';
else if(Director::is_cli()) $errorSuggestion = ' You probably want to define $_FILE_TO_URL_MAPPING in '.
'your _ss_environment.php as instructed on the "sake" page of the doc.silverstripe.com wiki';
else $errorSuggestion = "";
user_error("Director::protocolAndHost() lacks sufficient information - HTTP_HOST not set.$errorSuggestion", E_USER_WARNING);
return false; return false;
} }
@ -420,16 +427,20 @@ class Director {
* This is useful when turning a URL into a filesystem reference, or vice versa. * This is useful when turning a URL into a filesystem reference, or vice versa.
*/ */
static function makeRelative($url) { static function makeRelative($url) {
$base1 = self::absoluteBaseURL();
$base2 = self::baseFolder();
$base3 = self::baseURL();
// Allow for the accidental inclusion of a // in the URL // Allow for the accidental inclusion of a // in the URL
$url = ereg_replace('([^:])//','\\1/',$url); $url = ereg_replace('([^:])//','\\1/',$url);
if(substr($url,0,strlen($base1)) == $base1) return substr($url,strlen($base1)); // Only bother comparing the URL to the absolute version if $url looks like a URL.
else if(substr($url,0,strlen($base2)) == $base2) return substr($url,strlen($base2)); if(preg_match('/^http[^:]+:\/\//',$url)) {
else if(substr($url,0,strlen($base3)) == $base3) return substr($url,strlen($base3)); $base1 = self::absoluteBaseURL();
if(substr($url,0,strlen($base1)) == $base1) return substr($url,strlen($base1));
}
$base2 = self::baseFolder();
if(substr($url,0,strlen($base2)) == $base2) return substr($url,strlen($base2));
$base3 = self::baseURL();
if(substr($url,0,strlen($base3)) == $base3) return substr($url,strlen($base3));
return $url; return $url;
} }