BurningFlipside / CommonCode

class.FlipSession.php

Doc Comments +5 added lines

@@ -26,6 +26,7 @@ 
      * Get a variable from the session
      *
      * @SuppressWarnings(PHPMD.Superglobals)
+     * @param string $name
      */
     static function getVar($name, $default = false)
     {
@@ -43,6 +44,7 @@ 
      * Set a variable in the session
      *
      * @SuppressWarnings(PHPMD.Superglobals)
+     * @param string $name
      */
     static function setVar($name, $value)
     {
@@ -146,6 +148,9 @@ 
         }
     }
 
+    /**
+     * @param string $sessionData
+     */
     static function unserializePhpSession($sessionData)
     {
         $res = array();

Indentation +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 
     static function deleteSessionById($sid)
     {
-       return unlink(ini_get('session.save_path').'/sess_'.$sid); 
+        return unlink(ini_get('session.save_path').'/sess_'.$sid); 
     }
 }
 /* vim: set tabstop=4 shiftwidth=4 expandtab: */

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

Braces +9 added lines, -13 removed lines

@@ -32,8 +32,7 @@ 
         if(FlipSession::doesVarExist($name))
         {
             return $_SESSION[$name];
-        }
-        else
+        } else
         {
             return $default;
         }
@@ -59,13 +58,11 @@ 
         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']);
-        }
-        else
+        } else
         {
             return false;
         }
@@ -81,8 +78,7 @@ 
         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']);
@@ -91,8 +87,7 @@ 
                 $_SESSION['flipside_user'] = $user;
             }
             return $user;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -156,7 +151,9 @@ 
             $pos = strpos($sessionData, "|", $offset);
             $len = $pos - $offset;
             $name = substr($sessionData, $offset, $len);
-            if($name === false) break;
+            if($name === false) {
+                break;
+            }
             $offset += $len+1;
             $data = @unserialize(substr($sessionData, $offset));
             $res[$name] = $data;
@@ -181,8 +178,7 @@ 
             if($sessionData === false)
             {
                 array_push($res, array('sid' => $sessionId));
-            }
-            else
+            } else
             {
                 $tmp = FlipSession::unserializePhpSession($sessionData);
                 $tmp['sid' ] = $sessionId;

class.FlipsideCAPTCHA.php

Doc Comments +3 added lines

@@ -69,6 +69,9 @@
         return $data[0]['hint'];
     }
 
+    /**
+     * @return string
+     */
     private function get_answer()
     {
         $dataset = DataSetFactory::get_data_set('profiles');

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'];
         }
