ZsgsDesign / NOJ

app/Models/Submission/SubmissionModel.php

Spacing +13 added lines, -13 removed lines

@@ -413,7 +413,7 @@ 
                                             ->where(['verdict'=>'Waiting'])
                                             ->get()
                                             ->all();
-        foreach($ret as &$r){
+        foreach ($ret as &$r) {
             $r["ocode"]=DB::table("oj")->where(["oid"=>$r["oid"]])->first()["ocode"];
         }
         return $ret;
@@ -431,15 +431,15 @@ 
         if (isset($sub['verdict'])) {
             $sub["color"]=$this->colorScheme[$sub['verdict']];
         }
-        $result = DB::table($this->tableName)->where(['sid'=>$sid])->update($sub);
-        $contestModel = new ContestModel();
-        $submission_info = DB::table($this->tableName) -> where(['sid'=>$sid]) -> get() -> first();
-        if ($result==1 && $submission_info['cid'] && $contestModel->isContestRunning($submission_info['cid'])){
-            $sub['pid'] = $submission_info['pid'];
-            $sub['uid'] = $submission_info['uid'];
-            $sub['cid'] = $submission_info['cid'];
-            $sub['sid'] = $sid;
-            $contestModel->updateContestRankTable($submission_info['cid'],$sub);
+        $result=DB::table($this->tableName)->where(['sid'=>$sid])->update($sub);
+        $contestModel=new ContestModel();
+        $submission_info=DB::table($this->tableName) -> where(['sid'=>$sid]) -> get() -> first();
+        if ($result==1 && $submission_info['cid'] && $contestModel->isContestRunning($submission_info['cid'])) {
+            $sub['pid']=$submission_info['pid'];
+            $sub['uid']=$submission_info['uid'];
+            $sub['cid']=$submission_info['cid'];
+            $sub['sid']=$sid;
+            $contestModel->updateContestRankTable($submission_info['cid'], $sub);
         }
         return $result;
     }
@@ -510,15 +510,15 @@ 
             'desc'
         );
 
