BurningFlipside / CommonCode

Auth/class.User.php

Spacing +41 added lines, -41 removed lines

@@ -128,26 +128,26 @@ 
     function getTitleNames()
     {
         $titles = $this->getTitles();
-        if($titles === false)
+        if ($titles === false)
         {
             return false;
         }
-        if(self::$titlenames === null)
+        if (self::$titlenames === null)
         {
             $dataSet = \DataSetFactory::get_data_set('profiles');
             $dataTable = $dataSet['position'];
             $titlenames = $dataTable->read();
             self::$titlenames = array();
             $count = count($titlenames);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 self::$titlenames[$titlenames[$i]['short_name']] = $titlenames[$i];
             }
         }
         $count = count($titles);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(isset(self::$titlenames[$titles[$i]]))
+            if (isset(self::$titlenames[$titles[$i]]))
             {
                 $title = self::$titlenames[$titles[$i]];
                 $titles[$i] = $title['name'];
@@ -280,11 +280,11 @@ 
     function canLoginWith($provider)
     {
         $hosts = $this->getLoginProviders();
-        if($hosts === false) return false;
+        if ($hosts === false) return false;
         $count = count($hosts);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(strcasecmp($hosts[$i], $provider) === 0) return true;
+            if (strcasecmp($hosts[$i], $provider) === 0) return true;
         }
         return false;
     }
