@@ -76,7 +76,7 @@ |
||
| 76 | 76 | "spj_version" => null, |
| 77 | 77 | "spj_config" => null |
| 78 | 78 | ]; |
| 79 | - if($probBasic["spj"] && $probBasic["spj_version"]){ |
|
| 79 | + if ($probBasic["spj"] && $probBasic["spj_version"]) { |
|
| 80 | 80 | $submit_data["spj_version"]=$probBasic["spj_version"]; |
| 81 | 81 | $submit_data["spj_config"]=$probBasic["spj_lang"]; |
| 82 | 82 | } |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | } |
| 65 | 65 | public function getLanguageConfigByLanguage($language, $spj=false) |
| 66 | 66 | { |
| 67 | - return $this->getLanguageConfigByKey($language.($spj?'_lang_spj_config':'_lang_config')); |
|
| 67 | + return $this->getLanguageConfigByKey($language.($spj ? '_lang_spj_config' : '_lang_config')); |
|
| 68 | 68 | } |
| 69 | 69 | public function getLanguageConfigByKey($key) |
| 70 | 70 | { |
@@ -13,20 +13,20 @@ |
||
| 13 | 13 | |
| 14 | 14 | public function search($key) |
| 15 | 15 | { |
| 16 | - $result = []; |
|
| 17 | - if(strlen($key) >= 2){ |
|
| 18 | - $ret = self::where('pcode', $key) |
|
| 19 | - ->orWhereRaw('MATCH(`title`) AGAINST (? IN BOOLEAN MODE)',[$key]) |
|
| 16 | + $result=[]; |
|
| 17 | + if (strlen($key)>=2) { |
|
| 18 | + $ret=self::where('pcode', $key) |
|
| 19 | + ->orWhereRaw('MATCH(`title`) AGAINST (? IN BOOLEAN MODE)', [$key]) |
|
| 20 | 20 | ->select('pcode', 'title') |
| 21 | 21 | ->limit(120) |
| 22 | 22 | ->get()->all(); |
| 23 | - if(!empty($ret)){ |
|
| 24 | - $result += $ret; |
|
| 23 | + if (!empty($ret)) { |
|
| 24 | + $result+=$ret; |
|
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | - $problemModel = new ProblemModel(); |
|
| 27 | + $problemModel=new ProblemModel(); |
|
| 28 | 28 | foreach ($result as $p_index => $p) { |
| 29 | - if($problemModel->isBlocked($p['pid']) || $problemModel->isHidden($p["pid"])){ |
|
| 29 | + if ($problemModel->isBlocked($p['pid']) || $problemModel->isHidden($p["pid"])) { |
|
| 30 | 30 | unset($result[$p_index]); |
| 31 | 31 | } |
| 32 | 32 | } |
@@ -83,11 +83,11 @@ discard block |
||
| 83 | 83 | $grid->column('sid', "ID")->sortable(); |
| 84 | 84 | $grid->time("Time"); |
| 85 | 85 | $grid->memory("Memory"); |
| 86 | - $grid->verdict("Verdict")->display(function ($verdict) { |
|
| 86 | + $grid->verdict("Verdict")->display(function($verdict) { |
|
| 87 | 87 | return '<i class="fa fa-circle '.$this->color.'"></i> '.$verdict; |
| 88 | 88 | }); |
| 89 | 89 | $grid->language("Language"); |
| 90 | - $grid->submission_date("Submission Date")->display(function ($submission_date) { |
|
| 90 | + $grid->submission_date("Submission Date")->display(function($submission_date) { |
|
| 91 | 91 | return date("Y-m-d H:i:s", $submission_date); |
| 92 | 92 | }); |
| 93 | 93 | ; |
@@ -97,11 +97,11 @@ discard block |
||
| 97 | 97 | $grid->jid("JID"); |
| 98 | 98 | $grid->coid("COID"); |
| 99 | 99 | $grid->score("Raw Score"); |
| 100 | - $grid->filter(function (Grid\Filter $filter) { |
|
| 101 | - $filter->column(6, function ($filter) { |
|
| 100 | + $grid->filter(function(Grid\Filter $filter) { |
|
| 101 | + $filter->column(6, function($filter) { |
|
| 102 | 102 | $filter->like('verdict'); |
| 103 | 103 | }); |
| 104 | - $filter->column(6, function ($filter) { |
|
| 104 | + $filter->column(6, function($filter) { |
|
| 105 | 105 | $filter->equal('cid', 'Contest ID'); |
| 106 | 106 | $filter->equal('uid', 'User ID'); |
| 107 | 107 | $filter->equal('pid', 'Problem ID'); |
@@ -138,14 +138,14 @@ discard block |
||
| 138 | 138 | $show->coid('COID'); |
| 139 | 139 | $show->vcid('VCID'); |
| 140 | 140 | $show->score(); |
| 141 | - $show->share()->using(['No','Yes']); |
|
| 141 | + $show->share()->using(['No', 'Yes']); |
|
| 142 | 142 | return $show; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | private function codify($field, $lang=null) |
| 146 | 146 | { |
| 147 | - $field->unescape()->as(function ($value) use ($field,$lang) { |
|
| 148 | - $field->border = false; |
|
| 147 | + $field->unescape()->as(function($value) use ($field, $lang) { |
|
| 148 | + $field->border=false; |
|
| 149 | 149 | $hash=md5($value); |
| 150 | 150 | if (blank($value)) { |
| 151 | 151 | $value=" "; |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | { |
| 187 | 187 | $form=new Form(new EloquentSubmissionModel); |
| 188 | 188 | $form->model()->makeVisible('password'); |
| 189 | - $form->tab('Basic', function (Form $form) { |
|
| 189 | + $form->tab('Basic', function(Form $form) { |
|
| 190 | 190 | $form->display('sid'); |
| 191 | 191 | $form->text('time')->rules('required'); |
| 192 | 192 | $form->text('memory')->rules('required'); |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | $router->resource('contests', ContestController::class); |
| 18 | 18 | $router->resource('groups', GroupController::class); |
| 19 | 19 | |
| 20 | - Route::group(['prefix' => 'babel'], function (Router $router) { |
|
| 20 | + Route::group(['prefix' => 'babel'], function(Router $router) { |
|
| 21 | 21 | $router->get('/', 'BabelController@index')->name('admin.babel.index'); |
| 22 | 22 | $router->get('installed', 'BabelController@installed')->name('admin.babel.installed'); |
| 23 | 23 | $router->get('marketspace', 'BabelController@marketspace')->name('admin.babel.marketspace'); |
@@ -17,11 +17,11 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | public static function send($config) |
| 19 | 19 | { |
| 20 | - $message = new MessageModel; |
|
| 21 | - $message->sender = $config['sender']; |
|
| 22 | - $message->receiver = $config['receiver']; |
|
| 23 | - $message->title = $config['title']; |
|
| 24 | - $message->content = $config['content']; |
|
| 20 | + $message=new MessageModel; |
|
| 21 | + $message->sender=$config['sender']; |
|
| 22 | + $message->receiver=$config['receiver']; |
|
| 23 | + $message->title=$config['title']; |
|
| 24 | + $message->content=$config['content']; |
|
| 25 | 25 | /* |
| 26 | 26 | if(isset($config['reply'])){ |
| 27 | 27 | $message->reply = $config['reply']; |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | $message->reply = $config['allow_reply']; |
| 31 | 31 | } |
| 32 | 32 | */ |
| 33 | - $message->official = 1; |
|
| 33 | + $message->official=1; |
|
| 34 | 34 | $message->save(); |
| 35 | 35 | return true; |
| 36 | 36 | } |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public static function allowReply($id) |
| 63 | 63 | { |
| 64 | - $message = static::where('id',$id)->first(); |
|
| 65 | - if(empty($message)){ |
|
| 64 | + $message=static::where('id', $id)->first(); |
|
| 65 | + if (empty($message)) { |
|
| 66 | 66 | return false; |
| 67 | 67 | } |
| 68 | 68 | return $message['allow_reply'] ? true : false; |
@@ -77,8 +77,8 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public static function list($uid) |
| 79 | 79 | { |
| 80 | - return static::join('users','message.sender','=','users.id') |
|
| 81 | - ->where('receiver',$uid) |
|
| 80 | + return static::join('users', 'message.sender', '=', 'users.id') |
|
| 81 | + ->where('receiver', $uid) |
|
| 82 | 82 | ->select( |
| 83 | 83 | 'message.id as id', |
| 84 | 84 | 'users.name as sender_name', |
@@ -103,13 +103,13 @@ discard block |
||
| 103 | 103 | */ |
| 104 | 104 | public static function read($mid) |
| 105 | 105 | { |
| 106 | - $message = static::find($mid); |
|
| 107 | - if(!empty($message)){ |
|
| 108 | - $message->unread = 0; |
|
| 106 | + $message=static::find($mid); |
|
| 107 | + if (!empty($message)) { |
|
| 108 | + $message->unread=0; |
|
| 109 | 109 | $message->save(); |
| 110 | 110 | } |
| 111 | - return static::join('users','message.sender','=','users.id') |
|
| 112 | - ->where('message.id',$mid) |
|
| 111 | + return static::join('users', 'message.sender', '=', 'users.id') |
|
| 112 | + ->where('message.id', $mid) |
|
| 113 | 113 | ->select( |
| 114 | 114 | 'message.id as id', |
| 115 | 115 | 'users.name as sender_name', |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | */ |
| 134 | 134 | public static function allRead($uid) |
| 135 | 135 | { |
| 136 | - return static::where('receiver',$uid) |
|
| 136 | + return static::where('receiver', $uid) |
|
| 137 | 137 | ->update(['unread' => 0]); |
| 138 | 138 | } |
| 139 | 139 | |
@@ -161,20 +161,20 @@ discard block |
||
| 161 | 161 | */ |
| 162 | 162 | public static function remove($messages) |
| 163 | 163 | { |
| 164 | - $del_count = 0; |
|
| 165 | - if(is_array($messages)){ |
|
| 164 | + $del_count=0; |
|
| 165 | + if (is_array($messages)) { |
|
| 166 | 166 | foreach ($messages as $mid) { |
| 167 | - $message = static::find($mid); |
|
| 168 | - if(!empty($message)){ |
|
| 167 | + $message=static::find($mid); |
|
| 168 | + if (!empty($message)) { |
|
| 169 | 169 | $message->delete(); |
| 170 | - $del_count ++; |
|
| 170 | + $del_count++; |
|
| 171 | 171 | } |
| 172 | 172 | } |
| 173 | - }else{ |
|
| 174 | - $message = static::find($messages); |
|
| 175 | - if(!empty($message)){ |
|
| 173 | + } else { |
|
| 174 | + $message=static::find($messages); |
|
| 175 | + if (!empty($message)) { |
|
| 176 | 176 | $message->delete(); |
| 177 | - $del_count ++; |
|
| 177 | + $del_count++; |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | return $del_count; |
@@ -170,7 +170,7 @@ |
||
| 170 | 170 | $del_count ++; |
| 171 | 171 | } |
| 172 | 172 | } |
| 173 | - }else{ |
|
| 173 | + } else{ |
|
| 174 | 174 | $message = static::find($messages); |
| 175 | 175 | if(!empty($message)){ |
| 176 | 176 | $message->delete(); |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | $prob_detail["pdf"]=false; |
| 49 | 49 | $prob_detail["viewerShow"]=false; |
| 50 | 50 | $prob_detail["file_ext"]=null; |
| 51 | - if($prob_detail['file'] && !blank($prob_detail['file_url'])){ |
|
| 52 | - $prob_detail["file_ext"]=explode('.',basename($prob_detail['file_url'])); |
|
| 51 | + if ($prob_detail['file'] && !blank($prob_detail['file_url'])) { |
|
| 52 | + $prob_detail["file_ext"]=explode('.', basename($prob_detail['file_url'])); |
|
| 53 | 53 | $prob_detail["file_ext"]=end($prob_detail["file_ext"]); |
| 54 | 54 | $prob_detail["pdf"]=Str::is("*.pdf", basename($prob_detail['file_url'])); |
| 55 | - $prob_detail["viewerShow"]= blank($prob_detail["parsed"]["description"]) && |
|
| 55 | + $prob_detail["viewerShow"]=blank($prob_detail["parsed"]["description"]) && |
|
| 56 | 56 | blank($prob_detail["parsed"]["input"]) && |
| 57 | 57 | blank($prob_detail["parsed"]["output"]) && |
| 58 | 58 | blank($prob_detail["parsed"]["note"]); |
@@ -194,9 +194,9 @@ discard block |
||
| 194 | 194 | |
| 195 | 195 | private function inteliAudit($uid, $content) |
| 196 | 196 | { |
| 197 | - if (strpos($content, '```')!==false){ |
|
| 197 | + if (strpos($content, '```')!==false) { |
|
| 198 | 198 | $userSolutionHistory=DB::table("problem_solution")->where(['uid'=>$uid])->orderByDesc('updated_at')->first(); |
| 199 | - if (!empty($userSolutionHistory) && $userSolutionHistory["audit"]==1){ |
|
| 199 | + if (!empty($userSolutionHistory) && $userSolutionHistory["audit"]==1) { |
|
| 200 | 200 | return 1; |
| 201 | 201 | } |
| 202 | 202 | } |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | { |
| 293 | 293 | // $prob_list = DB::table($this->table)->select("pid","pcode","title")->get()->all(); // return a array |
| 294 | 294 | $submissionModel=new SubmissionModel(); |
| 295 | - $preQuery=DB::table($this->table)->where('hide','=',0); |
|
| 295 | + $preQuery=DB::table($this->table)->where('hide', '=', 0); |
|
| 296 | 296 | if ($filter['oj']) { |
| 297 | 297 | $preQuery=$preQuery->where(["OJ"=>$filter['oj']]); |
| 298 | 298 | } |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | |
| 447 | 447 | if (!empty($data["sample"])) { |
| 448 | 448 | foreach ($data["sample"] as $d) { |
| 449 | - if(!isset($d['sample_note'])) $d['sample_note']=null; |
|
| 449 | + if (!isset($d['sample_note'])) $d['sample_note']=null; |
|
| 450 | 450 | DB::table("problem_sample")->insert([ |
| 451 | 451 | 'pid'=>$pid, |
| 452 | 452 | 'sample_input'=>$d['sample_input'], |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | |
| 493 | 493 | if (!empty($data["sample"])) { |
| 494 | 494 | foreach ($data["sample"] as $d) { |
| 495 | - if(!isset($d['sample_note'])) $d['sample_note']=null; |
|
| 495 | + if (!isset($d['sample_note'])) $d['sample_note']=null; |
|
| 496 | 496 | DB::table("problem_sample")->insert([ |
| 497 | 497 | 'pid'=>$pid, |
| 498 | 498 | 'sample_input'=>$d['sample_input'], |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | |
| 508 | 508 | public function discussionList($pid) |
| 509 | 509 | { |
| 510 | - $paginator = DB::table('problem_discussion')->join( |
|
| 510 | + $paginator=DB::table('problem_discussion')->join( |
|
| 511 | 511 | "users", |
| 512 | 512 | "id", |
| 513 | 513 | "=", |
@@ -526,10 +526,10 @@ discard block |
||
| 526 | 526 | 'users.name', |
| 527 | 527 | 'users.id as uid' |
| 528 | 528 | ])->paginate(15); |
| 529 | - $list = $paginator->all(); |
|
| 530 | - foreach($list as &$l){ |
|
| 531 | - $l['updated_at'] = $this->formatTime($l['updated_at']); |
|
| 532 | - $l['comment_count'] = DB::table('problem_discussion_comment')->where('pdid','=',$l['pdid'])->count(); |
|
| 529 | + $list=$paginator->all(); |
|
| 530 | + foreach ($list as &$l) { |
|
| 531 | + $l['updated_at']=$this->formatTime($l['updated_at']); |
|
| 532 | + $l['comment_count']=DB::table('problem_discussion_comment')->where('pdid', '=', $l['pdid'])->count(); |
|
| 533 | 533 | } |
| 534 | 534 | return [ |
| 535 | 535 | 'paginator' => $paginator, |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | |
| 573 | 573 | public function discussionDetail($pdid) |
| 574 | 574 | { |
| 575 | - $main = DB::table('problem_discussion')->join( |
|
| 575 | + $main=DB::table('problem_discussion')->join( |
|
| 576 | 576 | "users", |
| 577 | 577 | "id", |
| 578 | 578 | "=", |
@@ -591,12 +591,12 @@ discard block |
||
| 591 | 591 | 'users.name', |
| 592 | 592 | 'users.id as uid' |
| 593 | 593 | ])->get()->first(); |
| 594 | - $main['created_at'] = $this->formatTime($main['created_at']); |
|
| 594 | + $main['created_at']=$this->formatTime($main['created_at']); |
|
| 595 | 595 | $main['content']=clean(Markdown::convertToHtml($main["content"])); |
| 596 | 596 | |
| 597 | - $comment_count = DB::table('problem_discussion_comment')->where('pdid','=',$pdid)->count(); |
|
| 597 | + $comment_count=DB::table('problem_discussion_comment')->where('pdid', '=', $pdid)->count(); |
|
| 598 | 598 | |
| 599 | - $paginator = DB::table('problem_discussion_comment')->join( |
|
| 599 | + $paginator=DB::table('problem_discussion_comment')->join( |
|
| 600 | 600 | "users", |
| 601 | 601 | "id", |
| 602 | 602 | "=", |
@@ -615,11 +615,11 @@ discard block |
||
| 615 | 615 | 'users.name', |
| 616 | 616 | 'users.id as uid' |
| 617 | 617 | ])->paginate(10); |
| 618 | - $comment = $paginator->all(); |
|
| 619 | - foreach($comment as &$c){ |
|
| 618 | + $comment=$paginator->all(); |
|
| 619 | + foreach ($comment as &$c) { |
|
| 620 | 620 | $c['content']=clean(Markdown::convertToHtml($c["content"])); |
| 621 | - $c['created_at'] = $this->formatTime($c['created_at']); |
|
| 622 | - $c['reply'] = DB::table('problem_discussion_comment')->join( |
|
| 621 | + $c['created_at']=$this->formatTime($c['created_at']); |
|
| 622 | + $c['reply']=DB::table('problem_discussion_comment')->join( |
|
| 623 | 623 | "users", |
| 624 | 624 | "id", |
| 625 | 625 | "=", |
@@ -647,20 +647,20 @@ discard block |
||
| 647 | 647 | 'users.name', |
| 648 | 648 | 'users.id as uid' |
| 649 | 649 | ])->get()->all(); |
| 650 | - foreach($c['reply'] as $k=>&$cr){ |
|
| 650 | + foreach ($c['reply'] as $k=>&$cr) { |
|
| 651 | 651 | $cr['content']=clean(Markdown::convertToHtml($cr["content"])); |
| 652 | - $cr['reply_uid'] = DB::table('problem_discussion_comment')->where( |
|
| 652 | + $cr['reply_uid']=DB::table('problem_discussion_comment')->where( |
|
| 653 | 653 | 'pdcid', |
| 654 | 654 | '=', |
| 655 | 655 | $cr['reply_id'] |
| 656 | 656 | )->get()->first()['uid']; |
| 657 | - $cr['reply_name'] = DB::table('users')->where( |
|
| 657 | + $cr['reply_name']=DB::table('users')->where( |
|
| 658 | 658 | 'id', |
| 659 | 659 | '=', |
| 660 | 660 | $cr['reply_uid'] |
| 661 | 661 | )->get()->first()['name']; |
| 662 | - $cr['created_at'] = $this->formatTime($cr['created_at']); |
|
| 663 | - if($this->replyParent($cr['pdcid'])!=$c['pdcid']){ |
|
| 662 | + $cr['created_at']=$this->formatTime($cr['created_at']); |
|
| 663 | + if ($this->replyParent($cr['pdcid'])!=$c['pdcid']) { |
|
| 664 | 664 | unset($c['reply'][$k]); |
| 665 | 665 | } |
| 666 | 666 | } |
@@ -675,19 +675,19 @@ discard block |
||
| 675 | 675 | |
| 676 | 676 | public function replyParent($pdcid) |
| 677 | 677 | { |
| 678 | - $reply_id=DB::table('problem_discussion_comment')->where('pdcid','=',$pdcid)->get()->first()['reply_id']; |
|
| 679 | - $top=DB::table('problem_discussion_comment')->where('pdcid','=',$reply_id)->get()->first()['reply_id']; |
|
| 680 | - if(isset($top)){ |
|
| 678 | + $reply_id=DB::table('problem_discussion_comment')->where('pdcid', '=', $pdcid)->get()->first()['reply_id']; |
|
| 679 | + $top=DB::table('problem_discussion_comment')->where('pdcid', '=', $reply_id)->get()->first()['reply_id']; |
|
| 680 | + if (isset($top)) { |
|
| 681 | 681 | return $this->replyParent($reply_id); |
| 682 | - }else{ |
|
| 682 | + } else { |
|
| 683 | 683 | return $reply_id; |
| 684 | 684 | } |
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | public function pcodeByPdid($dcode) |
| 688 | 688 | { |
| 689 | - $pid = DB::table('problem_discussion')->where('pdid','=',$dcode)->get()->first()['pid']; |
|
| 690 | - $pcode = $this->pcode($pid); |
|
| 689 | + $pid=DB::table('problem_discussion')->where('pdid', '=', $dcode)->get()->first()['pid']; |
|
| 690 | + $pcode=$this->pcode($pid); |
|
| 691 | 691 | return $pcode; |
| 692 | 692 | } |
| 693 | 693 | |
@@ -708,11 +708,11 @@ discard block |
||
| 708 | 708 | |
| 709 | 709 | public function pidByPdid($pdid) |
| 710 | 710 | { |
| 711 | - $pid = DB::table('problem_discussion')->where('pdid','=',$pdid)->get()->first()['pid']; |
|
| 711 | + $pid=DB::table('problem_discussion')->where('pdid', '=', $pdid)->get()->first()['pid']; |
|
| 712 | 712 | return $pid; |
| 713 | 713 | } |
| 714 | 714 | |
| 715 | - public function addComment($uid,$pdid,$content,$reply_id) |
|
| 715 | + public function addComment($uid, $pdid, $content, $reply_id) |
|
| 716 | 716 | { |
| 717 | 717 | $pid=$this->pidByPdid($pdid); |
| 718 | 718 | $pdcid=DB::table('problem_discussion_comment')->insertGetId([ |
@@ -731,6 +731,6 @@ discard block |
||
| 731 | 731 | |
| 732 | 732 | public function isHidden($pid) |
| 733 | 733 | { |
| 734 | - return DB::table('problem')->where('pid','=',$pid)->get()->first()['hide']; |
|
| 734 | + return DB::table('problem')->where('pid', '=', $pid)->get()->first()['hide']; |
|
| 735 | 735 | } |
| 736 | 736 | } |
@@ -446,7 +446,9 @@ discard block |
||
| 446 | 446 | |
| 447 | 447 | if (!empty($data["sample"])) { |
| 448 | 448 | foreach ($data["sample"] as $d) { |
| 449 | - if(!isset($d['sample_note'])) $d['sample_note']=null; |
|
| 449 | + if(!isset($d['sample_note'])) { |
|
| 450 | + $d['sample_note']=null; |
|
| 451 | + } |
|
| 450 | 452 | DB::table("problem_sample")->insert([ |
| 451 | 453 | 'pid'=>$pid, |
| 452 | 454 | 'sample_input'=>$d['sample_input'], |
@@ -492,7 +494,9 @@ discard block |
||
| 492 | 494 | |
| 493 | 495 | if (!empty($data["sample"])) { |
| 494 | 496 | foreach ($data["sample"] as $d) { |
| 495 | - if(!isset($d['sample_note'])) $d['sample_note']=null; |
|
| 497 | + if(!isset($d['sample_note'])) { |
|
| 498 | + $d['sample_note']=null; |
|
| 499 | + } |
|
| 496 | 500 | DB::table("problem_sample")->insert([ |
| 497 | 501 | 'pid'=>$pid, |
| 498 | 502 | 'sample_input'=>$d['sample_input'], |
@@ -679,7 +683,7 @@ discard block |
||
| 679 | 683 | $top=DB::table('problem_discussion_comment')->where('pdcid','=',$reply_id)->get()->first()['reply_id']; |
| 680 | 684 | if(isset($top)){ |
| 681 | 685 | return $this->replyParent($reply_id); |
| 682 | - }else{ |
|
| 686 | + } else{ |
|
| 683 | 687 | return $reply_id; |
| 684 | 688 | } |
| 685 | 689 | } |
@@ -22,13 +22,13 @@ discard block |
||
| 22 | 22 | $ret=[]; |
| 23 | 23 | $marketspaceRaw=self::getRemote(); |
| 24 | 24 | $marketspace=[]; |
| 25 | - foreach($marketspaceRaw["packages"] as $extension){ |
|
| 25 | + foreach ($marketspaceRaw["packages"] as $extension) { |
|
| 26 | 26 | $marketspace[$extension["name"]]=$extension; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | $localList=self::getLocal(); |
| 30 | 30 | |
| 31 | - foreach($localList as $extension){ |
|
| 31 | + foreach ($localList as $extension) { |
|
| 32 | 32 | $temp=[ |
| 33 | 33 | "details"=>$extension, |
| 34 | 34 | "status"=>0, |
@@ -37,30 +37,30 @@ discard block |
||
| 37 | 37 | "settings"=>null, |
| 38 | 38 | "available"=>null |
| 39 | 39 | ]; |
| 40 | - $temp["details"]["typeParsed"]=$temp["details"]["type"]=="virtual-judge"?"VirtualJudge":"OnlineJudge"; |
|
| 40 | + $temp["details"]["typeParsed"]=$temp["details"]["type"]=="virtual-judge" ? "VirtualJudge" : "OnlineJudge"; |
|
| 41 | 41 | try { |
| 42 | 42 | if ($extension["version"]=='__cur__') { |
| 43 | 43 | $extension["version"]=explode("-", version())[0]; |
| 44 | 44 | } |
| 45 | 45 | $downloadedVersion=new Version($extension["version"]); |
| 46 | 46 | |
| 47 | - if(isset($marketspace[$extension["name"]])){ |
|
| 47 | + if (isset($marketspace[$extension["name"]])) { |
|
| 48 | 48 | //remote extension, else is local extension |
| 49 | 49 | $remoteVersion=new Version($marketspace[$extension["name"]]["version"]); |
| 50 | 50 | $temp["updatable"]=$remoteVersion->isGreaterThan($downloadedVersion); |
| 51 | 51 | $temp["details"]["official"]=$marketspace[$extension["name"]]["official"]; |
| 52 | - } else{ |
|
| 52 | + } else { |
|
| 53 | 53 | $temp["updatable"]=false; |
| 54 | 54 | $temp["details"]["official"]=0; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | $installedConfig=OJModel::where(["ocode"=>$extension["code"]])->first(); |
| 58 | - if (is_null($installedConfig)){ |
|
| 58 | + if (is_null($installedConfig)) { |
|
| 59 | 59 | $temp["status"]=1; |
| 60 | 60 | } else { |
| 61 | 61 | $temp["version"]=$installedConfig->version; // local installed version |
| 62 | 62 | $installedVersion=new Version($temp["version"]); |
| 63 | - if ($downloadedVersion->isGreaterThan($installedVersion)){ |
|
| 63 | + if ($downloadedVersion->isGreaterThan($installedVersion)) { |
|
| 64 | 64 | $temp["status"]=1; |
| 65 | 65 | } else { |
| 66 | 66 | $temp["status"]=2; |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $temp["settings"]=false; |
| 69 | 69 | $temp["available"]=$installedConfig->status; |
| 70 | 70 | } |
| 71 | - }catch (Throwable $e){ |
|
| 71 | + } catch (Throwable $e) { |
|
| 72 | 72 | continue; |
| 73 | 73 | } |
| 74 | 74 | $ret[]=$temp; |
@@ -80,8 +80,8 @@ discard block |
||
| 80 | 80 | { |
| 81 | 81 | $ret=[]; |
| 82 | 82 | $marketspaceRaw=self::getRemote(); |
| 83 | - if(empty($marketspaceRaw)) return []; |
|
| 84 | - foreach($marketspaceRaw["packages"] as $extension){ |
|
| 83 | + if (empty($marketspaceRaw)) return []; |
|
| 84 | + foreach ($marketspaceRaw["packages"] as $extension) { |
|
| 85 | 85 | $temp=[ |
| 86 | 86 | "details"=>$extension, |
| 87 | 87 | "status"=>0, |
@@ -90,11 +90,11 @@ discard block |
||
| 90 | 90 | "settings"=>null, |
| 91 | 91 | "available"=>null |
| 92 | 92 | ]; |
| 93 | - $temp["details"]["typeParsed"]=$temp["details"]["type"]=="virtual-judge"?"VirtualJudge":"OnlineJudge"; |
|
| 93 | + $temp["details"]["typeParsed"]=$temp["details"]["type"]=="virtual-judge" ? "VirtualJudge" : "OnlineJudge"; |
|
| 94 | 94 | try { |
| 95 | 95 | try { |
| 96 | 96 | $BabelConfig=json_decode(file_get_contents(babel_path("Extension/{$extension['code']}/babel.json")), true); |
| 97 | - }catch (Throwable $e){ |
|
| 97 | + } catch (Throwable $e) { |
|
| 98 | 98 | $BabelConfig=[]; |
| 99 | 99 | } |
| 100 | 100 | if (!empty($BabelConfig)) { |
@@ -106,12 +106,12 @@ discard block |
||
| 106 | 106 | $temp["updatable"]=$remoteVersion->isGreaterThan($downloadedVersion); |
| 107 | 107 | |
| 108 | 108 | $installedConfig=OJModel::where(["ocode"=>$extension["code"]])->first(); |
| 109 | - if (is_null($installedConfig)){ |
|
| 109 | + if (is_null($installedConfig)) { |
|
| 110 | 110 | $temp["status"]=1; |
| 111 | 111 | } else { |
| 112 | 112 | $temp["version"]=$installedConfig->version; // local installed version |
| 113 | 113 | $installedVersion=new Version($temp["version"]); |
| 114 | - if ($downloadedVersion->isGreaterThan($installedVersion)){ |
|
| 114 | + if ($downloadedVersion->isGreaterThan($installedVersion)) { |
|
| 115 | 115 | $temp["status"]=1; |
| 116 | 116 | } else { |
| 117 | 117 | $temp["status"]=2; |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | $temp["available"]=$installedConfig->status; |
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | - }catch (Throwable $e){ |
|
| 123 | + } catch (Throwable $e) { |
|
| 124 | 124 | continue; |
| 125 | 125 | } |
| 126 | 126 | $ret[]=$temp; |
@@ -132,11 +132,11 @@ discard block |
||
| 132 | 132 | public static function getLocal() |
| 133 | 133 | { |
| 134 | 134 | $ret=[]; |
| 135 | - $dirs = array_filter(glob(babel_path("Extension/*")), 'is_dir'); |
|
| 136 | - foreach($dirs as $d){ |
|
| 135 | + $dirs=array_filter(glob(babel_path("Extension/*")), 'is_dir'); |
|
| 136 | + foreach ($dirs as $d) { |
|
| 137 | 137 | $extension=basename($d); |
| 138 | 138 | $BabelConfig=json_decode(file_get_contents(babel_path("Extension/$extension/babel.json")), true); |
| 139 | - if($extension==$BabelConfig["code"]) $ret[]=$BabelConfig; |
|
| 139 | + if ($extension==$BabelConfig["code"]) $ret[]=$BabelConfig; |
|
| 140 | 140 | } |
| 141 | 141 | return $ret; |
| 142 | 142 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | { |
| 146 | 146 | try { |
| 147 | 147 | return json_decode(file_get_contents(config('babel.mirror')."/babel.json"), true); |
| 148 | - }catch(Throwable $e){ |
|
| 148 | + } catch (Throwable $e) { |
|
| 149 | 149 | return []; |
| 150 | 150 | } |
| 151 | 151 | } |
@@ -153,10 +153,10 @@ discard block |
||
| 153 | 153 | public static function remoteDetail($code) |
| 154 | 154 | { |
| 155 | 155 | $babelConfig=self::getRemote(); |
| 156 | - if(empty($babelConfig)) return []; |
|
| 156 | + if (empty($babelConfig)) return []; |
|
| 157 | 157 | $babelConfigPackages=$babelConfig["packages"]; |
| 158 | - foreach($babelConfigPackages as $package) { |
|
| 159 | - if($package["code"]==$code) return $package; |
|
| 158 | + foreach ($babelConfigPackages as $package) { |
|
| 159 | + if ($package["code"]==$code) return $package; |
|
| 160 | 160 | } |
| 161 | 161 | return []; |
| 162 | 162 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $temp["settings"]=false; |
| 69 | 69 | $temp["available"]=$installedConfig->status; |
| 70 | 70 | } |
| 71 | - }catch (Throwable $e){ |
|
| 71 | + } catch (Throwable $e){ |
|
| 72 | 72 | continue; |
| 73 | 73 | } |
| 74 | 74 | $ret[]=$temp; |
@@ -80,7 +80,9 @@ discard block |
||
| 80 | 80 | { |
| 81 | 81 | $ret=[]; |
| 82 | 82 | $marketspaceRaw=self::getRemote(); |
| 83 | - if(empty($marketspaceRaw)) return []; |
|
| 83 | + if(empty($marketspaceRaw)) { |
|
| 84 | + return []; |
|
| 85 | + } |
|
| 84 | 86 | foreach($marketspaceRaw["packages"] as $extension){ |
| 85 | 87 | $temp=[ |
| 86 | 88 | "details"=>$extension, |
@@ -94,7 +96,7 @@ discard block |
||
| 94 | 96 | try { |
| 95 | 97 | try { |
| 96 | 98 | $BabelConfig=json_decode(file_get_contents(babel_path("Extension/{$extension['code']}/babel.json")), true); |
| 97 | - }catch (Throwable $e){ |
|
| 99 | + } catch (Throwable $e){ |
|
| 98 | 100 | $BabelConfig=[]; |
| 99 | 101 | } |
| 100 | 102 | if (!empty($BabelConfig)) { |
@@ -120,7 +122,7 @@ discard block |
||
| 120 | 122 | $temp["available"]=$installedConfig->status; |
| 121 | 123 | } |
| 122 | 124 | } |
| 123 | - }catch (Throwable $e){ |
|
| 125 | + } catch (Throwable $e){ |
|
| 124 | 126 | continue; |
| 125 | 127 | } |
| 126 | 128 | $ret[]=$temp; |
@@ -136,7 +138,9 @@ discard block |
||
| 136 | 138 | foreach($dirs as $d){ |
| 137 | 139 | $extension=basename($d); |
| 138 | 140 | $BabelConfig=json_decode(file_get_contents(babel_path("Extension/$extension/babel.json")), true); |
| 139 | - if($extension==$BabelConfig["code"]) $ret[]=$BabelConfig; |
|
| 141 | + if($extension==$BabelConfig["code"]) { |
|
| 142 | + $ret[]=$BabelConfig; |
|
| 143 | + } |
|
| 140 | 144 | } |
| 141 | 145 | return $ret; |
| 142 | 146 | } |
@@ -145,7 +149,7 @@ discard block |
||
| 145 | 149 | { |
| 146 | 150 | try { |
| 147 | 151 | return json_decode(file_get_contents(config('babel.mirror')."/babel.json"), true); |
| 148 | - }catch(Throwable $e){ |
|
| 152 | + } catch(Throwable $e){ |
|
| 149 | 153 | return []; |
| 150 | 154 | } |
| 151 | 155 | } |
@@ -153,10 +157,14 @@ discard block |
||
| 153 | 157 | public static function remoteDetail($code) |
| 154 | 158 | { |
| 155 | 159 | $babelConfig=self::getRemote(); |
| 156 | - if(empty($babelConfig)) return []; |
|
| 160 | + if(empty($babelConfig)) { |
|
| 161 | + return []; |
|
| 162 | + } |
|
| 157 | 163 | $babelConfigPackages=$babelConfig["packages"]; |
| 158 | 164 | foreach($babelConfigPackages as $package) { |
| 159 | - if($package["code"]==$code) return $package; |
|
| 165 | + if($package["code"]==$code) { |
|
| 166 | + return $package; |
|
| 167 | + } |
|
| 160 | 168 | } |
| 161 | 169 | return []; |
| 162 | 170 | } |
@@ -10,8 +10,8 @@ discard block |
||
| 10 | 10 | { |
| 11 | 11 | public function index() |
| 12 | 12 | { |
| 13 | - $uid = Auth::user()->id; |
|
| 14 | - $messages = MessageModel::list($uid); |
|
| 13 | + $uid=Auth::user()->id; |
|
| 14 | + $messages=MessageModel::list($uid); |
|
| 15 | 15 | return view('message.index', [ |
| 16 | 16 | 'page_title'=>"Message", |
| 17 | 17 | 'site_title'=>config("app.name"), |
@@ -22,8 +22,8 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | public function detail($id) |
| 24 | 24 | { |
| 25 | - $message = MessageModel::read($id); |
|
| 26 | - if(empty($message || $message->receiver != Auth::user()->id)){ |
|
| 25 | + $message=MessageModel::read($id); |
|
| 26 | + if (empty($message || $message->receiver!=Auth::user()->id)) { |
|
| 27 | 27 | return Redirect::route('message.index'); |
| 28 | 28 | } |
| 29 | 29 | return view('message.detail', [ |