Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2010-07-06 04:04:35 +0400
committermattpiwik <matthieu.aubry@gmail.com>2010-07-06 04:04:35 +0400
commit52ce332c866505448a73cf836282faa4e8b9b620 (patch)
tree988ac08696a12a63ad9bd0d1065845845866ffbd /piwik.php
parenta725cfd4eb3d7476017960f6ed1c75477a68b378 (diff)
Introducing documented piwik.php PHP Tracking client.
Also adding integration test suite in place. * Adding new mechanism to trigger known tracking requests, then call all API methods get* and compare XML to the previous 'expected' XML. * make sure overwritten config files are not read during tests. Use defaults from global.ini.php. * piwik.php Tracker allow calling script to force Datetime and user IP for a specific request. * Wrote 3 main tests * wrong tracking requests should not return error and should not record anything * standard one visitor, 2 visits, with page view, download, outlink and goal tracked * Added integration test as an example in the ExampleAPI plugin (pretty simple to add testing code) TODO * Finish PiwikTracker and show it in UI * Show how to use image based tracker in UI * Add more tests (multi periods and multi sites) in Main.test.php * Fix failing Config.test.php test (when ran via all_tests.php doesn't fail otherwise) git-svn-id: http://dev.piwik.org/svn/trunk@2429 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'piwik.php')
-rw-r--r--piwik.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/piwik.php b/piwik.php
index 26ade476ab..b8d56896c6 100644
--- a/piwik.php
+++ b/piwik.php
@@ -58,7 +58,12 @@ if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
set_exception_handler('Piwik_ExceptionHandler');
printDebug($_GET);
Piwik_Tracker_Db::enableProfiling();
- Piwik::createConfigObject();
+ // Config might have been created by proxy-piwik.php
+ try {
+ $config = Zend_Registry::get('config');
+ } catch (Exception $e) {
+ Piwik::createConfigObject();
+ }
Piwik::createLogObject();
}