ZsgsDesign / NOJ

app/Http/Controllers/GroupController.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $groupModel=new GroupModel();
         $contestModel=new ContestModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group_index');
+        if (empty($basic_info)) return Redirect::route('group_index');
         $my_profile=$groupModel->userProfile(Auth::user()->id, $basic_info["gid"]);
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $member_list=$groupModel->userList($basic_info["gid"]);

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,9 @@
         $groupModel=new GroupModel();
         $contestModel=new ContestModel();
         $basic_info=$groupModel->details($gcode);
-        if(empty($basic_info)) return Redirect::route('group_index');
+        if(empty($basic_info)) {
+            return Redirect::route('group_index');
+        }
         $my_profile=$groupModel->userProfile(Auth::user()->id, $basic_info["gid"]);
         $clearance=$groupModel->judgeClearance($basic_info["gid"], Auth::user()->id);
         $member_list=$groupModel->userList($basic_info["gid"]);

app/Models/ContestModel.php

Indentation +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
                 ->where(
                     function ($query) {
                         $query->where('public', 1)
-                              ->where('audit_status', 1);
+                                ->where('audit_status', 1);
                     }
                 )
                 ->orWhere(

Spacing +48 added lines, -48 removed lines

@@ -124,9 +124,9 @@ 
         //     "gid"=>$gid
         // ])->orderBy('begin_time', 'desc')->get()->all();
         $preQuery=DB::table($this->tableName);
-        $paginator=$preQuery->where('gid','=',$gid)->orderBy('begin_time', 'desc')->paginate(10);
+        $paginator=$preQuery->where('gid', '=', $gid)->orderBy('begin_time', 'desc')->paginate(10);
         $contest_list=$paginator->all();
-        if(empty($contest_list)){
+        if (empty($contest_list)) {
             return null;
         }
 
@@ -161,13 +161,13 @@ 
                 ->join('contest', 'group_member.gid', '=', 'contest.gid')
                 ->leftJoin('contest_participant', 'contest.cid', '=', 'contest_participant.cid')
                 ->where(
-                    function ($query) {
+                    function($query) {
                         $query->where('public', 1)
                               ->where('audit_status', 1);
                     }
                 )
                 ->orWhere(
-                    function ($query) use ($uid) {
+                    function($query) use ($uid) {
                         $query->where('group_member.uid', $uid)
                                 ->where('group_member.role', '>', 0);
                             //     ->where(function ($query) use ($uid) {
@@ -232,14 +232,14 @@ 
         }
     }
 
-    public function registContest($cid,$uid)
+    public function registContest($cid, $uid)
     {
         $registered=DB::table("contest_participant")->where([
             "cid"=>$cid,
             "uid"=>$uid
         ])->first();
 
-        if(empty($registered)){
+        if (empty($registered)) {
             DB::table("contest_participant")->insert([
                 "cid"=>$cid,
                 "uid"=>$uid,
@@ -540,7 +540,7 @@ 
                     "problem_detail" => $prob_detail
                 ];
             }
-            usort($ret, function ($a, $b) {
+            usort($ret, function($a, $b) {
                 if ($a["score"]==$b["score"]) {
                     if ($a["penalty"]==$b["penalty"]) {
                         return 0;
@@ -587,7 +587,7 @@ 
                     "problem_detail" => $prob_detail
                 ];
             }
-            usort($ret, function ($a, $b) {
+            usort($ret, function($a, $b) {
                 if ($a["score"]==$b["score"]) {
                     if ($a["solved"]==$b["solved"]) {
                         return 0;
@@ -680,7 +680,7 @@ 
     {
         return DB::table("contest_clarification")->where([
             "cid"=>$cid
-        ])->where(function ($query) {
+        ])->where(function($query) {
             $query->where([
                 "public"=>1
             ])->orWhere([
@@ -833,7 +833,7 @@ 
                 "users.id",
                 "=",
                 "submission.uid"
-            )->where(function ($query) use ($frozen_time) {
+            )->where(function($query) use ($frozen_time) {
                 $query->where(
                     "submission_date",
                     "<",
@@ -1026,12 +1026,12 @@ 
     public function updateProfessionalRate($cid)
     {
         $basic=$this->basic($cid);
-        if($basic["rated"]&&!$basic["is_rated"]){
+        if ($basic["rated"] && !$basic["is_rated"]) {
             $ratingCalculator=new RatingCalculator($cid);
-            if($ratingCalculator->calculate()){
+            if ($ratingCalculator->calculate()) {
                 $ratingCalculator->storage();
                 return true;
-            }else{
+            } else {
                 return false;
             }
         } else {
@@ -1041,7 +1041,7 @@ 
 
     public function arrangeContest($gid, $config, $problems)
     {
-        DB::transaction(function () use ($gid, $config, $problems) {
+        DB::transaction(function() use ($gid, $config, $problems) {
             $cid=DB::table($this->tableName)->insertGetId([
                 "gid"=>$gid,
                 "name"=>$config["name"],
@@ -1077,31 +1077,31 @@ 
         }, 5);
     }
 
-    public function updateContestRankTable($cid,$sub){
-        $lock = Cache::lock("contestrank$cid",10);
-        try{
-            if($lock->get()){
-                if(Cache::tags(['contest','rank'])->get($cid) != null){
-                    $chache = Cache::tags(['contest','data'])->get($cid);
-                    $ret = Cache::tags(['contest','rank'])->get($cid);
-                    if (time() > $chache['frozen_time'])
+    public function updateContestRankTable($cid, $sub) {
+        $lock=Cache::lock("contestrank$cid", 10);
+        try {
+            if ($lock->get()) {
+                if (Cache::tags(['contest', 'rank'])->get($cid)!=null) {
+                    $chache=Cache::tags(['contest', 'data'])->get($cid);
+                    $ret=Cache::tags(['contest', 'rank'])->get($cid);
+                    if (time()>$chache['frozen_time'])
                         return;
 
-                    $id = 0;
+                    $id=0;
 
-                    foreach($chache['problemSet'] as $key => $p){
-                        if ($p['pid'] == $sub['pid']){
-                            $chache['problemSet'][$key]['cpid'] = $key;
-                            $id = $key;
+                    foreach ($chache['problemSet'] as $key => $p) {
+                        if ($p['pid']==$sub['pid']) {
+                            $chache['problemSet'][$key]['cpid']=$key;
+                            $id=$key;
                         }
                     }
 
-                    $ret = $this->updateContestRankDetail($chache['contest_info'],$chache['problemSet'][$id],$cid,$sub['uid'],$ret);
-                    $ret = $this->sortContestRankTable($chache['contest_info'],$cid,$ret);
+                    $ret=$this->updateContestRankDetail($chache['contest_info'], $chache['problemSet'][$id], $cid, $sub['uid'], $ret);
+                    $ret=$this->sortContestRankTable($chache['contest_info'], $cid, $ret);
 
                     Cache::tags(['contest', 'rank'])->put($cid, $ret);
                 }
-                else{
+                else {
                     $ret=[];
                     $chache=[];
                     $chache['contest_info']=DB::table("contest")->where("cid", $cid)->first();
@@ -1118,7 +1118,7 @@ 
                             "cid"=>$cid,
                             "audit"=>1
                         ])->select('uid')->get()->all();
-                    }else{
+                    } else {
                         $submissionUsers=DB::table("submission")->where([
                             "cid"=>$cid
                         ])->where(
@@ -1129,24 +1129,24 @@ 
                     }
                     foreach ($submissionUsers as $s) {
                         foreach ($chache['problemSet'] as $key => $p) {
-                            $p['cpid'] = $key;
-                            $ret = $this->updateContestRankDetail($chache['contest_info'],$p,$cid,$s['uid'],$ret);
+                            $p['cpid']=$key;
+                            $ret=$this->updateContestRankDetail($chache['contest_info'], $p, $cid, $s['uid'], $ret);
                         }
                     }
-                    $ret = $this->sortContestRankTable($chache['contest_info'],$cid,$ret);
+                    $ret=$this->sortContestRankTable($chache['contest_info'], $cid, $ret);
                     Cache::tags(['contest', 'rank'])->put($cid, $ret);
                 }
             }
-        }catch(LockTimeoutException $e){
+        } catch (LockTimeoutException $e) {
             Log::warning("Contest Rank Lock Timed Out");
-        }finally{
+        } finally {
             optional($lock)->release();
         }
     }
 
-    public function sortContestRankTable($contest_info,$cid,$ret){
-        if ($contest_info["rule"]==1){
-            usort($ret, function ($a, $b) {
+    public function sortContestRankTable($contest_info, $cid, $ret) {
+        if ($contest_info["rule"]==1) {
+            usort($ret, function($a, $b) {
                 if ($a["score"]==$b["score"]) {
                     if ($a["penalty"]==$b["penalty"]) {
                         return 0;
@@ -1161,8 +1161,8 @@ 
                     return 1;
                 }
             });
-        }else if ($contest_info["rule"]==2){
-            usort($ret, function ($a, $b) {
+        } else if ($contest_info["rule"]==2) {
+            usort($ret, function($a, $b) {
                 if ($a["score"]==$b["score"]) {
                     if ($a["solved"]==$b["solved"]) {
                         return 0;
@@ -1181,15 +1181,15 @@ 
         return $ret;
     }
 
-    public function updateContestRankDetail($contest_info,$problem,$cid,$uid,$ret){
-        $id = count($ret);
-        foreach($ret as $key => $r){
-            if($r['uid'] == $uid)
-                $id = $key;
+    public function updateContestRankDetail($contest_info, $problem, $cid, $uid, $ret) {
+        $id=count($ret);
+        foreach ($ret as $key => $r) {
+            if ($r['uid']==$uid)
+                $id=$key;
         }
         if ($contest_info["rule"]==1) {
             // ACM/ICPC Mode
-                $prob_detail = $ret[$id]['problem_detail'];
+                $prob_detail=$ret[$id]['problem_detail'];
                 $totPen=$ret[$id]['penalty'];
                 $totScore=$ret[$id]['score'];
 
@@ -1223,7 +1223,7 @@ 
                 ];
         } elseif ($contest_info["rule"]==2) {
             // OI Mode
-            $prob_detail = $ret[$id]['problem_detail'];
+            $prob_detail=$ret[$id]['problem_detail'];
             $totScore=$ret[$id]['score'];
             $totSolved=$ret[$id]['solved'];
 

Braces +12 added lines, -11 removed lines

@@ -1031,7 +1031,7 @@ 
             if($ratingCalculator->calculate()){
                 $ratingCalculator->storage();
                 return true;
-            }else{
+            } else{
                 return false;
             }
         } else {
@@ -1084,8 +1084,9 @@ 
                 if(Cache::tags(['contest','rank'])->get($cid) != null){
                     $chache = Cache::tags(['contest','data'])->get($cid);
                     $ret = Cache::tags(['contest','rank'])->get($cid);
-                    if (time() > $chache['frozen_time'])
-                        return;
+                    if (time() > $chache['frozen_time']) {
+                                            return;
+                    }
 
                     $id = 0;
 
@@ -1100,8 +1101,7 @@ 
                     $ret = $this->sortContestRankTable($chache['contest_info'],$cid,$ret);
 
                     Cache::tags(['contest', 'rank'])->put($cid, $ret);
-                }
-                else{
+                } else{
                     $ret=[];
                     $chache=[];
                     $chache['contest_info']=DB::table("contest")->where("cid", $cid)->first();
@@ -1118,7 +1118,7 @@ 
                             "cid"=>$cid,
                             "audit"=>1
                         ])->select('uid')->get()->all();
-                    }else{
+                    } else{
                         $submissionUsers=DB::table("submission")->where([
                             "cid"=>$cid
                         ])->where(
@@ -1137,9 +1137,9 @@ 
                     Cache::tags(['contest', 'rank'])->put($cid, $ret);
                 }
             }
-        }catch(LockTimeoutException $e){
+        } catch(LockTimeoutException $e){
             Log::warning("Contest Rank Lock Timed Out");
-        }finally{
+        } finally{
             optional($lock)->release();
         }
     }
@@ -1161,7 +1161,7 @@ 
                     return 1;
                 }
             });
-        }else if ($contest_info["rule"]==2){
+        } else if ($contest_info["rule"]==2){
             usort($ret, function ($a, $b) {
                 if ($a["score"]==$b["score"]) {
                     if ($a["solved"]==$b["solved"]) {
@@ -1184,8 +1184,9 @@ 
     public function updateContestRankDetail($contest_info,$problem,$cid,$uid,$ret){
         $id = count($ret);
         foreach($ret as $key => $r){
-            if($r['uid'] == $uid)
-                $id = $key;
+            if($r['uid'] == $uid) {
+                            $id = $key;
+            }
         }
         if ($contest_info["rule"]==1) {
             // ACM/ICPC Mode

app/Http/Controllers/Ajax/ContestController.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
         $all_data=$request->all();
 
         $contestModel=new ContestModel();
-        return $contestModel->updateProfessionalRate($all_data["cid"])?ResponseModel::success(200):ResponseModel::err(1001);
+        return $contestModel->updateProfessionalRate($all_data["cid"]) ?ResponseModel::success(200) : ResponseModel::err(1001);
     }
 
     public function requestClarification(Request $request)
@@ -101,16 +101,16 @@ 
         $groupModel=new GroupModel();
         $basic=$contestModel->basic($all_data["cid"]);
 
-        if(!$basic["registration"]){
+        if (!$basic["registration"]) {
             return ResponseModel::err(4003);
         }
-        if(strtotime($basic["registration_due"])<time()){
+        if (strtotime($basic["registration_due"])<time()) {
             return ResponseModel::err(4004);
         }
-        if(!$basic["registant_type"]){
+        if (!$basic["registant_type"]) {
             return ResponseModel::err(4005);
         }
-        if($basic["registant_type"]==1 && !$groupModel->isMember($basic["gid"], Auth::user()->id)){
+        if ($basic["registant_type"]==1 && !$groupModel->isMember($basic["gid"], Auth::user()->id)) {
             return ResponseModel::err(4005);
         }
 

app/Models/AccountModel.php

Braces +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
                 $ret['secret_level'] = $secret_level;
             }
             DB::table('users_extra')->where('uid',$uid)->where('key',$key)->update($ret);
-        }else{
+        } else{
             return DB::table('users_extra')->insertGetId(
                 [
                     'uid' => $uid,

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/Helpers/functions.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 if (!function_exists('emailVerified')) {
     function emailVerified()
     {
-        if(Auth::check()){
+        if (Auth::check()) {
             return !is_null(Auth::user()->email_verified_at);
         }
 

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/GroupModel.php

Braces +6 added lines, -2 removed lines

@@ -79,7 +79,9 @@ 
     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');
@@ -120,7 +122,9 @@ 
         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;
     }

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

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();

Braces +3 added lines, -3 removed lines

@@ -90,7 +90,7 @@ 
         if(empty($last_send) || time() - $last_send >= 300){
             $request->session()->put('last_email_send',time());
             return ResponseModel::success(200,null,0);
-        }else{
+        } else{
             $cooldown =  300 - (time() - $last_send);
             return ResponseModel::success(200,null,$cooldown);
         }
@@ -109,7 +109,7 @@ 
         foreach ($input as $key => $value) {
             if(strlen($value) != 0){
                 $account_model->setExtraInfo($user_id,$key,$value,0);
-            }else{
+            } else{
                 $account_model->unsetExtraInfoIfExist($user_id,$key);
             }
         }
@@ -129,7 +129,7 @@ 
         foreach ($input as $key => $value) {
             if(strlen($value) != 0){
                 $account_model->setExtraInfo($user_id,$key,$value,0);
-            }else{
+            } else{
                 $account_model->unsetExtraInfoIfExist($user_id,$key);
             }
         }