BurningFlipside / CommonCode

Auth/class.User.php

Spacing +42 added lines, -42 removed lines

@@ -128,26 +128,26 @@ 
     public function getTitleNames()
     {
         $titles = $this->getTitles();
-        if($titles === false)
+        if ($titles === false)
         {
             return false;
         }
-        if(self::$titlenames === null)
+        if (self::$titlenames === null)
         {
             $dataSet = \DataSetFactory::getDataSetByName('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 @@ 
     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++)
+        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 @@ 
      */
     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,17 +354,17 @@ 
      *
      * @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)
+        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);
         }
@@ -605,14 +605,14 @@ 
      */
     private function editUserPassword($data)
     {
-        if(isset($data->password))
+        if (isset($data->password))
         {
-            if(isset($data->oldpass))
+            if (isset($data->oldpass))
             {
                 $this->change_pass($data->oldpass, $data->password);
                 unset($data->oldpass);
             }
-            else if(isset($data->hash))
+            else if (isset($data->hash))
             {
                 $this->change_pass($data->hash, $data->password, true);
                 unset($data->hash);
@@ -623,22 +623,22 @@ 
 
     private function editNames($data)
     {
-        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->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);
@@ -647,17 +647,17 @@ 
 
     private function checkForUnsettableElements($data)
     {
-        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!');
             }
@@ -667,27 +667,27 @@ 
 
     private function editAddressElements($data)
     {
-        if(isset($data->postalAddress))
+        if (isset($data->postalAddress))
         {
             $this->setAddress($data->postalAddress);
             unset($data->postalAddress);
         }
-        if(isset($data->l))
+        if (isset($data->l))
         {
             $this->setCity($data->l);
             unset($data->l);
         }
-        if(isset($data->st))
+        if (isset($data->st))
         {
             $this->setState($data->st);
             unset($data->st);
         }
-        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);
@@ -696,17 +696,17 @@ 
 
     private function editOrganizationElements($data)
     {
-        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->ou))
+        if (isset($data->ou))
         {
             $this->setOrganizationUnits($data->ou);
             unset($data->ou);
@@ -730,12 +730,12 @@ 
         $this->editAddressElements($data);
         $this->editOrganizationElements($data);
 
-        if(isset($data->jpegPhoto))
+        if (isset($data->jpegPhoto))
         {
             $this->setPhoto(base64_decode($data->jpegPhoto));
             unset($data->jpegPhoto);
         }
-        if(isset($data->mobile))
+        if (isset($data->mobile))
         {
             $this->setPhoneNumber($data->mobile);
             unset($data->mobile);
@@ -790,13 +790,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 @@ 
     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;
     }
@@ -611,8 +615,7 @@ 
             {
                 $this->change_pass($data->oldpass, $data->password);
                 unset($data->oldpass);
-            }
-            else if(isset($data->hash))
+            } else if(isset($data->hash))
             {
                 $this->change_pass($data->hash, $data->password, true);
                 unset($data->hash);