CorWatts / fasterscale

common/models/User.php

Spacing +29 added lines, -29 removed lines

@@ -143,7 +143,7 @@ 
    */
   public function findByPasswordResetToken($token)
   {
-    if(!$this->isTokenCurrent($token)) {
+    if (!$this->isTokenCurrent($token)) {
       return null;
     }
 
@@ -161,15 +161,15 @@ 
    */
   public function findByVerifyEmailToken($token)
   {
-    if($this->isTokenConfirmed($token)) return null;
+    if ($this->isTokenConfirmed($token)) return null;
 
     $user = $this->findOne([
       'verify_email_token' => [$token, $token . self::CONFIRMED_STRING],
       'status' => self::STATUS_ACTIVE,
     ]);
 
-    if($user) {
-      if(!$this->isTokenConfirmed($token) &&
+    if ($user) {
+      if (!$this->isTokenConfirmed($token) &&
          !$this->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
         return null;
       }
@@ -191,8 +191,8 @@ 
       'status' => self::STATUS_ACTIVE,
     ]);
 
-    if($user) {
-      if(!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
+    if ($user) {
+      if (!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
         return null;
       }
     }
@@ -210,7 +210,7 @@ 
   public function isTokenCurrent($token, String $paramPath = 'user.passwordResetTokenExpire') {
     $expire = \Yii::$app->params[$paramPath];
     $parts = explode('_', $token);
-    $timestamp = (int) end($parts);
+    $timestamp = (int)end($parts);
     if ($timestamp + $expire < time()) {
       // token expired
       return false;
@@ -225,7 +225,7 @@ 
    * @param string    $match the needle to search for
    */
   public function isTokenConfirmed($token = null, String $match = self::CONFIRMED_STRING) {
-    if(is_null($token)) $token = $this->verify_email_token;
+    if (is_null($token)) $token = $this->verify_email_token;
     return substr($token, -strlen($match)) === $match;
   }
 
@@ -250,7 +250,7 @@ 
   }
 
   public function isVerified() {
-    if(is_null($this->verify_email_token)) {
+    if (is_null($this->verify_email_token)) {
       // for old users who verified their accounts before the addition of
       // '_confirmed' to the token
       return true;
@@ -356,7 +356,7 @@ 
   }
 
   public function sendEmailReport($date) {
-    if(!$this->isPartnerEnabled()) return false; // no partner emails set
+    if (!$this->isPartnerEnabled()) return false; // no partner emails set
 
     list($start, $end) = $this->time->getUTCBookends($date);
 
@@ -366,12 +366,12 @@ 
       ->create($scores_of_month);
 
     $score          = $this->user_behavior->calculateScoreByUTCRange($start, $end);
-    $user_behaviors   = $this->getUserBehaviors($date);
+    $user_behaviors = $this->getUserBehaviors($date);
     $user_questions = $this->getUserQuestions($date);
 
     $messages = [];
-    foreach($this->getPartnerEmails() as $email) {
-      if($email) {
+    foreach ($this->getPartnerEmails() as $email) {
+      if ($email) {
         $messages[] = Yii::$app->mailer->compose('checkinReport', [
           'user'          => $this,
           'email'         => $email,
@@ -384,7 +384,7 @@ 
           'behaviors_list'  => \common\models\Behavior::$behaviors,
         ])->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name])
         ->setReplyTo($this->email)
-        ->setSubject($this->email." has scored high in The Faster Scale App")
+        ->setSubject($this->email . " has scored high in The Faster Scale App")
         ->setTo($email);
       }
     }
@@ -457,7 +457,7 @@ 
     return \Yii::$app->mailer->compose('signupNotification')
       ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name])
       ->setTo(\Yii::$app->params['adminEmail'])
-      ->setSubject('A new user has signed up for '.\Yii::$app->name)
+      ->setSubject('A new user has signed up for ' . \Yii::$app->name)
       ->send();
   }
 
@@ -465,22 +465,22 @@ 
     return \Yii::$app->mailer->compose('verifyEmail', ['user' => $this])
       ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name])
       ->setTo($this->email)
-      ->setSubject('Please verify your '.\Yii::$app->name .' account')
+      ->setSubject('Please verify your ' . \Yii::$app->name . ' account')
       ->send();
   }
 
   public function sendDeleteNotificationEmail() {
-    if($this->isPartnerEnabled()) return false; // no partner emails set
+    if ($this->isPartnerEnabled()) return false; // no partner emails set
 
     $messages = [];
-    foreach(array_merge([$this->email], $this->getPartnerEmails()) as $email) {
-      if($email) {
+    foreach (array_merge([$this->email], $this->getPartnerEmails()) as $email) {
+      if ($email) {
         $messages[] = Yii::$app->mailer->compose('partnerDeleteNotification', [
           'user' => $this,
           'email' => $email
         ])->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name])
         ->setReplyTo($this->email)
-        ->setSubject($this->email." has deleted their The Faster Scale App account")
+        ->setSubject($this->email . " has deleted their The Faster Scale App account")
         ->setTo($email);
       }
     }
@@ -489,13 +489,13 @@ 
   }
 
   public function getUserQuestions($local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if (is_null($local_date)) $local_date = $this->time->getLocalDate();
     $questions = $this->getQuestionData($local_date);
     return $this->parseQuestionData($questions);
   }
 
   public function getUserBehaviors($local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if (is_null($local_date)) $local_date = $this->time->getLocalDate();
 
     $behaviors = $this->getBehaviorData($local_date);
     $behaviors = $this->user_behavior::decorateWithCategory($behaviors);
@@ -503,10 +503,10 @@ 
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if (!$questions) return [];
 
     $question_answers = [];
-    foreach($questions as $question) {
+    foreach ($questions as $question) {
       $behavior = $question['behavior'];
 
       $question_answers[$behavior['id']]['question'] = [
@@ -524,10 +524,10 @@ 
   }
  
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if (!$behaviors) return [];
 
     $opts_by_cat = [];
-    foreach($behaviors as $behavior) {
+    foreach ($behaviors as $behavior) {
       $indx = $behavior['behavior']['category_id'];
 
       $opts_by_cat[$indx]['category_name'] = $behavior['behavior']['category']['name'];
@@ -576,7 +576,7 @@ 
   }
 
   public function isPartnerEnabled() {
-    if((is_integer($this->email_threshold)
+    if ((is_integer($this->email_threshold)
        && $this->email_threshold >= 0)
          && ($this->partner_email1
            || $this->partner_email2
@@ -587,7 +587,7 @@ 
   }
 
   public function isOverThreshold($score) {
-    if(!$this->isPartnerEnabled()) return false;
+    if (!$this->isPartnerEnabled()) return false;
 
     $threshold = $this->email_threshold;
 
@@ -640,7 +640,7 @@ 
     return rtrim(
       strtr(
         base64_encode(
-          hash('sha256', $this->id."::".$this->created_at, true)
+          hash('sha256', $this->id . "::" . $this->created_at, true)
         ),
       '+/', '-_'),
     '=');

site/controllers/ProfileController.php

Spacing +10 added lines, -10 removed lines

@@ -27,7 +27,7 @@ 
             'allow'   => true,
             'roles'   => ['@'],
           ], [
-            'actions' => [ 'change-email', ],
+            'actions' => ['change-email', ],
             'allow'   => true,
           ],
         ],
@@ -72,7 +72,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!');
       }
     }
@@ -90,7 +90,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!');
@@ -104,7 +104,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!');
@@ -118,7 +118,7 @@ 
     $model = Yii::$container->get(\site\models\ChangeEmailForm::class, [Yii::$app->user->identity]);
 
     if ($model->load(Yii::$app->request->post()) && $model->validate()) {
-      if($model->changeEmail()) {
+      if ($model->changeEmail()) {
         Yii::$app->getSession()->setFlash('success', "We've sent an email to your requested email address to confirm. Please click on the verification link to continue.");
       } else {
         Yii::$app->getSession()->setFlash('error', 'Something went wrong!');
@@ -130,14 +130,14 @@ 
 
   public function actionChangeEmail(string $token) {
     $user = \common\models\User::findByChangeEmailToken($token);
-    if($user) {
+    if ($user) {
       $validator = new \yii\validators\EmailValidator();
-      if($validator->validate($user->desired_email, $error)) {
+      if ($validator->validate($user->desired_email, $error)) {
         $user->removeChangeEmailToken();
         $user->email = $user->desired_email;
         $user->desired_email = null;
         $user->save();
-        if(!Yii::$app->user->isGuest) {
+        if (!Yii::$app->user->isGuest) {
           Yii::$app->user->logout();
           Yii::$app->session->setFlash('success', 'Your email address was successfully changed. For security, we\'ve logged you out.');
         } else {
@@ -157,7 +157,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');
@@ -173,7 +173,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/models/ChangeEmailForm.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     // check that the desired_email is not already the email of another user
     $user = $this->user->findByEmail($this->desired_email);
     // if it is, we do nothing and return true, don't leak the data
-    if(!$user) {
+    if (!$user) {
       $this->user->desired_email = $this->desired_email;
       $this->user->generateChangeEmailToken();
       $this->user->save();

site/views/profile/index.php

Spacing +2 added lines, -2 removed lines

@@ -24,11 +24,11 @@
   ]); ?>
           <?= $form->field($profile, 'timezone')->dropDownList(array_combine($timezones, $timezones)); ?>
           <?= $form->field($profile, 'expose_graph')->checkbox() ?>
-          <?php if($profile->expose_graph): ?>
+          <?php if ($profile->expose_graph): ?>
           <div class='alert alert-success score-graph-info'>Your score graph can be found at:<br /> <a id="score-graph-link" target="_blank" href="<?=$graph_url?>"><?=$graph_url?></a></div>
           <?php endif; ?>
         <?= $form->field($profile, 'send_email')->checkbox() ?>
-        <div id='email_threshold_fields' <?php if(!$profile->send_email) { ?>style="display: none;"<?php } ?>>
+        <div id='email_threshold_fields' <?php if (!$profile->send_email) { ?>style="display: none;"<?php } ?>>
           <?= $form->field($profile, 'email_threshold')->textInput(['class'=>'form-control', 'style'=>'width: 50px;'])->input('number', ['min' => 0, 'max' => 1000]) ?>
           <?= $form->field($profile, 'partner_email1')->input('email'); ?>
           <?= $form->field($profile, 'partner_email2')->input('email'); ?>

site/models/EditProfileForm.php

Spacing +4 added lines, -4 removed lines

@@ -81,9 +81,9 @@ 
       $graph = Yii::$container
         ->get(\common\components\Graph::class, [$this->user]);
 
-      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
@@ -91,7 +91,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 {
@@ -99,7 +99,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 +3 added lines, -2 removed lines

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