CorWatts / fasterscale

site/views/site/signup.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 				'id' => 'form-signup',
 				'enableClientValidation' => true,
         'enableAjaxValidation' => false,
-        'options' => [ 'validateOnSubmit' => true ]
+        'options' => ['validateOnSubmit' => true]
 			]); ?>
         <?= $form->field($model, 'email', ['inputTemplate' => '<div class="input-group"><span class="input-group-addon">@</span>{input}</div>'])->input('email') ?>
         <?= $form->field($model, 'password', ['inputTemplate' => '<div class="input-group">{input}<span class="input-group-btn"><button id="password-toggle" class="btn btn-default" type="button">Show</button></span></div>'])->passwordInput() ?>
@@ -34,7 +34,7 @@ 
           'template' => '<div class="row"><div class="col-md-5">{image}</div><div class="col-md-6 col-md-offset-1">{input}</div></div>',
         ]) ?>
         <?= $form->field($model, 'send_email')->checkbox(['disabled'=>true]) ?>
-        <div id='email_threshold_fields' <?php if(!$model->send_email) { ?>style="display: none;"<?php } ?>>
+        <div id='email_threshold_fields' <?php if (!$model->send_email) { ?>style="display: none;"<?php } ?>>
           <?= $form->field($model, 'email_threshold', ['template' => '{label}<div class="row"><div class="col-md-3">{input}</div><div class="col-md-9"><p class="bg-info text-center" style="margin: 5px 0px;">We recommend starting with 30</p></div></div>{error}'])->textInput(['class'=>'form-control'])->input('number', ['min' => 0, 'max' => 100]) ?>
           <?= $form->field($model, 'partner_email1')->input('email') ?>
           <?= $form->field($model, 'partner_email2')->input('email') ?>

Indentation +3 added lines, -3 removed lines

@@ -22,11 +22,11 @@
     <div class="col-md-6 col-md-offset-3">
       <h1>Sign up</h1>
 			<?php $form = ActiveForm::begin([
-				'id' => 'form-signup',
-				'enableClientValidation' => true,
+        'id' => 'form-signup',
+        'enableClientValidation' => true,
         'enableAjaxValidation' => false,
         'options' => [ 'validateOnSubmit' => true ]
-			]); ?>
+      ]); ?>
         <?= $form->field($model, 'email', ['inputTemplate' => '<div class="input-group"><span class="input-group-addon">@</span>{input}</div>'])->input('email') ?>
         <?= $form->field($model, 'password', ['inputTemplate' => '<div class="input-group">{input}<span class="input-group-btn"><button id="password-toggle" class="btn btn-default" type="button">Show</button></span></div>'])->passwordInput() ?>
         <?= $form->field($model, 'timezone')->dropDownList(array_combine($timezones, $timezones)); ?>

site/views/layouts/main.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
  */
 site\assets\AppAsset::register($this);
 
-if($hash = Utility::getRevHash()) {
-  $rev_link = '<a href="'.Utility::getGithubRevUrl().'">'.Utility::getRevHash().'</a>';
+if ($hash = Utility::getRevHash()) {
+  $rev_link = '<a href="' . Utility::getGithubRevUrl() . '">' . Utility::getRevHash() . '</a>';
 } else $rev_link = 'DEVELOPMENT';
 
 ?>

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
 
 if($hash = Utility::getRevHash()) {
   $rev_link = '<a href="'.Utility::getGithubRevUrl().'">'.Utility::getRevHash().'</a>';
-} else $rev_link = 'DEVELOPMENT';
+} else {
+  $rev_link = 'DEVELOPMENT';
+}
 
 ?>
 <?php $this->beginPage() ?>

site/views/checkin/index.php

Indentation +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
   print $form
           ->field($model, "behaviors{$category['id']}")
           ->checkboxList($behaviors,
-                         ['data-toggle' => 'buttons', 'item' => "checkboxItemTemplate"]);
+                          ['data-toggle' => 'buttons', 'item' => "checkboxItemTemplate"]);
 }
 print Html::submitButton('Submit', ['class' => 'btn btn-success']); 
 ActiveForm::end();

Spacing +2 added lines, -3 removed lines

