ZsgsDesign / NOJ

app/Models/ProblemModel.php

Spacing +2 added lines, -2 removed lines

@@ -177,9 +177,9 @@
 
     private function inteliAudit($uid, $content)
     {
-        if (strpos($content, '```')!==false){
+        if (strpos($content, '```')!==false) {
             $userSolutionHistory=DB::table("problem_solution")->where(['uid'=>$uid])->orderByDesc('updated_at')->first();
-            if (!empty($userSolutionHistory) && $userSolutionHistory["audit"]==1){
+            if (!empty($userSolutionHistory) && $userSolutionHistory["audit"]==1) {
                 return 1;
             }
         }

app/Models/Search/GroupSearchModel.php

Spacing +8 added lines, -8 removed lines

@@ -12,19 +12,19 @@
 
     public function search($key)
     {
-        $result = [];
+        $result=[];
         //group name or gcode find
-        if(strlen($key) >= 2){
-            $ret = self::where(function($query) use ($key){
-                $query->whereRaw('MATCH(`name`) AGAINST (? IN BOOLEAN MODE)',[$key])
+        if (strlen($key)>=2) {
+            $ret=self::where(function($query) use ($key){
+                $query->whereRaw('MATCH(`name`) AGAINST (? IN BOOLEAN MODE)', [$key])
                     ->orWhere('gcode', $key);
                 })
-                ->where('public',1)
-                ->select('gid','gcode', 'img', 'name', 'description')
+                ->where('public', 1)
+                ->select('gid', 'gcode', 'img', 'name', 'description')
                 ->limit(120)
                 ->get()->all();
-            if(!empty($ret)){
-                $result += $ret;
+            if (!empty($ret)) {
+                $result+=$ret;
             }
         }
 

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'])){
+            if ($problemModel->isBlocked($p['pid'])) {
                 unset($result[$p_index]);
             }
         }

app/Models/Search/ContestSearchModel.php

Spacing +11 added lines, -11 removed lines

@@ -15,26 +15,26 @@
 
     public function search($key)
     {
-        $result = [];
+        $result=[];
         //contest name find
-        if(strlen($key) >= 2){
-            $ret = self::whereRaw('MATCH(`name`) AGAINST (? IN BOOLEAN MODE)',[$key])
+        if (strlen($key)>=2) {
+            $ret=self::whereRaw('MATCH(`name`) AGAINST (? IN BOOLEAN MODE)', [$key])
                 ->select('cid', 'gid', 'name', 'rule', 'public', 'verified', 'practice', 'rated', 'anticheated', 'begin_time', 'end_time')
-                ->orderBy('end_time','DESC')
+                ->orderBy('end_time', 'DESC')
                 ->limit(120)
                 ->get()->all();
-            $user_id = Auth::user()->id;
-            $contestModel = new ContestModel();
-            foreach($ret as $c_index => $c){
-                if(!$contestModel->judgeClearance($c['cid'],$user_id)){
+            $user_id=Auth::user()->id;
+            $contestModel=new ContestModel();
+            foreach ($ret as $c_index => $c) {
+                if (!$contestModel->judgeClearance($c['cid'], $user_id)) {
                     unset($ret[$c_index]);
                 }
             }
-            if(!empty($ret)){
-                $result += $ret;
+            if (!empty($ret)) {
+                $result+=$ret;
             }
         }
-        if(!empty($result)) {
+        if (!empty($result)) {
             foreach ($result as &$contest) {
                 $contest["rule_parsed"]=$this->rule[$contest["rule"]];
                 $contest["date_parsed"]=[

app/Models/Search/UserSearchModel.php

Spacing +8 added lines, -8 removed lines

@@ -10,16 +10,16 @@
 
     public function search($key)
     {
-        $result = [];
-        if(strlen($key) >= 2){
-            $ret = self::where('email',$key)
-                ->orWhereRaw('MATCH(`name`) AGAINST (? IN BOOLEAN MODE)',[$key])
-                ->select('id','avatar', 'name',  'describes', 'professional_rate')
-                ->orderBy('professional_rate','DESC')
+        $result=[];
+        if (strlen($key)>=2) {
+            $ret=self::where('email', $key)
+                ->orWhereRaw('MATCH(`name`) AGAINST (? IN BOOLEAN MODE)', [$key])
+                ->select('id', 'avatar', 'name', 'describes', 'professional_rate')
+                ->orderBy('professional_rate', 'DESC')
                 ->limit(120)
                 ->get()->all();
-            if(!empty($ret)){
-                $result += $ret;
+            if (!empty($ret)) {
+                $result+=$ret;
             }
         }
         return $result;

app/Models/Babel/ExtensionModel.php

Spacing +8 added lines, -8 removed lines

@@ -21,8 +21,8 @@ 
     {
         $ret=[];
         $marketspaceRaw=self::getRemote();
-        if(empty($marketspaceRaw)) return [];
-        foreach($marketspaceRaw["packages"] as $extension){
+        if (empty($marketspaceRaw)) return [];
+        foreach ($marketspaceRaw["packages"] as $extension) {
             $temp=[
                 "details"=>$extension,
                 "status"=>0,
@@ -31,11 +31,11 @@ 
                 "settings"=>null,
                 "available"=>null
             ];
-            $temp["details"]["typeParsed"]=$temp["details"]["type"]=="virtual-judge"?"VirtualJudge":"OnlineJudge";
+            $temp["details"]["typeParsed"]=$temp["details"]["type"]=="virtual-judge" ? "VirtualJudge" : "OnlineJudge";
             try {
                 try {
                     $BabelConfig=json_decode(file_get_contents(babel_path("Extension/{$extension['code']}/babel.json")), true);
-                }catch (Throwable $e){
+                } catch (Throwable $e) {
                     $BabelConfig=[];
                 }
                 if (!empty($BabelConfig)) {
@@ -47,12 +47,12 @@ 
                     $temp["updatable"]=$remoteVersion->isGreaterThan($downloadedVersion);
 
                     $installedConfig=OJModel::where(["ocode"=>$extension["code"]])->first();
-                    if (is_null($installedConfig)){
+                    if (is_null($installedConfig)) {
                         $temp["status"]=1;
                     } else {
                         $temp["version"]=$installedConfig->version; // local installed version
                         $installedVersion=new Version($temp["version"]);
-                        if ($downloadedVersion->isGreaterThan($installedVersion)){
+                        if ($downloadedVersion->isGreaterThan($installedVersion)) {
                             $temp["status"]=1;
                         } else {
                             $temp["status"]=2;
@@ -61,7 +61,7 @@ 
                         $temp["available"]=$installedConfig->status;
                     }
                 }
-            }catch (Throwable $e){
+            } catch (Throwable $e) {
                 $temp["status"]=-1;
             }
             $ret[]=$temp;
@@ -74,7 +74,7 @@ 
     {
         try {
             return json_decode(file_get_contents(env("BABEL_MIRROR", "https://acm.njupt.edu.cn/babel")."/babel.json"), true);
-        }catch(Throwable $e){
+        } catch (Throwable $e) {
             return [];
         }
     }

Braces +6 added lines, -4 removed lines

@@ -21,7 +21,9 @@ 
     {
         $ret=[];
         $marketspaceRaw=self::getRemote();
-        if(empty($marketspaceRaw)) return [];
+        if(empty($marketspaceRaw)) {
+            return [];
+        }
         foreach($marketspaceRaw["packages"] as $extension){
             $temp=[
                 "details"=>$extension,
@@ -35,7 +37,7 @@ 
             try {
                 try {
                     $BabelConfig=json_decode(file_get_contents(babel_path("Extension/{$extension['code']}/babel.json")), true);
-                }catch (Throwable $e){
+                } catch (Throwable $e){
                     $BabelConfig=[];
                 }
                 if (!empty($BabelConfig)) {
@@ -61,7 +63,7 @@ 
                         $temp["available"]=$installedConfig->status;
                     }
                 }
-            }catch (Throwable $e){
+            } catch (Throwable $e){
                 $temp["status"]=-1;
             }
             $ret[]=$temp;
@@ -74,7 +76,7 @@ 
     {
         try {
             return json_decode(file_get_contents(env("BABEL_MIRROR", "https://acm.njupt.edu.cn/babel")."/babel.json"), true);
-        }catch(Throwable $e){
+        } catch(Throwable $e){
             return [];
         }
     }

app/Models/Update/UpdateModel.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
                 "name"=>$versionInfo[0]["name"],
                 "updatable"=>$updatable
             ];
-        }catch(Throwable $e){
+        } catch (Throwable $e) {
             return null;
         }
     }

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
                 "name"=>$versionInfo[0]["name"],
                 "updatable"=>$updatable
             ];
-        }catch(Throwable $e){
+        } catch(Throwable $e){
             return null;
         }
     }

app/Babel/Synchronize/Synchronizer.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         } catch (ErrorException $e) {
         } catch (Exception $e) {
         }
-        $className = "App\\Babel\\Extension\\$oj\\$synchronizerProvider";
+        $className="App\\Babel\\Extension\\$oj\\$synchronizerProvider";
         if (class_exists($className)) {
             return new $className($all_data);
         } else {

app/Babel/Submit/Curl.php

Spacing +19 added lines, -19 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,11 +54,11 @@ 
 
     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 $handle = false;
+        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 $handle=false;
 
         $handle=urlencode($handle);
 
@@ -85,15 +85,15 @@ 
 
     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["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";
 
         $handle=urlencode($handle);
 

Braces +95 added lines, -19 removed lines

@@ -18,11 +18,31 @@ 
 
     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,11 +74,31 @@ 
 
     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 $handle = false;
+        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 {
+            $handle = false;
+        }
 
         $handle=urlencode($handle);
 
@@ -85,15 +125,51 @@ 
 
     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["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";
+        }
 
         $handle=urlencode($handle);