summaryrefslogtreecommitdiff
path: root/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rw-r--r--index.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/index.php b/index.php
index c80100a33..7dbfd8081 100644
--- a/index.php
+++ b/index.php
@@ -42,19 +42,19 @@
*/
// define global vars
-$INSTALL_PATH = './';
+$INSTALL_PATH = dirname($_SERVER['SCRIPT_FILENAME']);
$OUTPUT_TYPE = 'html';
$JS_OBJECT_NAME = 'rcmail';
-$CURRENT_PATH = dirname($_SERVER['SCRIPT_FILENAME']);
-if ($CURRENT_PATH!='')
- $CURRENT_PATH.='/';
+if (empty($INSTALL_PATH))
+ $INSTALL_PATH = './';
+else
+ $INSTALL_PATH .= '/';
-// set environment first
// RC include folders MUST be included FIRST to avoid other
// possible not compatible libraries (i.e PEAR) to be included
// instead the ones provided by RC
-ini_set('include_path', $INSTALL_PATH.PATH_SEPARATOR.$CURRENT_PATH.'program'.PATH_SEPARATOR.$CURRENT_PATH.'program/lib'.PATH_SEPARATOR.ini_get('include_path'));
+ini_set('include_path', $INSTALL_PATH.PATH_SEPARATOR.$INSTALL_PATH.'program'.PATH_SEPARATOR.$INSTALL_PATH.'program/lib'.PATH_SEPARATOR.ini_get('include_path'));
ini_set('session.name', 'sessid');
ini_set('session.use_cookies', 1);
@@ -143,7 +143,7 @@ else if ($_action=='logout' && isset($_SESSION['user_id']))
}
// check session cookie and auth string
-else if ($_action!='login' && $_auth && $sess_auth)
+else if ($_action!='login' && $sess_auth && $_SESSION['user_id'])
{
if ($_auth !== $sess_auth || $_auth != rcmail_auth_hash($_SESSION['client_id'], $_SESSION['auth_time']) ||
($CONFIG['session_lifetime'] && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < mktime()))