ZsgsDesign / NOJ

app/Http/Controllers/AccountController.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
         $accountModel=new AccountModel();
         $info=$accountModel->detail(Auth::user()->id);
         $feed=$accountModel->feed(Auth::user()->id);
-        $extraInfo = $accountModel->getExtraInfo(Auth::user()->id,100);
+        $extraInfo=$accountModel->getExtraInfo(Auth::user()->id, 100);
         return view("account.dashboard", [
             'page_title'=>"DashBoard",
             'site_title'=>"NOJ",
@@ -45,10 +45,10 @@ 
     {
         $accountModel=new AccountModel();
         $info=$accountModel->detail(Auth::user()->id);
-        if(!empty(session('last_email_send'))){
-            $email_cooldown = 300 - (time() - session('last_email_send'));
+        if (!empty(session('last_email_send'))) {
+            $email_cooldown=300-(time()-session('last_email_send'));
         }
-        $extraInfo = $accountModel->getExtraInfo(Auth::user()->id,100);
+        $extraInfo=$accountModel->getExtraInfo(Auth::user()->id, 100);
         return view("account.dashboard", [
             'page_title'=>"Settings",
             'site_title'=>"NOJ",

app/Http/Controllers/UserController.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         $accountModel=new AccountModel();
         $info=$accountModel->detail($uid);
         $feed=$accountModel->feed($uid);
-        $extraInfo = $accountModel->getExtraInfo($uid,0);
+        $extraInfo=$accountModel->getExtraInfo($uid, 0);
         return view("account.dashboard", [
             'page_title'=>$info["name"],
             'site_title'=>"NOJ",

app/Models/AccountModel.php

Spacing +29 added lines, -29 removed lines

@@ -25,8 +25,8 @@ 
     public function feed($uid=null)
     {
         $ret=[];
-        $solution=DB::table("problem_solution")->join("problem","problem.pid","=","problem_solution.pid")->where(["uid"=>$uid,"audit"=>1])->select("problem.pid as pid","pcode","title","problem_solution.created_at as created_at")->orderBy("problem_solution.created_at","DESC")->get()->all();
-        foreach($solution as &$s){
+        $solution=DB::table("problem_solution")->join("problem", "problem.pid", "=", "problem_solution.pid")->where(["uid"=>$uid, "audit"=>1])->select("problem.pid as pid", "pcode", "title", "problem_solution.created_at as created_at")->orderBy("problem_solution.created_at", "DESC")->get()->all();
+        foreach ($solution as &$s) {
             $s["type"]="event";
             $s["color"]="wemd-orange";
             $s["icon"]="comment-check-outline";
@@ -92,14 +92,14 @@ 
         ])->join("problem", "problem.pid", "=", "submission.pid")->select('pcode')->distinct()->get()->all();
         $ret["solvedCount"]=count($ret["solved"]);
         // Casual
-        $ret["rank"]=Cache::tags(['rank',$ret["id"]])->get("rank", "N/A");
-        $ret["rankTitle"]=Cache::tags(['rank',$ret["id"]])->get("title");
+        $ret["rank"]=Cache::tags(['rank', $ret["id"]])->get("rank", "N/A");
+        $ret["rankTitle"]=Cache::tags(['rank', $ret["id"]])->get("title");
         $ret["rankTitleColor"]=RankModel::getColor($ret["rankTitle"]);
         // Professional
         $ret["professionalTitle"]=RankModel::getProfessionalTitle($ret["professional_rate"]);
         $ret["professionalTitleColor"]=RankModel::getProfessionalColor($ret["professionalTitle"]);
         // Administration Group
-        $ret["admin"]=$uid==1?1:0;
+        $ret["admin"]=$uid==1 ? 1 : 0;
         if (Cache::tags(['bing', 'pic'])->get(date("Y-m-d"))==null) {
             $bing=new BingPhoto([
                 'locale' => 'zh-CN',
@@ -111,9 +111,9 @@ 
         return $ret;
     }
 
-    public function getExtraInfo($uid,$secret_level = 0){
-        $ret = DB::table('users_extra')->where('uid',$uid)->get()->all();
-        $key_meaning = [
+    public function getExtraInfo($uid, $secret_level=0) {
+        $ret=DB::table('users_extra')->where('uid', $uid)->get()->all();
+        $key_meaning=[
             0 => 'gender',
             1 => 'contact',
             2 => 'school',
@@ -121,20 +121,20 @@ 
             4 => 'location',
             5 => 'editor_left_width',
         ];
-        $result = [];
-        if(!empty($ret)){
+        $result=[];
+        if (!empty($ret)) {
             foreach ($ret as $value) {
-                if(empty($value['secret_level']) || $value['secret_level'] <= $secret_level){
-                    $key_name = $key_meaning[$value['key']] ?? 'unknown';
-                    $result[$key_name] = $value['value'];
+                if (empty($value['secret_level']) || $value['secret_level']<=$secret_level) {
+                    $key_name=$key_meaning[$value['key']] ?? 'unknown';
+                    $result[$key_name]=$value['value'];
                 }
             }
         }
         return $result;
     }
 
-    public function setExtraInfo($uid,$key_name,$value = null,$secret_level = -1){
-        $key_value = [
+    public function setExtraInfo($uid, $key_name, $value=null, $secret_level=-1) {
+        $key_value=[
             'gender'                    => 0,
             'contact'                   => 1,
             'school'                    => 2,
@@ -143,31 +143,31 @@ 
             'editor_left_width'         => 5,
             //TODO...
         ];
-        $key = $key_value[$key_name];
-        $ret = DB::table('users_extra')->where('uid',$uid)->where('key',$key)->first();
-        if(!empty($ret)){
+        $key=$key_value[$key_name];
+        $ret=DB::table('users_extra')->where('uid', $uid)->where('key', $key)->first();
+        if (!empty($ret)) {
             unset($ret['id']);
-            if(!is_null($value)){
-                $ret['value'] = $value;
+            if (!is_null($value)) {
+                $ret['value']=$value;
             }
-            if($secret_level != -1){
-                $ret['secret_level'] = $secret_level;
+            if ($secret_level!=-1) {
+                $ret['secret_level']=$secret_level;
             }
-            DB::table('users_extra')->where('uid',$uid)->where('key',$key)->update($ret);
-        }else{
+            DB::table('users_extra')->where('uid', $uid)->where('key', $key)->update($ret);
+        } else {
             return DB::table('users_extra')->insertGetId(
                 [
                     'uid' => $uid,
                     'key' => $key,
                     'value' => $value,
-                    'secret_level' => $secret_level == -1 ? 0 : $secret_level,
+                    'secret_level' => $secret_level==-1 ? 0 : $secret_level,
                 ]
             );
         }
     }
 
-    public function unsetExtraInfoIfExist($uid,$key_name){
-        $key_value = [
+    public function unsetExtraInfoIfExist($uid, $key_name) {
+        $key_value=[
             'gender'                    => 0,
             'contact'                   => 1,
             'school'                    => 2,
@@ -176,7 +176,7 @@ 
             'editor_left_width'         => 5,
             //TODO...
         ];
-        $key = $key_value[$key_name];
-        $ret = DB::table('users_extra')->where('uid',$uid)->where('key',$key)->delete();
+        $key=$key_value[$key_name];
+        $ret=DB::table('users_extra')->where('uid', $uid)->where('key', $key)->delete();
     }
 }

app/Http/Controllers/Ajax/AccountController.php

Spacing +45 added lines, -45 removed lines

@@ -16,7 +16,7 @@ 
 class AccountController extends Controller
 {
 
-    public function updateAvatar(Request $request){
+    public function updateAvatar(Request $request) {
         $isValid=$request->file('avatar')->isValid();
         if ($isValid) {
             $extension=$request->file('avatar')->extension();
@@ -43,13 +43,13 @@ 
         }
     }
 
-    public function changeBasicInfo(Request $request){
+    public function changeBasicInfo(Request $request) {
         // if(!$request->has('username')){
         //     return ResponseModel::err(1003);
         // }
         // $username = $request->input('username');
-        $describes = $request->input('describes');
-        if(strlen($describes) > 255){
+        $describes=$request->input('describes');
+        if (strlen($describes)>255) {
             return ResponseModel::err(1006);
         }
         // $old_username=Auth::user()->name;
@@ -58,79 +58,79 @@ 
         // }
         $user=Auth::user();
         // $user->name = $username;
-        $user->describes = $describes;
+        $user->describes=$describes;
         $user->save();
         return ResponseModel::success();
     }
 
-    public function changePassword(Request $request){
-        if(!$request->has('old_password') || !$request->has('new_password') || !$request->has('confirm_password')){
+    public function changePassword(Request $request) {
+        if (!$request->has('old_password') || !$request->has('new_password') || !$request->has('confirm_password')) {
             return ResponseModel::err(1003);
         }
-        $old_password = $request->input('old_password');
-        $new_password = $request->input('new_password');
-        $confirm_password = $request->input('confirm_password');
-        if($new_password != $confirm_password){
+        $old_password=$request->input('old_password');
+        $new_password=$request->input('new_password');
+        $confirm_password=$request->input('confirm_password');
+        if ($new_password!=$confirm_password) {
             return ResponseModel::err(2004);
         }
-        if(strlen($new_password) < 8 || strlen($old_password) < 8){
+        if (strlen($new_password)<8 || strlen($old_password)<8) {
             return ResponseModel::err(1006);
         }
-        $user = Auth::user();
-        if(!Hash::check($old_password, $user->password)){
+        $user=Auth::user();
+        if (!Hash::check($old_password, $user->password)) {
             return ResponseModel::err(2005);
         }
-        $user->password = Hash::make($new_password);
+        $user->password=Hash::make($new_password);
         $user->save();
         return ResponseModel::success();
     }
 
-    public function checkEmailCooldown(Request $request){
-        $last_send = $request->session()->get('last_email_send');
-        if(empty($last_send) || time() - $last_send >= 300){
-            $request->session()->put('last_email_send',time());
-            return ResponseModel::success(200,null,0);
-        }else{
-            $cooldown =  300 - (time() - $last_send);
-            return ResponseModel::success(200,null,$cooldown);
+    public function checkEmailCooldown(Request $request) {
+        $last_send=$request->session()->get('last_email_send');
+        if (empty($last_send) || time()-$last_send>=300) {
+            $request->session()->put('last_email_send', time());
+            return ResponseModel::success(200, null, 0);
+        } else {
+            $cooldown=300-(time()-$last_send);
+            return ResponseModel::success(200, null, $cooldown);
         }
     }
 
-    public function changeExtraInfo(Request $request){
-        $input = $request->input();
-        $allow_change = ['gender','contact','school','country','location'];
-        foreach($input as $key => $value){
-            if(!in_array($key,$allow_change)){
+    public function changeExtraInfo(Request $request) {
+        $input=$request->input();
+        $allow_change=['gender', 'contact', 'school', 'country', 'location'];
+        foreach ($input as $key => $value) {
+            if (!in_array($key, $allow_change)) {
                 return ResponseModel::error(1007);
             }
         }
-        $account_model = new AccountModel();
-        $user_id = Auth::user()->id;
+        $account_model=new AccountModel();
+        $user_id=Auth::user()->id;
         foreach ($input as $key => $value) {
-            if(strlen($value) != 0){
-                $account_model->setExtraInfo($user_id,$key,$value,0);
-            }else{
-                $account_model->unsetExtraInfoIfExist($user_id,$key);
+            if (strlen($value)!=0) {
+                $account_model->setExtraInfo($user_id, $key, $value, 0);
+            } else {
+                $account_model->unsetExtraInfoIfExist($user_id, $key);
             }
         }
         return ResponseModel::success();
     }
 
-    public function saveEditorWidth(Request $request){
-        $input = $request->input();
-        $allow_change = ['editor_left_width'];
-        foreach($input as $key => $value){
-            if(!in_array($key,$allow_change)){
+    public function saveEditorWidth(Request $request) {
+        $input=$request->input();
+        $allow_change=['editor_left_width'];
+        foreach ($input as $key => $value) {
+            if (!in_array($key, $allow_change)) {
                 return ResponseModel::error(1007);
             }
         }
-        $account_model = new AccountModel();
-        $user_id = Auth::user()->id;
+        $account_model=new AccountModel();
+        $user_id=Auth::user()->id;
         foreach ($input as $key => $value) {
-            if(strlen($value) != 0){
-                $account_model->setExtraInfo($user_id,$key,$value,0);
-            }else{
-                $account_model->unsetExtraInfoIfExist($user_id,$key);
+            if (strlen($value)!=0) {
+                $account_model->setExtraInfo($user_id, $key, $value, 0);
+            } else {
+                $account_model->unsetExtraInfoIfExist($user_id, $key);
             }
         }
         return ResponseModel::success();

app/Http/Controllers/ProblemController.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
             ];
         }
 
-        $editor_left_width = $account->getExtraInfo(Auth::user()->id)['editor_left_width'] ?? '40';
+        $editor_left_width=$account->getExtraInfo(Auth::user()->id)['editor_left_width'] ?? '40';
 
         return is_null($prob_detail) ?  redirect("/problem") : view('problem.editor', [
                                             'page_title'=>$prob_detail["title"],

app/Http/Controllers/ContestController.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function index()
     {
         $contestModel=new ContestModel();
-        $return_list=$contestModel->list(Auth::check()?Auth::user()->id:0);
+        $return_list=$contestModel->list(Auth::check() ?Auth::user()->id : 0);
         $featured=$contestModel->featured();
         return view('contest.index', [
             'page_title'=>"Contest",
@@ -157,7 +157,7 @@ 
             ];
         }
 
-        $editor_left_width = $accountModel->getExtraInfo(Auth::user()->id)['editor_left_width'] ?? '40';
+        $editor_left_width=$accountModel->getExtraInfo(Auth::user()->id)['editor_left_width'] ?? '40';
 
         return view('contest.board.editor', [
             'page_title'=>"Problem Detail",

app/Http/Controllers/MainController.php

Spacing +4 added lines, -4 removed lines

@@ -56,11 +56,11 @@
     public function oldRedirect(Request $request)
     {
         $all_data=$request->all();
-        $method=isset($all_data["method"])?$all_data["method"]:null;
-        $id=isset($all_data["id"])?$all_data["id"]:null;
-        if($method=="showdetail" && !is_null($id)){
+        $method=isset($all_data["method"]) ? $all_data["method"] : null;
+        $id=isset($all_data["id"]) ? $all_data["id"] : null;
+        if ($method=="showdetail" && !is_null($id)) {
             $problemModel=new ProblemModel();
-            return ($problemModel->existPCode("NOJ$id"))?Redirect::route('problem_detail', ['pcode' => "NOJ$id"]):Redirect::route('problem_index');
+            return ($problemModel->existPCode("NOJ$id")) ?Redirect::route('problem_detail', ['pcode' => "NOJ$id"]) : Redirect::route('problem_index');
         }
         return Redirect::route('home');
     }

app/Console/Commands/upgrade.php

Spacing +3 added lines, -3 removed lines

@@ -11,14 +11,14 @@ 
      *
      * @var string
      */
-    protected $signature = 'upgrade';
+    protected $signature='upgrade';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Upgrade to the Latest of NOJ';
+    protected $description='Upgrade to the Latest of NOJ';
 
     /**
      * Create a new command instance.
@@ -37,7 +37,7 @@ 
      */
     public function handle()
     {
-        $bar = $this->output->createProgressBar(8);
+        $bar=$this->output->createProgressBar(8);
         $bar->setFormat("%current%/%max% [%bar%] %percent:3s%%\n<info>%message%</info>");
 
         $bar->setMessage("Enable Maintenance Mode.");

app/Models/GroupModel.php

Spacing +5 added lines, -5 removed lines

@@ -78,13 +78,13 @@ 
 
     public function changeGroupName($gid, $GroupName)
     {
-        return DB::table("group")->where('gid',$gid)->update([
+        return DB::table("group")->where('gid', $gid)->update([
             "name"=>$GroupName
         ]);
     }
 
-    public function changeJoinPolicy($gid, $JoinPolicy){
-        return DB::table("group")->where('gid',$gid)->update([
+    public function changeJoinPolicy($gid, $JoinPolicy) {
+        return DB::table("group")->where('gid', $gid)->update([
             "join_policy"=>$JoinPolicy
         ]);
     }
@@ -92,7 +92,7 @@ 
     public function details($gcode)
     {
         $basic_info=DB::table($this->tableName)->where(["gcode"=>$gcode])->first();
-        if(empty($basic_info)) return [];
+        if (empty($basic_info)) return [];
         $basic_info["members"]=$this->countGroupMembers($basic_info["gid"]);
         $basic_info["tags"]=$this->getGroupTags($basic_info["gid"]);
         $basic_info["create_time_foramt"]=date_format(date_create($basic_info["create_time"]), 'M jS, Y');
@@ -133,7 +133,7 @@ 
         foreach ($user_list as &$u) {
             $u["role_parsed"]=$this->role[$u["role"]];
             $u["role_color"]=$this->role_color[$u["role"]];
-            if(is_null($u["sub_group"])) $u["sub_group"]="None";
+            if (is_null($u["sub_group"])) $u["sub_group"]="None";
         }
         return $user_list;
     }