BurningFlipside / CommonCode

Auth/class.GoogleAuthenticator.php

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
             $ret = $auth->activatePendingUser($user);

             if($ret === false)

             {

-                 throw new \Exception('Unable to create user! '.$res);

+                    throw new \Exception('Unable to create user! '.$res);

             }

             return self::SUCCESS;

         }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public function authenticate($code, &$currentUser = false)

     {

         $googleUser = false;

-        try{

+        try {

             $this->client->authenticate($code);

             $this->token = $this->client->getAccessToken();

             \FlipSession::setVar('GoogleToken', $this->token);

Braces +35 added lines, -30 removed lines

@@ -2,20 +2,20 @@ 
 namespace Auth;

 require_once('/var/www/common/libs/google/src/Google/autoload.php');

 

-class GoogleAuthenticator extends Authenticator

-{

+class GoogleAuthenticator extends Authenticator
+{
     protected $client;

     protected $token = null;

 

-    public function __construct($params)

-    {

+    public function __construct($params)
+    {
         parent::__construct($params);

-        if(!isset($params['client_secrets_path']))

-        {

+        if(!isset($params['client_secrets_path']))
+        {
             throw new \Exception('Missing required parameter client_secrets_path!');

         }

-        if(!isset($params['redirect_url']))

-        {

+        if(!isset($params['redirect_url']))
+        {
             $params['redirect_url'] = 'https://'.$_SERVER['HTTP_HOST'].'/oauth2callback.php?src=google';

         }

         $this->token = \FlipSession::getVar('GoogleToken', null);

@@ -25,60 +25,64 @@ 
         $this->client->setRedirectUri($params['redirect_url']);

     }

 

-    public function getSupplementLink()

-    {

+    public function getSupplementLink()
+    {
         $authUrl = $this->client->createAuthUrl();

         return '<a href="'.filter_var($authUrl, FILTER_SANITIZE_URL).'"><img src="/img/common/google_sign_in.png" style="width: 2em;"/></a>';

     }

 

-    public function authenticate($code, &$currentUser = false)

-    {

+    public function authenticate($code, &$currentUser = false)
+    {
         $googleUser = false;

-        try{

+        try
+        {
             $this->client->authenticate($code);

             $this->token = $this->client->getAccessToken();

             \FlipSession::setVar('GoogleToken', $this->token);

             $oauth2Service = new \Google_Service_Oauth2($this->client);

             $googleUser = $oauth2Service->userinfo->get();

-        } catch(\Exception $ex) {

+        }
+        catch(\Exception $ex)
+        {
             return self::LOGIN_FAILED;

         }

 

         $auth = \AuthProvider::getInstance();

         $localUsers = $auth->getUsersByFilter(new \Data\Filter('mail eq '.$googleUser->email));

-        if($localUsers !== false && isset($localUsers[0]))

-        {

-            if($localUsers[0]->canLoginWith('google.com'))

-            {

+        if($localUsers !== false && isset($localUsers[0]))
+        {
+            if($localUsers[0]->canLoginWith('google.com'))
+            {
                 $auth->impersonateUser($localUsers[0]);

                 return self::SUCCESS;

             }

             $currentUser = $localUsers[0];

             return self::ALREADY_PRESENT;

-        }

-        else

-        {

+        }
+        else
+        {
             $user = new PendingUser();

             $user->setEmail($googleUser->email);

             $user->setGivenName($googleUser->givenName);

             $user->setLastName($googleUser->familyName);

             $user->addLoginProvider('google.com');

             $ret = $auth->activatePendingUser($user);

-            if($ret === false)

-            {

+            if($ret === false)
+            {
                  throw new \Exception('Unable to create user! '.$res);

             }

             return self::SUCCESS;

         }

     }

 

-    public function getUser($data = false)

-    {

-        if($data === false)

-        {

+    public function getUser($data = false)
+    {
+        if($data === false)
+        {
             $data = $this->token;

         }

-        try {

+        try
+        {
             $this->client->setAccessToken($data);

             $oauth2Service = new \Google_Service_Oauth2($this->client);

             $googleUser = $oauth2Service->userinfo->get();

@@ -89,8 +93,9 @@ 
             $profileUser['displayName'] = $googleUser->name;

             $profileUser['jpegPhoto'] = base64_encode(file_get_contents($googleUser->picture));

             return $profileUser;

-        } catch(\Exception $e)

-        {

+        }
+        catch(\Exception $e)
+        {
             return false;

         }

     }

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 +3 added lines, -3 removed lines

@@ -7,15 +7,15 @@
     $classname = ltrim($classname, '\\');
     $filename  = '';
     $namespace = '';
-    if ($lastNsPos = strrpos($classname, '\\'))
+    if($lastNsPos = strrpos($classname, '\\'))
     {
         $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))
     {
-        $namespace.=DIRECTORY_SEPARATOR;
+        $namespace .= DIRECTORY_SEPARATOR;
     }
     $filename = __DIR__.'/../libs/mongofill/src/'.$namespace.$classname.'.php';
     if(is_readable($filename))

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 +10 added lines, -10 removed lines

@@ -60,7 +60,7 @@ 
         $browserName = $this->getBrowserName();
         if($browserName === 'IE' && $this->getBrowserMajorVer() <= 7)
         {
-            header( 'Location: /badbrowser.php' ) ;
+            header('Location: /badbrowser.php');
         }
         else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
         {
@@ -89,7 +89,7 @@ 
      */
     private function getBrowser()
     {
-        static $browser;//No accident can arise from depending on an unset variable.
+        static $browser; //No accident can arise from depending on an unset variable.
         if(!isset($browser))
         {
             $browser = $this->browscap->getBrowser();
@@ -190,16 +190,16 @@ 
      *
      * @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)
         {
-            $tag.=' '.$attribName;
+            $tag .= ' '.$attribName;
             if($attribs[$attribName])
             {
-                $tag.='="'.$attribs[$attribName].'"';
+                $tag .= '="'.$attribs[$attribName].'"';
             }
         }
         if($selfClose)
@@ -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,7 +245,7 @@ 
      *
      * @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)
@@ -263,7 +263,7 @@ 
      *
      * @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')
@@ -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";
@@ -321,7 +321,7 @@ 
         {
             $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: */

Email/class.AmazonSES.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
             'version' => 'latest',
             'region'  => 'us-west-2',
             'credentials' => $credentials
-         ]);
+            ]);
     }
 
     public function canSend()

LDAP/class.LDAPObject.php

Indentation +14 added lines, -14 removed lines

@@ -3,19 +3,19 @@ 
 
 class LDAPObject extends \SerializableObject
 {
-     public $server;
+        public $server;
 
-     function __construct($array=false, $server=false)
-     {
-         parent::__construct($array);
-         $this->server = $server;
-     }
+        function __construct($array=false, $server=false)
+        {
+            parent::__construct($array);
+            $this->server = $server;
+        }
 
-     public function jsonSerialize()
-     {
-         $ret = array();
-         foreach ($this as $key => $value)
-         {
+        public function jsonSerialize()
+        {
+            $ret = array();
+            foreach ($this as $key => $value)
+            {
             if($key === 'server' || $key === 'count') continue;
             if(is_numeric($key)) continue;
             if($key === 'jpegphoto')
@@ -31,9 +31,9 @@ 
             {
                 $ret[$key] = $value;
             }
-         }
-         return $ret;
-     }
+            }
+            return $ret;
+        }
 }
 
 ?>

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
 {
      public $server;
 
-     function __construct($array=false, $server=false)
+     function __construct($array = false, $server = false)
      {
          parent::__construct($array);
          $this->server = $server;
@@ -14,7 +14,7 @@ 
      public function jsonSerialize()
      {
          $ret = array();
-         foreach ($this as $key => $value)
+         foreach($this as $key => $value)
          {
             if($key === 'server' || $key === 'count') continue;
             if(is_numeric($key)) continue;

Braces +8 added lines, -2 removed lines

@@ -16,8 +16,14 @@
          $ret = array();
          foreach ($this as $key => $value)
          {
-            if($key === 'server' || $key === 'count') continue;
-            if(is_numeric($key)) continue;
+            if($key === 'server' || $key === 'count')
+            {
+                continue;
+            }
+            if(is_numeric($key))
+            {
+                continue;
+            }
             if($key === 'jpegphoto')
             {
                 $ret[$key] = base64_encode($value[0]);

Auth/class.User.php

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()
     {

Spacing +10 added lines, -10 removed lines

@@ -308,9 +308,9 @@ 
      */
     public 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,7 +354,7 @@ 
      *
      * @return true|false true if the user's password was changed, false otherwise
      */
-    public function change_pass($oldpass, $newpass, $isHash=false)
+    public function change_pass($oldpass, $newpass, $isHash = false)
     {
         if($isHash === false && $this->validate_password($oldpass) === false)
         {
@@ -793,17 +793,17 @@ 
     public function getVcard()
     {
         $ret = "BEGIN:VCARD\nVERSION:2.1\n";
-        $ret.= 'N:'.$this->getLastName().';'.$this->getGivenName()."\n";
-        $ret.= 'FN:'.$this->getGivenName()."\n";
+        $ret .= 'N:'.$this->getLastName().';'.$this->getGivenName()."\n";
+        $ret .= 'FN:'.$this->getGivenName()."\n";
         $titles = $this->getTitles();
         if($titles !== false)
         {
-            $ret.= 'TITLE:'.implode(',', $titles)."\n";
+            $ret .= 'TITLE:'.implode(',', $titles)."\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 .= "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 +8 added lines, -2 removed lines

@@ -280,11 +280,17 @@
     public 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;
     }

Auth/class.SQLUser.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     {
         if(isset($this->data['mail']))
         {
-             return $this->data['mail'];
+                return $this->data['mail'];
         }
         return $this->getUid();
     }

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     private $data;
     private $auth;
 
-    function __construct($data=false, $auth=false)
+    function __construct($data = false, $auth = false)
     {
         $this->data = array();
         $this->auth = $auth;

class.FlipREST.php

Spacing +4 added lines, -4 removed lines

@@ -116,7 +116,7 @@ 
 
     private function createCSV(&$array)
     {
-        if (count($array) == 0)
+        if(count($array) == 0)
         {
             return null;
         }
@@ -135,7 +135,7 @@ 
                 $keys = array_keys(get_object_vars($first));
             }
             fputcsv($df, $keys);
-            foreach ($array as $row)
+            foreach($array as $row)
             {
                 if(is_array($row))
                 {
@@ -287,12 +287,12 @@ 
         $this->error($errorHandler);
     }
 
-    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 +2 added lines, -2 removed lines

@@ -75,8 +75,8 @@
         if(!isset($this->headers['Authorization']))
         {
             $this->app->user = $this->getUserFromSession();
-        } 
-        else 
+        }
+        else
         {
             $header = $this->headers['Authorization'];
             $this->app->user = $this->getUserFromHeader($header);

class.ODataParams.php

Spacing +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
     {
         if(isset($params['$expand']))
         {
-            $this->expand = explode(',',$params['$expand']);
+            $this->expand = explode(',', $params['$expand']);
         }
     }
 
@@ -74,11 +74,11 @@ 
     {
         if(isset($params['select']))
         {
-            $this->select = explode(',',$params['select']);
+            $this->select = explode(',', $params['select']);
         }
         else if(isset($params['$select']))
         {
-            $this->select = explode(',',$params['$select']);
+            $this->select = explode(',', $params['$select']);
         }
     }
 
@@ -87,11 +87,11 @@ 
         if(isset($params['$orderby']))
         {
             $this->orderby = array();
-            $orderby = explode(',',$params['$orderby']);
+            $orderby = explode(',', $params['$orderby']);
             $count = count($orderby);
             for($i = 0; $i < $count; $i++)
             {
-                $exp = explode(' ',$orderby[$i]);
+                $exp = explode(' ', $orderby[$i]);
                 if(count($exp) === 1)
                 {
                     //Default to assending