From abca36633d1a3276e48075f96cbe60baae7f0faf Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 17 Jan 2006 12:40:09 +0000
Subject: [PATCH] Removed logout message

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2506 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 html/logout.php                 | 13 -------------
 html/main.php                   |  2 +-
 ihtml/themes/default/logout.tpl |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/html/logout.php b/html/logout.php
index 1ffbf9d8d..ba44304bf 100644
--- a/html/logout.php
+++ b/html/logout.php
@@ -25,18 +25,6 @@ header("Content-type: text/html; charset=UTF-8");
 get_dir_list("$BASE_DIR/plugins");
 session_start ();
 
-/* This message will be set if the logout was caused by main.php- 
- *  if inactivity of user was > than the defined value in gosa.conf (session_lifetime)
- * This Message will be displayed in the logout template.
- * To force displaying the logout template, we have to unset the session.
- */
-if(isset($_SESSION['kick_message'])){
-  $kmsg = $_SESSION['kick_message'];
-  @session_unset();
-}else{
-  $kmsg = "";
-}
-
 /* Do logout-logging and destroy session */
 if (!isset($_SESSION["config"])){
   /* Language setup */
@@ -64,7 +52,6 @@ if (!isset($_SESSION["config"])){
   } else {
     $smarty->compile_dir= '/var/spool/gosa/';
   }
-  $smarty->assign("kmsg",$kmsg);
   $smarty->display (get_template_path('headers.tpl'));
   $smarty->display (get_template_path('logout.tpl'));
   @session_destroy ();
diff --git a/html/main.php b/html/main.php
index b07cf1b8c..dc33b4831 100644
--- a/html/main.php
+++ b/html/main.php
@@ -83,7 +83,7 @@ if(empty($_SESSION['_LAST_PAGE_REQUEST'])){
    * kill session
    */
   if($request_time > $max_life){
-    $_SESSION['kick_message'] = sprintf(_("The session timeout configuration is set to '%s' seconds. But have been inactive for '%s' seconds."),$max_life,$request_time)."<br>"._("You can change the value for session_lifetime in your gosa.conf.")."<br>";
+    session_unset();
     gosa_log ("main.php called without session - logging out");
     header ("Location: logout.php");
     exit;
diff --git a/ihtml/themes/default/logout.tpl b/ihtml/themes/default/logout.tpl
index 5189da0cc..28cd633a7 100644
--- a/ihtml/themes/default/logout.tpl
+++ b/ihtml/themes/default/logout.tpl
@@ -7,7 +7,6 @@
  {t}The last interaction with the GOsa web interface has been some time ago in the past. For security reasons, the session has been closed. To continue with administrative tasks, please sign in again.{/t}
  </p>
  <br>
-{$kmsg}
  <center><input type="submit" name="dummy" value="{t}Sign in again{/t}"></center>
 </div>
 </form>
-- 
2.30.2