ZsgsDesign / NOJ

app/Admin/Controllers/ApiController.php

Spacing +12 added lines, -12 removed lines

@@ -10,21 +10,21 @@ 
 
 class ApiController extends AdminController
 {
-    protected function paginate($items, $perPage = 15, $pageStart = 1)
+    protected function paginate($items, $perPage=15, $pageStart=1)
     {
-        $offSet = ($pageStart * $perPage) - $perPage;
-        $itemsForCurrentPage = array_slice($items, $offSet, $perPage, true);
-        $paginator = new LengthAwarePaginator($itemsForCurrentPage, count($items), $perPage, Paginator::resolveCurrentPage(), ['path' => Paginator::resolveCurrentPath()]);
+        $offSet=($pageStart * $perPage)-$perPage;
+        $itemsForCurrentPage=array_slice($items, $offSet, $perPage, true);
+        $paginator=new LengthAwarePaginator($itemsForCurrentPage, count($items), $perPage, Paginator::resolveCurrentPage(), ['path' => Paginator::resolveCurrentPath()]);
         return $paginator;
     }
 
     public function problems()
     {
-        $q = request()->q;
+        $q=request()->q;
 
-        return $this->paginate(Problem::orderBy('pcode', 'asc')->get()->filter(function ($problem) use ($q) {
-            return stripos($problem->readable_name, $q) !== false;
-        })->values()->transform(function ($problem) {
+        return $this->paginate(Problem::orderBy('pcode', 'asc')->get()->filter(function($problem) use ($q) {
+            return stripos($problem->readable_name, $q)!==false;
+        })->values()->transform(function($problem) {
             return [
                 'id' => $problem->pid,
                 'text' => $problem->readable_name,
@@ -34,11 +34,11 @@ 
 
     public function users()
     {
-        $q = request()->q;
+        $q=request()->q;
 
-        return $this->paginate(User::get()->filter(function ($user) use ($q) {
-            return stripos($user->readable_name, $q) !== false;
-        })->values()->transform(function ($user) {
+        return $this->paginate(User::get()->filter(function($user) use ($q) {
+            return stripos($user->readable_name, $q)!==false;
+        })->values()->transform(function($user) {
             return [
                 'id' => $user->id,
                 'text' => $user->readable_name,

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/Jobs/GeneratePDF.php

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, Trackable;
 
-    public $tries = 1;
+    public $tries=1;
     protected $cid;
     protected $config;
 
@@ -30,12 +30,12 @@ 
     public function __construct($cid, $config)
     {
         $this->prepareStatus();
-        $this->cid = $cid;
-        $default = [
+        $this->cid=$cid;
+        $default=[
             'cover' => false,
             'advice' => false,
         ];
-        $this->config = array_merge($default, $config);
+        $this->config=array_merge($default, $config);
     }
 
     /**
@@ -45,20 +45,20 @@ 
      */
     public function handle()
     {
-        $cid = $this->cid;
-        $config = $this->config;
+        $cid=$this->cid;
+        $config=$this->config;
 
         if (!is_dir(storage_path("app/contest/pdf/"))) {
             mkdir(storage_path("app/contest/pdf/"), 0777, true);
         }
 
-        $record = Contest::find($cid);
+        $record=Contest::find($cid);
 
         // $headerPath = 'headers/'.Str::random(32).".html";
 
         // Storage::disk("temp")->put('headers/'.Str::random(32).".html", "Generated by NOJ - https://github.com/ZsgsDesign/NOJ");
 
-        $pdfContest = PDF::setOptions([
+        $pdfContest=PDF::setOptions([
             // 'footer-html' => storage_path("temp/$headerPath"),
             'header-left' => "Generated by NOJ - https://github.com/ZsgsDesign/NOJ",
             'header-line' => true,
@@ -116,7 +116,7 @@ 
 
         // $pdf->save(storage_path("app/contest/pdf/$cid.pdf"));
 
-        $record->pdf = 1;
+        $record->pdf=1;
         $record->save();
     }
 

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/Http/Controllers/Ajax/ContestAdminController.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 
         $all_data=$request->all();
         $filter=$all_data['filter'];
-        $filter=Arr::where($filter, function ($value, $key) {
+        $filter=Arr::where($filter, function($value, $key) {
             return in_array($value, [
                 "Judge Error",
                 "System Error",

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) {