ZsgsDesign / NOJ

app/Jobs/ProcessSubmission.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $tries = 5;
+    public $tries=5;
     protected $all_data=[];
 
     /**
@@ -40,7 +40,7 @@ 
 
     public function failed()
     {
-        $submissionModel = new SubmissionModel();
+        $submissionModel=new SubmissionModel();
         $submissionModel->updateSubmission($this->all_data["sid"], ["verdict"=>"Submission Error"]);
     }
 }

app/Http/Controllers/Ajax/SubmissionController.php

Spacing +4 added lines, -4 removed lines

@@ -57,14 +57,14 @@
             return ResponseModel::err(3002);
         }
         $submissionModel=new SubmissionModel();
-        if($all_data["method"]==1){
+        if ($all_data["method"]==1) {
             // NOJ Share
             $status=$submissionModel->share($all_data["sid"], Auth::check() ? Auth::user()->id : null);
-            return empty($status)?ResponseModel::err(1001):ResponseModel::success(200, null, $status);
-        } elseif($all_data["method"]==2){
+            return empty($status) ?ResponseModel::err(1001) : ResponseModel::success(200, null, $status);
+        } elseif ($all_data["method"]==2) {
             // Pastebin
             $status=$submissionModel->sharePB($all_data["sid"], Auth::check() ? Auth::user()->id : null);
-            return empty($status)?ResponseModel::err(1001):ResponseModel::success(200, null, $status);
+            return empty($status) ?ResponseModel::err(1001) : ResponseModel::success(200, null, $status);
         } else {
             return ResponseModel::err(6002);
         }

app/Http/Controllers/Ajax/ProblemController.php

Spacing +8 added lines, -8 removed lines

@@ -111,8 +111,8 @@ 
         if (empty($basic)) {
             return ResponseModel::err(3001);
         }
-        $ret=$problemModel->addSolution($pid,Auth::user()->id,$content);
-        return $ret?ResponseModel::success(200):ResponseModel::err(3003);
+        $ret=$problemModel->addSolution($pid, Auth::user()->id, $content);
+        return $ret ?ResponseModel::success(200) : ResponseModel::err(3003);
     }
     /**
      * The Ajax Problem Solution Discussion Update.
@@ -127,8 +127,8 @@ 
         $problemModel=new ProblemModel();
         $psoid=$all_data["psoid"];
         $content=$all_data["content"];
-        $ret=$problemModel->updateSolution($psoid,Auth::user()->id,$content);
-        return $ret?ResponseModel::success(200):ResponseModel::err(3004);
+        $ret=$problemModel->updateSolution($psoid, Auth::user()->id, $content);
+        return $ret ?ResponseModel::success(200) : ResponseModel::err(3004);
     }
     /**
      * The Ajax Problem Solution Discussion Delete.
@@ -142,8 +142,8 @@ 
         $all_data=$request->all();
         $problemModel=new ProblemModel();
         $psoid=$all_data["psoid"];
-        $ret=$problemModel->removeSolution($psoid,Auth::user()->id);
-        return $ret?ResponseModel::success(200):ResponseModel::err(3004);
+        $ret=$problemModel->removeSolution($psoid, Auth::user()->id);
+        return $ret ?ResponseModel::success(200) : ResponseModel::err(3004);
     }
     /**
      * The Ajax Problem Solution Discussion Vote.
@@ -158,8 +158,8 @@ 
         $problemModel=new ProblemModel();
         $psoid=$all_data["psoid"];
         $type=$all_data["type"];
-        $ret=$problemModel->voteSolution($psoid,Auth::user()->id,$type);
-        return $ret["ret"]?ResponseModel::success(200,null,["votes"=>$ret["votes"],"select"=>$ret["select"]]):ResponseModel::err(3004);
+        $ret=$problemModel->voteSolution($psoid, Auth::user()->id, $type);
+        return $ret["ret"] ?ResponseModel::success(200, null, ["votes"=>$ret["votes"], "select"=>$ret["select"]]) : ResponseModel::err(3004);
     }
     /**
      * The Ajax Problem Solution Submit.

app/Http/Controllers/Auth/ResetPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -52,9 +52,9 @@
      * @param  string|null  $token
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function showResetForm(Request $request, $token = null)
+    public function showResetForm(Request $request, $token=null)
     {
-        return view('auth.passwords.reset',[
+        return view('auth.passwords.reset', [
             'token' => $token,
             'email' => $request->email,
             'page_title'=>"Reset Password",

app/Models/Rating/RatingCalculator.php

Spacing +70 added lines, -70 removed lines

@@ -17,14 +17,14 @@ 
     public $totParticipants=0;
     public $INITIAL_RATING=1500;
 
-    public function __construct($cid){
+    public function __construct($cid) {
         $this->cid=$cid;
 
         // get rank
         $this->getRecord();
     }
 
-    private function getRecord(){
+    private function getRecord() {
         $contestRankRaw=Cache::tags(['contest', 'rank'])->get($this->cid);
 
         if ($contestRankRaw==null) {
@@ -32,8 +32,8 @@ 
             $contestRankRaw=$contestModel->contestRankCache($this->cid);
         }
 
-        $this->totParticipants = count($contestRankRaw);
-        foreach($contestRankRaw as $c){
+        $this->totParticipants=count($contestRankRaw);
+        foreach ($contestRankRaw as $c) {
             $this->contestants[]=[
                 "uid"=>$c["uid"],
                 "points"=>$c["score"],
@@ -42,84 +42,84 @@ 
         }
     }
 
-    private function reassignRank(){
+    private function reassignRank() {
         $this->sort("points");
-        $idx = 0;
-        $points = $this->contestants[0]["points"];
-        $i = 1;
-        while($i < $this->totParticipants){
-            if($this->contestants[$i]["points"] < $points){
-                $j = $idx;
-                while($j < $i){
-                    $this->contestants[$j]["rank"] = $i;
-                    $j += 1;
+        $idx=0;
+        $points=$this->contestants[0]["points"];
+        $i=1;
+        while ($i<$this->totParticipants) {
+            if ($this->contestants[$i]["points"]<$points) {
+                $j=$idx;
+                while ($j<$i) {
+                    $this->contestants[$j]["rank"]=$i;
+                    $j+=1;
                 }
-                $idx = $i;
-                $points = $this->contestants[$i]["points"];
+                $idx=$i;
+                $points=$this->contestants[$i]["points"];
             }
-            $i += 1;
+            $i+=1;
         }
-        $j = $idx;
-        while($j < $this->totParticipants){
-            $this->contestants[$j]["rank"] = $this->totParticipants;
-            $j += 1;
+        $j=$idx;
+        while ($j<$this->totParticipants) {
+            $this->contestants[$j]["rank"]=$this->totParticipants;
+            $j+=1;
         }
     }
 
-    private function getEloWinProbability($Ra, $Rb){
-        return 1.0 / (1 + pow(10, ($Rb-$Ra)/400.0));
+    private function getEloWinProbability($Ra, $Rb) {
+        return 1.0 / (1+pow(10, ($Rb-$Ra) / 400.0));
     }
 
-    private function getSeed($rating){
-        $result = 1.0;
-        foreach($this->contestants as $other){
-            $result += $this->getEloWinProbability($other["rating"], $rating);
+    private function getSeed($rating) {
+        $result=1.0;
+        foreach ($this->contestants as $other) {
+            $result+=$this->getEloWinProbability($other["rating"], $rating);
         }
         return $result;
     }
 
-    private function getRatingToRank($rank){
+    private function getRatingToRank($rank) {
         $left=1;
         $right=8000;
-        while($right - $left > 1){
-            $mid = floor(($right + $left)/2);
-            if($this->getSeed($mid) < $rank){
-                $right = $mid;
-            }else{
-                $left = $mid;
+        while ($right-$left>1) {
+            $mid=floor(($right+$left) / 2);
+            if ($this->getSeed($mid)<$rank) {
+                $right=$mid;
+            } else {
+                $left=$mid;
             }
         }
         return $left;
     }
 
-    private function sort($key){
-        usort($this->contestants, function ($a, $b) use ($key) {
+    private function sort($key) {
+        usort($this->contestants, function($a, $b) use ($key) {
             return $b[$key] <=> $a[$key];
         });
     }
 
-    public function calculate(){
-        if(empty($this->contestants)){
+    public function calculate() {
+        if (empty($this->contestants)) {
             return;
         }
 
         // recalc rank
         $this->reassignRank();
 
-        foreach($this->contestants as &$member){
-            $member["seed"] = 1.0;
-            foreach($this->contestants as $other){
-                if($member["uid"] != $other["uid"]){
-                    $member["seed"] += $this->getEloWinProbability($other["rating"], $member["rating"]);
+        foreach ($this->contestants as &$member) {
+            $member["seed"]=1.0;
+            foreach ($this->contestants as $other) {
+                if ($member["uid"]!=$other["uid"]) {
+                    $member["seed"]+=$this->getEloWinProbability($other["rating"], $member["rating"]);
                 }
             }
         }
         unset($member);
 
-        foreach($this->contestants as &$contestant){
-            $midRank = sqrt($contestant["rank"] * $contestant["seed"]);
-            $contestant["needRating"] = $this->getRatingToRank($midRank);
-            $contestant["delta"] = floor(($contestant["needRating"] - $contestant["rating"])/2);
+        foreach ($this->contestants as &$contestant) {
+            $midRank=sqrt($contestant["rank"] * $contestant["seed"]);
+            $contestant["needRating"]=$this->getRatingToRank($midRank);
+            $contestant["delta"]=floor(($contestant["needRating"]-$contestant["rating"]) / 2);
         }
         unset($contestant);
 
@@ -127,39 +127,39 @@ 
 
         // DO some adjuct
         // Total sum should not be more than ZERO.
-        $sum = 0;
+        $sum=0;
 
-        foreach($this->contestants as $contestant){
-            $sum += $contestant["delta"];
+        foreach ($this->contestants as $contestant) {
+            $sum+=$contestant["delta"];
         }
-        $inc = -floor($sum / $this->totParticipants) - 1;
-        foreach($this->contestants as &$contestant){
-            $contestant["delta"] += $inc;
+        $inc=-floor($sum / $this->totParticipants)-1;
+        foreach ($this->contestants as &$contestant) {
+            $contestant["delta"]+=$inc;
         }
         unset($contestant);
 
         // Sum of top-4*sqrt should be adjusted to ZERO.
 
-        $sum = 0;
-        $zeroSumCount = min(intval(4*round(sqrt($this->totParticipants))), $this->totParticipants);
+        $sum=0;
+        $zeroSumCount=min(intval(4 * round(sqrt($this->totParticipants))), $this->totParticipants);
 
-        for($i=0;$i<$zeroSumCount;$i++){
-            $sum += $this->contestants[$i]["delta"];
+        for ($i=0; $i<$zeroSumCount; $i++) {
+            $sum+=$this->contestants[$i]["delta"];
         }
 
-        $inc = min(max(-floor($sum / $zeroSumCount), -10), 0);
+        $inc=min(max(-floor($sum / $zeroSumCount), -10), 0);
 
-        for($i=0;$i<$zeroSumCount;$i++){
-            $this->contestants[$i]["delta"] += $inc;
+        for ($i=0; $i<$zeroSumCount; $i++) {
+            $this->contestants[$i]["delta"]+=$inc;
         }
 
         return $this->validateDeltas();
     }
 
-    public function storage(){
+    public function storage() {
         $contestants=$this->contestants;
-        DB::transaction(function () use ($contestants) {
-            foreach($contestants as $contestant){
+        DB::transaction(function() use ($contestants) {
+            foreach ($contestants as $contestant) {
                 $newRating=$contestant["rating"]+$contestant["delta"];
                 DB::table("users")->where([
                     "id"=>$contestant["uid"]
@@ -181,20 +181,20 @@ 
         }, 5);
     }
 
-    private function validateDeltas(){
+    private function validateDeltas() {
         $this->sort("points");
 
-        for($i=0;$i<$this->totParticipants;$i++){
-            for($j=$i+1;$j<$this->totParticipants;$j++){
-                if($this->contestants[$i]["rating"] > $this->contestants[$j]["rating"]){
-                    if($this->contestants[$i]["rating"] + $this->contestants[$i]["delta"] < $this->contestants[$j]["rating"] + $this->contestants[$j]["delta"]){
+        for ($i=0; $i<$this->totParticipants; $i++) {
+            for ($j=$i+1; $j<$this->totParticipants; $j++) {
+                if ($this->contestants[$i]["rating"]>$this->contestants[$j]["rating"]) {
+                    if ($this->contestants[$i]["rating"]+$this->contestants[$i]["delta"]<$this->contestants[$j]["rating"]+$this->contestants[$j]["delta"]) {
                         Log::warning("First rating invariant failed: {$this->contestants[i]["uid"]} vs. {$this->contestants[j]["uid"]}.");
                         return false;
                     }
                 }
 
-                if($this->contestants[$i]["rating"] < $this->contestants[$j]["rating"]){
-                    if($this->contestants[$i]["delta"] < $this->contestants[$j]["delta"]){
+                if ($this->contestants[$i]["rating"]<$this->contestants[$j]["rating"]) {
+                    if ($this->contestants[$i]["delta"]<$this->contestants[$j]["delta"]) {
                         Log::warning("Second rating invariant failed: {$this->contestants[i]["uid"]} vs.  {$this->contestants[j]["uid"]}.");
                         return false;
                     }

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/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->setExtra($user_id,$key,$value,0);
-            }else{
-                $account_model->setExtra($user_id,$key,null);
+            if (strlen($value)!=0) {
+                $account_model->setExtra($user_id, $key, $value, 0);
+            } else {
+                $account_model->setExtra($user_id, $key, null);
             }
         }
         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->setExtra($user_id,$key,$value,0);
-            }else{
-                $account_model->setExtra($user_id,$key,null);
+            if (strlen($value)!=0) {
+                $account_model->setExtra($user_id, $key, $value, 0);
+            } else {
+                $account_model->setExtra($user_id, $key, null);
             }
         }
         return ResponseModel::success();

app/Models/SubmissionModel.php

Spacing +13 added lines, -13 removed lines

@@ -412,7 +412,7 @@ 
                                             ->where(['verdict'=>'Waiting'])
                                             ->get()
                                             ->all();
-        foreach($ret as &$r){
+        foreach ($ret as &$r) {
             $r["ocode"]=DB::table("oj")->where(["oid"=>$r["oid"]])->first()["ocode"];
         }
         return $ret;
@@ -430,15 +430,15 @@ 
         if (isset($sub['verdict'])) {
             $sub["color"]=$this->colorScheme[$sub['verdict']];
         }
-        $result = DB::table($this->tableName)->where(['sid'=>$sid])->update($sub);
-
-        $contestModel = new ContestModel();
-        $submission_info = DB::table($this->tableName) -> where(['sid'=>$sid]) -> get() -> first();
-        if ($submission_info['cid'] && $contestModel->isContestRunning($submission_info['cid'])){
-            $sub['pid'] = $submission_info['pid'];
-            $sub['uid'] = $submission_info['uid'];
-            $sub['cid'] = $submission_info['cid'];
-            $contestModel->updateContestRankTable($submission_info['cid'],$sub);
+        $result=DB::table($this->tableName)->where(['sid'=>$sid])->update($sub);
+
+        $contestModel=new ContestModel();
+        $submission_info=DB::table($this->tableName) -> where(['sid'=>$sid]) -> get() -> first();
+        if ($submission_info['cid'] && $contestModel->isContestRunning($submission_info['cid'])) {
+            $sub['pid']=$submission_info['pid'];
+            $sub['uid']=$submission_info['uid'];
+            $sub['cid']=$submission_info['cid'];
+            $contestModel->updateContestRankTable($submission_info['cid'], $sub);
         }
         return $result;
     }
@@ -509,15 +509,15 @@ 
             'desc'
         );
 
-        if($filter["pcode"]){
+        if ($filter["pcode"]) {
             $paginator=$paginator->where(["pcode"=>$filter["pcode"]]);
         }
 
-        if($filter["result"]){
+        if ($filter["result"]) {
             $paginator=$paginator->where(["verdict"=>$filter["result"]]);
         }
 
-        if($filter["account"]){
+        if ($filter["account"]) {
             $paginator=$paginator->where(["name"=>$filter["account"]]);
         }