ZsgsDesign / NOJ

app/Http/Controllers/Auth/RegisterController.php

Spacing +5 added lines, -5 removed lines

@@ -48,16 +48,16 @@
      */
     protected function validator(array $data)
     {
-        $validator = [
+        $validator=[
             'name' => ['required', 'string', 'max:16', 'unique:users'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users', 'allowed_email_domain'],
             'password' => ['required', 'string', 'min:8', 'confirmed'],
             'agreement' => ['required'],
         ];
-        $messages = [];
-        if(config('function.password.strong')) {
-            $validator['password'][] = 'regex:/^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$/';
-            $messages['password.regex'] = __('validation.password.strong');
+        $messages=[];
+        if (config('function.password.strong')) {
+            $validator['password'][]='regex:/^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$/';
+            $messages['password.regex']=__('validation.password.strong');
         }
         return Validator::make($data, $validator, $messages);
     }

app/Http/Controllers/Group/IndexController.php

Spacing +6 added lines, -6 removed lines

@@ -179,7 +179,7 @@ 
         if ($clearance<1) {
             return Redirect::route('group.detail', ['gcode' => $gcode]);
         }
-        $homeworkInfo = GroupHomework::where(['id' => $homework_id, 'group_id' => $basic_info['gid']])->first();
+        $homeworkInfo=GroupHomework::where(['id' => $homework_id, 'group_id' => $basic_info['gid']])->first();
         if (blank($homeworkInfo)) {
             return Redirect::route('group.detail', ['gcode' => $gcode]);
         }
@@ -195,13 +195,13 @@ 
 
     public function homeworkStatistics($gcode, $homework_id)
     {
-        $groupModel = new GroupModel();
-        $basic_info = $groupModel->details($gcode);
-        $clearance = $groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
-        if ($clearance < 2) {
+        $groupModel=new GroupModel();
+        $basic_info=$groupModel->details($gcode);
+        $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
+        if ($clearance<2) {
             return Redirect::route('group.detail', ['gcode' => $gcode]);
         }
-        $homeworkInfo = GroupHomework::where(['id' => $homework_id, 'group_id' => $basic_info['gid']])->first();
+        $homeworkInfo=GroupHomework::where(['id' => $homework_id, 'group_id' => $basic_info['gid']])->first();
         if (blank($homeworkInfo)) {
             return Redirect::route('group.detail', ['gcode' => $gcode]);
         }

app/Http/Controllers/Ajax/ProblemController.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
     public function problemExists(Request $request)
     {
         $request->validate(["pcode" => "required|string|max:100"]);
-        $problem = Problem::where('pcode', $request->pcode)->first();
+        $problem=Problem::where('pcode', $request->pcode)->first();
         if (filled($problem)) {
             return ResponseModel::success(200, null, $problem->only(["pcode", "title"]));
         } else {

app/Http/Controllers/Ajax/GroupManageController.php

Spacing +19 added lines, -19 removed lines

@@ -319,9 +319,9 @@ 
     public function createHomework(Request $request)
     {
         try {
-            $all = $request->all();
-            $all['currently_at'] = strtotime('now');
-            $validator = Validator::make($all, [
+            $all=$request->all();
+            $all['currently_at']=strtotime('now');
+            $validator=Validator::make($all, [
                 'title'         => 'required|string|min:1|max:100',
                 'description'   => 'required|string|min:1|max:65535',
                 'ended_at'      => 'required|date|after:currently_at',
@@ -340,29 +340,29 @@ 
                 throw new Exception($validator->errors()->first());
             }
 
-            if (count($request->problems) > 26) {
+            if (count($request->problems)>26) {
                 throw new Exception('Please include no more than 26 problems.');
             }
 
-            if (count($request->problems) < 1) {
+            if (count($request->problems)<1) {
                 throw new Exception('Please include at least one problem.');
             }
 
-            $proceedProblems = $request->problems;
-            $proceedProblemCodes = [];
+            $proceedProblems=$request->problems;
+            $proceedProblemCodes=[];
 
             foreach ($proceedProblems as &$problem) {
                 if (!is_array($problem)) {
                     throw new Exception('Each problem object must be an array.');
                 }
 
-                $problem['pcode'] = mb_strtoupper(trim($problem['pcode']));
+                $problem['pcode']=mb_strtoupper(trim($problem['pcode']));
 
-                if(array_search($problem['pcode'], $proceedProblemCodes) !== false) {
+                if (array_search($problem['pcode'], $proceedProblemCodes)!==false) {
                     throw new Exception("Duplicate Problem");
                 }
 
-                $validator = Validator::make($problem, [
+                $validator=Validator::make($problem, [
                     'pcode'         => 'required|string|min:1|max:100',
                     // 'alias'         => 'required|string|min:0|max:100|nullable',
                     // 'points'        => 'required|integer|gte:1',
@@ -376,17 +376,17 @@ 
                     throw new Exception($validator->errors()->first());
                 }
 
-                $proceedProblemCodes[] = $problem['pcode'];
+                $proceedProblemCodes[]=$problem['pcode'];
             }
 
             unset($problem);
 
-            $problemsDict = Problem::whereIn('pcode', $proceedProblemCodes)->select('pid', 'pcode')->get()->pluck('pid', 'pcode');
+            $problemsDict=Problem::whereIn('pcode', $proceedProblemCodes)->select('pid', 'pcode')->get()->pluck('pid', 'pcode');
 
             try {
-                foreach($proceedProblems as &$proceedProblem) {
-                    $proceedProblem['pid'] = $problemsDict[$proceedProblem['pcode']];
-                    if(blank($proceedProblem['pid'])) {
+                foreach ($proceedProblems as &$proceedProblem) {
+                    $proceedProblem['pid']=$problemsDict[$proceedProblem['pcode']];
+                    if (blank($proceedProblem['pid'])) {
                         throw new Exception();
                     }
                 }
@@ -405,14 +405,14 @@ 
             ], 422);
         }
 
-        $groupModel = new GroupModel();
-        $clearance = $groupModel->judgeClearance($request->gid, Auth::user()->id);
-        if ($clearance < 2) {
+        $groupModel=new GroupModel();
+        $clearance=$groupModel->judgeClearance($request->gid, Auth::user()->id);
+        if ($clearance<2) {
             return ResponseModel::err(2001);
         }
 
         try {
-            $homeworkID = Group::find($request->gid)->addHomework($request->title, $request->description, Carbon::parse($request->ended_at), $proceedProblems);
+            $homeworkID=Group::find($request->gid)->addHomework($request->title, $request->description, Carbon::parse($request->ended_at), $proceedProblems);
         } catch (Exception $e) {
             return ResponseModel::err(7009);
         }

app/Models/Eloquent/GroupHomeworkProblem.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 {
     use HasFactory;
 
-    protected $with = ['problem'];
+    protected $with=['problem'];
 
     public function homework()
     {

app/Models/Eloquent/GroupHomework.php

Spacing +23 added lines, -23 removed lines

@@ -30,17 +30,17 @@ 
 
     public function getStatisticsAttribute()
     {
-        $cachedStatistics = Cache::tags(['homework', 'statistics'])->get($this->id);
+        $cachedStatistics=Cache::tags(['homework', 'statistics'])->get($this->id);
 
         if (blank($cachedStatistics)) {
-            $cachedStatistics = $this->cacheStatistics();
+            $cachedStatistics=$this->cacheStatistics();
         }
 
-        if ($cachedStatistics === false) {
+        if ($cachedStatistics===false) {
             return null;
         }
 
-        $cachedStatistics['timestamp'] = Carbon::createFromTimestamp($cachedStatistics['timestamp']);
+        $cachedStatistics['timestamp']=Carbon::createFromTimestamp($cachedStatistics['timestamp']);
 
         return $cachedStatistics;
     }
@@ -48,25 +48,25 @@ 
     public function cacheStatistics()
     {
         try {
-            $statistics = [];
-            $homeworkProblems = $this->problems->sortBy('order_index');
-            $users = $this->group->members()->where('role', '>=', 1)->get();
-            $userIDArr = $users->pluck('uid');
-            $defaultVerdict = [];
+            $statistics=[];
+            $homeworkProblems=$this->problems->sortBy('order_index');
+            $users=$this->group->members()->where('role', '>=', 1)->get();
+            $userIDArr=$users->pluck('uid');
+            $defaultVerdict=[];
 
             foreach ($homeworkProblems as $homeworkProblem) {
-                $statistics['problems'][] = [
+                $statistics['problems'][]=[
                     'pid' => $homeworkProblem->problem_id,
                     'readable_name' => $homeworkProblem->problem->readable_name,
                 ];
-                $defaultVerdict[$homeworkProblem->problem_id] = [
+                $defaultVerdict[$homeworkProblem->problem_id]=[
                     "icon" => "checkbox-blank-circle-outline",
                     "color" => "wemd-grey-text"
                 ];
             }
 
             foreach ($users as $user) {
-                $statistics['data'][$user->uid] = [
+                $statistics['data'][$user->uid]=[
                     'name' => $user->user->name,
                     'nick_name' => blank($user->nick_name) ? null : $user->nick_name,
                     'solved' => 0,
@@ -75,44 +75,44 @@ 
                 ];
             }
 
-            $endedAt = Carbon::parse($this->ended_at);
+            $endedAt=Carbon::parse($this->ended_at);
 
             foreach ($homeworkProblems as $homeworkProblem) {
-                $userProbIDArr = [];
+                $userProbIDArr=[];
 
                 foreach ($homeworkProblem->problem->users_latest_submission($userIDArr->diff($userProbIDArr), null, $endedAt, ['Accepted'])->get() as $acceptedRecord) {
-                    $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id] = [
+                    $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id]=[
                         "icon" => "checkbox-blank-circle",
                         "color" => $acceptedRecord['color']
                     ];
                     $statistics['data'][$acceptedRecord['uid']]['solved']++;
-                    $userProbIDArr[] = $acceptedRecord['uid'];
+                    $userProbIDArr[]=$acceptedRecord['uid'];
                 }
 
                 foreach ($homeworkProblem->problem->users_latest_submission($userIDArr->diff($userProbIDArr), null, $endedAt, ['Partially Accepted'])->get() as $acceptedRecord) {
-                    $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id] = [
+                    $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id]=[
                         "icon" => "cisco-webex",
                         "color" => $acceptedRecord['color']
                     ];
                     $statistics['data'][$acceptedRecord['uid']]['attempted']++;
-                    $userProbIDArr[] = $acceptedRecord['uid'];
+                    $userProbIDArr[]=$acceptedRecord['uid'];
                 }
 
                 foreach ($homeworkProblem->problem->users_latest_submission($userIDArr->diff($userProbIDArr), null, $endedAt)->get() as $acceptedRecord) {
-                    $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id] = [
+                    $statistics['data'][$acceptedRecord['uid']]['verdict'][$homeworkProblem->problem_id]=[
                         "icon" => "cisco-webex",
                         "color" => $acceptedRecord['color']
                     ];
                     $statistics['data'][$acceptedRecord['uid']]['attempted']++;
-                    $userProbIDArr[] = $acceptedRecord['uid'];
+                    $userProbIDArr[]=$acceptedRecord['uid'];
                 }
             }
 
-            usort($statistics['data'], function ($a, $b) {
-                return $b["solved"] == $a["solved"] ? $b["attempted"] <=> $a["attempted"] : $b["solved"] <=> $a["solved"];
+            usort($statistics['data'], function($a, $b) {
+                return $b["solved"]==$a["solved"] ? $b["attempted"] <=> $a["attempted"] : $b["solved"] <=> $a["solved"];
             });
 
-            $statistics['timestamp'] = time();
+            $statistics['timestamp']=time();
             Cache::tags(['homework', 'statistics'])->put($this->id, $statistics, 360);
             return $statistics;
         } catch (Exception $e) {

app/Models/Eloquent/Group.php

Spacing +9 added lines, -9 removed lines

@@ -66,21 +66,21 @@
 
             // Create Homework Itself
 
-            $newHomework = new GroupHomework();
+            $newHomework=new GroupHomework();
 
-            $newHomework->title = $title;
-            $newHomework->description = $description;
-            $newHomework->ended_at = $endedAt;
-            $newHomework->is_simple = 1;
+            $newHomework->title=$title;
+            $newHomework->description=$description;
+            $newHomework->ended_at=$endedAt;
+            $newHomework->is_simple=1;
             $this->homework()->save($newHomework);
 
             // Created Related Problem List
 
-            $problemIndex = 1;
+            $problemIndex=1;
             foreach ($problems as $problem) {
-                $newProblem = new GroupHomeworkProblem();
-                $newProblem->problem_id = $problem['pid'];
-                $newProblem->order_index = $problemIndex++;
+                $newProblem=new GroupHomeworkProblem();
+                $newProblem->problem_id=$problem['pid'];
+                $newProblem->order_index=$problemIndex++;
                 $newHomework->problems()->save($newProblem);
             }
 

app/Exceptions/Handler.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
      *
      * @var array
      */
-    protected $dontReport = [
+    protected $dontReport=[
         //
     ];
 
@@ -21,7 +21,7 @@ 
      *
      * @var array
      */
-    protected $dontFlash = [
+    protected $dontFlash=[
         'current_password',
         'password',
         'password_confirmation',
@@ -34,7 +34,7 @@ 
      */
     public function register()
     {
-        $this->reportable(function (Throwable $e) {
+        $this->reportable(function(Throwable $e) {
             //
         });
     }

app/Console/Commands/Install/Install.php

Spacing +10 added lines, -10 removed lines

@@ -78,10 +78,10 @@ 
         $this->initSystemCheck();
         return;
         if ($this->confirm('Do you wish to continue?')) {
-            if(!$this->acceptLicense()){
+            if (!$this->acceptLicense()) {
                 return;
             }
-            if($this->createFrontAdminUser()){
+            if ($this->createFrontAdminUser()) {
                 $this->createFrontAdminGroup();
             }
             $this->installBabelExtensionNOJ();
@@ -119,19 +119,19 @@ 
     protected function createFrontAdminUser() {
         $this->line('Creating frontstage admin user...');
         $this->comment('');
-        $shallCreate = true;
+        $shallCreate=true;
         if (User::count()) {
-            $shallCreate = $this->confirm('Detected existing frontstage user, do you really want to create frontstage admin?');
+            $shallCreate=$this->confirm('Detected existing frontstage user, do you really want to create frontstage admin?');
             $this->comment('');
         }
         if (!$shallCreate) {
             return false;
         }
-        while(true) {
+        while (true) {
             try {
-                $createdUser = $this->createFrontUser();
+                $createdUser=$this->createFrontUser();
                 break;
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 $this->line("\n  <bg=red;fg=white> Exception </> : <fg=yellow>Error occured while creating admin user.</>\n");
                 continue;
             }
@@ -140,9 +140,9 @@ 
     }
 
     private function createFrontUser() {
-        $username = $this->ask('Please choose a username:', 'admin');
-        $email = $this->ask('Please choose a email address:', 'admin@code.master');
-        $password = Hash::make(Str::random(8));
+        $username=$this->ask('Please choose a username:', 'admin');
+        $email=$this->ask('Please choose a email address:', 'admin@code.master');
+        $password=Hash::make(Str::random(8));
         $createdUser=User::create([
             'name' => $username,
             'email' => $email,