ZsgsDesign / NOJ

app/Http/Controllers/Group/IndexController.php

Spacing +15 added lines, -15 removed lines

@@ -85,12 +85,12 @@ 
      *
      * @return Response
      */
-    public function analysis($gcode){
-        $groupModel = new GroupModel();
+    public function analysis($gcode) {
+        $groupModel=new GroupModel();
         $basic_info=$groupModel->details($gcode);
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
-        if($clearance < 1) return Redirect::route('group.detail',['gcode' => $gcode]);
-        $group_info = $groupModel->details($gcode);
+        if ($clearance<1) return Redirect::route('group.detail', ['gcode' => $gcode]);
+        $group_info=$groupModel->details($gcode);
         return view('group.settings.analysis', [
             'page_title'=>"Group Analysis",
             'site_title'=>"NOJ",
@@ -100,13 +100,13 @@ 
         ]);
     }
 
-    public function analysisDownload($gcode,Request $request){
-        $all_data = $request->all();
-        $groupModel = new GroupModel();
-        $group_info = $groupModel->details($gcode);
-        $mode = $all_data['mode'] ?? 'contest';
-        if($mode == 'contest'){
-            $data = $groupModel->groupMemberPracticeContestStat($group_info['gid']);
+    public function analysisDownload($gcode, Request $request) {
+        $all_data=$request->all();
+        $groupModel=new GroupModel();
+        $group_info=$groupModel->details($gcode);
+        $mode=$all_data['mode'] ?? 'contest';
+        if ($mode=='contest') {
+            $data=$groupModel->groupMemberPracticeContestStat($group_info['gid']);
             return Excel::download(
                 new GroupAnalysisExport(
                     [
@@ -119,10 +119,10 @@ 
                         'percent' => $all_data['percent'] ?? false,
                     ]
                 ),
-                $gcode . '_Group_Contest_Analysis.xlsx'
+                $gcode.'_Group_Contest_Analysis.xlsx'
             );
-        }else{
-            $data = $groupModel->groupMemberPracticeTagStat($group_info['gid']);
+        } else {
+            $data=$groupModel->groupMemberPracticeTagStat($group_info['gid']);
             return Excel::download(
                 new GroupAnalysisExport(
                     [
@@ -135,7 +135,7 @@ 
                         'percent' => $all_data['percent'] ?? false,
                     ]
                 ),
-                $gcode . '_Group_Tag_Analysis.xlsx'
+                $gcode.'_Group_Tag_Analysis.xlsx'
             );
         }
     }

Braces +4 added lines, -2 removed lines

@@ -89,7 +89,9 @@ 
         $groupModel = new GroupModel();
         $basic_info=$groupModel->details($gcode);
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
-        if($clearance < 1) return Redirect::route('group.detail',['gcode' => $gcode]);
+        if($clearance < 1) {
+            return Redirect::route('group.detail',['gcode' => $gcode]);
+        }
         $group_info = $groupModel->details($gcode);
         return view('group.settings.analysis', [
             'page_title'=>"Group Analysis",
@@ -121,7 +123,7 @@ 
                 ),
                 $gcode . '_Group_Contest_Analysis.xlsx'
             );
-        }else{
+        } else{
             $data = $groupModel->groupMemberPracticeTagStat($group_info['gid']);
             return Excel::download(
                 new GroupAnalysisExport(

app/Http/Controllers/Group/AdminController.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function settings($gcode)
     {
-        return Redirect::route('group.settings.general', ['gcode' => $gcode]);;
+        return Redirect::route('group.settings.general', ['gcode' => $gcode]); ;
     }
 
     /**
@@ -31,7 +31,7 @@ 
      */
     public function settingsReturn($gcode)
     {
-        return Redirect::route('group.detail', ['gcode' => $gcode]);;
+        return Redirect::route('group.detail', ['gcode' => $gcode]); ;
     }
 
     /**
@@ -60,10 +60,10 @@ 
      *
      * @return Response
      */
-    public function problems($gcode){
-        $groupModel = new GroupModel();
-        $group_info = $groupModel->details($gcode);
-        $problems = $groupModel->problems($group_info['gid']);
+    public function problems($gcode) {
+        $groupModel=new GroupModel();
+        $group_info=$groupModel->details($gcode);
+        $problems=$groupModel->problems($group_info['gid']);
         $basic_info=$groupModel->details($gcode);
         return view('group.settings.problems', [
             'page_title'=>"Group Problems",

app/Http/Middleware/User/Banned.php

Spacing +8 added lines, -8 removed lines

@@ -17,25 +17,25 @@
     public function handle($request, Closure $next)
     {
         //check login
-        if(!Auth::check()){
+        if (!Auth::check()) {
             return $next($request);
         }
-        $user = Auth::user();
-        $banned = $user->banneds()->orderBy('removed_at', 'desc')->first();
+        $user=Auth::user();
+        $banned=$user->banneds()->orderBy('removed_at', 'desc')->first();
         //check if there are any banned records
-        if(empty($banned)) {
+        if (empty($banned)) {
             return $next($request);
         }
         //check the time of the last record
-        if(strtotime($banned->removed_at) <= time()){
+        if (strtotime($banned->removed_at)<=time()) {
             return $next($request);
         }
         //return error page
-        if($request->method() == 'GET'){
-            return response()->view('errors.451',[
+        if ($request->method()=='GET') {
+            return response()->view('errors.451', [
                 'description' => "Your account is currently blocked and will remain so until {$banned->removed_at}. Here's why: {$banned->reason}",
             ]);
-        }else{
+        } else {
             return response()->json([
                 'ret' => 451,
                 'desc' => 'Unavailable For Legal Reasons',

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             return response()->view('errors.451',[
                 'description' => "Your account is currently blocked and will remain so until {$banned->removed_at}. Here's why: {$banned->reason}",
             ]);
-        }else{
+        } else{
             return response()->json([
                 'ret' => 451,
                 'desc' => 'Unavailable For Legal Reasons',

app/Http/Middleware/Group/Banned.php

Spacing +6 added lines, -6 removed lines

@@ -17,12 +17,12 @@
      */
     public function handle($request, Closure $next)
     {
-        $gcode = $request->gcode;
-        $group = Group::where('gcode',$gcode)->first();
-        $banneds = $group->banneds()->where('removed_at','>',date('Y-m-d H:i:s'))->first();
-        $user = Auth::user();
-        if(!empty($banneds) && $user->id != $group->leader->id) {
-            return response()->view('errors.451',[
+        $gcode=$request->gcode;
+        $group=Group::where('gcode', $gcode)->first();
+        $banneds=$group->banneds()->where('removed_at', '>', date('Y-m-d H:i:s'))->first();
+        $user=Auth::user();
+        if (!empty($banneds) && $user->id!=$group->leader->id) {
+            return response()->view('errors.451', [
                 'description' => 'This group is currently banned. Please contact the group administrator.'
             ]);
         }

app/Http/Middleware/Group/Exists.php

Spacing +4 added lines, -4 removed lines

@@ -16,11 +16,11 @@
      */
     public function handle($request, Closure $next)
     {
-        $gcode = $request->gcode;
-        $group = Group::where('gcode',$gcode)->first();
-        if(!empty($group)){
+        $gcode=$request->gcode;
+        $group=Group::where('gcode', $gcode)->first();
+        if (!empty($group)) {
             return $next($request);
-        }else{
+        } else {
             return redirect('/group');
         }
 

Braces +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         $group = Group::where('gcode',$gcode)->first();
         if(!empty($group)){
             return $next($request);
-        }else{
+        } else{
             return redirect('/group');
         }
 

app/Admin/Controllers/DashboardController.php

Spacing +9 added lines, -9 removed lines

@@ -13,15 +13,15 @@
     {
         $version=UpdateModel::checkUpdate();
 
-        $status = [
-            ['name' => 'NOJ Version',       'value' => version()],
-            ['name' => 'Lastest Version',   'value' => is_null($version)?'Failed to fetch latest version':$version["name"]],
-            ['name' => 'Problems',          'value' => \App\Models\Eloquent\ProblemModel::count()],
-            ['name' => 'Solutions',         'value' => \App\Models\Eloquent\ProblemSolutionModel::count()],
-            ['name' => 'Submissions',       'value' => \App\Models\Eloquent\SubmissionModel::count()],
-            ['name' => 'Contests',          'value' => \App\Models\Eloquent\ContestModel::count()],
-            ['name' => 'Users',             'value' => \App\Models\Eloquent\UserModel::count()],
-            ['name' => 'Groups',            'value' => \App\Models\Eloquent\Group::count()],
+        $status=[
+            ['name' => 'NOJ Version', 'value' => version()],
+            ['name' => 'Lastest Version', 'value' => is_null($version) ? 'Failed to fetch latest version' : $version["name"]],
+            ['name' => 'Problems', 'value' => \App\Models\Eloquent\ProblemModel::count()],
+            ['name' => 'Solutions', 'value' => \App\Models\Eloquent\ProblemSolutionModel::count()],
+            ['name' => 'Submissions', 'value' => \App\Models\Eloquent\SubmissionModel::count()],
+            ['name' => 'Contests', 'value' => \App\Models\Eloquent\ContestModel::count()],
+            ['name' => 'Users', 'value' => \App\Models\Eloquent\UserModel::count()],
+            ['name' => 'Groups', 'value' => \App\Models\Eloquent\Group::count()],
         ];
 
         return view('admin::dashboard.general', [

app/Admin/Controllers/AbuseController.php

Spacing +26 added lines, -26 removed lines

@@ -23,7 +23,7 @@ 
      *
      * @var string
      */
-    protected $title = 'Abuses';
+    protected $title='Abuses';
 
     /**
      * Make a grid builder.
@@ -32,7 +32,7 @@ 
      */
     protected function grid()
     {
-        $grid = new Grid(new Abuse);
+        $grid=new Grid(new Abuse);
 
         $grid->column('id', __('Id'));
         $grid->column('title', __('Title'));
@@ -58,7 +58,7 @@ 
      */
     protected function detail($id)
     {
-        $show = new Show(Abuse::findOrFail($id));
+        $show=new Show(Abuse::findOrFail($id));
 
         $show->field('id', __('Id'));
         $show->field('title', __('Title'));
@@ -81,7 +81,7 @@ 
      */
     protected function form()
     {
-        $form = new Form(new Abuse);
+        $form=new Form(new Abuse);
 
         $form->text('title', __('Title'));
         $form->number('cause', __('Cause'));
@@ -92,23 +92,23 @@ 
 
         $form->ignore(['created_at']);
 
-        $form->saving(function (Form $form) {
-            $abuse = $form->model();
+        $form->saving(function(Form $form) {
+            $abuse=$form->model();
             //get gategory and subject id
-            $regex = '/^([A-Za-z]+) #(\d+)/';
-            $matches = [];
-            preg_match($regex,$abuse->title,$matches);
-            $category = array_search(strtolower($matches[1]),Abuse::$supportCategory);
-            $subject_id = (int)$matches[2];
-            switch($abuse->category) {
+            $regex='/^([A-Za-z]+) #(\d+)/';
+            $matches=[];
+            preg_match($regex, $abuse->title, $matches);
+            $category=array_search(strtolower($matches[1]), Abuse::$supportCategory);
+            $subject_id=(int) $matches[2];
+            switch ($abuse->category) {
                 case 0:
-                    $gid = $subject_id;
-                    $group = Group::find($gid);
-                    if(empty($group)) {
-                        return ;
+                    $gid=$subject_id;
+                    $group=Group::find($gid);
+                    if (empty($group)) {
+                        return;
                     }
-                    if($form->audit) {
-                        $ban_time = request()->created_at;
+                    if ($form->audit) {
+                        $ban_time=request()->created_at;
                         sendMessage([
                             'sender'    => 1,
                             'receiver'  => $abuse->user_id,
@@ -128,8 +128,8 @@ 
                             'reason'     => $abuse->supplement,
                             'removed_at' => $ban_time
                         ]);
-                        return ;
-                    }else{
+                        return;
+                    } else {
                         sendMessage([
                             'sender'    => 1,
                             'receiver'  => $abuse->user_id,
@@ -137,11 +137,11 @@ 
                             'content'   => "Hi, Dear **{$abuse->user->name}**,\n\n We have checked your Abuse report about group **[{$group->name}]({$group->link})**.\n\n However, we regret to say that the information you submitted is not sufficient for us to take action.\n\n Of course, we will continue to follow up the investigation.\n\n Thank you for your contribution to our community environment.\n\n Sincerely, NOJ"
                         ]);
                         $abuse->delete();
-                        return ;
+                        return;
                     }
                     return;
                 case 1:
-                    $ban_time = request()->created_at;
+                    $ban_time=request()->created_at;
                     UserBanned::create([
                         'abuse_id'   => $abuse->id,
                         'user_id'    => $subject_id,
@@ -170,15 +170,15 @@ 
 
     protected function check_form()
     {
-        $form = new Form(new Abuse);
-        $form->display('id',__('Abuse id'));
+        $form=new Form(new Abuse);
+        $form->display('id', __('Abuse id'));
         $form->display('title', __('Title'));
         $form->display('cause', __('Cause'));
         $form->display('supplement', __('Supplement'));
         $form->display('link', __('Group Link'));
         $form->display('user_id', __('Submitter'));
-        $form->radio('audit','result')->options(['0' => 'Reject', '1'=> 'Pass']);
-        $form->datetime('created_at','ban until');
+        $form->radio('audit', 'result')->options(['0' => 'Reject', '1'=> 'Pass']);
+        $form->datetime('created_at', 'ban until');
 
         return $form;
     }

Braces +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
                             'removed_at' => $ban_time
                         ]);
                         return ;
-                    }else{
+                    } else{
                         sendMessage([
                             'sender'    => 1,
                             'receiver'  => $abuse->user_id,

app/Admin/Controllers/ProblemController.php

Spacing +35 added lines, -35 removed lines

@@ -142,19 +142,19 @@ 
      *
      * @return Form
      */
-    protected function form($create = false)
+    protected function form($create=false)
     {
         $form=new Form(new EloquentProblemModel);
         $form->model()->makeVisible('password');
-        $form->tab('Basic', function(Form $form){
+        $form->tab('Basic', function(Form $form) {
             $form->text('pid')->readonly();
             $form->text('pcode')->rules('required');
             $form->text('title')->rules('required');
             $form->text('time_limit')->rules('required');
             $form->text('memory_limit')->rules('required');
             $form->textarea('description')->rows(5);
-            $form->textarea('input','Sample Input')->rows(3);
-            $form->textarea('output','Sample Output')->rows(3);
+            $form->textarea('input', 'Sample Input')->rows(3);
+            $form->textarea('output', 'Sample Output')->rows(3);
             $form->textarea('note')->rows(2);
             $form->display('OJ');
             $form->display('update_date');
@@ -170,64 +170,64 @@ 
             $form->file('test_case');
             $form->ignore(['test_case']);
         });
-        if($create){
-            $form->tools(function (Form\Tools $tools) {
+        if ($create) {
+            $form->tools(function(Form\Tools $tools) {
                 $tools->add('<a href="/'.config('admin.route.prefix').'/problems/import" class="btn btn-sm btn-success" style="margin-right:1rem"><i class="MDI file-powerpoint-box"></i>&nbsp;&nbsp;Import from file</a>');
             });
         }
-        $form->saving(function (Form $form){
-            $err = function ($msg) {
-                $error = new MessageBag([
+        $form->saving(function(Form $form) {
+            $err=function($msg) {
+                $error=new MessageBag([
                     'title'   => 'Test case file parse faild.',
                     'message' => $msg,
                 ]);
                 return back()->with(compact('error'));
             };
-            $pcode = $form->pcode;
-            $p = EloquentProblemModel::where('pcode',$pcode)->first();
-            $pid = $form->pid ?? null;
-            if(!empty($p) && $p->pid != $pid){
-                $error = new MessageBag([
+            $pcode=$form->pcode;
+            $p=EloquentProblemModel::where('pcode', $pcode)->first();
+            $pid=$form->pid ?? null;
+            if (!empty($p) && $p->pid!=$pid) {
+                $error=new MessageBag([
                     'title'   => 'Error occur.',
                     'message' => 'Pcode has been token',
                 ]);
                 return back()->with(compact('error'));
             }
-            $test_case = \request()->file('test_case');
-            if(!empty($test_case)){
-                if($test_case->extension() != 'zip'){
+            $test_case=\request()->file('test_case');
+            if (!empty($test_case)) {
+                if ($test_case->extension()!='zip') {
                     $err('You must upload a zip file iuclude test case info and content.');
                 }
-                $path = $test_case->path();
-                $zip = new ZipArchive;
-                if($zip->open($path) !== true) {
+                $path=$test_case->path();
+                $zip=new ZipArchive;
+                if ($zip->open($path)!==true) {
                     $err('You must upload a zip file without encrypt and can open successfully.');
                 };
-                if(($zip->getFromName('info')) === false){
+                if (($zip->getFromName('info'))===false) {
                     $err('The zip files must include a file named info including info of test cases, and the format can see ZsgsDesign/NOJ wiki.');
                 };
-                $test_case_info = json_decode($zip->getFromName('info'),true);
-                $test_cases = $test_case_info['test_cases'];
-                foreach($test_cases as $index => $case) {
-                    if(!isset($case['input_name']) || !isset($case['output_name'])) {
+                $test_case_info=json_decode($zip->getFromName('info'), true);
+                $test_cases=$test_case_info['test_cases'];
+                foreach ($test_cases as $index => $case) {
+                    if (!isset($case['input_name']) || !isset($case['output_name'])) {
                         $err("Test case index {$index}: configuration missing input/output files name.");
                     }
-                    if($zip->getFromName($case['input_name']) === false || $zip->getFromName($case['output_name']) === false ) {
+                    if ($zip->getFromName($case['input_name'])===false || $zip->getFromName($case['output_name'])===false) {
                         $err("Test case index {$index}: missing input/output files that record in the configuration.");
                     }
                 }
-                if(!empty($form->pid)){
-                    $problem = EloquentProblemModel::find($form->pid);
-                    if(!empty($problem)){
-                        $pcode = $problem->pcode;
-                    }else{
-                        $pcode = $form->pcode;
+                if (!empty($form->pid)) {
+                    $problem=EloquentProblemModel::find($form->pid);
+                    if (!empty($problem)) {
+                        $pcode=$problem->pcode;
+                    } else {
+                        $pcode=$form->pcode;
                     }
-                }else{
-                    $pcode = $form->pcode;
+                } else {
+                    $pcode=$form->pcode;
                 }
 
-                if(Storage::exists(base_path().'/storage/test_case/'.$pcode)){
+                if (Storage::exists(base_path().'/storage/test_case/'.$pcode)) {
                     Storage::deleteDirectory(base_path().'/storage/test_case/'.$pcode);
                 }
                 Storage::makeDirectory(base_path().'/storage/test_case/'.$pcode);

Braces +2 added lines, -2 removed lines

@@ -220,10 +220,10 @@
                     $problem = EloquentProblemModel::find($form->pid);
                     if(!empty($problem)){
                         $pcode = $problem->pcode;
-                    }else{
+                    } else{
                         $pcode = $form->pcode;
                     }
-                }else{
+                } else{
                     $pcode = $form->pcode;
                 }
 

app/Admin/routes.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     $router->resource('groups', GroupController::class);
     $router->resource('abuses', AbuseController::class);
 
-    Route::group(['prefix' => 'babel'], function (Router $router) {
+    Route::group(['prefix' => 'babel'], function(Router $router) {
         $router->get('/', 'BabelController@index')->name('admin.babel.index');
         $router->get('installed', 'BabelController@installed')->name('admin.babel.installed');
         $router->get('marketspace', 'BabelController@marketspace')->name('admin.babel.marketspace');