ZsgsDesign / NOJ

app/Exports/AccountExport.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
     public function __construct(array $data)
     {
-        $this->data = $data;
+        $this->data=$data;
     }
 
     public function array(): array

app/Exports/GroupAnalysisExport.php

Indentation +4 added lines, -4 removed lines

@@ -28,8 +28,8 @@ 
     }
 
     /**
-    * @return array
-    */
+     * @return array
+     */
     public function registerEvents(): array
     {
         return [
@@ -46,8 +46,8 @@ 
     }
 
     /**
-    * @return \Illuminate\Support\Collection
-    */
+     * @return \Illuminate\Support\Collection
+     */
     public function collection()
     {
         $maxium = $this->config['maxium'] ?? false;

Spacing +52 added lines, -52 removed lines

@@ -16,16 +16,16 @@ 
     private $member_data;
     private $config;
 
-    public function __construct($data, $config = [])
+    public function __construct($data, $config=[])
     {
-        if ($config['mode'] == 'contest') {
-            $this->contest_data = $data['contest_data'];
-            $this->member_data = $data['member_data'];
+        if ($config['mode']=='contest') {
+            $this->contest_data=$data['contest_data'];
+            $this->member_data=$data['member_data'];
         } else {
-            $this->member_data = $data['member_data'];
-            $this->tag_problems = $data['tag_problems'];
+            $this->member_data=$data['member_data'];
+            $this->tag_problems=$data['tag_problems'];
         }
-        $this->config = $config;
+        $this->config=$config;
     }
 
     /**
@@ -34,9 +34,9 @@ 
     public function registerEvents(): array
     {
         return [
-            AfterSheet::class => function (AfterSheet $event) {
-                if ($this->config['mode'] === 'contest') {
-                    $mergeCell = ['A1:A2','B1:E1'];
+            AfterSheet::class => function(AfterSheet $event) {
+                if ($this->config['mode']==='contest') {
+                    $mergeCell=['A1:A2', 'B1:E1'];
                     foreach ($this->contest_data as $c) {
                         array_push($mergeCell, $this->mergeCellColumnNext());
                     }
@@ -51,46 +51,46 @@ 
     */
     public function collection()
     {
-        $maxium = $this->config['maxium'] ?? false;
-        $percent = $this->config['percent'] ?? false;
+        $maxium=$this->config['maxium'] ?? false;
+        $percent=$this->config['percent'] ?? false;
 
-        if ($this->config['mode'] == 'contest') {
-            $row_1 = ['Member','Total','','',''];
-            $row_2 = ['','Elo','Rank','Solved','Penalty'];
+        if ($this->config['mode']=='contest') {
+            $row_1=['Member', 'Total', '', '', ''];
+            $row_2=['', 'Elo', 'Rank', 'Solved', 'Penalty'];
             foreach ($this->contest_data as $contest) {
-                array_push($row_1, $contest['name'], '','');
-                array_push($row_2, 'Rank','Solved', 'Penalty');
+                array_push($row_1, $contest['name'], '', '');
+                array_push($row_2, 'Rank', 'Solved', 'Penalty');
             }
-            $data = [$row_1,$row_2];
+            $data=[$row_1, $row_2];
             foreach ($this->member_data as $member) {
-                $display_name = $member['name'];
+                $display_name=$member['name'];
                 if (!empty($member['nick_name'])) {
-                    $display_name .= ' ('.$member['nick_name'].')';
+                    $display_name.=' ('.$member['nick_name'].')';
                 }
-                $row = [
+                $row=[
                     $display_name,
                     $member['elo'],
                     !empty($member['rank_ave']) ? round($member['rank_ave'], 1) : '-',
-                    $percent === 'true'  ? ($member['problem_all'] != 0 ? round($member['solved_all'] / $member['problem_all'] * 100, 1) : '-'). ' %'
-                            : ($maxium === 'true'  ? $member['solved_all'] . ' / ' . $member['problem_all'] : $member['solved_all']),
+                    $percent==='true' ? ($member['problem_all']!=0 ? round($member['solved_all'] / $member['problem_all'] * 100, 1) : '-').' %'
+                            : ($maxium==='true' ? $member['solved_all'].' / '.$member['problem_all'] : $member['solved_all']),
                     round($member['penalty']),
                 ];
                 foreach ($this->contest_data as $contest) {
                     if (in_array($contest['cid'], array_keys($member['contest_detial']))) {
-                        $contest_detial = $member['contest_detial'][$contest['cid']];
+                        $contest_detial=$member['contest_detial'][$contest['cid']];
                         array_push(
                             $row,
                             $contest_detial['rank'],
-                            $percent === 'true' ? (round($contest_detial['solved'] / $contest_detial['problems'] * 100, 1) . ' %')
-                                    : ($maxium === 'true' ? $contest_detial['solved'].' / '.$contest_detial['problems'] : $contest_detial['solved']),
+                            $percent==='true' ? (round($contest_detial['solved'] / $contest_detial['problems'] * 100, 1).' %')
+                                    : ($maxium==='true' ? $contest_detial['solved'].' / '.$contest_detial['problems'] : $contest_detial['solved']),
                             round($contest_detial['penalty'])
                         );
                     } else {
                         array_push(
                             $row,
                             '-',
-                            $percent === 'true' ? '- %'
-                                    : ($maxium === 'true' ? '- / -' : ' - '),
+                            $percent==='true' ? '- %'
+                                    : ($maxium==='true' ? '- / -' : ' - '),
                             0
                         );
                     }
@@ -98,27 +98,27 @@ 
                 array_push($data, $row);
             }
         } else {
-            $row_1 = ['Member'];
-            $row_2 = [''];
+            $row_1=['Member'];
+            $row_2=[''];
             foreach ($this->tag_problems as $tag => $tag_problem_set) {
                 array_push($row_1, $tag);
                 array_push($row_2, 'Solved');
             }
-            $data = [$row_1,$row_2];
+            $data=[$row_1, $row_2];
             foreach ($this->member_data as $member) {
-                $display_name = $member['name'];
+                $display_name=$member['name'];
                 if (!empty($member['nick_name'])) {
-                    $display_name .= ' ('.$member['nick_name'].')';
+                    $display_name.=' ('.$member['nick_name'].')';
                 }
-                $row = [
+                $row=[
                     $display_name,
                 ];
                 foreach ($member['completion'] as $tag => $tag_completion) {
-                    $count = count($tag_completion);
-                    $solved = eval('return '.join('+', array_values($tag_completion)).';');
+                    $count=count($tag_completion);
+                    $solved=eval('return '.join('+', array_values($tag_completion)).';');
                     array_push(
                         $row,
-                        $percent === 'true' ? (round($solved / $count * 100, 1) . ' %') : ($maxium  === 'true' ? $solved .' / '.$count : $solved)
+                        $percent==='true' ? (round($solved / $count * 100, 1).' %') : ($maxium==='true' ? $solved.' / '.$count : $solved)
                     );
                 }
                 array_push($data, $row);
@@ -129,33 +129,33 @@ 
 
     private function mergeCellColumnNext()
     {
-        static $columns = [
-            [2],[4]
+        static $columns=[
+            [2], [4]
         ];
-        $columns_str = ['',''];
-        $chars = str_split('ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+        $columns_str=['', ''];
+        $chars=str_split('ABCDEFGHIJKLMNOPQRSTUVWXYZ');
         foreach ($columns as $key => &$column) {
-            $column[0] += 3;
-            if ($column[0] > 25) {
+            $column[0]+=3;
+            if ($column[0]>25) {
                 if (isset($column[1])) {
-                    $column[1] += 1;
-                    if ($column[1] > 25) {
+                    $column[1]+=1;
+                    if ($column[1]>25) {
                         if (isset($column[2])) {
-                            $column[2] += 1;
+                            $column[2]+=1;
                         } else {
-                            $column[2] = 0;
+                            $column[2]=0;
                         }
                     }
                 } else {
-                    $column[1] = 0;
+                    $column[1]=0;
                 }
             }
-            $columns_str[$key] = '';
-            $reverse_column = array_reverse($column);
+            $columns_str[$key]='';
+            $reverse_column=array_reverse($column);
             foreach ($reverse_column as $ord) {
-                $columns_str[$key] .= $chars[$ord];
+                $columns_str[$key].=$chars[$ord];
             }
-            $columns_str[$key] .= '1';
+            $columns_str[$key].='1';
         }
         return $columns_str[0].':'.$columns_str[1];
     }

app/Http/Controllers/Auth/ForgotPasswordController.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     public function showLinkRequestForm()
     {
-        return view('auth.passwords.email',[
+        return view('auth.passwords.email', [
             'page_title'=>"Reset Password",
             'site_title'=>config("app.name"),
             'navigation' => "Account"

app/Http/Middleware/Privileged.php

Spacing +4 added lines, -4 removed lines

@@ -18,16 +18,16 @@
     public function handle($request, Closure $next)
     {
         if (Auth::check()) {
-            if(isset($request->gcode)){
+            if (isset($request->gcode)) {
                 //group privilege
                 $groupModel=new GroupModel();
-                if($groupModel->judgeClearance($groupModel->gid($request->gcode), Auth::user()->id)>=2){
+                if ($groupModel->judgeClearance($groupModel->gid($request->gcode), Auth::user()->id)>=2) {
                     return $next($request);
                 }
-            }elseif(isset($request->cid)) {
+            }elseif (isset($request->cid)) {
                 //contest privilege
                 $contestModel=new ContestModel();
-                if($contestModel->judgeClearance($request->cid, Auth::user()->id)==3){
+                if ($contestModel->judgeClearance($request->cid, Auth::user()->id)==3) {
                     return $next($request);
                 }
             }

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
                 if($groupModel->judgeClearance($groupModel->gid($request->gcode), Auth::user()->id)>=2){
                     return $next($request);
                 }
-            }elseif(isset($request->cid)) {
+            } elseif(isset($request->cid)) {
                 //contest privilege
                 $contestModel=new ContestModel();
                 if($contestModel->judgeClearance($request->cid, Auth::user()->id)==3){

app/Models/RankModel.php

Spacing +24 added lines, -24 removed lines

@@ -7,7 +7,7 @@ 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Arr;
 use App\Models\Rating\RatingCalculator;
-use Cache,Redis;
+use Cache, Redis;
 
 class RankModel extends Model
 {
@@ -65,28 +65,28 @@ 
 
     public static function getColor($rankTitle)
     {
-        if(is_null($rankTitle)) return "";
+        if (is_null($rankTitle)) return "";
         return self::$casualRanking[$rankTitle];
     }
 
     public static function getProfessionalColor($rankTitle)
     {
-        if(is_null($rankTitle)) return self::$professionalRanking["None"];
+        if (is_null($rankTitle)) return self::$professionalRanking["None"];
         return self::$professionalRanking[$rankTitle];
     }
 
     public function list($num)
     {
         $rankList=Cache::tags(['rank'])->get('general');
-        if($rankList==null) $rankList=[];
-        $rankList=array_slice($rankList,0,$num);
-        $userInfoRaw=DB::table("users")->select("id as uid","avatar","name")->get()->all();
+        if ($rankList==null) $rankList=[];
+        $rankList=array_slice($rankList, 0, $num);
+        $userInfoRaw=DB::table("users")->select("id as uid", "avatar", "name")->get()->all();
         $userInfo=[];
-        foreach($userInfoRaw as $u){
+        foreach ($userInfoRaw as $u) {
             $userInfo[$u["uid"]]=$u;
         }
-        foreach($rankList as &$r){
-            $r["details"]=isset($userInfo[$r["uid"]])?$userInfo[$r["uid"]]:[];
+        foreach ($rankList as &$r) {
+            $r["details"]=isset($userInfo[$r["uid"]]) ? $userInfo[$r["uid"]] : [];
         }
         // var_dump($rankList); exit();
         return $rankList;
@@ -109,8 +109,8 @@ 
                     $rankSolved=$rankItem["totValue"];
                 }
                 $rankTitle=$this->getRankTitle($rankValue);
-                Cache::tags(['rank',$rankItem["uid"]])->put("rank", $rankValue, 86400);
-                Cache::tags(['rank',$rankItem["uid"]])->put("title", $rankTitle, 86400);
+                Cache::tags(['rank', $rankItem["uid"]])->put("rank", $rankValue, 86400);
+                Cache::tags(['rank', $rankItem["uid"]])->put("title", $rankTitle, 86400);
                 $rankListCached[]=[
                     "uid"=>$rankItem["uid"],
                     "rank"=>$rankValue,
@@ -127,14 +127,14 @@ 
 
     public function getProfessionalRanking()
     {
-        $professionalRankList = [];
-        $verifiedUsers = DB::table("users")->select("professional_rate","id as uid","avatar","name")->get()->all();
-        $rankIter = 0;
-        foreach($verifiedUsers as $user) {
-            $rankVal = $user['professional_rate'];
-            $rankTitle = self::getProfessionalTitle($rankVal);
-            $titleColor = self::getProfessionalColor($rankTitle);
-            $professionalRankList[$rankIter++] = [
+        $professionalRankList=[];
+        $verifiedUsers=DB::table("users")->select("professional_rate", "id as uid", "avatar", "name")->get()->all();
+        $rankIter=0;
+        foreach ($verifiedUsers as $user) {
+            $rankVal=$user['professional_rate'];
+            $rankTitle=self::getProfessionalTitle($rankVal);
+            $titleColor=self::getProfessionalColor($rankTitle);
+            $professionalRankList[$rankIter++]=[
                 "name"=>$user["name"],
                 "uid"=>$user["uid"],
                 "avatar"=>$user["avatar"],
@@ -156,7 +156,7 @@ 
                 $tot+=$c;
             }
             foreach ($this->casualRankingPer as &$c) {
-                $c=round($c*$totUsers/$tot);
+                $c=round($c * $totUsers / $tot);
                 $cur+=$c;
                 $c=$cur;
             }
@@ -167,16 +167,16 @@ 
 
     public function getRankTitle($rankVal)
     {
-        foreach($this->casualRankingPer as $title=>$c){
-            if($rankVal<=$c) return $title;
+        foreach ($this->casualRankingPer as $title=>$c) {
+            if ($rankVal<=$c) return $title;
         }
         return Arr::last($this->casualRankingPer);
     }
 
     public static function getProfessionalTitle($rankVal)
     {
-        foreach(self::$professionalRankingPer as $title=>$point) {
-            if($rankVal >= $point) return $title;
+        foreach (self::$professionalRankingPer as $title=>$point) {
+            if ($rankVal>=$point) return $title;
         }
         return Arr::last(self::$professionalRankingPer);
     }

Braces +15 added lines, -5 removed lines

@@ -65,20 +65,26 @@ 
 
     public static function getColor($rankTitle)
     {
-        if(is_null($rankTitle)) return "";
+        if(is_null($rankTitle)) {
+            return "";
+        }
         return self::$casualRanking[$rankTitle];
     }
 
     public static function getProfessionalColor($rankTitle)
     {
-        if(is_null($rankTitle)) return self::$professionalRanking["None"];
+        if(is_null($rankTitle)) {
+            return self::$professionalRanking["None"];
+        }
         return self::$professionalRanking[$rankTitle];
     }
 
     public function list($num)
     {
         $rankList=Cache::tags(['rank'])->get('general');
-        if($rankList==null) $rankList=[];
+        if($rankList==null) {
+            $rankList=[];
+        }
         $rankList=array_slice($rankList,0,$num);
         $userInfoRaw=DB::table("users")->select("id as uid","avatar","name")->get()->all();
         $userInfo=[];
@@ -168,7 +174,9 @@ 
     public function getRankTitle($rankVal)
     {
         foreach($this->casualRankingPer as $title=>$c){
-            if($rankVal<=$c) return $title;
+            if($rankVal<=$c) {
+                return $title;
+            }
         }
         return Arr::last($this->casualRankingPer);
     }
@@ -176,7 +184,9 @@ 
     public static function getProfessionalTitle($rankVal)
     {
         foreach(self::$professionalRankingPer as $title=>$point) {
-            if($rankVal >= $point) return $title;
+            if($rankVal >= $point) {
+                return $title;
+            }
         }
         return Arr::last(self::$professionalRankingPer);
     }

app/Console/Commands/Babel/SyncContest.php

Spacing +8 added lines, -8 removed lines

@@ -14,14 +14,14 @@ 
      *
      * @var string
      */
-    protected $signature = 'babel:sync {extension : The package name of the extension} {--vcid= : The target contest of the Crawler} {--gid=1 : The holding group}';
+    protected $signature='babel:sync {extension : The package name of the extension} {--vcid= : The target contest of the Crawler} {--gid=1 : The holding group}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Crawl contests for a given Babel Extension to NOJ';
+    protected $description='Crawl contests for a given Babel Extension to NOJ';
 
     /**
      * Create a new command instance.
@@ -40,16 +40,16 @@ 
      */
     public function handle()
     {
-        $extension = $this->argument('extension');
-        $vcid = $this->option('vcid');
-        $gid = $this->option('gid');
-        $className = "App\\Babel\\Extension\\$extension\\Synchronizer";
-        $all_data = [
+        $extension=$this->argument('extension');
+        $vcid=$this->option('vcid');
+        $gid=$this->option('gid');
+        $className="App\\Babel\\Extension\\$extension\\Synchronizer";
+        $all_data=[
             'oj'=>$extension,
             'vcid'=>$vcid,
             'gid'=>$gid,
         ];
-        $Sync = new $className($all_data);
+        $Sync=new $className($all_data);
         $Sync->crawlContest();
     }
 }

app/Console/Commands/Babel/RefreshRank.php

Spacing +9 added lines, -9 removed lines

@@ -14,14 +14,14 @@ 
      *
      * @var string
      */
-    protected $signature = 'babel:rerank {extension : The package name of the extension} {--vcid= : The target contest of the Crawler} {--gid=1 : The holding group} {--cid= : The NOJ contest}';
+    protected $signature='babel:rerank {extension : The package name of the extension} {--vcid= : The target contest of the Crawler} {--gid=1 : The holding group} {--cid= : The NOJ contest}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Refresh Rank from a remote contest';
+    protected $description='Refresh Rank from a remote contest';
 
     /**
      * Create a new command instance.
@@ -40,18 +40,18 @@ 
      */
     public function handle()
     {
-        $extension = $this->argument('extension');
-        $vcid = $this->option('vcid');
-        $gid = $this->option('gid');
-        $cid = $this->option('cid');
-        $className = "App\\Babel\\Extension\\$extension\\Synchronizer";
-        $all_data = [
+        $extension=$this->argument('extension');
+        $vcid=$this->option('vcid');
+        $gid=$this->option('gid');
+        $cid=$this->option('cid');
+        $className="App\\Babel\\Extension\\$extension\\Synchronizer";
+        $all_data=[
             'oj'=>$extension,
             'vcid'=>$vcid,
             'gid'=>$gid,
             'cid'=>$cid,
         ];
-        $Sync = new $className($all_data);
+        $Sync=new $className($all_data);
         $Sync->crawlRank();
     }
 }

app/Http/Controllers/Ajax/SearchController.php

Spacing +13 added lines, -13 removed lines

@@ -23,34 +23,34 @@
         if (!$request->has('search_key')) {
             return ResponseModel::err(1003);
         }
-        $key  = $request->input('search_key');
-        $all_result  = [];
-        $search_from = [
+        $key=$request->input('search_key');
+        $all_result=[];
+        $search_from=[
             'users'         => \App\Models\Search\UserSearchModel::class,
             'problems'      => \App\Models\Search\ProblemSearchModel::class,
             'contests'      => \App\Models\Search\ContestSearchModel::class,
             'groups'        => \App\Models\Search\GroupSearchModel::class,
         ];
         foreach ($search_from as $name => $model_class) {
-            if(class_exists($model_class)){
-                $model = new $model_class();
-                if(!method_exists($model,'search')){
-                    $all_result[$name] = [
+            if (class_exists($model_class)) {
+                $model=new $model_class();
+                if (!method_exists($model, 'search')) {
+                    $all_result[$name]=[
                         'code' => -1,
                         'msg' => 'cannot find search method in '.$model_class
                     ];
                     continue;
                 }
-                $result = $model->search($key);
-                $all_result[$name] = $result;
-            }else{
-                $all_result[$name] = [
+                $result=$model->search($key);
+                $all_result[$name]=$result;
+            } else {
+                $all_result[$name]=[
                     'code' => -1,
                     'msg' => 'cannot find class named '.$model_class
-                ];;
+                ]; ;
                 continue;
             }
         }
-        return ResponseModel::success(200,'Successful',$all_result);
+        return ResponseModel::success(200, 'Successful', $all_result);
     }
 }

Braces +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
                 }
                 $result = $model->search($key);
                 $all_result[$name] = $result;
-            }else{
+            } else{
                 $all_result[$name] = [
                     'code' => -1,
                     'msg' => 'cannot find class named '.$model_class

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