Skip to content

U
UserAdminV2
Commit 007863a6 by Taylor Otwell
Options

cleaning up various codes.

parent 78dc4529
Showing with 10 additions and 19 deletions
laravel/auth.php
......@@ -134,9 +134,6 @@ class Auth {
// or authentication provider they wish.
$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;
static::login($user, $remember);
......
laravel/core.php
......@@ -64,4 +64,6 @@ foreach ($bundles as $bundle => $value)
* be the default timezone used by all date functions through
* throughout the entire application.
*/
date_default_timezone_set(Config::get('application.timezone'));
\ No newline at end of file
$timezone = Config::get('application.timezone');
date_default_timezone_set($timezone);
\ No newline at end of file
laravel/error.php
......@@ -14,8 +14,7 @@ class Error {
// 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
// View in case the problem is in the View class itself so we can not
// run into a white screen of death situation.
// View in case the problem is in the View class.
if (Config::get('error.detail'))
{
echo "<html><h2>Unhandled Exception</h2>
......@@ -50,7 +49,7 @@ class Error {
// For a PHP error, we'll create an ErrorExcepetion and then feed that
// exception to the exception method, which will create a simple view
// 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);
if (in_array($code, Config::get('error.ignore')))
......
laravel/hash.php
......@@ -36,7 +36,7 @@ class Hash {
// 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
// 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'))
{
$salt = openssl_random_pseudo_bytes(16);
......
laravel/routing/controller.php
......@@ -79,9 +79,8 @@ abstract class Controller {
protected static function backreference($method, $parameters)
{
// Controller delegates may use back-references to the action parameters,
// which allows the developer to setup more flexible rouets to their
// controllers with less code. We will replace the back-references
// with their corresponding parameter value.
// which allows the developer to setup more flexible routes to various
// controllers with much less code than usual.
foreach ($parameters as $key => $value)
{
$method = str_replace('(:'.($key + 1).')', $value, $method, $count);
......@@ -158,13 +157,7 @@ abstract class Controller {
*/
protected static function format($bundle, $controller)
{
// If the controller's bundle is not the application bundle, we will
// 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';
return Bundle::class_prefix($bundle).Str::classify($controller).'_Controller';
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment