Etusivu Tutki Apua
Kirjaudu sisään
Apq
/
ProxyPanel
peilaus alkaen https://github.com/ProxyPanel/ProxyPanel.git
1
0
Haarauta 0
Tiedostot Esitykset 0 Wiki
Selaa lähdekoodia

代码结构优化

admin 7 vuotta sitten
vanhempi
5276eea8c6
sitoutus
c8de58074b
10 muutettua tiedostoa jossa 25 lisäystä ja 28 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 4 4
      app/Http/Controllers/AuthController.php
  2. 0 3
      app/Http/Controllers/UserController.php
  3. 1 1
      resources/views/401.blade.php
  4. 2 2
      resources/views/404.blade.php
  5. 3 3
      resources/views/auth/active.blade.php
  6. 3 3
      resources/views/auth/activeUser.blade.php
  7. 3 3
      resources/views/auth/login.blade.php
  8. 3 3
      resources/views/auth/register.blade.php
  9. 3 3
      resources/views/auth/reset.blade.php
  10. 3 3
      resources/views/auth/resetPassword.blade.php

+ 4 - 4
app/Http/Controllers/AuthController.php
Näytä tiedosto 

@@ -423,7 +423,7 @@ class AuthController extends Controller
 
             }
 
 
             // 校验账号
 
-            $verify = Verify::query()->where('token', $token)->with('User')->first();
 
+            $verify = Verify::query()->where('type', 1)->where('token', $token)->with('User')->first();
 
             if (empty($verify)) {
 
                 return Redirect::to('login');
 
             } elseif ($verify->status == 1) {
 
@@ -460,7 +460,7 @@ class AuthController extends Controller
 
                 return Redirect::to('login');
 
             }
 
 
-            $verify = Verify::query()->where('token', $token)->with('user')->first();
 
+            $verify = Verify::query()->where('type', 1)->where('token', $token)->with('user')->first();
 
             if (empty($verify)) {
 
                 return Redirect::to('login');
 
             } elseif (time() - strtotime($verify->created_at) >= 1800) {
 
@@ -471,7 +471,7 @@ class AuthController extends Controller
 
                 $verify->save();
 
 
                 // 重新获取一遍verify
 
-                $view['verify'] = Verify::query()->where('token', $token)->with('user')->first();
 
+                $view['verify'] = Verify::query()->where('type', 1)->where('token', $token)->with('user')->first();
 
 
                 return Response::view('auth.reset', $view);
 
             }
 
@@ -559,7 +559,7 @@ class AuthController extends Controller
 
             return Redirect::to('login');
 
         }
 
 
-        $verify = Verify::query()->where('token', $token)->with('user')->first();
 
