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

Refactoring URL class.

This commit is contained in:
Taylor Otwell 2011-07-25 13:19:39 -07:00
parent 3c216d897f
commit 7f465f307b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
system/url.php
View File

@ -9,9 +9,10 @@ class URL {
* *
* @param string $url * @param string $url
* @param bool $https * @param bool $https
* @param bool $asset
* @return string * @return string
*/ */
public static function to($url = '', $https = false) public static function to($url = '', $https = false, $asset = false)
{ {
if (filter_var($url, FILTER_VALIDATE_URL) !== false) if (filter_var($url, FILTER_VALIDATE_URL) !== false)
{ {
@ -20,10 +21,9 @@ public static function to($url = '', $https = false)
$base = Config::get('application.url').'/'.Config::get('application.index'); $base = Config::get('application.url').'/'.Config::get('application.index');
if ($https and strpos($base, 'http://') === 0) $base = ($asset) ? str_replace('/'.Config::get('application.index'), '', $base) : $base;
{
$base = 'https://'.substr($base, 7); $base = ($https and strpos($base, 'http://') === 0) ? 'https://'.substr($base, 7) : $base;
}
return $base.'/'.ltrim($url, '/'); return $base.'/'.ltrim($url, '/');
} }
@ -48,7 +48,7 @@ public static function to_secure($url = '')
*/ */
public static function to_asset($url) public static function to_asset($url)
{ {
return str_replace('/'.Config::get('application.index'), '', static::to($url, Request::is_secure())); return static::to($url, Request::is_secure(), true);
} }
/** /**