CorWatts / fasterscale

common/models/Category.php

Spacing +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@
 {
 
   public static $categories = [
-    [ "id" => 1, "name" => "Restoration"],
-    [ "id" => 2, "name" => "Forgetting Priorities"],
-    [ "id" => 3, "name" => "Anxiety"],
-    [ "id" => 4, "name" => "Speeding Up"],
-    [ "id" => 5, "name" => "Ticked Off"],
-    [ "id" => 6, "name" => "Exhausted"],
-    [ "id" => 7, "name" => "Relapse/Moral Failure"],
+    ["id" => 1, "name" => "Restoration"],
+    ["id" => 2, "name" => "Forgetting Priorities"],
+    ["id" => 3, "name" => "Anxiety"],
+    ["id" => 4, "name" => "Speeding Up"],
+    ["id" => 5, "name" => "Ticked Off"],
+    ["id" => 6, "name" => "Exhausted"],
+    ["id" => 7, "name" => "Relapse/Moral Failure"],
   ];
 
   public static $colors = [

common/models/UserBehavior.php

Spacing +7 added lines, -7 removed lines

@@ -84,7 +84,7 @@ 
       ->groupBy('date, user_id')
       ->having('user_id = :user_id');
     $temp_dates = $query->all();
-    foreach($temp_dates as $temp_date) {
+    foreach ($temp_dates as $temp_date) {
       $past_checkin_dates[] = $this->time->convertUTCToLocal($temp_date['date']);
     }
 
@@ -141,7 +141,7 @@ 
 
     $arr = array_reduce($behaviors, function($acc, $row) {
       $cat_id = $row['behavior']['category']['id'];
-      if(array_key_exists($cat_id, $acc)) {
+      if (array_key_exists($cat_id, $acc)) {
         $acc[$cat_id]['count'] += $row['count'];
       } else {
         $acc[$cat_id] = [
@@ -158,10 +158,10 @@ 
   }
 
   public static function decorate(Array $uo, $with_category = false) {
-    foreach($uo as &$o) {
-      if($behavior = \common\models\Behavior::getBehavior('id', $o['behavior_id'])) {
+    foreach ($uo as &$o) {
+      if ($behavior = \common\models\Behavior::getBehavior('id', $o['behavior_id'])) {
         $o['behavior'] = $behavior;
-        if($with_category) {
+        if ($with_category) {
           $o['behavior']['category'] = \common\models\Category::getCategory('id', $o['behavior']['category_id']);
         }
       }
@@ -182,11 +182,11 @@ 
       ->having('user_id = :user_id')
       ->orderBy('count DESC');
 
-    if($limit instanceof \DateTime) {
+    if ($limit instanceof \DateTime) {
       list($start, $end) = $this->time->getUTCBookends($limit->format('Y-m-d'));
       $query->params += [':start_date' => $start, ':end_date' => $end];
       $query->where('user_id=:user_id AND date > :start_date AND date <= :end_date');
-    } else if(is_int($limit)) {
+    } else if (is_int($limit)) {
       $query->limit($limit);
     }
 

common/models/User.php

Spacing +25 added lines, -25 removed lines

@@ -141,7 +141,7 @@ 
    */
   public function findByPasswordResetToken($token)
   {
-    if(!$this->isTokenCurrent($token)) {
+    if (!$this->isTokenCurrent($token)) {
       return null;
     }
 
@@ -159,15 +159,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;
       }
@@ -186,7 +186,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;
@@ -201,7 +201,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;
   }
 
@@ -226,7 +226,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;
@@ -320,14 +320,14 @@ 
   }
 
   public function sendEmailReport($date) {
-    if(!$this->send_email) return false; // no partner emails set
+    if (!$this->send_email) return false; // no partner emails set
     list($start, $end) = $this->time->getUTCBookends($date);
-    $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,
@@ -339,7 +339,7 @@ 
           'behaviors_list'  => \common\models\Behavior::$behaviors,
         ])->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name])
         ->setReplyTo($this->email)
-        ->setSubject($this->email." has completed a Faster Scale check-in")
+        ->setSubject($this->email . " has completed a Faster Scale check-in")
         ->setTo($email);
       }
     }
@@ -412,7 +412,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();
   }
 
@@ -420,22 +420,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->send_email) return false; // no partner emails set
+    if ($this->send_email) 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);
       }
     }
@@ -444,13 +444,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);
@@ -458,10 +458,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'] = [
@@ -479,10 +479,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'];
@@ -574,7 +574,7 @@ 
     return rtrim(
       strtr(
         base64_encode(
-          hash('sha256', $this->id."::".$this->created_at, true)
+          hash('sha256', $this->id . "::" . $this->created_at, true)
         ),
       '+/', '-_'),
     '=');

Braces +26 added lines, -8 removed lines

@@ -159,7 +159,9 @@ 
    */
   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],
@@ -201,7 +203,9 @@ 
    * @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;
   }
 
@@ -320,7 +324,10 @@ 
   }
 
   public function sendEmailReport($date) {
-    if(!$this->send_email) return false; // no partner emails set
+    if(!$this->send_email) {
+      return false;
+    }
+    // no partner emails set
     list($start, $end) = $this->time->getUTCBookends($date);
     $user_behaviors   = $this->getUserBehaviors($date);
     $user_questions = $this->getUserQuestions($date);
@@ -425,7 +432,10 @@ 
   }
 
   public function sendDeleteNotificationEmail() {
-    if($this->send_email) return false; // no partner emails set
+    if($this->send_email) {
+      return false;
+    }
+    // no partner emails set
 
     $messages = [];
     foreach(array_merge([$this->email], $this->getPartnerEmails()) as $email) {
@@ -444,13 +454,17 @@ 
   }
 
   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);
@@ -458,7 +472,9 @@ 
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if(!$questions) {
+      return [];
+    }
 
     $question_answers = [];
     foreach($questions as $question) {
@@ -479,7 +495,9 @@ 
   }
  
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if(!$behaviors) {
+      return [];
+    }
 
     $opts_by_cat = [];
     foreach($behaviors as $behavior) {

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']);