CorWatts / fasterscale

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
+     */
 }

common/tests/unit/models/BehaviorTest.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     expect('getCategories should return an array of 7 categories', $this->assertEquals(count($behaviors), 7));
 
-    foreach($behaviors as $behavior) {
+    foreach ($behaviors as $behavior) {
       expect('this behavior to have a "name" key', $this->assertArrayHasKey('name', $behavior));
       expect('this behavior to have a "behavior_count" key', $this->assertArrayHasKey('behavior_count', $behavior));
       expect('this behavior to have a "category_id" key', $this->assertArrayHasKey('category_id', $behavior));

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();

common/models/Behavior.php

Spacing +98 added lines, -98 removed lines

@@ -14,103 +14,103 @@ 
 class Behavior extends \yii\base\BaseObject implements BehaviorInterface
 {
   public static $behaviors = [
-    ['id' => 1,   'name' => 'no current secrets', 'category_id' => 1],
-    ['id' => 2,   'name' => 'resolving problems', 'category_id' => 1],
-    ['id' => 3,   'name' => 'identifying fears and feelings', 'category_id' => 1],
-    ['id' => 4,   'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
-    ['id' => 5,   'name' => 'being open', 'category_id' => 1],
-    ['id' => 6,   'name' => 'being honest', 'category_id' => 1],
-    ['id' => 7,   'name' => 'making eye contact', 'category_id' => 1],
-    ['id' => 8,   'name' => 'reaching out to others', 'category_id' => 1],
-    ['id' => 9,   'name' => 'increasing in relationships with God and others', 'category_id' => 1],
-    ['id' => 10,  'name' => 'accountability', 'category_id' => 1],
-    ['id' => 11,  'name' => 'secrets', 'category_id' => 2],
-    ['id' => 12,  'name' => 'bored', 'category_id' => 2],
-    ['id' => 13,  'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
-    ['id' => 14,  'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
-    ['id' => 15,  'name' => 'superficial conversations', 'category_id' => 2],
-    ['id' => 16,  'name' => 'sarcasm', 'category_id' => 2],
-    ['id' => 17,  'name' => 'isolating yourself', 'category_id' => 2],
-    ['id' => 18,  'name' => 'changes in goals', 'category_id' => 2],
-    ['id' => 19,  'name' => 'flirting', 'category_id' => 2],
-    ['id' => 20,  'name' => 'obsessed with relationships', 'category_id' => 2],
-    ['id' => 21,  'name' => 'breaking promises/commitments', 'category_id' => 2],
-    ['id' => 22,  'name' => 'neglecting family', 'category_id' => 2],
-    ['id' => 23,  'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
-    ['id' => 24,  'name' => 'procrastination', 'category_id' => 2],
-    ['id' => 25,  'name' => 'lying', 'category_id' => 2],
-    ['id' => 26,  'name' => 'over-confidence', 'category_id' => 2],
-    ['id' => 27,  'name' => 'hiding money', 'category_id' => 2],
-    ['id' => 28,  'name' => 'worry', 'category_id' => 3],
-    ['id' => 29,  'name' => 'using profanity', 'category_id' => 3],
-    ['id' => 30,  'name' => 'being fearful', 'category_id' => 3],
-    ['id' => 31,  'name' => 'being resentful', 'category_id' => 3],
-    ['id' => 32,  'name' => 'replaying old, negative thoughts', 'category_id' => 3],
-    ['id' => 33,  'name' => 'perfectionism', 'category_id' => 3],
-    ['id' => 34,  'name' => 'judging others\' motives', 'category_id' => 3],
-    ['id' => 35,  'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
-    ['id' => 36,  'name' => 'poor planning', 'category_id' => 3],
-    ['id' => 37,  'name' => 'mind reading', 'category_id' => 3],
-    ['id' => 38,  'name' => 'fantasy', 'category_id' => 3],
-    ['id' => 41,  'name' => 'co-dependent rescuing', 'category_id' => 3],
-    ['id' => 42,  'name' => 'sleep problems', 'category_id' => 3],
-    ['id' => 43,  'name' => 'trouble concentrating', 'category_id' => 3],
-    ['id' => 44,  'name' => 'seeking/creating drama', 'category_id' => 3],
-    ['id' => 45,  'name' => 'gossip', 'category_id' => 3],
-    ['id' => 46,  'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
-    ['id' => 47,  'name' => 'super busy', 'category_id' => 4],
-    ['id' => 48,  'name' => 'workaholic', 'category_id' => 4],
-    ['id' => 49,  'name' => 'can\'t relax', 'category_id' => 4],
-    ['id' => 50,  'name' => 'driving too fast', 'category_id' => 4],
-    ['id' => 51,  'name' => 'avoiding slowing down', 'category_id' => 4],
-    ['id' => 52,  'name' => 'feeling driven', 'category_id' => 4],
-    ['id' => 53,  'name' => 'in a hurry', 'category_id' => 4],
-    ['id' => 54,  'name' => 'can\'t turn off thoughts', 'category_id' => 4],
-    ['id' => 55,  'name' => 'skipping meals', 'category_id' => 4],
-    ['id' => 56,  'name' => 'binge eating (usually at night)', 'category_id' => 4],
-    ['id' => 57,  'name' => 'overspending', 'category_id' => 4],
-    ['id' => 58,  'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
-    ['id' => 59,  'name' => 'repetitive, negative thoughts', 'category_id' => 4],
-    ['id' => 60,  'name' => 'irritable', 'category_id' => 4],
-    ['id' => 61,  'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
-    ['id' => 62,  'name' => 'dramatic mood swings', 'category_id' => 4],
-    ['id' => 63,  'name' => 'lust', 'category_id' => 4],
-    ['id' => 64,  'name' => 'too much caffeine', 'category_id' => 4],
-    ['id' => 65,  'name' => 'over exercising', 'category_id' => 4],
-    ['id' => 66,  'name' => 'nervousness', 'category_id' => 4],
-    ['id' => 67,  'name' => 'difficulty being alone or with people', 'category_id' => 4],
-    ['id' => 68,  'name' => 'difficulty listening to others', 'category_id' => 4],
-    ['id' => 69,  'name' => 'avoiding support', 'category_id' => 4],
-    ['id' => 70,  'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
-    ['id' => 71,  'name' => 'sarcasm', 'category_id' => 5],
-    ['id' => 72,  'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
-    ['id' => 73,  'name' => 'feeling that no one understands', 'category_id' => 5],
-    ['id' => 74,  'name' => 'overreacting', 'category_id' => 5],
-    ['id' => 75,  'name' => 'road rage', 'category_id' => 5],
-    ['id' => 76,  'name' => 'constant resentments', 'category_id' => 5],
-    ['id' => 77,  'name' => 'pushing others away', 'category_id' => 5],
-    ['id' => 78,  'name' => 'increased isolation', 'category_id' => 5],
-    ['id' => 79,  'name' => 'blaming', 'category_id' => 5],
-    ['id' => 80,  'name' => 'self pity', 'category_id' => 5],
-    ['id' => 81,  'name' => 'arguing', 'category_id' => 5],
-    ['id' => 82,  'name' => 'irrationality', 'category_id' => 5],
-    ['id' => 83,  'name' => 'can\'t handle criticism', 'category_id' => 5],
-    ['id' => 84,  'name' => 'defensive', 'category_id' => 5],
-    ['id' => 85,  'name' => 'people are avoiding you', 'category_id' => 5],
-    ['id' => 86,  'name' => 'having to be right', 'category_id' => 5],
-    ['id' => 87,  'name' => 'digestive problems', 'category_id' => 5],
-    ['id' => 88,  'name' => 'headaches', 'category_id' => 5],
-    ['id' => 89,  'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
-    ['id' => 90,  'name' => 'can\'t forgive', 'category_id' => 5],
-    ['id' => 91,  'name' => 'feeling grandiose (superior)', 'category_id' => 5],
-    ['id' => 92,  'name' => 'intimidation', 'category_id' => 5],
-    ['id' => 93,  'name' => 'feeling aggressive', 'category_id' => 5],
-    ['id' => 94,  'name' => 'depressed', 'category_id' => 6],
-    ['id' => 95,  'name' => 'panicked', 'category_id' => 6],
-    ['id' => 96,  'name' => 'confused', 'category_id' => 6],
-    ['id' => 97,  'name' => 'hopeless', 'category_id' => 6],
-    ['id' => 98,  'name' => 'sleeping too much or too little', 'category_id' => 6],
-    ['id' => 99,  'name' => 'can\'t cope', 'category_id' => 6],
+    ['id' => 1, 'name' => 'no current secrets', 'category_id' => 1],
+    ['id' => 2, 'name' => 'resolving problems', 'category_id' => 1],
+    ['id' => 3, 'name' => 'identifying fears and feelings', 'category_id' => 1],
+    ['id' => 4, 'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
+    ['id' => 5, 'name' => 'being open', 'category_id' => 1],
+    ['id' => 6, 'name' => 'being honest', 'category_id' => 1],
+    ['id' => 7, 'name' => 'making eye contact', 'category_id' => 1],
+    ['id' => 8, 'name' => 'reaching out to others', 'category_id' => 1],
+    ['id' => 9, 'name' => 'increasing in relationships with God and others', 'category_id' => 1],
+    ['id' => 10, 'name' => 'accountability', 'category_id' => 1],
+    ['id' => 11, 'name' => 'secrets', 'category_id' => 2],
+    ['id' => 12, 'name' => 'bored', 'category_id' => 2],
+    ['id' => 13, 'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
+    ['id' => 14, 'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
+    ['id' => 15, 'name' => 'superficial conversations', 'category_id' => 2],
+    ['id' => 16, 'name' => 'sarcasm', 'category_id' => 2],
+    ['id' => 17, 'name' => 'isolating yourself', 'category_id' => 2],
+    ['id' => 18, 'name' => 'changes in goals', 'category_id' => 2],
+    ['id' => 19, 'name' => 'flirting', 'category_id' => 2],
+    ['id' => 20, 'name' => 'obsessed with relationships', 'category_id' => 2],
+    ['id' => 21, 'name' => 'breaking promises/commitments', 'category_id' => 2],
+    ['id' => 22, 'name' => 'neglecting family', 'category_id' => 2],
+    ['id' => 23, 'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
+    ['id' => 24, 'name' => 'procrastination', 'category_id' => 2],
+    ['id' => 25, 'name' => 'lying', 'category_id' => 2],
+    ['id' => 26, 'name' => 'over-confidence', 'category_id' => 2],
+    ['id' => 27, 'name' => 'hiding money', 'category_id' => 2],
+    ['id' => 28, 'name' => 'worry', 'category_id' => 3],
+    ['id' => 29, 'name' => 'using profanity', 'category_id' => 3],
+    ['id' => 30, 'name' => 'being fearful', 'category_id' => 3],
+    ['id' => 31, 'name' => 'being resentful', 'category_id' => 3],
+    ['id' => 32, 'name' => 'replaying old, negative thoughts', 'category_id' => 3],
+    ['id' => 33, 'name' => 'perfectionism', 'category_id' => 3],
+    ['id' => 34, 'name' => 'judging others\' motives', 'category_id' => 3],
+    ['id' => 35, 'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
+    ['id' => 36, 'name' => 'poor planning', 'category_id' => 3],
+    ['id' => 37, 'name' => 'mind reading', 'category_id' => 3],
+    ['id' => 38, 'name' => 'fantasy', 'category_id' => 3],
+    ['id' => 41, 'name' => 'co-dependent rescuing', 'category_id' => 3],
+    ['id' => 42, 'name' => 'sleep problems', 'category_id' => 3],
+    ['id' => 43, 'name' => 'trouble concentrating', 'category_id' => 3],
+    ['id' => 44, 'name' => 'seeking/creating drama', 'category_id' => 3],
+    ['id' => 45, 'name' => 'gossip', 'category_id' => 3],
+    ['id' => 46, 'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
+    ['id' => 47, 'name' => 'super busy', 'category_id' => 4],
+    ['id' => 48, 'name' => 'workaholic', 'category_id' => 4],
+    ['id' => 49, 'name' => 'can\'t relax', 'category_id' => 4],
+    ['id' => 50, 'name' => 'driving too fast', 'category_id' => 4],
+    ['id' => 51, 'name' => 'avoiding slowing down', 'category_id' => 4],
+    ['id' => 52, 'name' => 'feeling driven', 'category_id' => 4],
+    ['id' => 53, 'name' => 'in a hurry', 'category_id' => 4],
+    ['id' => 54, 'name' => 'can\'t turn off thoughts', 'category_id' => 4],
+    ['id' => 55, 'name' => 'skipping meals', 'category_id' => 4],
+    ['id' => 56, 'name' => 'binge eating (usually at night)', 'category_id' => 4],
+    ['id' => 57, 'name' => 'overspending', 'category_id' => 4],
+    ['id' => 58, 'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
+    ['id' => 59, 'name' => 'repetitive, negative thoughts', 'category_id' => 4],
+    ['id' => 60, 'name' => 'irritable', 'category_id' => 4],
+    ['id' => 61, 'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
+    ['id' => 62, 'name' => 'dramatic mood swings', 'category_id' => 4],
+    ['id' => 63, 'name' => 'lust', 'category_id' => 4],
+    ['id' => 64, 'name' => 'too much caffeine', 'category_id' => 4],
+    ['id' => 65, 'name' => 'over exercising', 'category_id' => 4],
+    ['id' => 66, 'name' => 'nervousness', 'category_id' => 4],
+    ['id' => 67, 'name' => 'difficulty being alone or with people', 'category_id' => 4],
+    ['id' => 68, 'name' => 'difficulty listening to others', 'category_id' => 4],
+    ['id' => 69, 'name' => 'avoiding support', 'category_id' => 4],
+    ['id' => 70, 'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
+    ['id' => 71, 'name' => 'sarcasm', 'category_id' => 5],
+    ['id' => 72, 'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
+    ['id' => 73, 'name' => 'feeling that no one understands', 'category_id' => 5],
+    ['id' => 74, 'name' => 'overreacting', 'category_id' => 5],
+    ['id' => 75, 'name' => 'road rage', 'category_id' => 5],
+    ['id' => 76, 'name' => 'constant resentments', 'category_id' => 5],
+    ['id' => 77, 'name' => 'pushing others away', 'category_id' => 5],
+    ['id' => 78, 'name' => 'increased isolation', 'category_id' => 5],
+    ['id' => 79, 'name' => 'blaming', 'category_id' => 5],
+    ['id' => 80, 'name' => 'self pity', 'category_id' => 5],
+    ['id' => 81, 'name' => 'arguing', 'category_id' => 5],
+    ['id' => 82, 'name' => 'irrationality', 'category_id' => 5],
+    ['id' => 83, 'name' => 'can\'t handle criticism', 'category_id' => 5],
+    ['id' => 84, 'name' => 'defensive', 'category_id' => 5],
+    ['id' => 85, 'name' => 'people are avoiding you', 'category_id' => 5],
+    ['id' => 86, 'name' => 'having to be right', 'category_id' => 5],
+    ['id' => 87, 'name' => 'digestive problems', 'category_id' => 5],
+    ['id' => 88, 'name' => 'headaches', 'category_id' => 5],
+    ['id' => 89, 'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
+    ['id' => 90, 'name' => 'can\'t forgive', 'category_id' => 5],
+    ['id' => 91, 'name' => 'feeling grandiose (superior)', 'category_id' => 5],
+    ['id' => 92, 'name' => 'intimidation', 'category_id' => 5],
+    ['id' => 93, 'name' => 'feeling aggressive', 'category_id' => 5],
+    ['id' => 94, 'name' => 'depressed', 'category_id' => 6],
+    ['id' => 95, 'name' => 'panicked', 'category_id' => 6],
+    ['id' => 96, 'name' => 'confused', 'category_id' => 6],
+    ['id' => 97, 'name' => 'hopeless', 'category_id' => 6],
+    ['id' => 98, 'name' => 'sleeping too much or too little', 'category_id' => 6],
+    ['id' => 99, 'name' => 'can\'t cope', 'category_id' => 6],
     ['id' => 100, 'name' => 'overwhelmed', 'category_id' => 6],
     ['id' => 101, 'name' => 'crying for "no reason"', 'category_id' => 6],
     ['id' => 102, 'name' => 'can\'t think', 'category_id' => 6],
@@ -180,7 +180,7 @@ 
   public function getCategories() {
     $bhvrs_by_cat = AH::index(self::$behaviors, null, 'category_id');
     $cats = AH::index(\common\models\Category::$categories, "id");
-    foreach($cats as $id => &$cat) {
+    foreach ($cats as $id => &$cat) {
       $cat['behavior_count'] = count($bhvrs_by_cat[$id]); // add count of behaviors
       $cat['category_id'] = $cat['id']; // rename id to category_id 
       unset($cat['id']);

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-4">{image}</div><div class="col-md-8">{input}</div></div>',

site/views/site/error.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 
 $exception = Yii::$app->errorHandler->exception;
 
-if($exception instanceof \yii\web\NotFoundHttpException):
+if ($exception instanceof \yii\web\NotFoundHttpException):
   $this->title = "The Faster Scale App | Page Not Found";
 ?>
 
@@ -25,7 +25,7 @@ 
   <p>Otherwise, please ensure your attempted url is correct.</p>
 
 <?php
-elseif($exception instanceof \yii\web\ServerErrorHttpException):
+elseif ($exception instanceof \yii\web\ServerErrorHttpException):
   $this->title = "The Faster Scale App | Oops";
 ?>
 

Braces +5 added lines, -2 removed lines

@@ -33,7 +33,8 @@ 
   <div class="alert alert-danger"><?= nl2br(Html::encode($name)) ?></div>
   <p>Well this is embarrassing...we're having an error on our side. So sorry for the annoyance. If you'd like to help, please send us a message on our <a href='<?=Url::to(['site/contact'])?>'>contact form</a>.</p>
 
-<?php else: ?>
+<?php else {
+  : ?>
 
 <div class="site-error">
   <h1><?= Html::encode($name) ?></h1>
@@ -41,4 +42,6 @@ 
   <p>The above error occurred while the Web server was processing your request.</p>
   <p>Please contact us if you think this is a server error. Thank you.</p>
 </div>
-<?php endif; ?>
+<?php endif;
+}
+?>

common/components/View.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         }
 
         if (!empty($this->json)) {
-          foreach($this->json[self::POS_READY] as $json_name => $json_value) {
+          foreach ($this->json[self::POS_READY] as $json_name => $json_value) {
             $lines[] = Html::script($json_value, ['type' => 'application/json', 'id' => $json_name]);
           }
         }

common/components/Controller.php

Indentation +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
   {
     return [
       'error' => [
-         'class' => 'yii\web\ErrorAction',
-       ],
+          'class' => 'yii\web\ErrorAction',
+        ],
       'captcha' => [
         'class' => 'yii\captcha\CaptchaAction',
       ],