ZsgsDesign / NOJ

app/Http/Controllers/Contest/AdminController.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
         $contestModel=new ContestModel();
         $verified=$contestModel->isVerified($cid);
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
-        if ($clearance <= 2) {
+        if ($clearance<=2) {
             return Redirect::route('contest_detail', ['cid' => $cid]);
         }
         $contest_name=$contestModel->contestName($cid);
@@ -52,30 +52,30 @@ 
     {
         $contestModel=new ContestModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
-        if ($clearance <= 2) {
+        if ($clearance<=2) {
             return Redirect::route('contest_detail', ['cid' => $cid]);
         }
         $account=$contestModel->getContestAccount($cid);
-        if($account==null){
-            return ;
-        }else{
+        if ($account==null) {
+            return;
+        } else {
             $AccountExport=new AccountExport($account);
             $filename="ContestAccount$cid";
             return Excel::download($AccountExport, $filename.'.xlsx');
         }
     }
 
-    public function refreshContestRank($cid){
+    public function refreshContestRank($cid) {
         $contestModel=new ContestModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
-        if ($clearance <= 2) {
+        if ($clearance<=2) {
             return Redirect::route('contest.detail', ['cid' => $cid]);
         }
         $contestRankRaw=$contestModel->contestRankCache($cid);
         Cache::tags(['contest', 'rank'])->put($cid, $contestRankRaw);
         Cache::tags(['contest', 'rank'])->put("contestAdmin$cid", $contestRankRaw);
         $end_time=strtotime(DB::table("contest")->where(["cid"=>$cid])->select("end_time")->first()["end_time"]);
-        if(time() > $end_time){
+        if (time()>$end_time) {
             $contestModel->storeContestRankInMySQL($cid, $contestRankRaw);
         }
         return Redirect::route('contest.rank', ['cid' => $cid]);

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
         $account=$contestModel->getContestAccount($cid);
         if($account==null){
             return ;
-        }else{
+        } else{
             $AccountExport=new AccountExport($account);
             $filename="ContestAccount$cid";
             return Excel::download($AccountExport, $filename.'.xlsx');

app/Http/Controllers/Contest/IndexController.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         $filter["rated"]=isset($all_data["rated"]) ? $all_data["rated"] : null;
         $filter["anticheated"]=isset($all_data["anticheated"]) ? $all_data["anticheated"] : null;
         $filter["practice"]=isset($all_data["practice"]) ? $all_data["practice"] : null;
-        $return_list=$contestModel->list($filter,Auth::check()?Auth::user()->id:0);
+        $return_list=$contestModel->list($filter, Auth::check() ?Auth::user()->id : 0);
         $featured=$contestModel->featured();
         if (is_null($return_list)) {
             if (isset($all_data["page"]) && $all_data["page"]>1) {

app/Http/Controllers/Contest/BoardController.php

Spacing +3 added lines, -3 removed lines

@@ -106,8 +106,8 @@ 
             ];
         }
 
-        $editor_left_width = $accountModel->getExtra(Auth::user()->id, 'editor_left_width');
-        if(empty($editor_left_width)) $editor_left_width='40';
+        $editor_left_width=$accountModel->getExtra(Auth::user()->id, 'editor_left_width');
+        if (empty($editor_left_width)) $editor_left_width='40';
 
         return view('contest.board.editor', [
             'page_title'=>"Problem Detail",
@@ -265,7 +265,7 @@ 
         ]);
     }
 
-    public function analysis($cid){
+    public function analysis($cid) {
         $contestModel=new ContestModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
         if (!$clearance) {

Braces +3 added lines, -1 removed lines

@@ -107,7 +107,9 @@
         }
 
         $editor_left_width = $accountModel->getExtra(Auth::user()->id, 'editor_left_width');
-        if(empty($editor_left_width)) $editor_left_width='40';
+        if(empty($editor_left_width)) {
+            $editor_left_width='40';
+        }
 
         return view('contest.board.editor', [
             'page_title'=>"Problem Detail",

app/Babel/Install/InstallerWorker.php

Spacing +2 added lines, -2 removed lines

@@ -84,9 +84,9 @@
             $installed_timestamp=intval($info["compiler_timestamp"]);
         }
         $latest_timestamp=$installed_timestamp;
-        $ConpilerConfig = glob(babel_path("Extension/$ocode/compiler/*.*"));
+        $ConpilerConfig=glob(babel_path("Extension/$ocode/compiler/*.*"));
         foreach ($ConpilerConfig as $file) {
-            if (intval(basename($file)) > $installed_timestamp) {
+            if (intval(basename($file))>$installed_timestamp) {
                 try {
                     $this->commitCompiler($file, json_decode(file_get_contents($file), true));
                     $latest_timestamp=intval(basename($file));

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/IndexController.php

Spacing +15 added lines, -15 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,9 +86,9 @@ 
      *
      * @return Response
      */
-    public function analysis($gcode){
-        $groupModel = new GroupModel();
-        $group_info = $groupModel->details($gcode);
+    public function analysis($gcode) {
+        $groupModel=new GroupModel();
+        $group_info=$groupModel->details($gcode);
         return view('group.settings.analysis', [
             'page_title'=>"Group Analysis",
             'site_title'=>"NOJ",
@@ -98,13 +98,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(
                     [
@@ -117,10 +117,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(
                     [
@@ -133,7 +133,7 @@ 
                         'percent' => $all_data['percent'] ?? false,
                     ]
                 ),
-                $gcode . '_Group_Tag_Analysis.xlsx'
+                $gcode.'_Group_Tag_Analysis.xlsx'
             );
         }
     }

Braces +4 added lines, -2 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"]);
@@ -119,7 +121,7 @@ 
                 ),
                 $gcode . '_Group_Contest_Analysis.xlsx'
             );
-        }else{
+        } else{
             $data = $groupModel->groupMemberPracticeTagStat($group_info['gid']);
             return Excel::download(
                 new GroupAnalysisExport(

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"]);