代码清理
This commit is contained in:
parent
d0370d4f46
commit
20e25b7441
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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) {
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
namespace app\models;
|
||||
|
||||
use Yii;
|
||||
use yii\db\ActiveRecord;
|
||||
|
||||
/**
|
||||
|
@ -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`.
|
||||
|
@ -74,7 +74,7 @@ class CollectionUploaded extends ActiveRecord
|
||||
/**
|
||||
* Gets query for [[User]].
|
||||
*
|
||||
* @return \yii\db\ActiveQuery
|
||||
* @return ActiveQuery
|
||||
*/
|
||||
public function getUser()
|
||||
{
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
namespace app\models;
|
||||
|
||||
use Yii;
|
||||
use yii\db\ActiveQuery;
|
||||
use yii\db\ActiveRecord;
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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 */
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user