Changed session timeout

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2505 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/logout.php b/html/logout.php
index ba44304bf18e0a7799c0a7eca3537870742987d4..1ffbf9d8df21d5bbea541d16c20288727ebf5a20 100644 (file)
--- a/html/logout.php
+++ b/html/logout.php
@@ -25,6 +25,18 @@ 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 */
@@ -52,6 +64,7 @@ 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 dc9b66ece56f61539c818c67e356971d2361f731..b07cf1b8c92c9d5ca3a90e3d4f54a27eb210c19f 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -83,12 +83,12 @@ if(empty($_SESSION['_LAST_PAGE_REQUEST'])){
    * kill session
    */
   if($request_time > $max_life){
-    session_unset();
+    $_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>";
     gosa_log ("main.php called without session - logging out");
     header ("Location: logout.php");
     exit;
   }
-  //echo "Session was ".$request_time." s inactive";
+//  echo "Session was ".$request_time." s inactive";
   $_SESSION['_LAST_PAGE_REQUEST'] = time();
 }
 

diff --git a/ihtml/themes/default/logout.tpl b/ihtml/themes/default/logout.tpl
index 28cd633a7fc88c7ba0f289c2fafaa84b3fffa559..5189da0cc0fbeb895e5b025e3431adc55d8bb381 100644 (file)
--- a/ihtml/themes/default/logout.tpl
+++ b/ihtml/themes/default/logout.tpl
@@ -7,6 +7,7 @@
  {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>