BurningFlipside / CommonCode

Data/class.SQLDataTable.php

Braces +3 added lines, -6 removed lines

@@ -38,13 +38,11 @@ 
                 if(isset($this->data[$array[$i][$key]][0]))
                 {
                     array_push($this->data[$array[$i][$key]], $array[$i]);
-                }
-                else
+                } else
                 {
                     $this->data[$array[$i][$key]] = array($array[$i]);
                 }
-            }
-            else
+            } else
             {
                 $this->data[$array[$i][$key]] = $array[$i];
             }
@@ -66,8 +64,7 @@ 
         if($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)']))
         {
              return false;
-        }
-        else
+        } else
         {
              return $ret[0]['COUNT(*)'];
         }

Data/class.FilterClause.php

Braces +4 added lines, -3 removed lines

@@ -9,7 +9,9 @@ 
 
     function __construct($string=false)
     {
-        if($string !== false) $this->process_filter_string($string);
+        if($string !== false) {
+            $this->process_filter_string($string);
+        }
     }
 
     static function str_startswith($haystack, $needle)
@@ -126,8 +128,7 @@ 
                 if($case)
                 {
                     return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i')));
-                }
-                else
+                } else
                 {
                     return array($field=>$this->var2);
                 }

class.FlipPage.php

Braces +6 added lines, -7 removed lines

@@ -19,8 +19,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');
 }
@@ -404,8 +403,7 @@ 
             {
                 $this->addLink('Login', $this->loginUrl);
             }
-        }
-        else
+        } else
         {
             $this->add_links();
             $this->addLink('Logout', $this->logoutUrl);
@@ -423,7 +421,9 @@ 
      */
     private function setupVars()
     {
-        if($this->minified !== null && $this->cdn !== null) return;
+        if($this->minified !== null && $this->cdn !== null) {
+            return;
+        }
         $this->minified = 'min';
         $this->cdn      = 'cdn';
         if(isset(FlipsideSettings::$global))
@@ -834,8 +834,7 @@ 
         {
             $submenu['_'] = $url;
             $this->links[$name] = $submenu;
-        }
-        else
+        } else
         {
             $this->links[$name] = $url;
         }

class.FlipSession.php

Braces +9 added lines, -13 removed lines

@@ -32,8 +32,7 @@ 
         if(FlipSession::doesVarExist($name))
         {
             return $_SESSION[$name];
-        }
-        else
+        } else
         {
             return $default;
         }
@@ -59,13 +58,11 @@ 
         if(isset($_SESSION['flipside_user']))
         {
             return true;
-        }
-        else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
+        } else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
         {
             $auth = AuthProvider::getInstance();
             return $auth->isLoggedIn($_SESSION['AuthData'], $_SESSION['AuthMethod']);
-        }
-        else
+        } else
         {
             return false;
         }
@@ -81,8 +78,7 @@ 
         if(isset($_SESSION['flipside_user']))
         {
             return $_SESSION['flipside_user'];
-        }
-        else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
+        } else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
         {
             $auth = AuthProvider::getInstance();
             $user = $auth->getUser($_SESSION['AuthData'], $_SESSION['AuthMethod']);
@@ -91,8 +87,7 @@ 
                 $_SESSION['flipside_user'] = $user;
             }
             return $user;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -156,7 +151,9 @@ 
             $pos = strpos($sessionData, "|", $offset);
             $len = $pos - $offset;
             $name = substr($sessionData, $offset, $len);
-            if($name === false) break;
+            if($name === false) {
+                break;
+            }
             $offset += $len+1;
             $data = @unserialize(substr($sessionData, $offset));
             $res[$name] = $data;
@@ -181,8 +178,7 @@ 
             if($sessionData === false)
             {
                 array_push($res, array('sid' => $sessionId));
-            }
-            else
+            } else
             {
                 $tmp = FlipSession::unserializePhpSession($sessionData);
                 $tmp['sid' ] = $sessionId;

class.WebPage.php

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
         if($browserName === 'IE' && $this->getBrowserMajorVer() <= 7)
         {
             header( 'Location: /badbrowser.php' ) ;
-        }
-        else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
+        } else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
         {
             $this->importSupport = true;
         }

Email/class.AmazonSES.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();

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