Преглед на файлове

fix software rules polluting whoops page

iamsaltedfish преди 3 години
родител
ревизия
39be0f666a
променени са 3 файла, в които са добавени 32 реда и са изтрити 71 реда
  1. 0 1
      public/index.php
  2. 14 19
      src/Controllers/LinkController.php
  3. 18 51
      src/Controllers/UserController.php

+ 0 - 1
public/index.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 require __DIR__ . '/../vendor/autoload.php';
 require __DIR__ . '/../config/.config.php';
-require __DIR__ . '/../config/appprofile.php';
 require __DIR__ . '/../app/predefine.php';
 require __DIR__ . '/../app/envload.php';
 

+ 14 - 19
src/Controllers/LinkController.php

@@ -1,27 +1,22 @@
 <?php
-
-//Thanks to http://blog.csdn.net/jollyjumper/article/details/9823047
-
 namespace App\Controllers;
 
-use App\Models\{
-    Link,
-    User,
-    UserSubscribeLog
-};
-use App\Utils\{
-    URL,
-    Tools,
-    AppURI,
-    ConfGenerate,
-    ConfRender
-};
+use App\Models\Link;
+use App\Models\User;
+use App\Models\UserSubscribeLog;
+use App\Utils\AppURI;
+use App\Utils\ConfGenerate;
+use App\Utils\ConfRender;
+use App\Utils\Tools;
+use App\Utils\URL;
+use Slim\Http\Request;
+use Slim\Http\Response;
 use voku\helper\AntiXSS;
 use Psr\Http\Message\ResponseInterface;
-use Slim\Http\{
-    Request,
-    Response
-};
+
+// Thanks to http://blog.csdn.net/jollyjumper/article/details/9823047
+
+require dirname(dirname(dirname(__FILE__))) . '/config/appprofile.php';
 
 /**
  *  LinkController

+ 18 - 51
src/Controllers/UserController.php

@@ -949,6 +949,24 @@ class UserController extends BaseController
         ]);
     }
 
+    public function index($request, $response, $args)
+    {
+        $user = $this->user;
+        $t_e = $user->transfer_enable;
+        $data = [
+            'today_traffic_usage' => ($t_e == 0) ? 0 : ($user->u + $user->d - $user->last_day_t) / $t_e * 100,
+            'past_traffic_usage' => ($t_e == 0) ? 0 : $user->last_day_t / $t_e * 100,
+            'residual_flow' => ($t_e == 0) ? 0 : ($t_e - ($user->u + $user->d)) / $t_e * 100,
+        ];
+
+        return $response->write(
+            $this->view()
+                ->assign('data', $data)
+                ->assign('ann', Ann::orderBy('date', 'desc')->first())
+                ->display('user/index.tpl')
+        );
+    }
+
     public function media($request, $response, $args)
     {
         $results = [];
@@ -1020,57 +1038,6 @@ class UserController extends BaseController
         下面是等待整理的
     */
 
-    public function index($request, $response, $args)
-    {
-        $captcha = Captcha::generate();
-
-        if ($_ENV['subscribe_client_url'] != '') {
-            $getClient = new Token();
-            for ($i = 0; $i < 10; $i++) {
-                $token = $this->user->id . Tools::genRandomChar(16);
-                $Elink = Token::where('token', '=', $token)->first();
-                if ($Elink == null) {
-                    $getClient->token = $token;
-                    break;
-                }
-            }
-            $getClient->user_id     = $this->user->id;
-            $getClient->create_time = time();
-            $getClient->expire_time = time() + 10 * 60;
-            $getClient->save();
-        } else {
-            $token = '';
-        }
-
-        if (Setting::obtain('enable_checkin_captcha') == true) {
-            $geetest_html = $captcha['geetest'];
-        } else {
-            $geetest_html = null;
-        }
-
-        $data = [
-            'today_traffic_usage' => ($this->user->transfer_enable == 0) ? 0 : ($this->user->u + $this->user->d - $this->user->last_day_t) / $this->user->transfer_enable * 100,
-            'past_traffic_usage' => ($this->user->transfer_enable == 0) ? 0 : $this->user->last_day_t / $this->user->transfer_enable * 100,
-            'residual_flow' => ($this->user->transfer_enable==0) ? 0 : ($this->user->transfer_enable - ($this->user->u + $this->user->d)) / $this->user->transfer_enable * 100,
-        ];
-
-        return $response->write(
-            $this->view()
-                ->assign('ssr_sub_token', $this->user->getSublink())
-                ->assign('ann', Ann::orderBy('date', 'desc')->first())
-                ->assign('geetest_html', $geetest_html)
-                ->assign('mergeSub', $_ENV['mergeSub'])
-                ->assign('subUrl', $_ENV['subUrl'])
-                ->registerClass('URL', URL::class)
-                ->assign('recaptcha_sitekey', $captcha['recaptcha'])
-                ->assign('subInfo', LinkController::getSubinfo($this->user, 0))
-                ->assign('getUniversalSub', SubController::getUniversalSub($this->user))
-                ->assign('getClient', $token)
-                ->assign('data', $data)
-                ->display('user/index.tpl')
-        );
-    }
-
     public function backtoadmin($request, $response, $args)
     {
         $userid = Cookie::get('uid');