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)

Braces +12 added lines, -3 removed lines

@@ -35,11 +35,17 @@ 
             return array(new FilterClause($string));
         }
         $children = array();
-        if($parens) array_push($children, '(');
+        if($parens)
+        {
+            array_push($children, '(');
+        }
         $children = array_merge($children, self::process_string($clauses[1]));
         array_push($children, trim($clauses[2]));
         $children = array_merge($children, self::process_string($clauses[3]));
-        if($parens) array_push($children, ')');
+        if($parens)
+        {
+            array_push($children, ')');
+        }
         return $children;
     }
 
@@ -178,7 +184,10 @@ 
         $count = count($this->children);
         for($i = 0; $i < $count; $i++)
         {
-            if(!is_object($this->children[$i])) continue;
+            if(!is_object($this->children[$i]))
+            {
+                continue;
+            }
             if(strstr($this->children[$i]->var1, $substr) !== false ||
                strstr($this->children[$i]->var2, $substr) !== false)
             {

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.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.NullAuthenticator.php

Braces +10 added lines, -10 removed lines

@@ -1,24 +1,24 @@
 <?php

 namespace Auth;

 

-class NullAuthenticator extends Authenticator

-{

-    public function login($username, $password)

-    {

+class NullAuthenticator extends Authenticator
+{
+    public function login($username, $password)
+    {
         return array('res'=>true, 'extended'=>null);

     }

 

-    public function isLoggedIn($data)

-    {

-        if(isset($data['res']))

-        {

+    public function isLoggedIn($data)
+    {
+        if(isset($data['res']))
+        {
             return $data['res'];

         }

         return false;

     }

 

-    public function getUser($data)

-    {

+    public function getUser($data)
+    {
         return null;

     }

 }

Auth/class.SQLGroup.php

Spacing +2 added lines, -2 removed lines

@@ -28,12 +28,12 @@
         return false;
     }
 
-    public function getMemberUids($recursive=true)
+    public function getMemberUids($recursive = true)
     {
         return $this->members(false, $recursive, true);
     }
 
-    public function members($details=false, $recursive=true, $includeGroups=true)
+    public function members($details = false, $recursive = true, $includeGroups = true)
     {
         //TODO
         return array();

Auth/class.Group.php

Spacing +7 added lines, -7 removed lines

@@ -23,12 +23,12 @@ 
         return false;
     }
 
-    public function getMemberUids($recursive=true)
+    public function getMemberUids($recursive = true)
     {
         return array();
     }
 
-    public function members($details=false, $recursive=true, $includeGroups=true)
+    public function members($details = false, $recursive = true, $includeGroups = true)
     {
         return array();
     }
@@ -46,20 +46,20 @@ 
     public function jsonSerialize()
     {
         $group = array();
-        try{
+        try {
         $group['cn'] = $this->getGroupName();
         $group['description'] = $this->getDescription();
         $group['member'] = $this->getMemberUids();
-        } catch(\Exception $e) {echo $e->getMessage(); die();}
+        } catch(\Exception $e) {echo $e->getMessage(); die(); }
         return $group;
     }
 
-    public function getNonMembers($select=false)
+    public function getNonMembers($select = false)
     {
         return array();
     }
 
-    public function addMember($name, $isGroup=false, $flush=true)
+    public function addMember($name, $isGroup = false, $flush = true)
     {
         return false;
     }
@@ -101,7 +101,7 @@ 
         return true;
     }
 
-    static function from_name($name, $data=false)
+    static function from_name($name, $data = false)
     {
         return false;
     }

Braces +10 added lines, -3 removed lines

@@ -46,11 +46,15 @@ 
     public function jsonSerialize()
     {
         $group = array();
-        try{
+        try
+        {
         $group['cn'] = $this->getGroupName();
         $group['description'] = $this->getDescription();
         $group['member'] = $this->getMemberUids();
-        } catch(\Exception $e) {echo $e->getMessage(); die();}
+        }
+        catch(\Exception $e)
+        {
+echo $e->getMessage(); die();}
         return $group;
     }
 
@@ -86,7 +90,10 @@ 
                 {
                     $isLast = true;
                 }
-                if(!isset($group->member[$i]->type)) continue;
+                if(!isset($group->member[$i]->type))
+                {
+                    continue;
+                }
                 if($group->member[$i]->type === 'Group')
                 {
                     $this->addMember($group->member[$i]->cn, true, $isLast);

Autoload.php

Spacing +2 added lines, -2 removed lines

@@ -22,11 +22,11 @@
     $classname = ltrim($classname, '\\');
     $filename  = '';
     $namespace = '';
-    if ($lastNsPos = strrpos($classname, '\\'))
+    if($lastNsPos = strrpos($classname, '\\'))
     {
         $namespace = substr($classname, 0, $lastNsPos);
         $classname = substr($classname, $lastNsPos + 1);
-        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
     }
     $filename = __DIR__.DIRECTORY_SEPARATOR.$filename.'class.'.$classname.'.php';
     if(is_readable($filename))

class.JsonSerializable.php

Braces +2 added lines, -1 removed lines

@@ -22,7 +22,8 @@
 * @license http://www.opensource.org/licenses/bsd-license New BSD License
 * @link http://www.php.net/manual/en/class.jsonserializable.php
 */
-interface JsonSerializable {
+interface JsonSerializable
+{
     /** The jsonSerizlize function as defined by PHP 5.4 and greater */
     public function jsonSerialize();
 }