diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-12-04 05:04:02 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-12-04 05:04:02 +0300 |
commit | 9d71fc8e92e5b434fd69c7ab4b83a69169064cf3 (patch) | |
tree | 8cb2798746e4defb1a978cd758df72006ec419ae /piwik.php | |
parent | 784b738f9c4a92c42a9d8e6b85c28a82a3af0a2f (diff) |
Tracker refactoring
Diffstat (limited to 'piwik.php')
-rw-r--r-- | piwik.php | 66 |
1 files changed, 19 insertions, 47 deletions
@@ -8,15 +8,13 @@ * @package Piwik */ -use Piwik\Common; -use Piwik\Timer; +use Piwik\Tracker\RequestSet; use Piwik\Tracker; +use Piwik\Tracker\Handler; // Note: if you wish to debug the Tracking API please see this documentation: // http://developer.piwik.org/api-reference/tracking-api#debugging-the-tracker -define('PIWIK_ENABLE_TRACKING', true); - if (!defined('PIWIK_DOCUMENT_ROOT')) { define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__)); } @@ -25,7 +23,6 @@ if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) { require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php'; } -$GLOBALS['PIWIK_TRACKER_MODE'] = true; error_reporting(E_ALL | E_NOTICE); @ini_set('xdebug.show_exception_trace', 0); @ini_set('magic_quotes_runtime', 0); @@ -62,62 +59,37 @@ require_once PIWIK_INCLUDE_PATH . '/core/IP.php'; require_once PIWIK_INCLUDE_PATH . '/core/UrlHelper.php'; require_once PIWIK_INCLUDE_PATH . '/core/Url.php'; require_once PIWIK_INCLUDE_PATH . '/core/SettingsPiwik.php'; +require_once PIWIK_INCLUDE_PATH . '/core/SettingsServer.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker.php'; require_once PIWIK_INCLUDE_PATH . '/core/Config.php'; require_once PIWIK_INCLUDE_PATH . '/core/Translate.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Cache.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db/DbException.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/IgnoreCookie.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/VisitInterface.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Visit.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/GoalManager.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/PageUrl.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/TableLogAction.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Action.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/ActionPageview.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Request.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/VisitExcluded.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Tracker/VisitorNotFoundInDb.php'; -require_once PIWIK_INCLUDE_PATH . '/core/CacheFile.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Filesystem.php'; require_once PIWIK_INCLUDE_PATH . '/core/Cookie.php'; +Tracker::loadTrackerEnvironment(); + session_cache_limiter('nocache'); @date_default_timezone_set('UTC'); -if (!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING) { - ob_start(); -} +$tracker = new Tracker(); +$requestSet = new RequestSet(); -\Piwik\FrontController::createConfigObject(); +ob_start(); -$GLOBALS['PIWIK_TRACKER_DEBUG'] = (bool) \Piwik\Config::getInstance()->Tracker['debug']; -if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) { - require_once PIWIK_INCLUDE_PATH . '/core/Error.php'; - \Piwik\Error::setErrorHandler(); - require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php'; - \Piwik\ExceptionHandler::setUp(); +try { + $handler = Handler\Factory::make(); + $response = $tracker->main($handler, $requestSet); - $timer = new Timer(); - Common::printDebug("Debug enabled - Input parameters: "); - Common::printDebug(var_export($_GET, true)); + if (!is_null($response)) { + echo $response; + } - \Piwik\Tracker\Db::enableProfiling(); +} catch (Exception $e) { + echo "Error:" . $e->getMessage(); + exit(1); } -if (!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING) { - $process = new Tracker(); - - try { - $process->main(); - } catch (Exception $e) { - echo "Error:" . $e->getMessage(); - exit(1); - } +if (ob_get_level() > 1) { ob_end_flush(); - if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) { - Common::printDebug($_COOKIE); - Common::printDebug((string)$timer); - } -} +}
\ No newline at end of file |