CorWatts / fasterscale

common/config/main.php

Spacing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
       'common\interfaces\QuestionInterface' => \common\models\Question::class,
       'common\interfaces\BehaviorInterface' => \common\models\Behavior::class,
       'common\interfaces\CategoryInterface' => \common\models\Category::class,
-      'common\interfaces\TimeInterface' => function () {
-        if(Yii::$app->user->getIsGuest()) {
+      'common\interfaces\TimeInterface' => function() {
+        if (Yii::$app->user->getIsGuest()) {
           return new \common\components\Time('UTC');
         } else {
           return new \common\components\Time(Yii::$app->user->identity->timezone);

site/models/EditProfileForm.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
       ['email', 'filter', 'filter' => 'trim'],
       ['email', 'filter', 'filter' => 'strtolower'],
       ['email', 'email'],
-      ['email', 'unique', 'targetClass' => '\common\models\User', 'message' => 'This email address has already been taken.', 'filter' => "id <> ".Yii::$app->user->id],
+      ['email', 'unique', 'targetClass' => '\common\models\User', 'message' => 'This email address has already been taken.', 'filter' => "id <> " . Yii::$app->user->id],
 
 
       ['timezone', 'string', 'min' => 2, 'max' => 255],
@@ -88,11 +88,11 @@ 
       $graph = Yii::$container
         ->get(\common\components\Graph::class, [$this->user]);
 
-      if($this->email)
+      if ($this->email)
         $user->email = $this->email;
-      if($this->timezone)
+      if ($this->timezone)
         $user->timezone = $this->timezone;
-      if($this->expose_graph) {
+      if ($this->expose_graph) {
         $user->expose_graph = true;
 
         // generate scores graph image
@@ -100,7 +100,7 @@ 
         // if they haven't done a check-in in the last month this
         // will explode because $scores_last_month is an empty
         // array
-        if($scores_last_month) {
+        if ($scores_last_month) {
           $graph->create($scores_last_month, true);
         }
       } else {
@@ -108,7 +108,7 @@ 
         // remove scores graph image
         $graph->destroy();
       }
-      if($this->send_email) {
+      if ($this->send_email) {
         $user->email_threshold = $this->email_threshold;
         $user->partner_email1  = $this->partner_email1;
         $user->partner_email2  = $this->partner_email2;

Braces +6 added lines, -4 removed lines

@@ -88,10 +88,12 @@
       $graph = Yii::$container
         ->get(\common\components\Graph::class, [$this->user]);
 
-      if($this->email)
-        $user->email = $this->email;
-      if($this->timezone)
-        $user->timezone = $this->timezone;
+      if($this->email) {
+              $user->email = $this->email;
+      }
+      if($this->timezone) {
+              $user->timezone = $this->timezone;
+      }
       if($this->expose_graph) {
         $user->expose_graph = true;
 

site/controllers/CheckinController.php

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
     if ($form->load(Yii::$app->request->post()) && $form->validate()) {
       $form->compiled_behaviors = $form->compileBehaviors();
 
-      if(sizeof($form->compiled_behaviors) === 0) {
+      if (sizeof($form->compiled_behaviors) === 0) {
         return $this->redirect(['view']);
       }
 
@@ -49,14 +49,14 @@ 
 
       // delete cached scores
       $time = Yii::$container->get(\common\interfaces\TimeInterface::class);
-      $key = "scores_of_last_month_".Yii::$app->user->id."_".$time->getLocalDate();
+      $key = "scores_of_last_month_" . Yii::$app->user->id . "_" . $time->getLocalDate();
       Yii::$app->cache->delete($key);
 
       // if the user has publicised their score graph, create the image
-      if(Yii::$app->user->identity->expose_graph) {
+      if (Yii::$app->user->identity->expose_graph) {
         $user_behavior = Yii::$container->get(\common\interfaces\UserBehaviorInterface::class);
         $scores_last_month = $user_behavior->calculateScoresOfLastMonth();
-        if($scores_last_month) {
+        if ($scores_last_month) {
           Yii::$container
             ->get(\common\components\Graph::class)
             ->create($scores_last_month, true);
@@ -81,7 +81,7 @@ 
     $date = Yii::$container->get(\common\interfaces\TimeInterface::class)->getLocalDate();
 
     $user_behaviors = $user_behavior->getUserBehaviorsWithCategory($date);
-    if(count($user_behaviors) === 0) {
+    if (count($user_behaviors) === 0) {
       return $this->redirect(['view']);
     }
 
@@ -91,10 +91,10 @@ 
       $form->deleteToday();
 
       $behaviors = $user_behavior->findAll($form->getUserBehaviorIds());
-      if($result = $form->saveAnswers($behaviors)) {
+      if ($result = $form->saveAnswers($behaviors)) {
 
         $score = $user_behavior->getDailyScore();
-        if(Yii::$app->user->identity->isOverThreshold($score)) {
+        if (Yii::$app->user->identity->isOverThreshold($score)) {
           Yii::$app->user->identity->sendEmailReport($date);
           Yii::$app->session->setFlash('warning', 'Your check-in is complete. A notification has been sent to your report partners because of your high score. Reach out to them!');
         } else {
@@ -114,9 +114,9 @@ 
   public function actionView(string $date = null)
   {
     $time = Yii::$container->get(\common\interfaces\TimeInterface::class);
-    if(is_null($date)) {
+    if (is_null($date)) {
       $date = $time->getLocalDate();
-    } else if($dt = $time->parse($date)) {
+    } else if ($dt = $time->parse($date)) {
       $date = $dt->format('Y-m-d');
     } else {
       $date = $time->getLocalDate();

site/controllers/SiteController.php

Spacing +13 added lines, -13 removed lines

@@ -71,9 +71,9 @@ 
   public function actionIndex()
   {
     $time = Yii::$container->get(\common\interfaces\TimeInterface::class); 
-    $key = "index_blog_".$time->getLocalDate('UTC');
+    $key = "index_blog_" . $time->getLocalDate('UTC');
     $posts = Yii::$app->cache->get($key);
-    if($posts === false) {
+    if ($posts === false) {
       $posts = \Yii::$app->getModule('blog')
                             ->fetch()
                             ->parse()
@@ -106,7 +106,7 @@ 
   {
     $model = new ContactForm();
     if ($model->load(Yii::$app->request->post()) && $model->validate()) {
-      if($model->sendEmail(Yii::$app->params['adminEmail'])) {
+      if ($model->sendEmail(Yii::$app->params['adminEmail'])) {
         Yii::$app->session->setFlash('success', 'Thank you for contacting us. We will respond to you as soon as possible.');
       } else {
         Yii::$app->session->setFlash('error', 'There was an error sending email.');
@@ -138,10 +138,10 @@ 
   public function actionSignup()
   {
     $model = Yii::$container->get(\site\models\SignupForm::class);
-    if($model->load(Yii::$app->request->post()) && $model->validate()) {
+    if ($model->load(Yii::$app->request->post()) && $model->validate()) {
       $model->signup();
       Yii::$app->getSession()->setFlash('success', 'We have sent a verification email to the email address you provided. Please check your inbox and follow the instructions to verify your account.');
-      return $this->redirect('/',302);
+      return $this->redirect('/', 302);
     }
 
     return $this->render('signup', [
@@ -152,10 +152,10 @@ 
   public function actionRequestPasswordReset()
   {
     $model = Yii::$container->get(\site\models\PasswordResetRequestForm::class);
-    if($model->load(Yii::$app->request->post()) && $model->validate()) {
-      if(!$model->sendEmail()) {
+    if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+      if (!$model->sendEmail()) {
         $ip = Yii::$app->getRequest()->getUserIP() ?: "UNKNOWN";
-        Yii::warning("$ip has tried to reset the password for ".$model->email);
+        Yii::warning("$ip has tried to reset the password for " . $model->email);
       }
 
       Yii::$app->getSession()->setFlash('success', 'If there is an account with the submitted email address you will receive further instructions in your email inbox.');
@@ -198,14 +198,14 @@ 
       throw new BadRequestHttpException("Wrong or expired email verification token. If you aren't sure why this error occurs perhaps you've already verified your account. Please try logging in.");
     }
 
-    if($user->isTokenConfirmed($user->verify_email_token)) {
+    if ($user->isTokenConfirmed($user->verify_email_token)) {
       Yii::$app->getSession()->setFlash('success', 'Your account has already been verified. Please log in.');
-      return $this->redirect('/login',302);
+      return $this->redirect('/login', 302);
     } else if (Yii::$app->getUser()->login($user)) {
       $user->confirmVerifyEmailToken();
       $user->save();
       Yii::$app->getSession()->setFlash('success', 'Your account has been verified. Please continue with your check-in.');
-      return $this->redirect('/welcome',302);
+      return $this->redirect('/welcome', 302);
     }
   }
 
@@ -222,7 +222,7 @@ 
   public function actionExport()
   {
     header("Content-Type: text/csv");
-    header("Content-Disposition: attachment; filename=fsa-data-export-".Yii::$app->user->identity->email."-".date('Ymd').".csv");
+    header("Content-Disposition: attachment; filename=fsa-data-export-" . Yii::$app->user->identity->email . "-" . date('Ymd') . ".csv");
 
     $reader = Yii::$app->user->identity->getExportData();
     $fp = fopen('php://output', 'w');
@@ -238,7 +238,7 @@ 
 
     fputcsv($fp, $header);
     $user_behavior = Yii::$container->get(\common\interfaces\UserBehaviorInterface::class);
-    while($row = $reader->read()) {
+    while ($row = $reader->read()) {
       $row = $user_behavior::decorateWithCategory([$row]);
       $row = Yii::$app->user->identity->cleanExportData($row);
       fputcsv($fp, $row[0]);

site/controllers/ProfileController.php

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
 
     if ($editProfileForm->load(Yii::$app->request->post())) {
       $saved_user = $editProfileForm->saveProfile();
-      if($saved_user) {
+      if ($saved_user) {
         Yii::$app->getSession()->setFlash('success', 'New profile data saved!');
       }
     }
@@ -85,7 +85,7 @@ 
     $model = Yii::$container->get(\site\models\DeleteAccountForm::class, [Yii::$app->user->identity]);
 
     if ($model->load(Yii::$app->request->post()) && $model->validate()) {
-      if($model->deleteAccount()) {
+      if ($model->deleteAccount()) {
         $this->redirect(['site/index']);
       } else {
         Yii::$app->getSession()->setFlash('error', 'Wrong password!');
@@ -100,7 +100,7 @@ 
     $model = Yii::$container->get(\site\models\ChangePasswordForm::class, [Yii::$app->user->identity]);
 
     if ($model->load(Yii::$app->request->post())) {
-      if($model->validate() && $model->changePassword()) {
+      if ($model->validate() && $model->changePassword()) {
         Yii::$app->getSession()->setFlash('success', 'Password successfully changed');
       } else {
         Yii::$app->getSession()->setFlash('error', 'Wrong password!');
@@ -113,7 +113,7 @@ 
   public function actionExport()
   {
     header("Content-Type: text/csv");
-    header("Content-Disposition: attachment; filename=fsa-data-export-".Yii::$app->user->identity->email."-".date('Ymd').".csv");
+    header("Content-Disposition: attachment; filename=fsa-data-export-" . Yii::$app->user->identity->email . "-" . date('Ymd') . ".csv");
 
     $reader = Yii::$app->user->identity->getExportData();
     $fp = fopen('php://output', 'w');
@@ -129,7 +129,7 @@ 
 
     fputcsv($fp, $header);
     $user_behavior = Yii::$container->get(\common\interfaces\UserBehaviorInterface::class);
-    while($row = $reader->read()) {
+    while ($row = $reader->read()) {
       $row = $user_behavior::decorateWithCategory([$row]);
       $row = Yii::$app->user->identity->cleanExportData($row);
       fputcsv($fp, $row[0]);