ZsgsDesign / NOJ

app/Models/SubmissionModel.php

Spacing +13 added lines, -13 removed lines

@@ -412,7 +412,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;
@@ -430,15 +430,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 ($submission_info['cid'] && $contestModel->isContestRunning($submission_info['cid'])){
-            $sub['pid'] = $submission_info['pid'];
-            $sub['uid'] = $submission_info['uid'];
-            $sub['cid'] = $submission_info['cid'];
-            $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 ($submission_info['cid'] && $contestModel->isContestRunning($submission_info['cid'])) {
+            $sub['pid']=$submission_info['pid'];
+            $sub['uid']=$submission_info['uid'];
+            $sub['cid']=$submission_info['cid'];
+            $contestModel->updateContestRankTable($submission_info['cid'], $sub);
         }
         return $result;
     }
@@ -509,15 +509,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/Babel/Judge/Judger.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
         $result=$submissionModel->getWaitingSubmission();
         foreach ($result as $row) {
             $ocode=$row["ocode"];
-            if(!isset($this->judger[$ocode]) || is_null($this->judger[$ocode])) {
+            if (!isset($this->judger[$ocode]) || is_null($this->judger[$ocode])) {
                 $this->judger[$ocode]=self::create($ocode);
             }
             $this->judger[$ocode]->judge($row);
@@ -38,8 +38,8 @@ 
 
     public static function create($ocode) {
         $name=$ocode;
-        $className = "App\\Babel\\Extension\\$name\\Judger";
-        if(class_exists($className)) {
+        $className="App\\Babel\\Extension\\$name\\Judger";
+        if (class_exists($className)) {
             return new $className();
         } else {
             return null;

app/Babel/Submit/Submitter.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
         ];
 
         $submitter=self::create($this->post_data["oj"], $sub, $all_data);
-        if(!is_null($submitter)) $submitter->submit();
+        if (!is_null($submitter)) $submitter->submit();
 
         // insert submission
 
@@ -43,9 +43,9 @@ 
         $submission->updateSubmission($this->post_data["sid"], $sub);
     }
 
-    public static function create($oj,& $sub, $all_data) {
-        $className = "App\\Babel\\Extension\\$oj\\Submitter";
-        if(class_exists($className)) {
+    public static function create($oj, & $sub, $all_data) {
+        $className="App\\Babel\\Extension\\$oj\\Submitter";
+        if (class_exists($className)) {
             return new $className($sub, $all_data);
         } else {
             return null;

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
         ];
 
         $submitter=self::create($this->post_data["oj"], $sub, $all_data);
-        if(!is_null($submitter)) $submitter->submit();
+        if(!is_null($submitter)) {
+            $submitter->submit();
+        }
 
         // insert submission
 

app/Babel/Submit/Curl.php

Spacing +18 added lines, -18 removed lines

@@ -12,11 +12,11 @@ 
 
     protected 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:");
@@ -47,10 +47,10 @@ 
 
     protected 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["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";
 
         $ch=curl_init();
         curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__)."/../Cookies/cacert.pem");
@@ -74,15 +74,15 @@ 
 
     protected 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";
 
         $datapost=curl_init();
         $headers=array("Expect:");

Braces +90 added lines, -18 removed lines

@@ -12,11 +12,31 @@ 
 
     protected 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:");
@@ -47,10 +67,26 @@ 
 
     protected 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["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";
+        }
 
         $ch=curl_init();
         curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__)."/../Cookies/cacert.pem");
@@ -74,15 +110,51 @@ 
 
     protected 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";
+        }
 
         $datapost=curl_init();
         $headers=array("Expect:");

app/Babel/Crawl/CrawlerBase.php

Spacing +10 added lines, -10 removed lines

@@ -51,14 +51,14 @@ 
 
     private function _cacheImage($data)
     {
-        if(!isset($data["ori"]) || !isset($data["path"]) || !isset($data["baseurl"]) || !isset($data["space_deli"]) || !isset($data["cookie"])){
+        if (!isset($data["ori"]) || !isset($data["path"]) || !isset($data["baseurl"]) || !isset($data["space_deli"]) || !isset($data["cookie"])) {
             throw new Exception("data is not completely exist in cacheImage");
         }
-        $ori = $data["ori"];
-        $path = $data["path"];
-        $baseurl = $data["baseurl"];
-        $space_deli = $data["space_deli"];
-        $cookie = $data["cookie"];
+        $ori=$data["ori"];
+        $path=$data["path"];
+        $baseurl=$data["baseurl"];
+        $space_deli=$data["space_deli"];
+        $cookie=$data["cookie"];
 
         $para["path"]=$path;
         $para["base"]=$baseurl;
@@ -103,10 +103,10 @@ 
 
     public function procInfo($data)
     {
-        if(isset($data["path"]))       $path = $data["path"];             else throw new Exception("path is not exist in data");
-        if(isset($data["baseurl"]))    $baseurl = $data["baseurl"];       else throw new Exception("baseurl is not exist in data");
-        if(isset($data["space_deli"])) $space_deli = $data["space_deli"]; else $space_deli = true;
-        if(isset($data["cookie"]))     $cookie = $data["cookie"];         else $cookie = "";
+        if (isset($data["path"]))       $path=$data["path"]; else throw new Exception("path is not exist in data");
+        if (isset($data["baseurl"]))    $baseurl=$data["baseurl"]; else throw new Exception("baseurl is not exist in data");
+        if (isset($data["space_deli"])) $space_deli=$data["space_deli"]; else $space_deli=true;
+        if (isset($data["cookie"]))     $cookie=$data["cookie"]; else $cookie="";
 
         $this->pro["description"]=$this->_cacheImage($this->pro["description"], $path, $baseurl, $space_deli, $cookie);
         $this->pro["input"]=$this->_cacheImage($this->pro["input"], $path, $baseurl, $space_deli, $cookie);

Braces +20 added lines, -4 removed lines

@@ -103,10 +103,26 @@
 
     public function procInfo($data)
     {
-        if(isset($data["path"]))       $path = $data["path"];             else throw new Exception("path is not exist in data");
-        if(isset($data["baseurl"]))    $baseurl = $data["baseurl"];       else throw new Exception("baseurl is not exist in data");
-        if(isset($data["space_deli"])) $space_deli = $data["space_deli"]; else $space_deli = true;
-        if(isset($data["cookie"]))     $cookie = $data["cookie"];         else $cookie = "";
+        if(isset($data["path"])) {
+            $path = $data["path"];
+        } else {
+            throw new Exception("path is not exist in data");
+        }
+        if(isset($data["baseurl"])) {
+            $baseurl = $data["baseurl"];
+        } else {
+            throw new Exception("baseurl is not exist in data");
+        }
+        if(isset($data["space_deli"])) {
+            $space_deli = $data["space_deli"];
+        } else {
+            $space_deli = true;
+        }
+        if(isset($data["cookie"])) {
+            $cookie = $data["cookie"];
+        } else {
+            $cookie = "";
+        }
 
         $this->pro["description"]=$this->_cacheImage($this->pro["description"], $path, $baseurl, $space_deli, $cookie);
         $this->pro["input"]=$this->_cacheImage($this->pro["input"], $path, $baseurl, $space_deli, $cookie);