BurningFlipside / CommonCode

js/js-webshim/dev/shims/FlashCanvasPro/proxy.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
     } else {
         $host = FCgetHostName();
     }
-    $pattern = '#^https?://' . str_replace('.', '\.', $host) . '(:\d*)?/#';
+    $pattern = '#^https?://'.str_replace('.', '\.', $host).'(:\d*)?/#';
     if (!preg_match($pattern, $_SERVER['HTTP_REFERER'])) {
         exit;
     }
@@ -73,7 +73,7 @@ 
 }
 
 // Percent-encode special characters in the URL
-$search  = array(  '%',   '#',   ' ');
+$search  = array('%', '#', ' ');
 $replace = array('%25', '%23', '%20');
 $url     = str_replace($search, $replace, $_GET['url']);
 

js/js-webshim/dev/shims/FlashCanvasPro/save.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     // Force download
     header('Content-Type: application/octet-stream');
-    header('Content-Disposition: attachment; filename="' . $filename . '"');
+    header('Content-Disposition: attachment; filename="'.$filename.'"');
 
     if (isset($_POST['dataurl'])) {
         // Decode the base64-encoded data

class.ODataParams.php

Spacing +18 added lines, -18 removed lines

@@ -12,45 +12,45 @@ 
 
     function __construct($params)
     {
-        if(isset($params['filter']))
+        if (isset($params['filter']))
         {
             $this->filter = new \Data\Filter($params['filter']);
         }
-        else if(isset($params['$filter']))
+        else if (isset($params['$filter']))
         {
             $this->filter = new \Data\Filter($params['$filter']);
         }
 
-        if(isset($params['$expand']))
+        if (isset($params['$expand']))
         {
-            $this->expand = explode(',',$params['$expand']);
+            $this->expand = explode(',', $params['$expand']);
         }
 
-        if(isset($params['select']))
+        if (isset($params['select']))
         {
-            $this->select = explode(',',$params['select']);
+            $this->select = explode(',', $params['select']);
         }
-        else if(isset($params['$select']))
+        else if (isset($params['$select']))
         {
-            $this->select = explode(',',$params['$select']);
+            $this->select = explode(',', $params['$select']);
         }
 
-        if(isset($params['$orderby']))
+        if (isset($params['$orderby']))
         {
             $this->orderby = array();
-            $orderby = explode(',',$params['$orderby']);
+            $orderby = explode(',', $params['$orderby']);
             $count = count($orderby);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                $exp = explode(' ',$orderby[$i]);
-                if(count($exp) === 1)
+                $exp = explode(' ', $orderby[$i]);
+                if (count($exp) === 1)
                 {
                     //Default to assending
                     $this->orderby[$exp[0]] = 1;
                 }
                 else
                 {
-                    switch($exp[1])
+                    switch ($exp[1])
                     {
                         case 'asc':
                             $this->orderby[$exp[0]] = 1;
@@ -65,22 +65,22 @@ 
             }
         }
 
-        if(isset($params['$top']))
+        if (isset($params['$top']))
         {
             $this->top = $params['$top'];
         }
 
-        if(isset($params['$skip']))
+        if (isset($params['$skip']))
         {
             $this->skip = $params['$skip'];
         }
 
-        if(isset($params['$count']) && $params['$count'] === 'true')
+        if (isset($params['$count']) && $params['$count'] === 'true')
         {
             $this->count = true;
         }
 
-        if(isset($params['$seach']))
+        if (isset($params['$seach']))
         {
             throw new Exception('Search not yet implemented');
         }

Auth/OAuth2/class.LiveAuthenticator.php

Spacing +1 added lines, -1 removed lines

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

js/js-webshim/dev/shims/FlashCanvas/proxy.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
     } else {
         $host = FCgetHostName();
     }
-    $pattern = '#^https?://' . str_replace('.', '\.', $host) . '(:\d*)?/#';
+    $pattern = '#^https?://'.str_replace('.', '\.', $host).'(:\d*)?/#';
     if (!preg_match($pattern, $_SERVER['HTTP_REFERER'])) {
         exit;
     }
@@ -73,7 +73,7 @@ 
 }
 
 // Percent-encode special characters in the URL
-$search  = array(  '%',   '#',   ' ');
+$search  = array('%', '#', ' ');
 $replace = array('%25', '%23', '%20');
 $url     = str_replace($search, $replace, $_GET['url']);
 

js/js-webshim/dev/shims/FlashCanvas/save.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     // Force download
     header('Content-Type: application/octet-stream');
-    header('Content-Disposition: attachment; filename="' . $filename . '"');
+    header('Content-Disposition: attachment; filename="'.$filename.'"');
 
     if (isset($_POST['dataurl'])) {
         // Decode the base64-encoded data

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