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

cleaning up various codes.

This commit is contained in:
Taylor Otwell 2012-02-06 19:59:07 -06:00
parent 78dc4529f1
commit 007863a6fa
5 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
laravel/auth.php
View File

@ -134,9 +134,6 @@ public static function attempt($username, $password = null, $remember = false)
// or authentication provider they wish. // or authentication provider they wish.
$user = call_user_func($config['attempt'], $username, $password); $user = call_user_func($config['attempt'], $username, $password);
// If the user credentials were authenticated by the closure, we will
// log the user into the application, which will store their user ID
// in the session for subsequent requests.
if (is_null($user)) return false; if (is_null($user)) return false;
static::login($user, $remember); static::login($user, $remember);

4
laravel/core.php
View File

@ -64,4 +64,6 @@
* be the default timezone used by all date functions through * be the default timezone used by all date functions through
* throughout the entire application. * throughout the entire application.
*/ */
date_default_timezone_set(Config::get('application.timezone')); $timezone = Config::get('application.timezone');
date_default_timezone_set($timezone);

5
laravel/error.php
View File

@ -14,8 +14,7 @@ public static function exception($exception)
// If detailed errors are enabled, we'll just format the exception into // If detailed errors are enabled, we'll just format the exception into
// a simple error message and display it on the screen. We don't use a // a simple error message and display it on the screen. We don't use a
// View in case the problem is in the View class itself so we can not // View in case the problem is in the View class.
// run into a white screen of death situation.
if (Config::get('error.detail')) if (Config::get('error.detail'))
{ {
echo "<html><h2>Unhandled Exception</h2> echo "<html><h2>Unhandled Exception</h2>
@ -50,7 +49,7 @@ public static function native($code, $error, $file, $line)
// For a PHP error, we'll create an ErrorExcepetion and then feed that // For a PHP error, we'll create an ErrorExcepetion and then feed that
// exception to the exception method, which will create a simple view // exception to the exception method, which will create a simple view
// of the exception details. The ErrorException class is built-in to // of the exception details. The ErrorException class is built-in to
// PHP for converting native errors to Exceptions. // PHP for converting native errors.
$exception = new \ErrorException($error, $code, 0, $file, $line); $exception = new \ErrorException($error, $code, 0, $file, $line);
if (in_array($code, Config::get('error.ignore'))) if (in_array($code, Config::get('error.ignore')))

2
laravel/hash.php
View File

@ -36,7 +36,7 @@ public static function make($value, $rounds = 8)
// Bcrypt expects the salt to be 22 base64 encoded characters including // Bcrypt expects the salt to be 22 base64 encoded characters including
// dots and slashes. We will get rid of the plus signs included in the // dots and slashes. We will get rid of the plus signs included in the
// base64 data and replace them with dots. OpenSSL will be used if it // base64 data and replace them with dots. OpenSSL will be used if it
// is available, otherwise we will use the Str::random method. // is available on the server.
if (function_exists('openssl_random_pseudo_bytes')) if (function_exists('openssl_random_pseudo_bytes'))
{ {
$salt = openssl_random_pseudo_bytes(16); $salt = openssl_random_pseudo_bytes(16);

13
laravel/routing/controller.php
View File

@ -79,9 +79,8 @@ public static function call($destination, $parameters = array())
protected static function backreference($method, $parameters) protected static function backreference($method, $parameters)
{ {
// Controller delegates may use back-references to the action parameters, // Controller delegates may use back-references to the action parameters,
// which allows the developer to setup more flexible rouets to their // which allows the developer to setup more flexible routes to various
// controllers with less code. We will replace the back-references // controllers with much less code than usual.
// with their corresponding parameter value.
foreach ($parameters as $key => $value) foreach ($parameters as $key => $value)
{ {
$method = str_replace('(:'.($key + 1).')', $value, $method, $count); $method = str_replace('(:'.($key + 1).')', $value, $method, $count);
@ -158,13 +157,7 @@ protected static function load($bundle, $controller)
*/ */
protected static function format($bundle, $controller) protected static function format($bundle, $controller)
{ {
// If the controller's bundle is not the application bundle, we will return Bundle::class_prefix($bundle).Str::classify($controller).'_Controller';
// prepend the bundle to the identifier so the bundle is prefixed to
// the class name when it is formatted. Bundle controllers are
// always prefixed with the bundle name.
if ($bundle !== DEFAULT_BUNDLE) $controller = $bundle.'.'.$controller;
return Str::classify($controller).'_Controller';
} }
/** /**