BurningFlipside / CommonCode

class.FlipAdminPage.php

Braces +2 added lines, -4 removed lines

@@ -34,8 +34,7 @@ 
         if($this->user === false || $this->user === null)
         {
             $this->add_link('<i class="fa fa-sign-in"></i> Login', $this->loginUrl);
-        }
-        else
+        } else
         {
             $this->add_links();
             $this->add_link('<i class="fa fa-sign-out"></i> Logout', $this->logoutUrl);
@@ -166,8 +165,7 @@ 
                 <h1 class="page-header">You must <a href="'.$this->loginUrl.'?return='.$this->current_url().'">log in <span class="glyphicon glyphicon-log-in"></span></a> to access the '.$this->title.' Admin system!</h1>
             </div>
         </div>';
-        }
-        else if($this->is_admin === false)
+        } else if($this->is_admin === false)
         {
             $this->body = '
         <div class="row">

Auth/class.Group.php

Braces +4 added lines, -3 removed lines

@@ -86,12 +86,13 @@
                 {
                     $isLast = true;
                 }
-                if(!isset($group->member[$i]->type)) continue;
+                if(!isset($group->member[$i]->type)) {
+                    continue;
+                }
                 if($group->member[$i]->type === 'Group')
                 {
                     $this->addMember($group->member[$i]->cn, true, $isLast);
-                }
-                else
+                } else
                 {
                     $this->addMember($group->member[$i]->uid, false, $isLast);
                 }

Auth/class.LDAPGroup.php

Indentation +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
             throw new \Exception('data must be set for LDAPGroup');
         }
         $filter = new \Data\Filter("cn eq $name");