@@ -10,8 +10,7 @@ 
 $this->title = "The Faster Scale App | Check-in";
 
 function checkboxItemTemplate($index, $label, $name, $checked, $value) {
-  return Html::checkbox
-    (
+  return Html::checkbox(
       $name,
       $checked,
       [
@@ -35,7 +34,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']}")

site/views/checkin/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 +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 $plus_week  = $time->alterLocalDate($actual_date, "+1 week");
 
 $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");
@@ -64,7 +64,7 @@ 
       </div>
 
   <?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!";
@@ -96,15 +96,15 @@ 
     </div>
   </div>
 
-  <?php if($questions) {
-  foreach($questions as $behavior_id => $behavior_questions) {
+  <?php if ($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>";
@@ -116,7 +116,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']}")

site/views/checkin/questions.php

Indentation +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@
     $name,
     $checked,
     ['value' => $value,
-     'label' => $label,
-     'container' => false,
-     'labelOptions' => [ 'class' => $checked
+      'label' => $label,
+      'container' => false,
+      'labelOptions' => [ 'class' => $checked
                                      ? 'btn btn-info active'
                                      : 'btn btn-info'],
     ]);

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
     ['value' => $value,
      'label' => $label,
      'container' => false,
-     'labelOptions' => [ 'class' => $checked
+     'labelOptions' => ['class' => $checked
                                      ? 'btn btn-info active'
                                      : 'btn btn-info'],
     ]);
@@ -32,7 +32,7 @@ 
   'id' => 'checkin-form',
 ]);
 
-foreach($categories as $category_id => $category_name) {
+foreach ($categories as $category_id => $category_name) {
   print $form->field($model, "user_behavior_id{$category_id}")->radioList($behaviors[$category_id], ['class' => "btn-group", 'data-toggle' => 'buttons', 'item'=>"radioItemTemplate"]);
   print $form->field($model, "answer_{$category_id}a")->textarea()->label("How does it affect me? How do I act and feel?");
   print $form->field($model, "answer_{$category_id}b")->textarea()->label("How does it affect the important people in my life?");

site/models/CheckinForm.php

Indentation +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
   public function setBehaviors($behaviors) {
     foreach($behaviors as $category_id => $category_data) {
       $attribute = "behaviors$category_id";
-			$this->$attribute = [];
+      $this->$attribute = [];
       foreach($category_data['behaviors'] as $behavior) {
         $this->{$attribute}[] = $behavior['id'];
       }
@@ -85,12 +85,12 @@ 
 
   public function compileBehaviors() {
     $behaviors = array_merge((array)$this->behaviors1,
-                           (array)$this->behaviors2,
-                           (array)$this->behaviors3,
-                           (array)$this->behaviors4,
-                           (array)$this->behaviors5,
-                           (array)$this->behaviors6,
-                           (array)$this->behaviors7);
+                            (array)$this->behaviors2,
+                            (array)$this->behaviors3,
+                            (array)$this->behaviors4,
+                            (array)$this->behaviors5,
+                            (array)$this->behaviors6,
+                            (array)$this->behaviors7);
 
     return array_filter($behaviors); // strip out false values
   }

Spacing +9 added lines, -9 removed lines

@@ -64,10 +64,10 @@ 
   }
 
   public function setBehaviors($behaviors) {
-    foreach($behaviors as $category_id => $category_data) {
+    foreach ($behaviors as $category_id => $category_data) {
       $attribute = "behaviors$category_id";
 			$this->$attribute = [];
-      foreach($category_data['behaviors'] as $behavior) {
+      foreach ($category_data['behaviors'] as $behavior) {
         $this->{$attribute}[] = $behavior['id'];
       }
     }   
@@ -75,8 +75,8 @@ 
 
   public function validateBehaviors($attribute, $params) {
     if (!$this->hasErrors()) {
-      foreach($this->$attribute as $behavior) {
-        if(!is_numeric($behavior)) {
+      foreach ($this->$attribute as $behavior) {
+        if (!is_numeric($behavior)) {
           $this->addError($attribute, 'One of your behaviors is not an integer!');
         }
       }
@@ -110,17 +110,17 @@ 
 
     // 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);
   }
 
   public function save() {
-    if(empty($this->compiled_behaviors)) {
+    if (empty($this->compiled_behaviors)) {
       $this->commpiled_behaviors = $this->compileBehaviors();
     }
 
     $rows = [];
-    foreach($this->compiled_behaviors as $behavior_id) {
+    foreach ($this->compiled_behaviors as $behavior_id) {
       $temp = [
         Yii::$app->user->id,
         (int)$behavior_id,
@@ -139,10 +139,10 @@ 
       )->execute();
 
     // 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) {
       $scores_last_month = $this->user_behavior->calculateScoresOfLastMonth();
 
-      if($scores_last_month) {
+      if ($scores_last_month) {
         Yii::$container
           ->get(\common\components\Graph::class, [Yii::$app->user->identity])
           ->create($scores_last_month, true);

site/models/ContactForm.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     return Yii::$app->mailer->compose()
       ->setTo($email)
       ->setFrom([$this->email => $this->name])
-      ->setSubject("[FSA Contact] ".$this->subject)
+      ->setSubject("[FSA Contact] " . $this->subject)
       ->setTextBody($this->body)
       ->send();
   }

site/models/SignupForm.php

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
    */
   public function signup() {
     $user = $this->user->findByEmail($this->email);
-    if(!$user) {
+    if (!$user) {
       // this is a brand new user
       $this->user = $this->setFields($this->user);
       $this->user->save();
@@ -109,7 +109,7 @@ 
        * this is a user that for whatever reason is trying to sign up again
        * with the same email address.
        */
-      if(!$user->isTokenConfirmed()) {
+      if (!$user->isTokenConfirmed()) {
         /*
          * they've never verified their account. We don't care if their
          * verification token is current or expired. We're resetting their
@@ -136,7 +136,7 @@ 
       $user->generateAuthKey();
       $user->generateVerifyEmailToken();
 
-      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;

site/models/QuestionForm.php

Indentation +5 added lines, -5 removed lines

@@ -157,11 +157,11 @@
       foreach($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
         $question_id = \common\models\Question::$TYPES[$answer_letter];
         array_push($answers, [
-                               'behavior_id'    => $user_bhvr->behavior_id,
-                               'user_bhvr_id' => $user_bhvr->id,
-                               'question_id'  => $question_id,
-                               'answer'       => $answer,
-                             ]);
+                                'behavior_id'    => $user_bhvr->behavior_id,
+                                'user_bhvr_id' => $user_bhvr->id,
+                                'question_id'  => $question_id,
+                                'answer'       => $answer,
+                              ]);
       }
     }
     return $answers;

Spacing +9 added lines, -9 removed lines

@@ -83,7 +83,7 @@ 
         'whenClient' => "function(attribute, value) { return false; }", // lame, but acceptable
         "message" => "You must select a behavior your responses apply to."],
 
-      [['answer_1a','answer_1b','answer_1c','answer_2a','answer_2b','answer_2c','answer_3a','answer_3b','answer_3c','answer_4a','answer_4b','answer_4c','answer_5a', 'answer_5b','answer_5c','answer_6a', 'answer_6b','answer_6c','answer_7a','answer_7b','answer_7c'], 'safe']
+      [['answer_1a', 'answer_1b', 'answer_1c', 'answer_2a', 'answer_2b', 'answer_2c', 'answer_3a', 'answer_3b', 'answer_3c', 'answer_4a', 'answer_4b', 'answer_4c', 'answer_5a', 'answer_5b', 'answer_5c', 'answer_6a', 'answer_6b', 'answer_6c', 'answer_7a', 'answer_7b', 'answer_7c'], 'safe']
     ];
   }
 
@@ -101,10 +101,10 @@ 
 
   public function getBhvrValidator() {
     return function($model, $attr) {
-      $attrNum = $attr[strlen($attr)-1];
-      foreach(['a', 'b', 'c'] as $l) {
+      $attrNum = $attr[strlen($attr) - 1];
+      foreach (['a', 'b', 'c'] as $l) {
         $attr = "answer_{$attrNum}{$l}";
-        if($model->$attr) return true;
+        if ($model->$attr) return true;
       }
       return false;
     };
@@ -134,7 +134,7 @@ 
 
   public function getPrefixProps($prefix) {
     return array_filter(get_object_vars($this), function($v, $k) use($prefix) {
-      if(strpos($k, $prefix) === 0 && strlen($v)) {
+      if (strpos($k, $prefix) === 0 && strlen($v)) {
         return true;
       }
     }, ARRAY_FILTER_USE_BOTH);
@@ -152,9 +152,9 @@ 
   public function getAnswers($bhvrs) {
     $answers = [];
     $user_bhvrs = array_combine($this->getUserBehaviorProps(), $bhvrs);
-    foreach($user_bhvrs as $property => $user_bhvr) {
+    foreach ($user_bhvrs as $property => $user_bhvr) {
       $behavior_id = intval(substr($property, -1, 1));
-      foreach($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
+      foreach ($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
         $question_id = \common\models\Question::$TYPES[$answer_letter];
         array_push($answers, [
                                'behavior_id'    => $user_bhvr->behavior_id,
@@ -169,7 +169,7 @@ 
 
   public function saveAnswers($bhvrs) {
     $result = true;
-    foreach($this->getAnswers($bhvrs) as $answer) {
+    foreach ($this->getAnswers($bhvrs) as $answer) {
       $model = new \common\models\Question;
       $model->user_id = Yii::$app->user->id;
       $model->behavior_id = $answer['behavior_id'];
@@ -177,7 +177,7 @@ 
       $model->date = new Expression("now()::timestamp");
       $model->question = $answer['question_id'];
       $model->answer = $answer['answer'];
-      if(!$model->save()) {
+      if (!$model->save()) {
         $result = false;
       }
     }

Braces +3 added lines, -1 removed lines

@@ -104,7 +104,9 @@
       $attrNum = $attr[strlen($attr)-1];
       foreach(['a', 'b', 'c'] as $l) {
         $attr = "answer_{$attrNum}{$l}";
-        if($model->$attr) return true;
+        if($model->$attr) {
+          return true;
+        }
       }
       return false;
     };