ZsgsDesign / NOJ

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'
             );
         }
     }

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

app/Babel/Submit/Curl.php

Spacing +21 added lines, -21 removed lines

@@ -18,11 +18,11 @@ 
 
     public function login($all_data)
     {
-        if(isset($all_data["url"]))    $url = $all_data["url"];       else throw new Exception("url is not exist in all_data");
-        if(isset($all_data["data"]))   $data = $all_data["data"];     else throw new Exception("data is not exist in all_data");
-        if(isset($all_data["oj"]))     $oj = $all_data["oj"];         else throw new Exception("oj is not exist in all_data");
-        if(isset($all_data["ret"]))    $ret = $all_data["ret"];       else $ret = 'false';
-        if(isset($all_data["handle"])) $handle = $all_data["handle"]; else $handle = "default";
+        if (isset($all_data["url"]))    $url=$all_data["url"]; else throw new Exception("url is not exist in all_data");
+        if (isset($all_data["data"]))   $data=$all_data["data"]; else throw new Exception("data is not exist in all_data");
+        if (isset($all_data["oj"]))     $oj=$all_data["oj"]; else throw new Exception("oj is not exist in all_data");
+        if (isset($all_data["ret"]))    $ret=$all_data["ret"]; else $ret='false';
+        if (isset($all_data["handle"])) $handle=$all_data["handle"]; else $handle="default";
 
         $datapost=curl_init();
         $headers=array("Expect:");
@@ -54,12 +54,12 @@ 
 
     public function grab_page($all_data)
     {
-        if(isset($all_data["site"]))    $site = $all_data["site"];          else throw new Exception("site is not exist in all_data");
-        if(isset($all_data["oj"]))      $oj = $all_data["oj"];              else throw new Exception("oj is not exist in all_data");
-        if(isset($all_data["headers"])) $headers = $all_data["headers"];    else $headers = [];
-        if(isset($all_data["handle"]))  $handle = $all_data["handle"];      else $handle = "default";
-        if(isset($all_data["follow"]))  $follow = $all_data["follow"];      else $follow = false;
-        if(isset($all_data["vcid"]))  $vcid = $all_data["vcid"]."_";      else $vcid = "";
+        if (isset($all_data["site"]))    $site=$all_data["site"]; else throw new Exception("site is not exist in all_data");
+        if (isset($all_data["oj"]))      $oj=$all_data["oj"]; else throw new Exception("oj is not exist in all_data");
+        if (isset($all_data["headers"])) $headers=$all_data["headers"]; else $headers=[];
+        if (isset($all_data["handle"]))  $handle=$all_data["handle"]; else $handle="default";
+        if (isset($all_data["follow"]))  $follow=$all_data["follow"]; else $follow=false;
+        if (isset($all_data["vcid"]))  $vcid=$all_data["vcid"]."_"; else $vcid="";
 
         $handle=urlencode($handle);
 
@@ -86,16 +86,16 @@ 
 
     public function post_data($all_data)
     {
-        if(isset($all_data["site"]))         $site = $all_data["site"];                 else throw new Exception("site is not exist in all_data");
-        if(isset($all_data["data"]))         $data = $all_data["data"];                 else throw new Exception("data is not exist in all_data");
-        if(isset($all_data["oj"]))           $oj = $all_data["oj"];                     else throw new Exception("oj is not exist in all_data");
-        if(isset($all_data["ret"]))          $ret = $all_data["ret"];                   else $ret = false;
-        if(isset($all_data["follow"]))       $follow = $all_data["follow"];             else $follow = true;
-        if(isset($all_data["returnHeader"])) $returnHeader = $all_data["returnHeader"]; else $returnHeader = true;
-        if(isset($all_data["postJson"]))     $postJson = $all_data["postJson"];         else $postJson = false;
-        if(isset($all_data["extraHeaders"])) $extraHeaders = $all_data["extraHeaders"]; else $extraHeaders = [];
-        if(isset($all_data["handle"]))       $handle = $all_data["handle"];             else $handle = "default";
-        if(isset($all_data["vcid"]))  $vcid = $all_data["vcid"]."_";      else $vcid = "";
+        if (isset($all_data["site"]))         $site=$all_data["site"]; else throw new Exception("site is not exist in all_data");
+        if (isset($all_data["data"]))         $data=$all_data["data"]; else throw new Exception("data is not exist in all_data");
+        if (isset($all_data["oj"]))           $oj=$all_data["oj"]; else throw new Exception("oj is not exist in all_data");
+        if (isset($all_data["ret"]))          $ret=$all_data["ret"]; else $ret=false;
+        if (isset($all_data["follow"]))       $follow=$all_data["follow"]; else $follow=true;
+        if (isset($all_data["returnHeader"])) $returnHeader=$all_data["returnHeader"]; else $returnHeader=true;
+        if (isset($all_data["postJson"]))     $postJson=$all_data["postJson"]; else $postJson=false;
+        if (isset($all_data["extraHeaders"])) $extraHeaders=$all_data["extraHeaders"]; else $extraHeaders=[];
+        if (isset($all_data["handle"]))       $handle=$all_data["handle"]; else $handle="default";
+        if (isset($all_data["vcid"]))  $vcid=$all_data["vcid"]."_"; else $vcid="";
 
         $handle=urlencode($handle);
 

app/Http/Controllers/Contest/IndexController.php

Spacing +2 added lines, -2 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) {
@@ -66,7 +66,7 @@ 
         $contestModel=new ContestModel();
         $groupModel=new GroupModel();
         $clearance=Auth::check() ? $contestModel->judgeClearance($cid, Auth::user()->id) : 0;
-        $basic = $contestModel->basic($cid);
+        $basic=$contestModel->basic($cid);
         if (Auth::check()) {
             $contest_detail=$contestModel->detail($cid, Auth::user()->id);
             $registration=$contestModel->registration($cid, Auth::user()->id);

app/Http/Controllers/Contest/BoardController.php

Spacing +38 added lines, -38 removed lines

@@ -34,10 +34,10 @@ 
         $contestModel=new ContestModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
         $basicInfo=$contestModel->basic($cid);
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
-            if($clearance == 3){
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
+            if ($clearance==3) {
                 return Redirect::route('contest.admin', ['cid' => $cid]);
-            }else{
+            } else {
                 return Redirect::route('contest.detail', ['cid' => $cid]);
             }
         }
@@ -50,7 +50,7 @@ 
         if ($remainingTime<=0) {
             $remainingTime=0;
         }
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
             return Redirect::route('contest.detail', ['cid' => $cid]);
         }
         return view('contest.board.challenge', [
@@ -83,15 +83,15 @@ 
         $accountModel=new AccountModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
         $basicInfo=$contestModel->basic($cid);
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
-            if($clearance == 3){
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
+            if ($clearance==3) {
                 return Redirect::route('contest.admin', ['cid' => $cid]);
-            }else{
+            } else {
                 return Redirect::route('contest.detail', ['cid' => $cid]);
             }
         }
         $basicInfo=$contestModel->basic($cid);
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
             return Redirect::route('contest.detail', ['cid' => $cid]);
         }
         $contest_name=$contestModel->contestName($cid);
@@ -122,8 +122,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",
@@ -157,15 +157,15 @@ 
         $contestModel=new ContestModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
         $basicInfo=$contestModel->basic($cid);
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
-            if($clearance == 3){
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
+            if ($clearance==3) {
                 return Redirect::route('contest.admin', ['cid' => $cid]);
-            }else{
+            } else {
                 return Redirect::route('contest.detail', ['cid' => $cid]);
             }
         }
         $basicInfo=$contestModel->basic($cid);
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
             return Redirect::route('contest.detail', ['cid' => $cid]);
         }
         $contest_name=$contestModel->contestName($cid);
@@ -176,14 +176,14 @@ 
 
         // To determine the ranking
         foreach ($contestRank as $i => &$r) {
-            if($i != 0) {
-                if($r['score'] == $contestRank[$i-1]['score'] && $r['penalty'] == $contestRank[$i-1]['penalty']){
-                    $r['rank'] = $contestRank[$i-1]['rank'];
-                }else{
-                    $r['rank'] = $i + 1;
+            if ($i!=0) {
+                if ($r['score']==$contestRank[$i-1]['score'] && $r['penalty']==$contestRank[$i-1]['penalty']) {
+                    $r['rank']=$contestRank[$i-1]['rank'];
+                } else {
+                    $r['rank']=$i+1;
                 }
-            }else{
-                $r['rank'] = 1;
+            } else {
+                $r['rank']=1;
             }
         }
         $rankFrozen=$contestModel->isFrozen($cid);
@@ -220,15 +220,15 @@ 
         $contestModel=new ContestModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
         $basicInfo=$contestModel->basic($cid);
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
-            if($clearance == 3){
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
+            if ($clearance==3) {
                 return Redirect::route('contest.admin', ['cid' => $cid]);
-            }else{
+            } else {
                 return Redirect::route('contest.detail', ['cid' => $cid]);
             }
         }
         $basicInfo=$contestModel->basic($cid);
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
             return Redirect::route('contest.detail', ['cid' => $cid]);
         }
         $contest_name=$contestModel->contestName($cid);
@@ -262,14 +262,14 @@ 
         $contestModel=new ContestModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
         $basicInfo=$contestModel->basic($cid);
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
-            if($clearance == 3){
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
+            if ($clearance==3) {
                 return Redirect::route('contest.admin', ['cid' => $cid]);
-            }else{
+            } else {
                 return Redirect::route('contest.detail', ['cid' => $cid]);
             }
         }
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
             return Redirect::route('contest.detail', ['cid' => $cid]);
         }
         $contest_name=$contestModel->contestName($cid);
@@ -300,14 +300,14 @@ 
         $contestModel=new ContestModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
         $basicInfo=$contestModel->basic($cid);
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
-            if($clearance == 3){
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
+            if ($clearance==3) {
                 return Redirect::route('contest.admin', ['cid' => $cid]);
-            }else{
+            } else {
                 return Redirect::route('contest.detail', ['cid' => $cid]);
             }
         }
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
             return Redirect::route('contest.detail', ['cid' => $cid]);
         }
         $contest_name=$contestModel->contestName($cid);
@@ -324,19 +324,19 @@ 
         ]);
     }
 
