--- nfo/php/libs/org.netfrag.flib/Tracker/Session.php	2002/12/03 16:13:21	1.3
+++ nfo/php/libs/org.netfrag.flib/Tracker/Session.php	2002/12/04 07:41:30	1.4
@@ -1,8 +1,11 @@
 <?
 //    -------------------------------------------------------------------------
-//    $Id: Session.php,v 1.3 2002/12/03 16:13:21 joko Exp $
+//    $Id: Session.php,v 1.4 2002/12/04 07:41:30 jonen Exp $
 //    -------------------------------------------------------------------------
 //    $Log: Session.php,v $
+//    Revision 1.4  2002/12/04 07:41:30  jonen
+//    + merged conflic
+//
 //    Revision 1.3  2002/12/03 16:13:21  joko
 //    + bugfix with autologout:
 //      + now just setting some message to site_state here
@@ -125,7 +128,7 @@
       $time_now = time();
       $last_date = strtotime($mus[last_date]);
       $max_idle_date = $last_date + $max_idle_time;
-
+/*
     // check timeout
       if ($time_now > $max_idle_date) {
         // set autologout message
@@ -137,7 +140,8 @@
         $this->site->user->preLogout(1);
         $this->site->request->overrideRequestIdentifier('/home/logout/');
       }
-    
+*/  
+      return $max_idle_date;
   }  
 
 }