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">

Auth/class.LDAPUser.php

Spacing +41 added lines, -41 removed lines

@@ -8,15 +8,15 @@ 
     private $ldapObj;
     private $server;
 
-    function __construct($data=false)
+    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;
@@ -54,14 +54,14 @@ 
     {
         $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];
-            if(isset($group['member']))
+            if (isset($group['member']))
             {
-                if(in_array($dn, $group['member']))
+                if (in_array($dn, $group['member']))
                 {
                     return true;
                 }
@@ -70,9 +70,9 @@ 
                     return $this->check_child_group($group['member']);
                 }
             }
-            else if(isset($group['uniquemember']))
+            else if (isset($group['uniquemember']))
             {
-                if(in_array($dn, $group['uniquemember']))
+                if (in_array($dn, $group['uniquemember']))
                 {
                     return true;
                 }
@@ -81,7 +81,7 @@ 
                     return $this->check_child_group($group['uniquemember']);
                 }
             }
-            else if(isset($group['memberUid']) && in_array($uid, $group['memberUid']))
+            else if (isset($group['memberUid']) && in_array($uid, $group['memberUid']))
             {
                 return true;
             }
@@ -122,7 +122,7 @@ 
     function getOrganization()
     {
         $org = $this->getFieldSingleValue('o');
-        if($org === false)
+        if ($org === false)
         {
             return 'Volunteer';
         }
@@ -132,7 +132,7 @@ 
     function getTitles()
     {
         $titles = $this->getField('title');
-        if(isset($titles['count']))
+        if (isset($titles['count']))
         {
             unset($titles['count']);
         }
@@ -177,7 +177,7 @@ 
     function getOrganizationUnits()
     {
         $units = $this->getField('ou');
-        if(isset($units['count']))
+        if (isset($units['count']))
         {
             unset($units['count']);
         }
@@ -187,7 +187,7 @@ 
     function getLoginProviders()
     {
         $hosts = $this->getField('host');
-        if(isset($hosts['count']))
+        if (isset($hosts['count']))
         {
             unset($hosts['count']);
         }
@@ -198,12 +198,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]));
                 }
@@ -223,23 +223,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;
     }
 
     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;
             }
@@ -253,7 +253,7 @@ 
 
     function validate_password($password)
     {
-        if($this->server->bind($this->ldapObj->dn, $password))
+        if ($this->server->bind($this->ldapObj->dn, $password))
         {
             return true;
         }
@@ -262,37 +262,37 @@ 
 
     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;
         }
@@ -321,7 +321,7 @@ 
 
     function setUid($uid)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
             return $this->setFieldLocal('uid', $uid);
         }
@@ -369,7 +369,7 @@ 
 
     function setTitles($titles)
     {
-        if(!is_array($titles))
+        if (!is_array($titles))
         {
             $titles = array($titles);
         }
@@ -378,7 +378,7 @@ 
 
     function setOrganizationUnits($ous)
     {
-        if(!is_array($ous))
+        if (!is_array($ous))
         {
             $ous = array($ous);
         }
@@ -387,7 +387,7 @@ 
 
     function flushUser()
     {
-        if(is_object($this->ldapObj))
+        if (is_object($this->ldapObj))
         {
             //In this mode we are always up to date
             return true;
@@ -395,11 +395,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'];
         }
@@ -416,7 +416,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]);
         }
@@ -426,7 +426,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!');
         }

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