BurningFlipside / CommonCode

class.FlipAdminPage.php

Spacing +13 added lines, -13 removed lines

@@ -6,13 +6,13 @@ 
     public $user;
     public $is_admin = false;
 
-    function __construct($title, $adminGroup='LDAPAdmins')
+    function __construct($title, $adminGroup = 'LDAPAdmins')
     {
         $this->user = FlipSession::getUser();
         $this->is_admin = $this->userIsAdmin($adminGroup);
         parent::__construct($title);
         $adminCSS = '/css/common/admin.min.css';
-        if($this->minified !== 'min')
+        if ($this->minified !== 'min')
         {
             $adminCSS = '/css/common/admin.css';
         }
@@ -22,7 +22,7 @@ 
 
     protected function userIsAdmin($adminGroup)
     {
-        if($this->user === false || $this->user === null)
+        if ($this->user === false || $this->user === null)
         {
             return false;
         }
@@ -31,7 +31,7 @@ 
 
     function addAllLinks()
     {
-        if($this->user === false || $this->user === null)
+        if ($this->user === false || $this->user === null)
         {
             $this->addLink('<i class="fa fa-sign-in"></i> Login', $this->loginUrl);
         }
@@ -47,13 +47,13 @@ 
         $ret  = '<li>';
         $href = $this->getHrefForDropdown($link);
         $ret .= $this->createLink($name.' <i class="fa fa-arrow-right"></i>', $href);
-        $ret.='<ul>';
+        $ret .= '<ul>';
         $subNames = array_keys($link);
-        foreach($subNames as $subName)
+        foreach ($subNames as $subName)
         {
-            $ret.=$this->getLinkByName($subName, $link);
+            $ret .= $this->getLinkByName($subName, $link);
         }
-        $ret.='</ul></li>';
+        $ret .= '</ul></li>';
         return $ret;
     }
 
@@ -62,7 +62,7 @@ 
         $sites   = $this->getSiteLinksForHeader();
         $sideNav = $this->getLinksMenus();
         $log     = '<a href="https://profiles.burningflipside.com/logout.php"><i class="fa fa-sign-out"></i></a>';
-        if($this->user === false || $this->user === null)
+        if ($this->user === false || $this->user === null)
         {
             $log = '<a href="https://profiles.burningflipside.com/login.php?return='.$this->currentUrl().'"><i class="fa fa-sign-in"></i></a>';
         }
@@ -108,7 +108,7 @@ 
     const CARD_YELLOW = 'panel-yellow';
     const CARD_RED    = 'panel-red';
 
-    function add_card($iconName, $bigText, $littleText, $link='#', $color = self::CARD_BLUE, $textColor=false)
+    function add_card($iconName, $bigText, $littleText, $link = '#', $color = self::CARD_BLUE, $textColor = false)
     {
         $card = '<div class="col-lg-3 col-md-6">
                      <div class="panel '.$color.'">
@@ -135,9 +135,9 @@ 
         $this->body .= $card;
     }
 
-    function printPage($header=true)
+    function printPage($header = true)
     {
-        if($this->user === false || $this->user === null)
+        if ($this->user === false || $this->user === null)
         {
             $this->body = '
         <div class="row">
@@ -146,7 +146,7 @@ 
             </div>
         </div>';
         }
-        else if($this->is_admin === false)
+        else if ($this->is_admin === false)
         {
             $this->body = '
         <div class="row">

class.FlipsideCAPTCHA.php

Spacing +15 added lines, -15 removed lines

@@ -11,7 +11,7 @@ 
         $datatable = $dataset['captcha'];
         $data = $datatable->read(false, array('id'));
         $count = count($data);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $data[$i] = $data[$i]['id'];
         }
@@ -23,7 +23,7 @@ 
         $res = array();
         $ids = FlipsideCAPTCHA::get_valid_captcha_ids();
         $count = count($ids);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $captcha = new FlipsideCAPTCHA();
             $captcha->random_id = $ids[$i]; 
@@ -36,13 +36,13 @@ 
     {
         $dataset = DataSetFactory::getDataSetByName('profiles');
         $datatable = $dataset['captcha'];
-        return $datatable->create(array('question'=>$question,'hint'=>$hint,'answer'=>$answer));
+        return $datatable->create(array('question'=>$question, 'hint'=>$hint, 'answer'=>$answer));
     }
 
     public function __construct()
     {
         $this->validIDs = FlipsideCAPTCHA::get_valid_captcha_ids();
-        $this->random_id = mt_rand(0, count($this->validIDs)-1);
+        $this->random_id = mt_rand(0, count($this->validIDs) - 1);
         $this->random_id = $this->validIDs[$this->random_id];
     }
 
@@ -51,7 +51,7 @@ 
         $dataset = DataSetFactory::getDataSetByName('profiles');
         $datatable = $dataset['captcha'];
         $data = $datatable->read(new \Data\Filter('id eq '.$this->random_id), array('question'));
-        if($data === false)
+        if ($data === false)
         {
             return false;
         }
@@ -63,7 +63,7 @@ 
         $dataset = DataSetFactory::getDataSetByName('profiles');
         $datatable = $dataset['captcha'];
         $data = $datatable->read(new \Data\Filter('id eq '.$this->random_id), array('hint'));
-        if($data === false)
+        if ($data === false)
         {
             return false;
         }
@@ -75,7 +75,7 @@ 
         $dataset = DataSetFactory::getDataSetByName('profiles');
         $datatable = $dataset['captcha'];
         $data = $datatable->read(new \Data\Filter('id eq '.$this->random_id), array('answer'));
-        if($data === false)
+        if ($data === false)
         {
             return false;
         }
@@ -84,29 +84,29 @@ 
 
     public function is_answer_right($answer)
     {
-        return strcasecmp($this->get_answer(),$answer) == 0;
+        return strcasecmp($this->get_answer(), $answer) == 0;
     }
 
-    public function draw_captcha($explination=true, $return=false, $ownForm=false)
+    public function draw_captcha($explination = true, $return = false, $ownForm = false)
     {
         $string = '';
 
-        if($ownForm)
+        if ($ownForm)
         {
-            $string.= '<form id="flipcaptcha" name="flipcaptcha">';
+            $string .= '<form id="flipcaptcha" name="flipcaptcha">';
         }
 
         $string .= '<label for="captcha" class="col-sm-2 control-label">'.$this->get_question().'</label><div class="col-sm-10"><input class="form-control" type="text" id="captcha" name="captcha" placeholder="'.$this->get_hint().'" required/></div>';
-        if($ownForm)
+        if ($ownForm)
         {
-            $string.='</form>';
+            $string .= '</form>';
         }
-        if($explination)
+        if ($explination)
         {
             $string .= '<div class="col-sm-10">The answer to this question may be found in the Burning Flipside Survival Guide. It may be found <a href="http://www.burningflipside.com/sg">here</a>.</div>';
         }
         
-        if(!$return)
+        if (!$return)
         {
             echo $string;
         }

LDAP/class.LDAPServer.php

Spacing +42 added lines, -42 removed lines

@@ -17,11 +17,11 @@ 
     $search = array_flip($dn ? array('\\', '+', '<', '>', ';', '"', '#') : array('\\', '*', '(', ')', "\x00"));
 
     // Process characters to ignore
-    if(is_array($ignore))
+    if (is_array($ignore))
     {
         $ignore = array_values($ignore);
     }
-    for($char = 0; isset($ignore[$char]); $char++)
+    for ($char = 0; isset($ignore[$char]); $char++)
     {
         unset($search[$ignore[$char]]);
     }
@@ -29,7 +29,7 @@ 
     // Flip $search back to values and build $replace array
     $search = array_keys($search); 
     $replace = array();
-    foreach($search as $char)
+    foreach ($search as $char)
     {
         $replace[] = sprintf('\\%02x', ord($char));
     }
@@ -38,13 +38,13 @@ 
     $result = str_replace($search, $replace, $subject);
 
     // Encode leading/trailing spaces in DN values
-    if($dn)
+    if ($dn)
     {
-        if($result[0] == ' ')
+        if ($result[0] == ' ')
         {
             $result = '\\20'.substr($result, 1);
         }
-        if($result[strlen($result) - 1] == ' ')
+        if ($result[strlen($result) - 1] == ' ')
         {
             $result = substr($result, 0, -1).'\\20';
         }
@@ -76,29 +76,29 @@ 
         $this->ds = ldap_connect($this->connect);
     }
 
-    private function getConnectString($name, $proto=false)
+    private function getConnectString($name, $proto = false)
     {
-        if(strstr($name, ':') !== false)
+        if (strstr($name, ':') !== false)
         {
             return $name;
         }
-        if($proto !== 'ldap')
+        if ($proto !== 'ldap')
         {
             return $proto.'://'.$name;
         }
         return $name;
     }
 
-    function connect($name, $proto=false)
+    function connect($name, $proto = false)
     {
         $connectStr = $this->getConnectString($name, $proto);
-        if($this->ds !== null)
+        if ($this->ds !== null)
         {
             ldap_close($this->ds);
         }
         $this->connect = $connectStr;
         $this->ds      = ldap_connect($this->connect);
-        if($this->ds === false)
+        if ($this->ds === false)
         {
             $this->ds = null;
             return false;
@@ -109,7 +109,7 @@ 
 
     function disconnect()
     {
-        if($this->ds !== null)
+        if ($this->ds !== null)
         {
             ldap_close($this->ds);
             $this->ds = null;
@@ -117,15 +117,15 @@ 
         $this->connect = false;
     }
 
-    function bind($cn=null, $password=null)
+    function bind($cn = null, $password = null)
     {
         $res = false;
-        if($this->ds === null)
+        if ($this->ds === null)
         {
             throw new \Exception('Not connected');
         }
         $this->binder = $cn;
-        if($cn === null || $password === null)
+        if ($cn === null || $password === null)
         {
             return @ldap_bind($this->ds);
         }
@@ -133,7 +133,7 @@ 
         {
             $res = ldap_bind($this->ds, $cn, $password);
         }
-        catch(\Exception $ex)
+        catch (\Exception $ex)
         {
             $this->ds = ldap_connect($this->connect);
             $res = @ldap_bind($this->ds, $cn, $password);
@@ -143,7 +143,7 @@ 
 
     function unbind()
     {
-        if($this->ds === null)
+        if ($this->ds === null)
         {
             return true;
         }
@@ -158,29 +158,29 @@ 
     private function _fix_object($object, &$delete = false)
     {
         $entity = $object;
-        if(!is_array($object))
+        if (!is_array($object))
         {
             $entity = $object->to_array();
         }
         unset($entity['dn']);
         $keys = array_keys($entity);
         $count = count($keys);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(is_array($entity[$keys[$i]]))
+            if (is_array($entity[$keys[$i]]))
             {
                 $array = $entity[$keys[$i]];
                 unset($entity[$keys[$i]]);
                 $count1 = count($array);
-                for($j = 0; $j < $count1; $j++)
+                for ($j = 0; $j < $count1; $j++)
                 {
-                    if(isset($array[$j]))
+                    if (isset($array[$j]))
                     {
                         $entity[$keys[$i]][$j] = $array[$j];
                     }
                 }
             }
-            else if($delete !== false && $entity[$keys[$i]] === null)
+            else if ($delete !== false && $entity[$keys[$i]] === null)
             {
                 $delete[$keys[$i]] = array();
                 unset($entity[$keys[$i]]);
@@ -194,7 +194,7 @@ 
         $dn = ldap_escape($object['dn'], true);
         $entity = $this->_fix_object($object);
         $ret = ldap_add($this->ds, $dn, $entity);
-        if($ret === false)
+        if ($ret === false)
         {
             throw new \Exception('Failed to create object with dn='.$dn);
         }
@@ -203,34 +203,34 @@ 
 
     private function filterToString($filter)
     {
-        if($filter === false)
+        if ($filter === false)
         {
             return '(objectclass=*)';
         }
-        if(is_string($filter))
+        if (is_string($filter))
         {
             return $filter;
         }
         return $filter->to_ldap_string();
     }
 
-    function read($baseDN, $filter=false, $single=false, $attributes=false)
+    function read($baseDN, $filter = false, $single = false, $attributes = false)
     {
         $filterStr = $this->filterToString($filter);
-        if($this->ds === null)
+        if ($this->ds === null)
         {
             throw new \Exception('Not connected');
         }
         $sr = false;
         try
         {
-            if($single === true)
+            if ($single === true)
             {
                 $sr = @ldap_read($this->ds, $baseDN, $filterStr);
             }
             else
             {
-                if($attributes !== false)
+                if ($attributes !== false)
                 {
                     $sr = @ldap_list($this->ds, $baseDN, $filterStr, $attributes);
                 }
@@ -240,20 +240,20 @@ 
                 }
             }
         }
-        catch(\Exception $e)
+        catch (\Exception $e)
         {
             throw new \Exception($e->getMessage().' '.$filterStr, $e->getCode(), $e);
         }
-        if($sr === false)
+        if ($sr === false)
         {
             return false;
         }
         $res = ldap_get_entries($this->ds, $sr);
-        if(is_array($res))
+        if (is_array($res))
         {
             $ldap = $res;
             $res = array();
-            for($i = 0; $i < $ldap['count']; $i++)
+            for ($i = 0; $i < $ldap['count']; $i++)
             {
                 array_push($res, new LDAPObject($ldap[$i], $this));
             }
@@ -261,10 +261,10 @@ 
         return $res;
     }
 
-    function count($baseDN, $filter=false)
+    function count($baseDN, $filter = false)
     {
         $filterStr = $this->filterToString($filter);
-        if($this->ds === null)
+        if ($this->ds === null)
         {
             throw new \Exception('Not connected');
         }
@@ -272,11 +272,11 @@ 
         {
             $sr = ldap_list($this->ds, $baseDN, $filterStr, array('dn'));
         }
-        catch(\Exception $e)
+        catch (\Exception $e)
         {
             throw new \Exception($e->getMessage().' '.$filterStr, $e->getCode(), $e);
         }
-        if($sr === false)
+        if ($sr === false)
         {
             return false;
         }
@@ -289,15 +289,15 @@ 
         $delete = array();
         $entity = $this->_fix_object($object, $delete);
         $ret = false;
-        if(!empty($entity))
+        if (!empty($entity))
         {
             $ret = @ldap_mod_replace($this->ds, $dn, $entity);
-            if($ret === false)
+            if ($ret === false)
             {
                 throw new \Exception('Failed to update object with dn='.$dn.'('.ldap_errno($this->ds).':'.ldap_error($this->ds).') '.print_r($entity, true));
             }
         }
-        if(!empty($delete))
+        if (!empty($delete))
         {
             $ret = @ldap_mod_del($this->ds, $dn, $delete);
         }

Email/class.Email.php

Spacing +37 added lines, -37 removed lines

@@ -62,7 +62,7 @@ 
      */
     public function getFromAddress()
     {
-        if($this->sender === false)
+        if ($this->sender === false)
         {
             return 'Burning Flipside <webmaster@burningflipside.com>';
         }
@@ -106,7 +106,7 @@ 
      */
     public function getReplyTo()
     {
-        if($this->replyTo === false)
+        if ($this->replyTo === false)
         {
             return $this->getFromAddress();
         }
@@ -149,10 +149,10 @@ 
      * @param string $email The email address to send from
      * @param string $name  The name to associate with the from address
      */
-    public function setFromAddress($email, $name=false)
+    public function setFromAddress($email, $name = false)
     {
         $address = $email;
-        if($name !== false)
+        if ($name !== false)
         {
             $address = $name.' <'.$email.'>';
         }
@@ -165,7 +165,7 @@ 
      * @param string $email The email address to send to
      * @param string $name  The name to associate with the address
      */
-    public function addToAddress($email, $name=false)
+    public function addToAddress($email, $name = false)
     {
         $this->addAddress($this->to, $email, $name);
     }
@@ -176,7 +176,7 @@ 
      * @param string $email The email address to send to
      * @param string $name  The name to associate with the address
      */
-    public function addCCAddress($email, $name=false)
+    public function addCCAddress($email, $name = false)
     {
         $this->addAddress($this->cc, $email, $name);
     }
@@ -187,7 +187,7 @@ 
      * @param string $email The email address to send to
      * @param string $name  The name to associate with the address
      */
-    public function addBCCAddress($email, $name=false)
+    public function addBCCAddress($email, $name = false)
     {
         $this->addAddress($this->bcc, $email, $name);
     }
@@ -199,10 +199,10 @@ 
      * @param string $email The email address to send to
      * @param string $name  The name to associate with the address
      */
-    protected function addAddress(&$list, $email, $name=false)
+    protected function addAddress(&$list, $email, $name = false)
     {
         $address = $email;
-        if($name !== false)
+        if ($name !== false)
         {
             $address = $name.' <'.$email.'>';
         }
@@ -215,10 +215,10 @@ 
      * @param string $email The email address to reply to
      * @param string $name  The name to associate with the from address
      */
-    public function setReplyTo($email, $name=false)
+    public function setReplyTo($email, $name = false)
     {
         $address = $email;
-        if($name !== false)
+        if ($name !== false)
         {
             $address = $name.' <'.$email.'>';
         }
@@ -262,7 +262,7 @@ 
      */
     public function appendToHTMLBody($body)
     {
-        $this->htmlBody.= $body;
+        $this->htmlBody .= $body;
     }
 
     /**
@@ -272,7 +272,7 @@ 
      */
     public function appendToTextBody($body)
     {
-        $this->textBody.= $body;
+        $this->textBody .= $body;
     }
 
     /**
@@ -295,17 +295,17 @@ 
      */
     public function addAttachmentFromFile($filename, $name = false)
     {
-        if($name === false)
+        if ($name === false)
         {
             $name = basename($filename);
         }
         $finfo = finfo_open(FILEINFO_MIME_TYPE);
         $mimeType = finfo_file($finfo, $filename);
-        if($mimeType === false)
+        if ($mimeType === false)
         {
             $mimeType = 'application/octet-stream';
         }
-        if(file_exists($filename) && is_file($filename) && is_readable($filename))
+        if (file_exists($filename) && is_file($filename) && is_readable($filename))
         {
             $this->addAttachmentFromBuffer($name, file_get_contents($filename), $mimeType);
         }
@@ -331,18 +331,18 @@ 
         $boundary = uniqid(rand(), true);
         $rawMessage = 'To: '.$this->encodeRecipients($this->getToAddresses())."\n";
         $from = $this->getFromAddress();
-        if($from === false)
+        if ($from === false)
         {
             throw new \Exception('Message must have a from address');
         }
-        $rawMessage.= 'From: '.$this->encodeRecipients($from)."\n";
-        if(!empty($this->cc))
+        $rawMessage .= 'From: '.$this->encodeRecipients($from)."\n";
+        if (!empty($this->cc))
         {
-            $rawMessage.= 'CC: '. $this->encodeRecipients($this->getCCAddresses())."\n";
+            $rawMessage .= 'CC: '.$this->encodeRecipients($this->getCCAddresses())."\n";
         }
-        if(!empty($this->bcc))
+        if (!empty($this->bcc))
         {
-            $rawMessage.= 'BCC: '. $this->encodeRecipients($this->getBCCAddresses())."\n";
+            $rawMessage .= 'BCC: '.$this->encodeRecipients($this->getBCCAddresses())."\n";
         }
         $rawMessage .= 'Subject: '.$this->getSubject()."\n";
         $rawMessage .= 'MIME-Version: 1.0'."\n";
@@ -350,27 +350,27 @@ 
         $rawMessage .= "\n--{$boundary}\n";
         $rawMessage .= 'Content-type: Multipart/Alternative; boundary="alt-'.$boundary.'"'."\n";
         $textBody    = $this->getTextBody();
-        if($textBody !== false && strlen($textBody) > 0)
+        if ($textBody !== false && strlen($textBody) > 0)
         {
-            $rawMessage.= "\n--alt-{$boundary}\n";
-            $rawMessage.= "Content-Type: text/plain\n\n";
-            $rawMessage.= $textBody."\n";
+            $rawMessage .= "\n--alt-{$boundary}\n";
+            $rawMessage .= "Content-Type: text/plain\n\n";
+            $rawMessage .= $textBody."\n";
         }
-        $htmlBody    = $this->getHTMLBody();
-        if($htmlBody !== false && strlen($htmlBody) > 0)
+        $htmlBody = $this->getHTMLBody();
+        if ($htmlBody !== false && strlen($htmlBody) > 0)
         {
             $rawMessage .= "\n--alt-{$boundary}\n";
             $rawMessage .= 'Content-Type: text/html; charset="UTF-8"'."\n\n";
             $rawMessage .= $htmlBody."\n";
         }
-        $rawMessage.= "\n--alt-{$boundary}--\n";
-        foreach($this->attachments as $attachment)
+        $rawMessage .= "\n--alt-{$boundary}--\n";
+        foreach ($this->attachments as $attachment)
         {
-            $rawMessage.= "\n--{$boundary}\n";
-            $rawMessage.= 'Content-Type: '. $attachment['mimeType'].'; name="'.$attachment['name']."\"\n";
-            $rawMessage.= 'Content-Disposition: attachment'."\n";
-            $rawMessage.= 'Content-Transfer-Encoding: base64'."\n\n";
-            $rawMessage.= chunk_split(base64_encode($attachment['data']), 76, "\n")."\n";
+            $rawMessage .= "\n--{$boundary}\n";
+            $rawMessage .= 'Content-Type: '.$attachment['mimeType'].'; name="'.$attachment['name']."\"\n";
+            $rawMessage .= 'Content-Disposition: attachment'."\n";
+            $rawMessage .= 'Content-Transfer-Encoding: base64'."\n\n";
+            $rawMessage .= chunk_split(base64_encode($attachment['data']), 76, "\n")."\n";
         }
         $rawMessage .= "\n--{$boundary}--\n";
         return $rawMessage;
@@ -385,11 +385,11 @@ 
      */
     public function encodeRecipients($recipient)
     {
-        if(is_array($recipient))
+        if (is_array($recipient))
         {
             return join(', ', array_map(array($this, 'encodeRecipients'), $recipient));
         }
-        if(preg_match("/(.*)<(.*)>/", $recipient, $regs))
+        if (preg_match("/(.*)<(.*)>/", $recipient, $regs))
         {
             $recipient = '=?UTF-8?B?'.base64_encode($regs[1]).'?= <'.$regs[2].'>';
         }

class.ODataParams.php

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/class.LDAPUser.php

Spacing +40 added lines, -40 removed lines

@@ -8,15 +8,15 @@ 
     private $ldapObj;
     private $server;
 
-    public function __construct($data=false)
+    public function __construct($data = false)
     {
         $this->server = \LDAP\LDAPServer::getInstance();
-        if($data !== false && !isset($data['dn']) && !isset($data['extended']))
+        if ($data !== false && !isset($data['dn']) && !isset($data['extended']))
         {
             //Generic user object
             $filter = new \Data\Filter('mail eq '.$data['mail']);
             $users = $this->server->read($this->server->user_base, $filter);
-            if($users === false || !isset($users[0]))
+            if ($users === false || !isset($users[0]))
             {
                 throw new \Exception('No such LDAP User!');
             }
@@ -24,7 +24,7 @@ 
         }
         else
         {
-            if(isset($data['extended']))
+            if (isset($data['extended']))
             {
                 $this->ldapObj = $data['extended'];
             }
@@ -38,13 +38,13 @@ 
     private function check_child_group($array)
     {
         $res = false;
-        for($i = 0; $i < $array['count']; $i++)
+        for ($i = 0; $i < $array['count']; $i++)
         {
-            if(strpos($array[$i], $this->server->group_base) !== false)
+            if (strpos($array[$i], $this->server->group_base) !== false)
             {
                 $dn = explode(',', $array[$i]);
                 $res = $this->isInGroupNamed(substr($dn[0], 3));
-                if($res) return $res;
+                if ($res) return $res;
             }
         }
         return $res;
@@ -52,11 +52,11 @@ 
 
     private function isInListOrChild($listName, $group, $dn)
     {
-        if(!isset($group[$listName]))
+        if (!isset($group[$listName]))
         {
             return false;
         }
-        if(in_array($dn, $group[$listName]))
+        if (in_array($dn, $group[$listName]))
         {
             return true;
         }
@@ -67,17 +67,17 @@ 
     {
         $filter = new \Data\Filter('cn eq '.$name);
         $group = $this->server->read($this->server->group_base, $filter);
-        if(!empty($group))
+        if (!empty($group))
         {
             $group = $group[0];
             $dn  = $this->ldapObj->dn;
             $uid = $this->ldapObj->uid[0];
             $ret = $this->isInListOrChild('member', $group, $dn);
-            if($ret === false)
+            if ($ret === false)
             {
                 $ret = $this->isInListOrChild('uniquemember', $group, $dn);
             }
-            if($ret === false && isset($group['memberUid']) && in_array($uid, $group['memberUid']))
+            if ($ret === false && isset($group['memberUid']) && in_array($uid, $group['memberUid']))
             {
                 return true;
             }
@@ -119,7 +119,7 @@ 
     public function getOrganization()
     {
         $org = $this->getFieldSingleValue('o');
-        if($org === false)
+        if ($org === false)
         {
             return 'Volunteer';
         }
@@ -129,7 +129,7 @@ 
     public function getTitles()
     {
         $titles = $this->getField('title');
-        if(isset($titles['count']))
+        if (isset($titles['count']))
         {
             unset($titles['count']);
         }
@@ -174,7 +174,7 @@ 
     public function getOrganizationUnits()
     {
         $units = $this->getField('ou');
-        if(isset($units['count']))
+        if (isset($units['count']))
         {
             unset($units['count']);
         }
@@ -184,7 +184,7 @@ 
     public function getLoginProviders()
     {
         $hosts = $this->getField('host');
-        if(isset($hosts['count']))
+        if (isset($hosts['count']))
         {
             unset($hosts['count']);
         }
@@ -195,12 +195,12 @@ 
     {
         $res = array();
         $groups = $this->server->read($this->server->group_base);
-        if(!empty($groups))
+        if (!empty($groups))
         {
             $count = count($groups);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->isInGroupNamed($groups[$i]['cn'][0]))
+                if ($this->isInGroupNamed($groups[$i]['cn'][0]))
                 {
                     array_push($res, new LDAPGroup($groups[$i]));
                 }
@@ -220,23 +220,23 @@ 
 
     private function generateLDAPPass($pass)
     {
-        mt_srand((double)microtime()*1000000);
+        mt_srand((double)microtime() * 1000000);
         $salt = pack("CCCC", mt_rand(), mt_rand(), mt_rand(), mt_rand());
-        $hash = base64_encode(pack('H*',sha1($pass.$salt)).$salt);
+        $hash = base64_encode(pack('H*', sha1($pass.$salt)).$salt);
         return '{SSHA}'.$hash;
     }
 
     public function setPass($password)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
-            return $this->setFieldLocal('userPassword',  $this->generateLDAPPass($password));
+            return $this->setFieldLocal('userPassword', $this->generateLDAPPass($password));
         }
         else
         {
             $obj = array('dn'=>$this->ldapObj->dn);
             $obj['userPassword'] = $this->generateLDAPPass($password);
-            if(isset($this->ldapObj->uniqueidentifier))
+            if (isset($this->ldapObj->uniqueidentifier))
             {
                $obj['uniqueIdentifier'] = null;
             }
@@ -250,7 +250,7 @@ 
 
     public function validate_password($password)
     {
-        if($this->server->bind($this->ldapObj->dn, $password))
+        if ($this->server->bind($this->ldapObj->dn, $password))
         {
             return true;
         }
@@ -259,37 +259,37 @@ 
 
     public function validate_reset_hash($hash)
     {
-        if(isset($this->ldapObj->uniqueidentifier) && strcmp($this->ldapObj->uniqueidentifier[0], $hash) === 0)
+        if (isset($this->ldapObj->uniqueidentifier) && strcmp($this->ldapObj->uniqueidentifier[0], $hash) === 0)
         {
             return true;
         }
         return false;
     }
 
-    static function from_name($name, $data=false)
+    static function from_name($name, $data = false)
     {
-        if($data === false)
+        if ($data === false)
         {
             throw new \Exception('data must be set for LDAPUser');
         }
         $filter = new \Data\Filter("uid eq $name");
         $user = $data->read($data->user_base, $filter);
-        if($user === false || !isset($user[0]))
+        if ($user === false || !isset($user[0]))
         {
             return false;
         }
         return new static($user[0]);
     }
 
-    static function from_dn($dn, $data=false)
+    static function from_dn($dn, $data = false)
     {
-        if($data === false)
+        if ($data === false)
         {
             throw new \Exception('data must be set for LDAPUser');
         }
         $filter = new \Data\Filter("dn eq $dn");
         $user = $data->read($data->user_base, $filter);
-        if($user === false || !isset($user[0]))
+        if ($user === false || !isset($user[0]))
         {
             return false;
         }
@@ -318,7 +318,7 @@ 
 
     public function setUid($uid)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
             return $this->setFieldLocal('uid', $uid);
         }
@@ -366,7 +366,7 @@ 
 
     public function setTitles($titles)
     {
-        if(!is_array($titles))
+        if (!is_array($titles))
         {
             $titles = array($titles);
         }
@@ -375,7 +375,7 @@ 
 
     public function setOrganizationUnits($ous)
     {
-        if(!is_array($ous))
+        if (!is_array($ous))
         {
             $ous = array($ous);
         }
@@ -384,7 +384,7 @@ 
 
     public function flushUser()
     {
-        if(is_object($this->ldapObj))
+        if (is_object($this->ldapObj))
         {
             //In this mode we are always up to date
             return true;
@@ -392,11 +392,11 @@ 
         $obj = $this->ldapObj;
         $obj['objectClass'] = array('top', 'inetOrgPerson', 'extensibleObject');
         $obj['dn'] = 'uid='.$this->ldapObj['uid'].','.$this->server->user_base;
-        if(!isset($obj['sn']))
+        if (!isset($obj['sn']))
         {
             $obj['sn'] = $obj['uid'];
         }
-        if(!isset($obj['cn']))
+        if (!isset($obj['cn']))
         {
             $obj['cn'] = $obj['uid'];
         }
@@ -413,7 +413,7 @@ 
         $ldapObj = $this->server->read($ldap->user_base, new \Data\Filter('uid eq '.$this->getUid()));
         $ldapObj = $ldapObj[0];
         $hash = false;
-        if(isset($ldapObj->userpassword))
+        if (isset($ldapObj->userpassword))
         {
             $hash = hash('sha512', $ldapObj->dn.';'.$ldapObj->userpassword[0].';'.$ldapObj->mail[0]);
         }
@@ -423,7 +423,7 @@ 
         }
         $obj = array('dn'=>$this->ldapObj->dn);
         $obj['uniqueIdentifier'] = $hash;
-        if($this->server->update($obj) === false)
+        if ($this->server->update($obj) === false)
         {
             throw new \Exception('Unable to create hash in LDAP object!');
         }

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;
         }

Auth/class.LDAPGroup.php

Spacing +48 added lines, -48 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace Auth;
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
 }
@@ -20,7 +20,7 @@ 
     {
         $this->ldapObj = $data;
         $this->server = \LDAP\LDAPServer::getInstance();
-        if(!is_object($data))
+        if (!is_object($data))
         {
             throw new \Exception('Unable to setup LDAPGroup!');
         }
@@ -45,17 +45,17 @@ 
     {
         $rawMembers = $this->getField('member');
         $fieldName  = 'member';
-        if($rawMembers === false)
+        if ($rawMembers === false)
         {
             $rawMembers = $this->getField('uniqueMember');
             $fieldName  = 'uniqueMember';
         }
-        if($rawMembers === false)
+        if ($rawMembers === false)
         {
             $rawMembers = $this->getField('memberUid');
             $fieldName  = 'memberUid';
         }
-        if(!isset($rawMembers['count']))
+        if (!isset($rawMembers['count']))
         {
             $rawMembers['count'] = count($rawMembers);
         }
@@ -65,23 +65,23 @@ 
     private function getIDFromDN($dn)
     {
         $split = explode(',', $dn);
-        if(strncmp('cn=', $split[0], 3) === 0)
+        if (strncmp('cn=', $split[0], 3) === 0)
         {
             return substr($split[0], 3);
         }
         return substr($split[0], 4);
     }
 
-    public function getMemberUids($recursive=true)
+    public function getMemberUids($recursive = true)
     {
         $members = array();
         $rawMembers = $this->getMembersField();
-        for($i = 0; $i < $rawMembers['count']; $i++)
+        for ($i = 0; $i < $rawMembers['count']; $i++)
         {
-            if($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
+            if ($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
             {
                 $child = self::from_dn($rawMembers[$i], $this->server);
-                if($child !== false)
+                if ($child !== false)
                 {
                     $members = array_merge($members, $child->members());
                 }
@@ -92,7 +92,7 @@ 
             }
         }
         $count = count($members);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $members[$i] = $this->getIDFromDN($members[$i]);
         }
@@ -102,36 +102,36 @@ 
     private function getObjectFromDN($dn)
     {
         $split = explode(',', $dn);
-        if(strncmp('cn=', $dn, 3) === 0)
+        if (strncmp('cn=', $dn, 3) === 0)
         {
-            if(count($split) === 1)
+            if (count($split) === 1)
             {
                 return LDAPGroup::from_name($dn, $this->server);
             }
             return LDAPGroup::from_name(substr($split[0], 3), $this->server);
         }
-        if(count($split) === 1)
+        if (count($split) === 1)
         {
             return LDAPUser::from_name($dn, $this->server);
         }
         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();
-        for($i = 0; $i < $rawMembers['count']; $i++)
+        for ($i = 0; $i < $rawMembers['count']; $i++)
         {
-            if($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
+            if ($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
             {
                 $child = self::from_dn($rawMembers[$i], $this->server);
-                if($child !== false)
+                if ($child !== false)
                 {
                     $members = array_merge($members, $child->members());
                 }
             }
-            else if($includeGroups === false && strncmp($rawMembers[$i], 'cn=', 3) === 0)
+            else if ($includeGroups === false && strncmp($rawMembers[$i], 'cn=', 3) === 0)
             {
                 //Drop this member
             }
@@ -140,11 +140,11 @@ 
                 array_push($members, $rawMembers[$i]);
             }
         }
-        if($details === true)
+        if ($details === true)
         {
             $details = array();
             $count = count($members);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $details[$i] = $this->getObjectFromDN($members[$i]);
             }
@@ -154,37 +154,37 @@ 
         return $members;
     }
 
-    public function getNonMemebers($select=false)
+    public function getNonMemebers($select = false)
     {
         $data = array();
         $groupFilter = '(&(cn=*)(!(cn='.$this->getGroupName().'))';
         $userFilter = '(&(cn=*)';
         $members = $this->members();
         $count = count($members);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            $dnComps = explode(',',$members[$i]);
-            if(strncmp($members[$i], "uid=", 4) == 0)
+            $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++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($groups[$i] === false || $groups[$i] === null) continue;
+            if ($groups[$i] === false || $groups[$i] === null) continue;
             array_push($data, new LDAPGroup($groups[$i]));
         }
         $users = $this->server->read($this->server->user_base, $userFilter, false, $select);
         $count = count($users);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             array_push($data, new LDAPUser($users[$i]));
         } 
@@ -193,24 +193,24 @@ 
 
     public function clearMembers()
     {
-        if(isset($this->ldapObj['member']))
+        if (isset($this->ldapObj['member']))
         {
             $this->ldapObj['member'] = array();
         }
-        else if(isset($this->ldapObj['uniquemember']))
+        else if (isset($this->ldapObj['uniquemember']))
         {
             $this->ldapObj['uniquemember'] = array();
         }
-        else if(isset($this->ldapObj['memberuid']))
+        else if (isset($this->ldapObj['memberuid']))
         {
             $this->ldapObj['memberuid'] = array();
         }
     }
 
-    public function addMember($name, $isGroup=false, $flush=true)
+    public function addMember($name, $isGroup = false, $flush = true)
     {
         $dn = false;
-        if($isGroup)
+        if ($isGroup)
         {
             $dn = 'cn='.$name.','.$this->server->group_base;
         }
@@ -220,17 +220,17 @@ 
         }
         $propName   = false;
         $rawMembers = $this->getMembersField($propName);
-        if(isset($rawMembers['count']))
+        if (isset($rawMembers['count']))
         {
             unset($rawMembers['count']);
         }
-        if(in_array($dn, $rawMembers) || in_array($name, $rawMembers))
+        if (in_array($dn, $rawMembers) || in_array($name, $rawMembers))
         {
             return true;
         }
-        if($propName === 'memberUid')
+        if ($propName === 'memberUid')
         {
-            if($isGroup)
+            if ($isGroup)
             {
                 throw new \Exception('Unable to add a group as a child of this group type');
             }
@@ -242,7 +242,7 @@ 
         }
         $tmp = strtolower($propName);
         $this->ldapObj->$tmp = $rawMembers;
-        if($flush === true)
+        if ($flush === true)
         {
             $obj = array('dn'=>$this->ldapObj->dn);
             $obj[$propName] = $rawMembers;
@@ -254,29 +254,29 @@ 
         }
     }
 
-    static function from_dn($dn, $data=false)
+    static function from_dn($dn, $data = false)
     {
-        if($data === false)
+        if ($data === false)
         {
             throw new \Exception('data must be set for LDAPGroup');
         }
         $group = $data->read($dn, false, true);
-        if($group === false || !isset($group[0]))
+        if ($group === false || !isset($group[0]))
         {
             return false;
         }
         return new static($group[0]);
     }
 
-    static function from_name($name, $data=false)
+    static function from_name($name, $data = false)
     {
-        if($data === false)
+        if ($data === false)
         {
             throw new \Exception('data must be set for LDAPGroup');
         }
         $filter = new \Data\Filter("cn eq $name");
 	$group = $data->read($data->group_base, $filter);
-        if($group === false || !isset($group[0]))
+        if ($group === false || !isset($group[0]))
         {
             return false;
         }

class.FlipREST.php

Spacing +31 added lines, -31 removed lines

@@ -25,7 +25,7 @@ 
 
     private function getUserFromSession()
     {
-        if(FlipSession::isLoggedIn())
+        if (FlipSession::isLoggedIn())
         {
             return FlipSession::getUser();
         }
@@ -41,7 +41,7 @@ 
         $auth = \AuthProvider::getInstance();
         $auth->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
         $user = FlipSession::getUser();
-        if($user === false)
+        if ($user === false)
         {
             $data = substr($header['Authorization'], 6);
             $userpass = explode(':', base64_decode($data));
@@ -62,7 +62,7 @@ 
 
     private function getUserFromHeader($header)
     {
-        if(strncmp($header, 'Basic', 5) == 0)
+        if (strncmp($header, 'Basic', 5) == 0)
         {
             return $this->getUserFromBasicAuth($header);
         }
@@ -72,7 +72,7 @@ 
     public function call()
     {
         // no auth header
-        if(!isset($this->headers['Authorization']))
+        if (!isset($this->headers['Authorization']))
         {
             $this->app->user = $this->getUserFromSession();
         } 
@@ -82,7 +82,7 @@ 
             $this->app->user = $this->getUserFromHeader($header);
         }
 
-        if($this->app->user === false)
+        if ($this->app->user === false)
         {
             $this->app->getLog()->error("No user found for call");
         }
@@ -96,19 +96,19 @@ 
 {
     private function fix_encoded_element($key, $value, &$array, $prefix = '')
     {
-        if(is_array($value))
+        if (is_array($value))
         {
             $array[$key] = implode(';', $value);
         }
-        else if($key === '_id' && is_object($value))
+        else if ($key === '_id' && is_object($value))
         {
             $array[$key] = $value->{'$id'};
         }
-        else if(is_object($value))
+        else if (is_object($value))
         {
             $array[$key] = $this->app->request->getUrl().$this->app->request->getPath().$prefix.'/'.$key;
         }
-        else if(strncmp($value, 'data:', 5) === 0)
+        else if (strncmp($value, 'data:', 5) === 0)
         {
             $array[$key] = $this->app->request->getUrl().$this->app->request->getPath().$prefix.'/'.$key;
         }
@@ -122,40 +122,40 @@ 
         }
         ob_start();
         $df = fopen("php://output", 'w');
-        if(is_array($array))
+        if (is_array($array))
         {
             $first = reset($array);
             $keys = FALSE;
-            if(is_array($first))
+            if (is_array($first))
             {
                 $keys = array_keys($first);
             }
-            else if(is_object($first))
+            else if (is_object($first))
             {
                 $keys = array_keys(get_object_vars($first));
             }
             fputcsv($df, $keys);
             foreach ($array as $row)
             {
-                if(is_array($row))
+                if (is_array($row))
                 {
                     $id = $row[$keys[0]];
-                    foreach($row as $key=>$value)
+                    foreach ($row as $key=>$value)
                     {
                         $this->fix_encoded_element($key, $value, $row, '/'.$id);
                     }
                     fputcsv($df, $row);
                 }
-                else if(is_object($row))
+                else if (is_object($row))
                 {
                     $keyName = $keys[0];
                     $id = $row->$keyName;
-                    if(is_object($id))
+                    if (is_object($id))
                     {
                         $id = $id->{'$id'};
                     }
                     $values = get_object_vars($row);
-                    foreach($values as $key=>$value)
+                    foreach ($values as $key=>$value)
                     {
                         $this->fix_encoded_element($key, $value, $values, '/'.$id);
                     }
@@ -167,7 +167,7 @@ 
         {
             $array = get_object_vars($array);
             fputcsv($df, array_keys($array));
-            foreach($array as $key=>$value)
+            foreach ($array as $key=>$value)
             {
                 $this->fix_encoded_element($key, $value, $array);
             }
@@ -185,34 +185,34 @@ 
 
     public function call()
     {
-        if($this->app->request->isOptions())
+        if ($this->app->request->isOptions())
         {
             return;
         }
         $params = $this->app->request->params();
         $fmt = null;
-        if(isset($params['fmt']))
+        if (isset($params['fmt']))
         {
             $fmt = $params['fmt'];
         }
-        if($fmt === null && isset($params['$format']))
+        if ($fmt === null && isset($params['$format']))
         {
             $fmt = $params['$format'];
-            if(strstr($fmt, 'odata.streaming=true'))
+            if (strstr($fmt, 'odata.streaming=true'))
             {
                 $this->app->response->setStatus(406);
                 return;
             }
         }
-        if($fmt === null)
+        if ($fmt === null)
         {
             $mimeType = $this->app->request->headers->get('Accept');
-            if(strstr($mimeType, 'odata.streaming=true'))
+            if (strstr($mimeType, 'odata.streaming=true'))
             {
                 $this->app->response->setStatus(406);
                 return;
             }
-            switch($mimeType)
+            switch ($mimeType)
             {
                 case 'text/csv':
                     $fmt = 'csv';
@@ -232,11 +232,11 @@ 
 
         $this->next->call();
 
-        if($this->app->response->getStatus() == 200 && $this->app->fmt !== 'json')
+        if ($this->app->response->getStatus() == 200 && $this->app->fmt !== 'json')
         {
             $data = json_decode($this->app->response->getBody());
             $text = false;
-            switch($this->app->fmt)
+            switch ($this->app->fmt)
             {
                 case 'data-table':
                     $this->app->response->headers->set('Content-Type', 'application/json');
@@ -263,7 +263,7 @@ 
             }
             $this->app->response->setBody($text);
         }
-        else if($this->app->response->getStatus() == 200)
+        else if ($this->app->response->getStatus() == 200)
         {
             $this->app->response->headers->set('Content-Type', 'application/json;odata.metadata=none');
         }
@@ -277,7 +277,7 @@ 
         parent::__construct();
         $this->config('debug', false);
         $headers = array();
-        if(php_sapi_name() !== "cli")
+        if (php_sapi_name() !== "cli")
         {
             $headers = apache_request_headers();
         }
@@ -297,12 +297,12 @@ 
         return $this->post($uri, $handler);
     }
 
-    function get_json_body($array=false)
+    function get_json_body($array = false)
     {
         return $this->getJsonBody($array);
     }
 
-    function getJsonBody($array=false)
+    function getJsonBody($array = false)
     {
         $body = $this->request->getBody();
         return json_decode($body, $array);