From 20e25b7441739ac6bf8e33fa0f719e151fd072cf Mon Sep 17 00:00:00 2001 From: Chenx221 Date: Mon, 22 Apr 2024 14:37:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/AdminController.php | 10 ++++------ controllers/TicketsController.php | 1 - controllers/UserController.php | 1 - models/Announcements.php | 1 - models/AnnouncementsSearch.php | 1 - models/CollectionUploaded.php | 2 +- models/Tickets.php | 1 - models/TicketsSearch.php | 2 -- models/User.php | 3 ++- views/admin/collection_manage_view.php | 1 - views/admin/user_view.php | 1 - views/user/_login1.php | 4 +--- views/user/login.php | 4 +--- 13 files changed, 9 insertions(+), 23 deletions(-) diff --git a/controllers/AdminController.php b/controllers/AdminController.php index 1e6cf01..42f0ba6 100644 --- a/controllers/AdminController.php +++ b/controllers/AdminController.php @@ -257,7 +257,7 @@ class AdminController extends Controller } } } - $model->loadDefaultValues(true); + $model->loadDefaultValues(); return $this->render('user_create', [ 'model' => $model, ]); @@ -303,7 +303,6 @@ class AdminController extends Controller return 3; } if ($user->deleteAccount($operation == 1)) { - $logout_result = ''; if ($operation == 0) { AdminSword::forceUserLogout($id); } @@ -321,7 +320,7 @@ class AdminController extends Controller { try { $user = $this->findModel($id); - } catch (NotFoundHttpException $e) { + } catch (NotFoundHttpException) { Yii::$app->session->setFlash('error', '用户不存在'); return $this->redirect(['user']); } @@ -331,11 +330,10 @@ class AdminController extends Controller $user->recovery_codes = null; $user->save(false); Yii::$app->session->setFlash('success', '二步验证已关闭'); - return $this->redirect(['user-view', 'id' => $id]); } else { Yii::$app->session->setFlash('error', '二步验证未启用,无需关闭'); - return $this->redirect(['user-view', 'id' => $id]); } + return $this->redirect(['user-view', 'id' => $id]); } /** @@ -816,7 +814,7 @@ class AdminController extends Controller * @param int $id 公告ID * @return Response * @throws NotFoundHttpException if the model cannot be found - * @throws \Throwable + * @throws Throwable * @throws StaleObjectException */ public function actionAnnouncementsDelete(int $id): Response diff --git a/controllers/TicketsController.php b/controllers/TicketsController.php index d644b40..4768e78 100644 --- a/controllers/TicketsController.php +++ b/controllers/TicketsController.php @@ -6,7 +6,6 @@ use app\models\TicketReplies; use app\models\Tickets; use app\models\TicketsSearch; use Yii; -use yii\db\StaleObjectException; use yii\filters\AccessControl; use yii\web\Controller; use yii\web\NotFoundHttpException; diff --git a/controllers/UserController.php b/controllers/UserController.php index bab741b..b444823 100644 --- a/controllers/UserController.php +++ b/controllers/UserController.php @@ -809,7 +809,6 @@ class UserController extends Controller */ public function actionRequestAssertionOptions(string $username = null): Response { - $user = null; if ($username !== null) { $user = User::findOne(['username' => $username]); if ($user === null) { diff --git a/models/Announcements.php b/models/Announcements.php index ba4958e..46ccb12 100644 --- a/models/Announcements.php +++ b/models/Announcements.php @@ -2,7 +2,6 @@ namespace app\models; -use Yii; use yii\db\ActiveRecord; /** diff --git a/models/AnnouncementsSearch.php b/models/AnnouncementsSearch.php index ed809de..a43d949 100644 --- a/models/AnnouncementsSearch.php +++ b/models/AnnouncementsSearch.php @@ -4,7 +4,6 @@ namespace app\models; use yii\base\Model; use yii\data\ActiveDataProvider; -use app\models\Announcements; /** * AnnouncementsSearch represents the model behind the search form of `app\models\Announcements`. diff --git a/models/CollectionUploaded.php b/models/CollectionUploaded.php index 0895f4c..b9f0df0 100644 --- a/models/CollectionUploaded.php +++ b/models/CollectionUploaded.php @@ -74,7 +74,7 @@ class CollectionUploaded extends ActiveRecord /** * Gets query for [[User]]. * - * @return \yii\db\ActiveQuery + * @return ActiveQuery */ public function getUser() { diff --git a/models/Tickets.php b/models/Tickets.php index 2e43dee..f16adc1 100644 --- a/models/Tickets.php +++ b/models/Tickets.php @@ -2,7 +2,6 @@ namespace app\models; -use Yii; use yii\db\ActiveQuery; use yii\db\ActiveRecord; diff --git a/models/TicketsSearch.php b/models/TicketsSearch.php index 5b7d84e..0dba667 100644 --- a/models/TicketsSearch.php +++ b/models/TicketsSearch.php @@ -5,7 +5,6 @@ namespace app\models; use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; -use app\models\Tickets; /** * TicketsSearch represents the model behind the search form of `app\models\Tickets`. @@ -45,7 +44,6 @@ class TicketsSearch extends Tickets // add conditions that should always apply here - $dataProvider = null; if(Yii::$app->user->can('admin')) { $dataProvider = new ActiveDataProvider([ 'query' => $query, diff --git a/models/User.php b/models/User.php index e59b3a7..02677a3 100644 --- a/models/User.php +++ b/models/User.php @@ -2,6 +2,7 @@ namespace app\models; +use Exception; use Yii; use yii\db\ActiveQuery; use yii\db\ActiveRecord; @@ -300,7 +301,7 @@ class User extends ActiveRecord implements IdentityInterface * @param $insert * @param $changedAttributes * @return void - * @throws \Exception + * @throws Exception */ public function afterSave($insert, $changedAttributes): void { diff --git a/views/admin/collection_manage_view.php b/views/admin/collection_manage_view.php index e7fcdfc..7b5e365 100644 --- a/views/admin/collection_manage_view.php +++ b/views/admin/collection_manage_view.php @@ -2,7 +2,6 @@ use yii\grid\GridView; use yii\helpers\Html; -use yii\helpers\Url; use yii\web\JqueryAsset; use yii\web\View; use yii\web\YiiAsset; diff --git a/views/admin/user_view.php b/views/admin/user_view.php index ad2153a..32e28c2 100644 --- a/views/admin/user_view.php +++ b/views/admin/user_view.php @@ -2,7 +2,6 @@ use app\assets\FontAwesomeAsset; use app\models\PublicKeyCredentialSourceRepository; -use app\models\User; use app\utils\FileSizeHelper; use app\utils\IPLocation; use kartik\editable\Editable; diff --git a/views/user/_login1.php b/views/user/_login1.php index 7d2ef9a..9186bd6 100644 --- a/views/user/_login1.php +++ b/views/user/_login1.php @@ -3,9 +3,7 @@ use yii\bootstrap5\Html; use yii\bootstrap5\ActiveForm; use yii\helpers\Url; -use yii\web\JqueryAsset; -use yii\web\View; -use yii\widgets\Pjax; + /** @var yii\web\View $this */ /** @var app\models\User $model */ diff --git a/views/user/login.php b/views/user/login.php index 00c4722..aeb669b 100644 --- a/views/user/login.php +++ b/views/user/login.php @@ -2,9 +2,7 @@ use yii\bootstrap5\Html; use yii\bootstrap5\ActiveForm; -use yii\web\JqueryAsset; -use yii\web\View; -use yii\widgets\Pjax; + /** @var yii\web\View $this */ /** @var app\models\User $model */