BurningFlipside / CommonCode

Auth/class.LDAPGroup.php

Braces +13 added lines, -21 removed lines

@@ -3,8 +3,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');
 }
@@ -85,8 +84,7 @@ 
                 {
                     $members = array_merge($members, $child->members());
                 }
-            }
-            else
+            } else
             {
                 array_push($members, $rawMembers[$i]);
             }
@@ -130,12 +128,10 @@ 
                 {
                     $members = array_merge($members, $child->members());
                 }
-            }
-            else if($includeGroups === false && strncmp($rawMembers[$i], 'cn=', 3) === 0)
+            } else if($includeGroups === false && strncmp($rawMembers[$i], 'cn=', 3) === 0)
             {
                 //Drop this member
-            }
-            else
+            } else
             {
                 array_push($members, $rawMembers[$i]);
             }
@@ -167,8 +163,7 @@ 
             if(strncmp($members[$i], "uid=", 4) == 0)
             {
                 $userFilter.='(!('.$dnComps[0].'))';
-            }
-            else
+            } else
             {
                 $groupFilter.='(!('.$dnComps[0].'))';
             }
@@ -179,7 +174,9 @@ 
         $count = count($groups);
         for($i = 0; $i < $count; $i++)
         {
-            if($groups[$i] === false || $groups[$i] === null) continue;
+            if($groups[$i] === false || $groups[$i] === null) {
+                continue;
+            }
             array_push($data, new LDAPGroup($groups[$i]));
         }
         $users = $this->server->read($this->server->user_base, $userFilter, false, $select);
@@ -196,12 +193,10 @@ 
         if(isset($this->ldapObj['member']))
         {
             $this->ldapObj['member'] = array();
-        }
-        else if(isset($this->ldapObj['uniquemember']))
+        } else if(isset($this->ldapObj['uniquemember']))
         {
             $this->ldapObj['uniquemember'] = array();
-        }
-        else if(isset($this->ldapObj['memberuid']))
+        } else if(isset($this->ldapObj['memberuid']))
         {
             $this->ldapObj['memberuid'] = array();
         }
@@ -213,8 +208,7 @@ 
         if($isGroup)
         {
             $dn = 'cn='.$name.','.$this->server->group_base;
-        }
-        else
+        } else
         {
             $dn = 'uid='.$name.','.$this->server->user_base;
         }
@@ -231,8 +225,7 @@ 
                 throw new \Exception('Unable to add a group as a child of this group type');
             }
             array_push($rawMembers, $name);
-        }
-        else
+        } else
         {
             array_push($rawMembers, $dn);
         }
@@ -243,8 +236,7 @@ 
             $obj = array('dn'=>$this->ldapObj->dn);
             $obj[$propName] = $rawMembers;
             return $this->server->update($obj);
-        }
-        else
+        } else
         {
             return true;
         }

Auth/class.LDAPCachableObject.php

Braces +6 added lines, -7 removed lines

@@ -8,12 +8,13 @@ 
         try
         {
             return $this->server->update($obj);
-        }
-        catch(\Exception $ex)
+        } catch(\Exception $ex)
         {
             $auth = \AuthProvider::getInstance();
             $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator');
-            if($ldap === false) return false;
+            if($ldap === false) {
+                return false;
+            }
             $this->server = $ldap->get_and_bind_server(true);
             return $this->server->update($obj);
         }
@@ -116,8 +117,7 @@ 
         if($fieldValue !== null && strlen($fieldValue) > 0)
         {
             $obj[$fieldName] = $fieldValue;
-        }
-        else
+        } else
         {
             $obj[$fieldName] = null;
         }
@@ -134,8 +134,7 @@ 
             $obj[$fieldName] = $this->ldapObj->{$fieldName};
             $obj[$fieldName][$obj[$fieldName]['count']] = $fieldValue;
             $obj[$fieldName]['count']++;
-        }
-        else
+        } else
         {
             $obj[$fieldName] = $fieldValue;
         }

class.AuthProvider.php

Braces +19 added lines, -8 removed lines

@@ -21,8 +21,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');
 }
@@ -381,7 +380,9 @@ 
         $count = count($this->methods);
         for($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if($this->methods[$i]->supplement === false) {
+                continue;
+            }
 
             array_push($ret, $this->methods[$i]->getSupplementLink());
         }
@@ -420,7 +421,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if($this->methods[$i]->pending === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->getTempUserByHash($hash);
                 if($ret !== false)
@@ -449,7 +452,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if($this->methods[$i]->pending === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->createPendingUser($user);
                 if($ret !== false)
@@ -481,7 +486,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if($this->methods[$i]->current === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->activatePendingUser($user);
                 if($ret !== false)
@@ -511,7 +518,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if($this->methods[$i]->current === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->getUserByResetHash($hash);
                 if($ret !== false)
@@ -541,7 +550,9 @@ 
         $count = count($this->methods);
         for($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if($this->methods[$i]->supplement === false) {
+                continue;
+            }
 
             if($this->methods[$i]->getHostName() === $host)
             {