BurningFlipside / SecureFramework

api/v1/index.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 require_once('class.FlipREST.php');
 require_once('class.AuthProvider.php');
 
-if($_SERVER['REQUEST_URI'][0] == '/' && $_SERVER['REQUEST_URI'][1] == '/')
+if ($_SERVER['REQUEST_URI'][0] == '/' && $_SERVER['REQUEST_URI'][1] == '/')
 {
     $_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'], 1);
 }
@@ -17,7 +17,7 @@ 
     global $app;
     $auth = AuthProvider::getInstance();
     $res = $auth->login($app->request->params('username'), $app->request->params('password'));
-    if($res === false)
+    if ($res === false)
     {
         $app->response->setStatus(403);
     }

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
     if($res === false)
     {
         $app->response->setStatus(403);
-    }
-    else
+    } else
     {
         echo json_encode($res);
     }

themes/api/v1/index.php

Doc Comments +3 added lines

@@ -95,6 +95,9 @@
     echo json_encode($objs);
 }
 
+/**
+ * @param boolean $field
+ */
 function obj_list_with_filter($field)
 {
     global $app;

Indentation +9 added lines, -9 removed lines

@@ -27,16 +27,16 @@ 
 
 function validate_user_is_admin($user)
 {
-   return $user->isInGroupNamed('ThemeAdmins');
+    return $user->isInGroupNamed('ThemeAdmins');
 }
 
 function validate_user_has_access($user, $obj)
 {
-   if($user->isInGroupNamed('ThemeAdmins'))
-   {
-       return true;
-   }
-   return in_array($user->getUid(), $obj['registrars']);
+    if($user->isInGroupNamed('ThemeAdmins'))
+    {
+        return true;
+    }
+    return in_array($user->getUid(), $obj['registrars']);
 }
 
 function list_obj()
@@ -49,11 +49,11 @@ 
     $params = $app->request->params();
     if(isset($params['fmt']))
     {
-       unset($params['fmt']);
+        unset($params['fmt']);
     }
     if(isset($params['_']))
     {
-       unset($params['_']);
+        unset($params['_']);
     }
     $logo_urls = false;
     $db = new ThemeDB();
@@ -144,7 +144,7 @@ 
         {
             if(!validate_user_is_admin($app->user))
             {
-               trim_obj($obj);
+                trim_obj($obj);
             }
             else if($field === false)
             {

Spacing +47 added lines, -47 removed lines

@@ -2,7 +2,7 @@ 
 require_once('class.FlipREST.php');
 require_once('class.ThemeDB.php');
 
-if($_SERVER['REQUEST_URI'][0] == '/' && $_SERVER['REQUEST_URI'][1] == '/')
+if ($_SERVER['REQUEST_URI'][0] == '/' && $_SERVER['REQUEST_URI'][1] == '/')
 {
     $_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'], 1);
 }
@@ -12,13 +12,13 @@ 
 
 function trim_obj(&$obj)
 {
-    foreach($obj as $key=>$value)
+    foreach ($obj as $key=>$value)
     {
-        if($key == '_id')
+        if ($key == '_id')
         {
-            $obj['_id'] = (string)$obj['_id'];
+            $obj['_id'] = (string) $obj['_id'];
         }
-        else if(is_object($value) || is_array($value))
+        else if (is_object($value) || is_array($value))
         {
             unset($obj[$key]);
         }
@@ -32,7 +32,7 @@ 
 
 function validate_user_has_access($user, $obj)
 {
-   if($user->isInGroupNamed('ThemeAdmins'))
+   if ($user->isInGroupNamed('ThemeAdmins'))
    {
        return true;
    }
@@ -42,33 +42,33 @@ 
 function list_obj()
 {
     global $app;
-    if(!$app->user)
+    if (!$app->user)
     {
         throw new Exception('Must be logged in', ACCESS_DENIED);
     }
     $params = $app->request->params();
-    if(isset($params['fmt']))
+    if (isset($params['fmt']))
     {
        unset($params['fmt']);
     }
-    if(isset($params['_']))
+    if (isset($params['_']))
     {
        unset($params['_']);
     }
     $logo_urls = false;
     $db = new ThemeDB();
     $fields = false;
-    if(isset($params['no_logo']))
+    if (isset($params['no_logo']))
     {
         $fields = array('logo' => false);
         unset($params['no_logo']);
     }
-    if(isset($params['logo_url']))
+    if (isset($params['logo_url']))
     {
         $logo_urls = true;
         unset($params['logo_url']);
     }
-    if(count($params))
+    if (count($params))
     {
         $objs = $db->searchFromCollection('themes', $params, $fields);
     }
@@ -76,18 +76,18 @@ 
     {
         $objs = $db->getAllFromCollection('themes', false, false, $fields);
     }
-    if(!validate_user_is_admin($app->user))
+    if (!validate_user_is_admin($app->user))
     {
         $count = count($objs);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             trim_obj($objs[$i]);
         }
     }
     $count = count($objs);
-    for($i = 0; $i < $count; $i++)
+    for ($i = 0; $i < $count; $i++)
     {
-        if($logo_urls && isset($objs[$i]['logo']))
+        if ($logo_urls && isset($objs[$i]['logo']))
         {
             $objs[$i]['logo'] = $app->request->getUrl().$app->request->getPath().'/'.$objs[$i]['_id'].'/logo';
         }
@@ -98,11 +98,11 @@ 
 function obj_list_with_filter($field)
 {
     global $app;
-    if(!$app->user)
+    if (!$app->user)
     {
         throw new Exception('Must be logged in', ACCESS_DENIED);
     }
-    if(!validate_user_is_admin($app->user, $collection))
+    if (!validate_user_is_admin($app->user, $collection))
     {
         throw new Exception('User not admin', ACCESS_DENIED);
     }
@@ -110,9 +110,9 @@ 
     $objs = $db->getAllFromCollection('themes');
     $res = array();
     $count = count($objs);
-    for($i = 0; $i < $count; $i++)
+    for ($i = 0; $i < $count; $i++)
     {
-        if(isset($objs[$i][$field]))
+        if (isset($objs[$i][$field]))
         {
             array_push($res, $objs[$i][$field]);
         }
@@ -123,36 +123,36 @@ 
 function obj_view($id, $field = FALSE)
 {
     global $app;
-    if(!$app->user)
+    if (!$app->user)
     {
         throw new Exception('Must be logged in', ACCESS_DENIED);
     }
     $db = new ThemeDB();
-    if($id === '*')
+    if ($id === '*')
     {
         obj_list_with_filter($field);
         return;
     }
     $obj = $db->getObjectFromCollectionByID('themes', $id);
-    if($obj === FALSE)
+    if ($obj === FALSE)
     {
         throw new Exception('Unable to obtain object!', INTERNAL_ERROR);
     }
     else
     {
-        if($app->request->params('full') === null)
+        if ($app->request->params('full') === null)
         {
-            if(!validate_user_is_admin($app->user))
+            if (!validate_user_is_admin($app->user))
             {
                trim_obj($obj);
             }
-            else if($field === false)
+            else if ($field === false)
             {
                 trim_obj($obj);
             }
-            if($field !== FALSE)
+            if ($field !== FALSE)
             {
-                if(!is_array($obj[$field]) && strncmp($obj[$field], 'data:', 5) === 0)
+                if (!is_array($obj[$field]) && strncmp($obj[$field], 'data:', 5) === 0)
                 {
                     $app->fmt = 'passthru';
                     $str = substr($obj[$field], 5);
@@ -171,7 +171,7 @@ 
         }
         else
         {
-            if(validate_user_has_access($app->user, $obj) === FALSE)
+            if (validate_user_has_access($app->user, $obj) === FALSE)
             {
                 throw new Exception('Cannot edit object that is not yours', ACCESS_DENIED);
             }
@@ -183,7 +183,7 @@ 
 function obj_add()
 {
     global $app;
-    if(!$app->user)
+    if (!$app->user)
     {
         throw new Exception('Must be logged in', ACCESS_DENIED);
     }
@@ -193,17 +193,17 @@ 
     $obj  = json_decode($body);
     $obj  = get_object_vars($obj);
     //Ensure minimum fields are set...
-    if(!isset($obj['name']))
+    if (!isset($obj['name']))
     {
         throw new Exception('Missing one or more required parameters!', INTERNAL_ERROR);
     }
     $obj['year'] = $db->getCurrentYear();
-    if(!isset($obj['registrars']))
+    if (!isset($obj['registrars']))
     {
         $obj['registrars'] = array();
     }
     array_push($obj['registrars'], $app->user->getUid());
-    if(isset($obj['_id']) && strlen($obj['_id']) > 0)
+    if (isset($obj['_id']) && strlen($obj['_id']) > 0)
     {
         $app->redirect('themes/'.$obj['_id'], 307);
         return;
@@ -212,61 +212,61 @@ 
     {
         $res = $db->addObjectToCollection('themes', $obj);
     }
-    if($res === FALSE)
+    if ($res === FALSE)
     {
         throw new Exception('Unable to add theme!', INTERNAL_ERROR);
     }
     else
     {
-        echo json_encode(array('_id'=>(string)$res, 'url'=>$app->request->getUrl().$app->request->getPath().'/'.(string)$res));
+        echo json_encode(array('_id'=>(string) $res, 'url'=>$app->request->getUrl().$app->request->getPath().'/'.(string) $res));
     }
 }
 
 function obj_edit($id)
 {
     global $app;
-    if(!$app->user)
+    if (!$app->user)
     {
         throw new Exception('Must be logged in', ACCESS_DENIED);
     }
     $db = new ThemeDB();
     $old_obj = $db->getObjectFromCollectionByID('themes', $id);
-    if(validate_user_has_access($app->user, $old_obj) === FALSE)
+    if (validate_user_has_access($app->user, $old_obj) === FALSE)
     {
         throw new Exception('Cannot edit object that is not yours', ACCESS_DENIED);
     }
     $obj = $app->request->params();
-    if($obj === null || count($obj) === 0)
+    if ($obj === null || count($obj) === 0)
     {
         $body = $app->request->getBody();
         $obj  = json_decode($body);
         $obj  = get_object_vars($obj);
     }
     //Ensure minimum fields are set...
-    if(!isset($obj['name']))
+    if (!isset($obj['name']))
     {
         throw new Exception('Missing one or more required parameters!', INTERNAL_ERROR);
     }
     $obj['year'] = $db->getCurrentYear();
-    if(!isset($obj['registrars']))
+    if (!isset($obj['registrars']))
     {
         $obj['registrars'] = array();
     }
     $obj['registrars'] = array_merge($obj['registrars'], $old_obj['registrars']);
-    if(validate_user_is_admin($app->user) === FALSE)
+    if (validate_user_is_admin($app->user) === FALSE)
     {
         $uid = $app->user->getUid();
-        if(!in_array($uid, $obj['registrars']))
+        if (!in_array($uid, $obj['registrars']))
         {
             array_push($obj['registrars'], $app->user->getUid());
         }
     }
-    if(!isset($obj['_id']))
+    if (!isset($obj['_id']))
     {
         $obj['_id'] = $id;
     }
     $res = $db->updateObjectInCollection('themes', $obj);
-    if($res === FALSE)
+    if ($res === FALSE)
     {
         throw new Exception('Unable to update object!', INTERNAL_ERROR);
     }
@@ -279,18 +279,18 @@ 
 function obj_delete($id)
 {
     global $app;
-    if(!$app->user)
+    if (!$app->user)
     {
         throw new Exception('Must be logged in', ACCESS_DENIED);
     }
     $db = new ThemeDB();
     $old_obj = $db->getObjectFromCollectionByID('themes', $id);
-    if(validate_user_has_access($app->user, $old_obj) === FALSE)
+    if (validate_user_has_access($app->user, $old_obj) === FALSE)
     {
         throw new Exception('Cannot delete object that is not yours', ACCESS_DENIED);
     }
     $res = $db->deleteObjectFromCollection('themes', $old_obj);
-    if($res === false)
+    if ($res === false)
     {
         throw new Exception('Unable to delete object!', INTERNAL_ERROR);
     }

Braces +10 added lines, -20 removed lines

@@ -17,8 +17,7 @@ 
         if($key == '_id')
         {
             $obj['_id'] = (string)$obj['_id'];
-        }
-        else if(is_object($value) || is_array($value))
+        } else if(is_object($value) || is_array($value))
         {
             unset($obj[$key]);
         }
@@ -71,8 +70,7 @@ 
     if(count($params))
     {
         $objs = $db->searchFromCollection('themes', $params, $fields);
-    }
-    else
+    } else
     {
         $objs = $db->getAllFromCollection('themes', false, false, $fields);
     }
@@ -137,16 +135,14 @@ 
     if($obj === FALSE)
     {
         throw new Exception('Unable to obtain object!', INTERNAL_ERROR);
-    }
-    else
+    } else
     {
         if($app->request->params('full') === null)
         {
             if(!validate_user_is_admin($app->user))
             {
                trim_obj($obj);
-            }
-            else if($field === false)
+            } else if($field === false)
             {
                 trim_obj($obj);
             }
@@ -161,15 +157,13 @@ 
                     $str = strtok("\0");
                     print(base64_decode($str));
                     $app->response->headers->set('Content-Type', $type);
-                }
-                else
+                } else
                 {
                     echo json_encode($obj[$field]);
                 }
                 return;
             }
-        }
-        else
+        } else
         {
             if(validate_user_has_access($app->user, $obj) === FALSE)
             {
@@ -207,16 +201,14 @@ 
     {
         $app->redirect('themes/'.$obj['_id'], 307);
         return;
-    }
-    else
+    } else
     {
         $res = $db->addObjectToCollection('themes', $obj);
     }
     if($res === FALSE)
     {
         throw new Exception('Unable to add theme!', INTERNAL_ERROR);
-    }
-    else
+    } else
     {
         echo json_encode(array('_id'=>(string)$res, 'url'=>$app->request->getUrl().$app->request->getPath().'/'.(string)$res));
     }
@@ -269,8 +261,7 @@ 
     if($res === FALSE)
     {
         throw new Exception('Unable to update object!', INTERNAL_ERROR);
-    }
-    else
+    } else
     {
         echo json_encode(array('update'=>TRUE));
     }
@@ -293,8 +284,7 @@ 
     if($res === false)
     {
         throw new Exception('Unable to delete object!', INTERNAL_ERROR);
-    }
-    else
+    } else
     {
         echo json_encode(array('delete'=>TRUE));
     }

themes/class.ThemeDB.php

Doc Comments +18 added lines

@@ -24,6 +24,9 @@ 
         return $data[0]['value'];
     }
 
+    /**
+     * @param string $collection
+     */
     function getAllFromCollection($collection, $year = false, $uid = false, $fields = false)
     {
         if($year === false)
@@ -48,6 +51,9 @@ 
         return $data;
     }
 
+    /**
+     * @param string $collection
+     */
     function searchFromCollection($collection, $criteria, $fields = false)
     {
         $col = $this->db->selectCollection($collection);
@@ -71,6 +77,9 @@ 
         return $ret;
     }
 
+    /**
+     * @param string $collection
+     */
     function getObjectFromCollectionByID($collection, $id)
     {
         $table = $this->dataSet[$collection];
@@ -82,6 +91,9 @@ 
         return $data[0];
     }
 
+    /**
+     * @param string $collection
+     */
     function addObjectToCollection($collection, $obj)
     {
          unset($obj['_id']);
@@ -94,6 +106,9 @@ 
          return false;
     }
 
+    /**
+     * @param string $collection
+     */
     function updateObjectInCollection($collection, $obj)
     {
         $id = $obj['_id'];
@@ -107,6 +122,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $collection
+     */
     function deleteObjectFromCollection($collection, $obj)
     {
         $id = $obj['_id'];

Indentation +15 added lines, -15 removed lines

@@ -84,14 +84,14 @@ 
 
     function addObjectToCollection($collection, $obj)
     {
-         unset($obj['_id']);
-         $table = $this->dataSet[$collection];
-         $res = $table->create($obj);
-         if($res !== false)
-         {
-             return $res;
-         }
-         return false;
+            unset($obj['_id']);
+            $table = $this->dataSet[$collection];
+            $res = $table->create($obj);
+            if($res !== false)
+            {
+                return $res;
+            }
+            return false;
     }
 
     function updateObjectInCollection($collection, $obj)
@@ -137,13 +137,13 @@ 
 
     function addTheme($theme)
     {
-         unset($theme['_id']);
-         $res = $this->db->themes->insert($theme);
-         if($res['ok'] === true)
-         {
-             return $theme['_id'];
-         }
-         return false;
+            unset($theme['_id']);
+            $res = $this->db->themes->insert($theme);
+            if($res['ok'] === true)
+            {
+                return $theme['_id'];
+            }
+            return false;
     }
 
     function updateTheme($theme)

Spacing +16 added lines, -16 removed lines

@@ -12,12 +12,12 @@ 
 
     function getCurrentYear()
     {
-        if(!isset($this->tables['vars']))
+        if (!isset($this->tables['vars']))
         {
             $this->tables['vars'] = $this->dataSet['vars'];
         }
         $data = $this->tables['vars']->read(new \Data\Filter('name eq year'));
-        if(empty($data))
+        if (empty($data))
         {
             return false;
         }
@@ -26,21 +26,21 @@ 
 
     function getAllFromCollection($collection, $year = false, $uid = false, $fields = false)
     {
-        if($year === false)
+        if ($year === false)
         {
             $year = $this->getCurrentYear();
         }
         $table = $this->dataSet[$collection];
         $filter = false;
-        if($year !== '*' && $uid !== false)
+        if ($year !== '*' && $uid !== false)
         {
             $filter = new \Data\Filter("year eq $year and registrars eq $uid");
         }
-        else if($year !== '*')
+        else if ($year !== '*')
         {
             $filter = new \Data\Filter("year eq $year");
         }
-        else if($uid !== false)
+        else if ($uid !== false)
         {
             $filter = new \Data\Filter("registrars eq $uid");
         }
@@ -51,20 +51,20 @@ 
     function searchFromCollection($collection, $criteria, $fields = false)
     {
         $col = $this->db->selectCollection($collection);
-        foreach($criteria as $key=>$value)
+        foreach ($criteria as $key=>$value)
         {
-            if($value[0] === '/')
+            if ($value[0] === '/')
             {
                 $criteria[$key] = array('$regex'=>new MongoRegex("$value"));
             }
         }
         $cursor = $col->find($criteria);
-        if($fields !== false)
+        if ($fields !== false)
         {
             $cursor->fields($fields);
         }
-        $ret    = array();
-        foreach($cursor as $doc)
+        $ret = array();
+        foreach ($cursor as $doc)
         {
             array_push($ret, $doc);
         }
@@ -75,7 +75,7 @@ 
     {
         $table = $this->dataSet[$collection];
         $data = $table->read(new \Data\Filter("_id eq $id"));
-        if(empty($data))
+        if (empty($data))
         {
             return false;
         }
@@ -87,7 +87,7 @@ 
          unset($obj['_id']);
          $table = $this->dataSet[$collection];
          $res = $table->create($obj);
-         if($res !== false)
+         if ($res !== false)
          {
              return $res;
          }
@@ -100,7 +100,7 @@ 
         unset($obj['_id']);
         $table = $this->dataSet[$collection];
         $res = $table->update(new \Data\Filter("_id eq $id"), $obj);
-        if($res !== false)
+        if ($res !== false)
         {
             return true;
         }
@@ -139,7 +139,7 @@ 
     {
          unset($theme['_id']);
          $res = $this->db->themes->insert($theme);
-         if($res['ok'] === true)
+         if ($res['ok'] === true)
          {
              return $theme['_id'];
          }
@@ -151,7 +151,7 @@ 
         $id = new MongoId($theme['_id']);
         unset($theme['_id']);
         $res = $this->db->themes->update(array('_id' => $id), $theme);
-        if($res['ok'] === true)
+        if ($res['ok'] === true)
         {
             return true;
         }

Braces +2 added lines, -4 removed lines

@@ -35,12 +35,10 @@
         if($year !== '*' && $uid !== false)
         {
             $filter = new \Data\Filter("year eq $year and registrars eq $uid");
-        }
-        else if($year !== '*')
+        } else if($year !== '*')
         {
             $filter = new \Data\Filter("year eq $year");
-        }
-        else if($uid !== false)
+        } else if($uid !== false)
         {
             $filter = new \Data\Filter("registrars eq $uid");
         }

themes/view.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 $page->addWellKnownCSS(CSS_DATATABLE);
 $page->add_js_from_src('js/view.js');
 
-if(!FlipSession::isLoggedIn())
+if (!FlipSession::isLoggedIn())
 {
 $page->body .= '
     <div id="content">

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
         </div>
     </div>
 ';
-}
-else
+} else
 {
 $page->body .= '
 <div id="content">

themes/class.ThemePage.php

Spacing +2 added lines, -2 removed lines

@@ -16,13 +16,13 @@
     function add_links()
     {
         $dir = $this->theme_root;
-        if(!FlipSession::isLoggedIn())
+        if (!FlipSession::isLoggedIn())
         {
             $this->add_link('Login', 'http://profiles.burningflipside.com/login.php?return='.$this->current_url());
         }
         else
         {
-            if($this->user->isInGroupNamed('ThemeAdmins'))
+            if ($this->user->isInGroupNamed('ThemeAdmins'))
             { 
                 $this->add_link('Admin', $dir.'/_admin/');
             }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
         if(!FlipSession::isLoggedIn())
         {
             $this->add_link('Login', 'http://profiles.burningflipside.com/login.php?return='.$this->current_url());
-        }
-        else
+        } else
         {
             if($this->user->isInGroupNamed('ThemeAdmins'))
             { 

class.SecurePage.php

Spacing +13 added lines, -13 removed lines

@@ -14,28 +14,28 @@ 
         $root = $_SERVER['DOCUMENT_ROOT'];
         $script_dir = dirname(__FILE__);
         $this->secure_root = substr($script_dir, strlen($root));
-        if($this->secure_root === false || strlen($this->secure_root) === 0)
+        if ($this->secure_root === false || strlen($this->secure_root) === 0)
         {
             $this->secure_root = '/';
         }
-        else if($this->secure_root[strlen($this->secure_root)-1] !== '/')
+        else if ($this->secure_root[strlen($this->secure_root)-1] !== '/')
         {
-            $this->secure_root.= '/';
+            $this->secure_root .= '/';
         }
         $this->add_secure_css();
         $this->add_secure_script();
         $this->add_login_form();
-        $this->body_tags='data-login-url="'.$this->secure_root.'api/v1/login"';
+        $this->body_tags = 'data-login-url="'.$this->secure_root.'api/v1/login"';
         $plugin_files = glob($script_dir.'/*/plugin.php');
         $count = count($plugin_files);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             include($plugin_files[$i]);
         }
         $this->plugins = array();
-        foreach(get_declared_classes() as $class)
+        foreach (get_declared_classes() as $class)
         {
-            if(is_subclass_of($class, 'SecurePlugin'))
+            if (is_subclass_of($class, 'SecurePlugin'))
             {
                 $this->plugins[] = new $class();
             }
@@ -56,13 +56,13 @@ 
 
     function add_links()
     {
-        if($this->user !== false)
+        if ($this->user !== false)
         {
             $secure_menu = array();
-            for($i = 0; $i < $this->plugin_count; $i++)
+            for ($i = 0; $i < $this->plugin_count; $i++)
             {
                 $ret = $this->plugins[$i]->get_secure_menu_entries($this, $this->user);
-                if($ret !== false)
+                if ($ret !== false)
                 {
                     $ret["<hr id='hr_$i'/>"] = false;
                     $secure_menu = array_merge($secure_menu, $ret);
@@ -76,12 +76,12 @@ 
     function get_secure_child_entry_points()
     {
         $entry_points = '';
-        for($i = 0; $i < $this->plugin_count; $i++)
+        for ($i = 0; $i < $this->plugin_count; $i++)
         {
             $ret = $this->plugins[$i]->get_plugin_entry_point();
-            if($ret !== false)
+            if ($ret !== false)
             {
-                $entry_points .= '<li>'.$this->createLink($ret['name'],$ret['link']).'</li>';
+                $entry_points .= '<li>'.$this->createLink($ret['name'], $ret['link']).'</li>';
             }
         }
         return $entry_points;

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
         if($this->secure_root === false || strlen($this->secure_root) === 0)
         {
             $this->secure_root = '/';
-        }
-        else if($this->secure_root[strlen($this->secure_root)-1] !== '/')
+        } else if($this->secure_root[strlen($this->secure_root)-1] !== '/')
         {
             $this->secure_root.= '/';
         }