@@ -308,9 +308,9 @@ 
      */
     function isProfileComplete()
     {
-        if($this->getCountry() === false    || $this->getAddress() === false ||
+        if ($this->getCountry() === false || $this->getAddress() === false ||
            $this->getPostalCode() === false || $this->getCity() === false ||
-           $this->getState() === false      || $this->getPhoneNumber() === false)
+           $this->getState() === false || $this->getPhoneNumber() === false)
         {
             return false;
         }
@@ -354,17 +354,17 @@ 
      *
      * @return true|false true if the user's password was changed, false otherwise
      */
-    function change_pass($oldpass, $newpass, $isHash=false)
+    function change_pass($oldpass, $newpass, $isHash = false)
     {
-        if($isHash === false && $this->validate_password($oldpass) === false)
+        if ($isHash === false && $this->validate_password($oldpass) === false)
         {
             throw new \Exception('Invalid Password!', 3);
         }
-        if($isHash === true && $this->validate_reset_hash($oldpass) === false)
+        if ($isHash === true && $this->validate_reset_hash($oldpass) === false)
         {
             throw new \Exception('Invalid Reset Hash!', 3);
         }
-        if($this->setPass($newpass) === false)
+        if ($this->setPass($newpass) === false)
         {
             throw new \Exception('Unable to set password!', 6);
         }
@@ -602,99 +602,99 @@ 
         $auth = \AuthProvider::getInstance();
         $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator');
         $ldap->get_and_bind_server(true);
-        if(isset($data->oldpass) && isset($data->password))
+        if (isset($data->oldpass) && isset($data->password))
         {
             $this->change_pass($data->oldpass, $data->password);
             unset($data->oldpass);
             unset($data->password);
         }
-        else if(isset($data->hash) && isset($data->password))
+        else if (isset($data->hash) && isset($data->password))
         {
             $this->change_pass($data->hash, $data->password, true);
             return;
         }
-        if(isset($data->displayName))
+        if (isset($data->displayName))
         {
             $this->setDisplayName($data->displayName);
             unset($data->displayName);
         }
-        if(isset($data->givenName))
+        if (isset($data->givenName))
         {
             $this->setGivenName($data->givenName);
             unset($data->givenName);
         }
-        if(isset($data->jpegPhoto))
+        if (isset($data->jpegPhoto))
         {
             $this->setPhoto(base64_decode($data->jpegPhoto));
             unset($data->jpegPhoto);
         }
-        if(isset($data->mail))
+        if (isset($data->mail))
         {
-            if($data->mail !== $this->getEmail())
+            if ($data->mail !== $this->getEmail())
             {
                 throw new \Exception('Unable to change email!');
             }
             unset($data->mail);
         }
-        if(isset($data->uid))
+        if (isset($data->uid))
         {
-            if($data->uid !== $this->getUid())
+            if ($data->uid !== $this->getUid())
             {
                 throw new \Exception('Unable to change uid!');
             }
             unset($data->uid);
         }
-        if(isset($data->mobile))
+        if (isset($data->mobile))
         {
             $this->setPhoneNumber($data->mobile);
             unset($data->mobile);
         }
-        if(isset($data->o))
+        if (isset($data->o))
         {
             $this->setOrganization($data->o);
             unset($data->o);
         }
-        if(isset($data->title))
+        if (isset($data->title))
         {
             $this->setTitles($data->title);
             unset($data->title);
         }
-        if(isset($data->st))
+        if (isset($data->st))
         {
             $this->setState($data->st);
             unset($data->st);
         }
-        if(isset($data->l))
+        if (isset($data->l))
         {
             $this->setCity($data->l);
             unset($data->l);
         }
-        if(isset($data->sn))
+        if (isset($data->sn))
         {
             $this->setLastName($data->sn);
             unset($data->sn);
         }
-        if(isset($data->cn))
+        if (isset($data->cn))
         {
             $this->setNickName($data->cn);
             unset($data->cn);
         }
-        if(isset($data->postalAddress))
+        if (isset($data->postalAddress))
         {
             $this->setAddress($data->postalAddress);
             unset($data->postalAddress);
         }
-        if(isset($data->postalCode))
+        if (isset($data->postalCode))
         {
             $this->setPostalCode($data->postalCode);
             unset($data->postalCode);
         }
-        if(isset($data->c))
+        if (isset($data->c))
         {
             $this->setCountry($data->c);
             unset($data->c);
         }
-        if(isset($data->ou))
+        if (isset($data->ou))
         {
             $this->setOrganizationUnits($data->ou);
             unset($data->ou);
@@ -749,13 +749,13 @@ 
     public function getVcard()
     {
         $ret = "BEGIN:VCARD\nVERSION:2.1\n";
-        $ret.= 'N:'.$this->getLastName().';'.$this->getGivenName()."\n";
-        $ret.= 'FN:'.$this->getGivenName()."\n";
-        $ret.= 'TITLE:'.implode(',', $this->getTitles())."\n";
-        $ret.= "ORG: Austin Artistic Reconstruction\n";
-        $ret.= 'TEL;TYPE=MOBILE,VOICE:'.$this->getPhoneNumber()."\n";
-        $ret.= 'EMAIL;TYPE=PREF,INTERNET:'.$this->getEmail()."\n";
-        $ret.= "END:VCARD\n";
+        $ret .= 'N:'.$this->getLastName().';'.$this->getGivenName()."\n";
+        $ret .= 'FN:'.$this->getGivenName()."\n";
+        $ret .= 'TITLE:'.implode(',', $this->getTitles())."\n";
+        $ret .= "ORG: Austin Artistic Reconstruction\n";
+        $ret .= 'TEL;TYPE=MOBILE,VOICE:'.$this->getPhoneNumber()."\n";
+        $ret .= 'EMAIL;TYPE=PREF,INTERNET:'.$this->getEmail()."\n";
+        $ret .= "END:VCARD\n";
         return $ret;
     }
 }

Braces +7 added lines, -4 removed lines

@@ -280,11 +280,15 @@ 
     function canLoginWith($provider)
     {
         $hosts = $this->getLoginProviders();
-        if($hosts === false) return false;
+        if($hosts === false) {
+            return false;
+        }
         $count = count($hosts);
         for($i = 0; $i < $count; $i++)
         {
-            if(strcasecmp($hosts[$i], $provider) === 0) return true;
+            if(strcasecmp($hosts[$i], $provider) === 0) {
+                return true;
+            }
         }
         return false;
     }
@@ -607,8 +611,7 @@ 
             $this->change_pass($data->oldpass, $data->password);
             unset($data->oldpass);
             unset($data->password);
-        }
-        else if(isset($data->hash) && isset($data->password))
+        } else if(isset($data->hash) && isset($data->password))
         {
             $this->change_pass($data->hash, $data->password, true);
             return;

Doc Comments +43 added lines, -43 removed lines

@@ -31,7 +31,7 @@ 
      *
      * @param string $name The name of the group to check if the user is in
      *
-     * @return true|false True if the user is in the group, false otherwise
+     * @return boolean True if the user is in the group, false otherwise
      */
     function isInGroupNamed($name)
     {
@@ -41,7 +41,7 @@ 
     /**
      * The name the user should be displayed as
      *
-     * @return string The name the user should be displayed as
+     * @return boolean The name the user should be displayed as
      */
     function getDisplayName()
     {
@@ -51,7 +51,7 @@ 
     /**
      * The given (or first) name for the user
      *
-     * @return string The user's first name
+     * @return boolean The user's first name
      */
     function getGivenName()
     {
@@ -61,7 +61,7 @@ 
     /**
      * The email address for the user
      *
-     * @return string The user's email address
+     * @return boolean The user's email address
      */
     function getEmail()
     {
@@ -71,7 +71,7 @@ 
     /**
      * The user ID for the user
      *
-     * @return string The user's ID or username
+     * @return boolean The user's ID or username
      */
     function getUid()
     {
@@ -81,7 +81,7 @@ 
     /**
      * The photo for the user
      *
-     * @return string The user's photo as a binary string
+     * @return boolean The user's photo as a binary string
      */ 
     function getPhoto()
     {
@@ -91,7 +91,7 @@ 
     /**
      * The phone number for the user
      *
-     * @return false|string The user's phone number
+     * @return boolean The user's phone number
      */
     function getPhoneNumber()
     {
@@ -101,7 +101,7 @@ 
     /**
      * The organziation for the user
      *
-     * @return false|string The user's organization
+     * @return boolean The user's organization
      */
     function getOrganization()
     {
@@ -111,7 +111,7 @@ 
     /**
      * The list of titles for the user
      *
-     * @return array The user's title(s) in short format
+     * @return boolean The user's title(s) in short format
      */
     function getTitles()
     {
@@ -121,7 +121,7 @@ 
     /**
      * The list of titles for the user
      *
-     * @return array The user's title(s) in user friendly strings
+     * @return boolean The user's title(s) in user friendly strings
      *
      * @SuppressWarnings("StaticAccess")
      */
@@ -159,7 +159,7 @@ 
     /**
      * The state the user's mailing address is in
      *
-     * @return string The user's state from their mailing address
+     * @return boolean The user's state from their mailing address
      */
     function getState()
     {
@@ -169,7 +169,7 @@ 
     /**
      * The city the user's mailing address is in
      *
-     * @return string The user's city from their mailing address
+     * @return boolean The user's city from their mailing address
      */
     function getCity()
     {
@@ -179,7 +179,7 @@ 
     /**
      * The last name for the user
      *
-     * @return string The user's last name
+     * @return boolean The user's last name
      */
     function getLastName()
     {
@@ -189,7 +189,7 @@ 
     /**
      * The nick name for the user
      *
-     * @return string The user's nick name
+     * @return boolean The user's nick name
      */
     function getNickName()
     {
@@ -199,7 +199,7 @@ 
     /**
      * The street address for the user
      *
-     * @return string The user's street address
+     * @return boolean The user's street address
      */
     function getAddress()
     {
@@ -209,7 +209,7 @@ 
     /**
      * The postal (zip) code for the user's mailing address
      *
-     * @return string The user's postal code
+     * @return boolean The user's postal code
      */
     function getPostalCode()
     {
@@ -219,7 +219,7 @@ 
     /**
      * The country the user's mailing address is in
      *
-     * @return string The user's country from their mailing address
+     * @return boolean The user's country from their mailing address
      */
     function getCountry()
     {
@@ -231,7 +231,7 @@ 
      *
      * This is the same as Areas in Flipside speak. 
      *
-     * @return array The user's orgnaiational units
+     * @return boolean The user's orgnaiational units
      */
     function getOrganizationUnits()
     {
@@ -241,7 +241,7 @@ 
     /**
      * The supplemental login types that the user can use to login
      *
-     * @return array The user's login providers
+     * @return boolean The user's login providers
      */
     function getLoginProviders()
     {
@@ -251,7 +251,7 @@ 
     /**
      * The groups the user is a part of
      *
-     * @return false|array The user's Auth\Group structures
+     * @return boolean The user's Auth\Group structures
      */
     function getGroups()
     {
@@ -275,7 +275,7 @@ 
      *
      * @param string $provider The hostname for the provider
      *
-     * @return true|false true if they can login with the provider, false otherwise
+     * @return boolean true if they can login with the provider, false otherwise
      */
     function canLoginWith($provider)
     {
@@ -294,7 +294,7 @@ 
      *
      * @param string $password The new user password
      *
-     * @return true|false true if the user's password was changed, false otherwise
+     * @return boolean true if the user's password was changed, false otherwise
      */
     protected function setPass($password)
     {
@@ -304,7 +304,7 @@ 
     /**
      * Has the user completely filled out their user profile?
      *
-     * @return true|false true if the user's profile is complete, false otherwise
+     * @return boolean true if the user's profile is complete, false otherwise
      */
     function isProfileComplete()
     {
@@ -322,7 +322,7 @@ 
      *
      * @param string $password The user's current password
      *
-     * @return true|false true if the user's password is correct, false otherwise
+     * @return boolean true if the user's password is correct, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -336,7 +336,7 @@ 
      *
      * @param string $hash The user's reset hash
      *
-     * @return true|false true if the user's hash is correct, false otherwise
+     * @return boolean true if the user's hash is correct, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -352,7 +352,7 @@ 
      * @param string $newpass The user's new password
      * @param boolean $isHash Is $old_pass a password or a hash
      *
-     * @return true|false true if the user's password was changed, false otherwise
+     * @return boolean true if the user's password was changed, false otherwise
      */
     function change_pass($oldpass, $newpass, $isHash=false)
     {
@@ -376,7 +376,7 @@ 
      *
      * @param string $name The user's new display name
      *
-     * @return true|false true if the user's display name was changed, false otherwise
+     * @return boolean true if the user's display name was changed, false otherwise
      */
     function setDisplayName($name)
     {
@@ -388,7 +388,7 @@ 
      *
      * @param string $name The user's new given name
      *
-     * @return true|false true if the user's given name was changed, false otherwise
+     * @return boolean true if the user's given name was changed, false otherwise
      */
     function setGivenName($name)
     {
@@ -400,7 +400,7 @@ 
      *
      * @param string $email The user's new email address
      *
-     * @return true|false true if the user's email address was changed, false otherwise
+     * @return boolean true if the user's email address was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -414,7 +414,7 @@ 
      *
      * @param string $uid The user's new user ID
      *
-     * @return true|false true if the user's ID was changed, false otherwise
+     * @return boolean true if the user's ID was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -428,7 +428,7 @@ 
      *
      * @param string $photo The user's new photo as a binary string
      *
-     * @return true|false true if the user's photo was changed, false otherwise
+     * @return boolean true if the user's photo was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -442,7 +442,7 @@ 
      *
      * @param string $phone The user's new phonew number
      *
-     * @return true|false true if the user's phone number was changed, false otherwise
+     * @return boolean true if the user's phone number was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -456,7 +456,7 @@ 
      *
      * @param string $org The user's new organization
      *
-     * @return true|false true if the user's organization was changed, false otherwise
+     * @return boolean true if the user's organization was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -470,7 +470,7 @@ 
      *
      * @param string $titles The user's new titles
      *
-     * @return true|false true if the user's titles were changed, false otherwise
+     * @return boolean true if the user's titles were changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -484,7 +484,7 @@ 
      *
      * @param string $state The user's new state
      *
-     * @return true|false true if the user's state was changed, false otherwise
+     * @return boolean true if the user's state was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -498,7 +498,7 @@ 
      *
      * @param string $city The user's new city
      *
-     * @return true|false true if the user's city was changed, false otherwise
+     * @return boolean true if the user's city was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -512,7 +512,7 @@ 
      *
      * @param string $sn The user's new last name
      *
-     * @return true|false true if the user's last name was changed, false otherwise
+     * @return boolean true if the user's last name was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -526,7 +526,7 @@ 
      *
      * @param string $displayName The user's new nick name
      *
-     * @return true|false true if the user's nick name was changed, false otherwise
+     * @return boolean true if the user's nick name was changed, false otherwise
      */
     function setNickName($displayName)
     {
@@ -538,7 +538,7 @@ 
      *
      * @param string $address The user's new mailing address
      *
-     * @return true|false true if the user's mailing address was changed, false otherwise
+     * @return boolean true if the user's mailing address was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -552,7 +552,7 @@ 
      *
      * @param string $postalcode The user's new postal code
      *
-     * @return true|false true if the user's postal code was changed, false otherwise
+     * @return boolean true if the user's postal code was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -566,7 +566,7 @@ 
      *
      * @param string $country The user's new country
      *
-     * @return true|false true if the user's country was changed, false otherwise
+     * @return boolean true if the user's country was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -580,7 +580,7 @@ 
      *
      * @param string $ous The user's new organizations
      *
-     * @return true|false true if the user's organizations was changed, false otherwise
+     * @return boolean true if the user's organizations was changed, false otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -704,7 +704,7 @@ 
     /**
      * Obtain the user's password reset hash
      *
-     * @return string|false A hash if available, false otherwise
+     * @return boolean A hash if available, false otherwise
      */
     public function getPasswordResetHash()
     {

class.FlipREST.php

Spacing +30 added lines, -30 removed lines

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

Braces +8 added lines, -16 removed lines

@@ -75,8 +75,7 @@ 
         if(!isset($this->headers['Authorization']))
         {
             $this->app->user = $this->getUserFromSession();
-        } 
-        else 
+        } else 
         {
             $header = $this->headers['Authorization'];
             $this->app->user = $this->getUserFromHeader($header);
@@ -99,16 +98,13 @@ 
         if(is_array($value))
         {
             $array[$key] = implode(';', $value);
-        }
-        else if($key === '_id' && is_object($value))
+        } else if($key === '_id' && is_object($value))
         {
             $array[$key] = $value->{'$id'};
-        }
-        else if(is_object($value))
+        } else if(is_object($value))
         {
             $array[$key] = $this->app->request->getUrl().$this->app->request->getPath().$prefix.'/'.$key;
-        }
-        else if(strncmp($value, 'data:', 5) === 0)
+        } else if(strncmp($value, 'data:', 5) === 0)
         {
             $array[$key] = $this->app->request->getUrl().$this->app->request->getPath().$prefix.'/'.$key;
         }
@@ -129,8 +125,7 @@ 
             if(is_array($first))
             {
                 $keys = array_keys($first);
-            }
-            else if(is_object($first))
+            } else if(is_object($first))
             {
                 $keys = array_keys(get_object_vars($first));
             }
@@ -145,8 +140,7 @@ 
                         $this->fix_encoded_element($key, $value, $row, '/'.$id);
                     }
                     fputcsv($df, $row);
-                }
-                else if(is_object($row))
+                } else if(is_object($row))
                 {
                     $keyName = $keys[0];
                     $id = $row->$keyName;
@@ -162,8 +156,7 @@ 
                     fputcsv($df, $values);
                 }
             }
-        }
-        else
+        } else
         {
             $array = get_object_vars($array);
             fputcsv($df, array_keys($array));
@@ -262,8 +255,7 @@ 
                     break;
             }
             $this->app->response->setBody($text);
-        }
-        else if($this->app->response->getStatus() == 200)
+        } else if($this->app->response->getStatus() == 200)
         {
             $this->app->response->headers->set('Content-Type', 'application/json;odata.metadata=none');
         }

Autoload.php

Spacing +3 added lines, -3 removed lines

@@ -26,16 +26,16 @@
     {
         $namespace = substr($classname, 0, $lastNsPos);
         $classname = substr($classname, $lastNsPos + 1);
-        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
     }
     $filename = __DIR__.DIRECTORY_SEPARATOR.$filename.'class.'.$classname.'.php';
-    if(is_readable($filename))
+    if (is_readable($filename))
     {
         require $filename;
     }
 }
 
-if(version_compare(PHP_VERSION, '5.3.0', '>='))
+if (version_compare(PHP_VERSION, '5.3.0', '>='))
 {
     spl_autoload_register('FlipsideAutoload', true, true);
 }

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
-}
-else
+} else
 {
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
 }

Data/class.DataTable.php

Spacing +5 added lines, -5 removed lines

@@ -5,18 +5,18 @@ 
 {
     protected $data = null;
 
-    function count($filter=false)
+    function count($filter = false)
     {
         throw new \Exception('Unimplemented');
     }
 
-    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)
         {
             throw new \Exception('Unimplemented');
         }
-        if($filter !== false)
+        if ($filter !== false)
         {
             $array = $filter->filter_array($this->data);
         }
@@ -28,7 +28,7 @@ 
         throw new \Exception('Unimplemented');
     }
 
-    function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false)
+    function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
     {
         return $this->search($filter, $select, $count, $skip, $sort, $params);
     }

Data/class.Filter.php

Spacing +38 added lines, -38 removed lines

@@ -9,7 +9,7 @@ 
 
     function __construct($string = false)
     {
-        if($string !== false)
+        if ($string !== false)
         {
             $this->string = $string;
             $this->children = self::process_string($this->string);
@@ -20,21 +20,21 @@ 
     {
         $parens = false;
         //First check for parenthesis...
-        if($string[0] === '(' && substr($string, -1) === ')')
+        if ($string[0] === '(' && substr($string, -1) === ')')
         {
-            $string = substr($string, 1, strlen($string)-2);
+            $string = substr($string, 1, strlen($string) - 2);
             $parens = true;
         }
-        if(preg_match('/(.+?)( and | or )(.+)/', $string, $clauses) === 0)
+        if (preg_match('/(.+?)( and | or )(.+)/', $string, $clauses) === 0)
         {
             return array(new FilterClause($string));
         }
         $children = array();
-        if($parens) array_push($children, '(');
+        if ($parens) array_push($children, '(');
         $children = array_merge($children, self::process_string($clauses[1]));
         array_push($children, trim($clauses[2]));
         $children = array_merge($children, self::process_string($clauses[3]));
-        if($parens) array_push($children, ')');
+        if ($parens) array_push($children, ')');
         return $children;
     }
 
@@ -42,23 +42,23 @@ 
     {
         $ret = '';
         $count = count($this->children);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->children[$i] === '(' || $this->children[$i] === ')')
+            if ($this->children[$i] === '(' || $this->children[$i] === ')')
             {
-                $ret.=$this->children[$i];
+                $ret .= $this->children[$i];
             }
-            else if($this->children[$i] === 'and')
+            else if ($this->children[$i] === 'and')
             {
-                $ret.=' AND ';
+                $ret .= ' AND ';
             }
-            else if($this->children[$i] === 'or')
+            else if ($this->children[$i] === 'or')
             {
-                $ret.=' OR ';
+                $ret .= ' OR ';
             }
             else
             {
-                $ret.=$this->children[$i]->to_sql_string();
+                $ret .= $this->children[$i]->to_sql_string();
             }
         }
         return $ret.$this->sqlAppend;
@@ -69,19 +69,19 @@ 
         $ret = '';
         $count = count($this->children);
         $prefix = '';
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->children[$i] === 'and')
+            if ($this->children[$i] === 'and')
             {
-                if($prefix == '|')
+                if ($prefix == '|')
                 {
                     throw new \Exception('Do not support both and or');
                 }
                 $prefix = '&';
             }
-            else if($this->children[$i] === 'or')
+            else if ($this->children[$i] === 'or')
             {
-                if($prefix == '&')
+                if ($prefix == '&')
                 {
                     throw new \Exception('Do not support both and or');
                 }
@@ -89,10 +89,10 @@ 
             }
             else
             {
-                $ret.=$this->children[$i]->to_ldap_string();
+                $ret .= $this->children[$i]->to_ldap_string();
             }
         }
-        if($count === 1 && $prefix === '')
+        if ($count === 1 && $prefix === '')
         {
             return $ret;
         }
@@ -103,14 +103,14 @@ 
     {
         $ret = array();
         $count = count($this->children);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->children[$i] === 'and')
+            if ($this->children[$i] === 'and')
             {
                 $old = array_pop($ret);
                 array_push($ret, array('$and'=>array($old, $this->children[++$i]->to_mongo_filter())));
             }
-            else if($this->children[$i] === 'or')
+            else if ($this->children[$i] === 'or')
             {
                 $old = array_pop($ret);
                 array_push($ret, array('$or'=>array($old, $this->children[++$i]->to_mongo_filter())));
@@ -120,7 +120,7 @@ 
                 array_push($ret, $this->children[$i]->to_mongo_filter());
             }
         }
-        if(count($ret) == 1 && is_array($ret[0]))
+        if (count($ret) == 1 && is_array($ret[0]))
         {
             //print_r(json_encode($ret[0])); die();
             return $ret[0];
@@ -131,27 +131,27 @@ 
     function filter_array(&$array)
     {
         $res = array();
-        if(is_array($array))
+        if (is_array($array))
         {
             $search = $array;
             $count = count($this->children);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->children[$i] === 'and')
+                if ($this->children[$i] === 'and')
                 {
                     $search = $res;
                 }
-                else if($this->children[$i] === 'or')
+                else if ($this->children[$i] === 'or')
                 {
                     $search = $array;
                 }
                 else
                 {
-                    foreach($search as $subarray)
+                    foreach ($search as $subarray)
                     {
-                        if(isset($subarray[$this->children[$i]->var1]))
+                        if (isset($subarray[$this->children[$i]->var1]))
                         {
-                            if($this->children[$i]->php_compare($subarray[$this->children[$i]->var1]))
+                            if ($this->children[$i]->php_compare($subarray[$this->children[$i]->var1]))
                             {
                                 array_push($res, $subarray);
                             }
@@ -171,10 +171,10 @@ 
     public function getClause($substr)
     {
         $count = count($this->children);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(!is_object($this->children[$i])) continue;
-            if(strstr($this->children[$i]->var1, $substr) !== false ||
+            if (!is_object($this->children[$i])) continue;
+            if (strstr($this->children[$i]->var1, $substr) !== false ||
                strstr($this->children[$i]->var2, $substr) !== false)
             {
                 return $this->children[$i];
@@ -184,17 +184,17 @@ 
 
     public function addToSQLString($string)
     {
-        $this->sqlAppend.=$string;
+        $this->sqlAppend .= $string;
     }
 
     public function appendChild($child)
     {
-        if($child === 'and' || $child === 'or')
+        if ($child === 'and' || $child === 'or')
         {
             array_push($this->children, $child);
             return;
         }
-        else if(is_a($child, '\Data\Filter'))
+        else if (is_a($child, '\Data\Filter'))
         {
             $this->children = array_merge($this->children, $child->children);
         }

Braces +20 added lines, -25 removed lines

@@ -30,11 +30,15 @@ 
             return array(new FilterClause($string));
         }
         $children = array();
-        if($parens) array_push($children, '(');
+        if($parens) {
+            array_push($children, '(');
+        }
         $children = array_merge($children, self::process_string($clauses[1]));
         array_push($children, trim($clauses[2]));
         $children = array_merge($children, self::process_string($clauses[3]));
-        if($parens) array_push($children, ')');
+        if($parens) {
+            array_push($children, ')');
+        }
         return $children;
     }
 
@@ -47,16 +51,13 @@ 
             if($this->children[$i] === '(' || $this->children[$i] === ')')
             {
                 $ret.=$this->children[$i];
-            }
-            else if($this->children[$i] === 'and')
+            } else if($this->children[$i] === 'and')
             {
                 $ret.=' AND ';
-            }
-            else if($this->children[$i] === 'or')
+            } else if($this->children[$i] === 'or')
             {
                 $ret.=' OR ';
-            }
-            else
+            } else
             {
                 $ret.=$this->children[$i]->to_sql_string();
             }
@@ -78,16 +79,14 @@ 
                     throw new \Exception('Do not support both and or');
                 }
                 $prefix = '&';
-            }
-            else if($this->children[$i] === 'or')
+            } else if($this->children[$i] === 'or')
             {
                 if($prefix == '&')
                 {
                     throw new \Exception('Do not support both and or');
                 }
                 $prefix = '|';
-            }
-            else
+            } else
             {
                 $ret.=$this->children[$i]->to_ldap_string();
             }
@@ -109,13 +108,11 @@ 
             {
                 $old = array_pop($ret);
                 array_push($ret, array('$and'=>array($old, $this->children[++$i]->to_mongo_filter())));
-            }
-            else if($this->children[$i] === 'or')
+            } else if($this->children[$i] === 'or')
             {
                 $old = array_pop($ret);
                 array_push($ret, array('$or'=>array($old, $this->children[++$i]->to_mongo_filter())));
-            }
-            else
+            } else
             {
                 array_push($ret, $this->children[$i]->to_mongo_filter());
             }
@@ -140,12 +137,10 @@ 
                 if($this->children[$i] === 'and')
                 {
                     $search = $res;
-                }
-                else if($this->children[$i] === 'or')
+                } else if($this->children[$i] === 'or')
                 {
                     $search = $array;
-                }
-                else
+                } else
                 {
                     foreach($search as $subarray)
                     {
@@ -173,7 +168,9 @@ 
         $count = count($this->children);
         for($i = 0; $i < $count; $i++)
         {
-            if(!is_object($this->children[$i])) continue;
+            if(!is_object($this->children[$i])) {
+                continue;
+            }
             if(strstr($this->children[$i]->var1, $substr) !== false ||
                strstr($this->children[$i]->var2, $substr) !== false)
             {
@@ -193,12 +190,10 @@ 
         {
             array_push($this->children, $child);
             return;
-        }
-        else if(is_a($child, '\Data\Filter'))
+        } else if(is_a($child, '\Data\Filter'))
         {
             $this->children = array_merge($this->children, $child->children);
-        }
-        else
+        } else
         {
             $this->children = array_merge($this->children, self::process_string($child));
         }

Data/class.MongoDataTable.php

Spacing +24 added lines, -24 removed lines

@@ -6,9 +6,9 @@ 
     protected $collection;
     protected $namespace;
 
-    function __construct($collection, $collection_name=false)
+    function __construct($collection, $collection_name = false)
     {
-        if($collection_name !== false)
+        if ($collection_name !== false)
         {
             $this->namespace = $collection.'.'.$collection_name;
         }
@@ -18,12 +18,12 @@ 
         }
     }
 
-    function count($filter=false)
+    function count($filter = false)
     {
         $criteria = array();
-        if($filter !== false)
+        if ($filter !== false)
         {
-            if($filter instanceof \Data\Filter)
+            if ($filter instanceof \Data\Filter)
             {
                 $criteria = $filter->to_mongo_filter();
             }
@@ -35,13 +35,13 @@ 
         return $this->collection->count($criteria);
     }
 
-    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)
     {
         $fields   = array();
         $criteria = array();
-        if($filter !== false)
+        if ($filter !== false)
         {
-            if(is_array($filter))
+            if (is_array($filter))
             {
                 $criteria = $filter;
             }
@@ -50,29 +50,29 @@ 
                 $criteria = $filter->to_mongo_filter();
             }
         }
-        if($select !== false)
+        if ($select !== false)
         {
             $fields = array_fill_keys($select, 1);
         }
-        $cursor   = $this->collection->find($criteria, $fields);
-        if($params !== false && isset($params['fields']))
+        $cursor = $this->collection->find($criteria, $fields);
+        if ($params !== false && isset($params['fields']))
         {
             $cursor->fields($params['fields']);
         }
-        if($sort  !== false)
+        if ($sort !== false)
         {
             $cursor->sort($sort);
         }
-        if($skip  !== false)
+        if ($skip !== false)
         {
             $cursor->skip($skip);
         }
-        if($count !== false)
+        if ($count !== false)
         {
             $cursor->limit($count);
         }
-        $ret      = array();
-        foreach($cursor as $doc)
+        $ret = array();
+        foreach ($cursor as $doc)
         {
             array_push($ret, $doc);
         }
@@ -82,7 +82,7 @@ 
     function create($data)
     {
         $res = $this->collection->insert($data);
-        if($res === false || $res['err'] !== null)
+        if ($res === false || $res['err'] !== null)
         {
             return false;
         }
@@ -92,9 +92,9 @@ 
     function update($filter, $data)
     {
         $criteria = array();
-        if($filter !== false)
+        if ($filter !== false)
         {
-            if(is_array($filter))
+            if (is_array($filter))
             {
                 $criteria = $filter;
             }
@@ -103,12 +103,12 @@ 
                 $criteria = $filter->to_mongo_filter();
             }
         }
-        if(isset($data['_id']))
+        if (isset($data['_id']))
         {
             unset($data['_id']);
         }
         $res = $this->collection->update($criteria, array('$set' => $data));
-        if($res === false || $res['err'] !== null)
+        if ($res === false || $res['err'] !== null)
         {
             return false;
         }
@@ -118,9 +118,9 @@ 
     function delete($filter)
     {
         $criteria = array();
-        if($filter !== false)
+        if ($filter !== false)
         {
-            if(is_array($filter))
+            if (is_array($filter))
             {
                 $criteria = $filter;
             }
@@ -130,7 +130,7 @@ 
             }
         }
         $res = $this->collection->remove($criteria);
-        if($res === false || $res['err'] !== null)
+        if ($res === false || $res['err'] !== null)
         {
             return false;
         }

Braces +5 added lines, -10 removed lines

@@ -11,8 +11,7 @@ 
         if($collection_name !== false)
         {
             $this->namespace = $collection.'.'.$collection_name;
-        }
-        else
+        } else
         {
             $this->collection = $collection;
         }
@@ -26,8 +25,7 @@ 
             if($filter instanceof \Data\Filter)
             {
                 $criteria = $filter->to_mongo_filter();
-            }
-            else
+            } else
             {
                 $criteria = $filter;
             }
@@ -44,8 +42,7 @@ 
             if(is_array($filter))
             {
                 $criteria = $filter;
-            }
-            else
+            } else
             {
                 $criteria = $filter->to_mongo_filter();
             }
@@ -97,8 +94,7 @@ 
             if(is_array($filter))
             {
                 $criteria = $filter;
-            }
-            else
+            } else
             {
                 $criteria = $filter->to_mongo_filter();
             }
@@ -123,8 +119,7 @@ 
             if(is_array($filter))
             {
                 $criteria = $filter;
-            }
-            else
+            } else
             {
                 $criteria = $filter->to_mongo_filter();
             }

Data/class.MongoDataSet.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         $collections = $this->db->getCollectionNames();
         if(in_array($name, $collections))
         {
-             return true;
+                return true;
         }
         return false;
     }

Spacing +11 added lines, -11 removed lines

@@ -11,14 +11,14 @@ 
     {
         $namespace = substr($classname, 0, $lastNsPos);
         $classname = substr($classname, $lastNsPos + 1);
-        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
     }
-    if(strlen($namespace))
+    if (strlen($namespace))
     {
-        $namespace.=DIRECTORY_SEPARATOR;
+        $namespace .= DIRECTORY_SEPARATOR;
     }
     $filename = __DIR__.'/../libs/mongofill/src/'.$namespace.$classname.'.php';
-    if(is_readable($filename))
+    if (is_readable($filename))
     {
         require $filename;
     }
@@ -37,18 +37,18 @@ 
         $this->mangaer = null;
         $this->db = null;
         $this->db_name = null;
-        if(class_exists('MongoClient'))
+        if (class_exists('MongoClient'))
         {
             $this->setupMongoClient($params);
         }
-        else if(class_exists('\MongoDB\Driver\Manager'))
+        else if (class_exists('\MongoDB\Driver\Manager'))
         {
             $this->setupMongoManager($params);
         }
         else
         {
             require __DIR__.'/../libs/mongofill/src/functions.php';
-            if(version_compare(PHP_VERSION, '5.3.0', '>='))
+            if (version_compare(PHP_VERSION, '5.3.0', '>='))
             {
                 spl_autoload_register('\Data\MongofillAutoload', true, true);
             }
@@ -63,7 +63,7 @@ 
     function tableExists($name)
     {
         $collections = $this->db->getCollectionNames();
-        if(in_array($name, $collections))
+        if (in_array($name, $collections))
         {
              return true;
         }
@@ -72,7 +72,7 @@ 
 
     function getTable($name)
     {
-        if($this->db !== null)
+        if ($this->db !== null)
         {
             return new MongoDataTable($this->db->selectCollection($name));
         }
@@ -84,7 +84,7 @@ 
 
     private function setupMongoClient($params)
     {
-        if(isset($params['user']))
+        if (isset($params['user']))
         {
             $this->client = new \MongoClient('mongodb://'.$params['host'].'/'.$params['db'], array('username'=>$params['user'], 'password'=>$params['pass']));
         }
@@ -97,7 +97,7 @@ 
 
     private function setupMongoManager($params)
     {
-        if(isset($params['user']))
+        if (isset($params['user']))
         {
             $this->manager = new \MongoDB\Driver\Manager('mongodb://'.$params['user'].':'.$params['pass'].'@'.$params['host'].'/'.$params['db']);
         }

Braces +6 added lines, -12 removed lines

@@ -40,19 +40,16 @@ 
         if(class_exists('MongoClient'))
         {
             $this->setupMongoClient($params);
-        }
-        else if(class_exists('\MongoDB\Driver\Manager'))
+        } else if(class_exists('\MongoDB\Driver\Manager'))
         {
             $this->setupMongoManager($params);
-        }
-        else
+        } else
         {
             require __DIR__.'/../libs/mongofill/src/functions.php';
             if(version_compare(PHP_VERSION, '5.3.0', '>='))
             {
                 spl_autoload_register('\Data\MongofillAutoload', true, true);
-            }
-            else
+            } else
             {
                 spl_autoload_register('\Data\MongofillAutoload');
             }
@@ -75,8 +72,7 @@ 
         if($this->db !== null)
         {
             return new MongoDataTable($this->db->selectCollection($name));
-        }
-        else
+        } else
         {
             return new MongoDataTable($this->db_name, $name);
         }
@@ -87,8 +83,7 @@ 
         if(isset($params['user']))
         {
             $this->client = new \MongoClient('mongodb://'.$params['host'].'/'.$params['db'], array('username'=>$params['user'], 'password'=>$params['pass']));
-        }
-        else
+        } else
         {
             $this->client = new \MongoClient('mongodb://'.$params['host'].'/'.$params['db']);
         }
@@ -100,8 +95,7 @@ 
         if(isset($params['user']))
         {
             $this->manager = new \MongoDB\Driver\Manager('mongodb://'.$params['user'].':'.$params['pass'].'@'.$params['host'].'/'.$params['db']);
-        }
-        else
+        } else
         {
             $this->manager = new \MongoDB\Driver\Manager('mongodb://'.$params['host'].'/'.$params['db']);
         }

class.JsonSerializable.php

Spacing +1 added lines, -1 removed lines

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

class.WebPage.php

Indentation +9 added lines, -9 removed lines

@@ -247,15 +247,15 @@
      */
     protected function printIeCompatability($prefix='')
     {
-       //IE 8 doesn't support HTML 5. Install the shim...
-       if($this->getBrowserMajorVer() < 9)
-       {
-           echo $prefix.'<script src="js/html5.js"></script>';
-           echo "\n";
-       }
-       //Tell the browser not to use compatability mode...
-       echo $prefix.'<meta http-equiv="X-UA-Compatible" content="IE=edge"/>';
-       echo "\n";
+        //IE 8 doesn't support HTML 5. Install the shim...
+        if($this->getBrowserMajorVer() < 9)
+        {
+            echo $prefix.'<script src="js/html5.js"></script>';
+            echo "\n";
+        }
+        //Tell the browser not to use compatability mode...
+        echo $prefix.'<meta http-equiv="X-UA-Compatible" content="IE=edge"/>';
+        echo "\n";
     }
 
     /**

Spacing +24 added lines, -24 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
         if($browserName === 'IE' && $this->getBrowserMajorVer() <= 7)
         {
             header( 'Location: /badbrowser.php' ) ;
-        }
-        else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
+        } else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
         {
             $this->importSupport = true;
         }