BurningFlipside / CommonCode

LDAP/class.LDAPObject.php

Braces +7 added lines, -4 removed lines

@@ -16,8 +16,12 @@ 
          $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]);
@@ -26,8 +30,7 @@ 
             if(is_array($value) && $value['count'] === 1)
             {
                 $ret[$key] = $value[0];
-            }
-            else
+            } else
             {
                 $ret[$key] = $value;
             }

LDAP/class.LDAPServer.php

Braces +6 added lines, -12 removed lines

@@ -132,8 +132,7 @@ 
         try
         {
             $res = ldap_bind($this->ds, $cn, $password);
-        }
-        catch(\Exception $ex)
+        } catch(\Exception $ex)
         {
             $this->ds = ldap_connect($this->connect);
             $res = @ldap_bind($this->ds, $cn, $password);
@@ -177,8 +176,7 @@ 
                         $entity[$keys[$i]][$j] = $array[$j];
                     }
                 }
-            }
-            else if($delete !== false && $entity[$keys[$i]] === null)
+            } else if($delete !== false && $entity[$keys[$i]] === null)
             {
                 $delete[$keys[$i]] = array();
                 unset($entity[$keys[$i]]);
@@ -225,20 +223,17 @@ 
             if($single === true)
             {
                 $sr = @ldap_read($this->ds, $baseDN, $filterStr);
-            }
-            else
+            } else
             {
                 if($attributes !== false)
                 {
                     $sr = @ldap_list($this->ds, $baseDN, $filterStr, $attributes);
-                }
-                else
+                } else
                 {
                     $sr = @ldap_list($this->ds, $baseDN, $filterStr);
                 }
             }
-        }
-        catch(\Exception $e)
+        } catch(\Exception $e)
         {
             throw new \Exception($e->getMessage().' '.$filterStr, $e->getCode(), $e);
         }
@@ -269,8 +264,7 @@ 
         try
         {
             $sr = ldap_list($this->ds, $baseDN, $filterStr, array('dn'));
-        }
-        catch(\Exception $e)
+        } catch(\Exception $e)
         {
             throw new \Exception($e->getMessage().' '.$filterStr, $e->getCode(), $e);
         }

class.DataSetFactory.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.AuthProvider.php

Braces +18 added lines, -6 removed lines

@@ -374,7 +374,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());
         }
@@ -413,7 +415,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)
@@ -442,7 +446,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)
@@ -474,7 +480,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)
@@ -504,7 +512,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)
@@ -534,7 +544,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)
             {

class.FlipsideMail.php

Braces +3 added lines, -6 removed lines

@@ -25,16 +25,14 @@ 
         if(isset($mail['from']))
         {
             $this->From = $mail['from'];
-        }
-        else
+        } else
         {
             $this->From = $this->Username;
         }
         if(isset($mail['from_name']))
         {
             $this->FromName = $mail['from_name'];
-        }
-        else
+        } else
         {
             $this->FromName = 'Burning Flipside';
         }
@@ -42,8 +40,7 @@ 
         if(is_array($mail['to']))
         {
             array_walk($mail['to'], 'FlipsideMail::addTo', $this);
-        }
-        else
+        } else
         {
             $this->addAddress($mail['to']);
         }

class.SerializableObject.php

Braces +5 added lines, -10 removed lines

@@ -59,8 +59,7 @@ 
             $xml->startElement('Array');
             $this->array2XML($xml, 'Entity', (array)$this);
             $xml->endElement();
-        }
-        else
+        } else
         {
             $this->object2XML($xml, $this);
         }
@@ -81,20 +80,17 @@ 
             if(is_array($value) || is_numeric($key))
             {
                 $this->array2XML($xml, $key, (array)$value);
-            }
-            else if(is_object($value))
+            } else if(is_object($value))
             {
                 $xml->startElement($key);
                 $this->object2XML($xml, $value);
 		$xml->endElement();
-            }
-            else
+            } else
             {
                 if($key[0] === '$')
                 {
                     $xml->writeElement(substr($key, 1), $value);
-                }
-                else
+                } else
                 {
                     $key = strtr($key, array(' '=>'', ','=>''));
                     $xml->writeElement($key, $value);
@@ -127,8 +123,7 @@ 
             if(is_object($value))
             {
                 $this->object2XML($xml, $value);
-            }
-            else if(is_array($value))
+            } else if(is_array($value))
             {
                 $this->array2XML($xml, $key, $value);
                 continue;

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.SQLUser.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();