BurningFlipside / CommonCode

class.FlipSession.php

Spacing +21 added lines, -21 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 require_once('Autoload.php');
-if(!isset($_SESSION) && php_sapi_name() !== 'cli') { session_start(); }
-if(!isset($_SESSION['ip_address']) && isset($_SERVER['REMOTE_ADDR']))
+if (!isset($_SESSION) && php_sapi_name() !== 'cli') { session_start(); }
+if (!isset($_SESSION['ip_address']) && isset($_SERVER['REMOTE_ADDR']))
 {
     $_SESSION['ip_address'] = $_SERVER['REMOTE_ADDR'];
 }
-if(!isset($_SESSION['init_time']))
+if (!isset($_SESSION['init_time']))
 {
     $_SESSION['init_time'] = date('c');
 }
@@ -29,7 +29,7 @@ 
      */
     static function getVar($name, $default = false)
     {
-        if(FlipSession::doesVarExist($name))
+        if (FlipSession::doesVarExist($name))
         {
             return $_SESSION[$name];
         }
@@ -56,11 +56,11 @@ 
      */
     static function isLoggedIn()
     {
-        if(isset($_SESSION['flipside_user']))
+        if (isset($_SESSION['flipside_user']))
         {
             return true;
         }
-        else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
+        else if (isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
         {
             $auth = AuthProvider::getInstance();
             return $auth->isLoggedIn($_SESSION['AuthData'], $_SESSION['AuthMethod']);
@@ -78,15 +78,15 @@ 
      */
     static function getUser()
     {
-        if(isset($_SESSION['flipside_user']))
+        if (isset($_SESSION['flipside_user']))
         {
             return $_SESSION['flipside_user'];
         }
-        else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
+        else if (isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
         {
             $auth = AuthProvider::getInstance();
             $user = $auth->getUser($_SESSION['AuthData'], $_SESSION['AuthMethod']);
-            if($user !== null)
+            if ($user !== null)
             {
                 $_SESSION['flipside_user'] = $user;
             }
@@ -115,16 +115,16 @@ 
      */
     static function getUserEmail()
     {
-        if(isset($_SESSION['flipside_email']))
+        if (isset($_SESSION['flipside_email']))
         {
             return $_SESSION['flipside_email'];
         }
         $user = FlipSession::getUser();
-        if($user === false || $user === null)
+        if ($user === false || $user === null)
         {
             return false;
         }
-        if(isset($user->mail) && isset($user->mail[0]))
+        if (isset($user->mail) && isset($user->mail[0]))
         {
             $_SESSION['flipside_email'] = $user->mail[0];
             return $_SESSION['flipside_email'];
@@ -139,7 +139,7 @@ 
      */
     static function end()
     {
-        if(isset($_SESSION) && !empty($_SESSION))
+        if (isset($_SESSION) && !empty($_SESSION))
         {
             $_SESSION = array();
             session_destroy();
@@ -151,13 +151,13 @@ 
         $res = array();
         $offset = 0;
         $length = strlen($sessionData);
-        while($offset < $length)
+        while ($offset < $length)
         {
             $pos = strpos($sessionData, "|", $offset);
             $len = $pos - $offset;
             $name = substr($sessionData, $offset, $len);
-            if($name === false) break;
-            $offset += $len+1;
+            if ($name === false) break;
+            $offset += $len + 1;
             $data = @unserialize(substr($sessionData, $offset));
             $res[$name] = $data;
             $offset += strlen(serialize($data));
@@ -170,26 +170,26 @@ 
         $res = array();
         $sessFiles = scandir(ini_get('session.save_path'));
         $count = count($sessFiles);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($sessFiles[$i][0] === '.')
+            if ($sessFiles[$i][0] === '.')
             {
                 continue;
             }
             $sessionId = substr($sessFiles[$i], 5);
             $sessionData = file_get_contents(ini_get('session.save_path').'/'.$sessFiles[$i]);
-            if($sessionData === false)
+            if ($sessionData === false)
             {
                 array_push($res, array('sid' => $sessionId));
             }
             else
             {
                 $tmp = FlipSession::unserializePhpSession($sessionData);
-                $tmp['sid' ] = $sessionId;
+                $tmp['sid'] = $sessionId;
                 array_push($res, $tmp);
             }
         }
-        if(count($res) == 0)
+        if (count($res) == 0)
         {
             return false;
         }

class.JsonSerializable.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 * @link http://www.php.net/manual/en/class.jsonserializable.php
 */
 
-if(PHP_VERSION_ID < 50400)
+if (PHP_VERSION_ID < 50400)
 {
 /**
 * JsonSerializable interface

class.WebPage.php

Spacing +24 added lines, -24 removed lines

@@ -58,11 +58,11 @@ 
         $this->importSupport = false;
         
         $browserName = $this->getBrowserName();
-        if($browserName === 'IE' && $this->getBrowserMajorVer() <= 7)
+        if ($browserName === 'IE' && $this->getBrowserMajorVer() <= 7)
         {
-            header( 'Location: /badbrowser.php' ) ;
+            header('Location: /badbrowser.php');
         }
-        else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
+        else if ($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
         {
             $this->importSupport = true;
         }
@@ -77,7 +77,7 @@ 
      */
     protected function getBrowscap()
     {
-        if(isset($GLOBALS['BROWSCAP_CACHE']))
+        if (isset($GLOBALS['BROWSCAP_CACHE']))
         {
             return new Browscap($GLOBALS['BROWSCAP_CACHE']);
         }
@@ -89,8 +89,8 @@ 
      */
     private function getBrowser()
     {
-        static $browser;//No accident can arise from depending on an unset variable.
-        if(!isset($browser))
+        static $browser; //No accident can arise from depending on an unset variable.
+        if (!isset($browser))
         {
             $browser = $this->browscap->getBrowser();
         }
@@ -102,7 +102,7 @@ 
      */
     private function getBrowserName()
     {
-        if(isset($this->browser->Browser))
+        if (isset($this->browser->Browser))
         {
             return $this->browser->Browser;
         }
@@ -117,7 +117,7 @@ 
      */
     private function getBrowserMajorVer()
     {
-        if(isset($this->browser->MajorVer))
+        if (isset($this->browser->MajorVer))
         {
             return $this->browser->MajorVer;
         }
@@ -190,19 +190,19 @@ 
      *
      * @return string The tag as a string
      */
-    protected function createOpenTag($tagName, $attribs=array(), $selfClose=false)
+    protected function createOpenTag($tagName, $attribs = array(), $selfClose = false)
     {
         $tag = '<'.$tagName;
         $attribNames = array_keys($attribs);
-        foreach($attribNames as $attribName)
+        foreach ($attribNames as $attribName)
         {
-            $tag.=' '.$attribName;
-            if($attribs[$attribName])
+            $tag .= ' '.$attribName;
+            if ($attribs[$attribName])
             {
-                $tag.='="'.$attribs[$attribName].'"';
+                $tag .= '="'.$attribs[$attribName].'"';
             }
         }
-        if($selfClose)
+        if ($selfClose)
         {
             return $tag.'/>';
         }
@@ -229,7 +229,7 @@ 
      *
      * @return string The link
      */
-    public function createLink($linkName, $linkTarget='#')
+    public function createLink($linkName, $linkTarget = '#')
     {
         $startTag = $this->createOpenTag('a', array('href'=>$linkTarget));
         $endTag = $this->createCloseTag('a');
@@ -245,10 +245,10 @@ 
      *
      * @param string $prefix The prefix to append to each line
      */
-    protected function printIeCompatability($prefix='')
+    protected function printIeCompatability($prefix = '')
     {
        //IE 8 doesn't support HTML 5. Install the shim...
-       if($this->getBrowserMajorVer() < 9)
+       if ($this->getBrowserMajorVer() < 9)
        {
            echo $prefix.'<script src="js/html5.js"></script>';
            echo "\n";
@@ -263,16 +263,16 @@ 
      *
      * @param string $prefix The prefix to append to each line
      */
-    protected function printHead($prefix='')
+    protected function printHead($prefix = '')
     {
         echo $prefix.'<HEAD>';
-        if($this->getBrowserName() === 'IE')
+        if ($this->getBrowserName() === 'IE')
         {
             $this->printIeCompatability($prefix.$prefix);
         }
         echo $prefix.$prefix.'<TITLE>'.$this->title.'</TITLE>';
         echo $prefix.$prefix.'<meta name="viewport" content="width=device-width, initial-scale=1.0">';
-        foreach($this->headTags as $tag)
+        foreach ($this->headTags as $tag)
         {
             echo $prefix.$prefix.$tag."\n";
         }
@@ -284,7 +284,7 @@ 
      *
      * @param string $prefix The prefix to append to each line
      */
-    protected function printBody($prefix='')
+    protected function printBody($prefix = '')
     {
         echo $prefix.'<BODY '.$this->body_tags.'>';
         echo $prefix.$prefix.$this->body."\n";
@@ -312,16 +312,16 @@ 
      */
     public function currentURL()
     {
-        if(!isset($_SERVER['REQUEST_URI']))
+        if (!isset($_SERVER['REQUEST_URI']))
         {
             return '';
         }
         $requestURI = $_SERVER['REQUEST_URI'];
-        if($requestURI[0] === '/')
+        if ($requestURI[0] === '/')
         {
             $requestURI = substr($requestURI, 1);
         }
-        return 'http'.(isset($_SERVER['HTTPS'])?'s':'').'://'.$_SERVER['HTTP_HOST'].'/'.$requestURI;
+        return 'http'.(isset($_SERVER['HTTPS']) ? 's' : '').'://'.$_SERVER['HTTP_HOST'].'/'.$requestURI;
     }
 }
 /* vim: set tabstop=4 shiftwidth=4 expandtab: */

class.EmailProvider.php

Spacing +7 added lines, -7 removed lines

@@ -37,11 +37,11 @@ 
     protected function __construct()
     {
         $this->methods = array();
-        if(isset(FlipsideSettings::$email_providers))
+        if (isset(FlipsideSettings::$email_providers))
         {
             $keys = array_keys(FlipsideSettings::$email_providers);
             $count = count($keys);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $class = $keys[$i];
                 array_push($this->methods, new $class(FlipsideSettings::$email_providers[$keys[$i]]));
@@ -59,9 +59,9 @@ 
     public function getEmailMethod($methodName)
     {
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(strcasecmp(get_class($this->methods[$i]), $methodName) === 0)
+            if (strcasecmp(get_class($this->methods[$i]), $methodName) === 0)
             {
                 return $this->methods[$i];
             }
@@ -79,14 +79,14 @@ 
      */
     public function sendEmail($email, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             $res = false;
             $count = count($this->methods);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $res = $this->methods[$i]->sendEmail($email);
-                if($res !== false)
+                if ($res !== false)
                 {
                     return $res;
                 }

Email/class.Email.php

Spacing +36 added lines, -36 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);
         }
@@ -330,14 +330,14 @@ 
     {
         $boundary = uniqid(rand(), true);
         $rawMessage = 'To: '.$this->encodeRecipients($this->getToAddresses())."\n";
-        $rawMessage.= 'From: '.$this->encodeRecipients($this->getFromAddress())."\n";
-        if(!empty($this->cc))
+        $rawMessage .= 'From: '.$this->encodeRecipients($this->getFromAddress())."\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";
@@ -345,27 +345,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;
@@ -380,11 +380,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].'>';
         }

Email/class.AmazonSES.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
     public function sendEmail($email)
     {
-        if($email->hasAttachments())
+        if ($email->hasAttachments())
         {
             //Amazeon sendEmail doesn't support attachments. We need to use sendRawEmail
             $args = array();

LDAP/class.LDAPObject.php

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

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,27 +158,27 @@ 
     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);
-        for($i = 0; $i < count($keys); $i++)
+        for ($i = 0; $i < count($keys); $i++)
         {
-            if(is_array($entity[$keys[$i]]))
+            if (is_array($entity[$keys[$i]]))
             {
                 $array = $entity[$keys[$i]];
                 unset($entity[$keys[$i]]);
-                for($j = 0; $j < count($array); $j++)
+                for ($j = 0; $j < count($array); $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]]);
@@ -192,7 +192,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);
         }
@@ -201,34 +201,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);
                 }
@@ -238,20 +238,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));
             }
@@ -259,10 +259,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');
         }
@@ -270,11 +270,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;
         }
@@ -286,15 +286,15 @@ 
         $dn = ldap_escape($object['dn'], true);
         $delete = array();
         $entity = $this->_fix_object($object, $delete);
-        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);
         }

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