cs

plugins/API/Menu.php

@@ -15,6 +15,8 @@ use DeviceDetector\Parser\OperatingSystem;
 
 class Menu extends \Piwik\Plugin\Menu
 {
+    const DD_SHORT_NAME_ANDROID = 'AND';
+    const DD_SHORT_NAME_IOS     = 'IOS';
 
     public function configureTopMenu(MenuTop $menu)
     {
@@ -41,7 +43,7 @@ class Menu extends \Piwik\Plugin\Menu
 
         $ua = new OperatingSystem($_SERVER['HTTP_USER_AGENT']);
         $parsedOS = $ua->parse();
-        if (!empty($parsedOS['short_name']) && in_array($parsedOS['short_name'], array('AND', 'IOS'))) {
+        if (!empty($parsedOS['short_name']) && in_array($parsedOS['short_name'], array(self::DD_SHORT_NAME_ANDROID, self::DD_SHORT_NAME_IOS))) {
             $menu->add('Piwik Mobile App', null, array('module' => 'Proxy', 'action' => 'redirect', 'url' => 'http://piwik.org/mobile/'), true, 4);
         }
     }

plugins/DevicesDetection/functions.php

@@ -86,9 +86,16 @@ function getBrowserLogoExtended($short)
 
     $browserFamilies = BrowserParser::getAvailableBrowserFamilies();
 
-    if (!empty($short) && array_key_exists($short, BrowserParser::getAvailableBrowsers()) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) {
+    if (!empty($short) &&
+        array_key_exists($short, BrowserParser::getAvailableBrowsers()) &&
+        file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) {
+
         return sprintf($path, $short);
-    } elseif (!empty($short) && array_key_exists($family, $browserFamilies) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $browserFamilies[$family][0]))) {
+
+    } elseif (!empty($short) &&
+        array_key_exists($family, $browserFamilies) &&
+        file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $browserFamilies[$family][0]))) {
+
         return sprintf($path, $browserFamilies[$family][0]);
     }
     return sprintf($path, 'UNK');
@@ -119,7 +126,10 @@ function getDeviceTypeLabel($label)
 
     $deviceTypes = DeviceParser::getAvailableDeviceTypes();
 
-    if (is_numeric($label) && in_array($label, $deviceTypes) && isset($translations[array_search($label, $deviceTypes)])) {
+    if (is_numeric($label) &&
+        in_array($label, $deviceTypes) &&
+        isset($translations[array_search($label, $deviceTypes)])) {
+
         return Piwik::translate($translations[array_search($label, $deviceTypes)]);
     } else if (isset($translations[$label])) {
         return Piwik::translate($translations[$label]);
@@ -228,9 +238,16 @@ function getOsLogoExtended($short)
     $family = getOsFamilyFullNameExtended($short);
     $osFamilies = OperatingSystemParser::getAvailableOperatingSystemFamilies();
 
-    if (!empty($short) && array_key_exists($short, OperatingSystemParser::getAvailableOperatingSystems()) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) {
+    if (!empty($short) &&
+        array_key_exists($short, OperatingSystemParser::getAvailableOperatingSystems()) &&
+        file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) {
+
         return sprintf($path, $short);
-    } elseif (!empty($family) && array_key_exists($family, $osFamilies) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $osFamilies[$family][0]))) {
+
+    } elseif (!empty($family) &&
+        array_key_exists($family, $osFamilies) &&
+        file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $osFamilies[$family][0]))) {
+
         return sprintf($path, $osFamilies[$family][0]);
     }
     return sprintf($path, 'UNK');