zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

use app() instead of App::make()

Browse Source
This commit is contained in:
printempw 2016-10-25 21:35:09 +08:00
parent 329f4c86bc
commit f3e803f57f
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/CheckAuthenticated.php
View File

@ -14,7 +14,7 @@ class CheckAuthenticated
public function handle($request, \Closure $next, $return_user = false)
{
if (Session::has('uid')) {
$user = App::make('users')->get(session('uid'));
$user = app('users')->get(session('uid'));
if (session('token') != $user->getToken())
return redirect('auth/login')->with('msg', trans('auth.check.token'));

2
app/Http/Middleware/CheckSessionUserValid.php
View File

@ -22,7 +22,7 @@ class CheckSessionUserValid
if ($user && $user->getToken() == session('token')) {
// push user instance to repository
App::make('users')->set($user->uid, $user);
app('users')->set($user->uid, $user);
} else {
// remove sessions & cookies
delete_sessions();

2
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@ -11,7 +11,7 @@ class RedirectIfAuthenticated
public function handle($request, \Closure $next)
{
if (session()->has('uid')) {
if (session('token') != App::make('users')->get(session('uid'))->getToken()) {
if (session('token') != app('users')->get(session('uid'))->getToken()) {
Session::put('msg', trans('auth.check.token'));
} else {
return redirect('user');

6
app/Models/User.php
View File

@ -74,7 +74,7 @@ class User extends Model
if (isset($responses[0])) {
return (bool) $responses[0];
} else {
return (App::make('cipher')->encrypt($raw_passwd, config('secure.salt')) == $this->password);
return (app('cipher')->encrypt($raw_passwd, config('secure.salt')) == $this->password);
}
}
@ -93,7 +93,7 @@ class User extends Model
if ($user->uid)
return false;
$user->password = App::make('cipher')->encrypt($password, config('secure.salt'));
$user->password = app('cipher')->encrypt($password, config('secure.salt'));
$callback($user);
@ -110,7 +110,7 @@ class User extends Model
*/
public function changePasswd($new_passwd)
{
$this->password = App::make('cipher')->encrypt($new_passwd, config('secure.salt'));
$this->password = app('cipher')->encrypt($new_passwd, config('secure.salt'));
return $this->save();
}

2
resources/views/admin/master.tpl
View File

@ -13,7 +13,7 @@
@yield('style')
</head>
<?php $user = App::make('users')->get(session('uid')); ?>
<?php $user = app('users')->get(session('uid')); ?>
<body class="hold-transition {{ option('color_scheme') }} sidebar-mini">
<div class="wrapper">

2
resources/views/admin/users.tpl
View File

@ -26,7 +26,7 @@
</h1>
</section>
<?php $current_user = App::make('users')->get(session('uid')); ?>
<?php $current_user = app('users')->get(session('uid')); ?>
<!-- Main content -->
<section class="content">

2
resources/views/skinlib/show.tpl
View File

@ -75,7 +75,7 @@
</tr>
<tr>
<td>{{ trans('skinlib.show.uploader') }}</td>
<?php $uploader = App::make('users')->get($texture->uploader); ?>
<?php $uploader = app('users')->get($texture->uploader); ?>
<td><a href="{{ url('skinlib?filter=user&uid='.$uploader->uid) }}&sort=time">{{ $uploader->getNickName() }}</a></td>
</tr>
<tr>