CorWatts / fasterscale

site/views/checkin/old_view.php

Indentation +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
     print $form
             ->field($model, "behaviors{$category['id']}")
             ->checkboxList($behaviors,
-                           ['item' => "checkboxItemTemplate"]);
+                            ['item' => "checkboxItemTemplate"]);
   }
   ActiveForm::end();
 

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 
   <?php
               switch(true) {
-                case ($score < 30):
-                  $alert_level = "success";
-                  $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
-                  break;
+              case ($score < 30):
+                $alert_level = "success";
+                $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
+                break;
 
               case ($score < 40):
                 $alert_level = "info";

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
 $this->title = "The Faster Scale App | Previous Check-ins";
 $time = Yii::$container->get('common\interfaces\TimeInterface');
 $this->registerJsFile('/js/checkin/view.js', ['depends' => [\site\assets\AppAsset::class]]);
-if($answer_pie) {
+if ($answer_pie) {
   $this->registerJsFile('/js/checkin/charts/pie.js', ['depends' => [\site\assets\AppAsset::class]]);
 }
 
@@ -25,7 +25,7 @@ 
 }
 
 $pie_data = [];
-if($answer_pie) {
+if ($answer_pie) {
   $values     = array_map('intval', array_column($answer_pie, "count"));
   $labels     = array_column($answer_pie, "name");
   $colors     = array_column($answer_pie, "color");
@@ -51,7 +51,7 @@ 
   <h1>View Previous Check-ins</h1>
 
   <?php
-              switch(true) {
+              switch (true) {
                 case ($score < 30):
                   $alert_level = "success";
                   $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
@@ -112,16 +112,16 @@ 
 </div>
 
 
-  <?php if($questions) {
+  <?php if ($questions) {
   print "<h3>Processing Questions:</h3>";
-  foreach($questions as $behavior_id => $behavior_questions) {
+  foreach ($questions as $behavior_id => $behavior_questions) {
     print "<div class='well well-sm'>";
     print "<button type='button' class='btn btn-primary' disabled='disabled'>{$behavior_questions['question']['title']}</button>";
     print "<div class='row'>";
-    foreach($behavior_questions['answers'] as $question) { 
+    foreach ($behavior_questions['answers'] as $question) { 
       print "<div class='col-md-4'>";
       print "<p><strong>{$question['title']}</strong></p>";
-      print "<p>".Html::encode($question['answer'])."</p>";
+      print "<p>" . Html::encode($question['answer']) . "</p>";
       print "</div>";
     }
     print "</div></div>";
@@ -136,7 +136,7 @@ 
     'options' => ['class' => 'form-horizontal'],
   ]);
 
-  foreach($categories as $category) {
+  foreach ($categories as $category) {
     $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name');
     print $form
             ->field($model, "behaviors{$category['id']}")
@@ -146,7 +146,7 @@ 
   ActiveForm::end();
 
 $this->registerJson($past_checkin_dates, "past-checkin-dates");
-if($answer_pie) {
+if ($answer_pie) {
   $this->registerJson($pie_data, "pie_data");
 }
 ?>

Braces +5 added lines, -2 removed lines

@@ -102,9 +102,12 @@
         <div class='card-text'>
           <?php if ($pie_data): ?>
           <canvas id='category-pie-chart'></canvas>
-          <?php else: ?>
+          <?php else {
+  : ?>
           <p>no data</p>
-          <?php endif; ?>
+          <?php endif;
+}
+?>
         </div>
       </div>
     </div>

site/controllers/SiteController.php

Spacing +15 added lines, -15 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);
     }
   }
 
@@ -216,7 +216,7 @@ 
     }
 
     $user = Yii::$container->get(\common\interfaces\UserInterface::class)->findByChangeEmailToken($token);
-    var_dump( $user);
+    var_dump($user);
     exit();
     if (!$user) {
       throw new BadRequestHttpException("Wrong or expired email change token. If you aren't sure why this error occurs perhaps you've already confirmed your change of email. Please try logging in.");
@@ -227,7 +227,7 @@ 
     // log out the user (if they're logged in)
 
     Yii::$app->getSession()->setFlash('success', 'Your email address has been successfully changed. Please log in.');
-    return $this->redirect('/login',302);
+    return $this->redirect('/login', 302);
   }
 
   public function actionPrivacy()
@@ -243,7 +243,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');
@@ -259,7 +259,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 +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

@@ -46,7 +46,7 @@
    */
   public function changeEmail() {
     $user = $this->user->findByEmail($this->desired_email);
-    if(!$user) {
+    if (!$user) {
       $this->user->desired_email = $this->desired_email;
       $this->user->generateChangeEmailToken();
       $this->user->save();