From 468549ace06bed0844a781d0a78619cd353dd6d3 Mon Sep 17 00:00:00 2001
From: hahn <hahn@AAE49.campus.unibe.ch>
Date: Tue, 4 Jul 2017 14:23:42 +0200
Subject: [PATCH] ci-webgui show a clear error if the user is not logged in

---
 config/lang/de.json                           | 1 +
 config/lang/en.json                           | 1 +
 public_html/deployment/classes/user.class.php | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/lang/de.json b/config/lang/de.json
index c2edacd8..bcc10bdc 100644
--- a/config/lang/de.json
+++ b/config/lang/de.json
@@ -145,6 +145,7 @@
     "class-project-warning-phase-not-active": "Die Phase %s ist nicht aktiv.",
 
     "class-user-error-deny-no-role": "FEHLER: Sie haben nicht gen&uuml;gend Berechtigungen.",
+    "class-user-error-login-required": "FEHLER: Sie sind noch nicht eingeloggt. Bitte melden Sie sich zuerst an.",
     
     "page-accept-error-cannot-accept-phase": "Die Phase [%s] kann nicht akzeptiert werden.",
     "page-accept-info": "Die Software wurde erfolgreich in der Phase <span class=\"%s\">%s</span> getestet und soll auf die n&auml;chste Phase <span class=\"%s\">%s</span> ausgerollt werden?",
diff --git a/config/lang/en.json b/config/lang/en.json
index f3bcd4da..484a2494 100644
--- a/config/lang/en.json
+++ b/config/lang/en.json
@@ -146,6 +146,7 @@
     "class-project-warning-phase-not-active": "The phase %s is not active.",
 
     "class-user-error-deny-no-role": "ERRROR: Your User has not enough permissions.",
+    "class-user-error-login-required": "ERROR: You need to login first.",
 
     "page-accept-error-cannot-accept-phase": "The phase [%s] cannot be accepted.",
     "page-accept-info": "The software was tested successfully in phase <span class=\"%s\">%s</span> and shall be rolled out in the next phase <span class=\"%s\">%s</span>?",
diff --git a/public_html/deployment/classes/user.class.php b/public_html/deployment/classes/user.class.php
index 47bb7a95..da03b925 100644
--- a/public_html/deployment/classes/user.class.php
+++ b/public_html/deployment/classes/user.class.php
@@ -194,7 +194,11 @@ class user {
      */
     public function showDenied(){
         return '<div class="alert alert-danger" role="alert">'
-        . t("class-user-error-deny-no-role").'<br>('.$this->_sLastCheckedPermission.')</div><br>'
+        . ($this->_sUsername ? ' User: '.$this->_sUsername : ''
+            ? t("class-user-error-deny-no-role").'<br>('.$this->_sLastCheckedPermission.')'
+            : t("class-user-error-login-required")
+        )
+        . '</div><br>'
         . '<a href="/deployment/all/login/" class="btn btn-primary">'.t('menu-login').'</a>'
         ;
     }
-- 
GitLab