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

Merge pull request #730 from sparksp/develop-default-https 

Generated URLs default to use the current protocol (http or https)
This commit is contained in:
Taylor Otwell 2012-05-30 07:01:28 -07:00
parent cf604d4e79 6151886860
commit bc67c667a9
6 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/form.php
View File

@ -51,7 +51,7 @@ public static function macro($name, $macro)
* @param bool $https * @param bool $https
* @return string * @return string
*/ */
public static function open($action = null, $method = 'POST', $attributes = array(), $https = false) public static function open($action = null, $method = 'POST', $attributes = array(), $https = null)
{ {
$method = strtoupper($method); $method = strtoupper($method);
@ -129,7 +129,7 @@ public static function open_secure($action = null, $method = 'POST', $attributes
* @param bool $https * @param bool $https
* @return string * @return string
*/ */
public static function open_for_files($action = null, $method = 'POST', $attributes = array(), $https = false) public static function open_for_files($action = null, $method = 'POST', $attributes = array(), $https = null)
{ {
$attributes['enctype'] = 'multipart/form-data'; $attributes['enctype'] = 'multipart/form-data';

4
laravel/helpers.php
View File

@ -323,7 +323,7 @@ function head($array)
* @param bool $https * @param bool $https
* @return string * @return string
*/ */
function url($url = '', $https = false) function url($url = '', $https = null)
{ {
return Laravel\URL::to($url, $https); return Laravel\URL::to($url, $https);
} }
@ -335,7 +335,7 @@ function url($url = '', $https = false)
* @param bool $https * @param bool $https
* @return string * @return string
*/ */
function asset($url, $https = false) function asset($url, $https = null)
{ {
return Laravel\URL::to_asset($url, $https); return Laravel\URL::to_asset($url, $https);
} }

2
laravel/html.php
View File

@ -137,7 +137,7 @@ public static function span($value, $attributes = array())
* @param bool $https * @param bool $https
* @return string * @return string
*/ */
public static function link($url, $title, $attributes = array(), $https = false) public static function link($url, $title, $attributes = array(), $https = null)
{ {
$url = URL::to($url, $https); $url = URL::to($url, $https);

4
laravel/redirect.php
View File

@ -9,7 +9,7 @@ class Redirect extends Response {
* @param bool $secure * @param bool $secure
* @return Redirect * @return Redirect
*/ */
public static function home($status = 302, $https = false) public static function home($status = 302, $https = null)
{ {
return static::to(URL::home($https), $status); return static::to(URL::home($https), $status);
} }
@ -41,7 +41,7 @@ public static function back($status = 302)
* @param bool $https * @param bool $https
* @return Redirect * @return Redirect
*/ */
public static function to($url, $status = 302, $https = false) public static function to($url, $status = 302, $https = null)
{ {
return static::make('', $status)->header('Location', URL::to($url, $https)); return static::make('', $status)->header('Location', URL::to($url, $https));
} }

2
laravel/routing/router.php
View File

@ -297,7 +297,7 @@ public static function secure_controller($controllers, $defaults = 'index')
* @param bool $https * @param bool $https
* @return void * @return void
*/ */
public static function controller($controllers, $defaults = 'index', $https = false) public static function controller($controllers, $defaults = 'index', $https = null)
{ {
foreach ((array) $controllers as $identifier) foreach ((array) $controllers as $identifier)
{ {

17
laravel/url.php
View File

@ -35,7 +35,7 @@ public static function current()
* @param bool $https * @param bool $https
* @return string * @return string
*/ */
public static function home($https = false) public static function home($https = null)
{ {
$route = Router::find('home'); $route = Router::find('home');
@ -91,7 +91,7 @@ public static function base()
* @param bool $https * @param bool $https
* @return string * @return string
*/ */
public static function to($url = '', $https = false) public static function to($url = '', $https = null)
{ {
// If the given URL is already valid or begins with a hash, we'll just return // If the given URL is already valid or begins with a hash, we'll just return
// the URL unchanged since it is already well formed. Otherwise we will add // the URL unchanged since it is already well formed. Otherwise we will add
@ -101,6 +101,10 @@ public static function to($url = '', $https = false)
return $url; return $url;
} }
// Unless $https is specified (true or false) then maintain the current request
// security for any new links generated. So https for all secure links.
if (is_null($https)) $https = Request::secure();
$root = static::base().'/'.Config::get('application.index'); $root = static::base().'/'.Config::get('application.index');
// Since SSL is not often used while developing the application, we allow the // Since SSL is not often used while developing the application, we allow the
@ -174,7 +178,7 @@ public static function to_action($action, $parameters = array())
*/ */
protected static function explicit($route, $action, $parameters) protected static function explicit($route, $action, $parameters)
{ {
$https = array_get(current($route), 'https', false); $https = array_get(current($route), 'https', null);
return static::to(static::transpose(key($route), $parameters), $https); return static::to(static::transpose(key($route), $parameters), $https);
} }
@ -197,8 +201,6 @@ protected static function convention($action, $parameters)
// URIs that begin with that string and no others. // URIs that begin with that string and no others.
$root = $bundle['handles'] ?: ''; $root = $bundle['handles'] ?: '';
$https = false;
$parameters = implode('/', $parameters); $parameters = implode('/', $parameters);
// We'll replace both dots and @ signs in the URI since both are used // We'll replace both dots and @ signs in the URI since both are used
@ -230,8 +232,6 @@ public static function to_asset($url, $https = null)
return rtrim($root, '/').'/'.ltrim($url, '/'); return rtrim($root, '/').'/'.ltrim($url, '/');
} }
if (is_null($https)) $https = Request::secure();
$url = static::to($url, $https); $url = static::to($url, $https);
// Since assets are not served by Laravel, we do not need to come through // Since assets are not served by Laravel, we do not need to come through
@ -258,7 +258,6 @@ public static function to_asset($url, $https = null)
* *
* @param string $name * @param string $name
* @param array $parameters * @param array $parameters
* @param bool $https
* @return string * @return string
*/ */
public static function to_route($name, $parameters = array()) public static function to_route($name, $parameters = array())
@ -271,7 +270,7 @@ public static function to_route($name, $parameters = array())
// To determine whether the URL should be HTTPS or not, we look for the "https" // To determine whether the URL should be HTTPS or not, we look for the "https"
// value on the route action array. The route has control over whether the URL // value on the route action array. The route has control over whether the URL
// should be generated with an HTTPS protocol string or just HTTP. // should be generated with an HTTPS protocol string or just HTTP.
$https = array_get(current($route), 'https', false); $https = array_get(current($route), 'https', null);
$uri = trim(static::transpose(key($route), $parameters), '/'); $uri = trim(static::transpose(key($route), $parameters), '/');