Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaning up classes.

This commit is contained in:
Taylor Otwell 2012-02-23 16:18:08 -06:00
parent fadadd0f62
commit 160e839e81
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/cookie.php
View File

@ -33,7 +33,7 @@ public static function send()
// All cookies are stored in the "jar" when set and not sent directly to the // All cookies are stored in the "jar" when set and not sent directly to the
// browser. This simply makes testing all of the cookie stuff very easy // browser. This simply makes testing all of the cookie stuff very easy
// since the jar can be inspected by the tests. // since the jar can be inspected by the application's tests.
foreach (static::$jar as $cookie) foreach (static::$jar as $cookie)
{ {
static::set($cookie); static::set($cookie);

38
laravel/url.php
View File

@ -70,24 +70,36 @@ public static function base()
} }
elseif (isset($_SERVER['HTTP_HOST'])) elseif (isset($_SERVER['HTTP_HOST']))
{ {
$protocol = (Request::secure()) ? 'https://' : 'http://'; $base = static::guess();
// Basically, by removing the basename, we are removing everything after the
// and including the front controller from the request URI. Leaving us with
// the path in which the framework is installed.
$script = $_SERVER['SCRIPT_NAME'];
$path = str_replace(basename($script), '', $script);
// Now that we have the base URL, all we need to do is attach the protocol
// and the HTTP_HOST to build the full URL for the application. We also
// trim off trailing slashes to clean the URL.
$base = rtrim($protocol.$_SERVER['HTTP_HOST'].$path, '/');
} }
return static::$base = $base; return static::$base = $base;
} }
/**
* Guess the application URL based on the $_SERVER variables.
*
* @return string
*/
protected static function guess()
{
$protocol = (Request::secure()) ? 'https://' : 'http://';
// Basically, by removing the basename, we are removing everything after
// the and including the front controller from the URI. Leaving us with
// the installation path for the application.
$script = $_SERVER['SCRIPT_NAME'];
$path = str_replace(basename($script), '', $script);
// Now that we have the URL, all we need to do is attach the protocol
// protocol and HTTP_HOST to build the URL for the application, and
// we also trim off trailing slashes for cleanliness.
$uri = $protocol.$_SERVER['HTTP_HOST'].$path;
return rtrim($uri, '/');
}
/** /**
* Generate an application URL. * Generate an application URL.
* *