BurningFlipside / CommonCode

LDAP/class.LDAPObject.php

Indentation +14 added lines, -14 removed lines

@@ -3,19 +3,19 @@ 
 
 class LDAPObject extends \SerializableObject
 {
-     public $server;
+        public $server;
 
-     function __construct($array=false, $server=false)
-     {
-         parent::__construct($array);
-         $this->server = $server;
-     }
+        function __construct($array=false, $server=false)
+        {
+            parent::__construct($array);
+            $this->server = $server;
+        }
 
-     public function jsonSerialize()
-     {
-         $ret = array();
-         foreach ($this as $key => $value)
-         {
+        public function jsonSerialize()
+        {
+            $ret = array();
+            foreach ($this as $key => $value)
+            {
             if($key === 'server' || $key === 'count') continue;
             if(is_numeric($key)) continue;
             if($key === 'jpegphoto')
@@ -31,9 +31,9 @@ 
             {
                 $ret[$key] = $value;
             }
-         }
-         return $ret;
-     }
+            }
+            return $ret;
+        }
 }
 
 ?>

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
 {
      public $server;
 
-     function __construct($array=false, $server=false)
+     function __construct($array = false, $server = false)
      {
          parent::__construct($array);
          $this->server = $server;
@@ -16,14 +16,14 @@ 
          $ret = array();
          foreach ($this as $key => $value)
          {
-            if($key === 'server' || $key === 'count') continue;
-            if(is_numeric($key)) continue;
-            if($key === 'jpegphoto')
+            if ($key === 'server' || $key === 'count') continue;
+            if (is_numeric($key)) continue;
+            if ($key === 'jpegphoto')
             {
                 $ret[$key] = base64_encode($value[0]);
                 continue;
             }
-            if(is_array($value) && $value['count'] === 1)
+            if (is_array($value) && $value['count'] === 1)
             {
                 $ret[$key] = $value[0];
             }

Braces +7 added lines, -4 removed lines

@@ -16,8 +16,12 @@ 
          $ret = array();
          foreach ($this as $key => $value)
          {
-            if($key === 'server' || $key === 'count') continue;
-            if(is_numeric($key)) continue;
+            if($key === 'server' || $key === 'count') {
+                continue;
+            }
+            if(is_numeric($key)) {
+                continue;
+            }
             if($key === 'jpegphoto')
             {
                 $ret[$key] = base64_encode($value[0]);
@@ -26,8 +30,7 @@ 
             if(is_array($value) && $value['count'] === 1)
             {
                 $ret[$key] = $value[0];
-            }
-            else
+            } else
             {
                 $ret[$key] = $value;
             }

class.DataSetFactory.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 /**
  * use the FlipsideSettings class
  */
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
 }
@@ -59,11 +59,11 @@ 
     static function getDataSetByName($setName)
     {
         static $instances = array();
-        if(isset($instances[$setName]))
+        if (isset($instances[$setName]))
         {
             return $instances[$setName];
         }
-        if(!isset(FlipsideSettings::$dataset) || !isset(FlipsideSettings::$dataset[$setName]))
+        if (!isset(FlipsideSettings::$dataset) || !isset(FlipsideSettings::$dataset[$setName]))
         {
             throw new Exception('Unknown dataset name '.$setName);
         }

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
-}
-else
+} else
 {
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
 }

class.FlipsideMail.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 
     public function send_HTML($mail)
     {
-        if(isset($mail['from']))
+        if (isset($mail['from']))
         {
             $this->From = $mail['from'];
         }
@@ -30,7 +30,7 @@ 
         {
             $this->From = $this->Username;
         }
-        if(isset($mail['from_name']))
+        if (isset($mail['from_name']))
         {
             $this->FromName = $mail['from_name'];
         }
@@ -39,7 +39,7 @@ 
             $this->FromName = 'Burning Flipside';
         }
         $this->clearAllRecipients();
-        if(is_array($mail['to']))
+        if (is_array($mail['to']))
         {
             array_walk($mail['to'], 'FlipsideMail::addTo', $this);
         }
@@ -47,7 +47,7 @@ 
         {
             $this->addAddress($mail['to']);
         }
-        if(isset($mail['reply_to']))
+        if (isset($mail['reply_to']))
         {
             $this->addReplyTo($mail['reply_to']);
         }

Braces +3 added lines, -6 removed lines

@@ -25,16 +25,14 @@ 
         if(isset($mail['from']))
         {
             $this->From = $mail['from'];
-        }
-        else
+        } else
         {
             $this->From = $this->Username;
         }
         if(isset($mail['from_name']))
         {
             $this->FromName = $mail['from_name'];
-        }
-        else
+        } else
         {
             $this->FromName = 'Burning Flipside';
         }
