diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-06-16 10:00:06 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-06-16 10:00:32 +0400 |
commit | 336cd45fd1c3c1df8aaf9f4980e24a563f0823c0 (patch) | |
tree | d36c100fd880af95014740312a7d48810fe2e2f4 /core/Tracker/Request.php | |
parent | fccdcc0c2c9416a283d35feb89fa689f9a32fcae (diff) |
moved some more dimensions to plugins, fixed some issues, removed some more duplicated code etc. Tests will not be green as there fixes to country detection
Diffstat (limited to 'core/Tracker/Request.php')
-rw-r--r-- | core/Tracker/Request.php | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index df551e7d82..0f62596b40 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -300,6 +300,11 @@ class Request return $value; } + public function getParams() + { + return $this->params; + } + public function getCurrentTimestamp() { return $this->timestamp; @@ -518,31 +523,6 @@ class Request return $this->forcedVisitorId; } - public function overrideLocation(&$visitorInfo) - { - if (!$this->isAuthenticated()) { - return; - } - - // check for location override query parameters (ie, lat, long, country, region, city) - static $locationOverrideParams = array( - 'country' => array('string', 'location_country'), - 'region' => array('string', 'location_region'), - 'city' => array('string', 'location_city'), - 'lat' => array('float', 'location_latitude'), - 'long' => array('float', 'location_longitude'), - ); - foreach ($locationOverrideParams as $queryParamName => $info) { - list($type, $visitorInfoKey) = $info; - - $value = Common::getRequestVar($queryParamName, false, $type, $this->params); - if (!empty($value)) { - $visitorInfo[$visitorInfoKey] = $value; - } - } - return; - } - public function getPlugins() { static $pluginsInOrder = array('fla', 'java', 'dir', 'qt', 'realp', 'pdf', 'wma', 'gears', 'ag', 'cookie'); |