install/config.inc.php.patch

   1 --- ../0.7.4/config.inc.php     2011-03-03 02:26:11.565256656 +0100
   2 +++ ../config.inc.php   2011-03-11 21:57:11.855624358 +0100
   3 @@ -35,15 +35,17 @@
   4      require_once 'utils/authenticate.php';
   5      require_once 'utils/helper.php';
   6
   7 +    session_cache_limiter('private');
   8 +    if (isset($_COOKIE['WEBCAL_EXPIRE'])) {
   9 +        $expire = $_COOKIE['WEBCAL_EXPIRE'];
  10 +        session_cache_expire($expire);
  11 +        unset($_COOKIE['WEBCAL_EXPIRE']);
  12 +        setcookie('WEBCAL_EXPIRE', FALSE);
  13 +    }
  14 +    else
  15 +        session_cache_expire(TIMEOUT);
  16      session_start();
  17 -
  18 -    if (isset($_SESSION['user_settings']))
  19 -        $timeout = $_SESSION['user_settings']->getTimeout();
  20 -
  21 -    if (isset($timeout))
  22 -        ini_set('session.gc_maxlifetime', $timeout);
  23 -    else if (defined('TIMEOUT'))
  24 -        ini_set('session.gc_maxlifetime', TIMEOUT);
  25 +    $_SESSION['WEB_ROOT'] = WEB_ROOT;
  26
  27      error_reporting(E_ALL ^ E_NOTICE ^ E_USER_NOTICE);
  28
  29 @@ -69,4 +71,11 @@
  30          ini_set('log_errors', 'on');
  31          ini_set('error_log', LOG_FILE);
  32      }
  33 -?>
  34 +
  35 +    if (! isset($_SESSION['isTimeout'])) {
  36 +       if (isset($_SESSION['user_settings']))
  37 +               $_SESSION['user_settings']->isTimeout();
  38 +    }
  39 +    else
  40 +       unset($_SESSION['isTimeout']);
  41 +?>
  42 \ No newline at end of file