gatekeeper functions now display helpful messages - closes #1060

git-svn-id: http://code.elgg.org/elgg/trunk@3742 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php
index f6758425a9f554a55e03131f2dc714ce506ea231..0448007e1923c7225b7d61405579fb047c8b7013 100644 (file)
--- a/engine/lib/sessions.php
+++ b/engine/lib/sessions.php
@@ -588,6 +588,7 @@ function session_init($event, $object_type, $object) {
 function gatekeeper() {
        if (!isloggedin()) {
                $_SESSION['last_forward_from'] = current_page_url();
+               register_error(elgg_echo('loggedinrequired'));
                forward();
        }
 }
@@ -601,6 +602,7 @@ function admin_gatekeeper() {
 
        if (!isadminloggedin()) {
                $_SESSION['last_forward_from'] = current_page_url();
+               register_error(elgg_echo('adminrequired'));
                forward();
        }
 }

diff --git a/languages/en.php b/languages/en.php
index 1972a81e705ae32774ab14a999f836b44ea4191d..017bc42ddacc9cc7aa3532da5b5bcba17b12f9bc 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -28,6 +28,9 @@ $english = array(
        'logoutok' => "You have been logged out.",
        'logouterror' => "We couldn't log you out. Please try again.",
 
+       'loggedinrequired' => "You must be logged in to view that page.",
+       'adminrequired' => "You must be an administrator to view that page.",
+
 /**
  * Errors
  */