@@ -22,7 +22,7 @@ 
     {
         $res = array();
         $ids = FlipsideCAPTCHA::get_valid_captcha_ids();
-        for($i = 0; $i < count($ids); $i++)
+        for ($i = 0; $i < count($ids); $i++)
         {
             $captcha = new FlipsideCAPTCHA();
             $captcha->random_id = $ids[$i]; 
@@ -35,13 +35,13 @@ 
     {
         $dataset = DataSetFactory::get_data_set('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];
     }
 
@@ -50,7 +50,7 @@ 
         $dataset = DataSetFactory::get_data_set('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;
         }
@@ -62,7 +62,7 @@ 
         $dataset = DataSetFactory::get_data_set('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;
         }
@@ -74,7 +74,7 @@ 
         $dataset = DataSetFactory::get_data_set('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;
         }
@@ -83,29 +83,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;
         }

class.SerializableObject.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     /**
      * Serialize the object into a format consumable by json_encode
      *
-     * @return mixed The object in a more serialized format
+     * @return SerializableObject The object in a more serialized format
      */
     public function jsonSerialize()
     {

Indentation +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
             {
                 $xml->startElement($key);
                 $this->object2XML($xml, $value);
-		$xml->endElement();
+        $xml->endElement();
             }
             else
             {
@@ -114,7 +114,7 @@ 
     {
         foreach($data as $key => $value)
         {
-	    if(is_string($value))
+        if(is_string($value))
             {
                 $xml->writeElement($keyParent, $value);
                 continue;

Spacing +18 added lines, -18 removed lines

@@ -16,18 +16,18 @@ 
  *
  * This class can be serialized to various formats
  */
-class SerializableObject implements ArrayAccess,JsonSerializable
+class SerializableObject implements ArrayAccess, JsonSerializable
 {
     /**
      * Create the object from an array
      *
      * @param array $array The array of object properties
      */
-    public function __construct($array=false)
+    public function __construct($array = false)
     {
-        if($array !== false && is_array($array))
+        if ($array !== false && is_array($array))
         {
-            foreach($array as $key => $value)
+            foreach ($array as $key => $value)
             {
                 $this->{$key} = $value;
             }
@@ -54,7 +54,7 @@ 
         $xml = new XmlWriter();
         $xml->openMemory();
         $xml->startDocument('1.0');
-        if(isset($this[0]))
+        if (isset($this[0]))
         {
             $xml->startElement('Array');
             $this->array2XML($xml, 'Entity', (array)$this);
@@ -76,13 +76,13 @@ 
      */
     private function object2XML(XMLWriter $xml, $data)
     {
-        foreach($data as $key => $value)
+        foreach ($data as $key => $value)
         {
-            if(is_array($value) || is_numeric($key))
+            if (is_array($value) || is_numeric($key))
             {
                 $this->array2XML($xml, $key, (array)$value);
             }
-            else if(is_object($value))
+            else if (is_object($value))
             {
                 $xml->startElement($key);
                 $this->object2XML($xml, $value);
@@ -90,7 +90,7 @@ 
             }
             else
             {
-                if($key[0] === '$')
+                if ($key[0] === '$')
                 {
                     $xml->writeElement(substr($key, 1), $value);
                 }
@@ -112,29 +112,29 @@ 
      */
     private function array2XML(XMLWriter $xml, $keyParent, $data)
     {
-        foreach($data as $key => $value)
+        foreach ($data as $key => $value)
         {
-	    if(is_string($value))
+	    if (is_string($value))
             {
                 $xml->writeElement($keyParent, $value);
                 continue;
             }
-            if(is_numeric($key))
+            if (is_numeric($key))
             {
                 $xml->startElement($keyParent);
             }
  
-            if(is_object($value))
+            if (is_object($value))
             {
                 $this->object2XML($xml, $value);
             }
-            else if(is_array($value))
+            else if (is_array($value))
             {
                 $this->array2XML($xml, $key, $value);
                 continue;
             }
  
-            if(is_numeric($key))
+            if (is_numeric($key))
             {
                 $xml->endElement();
             }
@@ -165,16 +165,16 @@ 
     public function serializeObject($fmt = 'json', $select = false)
     {
         $copy = $this;
-        if($select !== false)
+        if ($select !== false)
         {
             $copy = new self();
             $count = count($select);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $copy->{$select[$i]} = $this->offsetGet($select[$i]);
             }
         }
-        switch($fmt)
+        switch ($fmt)
         {
             case 'json':
                 return json_encode($copy);

Braces +5 added lines, -10 removed lines

@@ -59,8 +59,7 @@ 
             $xml->startElement('Array');
             $this->array2XML($xml, 'Entity', (array)$this);
             $xml->endElement();
-        }
-        else
+        } else
         {
             $this->object2XML($xml, $this);
         }
@@ -81,20 +80,17 @@ 
             if(is_array($value) || is_numeric($key))
             {
                 $this->array2XML($xml, $key, (array)$value);
-            }
-            else if(is_object($value))
+            } else if(is_object($value))
             {
                 $xml->startElement($key);
                 $this->object2XML($xml, $value);
 		$xml->endElement();
-            }
-            else
+            } else
             {
                 if($key[0] === '$')
                 {
                     $xml->writeElement(substr($key, 1), $value);
-                }
-                else
+                } else
                 {
                     $key = strtr($key, array(' '=>'', ','=>''));
                     $xml->writeElement($key, $value);
@@ -127,8 +123,7 @@ 
             if(is_object($value))
             {
                 $this->object2XML($xml, $value);
-            }
-            else if(is_array($value))
+            } else if(is_array($value))
             {
                 $this->array2XML($xml, $key, $value);
                 continue;

Data/class.FilterClause.php

Doc Comments +6 added lines

@@ -12,11 +12,17 @@
         if($string !== false) $this->process_filter_string($string);
     }
 
+    /**
+     * @param string $needle
+     */
     static function str_startswith($haystack, $needle)
     {
         return substr($haystack, 0, strlen($needle)) === $needle;
     }
 
+    /**
+     * @param boolean $string
+     */
     protected function process_filter_string($string)
     {
         if(self::str_startswith($string, 'substringof') || self::str_startswith($string, 'contains') || 

Spacing +16 added lines, -16 removed lines

@@ -7,9 +7,9 @@ 
     public $var2;
     public $op;
 
-    function __construct($string=false)
+    function __construct($string = false)
     {
-        if($string !== false) $this->process_filter_string($string);
+        if ($string !== false) $this->process_filter_string($string);
     }
 
     static function str_startswith($haystack, $needle)
@@ -19,7 +19,7 @@ 
 
     protected function process_filter_string($string)
     {
-        if(self::str_startswith($string, 'substringof') || self::str_startswith($string, 'contains') || 
+        if (self::str_startswith($string, 'substringof') || self::str_startswith($string, 'contains') || 
            self::str_startswith($string, 'indexof'))
         {
             $this->op   = strtok($string, '(');
@@ -30,7 +30,7 @@ 
         $field = strtok($string, ' ');
         $op = strtok(' ');
         $rest = strtok("\0");
-        switch($op)
+        switch ($op)
         {
             case 'ne':
                 $op = '!=';
@@ -59,11 +59,11 @@ 
     function to_sql_string()
     {
         $str = '';
-        switch($this->op)
+        switch ($this->op)
         {
             case 'substringof':
             case 'contains':
-                $str = $this->var1.' LIKE \'%'.trim($this->var2,"'").'%\'';
+                $str = $this->var1.' LIKE \'%'.trim($this->var2, "'").'%\'';
                 break;
             default:
                 $str = $this->var1.$this->op.$this->var2;
@@ -75,17 +75,17 @@ 
     function to_ldap_string()
     {
         $str = '(';
-        switch($this->op)
+        switch ($this->op)
         {
             case 'substringof':
             case 'contains':
-                $str.=$this->var1.$this->op.'*'.trim($this->var2,"'").'*';
+                $str .= $this->var1.$this->op.'*'.trim($this->var2, "'").'*';
                 break;
             case '!=':
-                $str.='!('.$this->var1.'='.$this->var2.')';
+                $str .= '!('.$this->var1.'='.$this->var2.')';
                 break;
             default:
-                $str.=$this->var1.$this->op.$this->var2;
+                $str .= $this->var1.$this->op.$this->var2;
                 break;
         }
         return $str.')';
@@ -94,11 +94,11 @@ 
     function to_mongo_filter()
     {
         $this->var2 = trim($this->var2, "'");
-        if($this->var1 === '_id')
+        if ($this->var1 === '_id')
         {
             $this->var2 = new \MongoId($this->var2);
         }
-        switch($this->op)
+        switch ($this->op)
         {
             case '!=':
                 return array($this->var1=>array('$ne'=>$this->var2));
@@ -117,13 +117,13 @@ 
             case 'indexof':
                 $field = $this->var1;
                 $case  = false;
-                if(self::str_startswith($this->var1, 'tolower'))
+                if (self::str_startswith($this->var1, 'tolower'))
                 {
-                    $field = substr($this->var1, strpos($this->var1, '(')+1);
+                    $field = substr($this->var1, strpos($this->var1, '(') + 1);
                     $field = substr($field, 0, strpos($field, ')'));
                     $case = true;
                 }
-                if($case)
+                if ($case)
                 {
                     return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i')));
                 }
@@ -136,7 +136,7 @@ 
 
     function php_compare($value)
     {
-        switch($this->op)
+        switch ($this->op)
         {
             case '!=':
                 return $value != $this->var2;

Braces +4 added lines, -3 removed lines

@@ -9,7 +9,9 @@ 
 
     function __construct($string=false)
     {
-        if($string !== false) $this->process_filter_string($string);
+        if($string !== false) {
+            $this->process_filter_string($string);
+        }
     }
 
     static function str_startswith($haystack, $needle)
@@ -126,8 +128,7 @@ 
                 if($case)
                 {
                     return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i')));
-                }
-                else
+                } else
                 {
                     return array($field=>$this->var2);
                 }

Data/class.SQLDataSet.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
         }
     }
 
+    /**
+     * @param string $sql
+     */
     function _get_row_count_for_query($sql)
     {
         $stmt = $this->pdo->query($sql);

Spacing +38 added lines, -38 removed lines

@@ -7,7 +7,7 @@ 
 
     function __construct($params)
     {
-        if(isset($params['user']))
+        if (isset($params['user']))
         {
             $this->pdo = new \PDO($params['dsn'], $params['user'], $params['pass']);
         }
@@ -20,12 +20,12 @@ 
     function _get_row_count_for_query($sql)
     {
         $stmt = $this->pdo->query($sql);
-        if($stmt === false)
+        if ($stmt === false)
         {
             return 0;
         }
         $count = $stmt->rowCount();
-        if($count === 0)
+        if ($count === 0)
         {
             $array = $stmt->fetchAll();
             $count = count($array);
@@ -35,11 +35,11 @@ 
 
     function _tableExistsNoPrefix($name)
     {
-        if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote($name)) > 0)
+        if ($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote($name)) > 0)
         {
             return true;
         }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote($name)) > 0)
+        else if ($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote($name)) > 0)
         {
             return true;
         }
@@ -48,11 +48,11 @@ 
 
     function _tableExists($name)
     {
-        if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
+        if ($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
         {
             return true;
         }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
+        else if ($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
         {
             return true;
         }
@@ -61,11 +61,11 @@ 
 
     function _viewExists($name)
     {
-        if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('v'.$name)) > 0)
+        if ($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('v'.$name)) > 0)
         {
             return true;
         }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('v'.$name)) > 0)
+        else if ($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('v'.$name)) > 0)
         {
             return true;
         }
@@ -74,15 +74,15 @@ 
 
     function tableExists($name)
     {
-        if($this->_tableExists($name))
+        if ($this->_tableExists($name))
         {
             return true;
         }
-        if($this->_tableExistsNoPrefix($name))
+        if ($this->_tableExistsNoPrefix($name))
         {
             return true;
         }
-        if($this->_viewExists($name))
+        if ($this->_viewExists($name))
         {
             return true;
         }
@@ -91,60 +91,60 @@ 
 
     function getTable($name)
     {
-        if($this->_tableExists($name))
+        if ($this->_tableExists($name))
         {
             return new SQLDataTable($this, 'tbl'.$name);
         }
-        if($this->_viewExists($name))
+        if ($this->_viewExists($name))
         {
             return new SQLDataTable($this, 'v'.$name);
         }
-        if($this->_tableExistsNoPrefix($name))
+        if ($this->_tableExistsNoPrefix($name))
         {
             return new SQLDataTable($this, $name);
         }
         throw new \Exception('No such table '.$name);
     }
 
-    function read($tablename, $where=false, $select='*', $count=false, $skip=false, $sort=false)
+    function read($tablename, $where = false, $select = '*', $count = false, $skip = false, $sort = false)
     {
-        if($select === false)
+        if ($select === false)
         {
             $select = '*';
         }
         $sql = "SELECT $select FROM $tablename";
-        if($where !== false)
+        if ($where !== false)
         {
-            $sql.=' WHERE '.$where;
+            $sql .= ' WHERE '.$where;
         }
-        if($count !== false)
+        if ($count !== false)
         {
-            if($skip === false)
+            if ($skip === false)
             {
-                $sql.=' LIMIT '.(int)$count;
+                $sql .= ' LIMIT '.(int)$count;
             }
             else
             {
-                $sql.=" LIMIT $skip, $count";
+                $sql .= " LIMIT $skip, $count";
             }
         }
-        if($sort !== false)
+        if ($sort !== false)
         {
-            $sql.=' ORDER BY ';
+            $sql .= ' ORDER BY ';
             $tmp = array();
-            foreach($sort as $sort_col=>$dir)
+            foreach ($sort as $sort_col=>$dir)
             {
-                array_push($tmp, $sort_col.' '.($dir === 1?'ASC':'DESC'));
+                array_push($tmp, $sort_col.' '.($dir === 1 ? 'ASC' : 'DESC'));
             }
-            $sql.=implode($tmp,',');
+            $sql .= implode($tmp, ',');
         }
         $stmt = $this->pdo->query($sql, \PDO::FETCH_ASSOC);
-        if($stmt === false)
+        if ($stmt === false)
         {
             return false;
         }
         $ret = $stmt->fetchAll();
-        if($ret === false || empty($ret))
+        if ($ret === false || empty($ret))
         {
             return false;
         }
@@ -154,19 +154,19 @@ 
     function update($tablename, $where, $data)
     {
         $set = array();
-        if(is_object($data))
+        if (is_object($data))
         {
             $data = (array)$data;
         }
         $cols = array_keys($data);
         $count = count($cols);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             array_push($set, $cols[$i].'='.$this->pdo->quote($data[$cols[$i]]));
         }
         $set = implode(',', $set);
         $sql = "UPDATE $tablename SET $set WHERE $where";
-        if($this->pdo->exec($sql) === false)
+        if ($this->pdo->exec($sql) === false)
         {
             return false;
         }
@@ -176,20 +176,20 @@ 
     function create($tablename, $data)
     {
         $set = array();
-        if(is_object($data))
+        if (is_object($data))
         {
             $data = (array)$data;
         }
         $cols = array_keys($data);
         $count = count($cols);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             array_push($set, $this->pdo->quote($data[$cols[$i]]));
         }
         $cols = implode(',', $cols);
         $set = implode(',', $set);
         $sql = "INSERT INTO $tablename ($cols) VALUES ($set);";
-        if($this->pdo->exec($sql) === false)
+        if ($this->pdo->exec($sql) === false)
         {
             return false;
         }
@@ -199,7 +199,7 @@ 
     function delete($tablename, $where)
     {
         $sql = "DELETE FROM $tablename WHERE $where";
-        if($this->pdo->exec($sql) === false)
+        if ($this->pdo->exec($sql) === false)
         {
             return false;
         }
@@ -209,7 +209,7 @@ 
     function raw_query($sql)
     {
         $stmt = $this->pdo->query($sql, \PDO::FETCH_ASSOC);
-        if($stmt === false)
+        if ($stmt === false)
         {
             return false;
         }

Braces +5 added lines, -10 removed lines

@@ -10,8 +10,7 @@ 
         if(isset($params['user']))
         {
             $this->pdo = new \PDO($params['dsn'], $params['user'], $params['pass']);
-        }
-        else
+        } else
         {
             $this->pdo = new \PDO($params['dsn']);
         }
@@ -38,8 +37,7 @@ 
         if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote($name)) > 0)
         {
             return true;
-        }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote($name)) > 0)
+        } else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote($name)) > 0)
         {
             return true;
         }
@@ -51,8 +49,7 @@ 
         if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
         {
             return true;
-        }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
+        } else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
         {
             return true;
         }
@@ -64,8 +61,7 @@ 
         if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('v'.$name)) > 0)
         {
             return true;
-        }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('v'.$name)) > 0)
+        } else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('v'.$name)) > 0)
         {
             return true;
         }
@@ -122,8 +118,7 @@ 
             if($skip === false)
             {
                 $sql.=' LIMIT '.(int)$count;
-            }
-            else
+            } else
             {
                 $sql.=" LIMIT $skip, $count";
             }

Data/class.SQLDataTable.php

Doc Comments +3 added lines

@@ -6,6 +6,9 @@
     protected $dataset;
     protected $tablename;
 
+    /**
+     * @param SQLDataSet $dataset
+     */
     function __construct($dataset, $tablename)
     {
         $this->dataset   = $dataset;

Indentation +4 added lines, -4 removed lines

@@ -65,11 +65,11 @@ 
         $ret = $this->dataset->read($this->tablename, $where, 'COUNT(*)');
         if($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)']))
         {
-             return false;
+                return false;
         }
         else
         {
-             return $ret[0]['COUNT(*)'];
+                return $ret[0]['COUNT(*)'];
         }
     }
   
@@ -93,8 +93,8 @@ 
 
     function update($filter, $data)
     {
-         $where = $filter->to_sql_string();
-         return $this->dataset->update($this->tablename, $where, $data);
+            $where = $filter->to_sql_string();
+            return $this->dataset->update($this->tablename, $where, $data);
     }
 
     function create($data)

Spacing +14 added lines, -14 removed lines

@@ -15,7 +15,7 @@ 
     function get_primary_key()
     {
         $res = $this->dataset->raw_query("SHOW INDEX FROM $this->tablename WHERE Key_name='PRIMARY'");
-        if($res === false)
+        if ($res === false)
         {
             return false;
         }
@@ -25,17 +25,17 @@ 
     function prefetch_all($key = false)
     {
         $array = $this->read(false, false);
-        if($key === false)
+        if ($key === false)
         {
             $key = $this->get_primary_key();
         }
         $count = count($array);
         $this->data = array();
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(isset($this->data[$array[$i][$key]]))
+            if (isset($this->data[$array[$i][$key]]))
             {
-                if(isset($this->data[$array[$i][$key]][0]))
+                if (isset($this->data[$array[$i][$key]][0]))
                 {
                     array_push($this->data[$array[$i][$key]], $array[$i]);
                 }
@@ -51,19 +51,19 @@ 
         }
     }
 
-    function count($filter=false)
+    function count($filter = false)
     {
-        if($this->data !== null)
+        if ($this->data !== null)
         {
             return parent::count($filter);
         }
         $where = false;
-        if($filter !== false)
+        if ($filter !== false)
         {
             $where = $filter->to_sql_string();
         }
         $ret = $this->dataset->read($this->tablename, $where, 'COUNT(*)');
-        if($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)']))
+        if ($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)']))
         {
              return false;
         }
@@ -73,18 +73,18 @@ 
         }
     }
   
-    function search($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false)
+    function search($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
     {
-        if($this->data !== null)
+        if ($this->data !== null)
         {
             return parent::search($filter, $select);
         }
         $where = false;
-        if($filter !== false)
+        if ($filter !== false)
         {
             $where = $filter->to_sql_string();
         }
-        if($select !== false && is_array($select))
+        if ($select !== false && is_array($select))
         {
             $select = implode(',', $select);
         }
@@ -105,7 +105,7 @@ 
     function delete($filter)
     {
         $where = false;
-        if($filter !== false)
+        if ($filter !== false)
         {
             $where = $filter->to_sql_string();
         }

Braces +3 added lines, -6 removed lines

@@ -38,13 +38,11 @@ 
                 if(isset($this->data[$array[$i][$key]][0]))
                 {
                     array_push($this->data[$array[$i][$key]], $array[$i]);
-                }
-                else
+                } else
                 {
                     $this->data[$array[$i][$key]] = array($array[$i]);
                 }
-            }
-            else
+            } else
             {
                 $this->data[$array[$i][$key]] = $array[$i];
             }
@@ -66,8 +64,7 @@ 
         if($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)']))
         {
              return false;
-        }
-        else
+        } else
         {
              return $ret[0]['COUNT(*)'];
         }

Email/class.Email.php

Doc Comments +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
     /**
      * Who is this email going to
      *
-     * @return array The recipients of the email
+     * @return string The recipients of the email
      */
     public function getToAddresses()
     {
@@ -82,7 +82,7 @@ 
     /**
      * Who is this email going to (CC)
      *
-     * @return array The recipients of the email
+     * @return string The recipients of the email
      */
     public function getCCAddresses()
     {
@@ -92,7 +92,7 @@ 
     /**
      * Who is this email going to (BCC)
      *
-     * @return array The recipients of the email
+     * @return string The recipients of the email
      */
     public function getBCCAddresses()
     {

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

Doc Comments +3 added lines

@@ -12,6 +12,9 @@
         return false;
     }
 
+    /**
+     * @param Email $email
+     */
     public function sendEmail($email)
     {
         return false;

LDAP/class.LDAPServer.php

Doc Comments +6 added lines

@@ -117,6 +117,9 @@ 
         $this->connect = false;
     }
 
+    /**
+     * @param string $password
+     */
     function bind($cn=null, $password=null)
     {
         $res = false;
@@ -199,6 +202,9 @@ 
         return $ret;
     }
 
+    /**
+     * @param boolean $filter
+     */
     private function filterToString($filter)
     {
         if($filter === false)

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

Braces +6 added lines, -12 removed lines

@@ -132,8 +132,7 @@ 
         try
         {
             $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);
@@ -177,8 +176,7 @@ 
                         $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]]);
@@ -225,20 +223,17 @@ 
             if($single === true)
             {
                 $sr = @ldap_read($this->ds, $baseDN, $filterStr);
-            }
-            else
+            } else
             {
                 if($attributes !== false)
                 {
                     $sr = @ldap_list($this->ds, $baseDN, $filterStr, $attributes);
-                }
-                else
+                } else
                 {
                     $sr = @ldap_list($this->ds, $baseDN, $filterStr);
                 }
             }
-        }
-        catch(\Exception $e)
+        } catch(\Exception $e)
         {
             throw new \Exception($e->getMessage().' '.$filterStr, $e->getCode(), $e);
         }
@@ -269,8 +264,7 @@ 
         try
         {
             $sr = ldap_list($this->ds, $baseDN, $filterStr, array('dn'));
-        }
-        catch(\Exception $e)
+        } catch(\Exception $e)
         {
             throw new \Exception($e->getMessage().' '.$filterStr, $e->getCode(), $e);
         }