From d987b1962b505b134eebc748e343d96f38e9f5a0 Mon Sep 17 00:00:00 2001 From: robocoder Date: Sun, 25 Apr 2010 14:00:36 +0000 Subject: refs #1279 - refactor session initialization code out of index.php git-svn-id: http://dev.piwik.org/svn/trunk@2121 59fd770c-687e-43c8-a1e3-f5a4ff64c105 --- index.php | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'index.php') diff --git a/index.php b/index.php index 9c3981af57..07c2ebc0de 100644 --- a/index.php +++ b/index.php @@ -31,42 +31,6 @@ if(!defined('PIWIK_INCLUDE_PATH')) define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT); } -if(!defined('PIWIK_SESSION_NAME')) -{ - define('PIWIK_SESSION_NAME', 'PIWIK_SESSID'); -} -@ini_set('session.name', PIWIK_SESSION_NAME); -if(ini_get('session.save_handler') == 'user') -{ - @ini_set('session.save_handler', 'files'); - @ini_set('session.save_path', ''); -} -if(ini_get('session.save_handler') == 'files') -{ - $sessionPath = ini_get('session.save_path'); - if(preg_match('/^[0-9]+;(.*)/', $sessionPath, $matches)) - { - $sessionPath = $matches[1]; - } - if(ini_get('safe_mode') || ini_get('open_basedir') || empty($sessionPath) || !@is_writable($sessionPath)) - { - $sessionPath = PIWIK_USER_PATH . '/tmp/sessions'; - @ini_set('session.save_path', $sessionPath); - if(!is_dir($sessionPath)) - { - @mkdir($sessionPath, 0755, true); - if(!is_dir($sessionPath)) - { - die("Error: Unable to mkdir $sessionPath"); - } - } - else if(!@is_writable($sessionPath)) - { - die("Error: $sessionPath is not writable"); - } - } -} - require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php'; // NOTE: the code above this comment must be PHP4 compatible @@ -77,7 +41,7 @@ require_once PIWIK_INCLUDE_PATH .'/core/Loader.php'; if(!defined('PIWIK_ENABLE_SESSION_START') || PIWIK_ENABLE_SESSION_START) { - Zend_Session::start(); + Piwik_Session::start(); } if(!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) -- cgit v1.2.3