ZsgsDesign / NOJ

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

app/Babel/Submit/Submitter.php

Spacing +1 added lines, -1 removed lines

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

app/Babel/Judge/Judger.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         } catch (ErrorException $e) {
         } catch (Exception $e) {
         }
-        $className = "App\\Babel\\Extension\\$name\\$judgerProvider";
+        $className="App\\Babel\\Extension\\$name\\$judgerProvider";
         if (class_exists($className)) {
             return new $className();
         } else {

app/Babel/Install/InstallerBase.php

Spacing +9 added lines, -9 removed lines

@@ -38,8 +38,8 @@ 
             //writing database
             $this->transactionDB();
 
-        }catch(Throwable $e){
-            if ($e->getMessage()!==""){
+        } catch (Throwable $e) {
+            if ($e->getMessage()!=="") {
                 $this->command->line("\n  <bg=red;fg=white> {$e->getMessage()} </>\n");
             }
         }
@@ -58,7 +58,7 @@ 
     public function __construct($class)
     {
         $this->command=$class;
-        $this->versionParser = new VersionConstraintParser();
+        $this->versionParser=new VersionConstraintParser();
     }
 
 
@@ -136,8 +136,8 @@ 
     private 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 {
@@ -153,7 +153,7 @@ 
 
     private function parseVersion()
     {
-        if(empty($this->babelConfig)){
+        if (empty($this->babelConfig)) {
             throw new Exception('Missing babel.json Config file.');
         }
 
@@ -220,7 +220,7 @@ 
 
             DB::commit();
 
-        }catch(Throwable $e){
+        } catch (Throwable $e) {
             DB::rollback();
             if ($e->getMessage()!=="") {
                 $this->command->line("\n  <bg=red;fg=white> {$e->getMessage()} </>\n");
@@ -308,9 +308,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));

Braces +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
             //writing database
             $this->transactionDB();
 
-        }catch(Throwable $e){
+        } catch(Throwable $e){
             if ($e->getMessage()!==""){
                 $this->command->line("\n  <bg=red;fg=white> {$e->getMessage()} </>\n");
             }
@@ -220,7 +220,7 @@ 
 
             DB::commit();
 
-        }catch(Throwable $e){
+        } catch(Throwable $e){
             DB::rollback();
             if ($e->getMessage()!=="") {
                 $this->command->line("\n  <bg=red;fg=white> {$e->getMessage()} </>\n");

app/Babel/Crawl/CrawlerBase.php

Spacing +12 added lines, -12 removed lines

@@ -88,11 +88,11 @@ 
         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;
@@ -105,7 +105,7 @@ 
             $reg="/< *im[a]?g[^>]*src *= *[\"\\']?([^\"\\'>]*)[^>]*>/si";
         }
 
-        return preg_replace_callback($reg, function ($matches) use ($para) {
+        return preg_replace_callback($reg, function($matches) use ($para) {
             global $config;
             $url=trim($matches[1]);
             if (stripos($url, "http://")===false && stripos($url, "https://")===false) {
@@ -138,24 +138,24 @@ 
     public function procInfo($data)
     {
         if (isset($data["path"])) {
-            $path = $data["path"];
+            $path=$data["path"];
         } else {
             throw new Exception("path is not exist in data");
         }
         if (isset($data["baseurl"])) {
-            $baseurl = $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"];
+            $space_deli=$data["space_deli"];
         } else {
-            $space_deli = true;
+            $space_deli=true;
         }
         if (isset($data["cookie"])) {
-            $cookie = $data["cookie"];
+            $cookie=$data["cookie"];
         } else {
-            $cookie = "";
+            $cookie="";
         }
 
         $this->pro["description"]=$this->_cacheImage($this->pro["description"], $path, $baseurl, $space_deli, $cookie);

app/Babel/Crawl/Crawler.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         } catch (ErrorException $e) {
         } catch (Exception $e) {
         }
-        $className = "App\\Babel\\Extension\\$name\\$crawlerProvider";
+        $className="App\\Babel\\Extension\\$name\\$crawlerProvider";
         if (class_exists($className)) {
             $temp=new $className();
             $temp->importCommandLine($commandLineObject);