BurningFlipside / CommonCode

class.ODataParams.php

Braces +3 added lines, -6 removed lines

@@ -15,8 +15,7 @@ 
         if(isset($params['filter']))
         {
             $this->filter = new \Data\Filter($params['filter']);
-        }
-        else if(isset($params['$filter']))
+        } else if(isset($params['$filter']))
         {
             $this->filter = new \Data\Filter($params['$filter']);
         }
@@ -29,8 +28,7 @@ 
         if(isset($params['select']))
         {
             $this->select = explode(',',$params['select']);
-        }
-        else if(isset($params['$select']))
+        } else if(isset($params['$select']))
         {
             $this->select = explode(',',$params['$select']);
         }
@@ -47,8 +45,7 @@ 
                 {
                     //Default to assending
                     $this->orderby[$exp[0]] = 1;
-                }
-                else
+                } else
                 {
                     switch($exp[1])
                     {

Auth/class.PendingUser.php

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
             $args['RawMessage'] = array();
             $args['RawMessage']['Data'] = base64_encode($email->getRawMessage());
             return $this->ses->sendRawEmail($args);
-        }
-        else
+        } else
         {
             $args = array();
             $args['Source'] = $email->getFromAddress();

Auth/class.FlipsideAPIUser.php

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
             $args['RawMessage'] = array();
             $args['RawMessage']['Data'] = base64_encode($email->getRawMessage());
             return $this->ses->sendRawEmail($args);
-        }
-        else
+        } else
         {
             $args = array();
             $args['Source'] = $email->getFromAddress();

Auth/OAuth2/class.OAuth2Authenticator.php

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
             $args['RawMessage'] = array();
             $args['RawMessage']['Data'] = base64_encode($email->getRawMessage());
             return $this->ses->sendRawEmail($args);
-        }
-        else
+        } else
         {
             $args = array();
             $args['Source'] = $email->getFromAddress();

Autoload.php

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

class.EmailProvider.php

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
             $args['RawMessage'] = array();
             $args['RawMessage']['Data'] = base64_encode($email->getRawMessage());
             return $this->ses->sendRawEmail($args);
-        }
-        else
+        } else
         {
             $args = array();
             $args['Source'] = $email->getFromAddress();

Auth/class.LDAPUser.php

Braces +9 added lines, -13 removed lines

@@ -21,14 +21,12 @@ 
                 throw new \Exception('No such LDAP User!');
             }
             $this->ldapObj = $users[0];
-        }
-        else
+        } else
         {
             if(isset($data['extended']))
             {
                 $this->ldapObj = $data['extended'];
-            }
-            else
+            } else
             {
                 $this->ldapObj = $data;
             }
@@ -44,7 +42,9 @@ 
             {
                 $dn = explode(',', $array[$i]);
                 $res = $this->isInGroupNamed(substr($dn[0], 3));
-                if($res) return $res;
+                if($res) {
+                    return $res;
+                }
             }
         }
         return $res;
@@ -206,8 +206,7 @@ 
                 }
             }
             return $res;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -231,8 +230,7 @@ 
         if(!is_object($this->ldapObj))
         {
             return $this->setFieldLocal('userPassword',  $this->generateLDAPPass($password));
-        }
-        else
+        } else
         {
             $obj = array('dn'=>$this->ldapObj->dn);
             $obj['userPassword'] = $this->generateLDAPPass($password);
@@ -321,8 +319,7 @@ 
         if(!is_object($this->ldapObj))
         {
             return $this->setFieldLocal('uid', $uid);
-        }
-        else
+        } else
         {
             throw new \Exception('Unsupported!');
         }
@@ -416,8 +413,7 @@ 
         if(isset($ldapObj->userpassword))
         {
             $hash = hash('sha512', $ldapObj->dn.';'.$ldapObj->userpassword[0].';'.$ldapObj->mail[0]);
-        }
-        else
+        } else
         {
             $hash = hash('sha512', $ldapObj->dn.';'.openssl_random_pseudo_bytes(10).';'.$ldapObj->mail[0]);
         }

Data/class.MongoDataTable.php

Braces +2 added lines, -4 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;
             }

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