1 files changed, 37 insertions, 32 deletions

diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
index 41269b773b..28215d2e44 100644
--- a/plugins/UserSettings/functions.php
+++ b/plugins/UserSettings/functions.php
@@ -6,17 +6,22 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_UserSettings
+ * @package UserSettings
  */
+
+namespace Piwik\Plugins\UserSettings;
+
 use Piwik\Piwik;
+use Piwik\Plugins\UserSettings\UserSettings;
 use Piwik\Tracker\Request;
+use UserAgentParser;
 
 /**
  * @see libs/UserAgentParser/UserAgentParser.php
  */
 require_once PIWIK_INCLUDE_PATH . '/libs/UserAgentParser/UserAgentParser.php';
 
-function Piwik_getPluginsLogo($oldLabel)
+function getPluginsLogo($oldLabel)
 {
     if($oldLabel == Piwik_Translate('General_Others')) {
         return false;
@@ -24,7 +29,7 @@ function Piwik_getPluginsLogo($oldLabel)
     return 'plugins/UserSettings/images/plugins/' . $oldLabel . '.gif';
 }
 
-function Piwik_getOSLabel($osId)
+function getOSLabel($osId)
 {
     $osName = UserAgentParser::getOperatingSystemNameFromId($osId);
     if ($osName !== false) {
@@ -36,7 +41,7 @@ function Piwik_getOSLabel($osId)
     return $osId;
 }
 
-function Piwik_getOSShortLabel($osId)
+function getOSShortLabel($osId)
 {
     $osShortName = UserAgentParser::getOperatingSystemShortNameFromId($osId);
     if ($osShortName !== false) {
@@ -49,7 +54,7 @@ function Piwik_getOSShortLabel($osId)
 }
 
 
-function Piwik_UserSettings_getOSFamily($osLabel)
+function getOSFamily($osLabel)
 {
     $osId = UserAgentParser::getOperatingSystemIdFromName($osLabel);
     $osFamily = UserAgentParser::getOperatingSystemFamilyFromId($osId);
@@ -63,7 +68,7 @@ function Piwik_UserSettings_getOSFamily($osLabel)
     return $osFamily;
 }
 
-function Piwik_UserSettings_getDeviceTypeFromOS($osLabel)
+function getDeviceTypeFromOS($osLabel)
 {
     $osId = UserAgentParser::getOperatingSystemIdFromName($osLabel);
     $osFamily = UserAgentParser::getOperatingSystemFamilyFromId($osId);
@@ -88,10 +93,10 @@ function Piwik_UserSettings_getDeviceTypeFromOS($osLabel)
     }
 }
 
-function Piwik_getBrowserTypeLabel($oldLabel)
+function getBrowserTypeLabel($oldLabel)
 {
-    if (isset(Piwik_UserSettings::$browserType_display[$oldLabel])) {
-        return Piwik_UserSettings::$browserType_display[$oldLabel];
+    if (isset(UserSettings::$browserType_display[$oldLabel])) {
+        return UserSettings::$browserType_display[$oldLabel];
     }
     if ($oldLabel == 'unknown') {
         return Piwik_Translate('General_Unknown');
@@ -100,14 +105,14 @@ function Piwik_getBrowserTypeLabel($oldLabel)
 }
 
 
-function Piwik_getConfigurationLabel($str)
+function getConfigurationLabel($str)
 {
     if (strpos($str, ';') === false) {
         return $str;
     }
     $values = explode(";", $str);
 
-    $os = Piwik_getOSLabel($values[0]);
+    $os = getOSLabel($values[0]);
     $name = $values[1];
     $browser = UserAgentParser::getBrowserNameFromId($name);
     if ($browser === false) {
@@ -117,10 +122,10 @@ function Piwik_getConfigurationLabel($str)
     return $os . " / " . $browser . " / " . $resolution;
 }
 
-function Piwik_getBrowserLabel($oldLabel)
+function getBrowserLabel($oldLabel)
 {
-    $browserId = Piwik_getBrowserId($oldLabel);
-    $version = Piwik_getBrowserVersion($oldLabel);
+    $browserId = getBrowserId($oldLabel);
+    $version = getBrowserVersion($oldLabel);
     $browserName = UserAgentParser::getBrowserNameFromId($browserId);
     if ($browserName !== false) {
         return $browserName . " " . $version;
@@ -131,10 +136,10 @@ function Piwik_getBrowserLabel($oldLabel)
     return $oldLabel;
 }
 
-function Piwik_getBrowserShortLabel($oldLabel)
+function getBrowserShortLabel($oldLabel)
 {
-    $browserId = Piwik_getBrowserId($oldLabel);
-    $version = Piwik_getBrowserVersion($oldLabel);
+    $browserId = getBrowserId($oldLabel);
+    $version = getBrowserVersion($oldLabel);
     $browserName = UserAgentParser::getBrowserShortNameFromId($browserId);
     if ($browserName !== false) {
         return $browserName . " " . $version;
@@ -145,17 +150,17 @@ function Piwik_getBrowserShortLabel($oldLabel)
     return $oldLabel;
 }
 
-function Piwik_getBrowserId($str)
+function getBrowserId($str)
 {
     return substr($str, 0, strpos($str, ';'));
 }
 
-function Piwik_getBrowserVersion($str)
+function getBrowserVersion($str)
 {
     return substr($str, strpos($str, ';') + 1);
 }
 
-function Piwik_getLogoImageFromId($dir, $id)
+function getLogoImageFromId($dir, $id)
 {
     $path = $dir.'/'.$id.'.gif';
     if (file_exists(PIWIK_INCLUDE_PATH . '/' . $path)) {
@@ -165,31 +170,31 @@ function Piwik_getLogoImageFromId($dir, $id)
     }
 }
 
-function Piwik_getBrowsersLogo($label)
+function getBrowsersLogo($label)
 {
-    $id = Piwik_getBrowserId($label);
+    $id = getBrowserId($label);
     // For aggregated row 'Others'
     if (empty($id)) {
         $id = 'UNK';
     }
-    return Piwik_getLogoImageFromId('plugins/UserSettings/images/browsers', $id);
+    return getLogoImageFromId('plugins/UserSettings/images/browsers', $id);
 }
 
-function Piwik_getOSLogo($label)
+function getOSLogo($label)
 {
     // For aggregated row 'Others'
     if (empty($label)) {
         $label = 'UNK';
     }
-    return Piwik_getLogoImageFromId('plugins/UserSettings/images/os', $label);
+    return getLogoImageFromId('plugins/UserSettings/images/os', $label);
 }
 
-function Piwik_getScreensLogo($label)
+function getScreensLogo($label)
 {
     return 'plugins/UserSettings/images/screens/' . $label . '.gif';
 }
 
-function Piwik_UserSettings_getDeviceTypeImg($oldOSImage, $osFamilyLabel)
+function getDeviceTypeImg($oldOSImage, $osFamilyLabel)
 {
     switch ($osFamilyLabel) {
         case 'General_Desktop':
@@ -202,12 +207,12 @@ function Piwik_UserSettings_getDeviceTypeImg($oldOSImage, $osFamilyLabel)
     }
 }
 
-function Piwik_UserSettings_keepStrlenGreater($value)
+function keepStrlenGreater($value)
 {
     return strlen($value) > 5;
 }
 
-function Piwik_getScreenTypeFromResolution($resolution)
+function getScreenTypeFromResolution($resolution)
 {
     if ($resolution === Request::UNKNOWN_RESOLUTION) {
         return $resolution;
@@ -229,7 +234,7 @@ function Piwik_getScreenTypeFromResolution($resolution)
     return $name;
 }
 
-function Piwik_getBrowserFamily($browserLabel)
+function getBrowserFamily($browserLabel)
 {
     $familyNameToUse = UserAgentParser::getBrowserFamilyFromId(substr($browserLabel, 0, 2));
     return $familyNameToUse;
@@ -238,7 +243,7 @@ function Piwik_getBrowserFamily($browserLabel)
 /**
  * Extracts the browser name from a string with the browser name and version.
  */
-function Piwik_UserSettings_getBrowserFromBrowserVersion($browserWithVersion)
+function getBrowserFromBrowserVersion($browserWithVersion)
 {
     if (preg_match("/(.+) [0-9]+(?:\.[0-9]+)?$/", $browserWithVersion, $matches) === 0) {
         return $browserWithVersion;
@@ -254,7 +259,7 @@ function Piwik_UserSettings_getBrowserFromBrowserVersion($browserWithVersion)
  *
  * @return string
  */
-function Piwik_LanguageTranslate($label)
+function languageTranslate($label)
 {
     if ($label == '' || $label == 'xx') {
         return Piwik_Translate('General_Unknown');