-	$group = $data->read($data->group_base, $filter);
+    $group = $data->read($data->group_base, $filter);
         if($group === false || !isset($group[0]))
         {
             return false;

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.LDAPUser.php

Indentation +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
             $obj['userPassword'] = $this->generateLDAPPass($password);
             if(isset($this->ldap_obj->uniqueidentifier))
             {
-               $obj['uniqueIdentifier'] = null;
+                $obj['uniqueIdentifier'] = null;
             }
             //Make sure we are bound in write mode
             $auth = \AuthProvider::getInstance();

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

Auth/class.SQLAuthenticator.php

Indentation +20 added lines, -20 removed lines

@@ -116,26 +116,26 @@
 
     private function getDataTable($name, $pending=false)
     {
-         if(isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
-         {
-             return $this->dataTables[$name][$pending];
-         }
-         $dataSet = $this->dataSet;
-         if($pending)
-         {
-             $dataSet = $this->pendingDataSet;
-         }
-         if($dataSet === null)
-         {
-             throw new \Exception('Unable to obtain dataset for SQL Authentication!');
-         }
-         $dataTable = $dataSet[$name];
-         if(!isset($this->dataTables[$name]))
-         {
-             $this->dataTables[$name] = array();
-         }
-         $this->dataTables[$name][$pending] = $dataTable;
-         return $dataTable;
+            if(isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
+            {
+                return $this->dataTables[$name][$pending];
+            }
+            $dataSet = $this->dataSet;
+            if($pending)
+            {
+                $dataSet = $this->pendingDataSet;
+            }
+            if($dataSet === null)
+            {
+                throw new \Exception('Unable to obtain dataset for SQL Authentication!');
+            }
+            $dataTable = $dataSet[$name];
+            if(!isset($this->dataTables[$name]))
+            {
+                $this->dataTables[$name] = array();
+            }
+            $this->dataTables[$name][$pending] = $dataTable;
+            return $dataTable;
     }
 
     private function getPendingUserDataTable()

Braces +15 added lines, -5 removed lines

@@ -149,7 +149,9 @@ 
 
     public function login($username, $password)
     {
-        if($this->current === false) return false;
+        if($this->current === false) {
+            return false;
+        }
         $userDataTable = $this->getDataTable('user');
         $filter = new \Data\Filter("uid eq '$username'");
         $users = $userDataTable->read($filter, 'uid,pass');
@@ -235,9 +237,13 @@ 
 
     public function getPendingUserCount()
     {
-        if($this->pending === false) return 0;
+        if($this->pending === false) {
+            return 0;
+        }
         $dataTable = $this->getPendingUserDataTable();
-        if($dataTable === null) return 0;
+        if($dataTable === null) {
+            return 0;
+        }
         return $dataTable->count();
     }
 
@@ -275,7 +281,9 @@ 
     public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
 
     {
-        if($this->pending === false) return false;
+        if($this->pending === false) {
+            return false;
+        }
         if($filter !== false && !$filter->contains('hash'))
         {
             return $this->searchPendingUsers($filter, $select, $top, $skip, $orderby);
@@ -296,7 +304,9 @@ 
 
     public function createPendingUser($user)
     {
-        if($this->pending === false) return false;
+        if($this->pending === false) {
+            return false;
+        }
         $userDataTable = $this->getPendingUserDataTable();
         if(isset($user->password2))
         {

Auth/class.GoogleAuthenticator.php

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
             $ret = $auth->activatePendingUser($user);

             if($ret === false)

             {

-                 throw new \Exception('Unable to create user! '.$res);

+                    throw new \Exception('Unable to create user! '.$res);

             }

             return self::SUCCESS;

         }

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
             }

             $currentUser = $localUsers[0];

             return self::ALREADY_PRESENT;

-        }

-        else

+        } else

         {

             $user = new PendingUser();

             $user->setEmail($googleUser->email);

class.FlipREST.php

Braces +8 added lines, -16 removed lines

@@ -75,8 +75,7 @@ 
         if(!isset($this->headers['Authorization']))
         {
             $this->app->user = $this->getUserFromSession();
-        } 
-        else 
+        } else 
         {
             $header = $this->headers['Authorization'];
             $this->app->user = $this->getUserFromHeader($header);
@@ -99,16 +98,13 @@ 
         if(is_array($value))
         {
             $array[$key] = implode(';', $value);
-        }
-        else if($key === '_id' && is_object($value))
+        } else if($key === '_id' && is_object($value))
         {
             $array[$key] = $value->{'$id'};
-        }
-        else if(is_object($value))
+        } else if(is_object($value))
         {
             $array[$key] = $this->app->request->getUrl().$this->app->request->getPath().$prefix.'/'.$key;
-        }
-        else if(strncmp($value, 'data:', 5) === 0)
+        } else if(strncmp($value, 'data:', 5) === 0)
         {
             $array[$key] = $this->app->request->getUrl().$this->app->request->getPath().$prefix.'/'.$key;
         }
@@ -129,8 +125,7 @@ 
             if(is_array($first))
             {
                 $keys = array_keys($first);
-            }
-            else if(is_object($first))
+            } else if(is_object($first))
             {
                 $keys = array_keys(get_object_vars($first));
             }
@@ -145,8 +140,7 @@ 
                         $this->fix_encoded_element($key, $value, $row, '/'.$id);
                     }
                     fputcsv($df, $row);
-                }
-                else if(is_object($row))
+                } else if(is_object($row))
                 {
                     $keyName = $keys[0];
                     $id = $row->$keyName;
@@ -162,8 +156,7 @@ 
                     fputcsv($df, $values);
                 }
             }
-        }
-        else
+        } else
         {
             $array = get_object_vars($array);
             fputcsv($df, array_keys($array));
@@ -262,8 +255,7 @@ 
                     break;
             }
             $this->app->response->setBody($text);
-        }
-        else if($this->app->response->getStatus() == 200)
+        } else if($this->app->response->getStatus() == 200)
         {
             $this->app->response->headers->set('Content-Type', 'application/json;odata.metadata=none');
         }

Data/class.SQLDataSet.php

Braces +5 added lines, -10 removed lines

@@ -10,8 +10,7 @@ 
         if(isset($params['user']))
         {
             $this->pdo = new \PDO($params['dsn'], $params['user'], $params['pass']);
-        }
-        else
+        } else
         {
             $this->pdo = new \PDO($params['dsn']);
         }