-        if($filter["pcode"]){
+        if ($filter["pcode"]) {
             $paginator=$paginator->where(["pcode"=>$filter["pcode"]]);
         }
 
-        if($filter["result"]){
+        if ($filter["result"]) {
             $paginator=$paginator->where(["verdict"=>$filter["result"]]);
         }
 
-        if($filter["account"]){
+        if ($filter["account"]) {
             $paginator=$paginator->where(["name"=>$filter["account"]]);
         }
 

app/Http/Controllers/Group/AdminController.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function settings($gcode)
     {
-        return Redirect::route('group.settings.general', ['gcode' => $gcode]);;
+        return Redirect::route('group.settings.general', ['gcode' => $gcode]); ;
     }
 
     /**
@@ -31,7 +31,7 @@ 
      */
     public function settingsReturn($gcode)
     {
-        return Redirect::route('group.detail', ['gcode' => $gcode]);;
+        return Redirect::route('group.detail', ['gcode' => $gcode]); ;
     }
 
     /**
@@ -43,7 +43,7 @@ 
     {
         $groupModel=new GroupModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if (empty($basic_info)) return Redirect::route('group.index');
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $member_list=$groupModel->userList($basic_info["gid"]);
         return view('group.settings.general', [
@@ -61,10 +61,10 @@ 
      *
      * @return Response
      */
-    public function problems($gcode){
-        $groupModel = new GroupModel();
-        $group_info = $groupModel->details($gcode);
-        $problems = $groupModel->problems($group_info['gid']);
+    public function problems($gcode) {
+        $groupModel=new GroupModel();
+        $group_info=$groupModel->details($gcode);
+        $problems=$groupModel->problems($group_info['gid']);
         $basic_info=$groupModel->details($gcode);
         return view('group.settings.problems', [
             'page_title'=>"Group Problems",
@@ -85,7 +85,7 @@ 
     {
         $groupModel=new GroupModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if (empty($basic_info)) return Redirect::route('group.index');
         return view('group.settings.danger', [
             'page_title'=>"Group Setting danger",
             'site_title'=>config("app.name"),
@@ -104,7 +104,7 @@ 
         $groupModel=new GroupModel();
         $contestModel=new ContestModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if (empty($basic_info)) return Redirect::route('group.index');
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $member_list=$groupModel->userList($basic_info["gid"]);
         $group_notice=$groupModel->detailNotice($gcode);
@@ -124,7 +124,7 @@ 
         $groupModel=new GroupModel();
         $contestModel=new ContestModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if (empty($basic_info)) return Redirect::route('group.index');
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $contest_list=$contestModel->listForSetting($basic_info["gid"]);
         $member_list=$groupModel->userList($basic_info["gid"]);

Braces +12 added lines, -4 removed lines

@@ -43,7 +43,9 @@ 
     {
         $groupModel=new GroupModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if(empty($basic_info)) {
+            return Redirect::route('group.index');
+        }
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $member_list=$groupModel->userList($basic_info["gid"]);
         return view('group.settings.general', [
@@ -85,7 +87,9 @@ 
     {
         $groupModel=new GroupModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if(empty($basic_info)) {
+            return Redirect::route('group.index');
+        }
         return view('group.settings.danger', [
             'page_title'=>"Group Setting danger",
             'site_title'=>config("app.name"),
@@ -104,7 +108,9 @@ 
         $groupModel=new GroupModel();
         $contestModel=new ContestModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if(empty($basic_info)) {
+            return Redirect::route('group.index');
+        }
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $member_list=$groupModel->userList($basic_info["gid"]);
         $group_notice=$groupModel->detailNotice($gcode);
@@ -124,7 +130,9 @@ 
         $groupModel=new GroupModel();
         $contestModel=new ContestModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if(empty($basic_info)) {
+            return Redirect::route('group.index');
+        }
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $contest_list=$contestModel->listForSetting($basic_info["gid"]);
         $member_list=$groupModel->userList($basic_info["gid"]);

app/Http/Controllers/Ajax/GroupController.php

Braces +6 added lines, -2 removed lines

@@ -69,9 +69,13 @@
         $all_data=$request->all();
 
         $groupModel=new GroupModel();
-        if($all_data["gcode"]=="create") return ResponseModel::err(7005);
+        if($all_data["gcode"]=="create") {
+            return ResponseModel::err(7005);
+        }
         $is_group=$groupModel->isGroup($all_data["gcode"]);
-        if($is_group) return ResponseModel::err(7006);
+        if($is_group) {
+            return ResponseModel::err(7006);
+        }
 
         $allow_extension=['jpg', 'png', 'jpeg', 'gif', 'bmp'];
         if (!empty($request->file('img')) && $request->file('img')->isValid()) {

Spacing +10 added lines, -10 removed lines

@@ -69,9 +69,9 @@ 
         $all_data=$request->all();
 
         $groupModel=new GroupModel();
-        if($all_data["gcode"]=="create") return ResponseModel::err(7005);
+        if ($all_data["gcode"]=="create") return ResponseModel::err(7005);
         $is_group=$groupModel->isGroup($all_data["gcode"]);
-        if($is_group) return ResponseModel::err(7006);
+        if ($is_group) return ResponseModel::err(7006);
 
         $allow_extension=['jpg', 'png', 'jpeg', 'gif', 'bmp'];
         if (!empty($request->file('img')) && $request->file('img')->isValid()) {
@@ -100,20 +100,20 @@ 
 
         $groupModel=new GroupModel();
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
-        if ($clearance > 0) {
-            switch($all_data['mode']){
+        if ($clearance>0) {
+            switch ($all_data['mode']) {
                 case 'contest':
-                    $ret = $groupModel->groupMemberPracticeContestStat($all_data["gid"]);
+                    $ret=$groupModel->groupMemberPracticeContestStat($all_data["gid"]);
                 break;
                 case 'tag':
-                    $ret = $groupModel->groupMemberPracticeTagStat($all_data["gid"]);
+                    $ret=$groupModel->groupMemberPracticeTagStat($all_data["gid"]);
                 break;
                 default:
                     return ResponseModel::err(1007);
                 break;
             }
 
-            return ResponseModel::success(200,null,$ret);
+            return ResponseModel::success(200, null, $ret);
         }
         return ResponseModel::err(7002);
     }
@@ -129,10 +129,10 @@ 
 
         $groupModel=new GroupModel();
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
-        if($clearance <= 0){
+        if ($clearance<=0) {
             return ResponseModel::err(7002);
         }
-        $ret = $groupModel->getEloChangeLog($all_data['gid'],$all_data['uid']);
-        return ResponseModel::success(200,null,$ret);
+        $ret=$groupModel->getEloChangeLog($all_data['gid'], $all_data['uid']);
+        return ResponseModel::success(200, null, $ret);
     }
 }

app/Http/Controllers/Ajax/GroupAdminController.php

Spacing +5 added lines, -5 removed lines

@@ -48,11 +48,11 @@ 
 
         $groupModel=new GroupModel();
         $clearance=$groupModel->judgeClearance($all_data["gid"], Auth::user()->id);
-        if ($clearance < 2) {
+        if ($clearance<2) {
             return ResponseModel::err(7002);
         }
-        $tags = $groupModel->problemTags($all_data['gid'],$all_data['pid']);
-        if(in_array($all_data['tag'],$tags)){
+        $tags=$groupModel->problemTags($all_data['gid'], $all_data['pid']);
+        if (in_array($all_data['tag'], $tags)) {
             return ResponseModel::err(7007);
         }
 
@@ -84,9 +84,9 @@ 
         $request->validate([
             'gid' => 'required|string',
         ]);
-        $gid = $request->input('gid');
+        $gid=$request->input('gid');
         $groupModel=new GroupModel();
-        if($groupModel->judgeClearance($gid,Auth::user()->id) < 2) {
+        if ($groupModel->judgeClearance($gid, Auth::user()->id)<2) {
             return ResponseModel::err(2001);
         }
         $groupModel->refreshElo($gid);

app/Models/JudgerModel.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
             "oid"=>$oid,
             "available"=>1,
             "status"=>0
-        ])->orderBy('usage','desc')->get()->first();
+        ])->orderBy('usage', 'desc')->get()->first();
 
         return $serverList;
     }
@@ -68,7 +68,7 @@ 
     {
         $serverList=DB::table("judge_server")->where(["oid"=>$oid])->get()->all();
         foreach ($serverList as &$server) {
-            $server["status_parsed"]=is_null($server["status"])?self::$status["-1"]:self::$status[$server["status"]];
+            $server["status_parsed"]=is_null($server["status"]) ?self::$status["-1"] : self::$status[$server["status"]];
         }
         return $serverList;
     }

app/Helpers/functions.php

Spacing +10 added lines, -10 removed lines

@@ -63,20 +63,20 @@ 
     }
 }
 
-if (! function_exists('babel_path')) {
+if (!function_exists('babel_path')) {
     /**
      * Get the path to the application folder.
      *
      * @param  string  $path
      * @return string
      */
-    function babel_path($path = '')
+    function babel_path($path='')
     {
         return app('path').DIRECTORY_SEPARATOR.'Babel'.($path ? DIRECTORY_SEPARATOR.$path : $path);
     }
 }
 
-if (! function_exists('glob_recursive')) {
+if (!function_exists('glob_recursive')) {
     /**
      * Find pathnames matching a pattern recursively.
      *
@@ -84,11 +84,11 @@ 
      * @param  int     $flags   Valid flags: GLOB_MARK
      * @return array|false      an array containing the matched files/directories, an empty array if no file matched or false on error.
      */
-    function glob_recursive($pattern, $flags = 0)
+    function glob_recursive($pattern, $flags=0)
     {
-        $files = glob($pattern, $flags);
-        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
-            $files = array_merge($files, glob_recursive($dir.'/'.basename($pattern), $flags));
+        $files=glob($pattern, $flags);
+        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
+            $files=array_merge($files, glob_recursive($dir.'/'.basename($pattern), $flags));
         }
         return $files;
     }
@@ -122,8 +122,8 @@ 
     function delFile($dirName)
     {
         if (file_exists($dirName) && $handle=opendir($dirName)) {
-            while (false!==($item = readdir($handle))) {
-                if ($item!= "." && $item != "..") {
+            while (false!==($item=readdir($handle))) {
+                if ($item!="." && $item!="..") {
                     if (file_exists($dirName.'/'.$item) && is_dir($dirName.'/'.$item)) {
                         delFile($dirName.'/'.$item);
                     } else {
@@ -141,6 +141,6 @@ 
 if (!function_exists('convertMarkdownToHtml')) {
     function convertMarkdownToHtml($md)
     {
-        return is_string($md)?Markdown::convertToHtml($md):'';
+        return is_string($md) ?Markdown::convertToHtml($md) : '';
     }
 }

app/Models/GroupModel.php

Braces +13 added lines, -7 removed lines

@@ -115,7 +115,9 @@ 
     public function details($gcode)
     {
         $basic_info=DB::table($this->tableName)->where(["gcode"=>$gcode])->first();
-        if(empty($basic_info)) return [];
+        if(empty($basic_info)) {
+            return [];
+        }
         $basic_info["members"]=$this->countGroupMembers($basic_info["gid"]);
         $basic_info["tags"]=$this->getGroupTags($basic_info["gid"]);
         $basic_info["create_time_foramt"]=date_format(date_create($basic_info["create_time"]), 'M jS, Y');
@@ -163,7 +165,9 @@ 
         foreach ($user_list as &$u) {
             $u["role_parsed"]=$this->role[$u["role"]];
             $u["role_color"]=$this->role_color[$u["role"]];
-            if(is_null($u["sub_group"])) $u["sub_group"]="None";
+            if(is_null($u["sub_group"])) {
+                $u["sub_group"]="None";
+            }
         }
         return $user_list;
     }
@@ -232,7 +236,7 @@ 
             ->where('gid',$gid)
             ->distinct()
             ->get()->all();
-        }else{
+        } else{
             $tags =  DB::table('group_problem_tag')
             ->select('tag')
             ->where('gid', $gid)
@@ -266,7 +270,7 @@ 
         foreach($problems as $key => $value){
             if($contestModel->judgeClearance($value['cid'],$user_id) != 3){
                 unset($problems[$key]);
-            }else{
+            } else{
                 $problems[$key]['tags'] = $this->problemTags($gid,$value['pid']);
             }
         }
@@ -327,7 +331,9 @@ 
     public function judgeEmailClearance($gid, $email)
     {
         $user=DB::table("users")->where(["email"=>$email])->first();
-        if(empty($user)) return -4;
+        if(empty($user)) {
+            return -4;
+        }
         $ret=DB::table("group_member")->where([
             "gid"=>$gid,
             "uid"=>$user["id"],
@@ -461,7 +467,7 @@ 
                 if(!empty($last_cr)){
                     if($cr['solved'] == $last_cr['solved'] && $cr['penalty'] == $last_cr['penalty'] ){
                         $rank = $last_rank;
-                    }else{
+                    } else{
                         $rank = $index;
                         $last_rank = $rank;
                     }
@@ -613,7 +619,7 @@ 
                     'cid' => $contest['cid'],
                     'name' => $contest['name']
                 ];
-            }else{
+            } else{
                 $result[] = [
                     'ret' => 'judging',
                     'cid' => $contest['cid'],

Spacing +120 added lines, -120 removed lines

@@ -57,10 +57,10 @@ 
         foreach ($trending_groups as &$t) {
             $t["members"]=$this->countGroupMembers($t["gid"]);
         }
-        usort($trending_groups, function ($a, $b) {
+        usort($trending_groups, function($a, $b) {
             return $b["members"]<=>$a["members"];
         });
-        Cache::tags(['group'])->put('trending', array_slice($trending_groups,0,12), 3600*24);
+        Cache::tags(['group'])->put('trending', array_slice($trending_groups, 0, 12), 3600 * 24);
     }
 
     public function userGroups($uid)
@@ -100,13 +100,13 @@ 
 
     public function changeGroupName($gid, $GroupName)
     {
-        return DB::table("group")->where('gid',$gid)->update([
+        return DB::table("group")->where('gid', $gid)->update([
             "name"=>$GroupName
         ]);
     }
 
-    public function changeJoinPolicy($gid, $JoinPolicy){
-        return DB::table("group")->where('gid',$gid)->update([
+    public function changeJoinPolicy($gid, $JoinPolicy) {
+        return DB::table("group")->where('gid', $gid)->update([
             "join_policy"=>$JoinPolicy
         ]);
     }
@@ -120,7 +120,7 @@ 
     public function details($gcode)
     {
         $basic_info=DB::table($this->tableName)->where(["gcode"=>$gcode])->first();
-        if(empty($basic_info)) return [];
+        if (empty($basic_info)) return [];
         $basic_info["members"]=$this->countGroupMembers($basic_info["gid"]);
         $basic_info["tags"]=$this->getGroupTags($basic_info["gid"]);
         $basic_info["create_time_foramt"]=date_format(date_create($basic_info["create_time"]), 'M jS, Y');
@@ -137,10 +137,10 @@ 
     public function userProfile($uid, $gid)
     {
         $info=DB::table("group_member")
-        ->join('users','users.id','=','group_member.uid')
+        ->join('users', 'users.id', '=', 'group_member.uid')
         ->where(["gid"=>$gid, "uid"=>$uid])
         ->where("role", ">", 0)
-        ->select('avatar','describes','email','gid','uid','name','nick_name','professional_rate','role','sub_group')
+        ->select('avatar', 'describes', 'email', 'gid', 'uid', 'name', 'nick_name', 'professional_rate', 'role', 'sub_group')
         ->first();
         if (!empty($info)) {
             $info["role_parsed"]=$this->role[$info["role"]];
@@ -168,7 +168,7 @@ 
         foreach ($user_list as &$u) {
             $u["role_parsed"]=$this->role[$u["role"]];
             $u["role_color"]=$this->role_color[$u["role"]];
-            if(is_null($u["sub_group"])) $u["sub_group"]="None";
+            if (is_null($u["sub_group"])) $u["sub_group"]="None";
         }
         return $user_list;
     }
@@ -229,16 +229,16 @@ 
         ])->where("role", ">", 0)->count();
     }
 
-    public function problemTags($gid,$pid = -1)
+    public function problemTags($gid, $pid=-1)
     {
-        if($pid == -1){
-            $tags =  DB::table('group_problem_tag')
+        if ($pid==-1) {
+            $tags=DB::table('group_problem_tag')
             ->select('tag')
-            ->where('gid',$gid)
+            ->where('gid', $gid)
             ->distinct()
             ->get()->all();
-        }else{
-            $tags =  DB::table('group_problem_tag')
+        } else {
+            $tags=DB::table('group_problem_tag')
             ->select('tag')
             ->where('gid', $gid)
             ->where('pid', $pid)
@@ -246,10 +246,10 @@ 
             ->get()->all();
         }
 
-        $tags_arr = [];
-        if(!empty($tags)){
+        $tags_arr=[];
+        if (!empty($tags)) {
             foreach ($tags as $value) {
-                array_push($tags_arr,$value['tag']);
+                array_push($tags_arr, $value['tag']);
             }
         }
         return $tags_arr;
@@ -257,28 +257,28 @@ 
 
     public function problems($gid)
     {
-        $contestModel = new ContestModel();
-        $problems = DB::table('contest_problem')
-        ->join('contest','contest_problem.cid', '=', 'contest.cid')
-        ->join('problem','contest_problem.pid', '=', 'problem.pid' )
+        $contestModel=new ContestModel();
+        $problems=DB::table('contest_problem')
+        ->join('contest', 'contest_problem.cid', '=', 'contest.cid')
+        ->join('problem', 'contest_problem.pid', '=', 'problem.pid')
         ->select('contest_problem.cid as cid', 'problem.pid as pid', 'pcode', 'title')
-        ->where('contest.gid',$gid)
-        ->where('contest.practice',1)
-        ->orderBy('contest.create_time','desc')
+        ->where('contest.gid', $gid)
+        ->where('contest.practice', 1)
+        ->orderBy('contest.create_time', 'desc')
         ->distinct()
         ->get()->all();
-        $user_id = Auth::user()->id;
-        foreach($problems as $key => $value){
-            if($contestModel->judgeClearance($value['cid'],$user_id) != 3){
+        $user_id=Auth::user()->id;
+        foreach ($problems as $key => $value) {
+            if ($contestModel->judgeClearance($value['cid'], $user_id)!=3) {
                 unset($problems[$key]);
-            }else{
-                $problems[$key]['tags'] = $this->problemTags($gid,$value['pid']);
+            } else {
+                $problems[$key]['tags']=$this->problemTags($gid, $value['pid']);
             }
         }
         return $problems;
     }
 
-    public function problemAddTag($gid,$pid,$tag)
+    public function problemAddTag($gid, $pid, $tag)
     {
         return DB::table("group_problem_tag")->insert([
             "gid"=>$gid,
@@ -287,7 +287,7 @@ 
         ]);
     }
 
-    public function problemRemoveTag($gid,$pid,$tag)
+    public function problemRemoveTag($gid, $pid, $tag)
     {
         return DB::table("group_problem_tag")->where([
             "gid"=>$gid,
@@ -332,7 +332,7 @@ 
     public function judgeEmailClearance($gid, $email)
     {
         $user=DB::table("users")->where(["email"=>$email])->first();
-        if(empty($user)) return -4;
+        if (empty($user)) return -4;
         $ret=DB::table("group_member")->where([
             "gid"=>$gid,
             "uid"=>$user["id"],
@@ -423,20 +423,20 @@ 
 
     public function groupMemberPracticeContestStat($gid)
     {
-        $contestModel = new ContestModel();
+        $contestModel=new ContestModel();
 
-        $allPracticeContest = DB::table('contest')
+        $allPracticeContest=DB::table('contest')
             ->where([
                 'gid' => $gid,
                 'practice' => 1,
             ])
-            ->select('cid','name')
+            ->select('cid', 'name')
             ->get()->all();
-        $user_list = $this->userList($gid);
+        $user_list=$this->userList($gid);
 
-        $memberData = [];
+        $memberData=[];
         foreach ($user_list as $u) {
-            $memberData[$u['uid']] = [
+            $memberData[$u['uid']]=[
                 'name' => $u['name'],
                 'nick_name' => $u['nick_name'],
                 'elo' => $u['ranking'],
@@ -447,61 +447,61 @@ 
             ];
         }
         foreach ($allPracticeContest as $c) {
-            $contestRankRaw = $contestModel->contestRank($c['cid']);
-            foreach($contestRankRaw as $key => $contestRank){
-                if(isset($contestRank['remote']) && $contestRank['remote']){
+            $contestRankRaw=$contestModel->contestRank($c['cid']);
+            foreach ($contestRankRaw as $key => $contestRank) {
+                if (isset($contestRank['remote']) && $contestRank['remote']) {
                     unset($contestRankRaw[$key]);
                 }
             }
-            $contestRank = array_values($contestRankRaw);
-            $problemsCount = DB::table('contest_problem')
-                ->where('cid',$c['cid'])
+            $contestRank=array_values($contestRankRaw);
+            $problemsCount=DB::table('contest_problem')
+                ->where('cid', $c['cid'])
                 ->count();
-            $index = 1;
-            $rank = 1;
-            $last_cr = [];
-            $last_rank = 1;
+            $index=1;
+            $rank=1;
+            $last_cr=[];
+            $last_rank=1;
             foreach ($contestRank as $cr) {
-                $last_rank = $index;
-                if(!empty($last_cr)){
-                    if($cr['solved'] == $last_cr['solved'] && $cr['penalty'] == $last_cr['penalty'] ){
-                        $rank = $last_rank;
-                    }else{
-                        $rank = $index;
-                        $last_rank = $rank;
+                $last_rank=$index;
+                if (!empty($last_cr)) {
+                    if ($cr['solved']==$last_cr['solved'] && $cr['penalty']==$last_cr['penalty']) {
+                        $rank=$last_rank;
+                    } else {
+                        $rank=$index;
+                        $last_rank=$rank;
                     }
                 }
-                if(in_array($cr['uid'],array_keys($memberData))) {
-                    $memberData[$cr['uid']]['solved_all'] += $cr['solved'];
-                    $memberData[$cr['uid']]['problem_all'] += $problemsCount;
-                    $memberData[$cr['uid']]['penalty'] += $cr['penalty'];
-                    $memberData[$cr['uid']]['contest_detial'][$c['cid']] = [
+                if (in_array($cr['uid'], array_keys($memberData))) {
+                    $memberData[$cr['uid']]['solved_all']+=$cr['solved'];
+                    $memberData[$cr['uid']]['problem_all']+=$problemsCount;
+                    $memberData[$cr['uid']]['penalty']+=$cr['penalty'];
+                    $memberData[$cr['uid']]['contest_detial'][$c['cid']]=[
                         'rank' => $rank,
                         'solved' => $cr['solved'],
                         'problems' => $problemsCount,
                         'penalty' => $cr['penalty']
                     ];
                 }
-                $last_cr = $cr;
+                $last_cr=$cr;
                 $index++;
             }
         }
-        $new_memberData = [];
+        $new_memberData=[];
         foreach ($memberData as $uid => $data) {
-            $contest_count = 0;
-            $rank_sum = 0;
+            $contest_count=0;
+            $rank_sum=0;
             foreach ($data['contest_detial'] as $cid => $c) {
-                $rank_sum += $c['rank'];
-                $contest_count += 1;
+                $rank_sum+=$c['rank'];
+                $contest_count+=1;
             }
-            $temp = $data;
-            $temp['uid'] = $uid;
-            if($contest_count != 0){
-                $temp['rank_ave'] = $rank_sum/$contest_count;
+            $temp=$data;
+            $temp['uid']=$uid;
+            if ($contest_count!=0) {
+                $temp['rank_ave']=$rank_sum / $contest_count;
             }
-            array_push($new_memberData,$temp);
+            array_push($new_memberData, $temp);
         }
-        $ret = [
+        $ret=[
             'contest_list' => $allPracticeContest,
             'member_data' => $new_memberData
         ];
@@ -510,58 +510,58 @@ 
 
     public function groupMemberPracticeTagStat($gid)
     {
-        $tags = $this->problemTags($gid);
-        $tag_problems = [];
+        $tags=$this->problemTags($gid);
+        $tag_problems=[];
 
-        $user_list = $this->userList($gid);
+        $user_list=$this->userList($gid);
         foreach ($tags as $tag) {
-            $tag_problems[$tag] = DB::table('problem')
-                ->join('group_problem_tag','problem.pid','=','group_problem_tag.pid')
+            $tag_problems[$tag]=DB::table('problem')
+                ->join('group_problem_tag', 'problem.pid', '=', 'group_problem_tag.pid')
                 ->where([
                     'group_problem_tag.gid' => $gid,
                     'tag' => $tag
                 ])
-                ->select('group_problem_tag.pid as pid','pcode','title')
+                ->select('group_problem_tag.pid as pid', 'pcode', 'title')
                 ->get()->all();
         }
-        $all_problems = [];
+        $all_problems=[];
         foreach ($tag_problems as &$tag_problem_set) {
             foreach ($tag_problem_set as $problem) {
-                $all_problems[$problem['pid']] = $problem;
+                $all_problems[$problem['pid']]=$problem;
             }
-            $tag_problem_set = array_column($tag_problem_set,'pid');
+            $tag_problem_set=array_column($tag_problem_set, 'pid');
         }
-        $submission_data =  DB::table('submission')
-            ->whereIn('pid',array_keys($all_problems))
-            ->whereIn('uid',array_column($user_list,'uid'))
-            ->where('verdict','Accepted')
-            ->select('pid','uid')
+        $submission_data=DB::table('submission')
+            ->whereIn('pid', array_keys($all_problems))
+            ->whereIn('uid', array_column($user_list, 'uid'))
+            ->where('verdict', 'Accepted')
+            ->select('pid', 'uid')
             ->get()->all();
 
-        $memberData = [];
+        $memberData=[];
         foreach ($user_list as $member) {
-            $completion = [];
-            foreach($tag_problems as $tag => $problems) {
-                $completion[$tag] = [];
+            $completion=[];
+            foreach ($tag_problems as $tag => $problems) {
+                $completion[$tag]=[];
                 foreach ($problems as $problem) {
-                    $is_accepted = 0;
+                    $is_accepted=0;
                     foreach ($submission_data as $sd) {
-                        if($sd['pid'] == $problem && $sd['uid'] == $member['uid']){
-                            $is_accepted = 1;
+                        if ($sd['pid']==$problem && $sd['uid']==$member['uid']) {
+                            $is_accepted=1;
                             break;
                         }
                     }
-                    $completion[$tag][$problem] = $is_accepted;
+                    $completion[$tag][$problem]=$is_accepted;
                 }
             }
-            array_push($memberData,[
+            array_push($memberData, [
                 'uid' => $member['uid'],
                 'name' => $member['name'],
                 'nick_name' => $member['nick_name'],
                 'completion' => $completion,
             ]);
         }
-        $ret = [
+        $ret=[
             'all_problems' => $all_problems,
             'tag_problems' => $tag_problems,
             'member_data' => $memberData
@@ -571,10 +571,10 @@ 
 
     public function refreshAllElo()
     {
-        $result = [];
-        $gids = DB::table('group')->select('gid','name')->get()->all();
+        $result=[];
+        $gids=DB::table('group')->select('gid', 'name')->get()->all();
         foreach ($gids as $gid) {
-            $result[$gid['gid']] = [
+            $result[$gid['gid']]=[
                 'name' => $gid['name'],
                 'result' => $this->refreshElo($gid['gid']),
             ];
@@ -585,41 +585,41 @@ 
     public function refreshElo($gid)
     {
         DB::table('group_rated_change_log')
-            ->where('gid',$gid)
+            ->where('gid', $gid)
             ->delete();
         DB::table('group_member')
-            ->where('gid',$gid)
+            ->where('gid', $gid)
             ->update([
                 'ranking' => 1500
             ]);
-        $contests = DB::table('contest')
+        $contests=DB::table('contest')
             ->where([
                 'gid' => $gid,
                 'practice' => 1
             ])
-            ->where('end_time','<',date("Y-m-d H:i:s"))
-            ->select('cid','name')
+            ->where('end_time', '<', date("Y-m-d H:i:s"))
+            ->select('cid', 'name')
             ->orderBy('end_time')
             ->get()->all();
 
-        if(empty($contests)) {
+        if (empty($contests)) {
             return [];
         }
-        $result = [];
-        $contestModel = new ContestModel();
+        $result=[];
+        $contestModel=new ContestModel();
         foreach ($contests as $contest) {
-            $judge_status = $contestModel->judgeOver($contest['cid']);
-            if($judge_status['result'] == true){
-                $calc = new GroupRatingCalculator($contest['cid']);
+            $judge_status=$contestModel->judgeOver($contest['cid']);
+            if ($judge_status['result']==true) {
+                $calc=new GroupRatingCalculator($contest['cid']);
                 $calc->calculate();
                 $calc->storage();
-                $result[] = [
+                $result[]=[
                     'ret' => 'success',
                     'cid' => $contest['cid'],
                     'name' => $contest['name']
                 ];
-            }else{
-                $result[] = [
+            } else {
+                $result[]=[
                     'ret' => 'judging',
                     'cid' => $contest['cid'],
                     'name' => $contest['name'],
@@ -631,23 +631,23 @@ 
         return $result;
     }
 
-    public function getEloChangeLog($gid,$uid)
+    public function getEloChangeLog($gid, $uid)
     {
-        $ret = DB::table('group_rated_change_log')
-            ->join('contest','group_rated_change_log.cid','=','contest.cid')
+        $ret=DB::table('group_rated_change_log')
+            ->join('contest', 'group_rated_change_log.cid', '=', 'contest.cid')
             ->where([
                 'group_rated_change_log.gid' => $gid,
                 'group_rated_change_log.uid' => $uid
             ])->select('group_rated_change_log.cid as cid', 'contest.name as name', 'ranking', 'end_time')
             ->orderBy('contest.end_time')
             ->get()->all();
-            $begin = [
+            $begin=[
                 'cid' => -1,
                 'name' => '',
                 'ranking' => '1500',
-                'end_time' => date("Y-m-d H:i:s",(strtotime($ret[0]['end_time'] ?? time())  - 3600*24)),
+                'end_time' => date("Y-m-d H:i:s", (strtotime($ret[0]['end_time'] ?? time())-3600 * 24)),
             ];
-            $ret = array_prepend($ret,$begin);
+            $ret=array_prepend($ret, $begin);
         return $ret;
     }
 }

app/Http/Controllers/Group/IndexController.php

Spacing +17 added lines, -17 removed lines

@@ -43,7 +43,7 @@ 
         $groupModel=new GroupModel();
         $contestModel=new ContestModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if (empty($basic_info)) return Redirect::route('group.index');
         $my_profile=$groupModel->userProfile(Auth::user()->id, $basic_info["gid"]);
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $member_list=$groupModel->userList($basic_info["gid"]);
@@ -86,13 +86,13 @@ 
      *
      * @return Response
      */
-    public function analysis($gcode){
-        $groupModel = new GroupModel();
+    public function analysis($gcode) {
+        $groupModel=new GroupModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if (empty($basic_info)) return Redirect::route('group.index');
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
-        if($clearance < 1) return Redirect::route('group.detail',['gcode' => $gcode]);
-        $group_info = $groupModel->details($gcode);
+        if ($clearance<1) return Redirect::route('group.detail', ['gcode' => $gcode]);
+        $group_info=$groupModel->details($gcode);
         return view('group.settings.analysis', [
             'page_title'=>"Group Analysis",
             'site_title'=>"NOJ",
@@ -102,13 +102,13 @@ 
         ]);
     }
 
-    public function analysisDownload($gcode,Request $request){
-        $all_data = $request->all();
-        $groupModel = new GroupModel();
-        $group_info = $groupModel->details($gcode);
-        $mode = $all_data['mode'] ?? 'contest';
-        if($mode == 'contest'){
-            $data = $groupModel->groupMemberPracticeContestStat($group_info['gid']);
+    public function analysisDownload($gcode, Request $request) {
+        $all_data=$request->all();
+        $groupModel=new GroupModel();
+        $group_info=$groupModel->details($gcode);
+        $mode=$all_data['mode'] ?? 'contest';
+        if ($mode=='contest') {
+            $data=$groupModel->groupMemberPracticeContestStat($group_info['gid']);
             return Excel::download(
                 new GroupAnalysisExport(
                     [
@@ -121,10 +121,10 @@ 
                         'percent' => $all_data['percent'] ?? false,
                     ]
                 ),
-                $gcode . '_Group_Contest_Analysis.xlsx'
+                $gcode.'_Group_Contest_Analysis.xlsx'
             );
-        }else{
-            $data = $groupModel->groupMemberPracticeTagStat($group_info['gid']);
+        } else {
+            $data=$groupModel->groupMemberPracticeTagStat($group_info['gid']);
             return Excel::download(
                 new GroupAnalysisExport(
                     [
@@ -137,7 +137,7 @@ 
                         'percent' => $all_data['percent'] ?? false,
                     ]
                 ),
-                $gcode . '_Group_Tag_Analysis.xlsx'
+                $gcode.'_Group_Tag_Analysis.xlsx'
             );
         }
     }

Braces +10 added lines, -4 removed lines

@@ -43,7 +43,9 @@ 
         $groupModel=new GroupModel();
         $contestModel=new ContestModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if(empty($basic_info)) {
+            return Redirect::route('group.index');
+        }
         $my_profile=$groupModel->userProfile(Auth::user()->id, $basic_info["gid"]);
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $member_list=$groupModel->userList($basic_info["gid"]);
@@ -89,9 +91,13 @@ 
     public function analysis($gcode){
         $groupModel = new GroupModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group.index');
+        if(empty($basic_info)) {
+            return Redirect::route('group.index');
+        }
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
-        if($clearance < 1) return Redirect::route('group.detail',['gcode' => $gcode]);
+        if($clearance < 1) {
+            return Redirect::route('group.detail',['gcode' => $gcode]);
+        }
         $group_info = $groupModel->details($gcode);
         return view('group.settings.analysis', [
             'page_title'=>"Group Analysis",
@@ -123,7 +129,7 @@ 
                 ),
                 $gcode . '_Group_Contest_Analysis.xlsx'
             );
-        }else{
+        } else{
             $data = $groupModel->groupMemberPracticeTagStat($group_info['gid']);
             return Excel::download(
                 new GroupAnalysisExport(

app/Console/Kernel.php

Spacing +24 added lines, -24 removed lines

@@ -33,7 +33,7 @@ 
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->call(function () {
+        $schedule->call(function() {
             $babel=new Babel();
             for ($i=1; $i<=12; $i++) {
                 $babel->judge();
@@ -42,35 +42,35 @@ 
             // file_put_contents(storage_path('app/task-schedule.output'),"Successfully Synced Judger");
         })->everyMinute()->description("Sync Judger");
 
-        $schedule->call(function () {
+        $schedule->call(function() {
             $rankModel=new RankModel();
             $rankModel->rankList();
             // file_put_contents(storage_path('app/task-schedule.output'),"Successfully Updated Rank");
         })->dailyAt('02:00')->description("Update Rank");
 
-        $schedule->call(function () {
+        $schedule->call(function() {
             $siteMapModel=new SiteMapModel();
             // file_put_contents(storage_path('app/task-schedule.output'),"Successfully Updated SiteMap");
         })->dailyAt('02:00')->description("Update SiteMap");
 
-        $schedule->call(function () {
+        $schedule->call(function() {
             $groupModel=new GroupModel();
             $groupModel->cacheTrendingGroups();
             // file_put_contents(storage_path('app/task-schedule.output'),"Successfully Cached Trending Groups");
         })->dailyAt('03:00')->description("Update Trending Groups");
 
         $schedule->call(function() {
-            $groupModel = new GroupModel();
-            $ret = $groupModel->refreshAllElo();
+            $groupModel=new GroupModel();
+            $ret=$groupModel->refreshAllElo();
             foreach ($ret as $gid => $group) {
-                if(empty($group['result'])){
+                if (empty($group['result'])) {
                     Log::channel('group_elo')->info('Refreshed Group Elo (Empty) : ('.$gid.')'.$group['name']);
-                }else{
+                } else {
                     Log::channel('group_elo')->info('Refreshing Group Elo: ('.$gid.')'.$group['name']);
                     foreach ($group['result'] as $contest) {
-                        if($contest['ret'] == 'success'){
+                        if ($contest['ret']=='success') {
                             Log::channel('group_elo')->info('    Elo Clac Successfully : ('.$contest['cid'].')'.$contest['name']);
-                        }else{
+                        } else {
                             Log::channel('group_elo')->info('    Elo Clac Faild (Judge Not Over) : ('.$contest['cid'].')'.$contest['name'].'  sids:');
                             foreach ($contest['submissions'] as $sid) {
                                 Log::channel('group_elo')->info('        '.$sid['sid']);
@@ -81,45 +81,45 @@ 
             }
         })->dailyAt('04:00')->description("Update Group Elo");
 
-        $schedule->call(function () {
-            $contestModel = new ContestModel();
-            $syncList = $contestModel->runningContest();
+        $schedule->call(function() {
+            $contestModel=new ContestModel();
+            $syncList=$contestModel->runningContest();
             foreach ($syncList as $syncContest) {
                 if (!isset($syncContest['vcid'])) {
                     $contestRankRaw=$contestModel->contestRankCache($syncContest['cid']);
                     $cid=$syncContest['cid'];
                     Cache::tags(['contest', 'rank'])->put($cid, $contestRankRaw);
                     Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $contestRankRaw);
-                    continue ;
+                    continue;
                 }
-                $className = "App\\Babel\\Extension\\hdu\\Synchronizer";  // TODO Add OJ judgement.
-                $all_data = [
+                $className="App\\Babel\\Extension\\hdu\\Synchronizer"; // TODO Add OJ judgement.
+                $all_data=[
                     'oj'=>"hdu",
                     'vcid'=>$syncContest['vcid'],
                     'gid'=>$syncContest['gid'],
                     'cid'=>$syncContest['cid'],
                 ];
-                $hduSync = new $className($all_data);
+                $hduSync=new $className($all_data);
                 $hduSync->crawlRank();
                 $hduSync->crawlClarification();
             }
             // file_put_contents(storage_path('app/task-schedule.output'),"Successfully Synced Remote Rank and Clarification");
         })->everyMinute()->description("Sync Remote Rank and Clarification");
 
-        $schedule->call(function () {
-            $contestModel = new ContestModel();
-            $syncList = $contestModel->runningContest();
+        $schedule->call(function() {
+            $contestModel=new ContestModel();
+            $syncList=$contestModel->runningContest();
             foreach ($syncList as $syncContest) {
                 if (isset($syncContest['crawled'])) {
                     if (!$syncContest['crawled']) {
-                        $className = "App\\Babel\\Extension\\hdu\\Synchronizer";
-                        $all_data = [
+                        $className="App\\Babel\\Extension\\hdu\\Synchronizer";
+                        $all_data=[
                             'oj'=>"hdu",
                             'vcid'=>$syncContest['vcid'],
                             'gid'=>$syncContest['gid'],
                             'cid'=>$syncContest['cid'],
                         ];
-                        $hduSync = new $className($all_data);
+                        $hduSync=new $className($all_data);
                         $hduSync->scheduleCrawl();
                         $contestModel->updateCrawlStatus($syncContest['cid']);
                     }
@@ -127,7 +127,7 @@ 
             }
         })->everyMinute()->description("Sync Contest Problem");
 
-        $schedule->call(function () {
+        $schedule->call(function() {
             $oidList=EloquentJudgeServerModel::column('oid');
             $babel=new Babel();
             foreach ($oidList as $oid) {

Braces +2 added lines, -2 removed lines

@@ -65,12 +65,12 @@
             foreach ($ret as $gid => $group) {
                 if(empty($group['result'])){
                     Log::channel('group_elo')->info('Refreshed Group Elo (Empty) : ('.$gid.')'.$group['name']);
-                }else{
+                } else{
                     Log::channel('group_elo')->info('Refreshing Group Elo: ('.$gid.')'.$group['name']);
                     foreach ($group['result'] as $contest) {
                         if($contest['ret'] == 'success'){
                             Log::channel('group_elo')->info('    Elo Clac Successfully : ('.$contest['cid'].')'.$contest['name']);
-                        }else{
+                        } else{
                             Log::channel('group_elo')->info('    Elo Clac Faild (Judge Not Over) : ('.$contest['cid'].')'.$contest['name'].'  sids:');
                             foreach ($contest['submissions'] as $sid) {
                                 Log::channel('group_elo')->info('        '.$sid['sid']);