+        $verify = Verify::query()->where('type', 1)->where('token', $token)->with('user')->first();
 
         if (empty($verify)) {
 
             return Redirect::to('login');
 
         } elseif (empty($verify->user)) {

+ 0 - 3
app/Http/Controllers/UserController.php
Näytä tiedosto 

@@ -25,15 +25,12 @@ use App\Http\Models\UserLoginLog;
 
 use App\Http\Models\UserSubscribe;
 
 use App\Http\Models\UserTrafficDaily;
 
 use App\Http\Models\UserTrafficHourly;
 
-use App\Http\Models\Verify;
 
-use App\Mail\activeUser;
 
 use App\Mail\newTicket;
 
 use App\Mail\replyTicket;
 
 use Illuminate\Http\Request;
 
 use Redirect;
 
 use Response;
 
 use Session;
 
-use Cache;
 
 use Mail;
 
 use Log;
 
 use DB;

+ 1 - 1
resources/views/401.blade.php
Näytä tiedosto 

@@ -8,7 +8,7 @@
 
 
 <head>
 
     <meta charset="utf-8" />
 
-    <title>403</title>
 
+    <title>401</title>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta content="width=device-width, initial-scale=1" name="viewport" />
 
     <meta content="" name="description" />

+ 2 - 2
resources/views/404.blade.php
Näytä tiedosto 

@@ -8,7 +8,7 @@
 
 
 <head>
 
     <meta charset="utf-8" />
 
-    <title>{{trans('404.title')}}</title>
 
+    <title>404</title>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta content="width=device-width, initial-scale=1" name="viewport" />
 
     <meta content="" name="description" />
 
@@ -34,7 +34,7 @@
 
 <body class="page-500-full-page">
 
 <div class="row">
 
     <div class="col-md-12 page-500">
 
-        <h3>{{trans('404.title')}}</h3>
 
+        <h2>Page Not Found</h2>
 
         <p><br></p>
 
         <div class="number font-red"> <img src="{{asset('assets/images/404.gif')}}" /> </div>
 
         <p><br></p>

+ 3 - 3
resources/views/auth/active.blade.php
Näytä tiedosto 

@@ -32,10 +32,10 @@
 
 <body class="login">
 
 <!-- BEGIN LOGO -->
 
 <div class="logo">
 
-    @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
 
-        <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
+    @if(\App\Components\Helpers::systemConfig()['website_logo'])
 
+        <a href="{{url('/')}}"> <img src="{{\App\Components\Helpers::systemConfig()['website_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
     @else
 
-        <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
+        <a href="{{url('/')}}"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
     @endif
 
 </div>
 
 <!-- END LOGO -->

+ 3 - 3
resources/views/auth/activeUser.blade.php
Näytä tiedosto 

@@ -32,10 +32,10 @@
 
 <body class=" login">
 
 <!-- BEGIN LOGO -->
 
 <div class="logo">
 
-    @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
 
-        <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
+    @if(\App\Components\Helpers::systemConfig()['website_logo'])
 
+        <a href="{{url('/')}}"> <img src="{{\App\Components\Helpers::systemConfig()['website_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
     @else
 
-        <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
+        <a href="{{url('/')}}"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
     @endif
 
 </div>
 
 <!-- END LOGO -->

+ 3 - 3
resources/views/auth/login.blade.php
Näytä tiedosto 

@@ -32,10 +32,10 @@
 
 <body class=" login">
 
 <!-- BEGIN LOGO -->
 
 <div class="logo">
 
-    @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
 
-        <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
+    @if(\App\Components\Helpers::systemConfig()['website_logo'])
 
+        <a href="{{url('/')}}"> <img src="{{\App\Components\Helpers::systemConfig()['website_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
     @else
 
-        <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
+        <a href="{{url('/')}}"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
     @endif
 
 </div>
 
 <!-- END LOGO -->

+ 3 - 3
resources/views/auth/register.blade.php
Näytä tiedosto 

@@ -32,10 +32,10 @@
 
 <body class=" login">
 
 <!-- BEGIN LOGO -->
 
 <div class="logo">
 
-    @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
 
-        <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
+    @if(\App\Components\Helpers::systemConfig()['website_logo'])
 
+        <a href="{{url('/')}}"> <img src="{{\App\Components\Helpers::systemConfig()['website_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
     @else
 
-        <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
+        <a href="{{url('/')}}"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
     @endif
 
 </div>
 
 <!-- END LOGO -->

+ 3 - 3
resources/views/auth/reset.blade.php
Näytä tiedosto 

@@ -32,10 +32,10 @@
 
 <body class=" login">
 
     <!-- BEGIN LOGO -->
 
     <div class="logo">
 
-        @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
 
-            <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
+        @if(\App\Components\Helpers::systemConfig()['website_logo'])
 
+            <a href="{{url('/')}}"> <img src="{{\App\Components\Helpers::systemConfig()['website_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
         @else
 
-            <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
+            <a href="{{url('/')}}"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
         @endif
 
     </div>
 
     <!-- END LOGO -->

+ 3 - 3
resources/views/auth/resetPassword.blade.php
Näytä tiedosto 

@@ -32,10 +32,10 @@
 
 <body class=" login">
 
     <!-- BEGIN LOGO -->
 
     <div class="logo">
 
-        @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
 
-            <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
+        @if(\App\Components\Helpers::systemConfig()['website_logo'])
 
+            <a href="{{url('/')}}"> <img src="{{\App\Components\Helpers::systemConfig()['website_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
 
         @else
 
-            <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
+            <a href="{{url('/')}}"> <img src="/assets/images/home_logo.png" alt="" /> </a>
 
         @endif
 
     </div>
 
     <!-- END LOGO -->