@@ -38,8 +37,7 @@ 
         if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote($name)) > 0)
         {
             return true;
-        }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote($name)) > 0)
+        } else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote($name)) > 0)
         {
             return true;
         }
@@ -51,8 +49,7 @@ 
         if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
         {
             return true;
-        }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
+        } else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
         {
             return true;
         }
@@ -64,8 +61,7 @@ 
         if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('v'.$name)) > 0)
         {
             return true;
-        }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('v'.$name)) > 0)
+        } else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('v'.$name)) > 0)
         {
             return true;
         }
@@ -122,8 +118,7 @@ 
             if($skip === false)
             {
                 $sql.=' LIMIT '.(int)$count;
-            }
-            else
+            } else
             {
                 $sql.=" LIMIT $skip, $count";
             }

Data/class.Filter.php

Braces +20 added lines, -25 removed lines

@@ -30,11 +30,15 @@ 
             return array(new FilterClause($string));
         }
         $children = array();
-        if($parens) array_push($children, '(');
+        if($parens) {
+            array_push($children, '(');
+        }
         $children = array_merge($children, self::process_string($clauses[1]));
         array_push($children, trim($clauses[2]));
         $children = array_merge($children, self::process_string($clauses[3]));
-        if($parens) array_push($children, ')');
+        if($parens) {
+            array_push($children, ')');
+        }
         return $children;
     }
 
@@ -47,16 +51,13 @@ 
             if($this->children[$i] === '(' || $this->children[$i] === ')')
             {
                 $ret.=$this->children[$i];
-            }
-            else if($this->children[$i] === 'and')
+            } else if($this->children[$i] === 'and')
             {
                 $ret.=' AND ';
-            }
-            else if($this->children[$i] === 'or')
+            } else if($this->children[$i] === 'or')
             {
                 $ret.=' OR ';
-            }
-            else
+            } else
             {
                 $ret.=$this->children[$i]->to_sql_string();
             }
@@ -78,16 +79,14 @@ 
                     throw new \Exception('Do not support both and or');
                 }
                 $prefix = '&';
-            }
-            else if($this->children[$i] === 'or')
+            } else if($this->children[$i] === 'or')
             {
                 if($prefix == '&')
                 {
                     throw new \Exception('Do not support both and or');
                 }
                 $prefix = '|';
-            }
-            else
+            } else
             {
                 $ret.=$this->children[$i]->to_ldap_string();
             }
@@ -109,13 +108,11 @@ 
             {
                 $old = array_pop($ret);
                 array_push($ret, array('$and'=>array($old, $this->children[++$i]->to_mongo_filter())));
-            }
-            else if($this->children[$i] === 'or')
+            } else if($this->children[$i] === 'or')
             {
                 $old = array_pop($ret);
                 array_push($ret, array('$or'=>array($old, $this->children[++$i]->to_mongo_filter())));
-            }
-            else
+            } else
             {
                 array_push($ret, $this->children[$i]->to_mongo_filter());
             }
@@ -140,12 +137,10 @@ 
                 if($this->children[$i] === 'and')
                 {
                     $search = $res;
-                }
-                else if($this->children[$i] === 'or')
+                } else if($this->children[$i] === 'or')
                 {
                     $search = $array;
-                }
-                else
+                } else
                 {
                     foreach($search as $subarray)
                     {
@@ -173,7 +168,9 @@ 
         $count = count($this->children);
         for($i = 0; $i < $count; $i++)
         {
-            if(!is_object($this->children[$i])) continue;
+            if(!is_object($this->children[$i])) {
+                continue;
+            }
             if(strstr($this->children[$i]->var1, $substr) !== false ||
                strstr($this->children[$i]->var2, $substr) !== false)
             {
@@ -193,12 +190,10 @@ 
         {
             array_push($this->children, $child);
             return;
-        }
-        else if(is_a($child, '\Data\Filter'))
+        } else if(is_a($child, '\Data\Filter'))
         {
             $this->children = array_merge($this->children, $child->children);
-        }
-        else
+        } else
         {
             $this->children = array_merge($this->children, self::process_string($child));
         }