-    public function analysis($cid){
+    public function analysis($cid) {
         $contestModel=new ContestModel();
         $clearance=$contestModel->judgeClearance($cid, Auth::user()->id);
         $basicInfo=$contestModel->basic($cid);
-        if (!$clearance || time() < strtotime($basicInfo['begin_time'])) {
-            if($clearance == 3){
+        if (!$clearance || time()<strtotime($basicInfo['begin_time'])) {
+            if ($clearance==3) {
                 return Redirect::route('contest.admin', ['cid' => $cid]);
-            }else{
+            } else {
                 return Redirect::route('contest.detail', ['cid' => $cid]);
             }
         }
         $basicInfo=$contestModel->basic($cid);
-        if($basicInfo['public'] && !$basicInfo['audit_status']){
+        if ($basicInfo['public'] && !$basicInfo['audit_status']) {
             return Redirect::route('contest.detail', ['cid' => $cid]);
         }
         $contest_name=$contestModel->contestName($cid);

app/Babel/Extension/noj/Submitter.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
             "spj_version" => null,
             "spj_config" => null
         ];
-        if($probBasic["spj"] && $probBasic["spj_version"]){
+        if ($probBasic["spj"] && $probBasic["spj_version"]) {
             $submit_data["spj_version"]=$probBasic["spj_version"];
             $submit_data["spj_config"]=$probBasic["spj_lang"];
         }

app/Http/Controllers/OAuth/GithubController.php

Spacing +49 added lines, -49 removed lines

@@ -13,18 +13,18 @@ 
 {
     public function redirectTo()
     {
-        $accountModel = new AccountModel();
+        $accountModel=new AccountModel();
         $info=$accountModel->detail(Auth::user()->id);
-        if(Auth::check() && $info['contest_account']){
+        if (Auth::check() && $info['contest_account']) {
             return redirect('/account/settings');
         }
-        if(Auth::check() && $accountModel->getExtra(Auth::user()->id ,'github_id')){
-            return view('oauth.index',[
+        if (Auth::check() && $accountModel->getExtra(Auth::user()->id, 'github_id')) {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
                 'platform' => 'Github',
-                'display_html' => 'You\'re already tied to the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
+                'display_html' => 'You\'re already tied to the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
                 You can choose to unbind or go back to the homepage',
                 'buttons' => [
                     [
@@ -44,19 +44,19 @@ 
 
     public function handleCallback()
     {
-        try{
-            $github_user = Socialite::driver('github')->user();
-        }catch(\Laravel\Socialite\Two\InvalidStateException $e){
+        try {
+            $github_user=Socialite::driver('github')->user();
+        } catch (\Laravel\Socialite\Two\InvalidStateException $e) {
             return redirect('/');
         }
 
-        $accountModel = new AccountModel();
-        if(Auth::check()){
-            $user_id = Auth::user()->id;
-            $ret = $accountModel->findExtra('github_id',$github_user->id);
-            if(!empty($ret) && $ret['uid'] != $user_id){
-                $user = UserModel::find($ret['uid']);
-                return view('oauth.index',[
+        $accountModel=new AccountModel();
+        if (Auth::check()) {
+            $user_id=Auth::user()->id;
+            $ret=$accountModel->findExtra('github_id', $github_user->id);
+            if (!empty($ret) && $ret['uid']!=$user_id) {
+                $user=UserModel::find($ret['uid']);
+                return view('oauth.index', [
                     'page_title'=>"OAuth",
                     'site_title'=>config("app.name"),
                     'navigation'=>"OAuth",
@@ -71,17 +71,17 @@ 
                     ]
                 ]);
             }
-            $accountModel->setExtra($user_id,'github_id',$github_user->id);
-            $accountModel->setExtra($user_id,'github_email',$github_user->email);
-            $accountModel->setExtra($user_id,'github_nickname',$github_user->nickname);
-            $accountModel->setExtra($user_id,'github_homepage',($github_user->user)['html_url']);
-            $accountModel->setExtra($user_id,'github_token',$github_user->token,101);
-            return view('oauth.index',[
+            $accountModel->setExtra($user_id, 'github_id', $github_user->id);
+            $accountModel->setExtra($user_id, 'github_email', $github_user->email);
+            $accountModel->setExtra($user_id, 'github_nickname', $github_user->nickname);
+            $accountModel->setExtra($user_id, 'github_homepage', ($github_user->user)['html_url']);
+            $accountModel->setExtra($user_id, 'github_token', $github_user->token, 101);
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
                 'platform' => 'Github',
-                'display_html' => 'You have successfully tied up the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
+                'display_html' => 'You have successfully tied up the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
                 You can log in to '.config("app.name").' later using this account',
                 'buttons' => [
                     [
@@ -90,18 +90,18 @@ 
                     ],
                 ]
             ]);
-        }else{
-            $ret = $accountModel->findExtra('github_id',$github_user->id);
-            if(!empty($ret)){
+        } else {
+            $ret=$accountModel->findExtra('github_id', $github_user->id);
+            if (!empty($ret)) {
                 Auth::loginUsingId($ret['uid']);
-                $user_id = Auth::user()->id;
-                $accountModel->setExtra($user_id,'github_email',$github_user->email);
-                $accountModel->setExtra($user_id,'github_nickname',$github_user->nickname);
-                $accountModel->setExtra($user_id,'github_homepage',($github_user->user)['html_url']);
-                $accountModel->setExtra($user_id,'github_token',$github_user->token,101);
+                $user_id=Auth::user()->id;
+                $accountModel->setExtra($user_id, 'github_email', $github_user->email);
+                $accountModel->setExtra($user_id, 'github_nickname', $github_user->nickname);
+                $accountModel->setExtra($user_id, 'github_homepage', ($github_user->user)['html_url']);
+                $accountModel->setExtra($user_id, 'github_token', $github_user->token, 101);
                 return redirect('/');
-            }else{
-                return view('oauth.index',[
+            } else {
+                return view('oauth.index', [
                     'page_title'=>"OAuth",
                     'site_title'=>config("app.name"),
                     'navigation'=>"OAuth",
@@ -124,16 +124,16 @@ 
 
     public function unbind()
     {
-        $accountModel = new AccountModel();
-        if($accountModel->getExtra(Auth::user()->id ,'github_id')){
-            return view('oauth.index',[
+        $accountModel=new AccountModel();
+        if ($accountModel->getExtra(Auth::user()->id, 'github_id')) {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
                 'platform' => 'Github',
                 'display_html' => 'You are trying to unbind the following two : <br />
                 Your '.config("app.name").' account : <span class="text-info">'.Auth::user()->email.'</span><br />
-                This Github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
+                This Github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
                 Make your decision carefully, although you can later establish the binding again',
                 'buttons' => [
                     [
@@ -147,8 +147,8 @@ 
                     ],
                 ]
             ]);
-        }else{
-            return view('oauth.index',[
+        } else {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
@@ -166,15 +166,15 @@ 
 
     public function confirmUnbind()
     {
-        $accountModel = new AccountModel();
-        $user_id = Auth::user()->id;
-        if($accountModel->getExtra($user_id ,'github_id')){
-            $accountModel->setExtra($user_id,'github_id',null);
-            $accountModel->setExtra($user_id,'github_email',null);
-            $accountModel->setExtra($user_id,'github_nickname',null);
-            $accountModel->setExtra($user_id,'github_homepage',null);
-            $accountModel->setExtra($user_id,'github_token',null);
-            return view('oauth.index',[
+        $accountModel=new AccountModel();
+        $user_id=Auth::user()->id;
+        if ($accountModel->getExtra($user_id, 'github_id')) {
+            $accountModel->setExtra($user_id, 'github_id', null);
+            $accountModel->setExtra($user_id, 'github_email', null);
+            $accountModel->setExtra($user_id, 'github_nickname', null);
+            $accountModel->setExtra($user_id, 'github_homepage', null);
+            $accountModel->setExtra($user_id, 'github_token', null);
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
@@ -187,8 +187,8 @@ 
                     ],
                 ]
             ]);
-        }else{
-            return view('oauth.index',[
+        } else {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",

app/Babel/Extension/noj/JudgeClient.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     }
     public function getLanguageConfigByLanguage($language, $spj=false)
     {
-        return $this->getLanguageConfigByKey($language.($spj?'_lang_spj_config':'_lang_config'));
+        return $this->getLanguageConfigByKey($language.($spj ? '_lang_spj_config' : '_lang_config'));
     }
     public function getLanguageConfigByKey($key)
     {

app/Models/Search/ProblemSearchModel.php

Spacing +8 added lines, -8 removed lines

@@ -13,20 +13,20 @@
 
     public function search($key)
     {
-        $result = [];
-        if(strlen($key) >= 2){
-            $ret = self::where('pcode', $key)
-                ->orWhereRaw('MATCH(`title`) AGAINST (? IN BOOLEAN MODE)',[$key])
+        $result=[];
+        if (strlen($key)>=2) {
+            $ret=self::where('pcode', $key)
+                ->orWhereRaw('MATCH(`title`) AGAINST (? IN BOOLEAN MODE)', [$key])
                 ->select('pcode', 'title')
                 ->limit(120)
                 ->get()->all();
-            if(!empty($ret)){
-                $result += $ret;
+            if (!empty($ret)) {
+                $result+=$ret;
             }
         }
-        $problemModel = new ProblemModel();
+        $problemModel=new ProblemModel();
         foreach ($result as $p_index => $p) {
-            if($problemModel->isBlocked($p['pid']) || $problemModel->isHidden($p["pid"])){
+            if ($problemModel->isBlocked($p['pid']) || $problemModel->isHidden($p["pid"])) {
                 unset($result[$p_index]);
             }
         }