Added some functionality to the user helper class (to check if the user is logged in) and changed the header to use the helper class

2 files changed, 19 insertions, 3 deletions

diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 10015b83..e522f016 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -25,4 +25,19 @@
  *
  */
 class user {
+  /**
+   * Function to determine if the user has logged in.
+   * @param $user(optional) Defaults to null, if specified will compare against the user in the 
+   *                        session.
+   * @returns boolean   true if logged in
+   */
+  public static function is_logged_in($user=null) {
+    $session_user = Session::instance()->get("user", null);
+    $logged_in = false;
+    if (!empty($session_user)) {
+      $logged_in = !empty($user) && $session_user === $user;
+    }
+
+    return $logged_in;
+  }
 }
\ No newline at end of file
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 7b39da41..59e1f161 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -3,11 +3,12 @@
 <h1><?= $item->title_edit ?></h1>
 
 <div id="gLoginMenu">
-  <? if (empty($user)): ?>
+  <? if (!user::is_logged_in($user)): ?>
     <a href="<?= url::site("user/register")?>"><?= _("Register") ?></a> | 
-    <a href="<?= url::site("user/login")?>"><?= _("Login") ?></a>
+    <a href="<?= url::site("login")?>"><?= _("Login") ?></a>
   <? else: ?>
-    <a href="<?= url::site("user/logout")?>"><?= _("Logout") ?></a>
+    <a href="<?= url::site("user/update")?>"><?= _("Modify Profile") ?></a> | 
+    <a href="<?= url::site("logout")?>"><?= _("Logout") ?></a>
   <? endif; ?>
 </div>
 <ul id="gSiteMenu">