BurningFlipside / CommonCode

Data/class.Filter.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
         //First check for parenthesis...
         if($string[0] === '(' && substr($string, -1) === ')')
         {
-            $string = substr($string, 1, strlen($string)-2);
+            $string = substr($string, 1, strlen($string) - 2);
             $parens = true;
         }
         if(preg_match('/(.+?)( and | or )(.+)/', $string, $clauses) === 0)
@@ -51,19 +51,19 @@ 
         {
             if($this->children[$i] === '(' || $this->children[$i] === ')')
             {
-                $ret.=$this->children[$i];
+                $ret .= $this->children[$i];
             }
             else if($this->children[$i] === 'and')
             {
-                $ret.=' AND ';
+                $ret .= ' AND ';
             }
             else if($this->children[$i] === 'or')
             {
-                $ret.=' OR ';
+                $ret .= ' OR ';
             }
             else
             {
-                $ret.=$this->children[$i]->to_sql_string();
+                $ret .= $this->children[$i]->to_sql_string();
             }
         }
         return $ret.$this->sqlAppend;
@@ -94,7 +94,7 @@ 
             }
             else
             {
-                $ret.=$this->children[$i]->to_ldap_string();
+                $ret .= $this->children[$i]->to_ldap_string();
             }
         }
         if($count === 1 && $prefix === '')
@@ -189,7 +189,7 @@ 
 
     public function addToSQLString($string)
     {
-        $this->sqlAppend.=$string;
+        $this->sqlAppend .= $string;
     }
 
     public function appendChild($child)

Data/class.FilterClause.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
     public $var2;
     public $op;
 
-    function __construct($string=false)
+    function __construct($string = false)
     {
         if($string !== false) $this->process_filter_string($string);
     }
