ZsgsDesign / NOJ

app/Http/Controllers/OAuth/GithubController.php

Spacing +48 added lines, -48 removed lines

@@ -13,14 +13,14 @@ 
 {
     public function redirectTo()
     {
-        $accountModel = new AccountModel();
-        if(Auth::check() && $accountModel->getExtra(Auth::user()->id ,'github_id')){
-            return view('oauth.index',[
+        $accountModel=new AccountModel();
+        if (Auth::check() && $accountModel->getExtra(Auth::user()->id, 'github_id')) {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
                 'platform' => 'Github',
-                'display_html' => 'You\'re already tied to the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
+                'display_html' => 'You\'re already tied to the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
                 You can choose to unbind or go back to the homepage',
                 'buttons' => [
                     [
@@ -40,19 +40,19 @@ 
 
     public function handleCallback()
     {
-        try{
-            $github_user = Socialite::driver('github')->user();
-        }catch(\Laravel\Socialite\Two\InvalidStateException $e){
+        try {
+            $github_user=Socialite::driver('github')->user();
+        } catch (\Laravel\Socialite\Two\InvalidStateException $e) {
             return redirect('/');
         }
 
-        $accountModel = new AccountModel();
-        if(Auth::check()){
-            $user_id = Auth::user()->id;
-            $ret = $accountModel->findExtra('github_id',$github_user->id);
-            if(!empty($ret) && $ret['uid'] != $user_id){
-                $user = UserModel::find($ret['uid']);
-                return view('oauth.index',[
+        $accountModel=new AccountModel();
+        if (Auth::check()) {
+            $user_id=Auth::user()->id;
+            $ret=$accountModel->findExtra('github_id', $github_user->id);
+            if (!empty($ret) && $ret['uid']!=$user_id) {
+                $user=UserModel::find($ret['uid']);
+                return view('oauth.index', [
                     'page_title'=>"OAuth",
                     'site_title'=>config("app.name"),
                     'navigation'=>"OAuth",
@@ -67,17 +67,17 @@ 
                     ]
                 ]);
             }
-            $accountModel->setExtra($user_id,'github_id',$github_user->id);
-            $accountModel->setExtra($user_id,'github_email',$github_user->email);
-            $accountModel->setExtra($user_id,'github_nickname',$github_user->nickname);
-            $accountModel->setExtra($user_id,'github_homepage',($github_user->user)['html_url']);
-            $accountModel->setExtra($user_id,'github_token',$github_user->token,101);
-            return view('oauth.index',[
+            $accountModel->setExtra($user_id, 'github_id', $github_user->id);
+            $accountModel->setExtra($user_id, 'github_email', $github_user->email);
+            $accountModel->setExtra($user_id, 'github_nickname', $github_user->nickname);
+            $accountModel->setExtra($user_id, 'github_homepage', ($github_user->user)['html_url']);
+            $accountModel->setExtra($user_id, 'github_token', $github_user->token, 101);
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
                 'platform' => 'Github',
-                'display_html' => 'You have successfully tied up the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
+                'display_html' => 'You have successfully tied up the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
                 You can log in to '.config("app.name").' later using this account',
                 'buttons' => [
                     [
@@ -86,18 +86,18 @@ 
                     ],
                 ]
             ]);
-        }else{
-            $ret = $accountModel->findExtra('github_id',$github_user->id);
-            if(!empty($ret)){
+        } else {
+            $ret=$accountModel->findExtra('github_id', $github_user->id);
+            if (!empty($ret)) {
                 Auth::loginUsingId($ret['uid']);
-                $user_id = Auth::user()->id;
-                $accountModel->setExtra($user_id,'github_email',$github_user->email);
-                $accountModel->setExtra($user_id,'github_nickname',$github_user->nickname);
-                $accountModel->setExtra($user_id,'github_homepage',($github_user->user)['html_url']);
-                $accountModel->setExtra($user_id,'github_token',$github_user->token,101);
+                $user_id=Auth::user()->id;
+                $accountModel->setExtra($user_id, 'github_email', $github_user->email);
+                $accountModel->setExtra($user_id, 'github_nickname', $github_user->nickname);
+                $accountModel->setExtra($user_id, 'github_homepage', ($github_user->user)['html_url']);
+                $accountModel->setExtra($user_id, 'github_token', $github_user->token, 101);
                 return redirect('/');
-            }else{
-                return view('oauth.index',[
+            } else {
+                return view('oauth.index', [
                     'page_title'=>"OAuth",
                     'site_title'=>config("app.name"),
                     'navigation'=>"OAuth",
@@ -120,16 +120,16 @@ 
 
     public function unbind()
     {
-        $accountModel = new AccountModel();
-        if($accountModel->getExtra(Auth::user()->id ,'github_id')){
-            return view('oauth.index',[
+        $accountModel=new AccountModel();
+        if ($accountModel->getExtra(Auth::user()->id, 'github_id')) {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
                 'platform' => 'Github',
                 'display_html' => 'You are trying to unbind the following two : <br />
                 Your '.config("app.name").' account : <span class="text-info">'.Auth::user()->email.'</span><br />
-                This Github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
+                This Github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
                 Make your decision carefully, although you can later establish the binding again',
                 'buttons' => [
                     [
@@ -143,8 +143,8 @@ 
                     ],
                 ]
             ]);
-        }else{
-            return view('oauth.index',[
+        } else {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
@@ -162,15 +162,15 @@ 
 
     public function confirmUnbind()
     {
-        $accountModel = new AccountModel();
-        $user_id = Auth::user()->id;
-        if($accountModel->getExtra($user_id ,'github_id')){
-            $accountModel->setExtra($user_id,'github_id',null);
-            $accountModel->setExtra($user_id,'github_email',null);
-            $accountModel->setExtra($user_id,'github_nickname',null);
-            $accountModel->setExtra($user_id,'github_homepage',null);
-            $accountModel->setExtra($user_id,'github_token',null);
-            return view('oauth.index',[
+        $accountModel=new AccountModel();
+        $user_id=Auth::user()->id;
+        if ($accountModel->getExtra($user_id, 'github_id')) {
+            $accountModel->setExtra($user_id, 'github_id', null);
+            $accountModel->setExtra($user_id, 'github_email', null);
+            $accountModel->setExtra($user_id, 'github_nickname', null);
+            $accountModel->setExtra($user_id, 'github_homepage', null);
+            $accountModel->setExtra($user_id, 'github_token', null);
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
@@ -183,8 +183,8 @@ 
                     ],
                 ]
             ]);
-        }else{
-            return view('oauth.index',[
+        } else {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",

app/Http/Controllers/UserController.php

Spacing +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
         $accountModel=new AccountModel();
         $info=$accountModel->detail($uid);
         $feed=$accountModel->feed($uid);
-        $extraInfo = $accountModel->getExtra($uid, ['gender', 'contanct', 'school', 'country', 'location'],0);
-        $socialiteInfo = $accountModel->getSocialiteInfo($uid,0);
+        $extraInfo=$accountModel->getExtra($uid, ['gender', 'contanct', 'school', 'country', 'location'], 0);
+        $socialiteInfo=$accountModel->getSocialiteInfo($uid, 0);
         return view("account.dashboard", [
             'page_title'=>$info["name"],
             'site_title'=>config("app.name"),

app/Http/Controllers/Auth/ForgotPasswordController.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     public function showLinkRequestForm()
     {
-        return view('auth.passwords.email',[
+        return view('auth.passwords.email', [
             'page_title'=>"Reset Password",
             'site_title'=>config("app.name"),
             'navigation' => "Account"

app/Http/Controllers/AccountController.php

Spacing +6 added lines, -6 removed lines

@@ -28,8 +28,8 @@ 
         $accountModel=new AccountModel();
         $info=$accountModel->detail(Auth::user()->id);
         $feed=$accountModel->feed(Auth::user()->id);
-        $extraInfo = $accountModel->getExtra(Auth::user()->id, ['gender', 'contanct', 'school', 'country', 'location'],100);
-        $socialiteInfo = $accountModel->getSocialiteInfo(Auth::user()->id,100);
+        $extraInfo=$accountModel->getExtra(Auth::user()->id, ['gender', 'contanct', 'school', 'country', 'location'], 100);
+        $socialiteInfo=$accountModel->getSocialiteInfo(Auth::user()->id, 100);
         return view("account.dashboard", [
             'page_title'=>"DashBoard",
             'site_title'=>config("app.name"),
@@ -52,11 +52,11 @@ 
     {
         $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->getExtra(Auth::user()->id, ['gender', 'contanct', 'school', 'country', 'location'],100);
-        $socialiteInfo = $accountModel->getSocialiteInfo(Auth::user()->id,100);
+        $extraInfo=$accountModel->getExtra(Auth::user()->id, ['gender', 'contanct', 'school', 'country', 'location'], 100);
+        $socialiteInfo=$accountModel->getSocialiteInfo(Auth::user()->id, 100);
         return view("account.dashboard", [
             'page_title'=>"Settings",
             'site_title'=>config("app.name"),

app/Http/Middleware/Privileged.php

Spacing +4 added lines, -4 removed lines

@@ -18,16 +18,16 @@
     public function handle($request, Closure $next)
     {
         if (Auth::check()) {
-            if(isset($request->gcode)){
+            if (isset($request->gcode)) {
                 //group privilege
                 $groupModel=new GroupModel();
-                if($groupModel->judgeClearance($groupModel->gid($request->gcode), Auth::user()->id)>=2){
+                if ($groupModel->judgeClearance($groupModel->gid($request->gcode), Auth::user()->id)>=2) {
                     return $next($request);
                 }
-            }elseif(isset($request->cid)) {
+            }elseif (isset($request->cid)) {
                 //contest privilege
                 $contestModel=new ContestModel();
-                if($contestModel->judgeClearance($request->cid, Auth::user()->id)==3){
+                if ($contestModel->judgeClearance($request->cid, Auth::user()->id)==3) {
                     return $next($request);
                 }
             }

app/Console/Commands/Babel/Crawl.php

Spacing +6 added lines, -6 removed lines

@@ -14,14 +14,14 @@ 
      *
      * @var string
      */
-    protected $signature = 'babel:crawl {extension : The package name of the extension} {--action=crawl_problem : The action of the Crawler} {--con=all : The target problemset of the Crawler} {--cached : Whether cached or not}';
+    protected $signature='babel:crawl {extension : The package name of the extension} {--action=crawl_problem : The action of the Crawler} {--con=all : The target problemset of the Crawler} {--cached : Whether cached or not}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Crawl problems for a given Babel Extension to NOJ';
+    protected $description='Crawl problems for a given Babel Extension to NOJ';
 
     /**
      * Create a new command instance.
@@ -40,10 +40,10 @@ 
      */
     public function handle()
     {
-        $extension = $this->argument('extension');
-        $action = $this->option('action');
-        $con = $this->option('con');
-        $cached = $this->option('cached');
+        $extension=$this->argument('extension');
+        $action=$this->option('action');
+        $con=$this->option('con');
+        $cached=$this->option('cached');
         $babel=new Babel();
         $babel->crawl([
             "name" => $extension,

app/Models/AnnouncementModel.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
     public function fetch()
     {
-        $list=DB::table($this->table)->orderBy('post_date','desc')->get()->all();
+        $list=DB::table($this->table)->orderBy('post_date', 'desc')->get()->all();
         if (empty($list)) {
             return [];
         }

app/Models/RankModel.php

Spacing +24 added lines, -24 removed lines

@@ -7,7 +7,7 @@ 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Arr;
 use App\Models\Rating\RatingCalculator;
-use Cache,Redis;
+use Cache, Redis;
 
 class RankModel extends Model
 {
@@ -65,28 +65,28 @@ 
 
     public static function getColor($rankTitle)
     {
-        if(is_null($rankTitle)) return "";
+        if (is_null($rankTitle)) return "";
         return self::$casualRanking[$rankTitle];
     }
 
     public static function getProfessionalColor($rankTitle)
     {
-        if(is_null($rankTitle)) return self::$professionalRanking["None"];
+        if (is_null($rankTitle)) return self::$professionalRanking["None"];
         return self::$professionalRanking[$rankTitle];
     }
 
     public function list($num)
     {
         $rankList=Cache::tags(['rank'])->get('general');
-        if($rankList==null) $rankList=[];
-        $rankList=array_slice($rankList,0,$num);
-        $userInfoRaw=DB::table("users")->select("id as uid","avatar","name")->get()->all();
+        if ($rankList==null) $rankList=[];
+        $rankList=array_slice($rankList, 0, $num);
+        $userInfoRaw=DB::table("users")->select("id as uid", "avatar", "name")->get()->all();
         $userInfo=[];
-        foreach($userInfoRaw as $u){
+        foreach ($userInfoRaw as $u) {
             $userInfo[$u["uid"]]=$u;
         }
-        foreach($rankList as &$r){
-            $r["details"]=isset($userInfo[$r["uid"]])?$userInfo[$r["uid"]]:[];
+        foreach ($rankList as &$r) {
+            $r["details"]=isset($userInfo[$r["uid"]]) ? $userInfo[$r["uid"]] : [];
         }
         // var_dump($rankList); exit();
         return $rankList;
@@ -109,8 +109,8 @@ 
                     $rankSolved=$rankItem["totValue"];
                 }
                 $rankTitle=$this->getRankTitle($rankValue);
-                Cache::tags(['rank',$rankItem["uid"]])->put("rank", $rankValue, 86400);
-                Cache::tags(['rank',$rankItem["uid"]])->put("title", $rankTitle, 86400);
+                Cache::tags(['rank', $rankItem["uid"]])->put("rank", $rankValue, 86400);
+                Cache::tags(['rank', $rankItem["uid"]])->put("title", $rankTitle, 86400);
                 $rankListCached[]=[
                     "uid"=>$rankItem["uid"],
                     "rank"=>$rankValue,
@@ -127,14 +127,14 @@ 
 
     public function getProfessionalRanking()
     {
-        $professionalRankList = [];
-        $verifiedUsers = DB::table("users")->select("professional_rate","id as uid","avatar","name")->get()->all();
-        $rankIter = 0;
-        foreach($verifiedUsers as $user) {
-            $rankVal = $user['professional_rate'];
-            $rankTitle = self::getProfessionalTitle($rankVal);
-            $titleColor = self::getProfessionalColor($rankTitle);
-            $professionalRankList[$rankIter++] = [
+        $professionalRankList=[];
+        $verifiedUsers=DB::table("users")->select("professional_rate", "id as uid", "avatar", "name")->get()->all();
+        $rankIter=0;
+        foreach ($verifiedUsers as $user) {
+            $rankVal=$user['professional_rate'];
+            $rankTitle=self::getProfessionalTitle($rankVal);
+            $titleColor=self::getProfessionalColor($rankTitle);
+            $professionalRankList[$rankIter++]=[
                 "name"=>$user["name"],
                 "uid"=>$user["uid"],
                 "avatar"=>$user["avatar"],
@@ -156,7 +156,7 @@ 
                 $tot+=$c;
             }
             foreach ($this->casualRankingPer as &$c) {
-                $c=round($c*$totUsers/$tot);
+                $c=round($c * $totUsers / $tot);
                 $cur+=$c;
                 $c=$cur;
             }
@@ -167,16 +167,16 @@ 
 
     public function getRankTitle($rankVal)
     {
-        foreach($this->casualRankingPer as $title=>$c){
-            if($rankVal<=$c) return $title;
+        foreach ($this->casualRankingPer as $title=>$c) {
+            if ($rankVal<=$c) return $title;
         }
         return Arr::last($this->casualRankingPer);
     }
 
     public static function getProfessionalTitle($rankVal)
     {
-        foreach(self::$professionalRankingPer as $title=>$point) {
-            if($rankVal >= $point) return $title;
+        foreach (self::$professionalRankingPer as $title=>$point) {
+            if ($rankVal>=$point) return $title;
         }
         return Arr::last(self::$professionalRankingPer);
     }

app/Console/Commands/Babel/SyncContest.php

Spacing +8 added lines, -8 removed lines

@@ -14,14 +14,14 @@ 
      *
      * @var string
      */
-    protected $signature = 'babel:sync {extension : The package name of the extension} {--vcid= : The target contest of the Crawler} {--gid=1 : The holding group}';
+    protected $signature='babel:sync {extension : The package name of the extension} {--vcid= : The target contest of the Crawler} {--gid=1 : The holding group}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Crawl contests for a given Babel Extension to NOJ';
+    protected $description='Crawl contests for a given Babel Extension to NOJ';
 
     /**
      * Create a new command instance.
@@ -40,16 +40,16 @@ 
      */
     public function handle()
     {
-        $extension = $this->argument('extension');
-        $vcid = $this->option('vcid');
-        $gid = $this->option('gid');
-        $className = "App\\Babel\\Extension\\$extension\\Synchronizer";
-        $all_data = [
+        $extension=$this->argument('extension');
+        $vcid=$this->option('vcid');
+        $gid=$this->option('gid');
+        $className="App\\Babel\\Extension\\$extension\\Synchronizer";
+        $all_data=[
             'oj'=>$extension,
             'vcid'=>$vcid,
             'gid'=>$gid,
         ];
-        $Sync = new $className($all_data);
+        $Sync=new $className($all_data);
         $Sync->crawlContest();
     }
 }