From d59dea9fddf885a836f7dc2d8be1f93afb7e9542 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 25 Feb 2014 20:00:56 +0100
Subject: added new html_denied() method as well

---
 inc/html.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index fcec29670..507ba511e 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -64,6 +64,25 @@ function html_login(){
     print '</div>'.NL;
 }
 
+
+/**
+ * Denied page content
+ *
+ * @return string html
+ */
+function html_denied() {
+    global $lang;
+    $denied = p_locale_xhtml('denied');
+    $notloggedin = isset($_SERVER['REMOTE_USER']) ? '' : $lang['notloggedin'];
+
+    $denied = str_replace(
+        array('@NOTLOGGEDIN@'),
+        array($notloggedin),
+        $denied
+    );
+    print $denied;
+}
+
 /**
  * inserts section edit buttons if wanted or removes the markers
  *
-- 
cgit v1.2.3


From f019ab46c33b430831053cd41b5b04a163fd529f Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 4 Mar 2014 21:27:10 +0100
Subject: added login form at denied access page

- restore lang string as well
---
 inc/html.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index 507ba511e..514f961e7 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -81,6 +81,10 @@ function html_denied() {
         $denied
     );
     print $denied;
+
+    if(!$_SERVER['REMOTE_USER']){
+        html_login();
+    }
 }
 
 /**
-- 
cgit v1.2.3


From d1e9181ef12479db0c36d6d93f0ecff84523bf73 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 6 Mar 2014 23:50:05 +0100
Subject: removed 'not logged in' text, loginform is shown already

---
 inc/html.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index 514f961e7..4a355bdaf 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -71,16 +71,7 @@ function html_login(){
  * @return string html
  */
 function html_denied() {
-    global $lang;
-    $denied = p_locale_xhtml('denied');
-    $notloggedin = isset($_SERVER['REMOTE_USER']) ? '' : $lang['notloggedin'];
-
-    $denied = str_replace(
-        array('@NOTLOGGEDIN@'),
-        array($notloggedin),
-        $denied
-    );
-    print $denied;
+    print p_locale_xhtml('denied');
 
     if(!$_SERVER['REMOTE_USER']){
         html_login();
-- 
cgit v1.2.3