@@ -63,7 +63,7 @@ 
         {
             case 'substringof':
             case 'contains':
-                $str = $this->var1.' LIKE \'%'.trim($this->var2,"'").'%\'';
+                $str = $this->var1.' LIKE \'%'.trim($this->var2, "'").'%\'';
                 break;
             default:
                 $str = $this->var1.$this->op.$this->var2;
@@ -79,13 +79,13 @@ 
         {
             case 'substringof':
             case 'contains':
-                $str.=$this->var1.$this->op.'*'.trim($this->var2,"'").'*';
+                $str .= $this->var1.$this->op.'*'.trim($this->var2, "'").'*';
                 break;
             case '!=':
-                $str.='!('.$this->var1.'='.$this->var2.')';
+                $str .= '!('.$this->var1.'='.$this->var2.')';
                 break;
             default:
-                $str.=$this->var1.$this->op.$this->var2;
+                $str .= $this->var1.$this->op.$this->var2;
                 break;
         }
         return $str.')';
@@ -119,7 +119,7 @@ 
                 $case  = false;
                 if(self::str_startswith($this->var1, 'tolower'))
                 {
-                    $field = substr($this->var1, strpos($this->var1, '(')+1);
+                    $field = substr($this->var1, strpos($this->var1, '(') + 1);
                     $field = substr($field, 0, strpos($field, ')'));
                     $case = true;
                 }

Data/class.MongoDataTable.php

Spacing +7 added lines, -7 removed lines

@@ -6,7 +6,7 @@ 
     protected $collection;
     protected $namespace;
 
-    public function __construct($collection, $collection_name=false)
+    public function __construct($collection, $collection_name = false)
     {
         if($collection_name !== false)
         {
@@ -18,7 +18,7 @@ 
         }
     }
 
-    public function count($filter=false)
+    public function count($filter = false)
     {
         $criteria = array();
         if($filter !== false)
@@ -48,7 +48,7 @@ 
         return $filter->to_mongo_filter();
     }
 
-    public function search($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false)
+    public function search($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
     {
         $fields   = array();
         $criteria = $this->getCriteriaFromFilter($filter);
@@ -56,16 +56,16 @@ 
         {
             $fields = array_fill_keys($select, 1);
         }
-        $cursor   = $this->collection->find($criteria, $fields);
+        $cursor = $this->collection->find($criteria, $fields);
         if($params !== false && isset($params['fields']))
         {
             $cursor->fields($params['fields']);
         }
-        if($sort  !== false)
+        if($sort !== false)
         {
             $cursor->sort($sort);
         }
-        if($skip  !== false)
+        if($skip !== false)
         {
             $cursor->skip($skip);
         }
@@ -73,7 +73,7 @@ 
         {
             $cursor->limit($count);
         }
-        $ret      = array();
+        $ret = array();
         foreach($cursor as $doc)
         {
             array_push($ret, $doc);

Auth/class.SQLUser.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     private $data;
     private $auth;
 
-    function __construct($data=false, $auth=false)
+    function __construct($data = false, $auth = false)
     {
         $this->data = array();
         $this->auth = $auth;

Auth/class.User.php

Spacing +10 added lines, -10 removed lines

@@ -308,9 +308,9 @@ 
      */
     public function isProfileComplete()
     {
-        if($this->getCountry() === false    || $this->getAddress() === false ||
+        if($this->getCountry() === false || $this->getAddress() === false ||
            $this->getPostalCode() === false || $this->getCity() === false ||
-           $this->getState() === false      || $this->getPhoneNumber() === false)
+           $this->getState() === false || $this->getPhoneNumber() === false)
         {
             return false;
         }
@@ -354,7 +354,7 @@ 
      *
      * @return true|false true if the user's password was changed, false otherwise
      */
-    public function change_pass($oldpass, $newpass, $isHash=false)
+    public function change_pass($oldpass, $newpass, $isHash = false)
     {
         if($isHash === false && $this->validate_password($oldpass) === false)
         {
@@ -793,17 +793,17 @@ 
     public function getVcard()
     {
         $ret = "BEGIN:VCARD\nVERSION:2.1\n";
-        $ret.= 'N:'.$this->getLastName().';'.$this->getGivenName()."\n";
-        $ret.= 'FN:'.$this->getGivenName()."\n";
+        $ret .= 'N:'.$this->getLastName().';'.$this->getGivenName()."\n";
+        $ret .= 'FN:'.$this->getGivenName()."\n";
         $titles = $this->getTitles();
         if($titles !== false)
         {
-            $ret.= 'TITLE:'.implode(',', $titles)."\n";
+            $ret .= 'TITLE:'.implode(',', $titles)."\n";
         }
-        $ret.= "ORG: Austin Artistic Reconstruction\n";
-        $ret.= 'TEL;TYPE=MOBILE,VOICE:'.$this->getPhoneNumber()."\n";
-        $ret.= 'EMAIL;TYPE=PREF,INTERNET:'.$this->getEmail()."\n";
-        $ret.= "END:VCARD\n";
+        $ret .= "ORG: Austin Artistic Reconstruction\n";
+        $ret .= 'TEL;TYPE=MOBILE,VOICE:'.$this->getPhoneNumber()."\n";
+        $ret .= 'EMAIL;TYPE=PREF,INTERNET:'.$this->getEmail()."\n";
+        $ret .= "END:VCARD\n";
         return $ret;
     }
 }

Auth/class.FlipsideAPIUser.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     private $userData;
     private $groupData = null;
 
-    public function __construct($data=false)
+    public function __construct($data = false)
     {
         if($data !== false && !isset($data['extended']))
         {

Auth/class.Authenticator.php

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         return false;
     }
@@ -120,7 +120,7 @@ 
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         return false;
     }
@@ -138,7 +138,7 @@ 
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
-    public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getPendingUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         return false;
     }

Auth/class.LDAPGroup.php

Spacing +11 added lines, -11 removed lines

@@ -72,7 +72,7 @@ 
         return substr($split[0], 4);
     }
 
-    public function getMemberUids($recursive=true)
+    public function getMemberUids($recursive = true)
     {
         $members = array();
         $rawMembers = $this->getMembersField();
@@ -117,7 +117,7 @@ 
         return LDAPUser::from_name(substr($split[0], 4), $this->server);
     }
 
-    public function members($details=false, $recursive=true, $includeGroups=true)
+    public function members($details = false, $recursive = true, $includeGroups = true)
     {
         $members = array();
         $rawMembers = $this->getMembersField();
@@ -154,7 +154,7 @@ 
         return $members;
     }
 
-    public function getNonMemebers($select=false)
+    public function getNonMemebers($select = false)
     {
         $data = array();
         $groupFilter = '(&(cn=*)(!(cn='.$this->getGroupName().'))';
@@ -163,18 +163,18 @@ 
         $count = count($members);
         for($i = 0; $i < $count; $i++)
         {
-            $dnComps = explode(',',$members[$i]);
+            $dnComps = explode(',', $members[$i]);
             if(strncmp($members[$i], "uid=", 4) == 0)
             {
-                $userFilter.='(!('.$dnComps[0].'))';
+                $userFilter .= '(!('.$dnComps[0].'))';
             }
             else
             {
-                $groupFilter.='(!('.$dnComps[0].'))';
+                $groupFilter .= '(!('.$dnComps[0].'))';
             }
         }
-        $userFilter.=')';
-        $groupFilter.=')';
+        $userFilter .= ')';
+        $groupFilter .= ')';
         $groups = $this->server->read($this->server->group_base, $groupFilter);
         $count = count($groups);
         for($i = 0; $i < $count; $i++)
@@ -207,7 +207,7 @@ 
         }
     }
 
-    public function addMember($name, $isGroup=false, $flush=true)
+    public function addMember($name, $isGroup = false, $flush = true)
     {
         $dn = false;
         if($isGroup)
@@ -254,7 +254,7 @@ 
         }
     }
 
-    static function from_dn($dn, $data=false)
+    static function from_dn($dn, $data = false)
     {
         if($data === false)
         {
@@ -268,7 +268,7 @@ 
         return new static($group[0]);
     }
 
-    static function from_name($name, $data=false)
+    static function from_name($name, $data = false)
     {
         if($data === false)
         {

Auth/class.GoogleAuthenticator.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public function authenticate($code, &$currentUser = false)

     {

         $googleUser = false;

-        try{

+        try {

             $this->client->authenticate($code);

             $this->token = $this->client->getAccessToken();

             \FlipSession::setVar('GoogleToken', $this->token);