CorWatts / fasterscale

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/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', [$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', [$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/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;
     };

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', [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', [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');
-    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/SiteController.php

Spacing +13 added lines, -13 removed lines

@@ -71,9 +71,9 @@ 
   public function actionIndex()
   {
     $time = Yii::$container->get('common\interfaces\TimeInterface'); 
-    $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');
-    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');
-    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');
-    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/web/router.php

Indentation +7 added lines, -7 removed lines

@@ -7,12 +7,12 @@
 set_include_path(get_include_path().':'.__DIR__);
 if(file_exists($root.$path))
 {
-	if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
-		$path = rtrim($path,'/').'/index.php';
-	if(strpos($path,'.php') === false) return false;
-	else {
-		chdir(dirname($root.$path));
-		require_once $root.$path;
-	}
+  if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
+    $path = rtrim($path,'/').'/index.php';
+  if(strpos($path,'.php') === false) return false;
+  else {
+    chdir(dirname($root.$path));
+    require_once $root.$path;
+  }
 }else include_once 'index.php';
 ?>

Spacing +9 added lines, -9 removed lines

@@ -3,16 +3,16 @@
 header("Access-Control-Allow-Origin: *");
 $root = $_SERVER['DOCUMENT_ROOT'];
 chdir($root);
-$path = '/'.ltrim(parse_url($_SERVER['REQUEST_URI'])['path'],'/');
-set_include_path(get_include_path().':'.__DIR__);
-if(file_exists($root.$path))
+$path = '/' . ltrim(parse_url($_SERVER['REQUEST_URI'])['path'], '/');
+set_include_path(get_include_path() . ':' . __DIR__);
+if (file_exists($root . $path))
 {
-	if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
-		$path = rtrim($path,'/').'/index.php';
-	if(strpos($path,'.php') === false) return false;
+	if (is_dir($root . $path) && substr($path, strlen($path) - 1, 1) !== '/')
+		$path = rtrim($path, '/') . '/index.php';
+	if (strpos($path, '.php') === false) return false;
 	else {
-		chdir(dirname($root.$path));
-		require_once $root.$path;
+		chdir(dirname($root . $path));
+		require_once $root . $path;
 	}
-}else include_once 'index.php';
+} else include_once 'index.php';
 ?>

Braces +9 added lines, -5 removed lines

@@ -7,12 +7,16 @@
 set_include_path(get_include_path().':'.__DIR__);
 if(file_exists($root.$path))
 {
-	if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
-		$path = rtrim($path,'/').'/index.php';
-	if(strpos($path,'.php') === false) return false;
-	else {
+	if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/') {
+			$path = rtrim($path,'/').'/index.php';
+	}
+	if(strpos($path,'.php') === false) {
+	  return false;
+	} else {
 		chdir(dirname($root.$path));
 		require_once $root.$path;
 	}
-}else include_once 'index.php';
+} else {
+  include_once 'index.php';
+}
 ?>

site/tests/_support/UnitTester.php

Indentation +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@
 {
     use _generated\UnitTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }

site/views/site/contact.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         <?= $form->field($model, 'subject') ?>
         <?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
 
-        <?php if(Yii::$app->user->isGuest) {
+        <?php if (Yii::$app->user->isGuest) {
           // only show captcha if user is not logged in
           print $form->field($model, 'verifyCode')->widget(Captcha::class, [
             'template' => '<div class="row"><div class="col-md-3">{image}</div><div class="col-md-6">{input}</div></div>',

common/models/Category.php

Spacing +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
 
   // a weight of 0 means selections in that category do not increase the score
   public static $categories = [
-    [ "id" => 1, "weight" => 0,  "name" => "Restoration"],
-    [ "id" => 2, "weight" => 1,  "name" => "Forgetting Priorities"],
-    [ "id" => 3, "weight" => 2,  "name" => "Anxiety"],
-    [ "id" => 4, "weight" => 4,  "name" => "Speeding Up"],
-    [ "id" => 5, "weight" => 6,  "name" => "Ticked Off"],
-    [ "id" => 6, "weight" => 8,  "name" => "Exhausted"],
-    [ "id" => 7, "weight" => 10, "name" => "Relapse/Moral Failure"],
+    ["id" => 1, "weight" => 0, "name" => "Restoration"],
+    ["id" => 2, "weight" => 1, "name" => "Forgetting Priorities"],
+    ["id" => 3, "weight" => 2, "name" => "Anxiety"],
+    ["id" => 4, "weight" => 4, "name" => "Speeding Up"],
+    ["id" => 5, "weight" => 6, "name" => "Ticked Off"],
+    ["id" => 6, "weight" => 8, "name" => "Exhausted"],
+    ["id" => 7, "weight" => 10, "name" => "Relapse/Moral Failure"],
   ];
 
   public static $colors = [