@@ -42,8 +40,7 @@ 
         if(is_array($mail['to']))
         {
             array_walk($mail['to'], 'FlipsideMail::addTo', $this);
-        }
-        else
+        } else
         {
             $this->addAddress($mail['to']);
         }

class.Singleton.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     {
         static $instances = array();
         $class = get_called_class();
-        if(!isset($instances[$class]))
+        if (!isset($instances[$class]))
         {
             $instances[$class] = new static();
         }

class.ODataParams.php

Braces +3 added lines, -6 removed lines

@@ -15,8 +15,7 @@ 
         if(isset($params['filter']))
         {
             $this->filter = new \Data\Filter($params['filter']);
-        }
-        else if(isset($params['$filter']))
+        } else if(isset($params['$filter']))
         {
             $this->filter = new \Data\Filter($params['$filter']);
         }
@@ -29,8 +28,7 @@ 
         if(isset($params['select']))
         {
             $this->select = explode(',',$params['select']);
-        }
-        else if(isset($params['$select']))
+        } else if(isset($params['$select']))
         {
             $this->select = explode(',',$params['$select']);
         }
@@ -47,8 +45,7 @@ 
                 {
                     //Default to assending
                     $this->orderby[$exp[0]] = 1;
-                }
-                else
+                } else
                 {
                     switch($exp[1])
                     {

Spacing +18 added lines, -18 removed lines

@@ -52,11 +52,11 @@ 
 
     protected function processFilter($params)
     {
-        if(isset($params['filter']))
+        if (isset($params['filter']))
         {
             $this->filter = new \Data\Filter($params['filter']);
         }
-        else if(isset($params['$filter']))
+        else if (isset($params['$filter']))
         {
             $this->filter = new \Data\Filter($params['$filter']);
         }
@@ -64,42 +64,42 @@ 
 
     protected function processExpand($params)
     {
-        if(isset($params['$expand']))
+        if (isset($params['$expand']))
         {
-            $this->expand = explode(',',$params['$expand']);
+            $this->expand = explode(',', $params['$expand']);
         }
     }
 
     protected function processSelect($params)
     {
-        if(isset($params['select']))
+        if (isset($params['select']))
         {
-            $this->select = explode(',',$params['select']);
+            $this->select = explode(',', $params['select']);
         }
-        else if(isset($params['$select']))
+        else if (isset($params['$select']))
         {
-            $this->select = explode(',',$params['$select']);
+            $this->select = explode(',', $params['$select']);
         }
     }
 
     protected function processOrderBy($params)
     {
-        if(isset($params['$orderby']))
+        if (isset($params['$orderby']))
         {
             $this->orderby = array();
-            $orderby = explode(',',$params['$orderby']);
+            $orderby = explode(',', $params['$orderby']);
             $count = count($orderby);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                $exp = explode(' ',$orderby[$i]);
-                if(count($exp) === 1)
+                $exp = explode(' ', $orderby[$i]);
+                if (count($exp) === 1)
                 {
                     //Default to assending
                     $this->orderby[$exp[0]] = 1;
                 }
                 else
                 {
-                    switch($exp[1])
+                    switch ($exp[1])
                     {
                         case 'asc':
                             $this->orderby[$exp[0]] = 1;
@@ -117,7 +117,7 @@ 
 
     protected function processTop($params)
     {
-        if(isset($params['$top']) && is_numeric($params['$top']))
+        if (isset($params['$top']) && is_numeric($params['$top']))
         {
             $this->top = intval($params['$top']);
         }
@@ -125,7 +125,7 @@ 
 
     protected function processSkip($params)
     {
-        if(isset($params['$skip']) && is_numeric($params['$skip']))
+        if (isset($params['$skip']) && is_numeric($params['$skip']))
         {
             $this->skip = intval($params['$skip']);
         }
@@ -133,7 +133,7 @@ 
 
     protected function processCount($params)
     {
-        if(isset($params['$count']) && strcasecmp($params['$count'], 'true') === 0)
+        if (isset($params['$count']) && strcasecmp($params['$count'], 'true') === 0)
         {
             $this->count = true;
         }
@@ -141,7 +141,7 @@ 
 
     protected function processSearch($params)
     {
-        if(isset($params['$search']))
+        if (isset($params['$search']))
         {
             throw new Exception('Search not yet implemented');
         }

Auth/OAuth2/class.LiveAuthenticator.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
     public function getUserFromToken($token)
     {
-        if($token === false)
+        if ($token === false)
         {
             $token = \FlipSession::getVar('OAuthToken');
         }

Data/class.MongoDataTable.php

Spacing +20 added lines, -20 removed lines

@@ -6,9 +6,9 @@ 
     protected $collection;
     protected $namespace;
 
-    public function __construct($collection, $collection_name=false)
+    public function __construct($collection, $collection_name = false)
     {
-        if($collection_name !== false)
+        if ($collection_name !== false)
         {
             $this->namespace = $collection.'.'.$collection_name;
         }
@@ -18,12 +18,12 @@ 
         }
     }
 
-    public function count($filter=false)
+    public function count($filter = false)
     {
         $criteria = array();
-        if($filter !== false)
+        if ($filter !== false)
         {
-            if($filter instanceof \Data\Filter)
+            if ($filter instanceof \Data\Filter)
             {
                 $criteria = $filter->to_mongo_filter();
             }
@@ -37,44 +37,44 @@ 
 
     private function getCriteriaFromFilter($filter)
     {
-        if($filter === false)
+        if ($filter === false)
         {
             return array();
         }
-        if(is_array($filter))
+        if (is_array($filter))
         {
             return $filter;
         }
         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);
-        if($select !== false)
+        if ($select !== false)
         {
             $fields = array_fill_keys($select, 1);
         }
-        $cursor   = $this->collection->find($criteria, $fields);
-        if($params !== false && isset($params['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);
         }
-        if($count !== false)
+        if ($count !== false)
         {
             $cursor->limit($count);
         }
-        $ret      = array();
-        foreach($cursor as $doc)
+        $ret = array();
+        foreach ($cursor as $doc)
         {
             array_push($ret, $doc);
         }
@@ -84,7 +84,7 @@ 
     public function create($data)
     {
         $res = $this->collection->insert($data);
-        if($res === false || $res['err'] !== null)
+        if ($res === false || $res['err'] !== null)
         {
             return false;
         }
@@ -94,12 +94,12 @@ 
     public function update($filter, $data)
     {
         $criteria = $this->getCriteriaFromFilter($filter);
-        if(isset($data['_id']))
+        if (isset($data['_id']))
         {
             unset($data['_id']);
         }
         $res = $this->collection->update($criteria, array('$set' => $data));
-        if($res === false || $res['err'] !== null)
+        if ($res === false || $res['err'] !== null)
         {
             return false;
         }
@@ -110,7 +110,7 @@ 
     {
         $criteria = $this->getCriteriaFromFilter($filter);
         $res = $this->collection->remove($criteria);
-        if($res === false || $res['err'] !== null)
+        if ($res === false || $res['err'] !== null)
         {
             return false;
         }

Braces +2 added lines, -4 removed lines

@@ -11,8 +11,7 @@ 
         if($collection_name !== false)
         {
             $this->namespace = $collection.'.'.$collection_name;
-        }
-        else
+        } else
         {
             $this->collection = $collection;
         }
@@ -26,8 +25,7 @@ 
             if($filter instanceof \Data\Filter)
             {
                 $criteria = $filter->to_mongo_filter();
-            }
-            else
+            } else
             {
                 $criteria = $filter;
             }