@@ -18,16 +18,16 @@ |
||
| 18 | 18 | public function handle($request, Closure $next) |
| 19 | 19 | { |
| 20 | 20 | if (Auth::check()) { |
| 21 | - if(isset($request->gcode)){ |
|
| 21 | + if (isset($request->gcode)) { |
|
| 22 | 22 | //group privilege |
| 23 | 23 | $groupModel=new GroupModel(); |
| 24 | - if($groupModel->judgeClearance($groupModel->gid($request->gcode), Auth::user()->id)>=2){ |
|
| 24 | + if ($groupModel->judgeClearance($groupModel->gid($request->gcode), Auth::user()->id)>=2) { |
|
| 25 | 25 | return $next($request); |
| 26 | 26 | } |
| 27 | - }elseif(isset($request->cid)) { |
|
| 27 | + }elseif (isset($request->cid)) { |
|
| 28 | 28 | //contest privilege |
| 29 | 29 | $contestModel=new ContestModel(); |
| 30 | - if($contestModel->judgeClearance($request->cid, Auth::user()->id)==3){ |
|
| 30 | + if ($contestModel->judgeClearance($request->cid, Auth::user()->id)==3) { |
|
| 31 | 31 | return $next($request); |
| 32 | 32 | } |
| 33 | 33 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | if($groupModel->judgeClearance($groupModel->gid($request->gcode), Auth::user()->id)>=2){ |
| 25 | 25 | return $next($request); |
| 26 | 26 | } |
| 27 | - }elseif(isset($request->cid)) { |
|
| 27 | + } elseif(isset($request->cid)) { |
|
| 28 | 28 | //contest privilege |
| 29 | 29 | $contestModel=new ContestModel(); |
| 30 | 30 | if($contestModel->judgeClearance($request->cid, Auth::user()->id)==3){ |
@@ -14,14 +14,14 @@ discard block |
||
| 14 | 14 | * |
| 15 | 15 | * @var string |
| 16 | 16 | */ |
| 17 | - protected $signature = 'babel:crawl {extension : The package name of the extension} {--action=crawl_problem : The action of the Crawler} {--con=all : The target problemset of the Crawler} {--cached : Whether cached or not}'; |
|
| 17 | + protected $signature='babel:crawl {extension : The package name of the extension} {--action=crawl_problem : The action of the Crawler} {--con=all : The target problemset of the Crawler} {--cached : Whether cached or not}'; |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * The console command description. |
| 21 | 21 | * |
| 22 | 22 | * @var string |
| 23 | 23 | */ |
| 24 | - protected $description = 'Crawl problems for a given Babel Extension to NOJ'; |
|
| 24 | + protected $description='Crawl problems for a given Babel Extension to NOJ'; |
|
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * Create a new command instance. |
@@ -40,10 +40,10 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function handle() |
| 42 | 42 | { |
| 43 | - $extension = $this->argument('extension'); |
|
| 44 | - $action = $this->option('action'); |
|
| 45 | - $con = $this->option('con'); |
|
| 46 | - $cached = $this->option('cached'); |
|
| 43 | + $extension=$this->argument('extension'); |
|
| 44 | + $action=$this->option('action'); |
|
| 45 | + $con=$this->option('con'); |
|
| 46 | + $cached=$this->option('cached'); |
|
| 47 | 47 | $babel=new Babel(); |
| 48 | 48 | $babel->crawl([ |
| 49 | 49 | "name" => $extension, |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | |
| 18 | 18 | public function fetch() |
| 19 | 19 | { |
| 20 | - $list=DB::table($this->table)->orderBy('post_date','desc')->get()->all(); |
|
| 20 | + $list=DB::table($this->table)->orderBy('post_date', 'desc')->get()->all(); |
|
| 21 | 21 | if (empty($list)) { |
| 22 | 22 | return []; |
| 23 | 23 | } |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | use Illuminate\Support\Facades\DB; |
| 8 | 8 | use Illuminate\Support\Arr; |
| 9 | 9 | use App\Models\Rating\RatingCalculator; |
| 10 | -use Cache,Redis; |
|
| 10 | +use Cache, Redis; |
|
| 11 | 11 | |
| 12 | 12 | class RankModel extends Model |
| 13 | 13 | { |
@@ -65,28 +65,28 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | public static function getColor($rankTitle) |
| 67 | 67 | { |
| 68 | - if(is_null($rankTitle)) return ""; |
|
| 68 | + if (is_null($rankTitle)) return ""; |
|
| 69 | 69 | return self::$casualRanking[$rankTitle]; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public static function getProfessionalColor($rankTitle) |
| 73 | 73 | { |
| 74 | - if(is_null($rankTitle)) return self::$professionalRanking["None"]; |
|
| 74 | + if (is_null($rankTitle)) return self::$professionalRanking["None"]; |
|
| 75 | 75 | return self::$professionalRanking[$rankTitle]; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | public function list($num) |
| 79 | 79 | { |
| 80 | 80 | $rankList=Cache::tags(['rank'])->get('general'); |
| 81 | - if($rankList==null) $rankList=[]; |
|
| 82 | - $rankList=array_slice($rankList,0,$num); |
|
| 83 | - $userInfoRaw=DB::table("users")->select("id as uid","avatar","name")->get()->all(); |
|
| 81 | + if ($rankList==null) $rankList=[]; |
|
| 82 | + $rankList=array_slice($rankList, 0, $num); |
|
| 83 | + $userInfoRaw=DB::table("users")->select("id as uid", "avatar", "name")->get()->all(); |
|
| 84 | 84 | $userInfo=[]; |
| 85 | - foreach($userInfoRaw as $u){ |
|
| 85 | + foreach ($userInfoRaw as $u) { |
|
| 86 | 86 | $userInfo[$u["uid"]]=$u; |
| 87 | 87 | } |
| 88 | - foreach($rankList as &$r){ |
|
| 89 | - $r["details"]=isset($userInfo[$r["uid"]])?$userInfo[$r["uid"]]:[]; |
|
| 88 | + foreach ($rankList as &$r) { |
|
| 89 | + $r["details"]=isset($userInfo[$r["uid"]]) ? $userInfo[$r["uid"]] : []; |
|
| 90 | 90 | } |
| 91 | 91 | // var_dump($rankList); exit(); |
| 92 | 92 | return $rankList; |
@@ -109,8 +109,8 @@ discard block |
||
| 109 | 109 | $rankSolved=$rankItem["totValue"]; |
| 110 | 110 | } |
| 111 | 111 | $rankTitle=$this->getRankTitle($rankValue); |
| 112 | - Cache::tags(['rank',$rankItem["uid"]])->put("rank", $rankValue, 86400); |
|
| 113 | - Cache::tags(['rank',$rankItem["uid"]])->put("title", $rankTitle, 86400); |
|
| 112 | + Cache::tags(['rank', $rankItem["uid"]])->put("rank", $rankValue, 86400); |
|
| 113 | + Cache::tags(['rank', $rankItem["uid"]])->put("title", $rankTitle, 86400); |
|
| 114 | 114 | $rankListCached[]=[ |
| 115 | 115 | "uid"=>$rankItem["uid"], |
| 116 | 116 | "rank"=>$rankValue, |
@@ -127,14 +127,14 @@ discard block |
||
| 127 | 127 | |
| 128 | 128 | public function getProfessionalRanking() |
| 129 | 129 | { |
| 130 | - $professionalRankList = []; |
|
| 131 | - $verifiedUsers = DB::table("users")->select("professional_rate","id as uid","avatar","name")->get()->all(); |
|
| 132 | - $rankIter = 0; |
|
| 133 | - foreach($verifiedUsers as $user) { |
|
| 134 | - $rankVal = $user['professional_rate']; |
|
| 135 | - $rankTitle = self::getProfessionalTitle($rankVal); |
|
| 136 | - $titleColor = self::getProfessionalColor($rankTitle); |
|
| 137 | - $professionalRankList[$rankIter++] = [ |
|
| 130 | + $professionalRankList=[]; |
|
| 131 | + $verifiedUsers=DB::table("users")->select("professional_rate", "id as uid", "avatar", "name")->get()->all(); |
|
| 132 | + $rankIter=0; |
|
| 133 | + foreach ($verifiedUsers as $user) { |
|
| 134 | + $rankVal=$user['professional_rate']; |
|
| 135 | + $rankTitle=self::getProfessionalTitle($rankVal); |
|
| 136 | + $titleColor=self::getProfessionalColor($rankTitle); |
|
| 137 | + $professionalRankList[$rankIter++]=[ |
|
| 138 | 138 | "name"=>$user["name"], |
| 139 | 139 | "uid"=>$user["uid"], |
| 140 | 140 | "avatar"=>$user["avatar"], |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | $tot+=$c; |
| 157 | 157 | } |
| 158 | 158 | foreach ($this->casualRankingPer as &$c) { |
| 159 | - $c=round($c*$totUsers/$tot); |
|
| 159 | + $c=round($c * $totUsers / $tot); |
|
| 160 | 160 | $cur+=$c; |
| 161 | 161 | $c=$cur; |
| 162 | 162 | } |
@@ -167,16 +167,16 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | public function getRankTitle($rankVal) |
| 169 | 169 | { |
| 170 | - foreach($this->casualRankingPer as $title=>$c){ |
|
| 171 | - if($rankVal<=$c) return $title; |
|
| 170 | + foreach ($this->casualRankingPer as $title=>$c) { |
|
| 171 | + if ($rankVal<=$c) return $title; |
|
| 172 | 172 | } |
| 173 | 173 | return Arr::last($this->casualRankingPer); |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | public static function getProfessionalTitle($rankVal) |
| 177 | 177 | { |
| 178 | - foreach(self::$professionalRankingPer as $title=>$point) { |
|
| 179 | - if($rankVal >= $point) return $title; |
|
| 178 | + foreach (self::$professionalRankingPer as $title=>$point) { |
|
| 179 | + if ($rankVal>=$point) return $title; |
|
| 180 | 180 | } |
| 181 | 181 | return Arr::last(self::$professionalRankingPer); |
| 182 | 182 | } |
@@ -65,20 +65,26 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | public static function getColor($rankTitle) |
| 67 | 67 | { |
| 68 | - if(is_null($rankTitle)) return ""; |
|
| 68 | + if(is_null($rankTitle)) { |
|
| 69 | + return ""; |
|
| 70 | + } |
|
| 69 | 71 | return self::$casualRanking[$rankTitle]; |
| 70 | 72 | } |
| 71 | 73 | |
| 72 | 74 | public static function getProfessionalColor($rankTitle) |
| 73 | 75 | { |
| 74 | - if(is_null($rankTitle)) return self::$professionalRanking["None"]; |
|
| 76 | + if(is_null($rankTitle)) { |
|
| 77 | + return self::$professionalRanking["None"]; |
|
| 78 | + } |
|
| 75 | 79 | return self::$professionalRanking[$rankTitle]; |
| 76 | 80 | } |
| 77 | 81 | |
| 78 | 82 | public function list($num) |
| 79 | 83 | { |
| 80 | 84 | $rankList=Cache::tags(['rank'])->get('general'); |
| 81 | - if($rankList==null) $rankList=[]; |
|
| 85 | + if($rankList==null) { |
|
| 86 | + $rankList=[]; |
|
| 87 | + } |
|
| 82 | 88 | $rankList=array_slice($rankList,0,$num); |
| 83 | 89 | $userInfoRaw=DB::table("users")->select("id as uid","avatar","name")->get()->all(); |
| 84 | 90 | $userInfo=[]; |
@@ -168,7 +174,9 @@ discard block |
||
| 168 | 174 | public function getRankTitle($rankVal) |
| 169 | 175 | { |
| 170 | 176 | foreach($this->casualRankingPer as $title=>$c){ |
| 171 | - if($rankVal<=$c) return $title; |
|
| 177 | + if($rankVal<=$c) { |
|
| 178 | + return $title; |
|
| 179 | + } |
|
| 172 | 180 | } |
| 173 | 181 | return Arr::last($this->casualRankingPer); |
| 174 | 182 | } |
@@ -176,7 +184,9 @@ discard block |
||
| 176 | 184 | public static function getProfessionalTitle($rankVal) |
| 177 | 185 | { |
| 178 | 186 | foreach(self::$professionalRankingPer as $title=>$point) { |
| 179 | - if($rankVal >= $point) return $title; |
|
| 187 | + if($rankVal >= $point) { |
|
| 188 | + return $title; |
|
| 189 | + } |
|
| 180 | 190 | } |
| 181 | 191 | return Arr::last(self::$professionalRankingPer); |
| 182 | 192 | } |
@@ -14,14 +14,14 @@ discard block |
||
| 14 | 14 | * |
| 15 | 15 | * @var string |
| 16 | 16 | */ |
| 17 | - protected $signature = 'babel:sync {extension : The package name of the extension} {--vcid= : The target contest of the Crawler} {--gid=1 : The holding group}'; |
|
| 17 | + protected $signature='babel:sync {extension : The package name of the extension} {--vcid= : The target contest of the Crawler} {--gid=1 : The holding group}'; |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * The console command description. |
| 21 | 21 | * |
| 22 | 22 | * @var string |
| 23 | 23 | */ |
| 24 | - protected $description = 'Crawl contests for a given Babel Extension to NOJ'; |
|
| 24 | + protected $description='Crawl contests for a given Babel Extension to NOJ'; |
|
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * Create a new command instance. |
@@ -40,16 +40,16 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function handle() |
| 42 | 42 | { |
| 43 | - $extension = $this->argument('extension'); |
|
| 44 | - $vcid = $this->option('vcid'); |
|
| 45 | - $gid = $this->option('gid'); |
|
| 46 | - $className = "App\\Babel\\Extension\\$extension\\Synchronizer"; |
|
| 47 | - $all_data = [ |
|
| 43 | + $extension=$this->argument('extension'); |
|
| 44 | + $vcid=$this->option('vcid'); |
|
| 45 | + $gid=$this->option('gid'); |
|
| 46 | + $className="App\\Babel\\Extension\\$extension\\Synchronizer"; |
|
| 47 | + $all_data=[ |
|
| 48 | 48 | 'oj'=>$extension, |
| 49 | 49 | 'vcid'=>$vcid, |
| 50 | 50 | 'gid'=>$gid, |
| 51 | 51 | ]; |
| 52 | - $Sync = new $className($all_data); |
|
| 52 | + $Sync=new $className($all_data); |
|
| 53 | 53 | $Sync->crawlContest(); |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -14,14 +14,14 @@ discard block |
||
| 14 | 14 | * |
| 15 | 15 | * @var string |
| 16 | 16 | */ |
| 17 | - 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}'; |
|
| 17 | + 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}'; |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * The console command description. |
| 21 | 21 | * |
| 22 | 22 | * @var string |
| 23 | 23 | */ |
| 24 | - protected $description = 'Refresh Rank from a remote contest'; |
|
| 24 | + protected $description='Refresh Rank from a remote contest'; |
|
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * Create a new command instance. |
@@ -40,18 +40,18 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function handle() |
| 42 | 42 | { |
| 43 | - $extension = $this->argument('extension'); |
|
| 44 | - $vcid = $this->option('vcid'); |
|
| 45 | - $gid = $this->option('gid'); |
|
| 46 | - $cid = $this->option('cid'); |
|
| 47 | - $className = "App\\Babel\\Extension\\$extension\\Synchronizer"; |
|
| 48 | - $all_data = [ |
|
| 43 | + $extension=$this->argument('extension'); |
|
| 44 | + $vcid=$this->option('vcid'); |
|
| 45 | + $gid=$this->option('gid'); |
|
| 46 | + $cid=$this->option('cid'); |
|
| 47 | + $className="App\\Babel\\Extension\\$extension\\Synchronizer"; |
|
| 48 | + $all_data=[ |
|
| 49 | 49 | 'oj'=>$extension, |
| 50 | 50 | 'vcid'=>$vcid, |
| 51 | 51 | 'gid'=>$gid, |
| 52 | 52 | 'cid'=>$cid, |
| 53 | 53 | ]; |
| 54 | - $Sync = new $className($all_data); |
|
| 54 | + $Sync=new $className($all_data); |
|
| 55 | 55 | $Sync->crawlRank(); |
| 56 | 56 | } |
| 57 | 57 | } |
@@ -23,34 +23,34 @@ |
||
| 23 | 23 | if (!$request->has('search_key')) { |
| 24 | 24 | return ResponseModel::err(1003); |
| 25 | 25 | } |
| 26 | - $key = $request->input('search_key'); |
|
| 27 | - $all_result = []; |
|
| 28 | - $search_from = [ |
|
| 26 | + $key=$request->input('search_key'); |
|
| 27 | + $all_result=[]; |
|
| 28 | + $search_from=[ |
|
| 29 | 29 | 'users' => \App\Models\Search\UserSearchModel::class, |
| 30 | 30 | 'problems' => \App\Models\Search\ProblemSearchModel::class, |
| 31 | 31 | 'contests' => \App\Models\Search\ContestSearchModel::class, |
| 32 | 32 | 'groups' => \App\Models\Search\GroupSearchModel::class, |
| 33 | 33 | ]; |
| 34 | 34 | foreach ($search_from as $name => $model_class) { |
| 35 | - if(class_exists($model_class)){ |
|
| 36 | - $model = new $model_class(); |
|
| 37 | - if(!method_exists($model,'search')){ |
|
| 38 | - $all_result[$name] = [ |
|
| 35 | + if (class_exists($model_class)) { |
|
| 36 | + $model=new $model_class(); |
|
| 37 | + if (!method_exists($model, 'search')) { |
|
| 38 | + $all_result[$name]=[ |
|
| 39 | 39 | 'code' => -1, |
| 40 | 40 | 'msg' => 'cannot find search method in '.$model_class |
| 41 | 41 | ]; |
| 42 | 42 | continue; |
| 43 | 43 | } |
| 44 | - $result = $model->search($key); |
|
| 45 | - $all_result[$name] = $result; |
|
| 46 | - }else{ |
|
| 47 | - $all_result[$name] = [ |
|
| 44 | + $result=$model->search($key); |
|
| 45 | + $all_result[$name]=$result; |
|
| 46 | + } else { |
|
| 47 | + $all_result[$name]=[ |
|
| 48 | 48 | 'code' => -1, |
| 49 | 49 | 'msg' => 'cannot find class named '.$model_class |
| 50 | - ];; |
|
| 50 | + ]; ; |
|
| 51 | 51 | continue; |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | - return ResponseModel::success(200,'Successful',$all_result); |
|
| 54 | + return ResponseModel::success(200, 'Successful', $all_result); |
|
| 55 | 55 | } |
| 56 | 56 | } |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | } |
| 44 | 44 | $result = $model->search($key); |
| 45 | 45 | $all_result[$name] = $result; |
| 46 | - }else{ |
|
| 46 | + } else{ |
|
| 47 | 47 | $all_result[$name] = [ |
| 48 | 48 | 'code' => -1, |
| 49 | 49 | 'msg' => 'cannot find class named '.$model_class |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | if (empty($basic)) { |
| 111 | 111 | return ResponseModel::err(3001); |
| 112 | 112 | } |
| 113 | - $ret=$problemModel->addSolution($pid,Auth::user()->id,$content); |
|
| 114 | - return $ret?ResponseModel::success(200):ResponseModel::err(3003); |
|
| 113 | + $ret=$problemModel->addSolution($pid, Auth::user()->id, $content); |
|
| 114 | + return $ret ?ResponseModel::success(200) : ResponseModel::err(3003); |
|
| 115 | 115 | } |
| 116 | 116 | /** |
| 117 | 117 | * The Ajax Problem Solution Discussion Update. |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | $problemModel=new ProblemModel(); |
| 127 | 127 | $psoid=$all_data["psoid"]; |
| 128 | 128 | $content=$all_data["content"]; |
| 129 | - $ret=$problemModel->updateSolution($psoid,Auth::user()->id,$content); |
|
| 130 | - return $ret?ResponseModel::success(200):ResponseModel::err(3004); |
|
| 129 | + $ret=$problemModel->updateSolution($psoid, Auth::user()->id, $content); |
|
| 130 | + return $ret ?ResponseModel::success(200) : ResponseModel::err(3004); |
|
| 131 | 131 | } |
| 132 | 132 | /** |
| 133 | 133 | * The Ajax Problem Solution Discussion Delete. |
@@ -141,8 +141,8 @@ discard block |
||
| 141 | 141 | $all_data=$request->all(); |
| 142 | 142 | $problemModel=new ProblemModel(); |
| 143 | 143 | $psoid=$all_data["psoid"]; |
| 144 | - $ret=$problemModel->removeSolution($psoid,Auth::user()->id); |
|
| 145 | - return $ret?ResponseModel::success(200):ResponseModel::err(3004); |
|
| 144 | + $ret=$problemModel->removeSolution($psoid, Auth::user()->id); |
|
| 145 | + return $ret ?ResponseModel::success(200) : ResponseModel::err(3004); |
|
| 146 | 146 | } |
| 147 | 147 | /** |
| 148 | 148 | * The Ajax Problem Solution Discussion Vote. |
@@ -157,8 +157,8 @@ discard block |
||
| 157 | 157 | $problemModel=new ProblemModel(); |
| 158 | 158 | $psoid=$all_data["psoid"]; |
| 159 | 159 | $type=$all_data["type"]; |
| 160 | - $ret=$problemModel->voteSolution($psoid,Auth::user()->id,$type); |
|
| 161 | - return $ret["ret"]?ResponseModel::success(200,null,["votes"=>$ret["votes"],"select"=>$ret["select"]]):ResponseModel::err(3004); |
|
| 160 | + $ret=$problemModel->voteSolution($psoid, Auth::user()->id, $type); |
|
| 161 | + return $ret["ret"] ?ResponseModel::success(200, null, ["votes"=>$ret["votes"], "select"=>$ret["select"]]) : ResponseModel::err(3004); |
|
| 162 | 162 | } |
| 163 | 163 | /** |
| 164 | 164 | * The Ajax Problem Solution Submit. |
@@ -251,15 +251,15 @@ discard block |
||
| 251 | 251 | |
| 252 | 252 | $submissionData=$submissionModel->basic($all_data["sid"]); |
| 253 | 253 | |
| 254 | - if($submissionData["uid"]!=Auth::user()->id){ |
|
| 254 | + if ($submissionData["uid"]!=Auth::user()->id) { |
|
| 255 | 255 | return ResponseModel::err(2001); |
| 256 | 256 | } |
| 257 | 257 | |
| 258 | - if($submissionData["verdict"]!="Submission Error"){ |
|
| 258 | + if ($submissionData["verdict"]!="Submission Error") { |
|
| 259 | 259 | return ResponseModel::err(6003); |
| 260 | 260 | } |
| 261 | 261 | |
| 262 | - $submissionModel->updateSubmission($all_data["sid"],[ |
|
| 262 | + $submissionModel->updateSubmission($all_data["sid"], [ |
|
| 263 | 263 | "verdict"=>"Pending", |
| 264 | 264 | "time"=>0, |
| 265 | 265 | "memory"=>0 |
@@ -12,19 +12,19 @@ |
||
| 12 | 12 | |
| 13 | 13 | public function search($key) |
| 14 | 14 | { |
| 15 | - $result = []; |
|
| 15 | + $result=[]; |
|
| 16 | 16 | //group name or gcode find |
| 17 | - if(strlen($key) >= 2){ |
|
| 18 | - $ret = self::where(function($query) use ($key){ |
|
| 19 | - $query->whereRaw('MATCH(`name`) AGAINST (? IN BOOLEAN MODE)',[$key]) |
|
| 17 | + if (strlen($key)>=2) { |
|
| 18 | + $ret=self::where(function($query) use ($key){ |
|
| 19 | + $query->whereRaw('MATCH(`name`) AGAINST (? IN BOOLEAN MODE)', [$key]) |
|
| 20 | 20 | ->orWhere('gcode', $key); |
| 21 | 21 | }) |
| 22 | - ->where('public',1) |
|
| 23 | - ->select('gid','gcode', 'img', 'name', 'description') |
|
| 22 | + ->where('public', 1) |
|
| 23 | + ->select('gid', 'gcode', 'img', 'name', 'description') |
|
| 24 | 24 | ->limit(120) |
| 25 | 25 | ->get()->all(); |
| 26 | - if(!empty($ret)){ |
|
| 27 | - $result += $ret; |
|
| 26 | + if (!empty($ret)) { |
|
| 27 | + $result+=$ret; |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | |