diff options
Diffstat (limited to 'plugins/Live/Visitor.php')
| -rw-r--r-- | plugins/Live/Visitor.php | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 5d7441fc38..849521ba3d 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -6,13 +6,18 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik_Plugins - * @package Piwik_Live + * @package Live */ +namespace Piwik\Plugins\Live; + use Piwik\Piwik; use Piwik\Common; use Piwik\IP; use Piwik\Tracker; use Piwik\Tracker\Visit; +use Piwik\Plugins\API\API as MetaAPI; +use Piwik\Plugins\Referers\API as ReferersAPI; +use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; /** * @see plugins/Referers/functions.php @@ -27,10 +32,9 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; require_once PIWIK_INCLUDE_PATH . '/plugins/Provider/functions.php'; /** - * - * @package Piwik_Live + * @package Live */ -class Piwik_Live_Visitor +class Visitor { const DELIMITER_PLUGIN_NAME = ", "; @@ -102,7 +106,7 @@ class Piwik_Live_Visitor 'referrerSearchEngineUrl' => $this->getSearchEngineUrl(), 'referrerSearchEngineIcon' => $this->getSearchEngineIcon(), 'operatingSystem' => $this->getOperatingSystem(), - 'operatingSystemCode' => $this->getOperatingSystemCode(), + 'operatingSystemCode' => $this->getOperatingSystemCode(), 'operatingSystemShortName' => $this->getOperatingSystemShortName(), 'operatingSystemIcon' => $this->getOperatingSystemIcon(), 'browserFamily' => $this->getBrowserFamily(), @@ -244,17 +248,17 @@ class Piwik_Live_Visitor function getCountryName() { - return Piwik_CountryTranslate($this->getCountryCode()); + return \Piwik\Plugins\UserCountry\countryTranslate($this->getCountryCode()); } function getCountryFlag() { - return Piwik_getFlagFromCode($this->getCountryCode()); + return \Piwik\Plugins\UserCountry\getFlagFromCode($this->getCountryCode()); } function getContinent() { - return Piwik_ContinentTranslate($this->getContinentCode()); + return \Piwik\Plugins\UserCountry\continentTranslate($this->getContinentCode()); } function getContinentCode() @@ -274,7 +278,7 @@ class Piwik_Live_Visitor { $region = $this->getRegionCode(); if ($region != '' && $region != Visit::UNKNOWN_CODE) { - return Piwik_UserCountry_LocationProvider_GeoIp::getRegionNameFromCodes( + return GeoIp::getRegionNameFromCodes( $this->details['location_country'], $region); } return null; @@ -335,12 +339,12 @@ class Piwik_Live_Visitor function getRefererType() { - return Piwik_getRefererTypeFromShortName($this->details['referer_type']); + return \Piwik\Plugins\Referers\getRefererTypeFromShortName($this->details['referer_type']); } function getRefererTypeName() { - return Piwik_getRefererTypeLabel($this->details['referer_type']); + return \Piwik\Plugins\Referers\getRefererTypeLabel($this->details['referer_type']); } function getKeyword() @@ -349,7 +353,7 @@ class Piwik_Live_Visitor if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referers') && $this->getRefererType() == 'search' ) { - $keyword = Piwik_Referers_API::getCleanKeyword($keyword); + $keyword = \Piwik\Plugins\Referers\API::getCleanKeyword($keyword); } return urldecode($keyword); } @@ -358,7 +362,7 @@ class Piwik_Live_Visitor { if ($this->getRefererType() == 'search') { if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referers') - && $this->details['referer_keyword'] == Piwik_Referers_API::LABEL_KEYWORD_NOT_DEFINED + && $this->details['referer_keyword'] == ReferersAPI::LABEL_KEYWORD_NOT_DEFINED ) { return 'http://piwik.org/faq/general/#faq_144'; } // Case URL is google.XX/url.... then we rewrite to the search result page url @@ -367,7 +371,7 @@ class Piwik_Live_Visitor ) { $refUrl = @parse_url($this->details['referer_url']); if (isset($refUrl['host'])) { - $url = Piwik_getSearchEngineUrlFromUrlAndKeyword('http://google.com', $this->getKeyword()); + $url = \Piwik\Plugins\Referers\getSearchEngineUrlFromUrlAndKeyword('http://google.com', $this->getKeyword()); $url = str_replace('google.com', $refUrl['host'], $url); return $url; } @@ -406,7 +410,7 @@ class Piwik_Live_Visitor if ($this->getRefererType() == 'search' && !empty($this->details['referer_name']) ) { - return Piwik_getSearchEngineUrlFromName($this->details['referer_name']); + return \Piwik\Plugins\Referers\getSearchEngineUrlFromName($this->details['referer_name']); } return null; } @@ -415,7 +419,7 @@ class Piwik_Live_Visitor { $searchEngineUrl = $this->getSearchEngineUrl(); if (!is_null($searchEngineUrl)) { - return Piwik_getSearchEngineLogoFromUrl($searchEngineUrl); + return \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl($searchEngineUrl); } return null; } @@ -451,7 +455,7 @@ class Piwik_Live_Visitor $pluginIcons = array(); foreach ($pluginNames as $plugin) { - $pluginIcons[] = array("pluginIcon" => Piwik_getPluginsLogo($plugin), "pluginName" => $plugin); + $pluginIcons[] = array("pluginIcon" => \Piwik\Plugins\UserSettings\getPluginsLogo($plugin), "pluginName" => $plugin); } return $pluginIcons; } @@ -465,27 +469,27 @@ class Piwik_Live_Visitor function getOperatingSystem() { - return Piwik_getOSLabel($this->details['config_os']); + return \Piwik\Plugins\UserSettings\getOSLabel($this->details['config_os']); } function getOperatingSystemShortName() { - return Piwik_getOSShortLabel($this->details['config_os']); + return \Piwik\Plugins\UserSettings\getOSShortLabel($this->details['config_os']); } function getOperatingSystemIcon() { - return Piwik_getOSLogo($this->details['config_os']); + return \Piwik\Plugins\UserSettings\getOSLogo($this->details['config_os']); } function getBrowserFamilyDescription() { - return Piwik_getBrowserTypeLabel($this->getBrowserFamily()); + return \Piwik\Plugins\UserSettings\getBrowserTypeLabel($this->getBrowserFamily()); } function getBrowserFamily() { - return Piwik_getBrowserFamily($this->details['config_browser_name']); + return \Piwik\Plugins\UserSettings\getBrowserFamily($this->details['config_browser_name']); } function getBrowserCode() @@ -500,23 +504,23 @@ class Piwik_Live_Visitor function getBrowser() { - return Piwik_getBrowserLabel($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); + return \Piwik\Plugins\UserSettings\getBrowserLabel($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); } function getBrowserIcon() { - return Piwik_getBrowsersLogo($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); + return \Piwik\Plugins\UserSettings\getBrowsersLogo($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); } function getScreenType() { - return Piwik_getScreenTypeFromResolution($this->details['config_resolution']); + return \Piwik\Plugins\UserSettings\getScreenTypeFromResolution($this->details['config_resolution']); } function getDeviceType() { - if(\Piwik\PluginsManager::getInstance()->isPluginActivated('DevicesDetection')) { - return Piwik_getDeviceTypeLabel($this->details['config_device_type']); + if (\Piwik\PluginsManager::getInstance()->isPluginActivated('DevicesDetection')) { + return \Piwik\Plugins\DevicesDetection\getDeviceTypeLabel($this->details['config_device_type']); } return false; } @@ -528,9 +532,9 @@ class Piwik_Live_Visitor function getScreenTypeIcon() { - return Piwik_getScreensLogo($this->getScreenType()); + return \Piwik\Plugins\UserSettings\getScreensLogo($this->getScreenType()); } - + function getProvider() { if (isset($this->details['location_provider'])) { @@ -542,12 +546,12 @@ class Piwik_Live_Visitor function getProviderName() { - return Piwik_Provider_getPrettyProviderName($this->getProvider()); + return \Piwik\Plugins\Provider\getPrettyProviderName($this->getProvider()); } function getProviderUrl() { - return Piwik_getHostnameUrl(@$this->details['location_provider']); + return \Piwik\Plugins\Provider\getHostnameUrl(@$this->details['location_provider']); } function getDateTimeLastAction() @@ -569,7 +573,7 @@ class Piwik_Live_Visitor function getVisitEcommerceStatus() { - return Piwik_API_API::getVisitEcommerceStatusFromId($this->details['visit_goal_buyer']); + return MetaAPI::getVisitEcommerceStatusFromId($this->details['visit_goal_buyer']); } function getVisitorGoalConvertedIcon() |