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

Trim comment bloat from URL class.

This commit is contained in:
Taylor Otwell 2011-07-07 07:21:15 -07:00
parent a2406c0174
commit 2f999397e3
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
system/url.php
View File

@ -12,9 +12,6 @@ class URL {
*/ */
public static function to($url = '', $https = false, $asset = false) public static function to($url = '', $https = false, $asset = false)
{ {
// ----------------------------------------------------
// Return the URL unchanged if it is already formed.
// ----------------------------------------------------
if (strpos($url, '://') !== false) if (strpos($url, '://') !== false)
{ {
return $url; return $url;
@ -22,19 +19,13 @@ public static function to($url = '', $https = false, $asset = false)
$base = Config::get('application.url'); $base = Config::get('application.url');
// ---------------------------------------------------- // Assets live in the public directory, so we only want to append
// Assets live in the public directory, so we don't // the index file if the URL is to an asset.
// want to append the index file to the URL if the
// URL is to an asset.
// ----------------------------------------------------
if ( ! $asset) if ( ! $asset)
{ {
$base .= '/'.Config::get('application.index'); $base .= '/'.Config::get('application.index');
} }
// ----------------------------------------------------
// Does the URL need an HTTPS protocol?
// ----------------------------------------------------
if (strpos($base, 'http://') === 0 and $https) if (strpos($base, 'http://') === 0 and $https)
{ {
$base = 'https://'.substr($base, 7); $base = 'https://'.substr($base, 7);
@ -78,18 +69,13 @@ public static function to_route($name, $parameters = array(), $https = false)
{ {
if ( ! is_null($route = Route\Finder::find($name))) if ( ! is_null($route = Route\Finder::find($name)))
{ {
// ----------------------------------------------------
// Get the first URI assigned to the route. // Get the first URI assigned to the route.
// ----------------------------------------------------
$uris = explode(', ', key($route)); $uris = explode(', ', key($route));
$uri = substr($uris[0], strpos($uris[0], '/')); $uri = substr($uris[0], strpos($uris[0], '/'));
// ---------------------------------------------------- // Replace any parameters in the URI. This allows the dynamic creation of URLs
// Replace any parameters in the URI. This allows // that contain parameter wildcards.
// the dynamic creation of URLs that contain parameter
// wildcards.
// ----------------------------------------------------
foreach ($parameters as $parameter) foreach ($parameters as $parameter)
{ {
$uri = preg_replace('/\(.+?\)/', $parameter, $uri, 1); $uri = preg_replace('/\(.+?\)/', $parameter, $uri, 1);
@ -122,16 +108,10 @@ public static function to_secure_route($name, $parameters = array())
*/ */
public static function slug($title, $separator = '-') public static function slug($title, $separator = '-')
{ {
// ---------------------------------------------------- // Remove all characters that are not the separator, letters, numbers, or whitespace.
// Remove all characters that are not the separator,
// letters, numbers, or whitespace.
// ----------------------------------------------------
$title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', Str::lower($title)); $title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', Str::lower($title));
// ---------------------------------------------------- // Replace all separator characters and whitespace by a single separator
// Replace all separator characters and whitespace by
// a single separator
// ----------------------------------------------------
$title = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title); $title = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
return trim($title, $separator); return trim($title, $separator);
@ -144,17 +124,13 @@ public static function __callStatic($method, $parameters)
{ {
$parameters = (isset($parameters[0])) ? $parameters[0] : array(); $parameters = (isset($parameters[0])) ? $parameters[0] : array();
// ----------------------------------------------------
// Dynamically create a secure route URL. // Dynamically create a secure route URL.
// ----------------------------------------------------
if (strpos($method, 'to_secure_') === 0) if (strpos($method, 'to_secure_') === 0)
{ {
return static::to_route(substr($method, 10), $parameters, true); return static::to_route(substr($method, 10), $parameters, true);
} }
// ----------------------------------------------------
// Dynamically create a route URL. // Dynamically create a route URL.
// ----------------------------------------------------
if (strpos($method, 'to_') === 0) if (strpos($method, 'to_') === 0)
{ {
return static::to_route(substr($method, 3), $parameters); return static::to_route(substr($method, 3), $parameters);