diff --git a/CHANGELOG.md b/CHANGELOG.md index cd16152b517..760afdf8a73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API's, Plugins, Themes, etc will be listed here. +## Piwik 2.10.0 + +### Breaking Changes +* Some duplicate reports from UserSettings plugin have been removed. Widget URLs for those reports will still work till May 1st 2015. Please update those to the new reports of DevicesDetection plugin. + +### Deprecations +* The API method `UserSettings.getBrowserVersion` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserVersions` instead +* The API method `UserSettings.getBrowser` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowsers` instead +* The API method `UserSettings.getOSFamily` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getOsFamilies` instead +* The API method `UserSettings.getOS` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getOsVersions` instead +* The API method `UserSettings.getMobileVsDesktop` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getType` instead +* The API method `UserSettings.getBrowserType` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserEngines` instead +* The API method `UserSettings.getWideScreen` is deprecated and will be removed from May 1st 2015. Use `UserSettings.getScreenType` instead + ## Piwik 2.9.1 ### Breaking Changes @@ -48,13 +62,13 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API' ### Deprecations * The `Piwik::setUserHasSuperUserAccess` method is deprecated, instead use Access::doAsSuperUser. This method will ensure that super user access is properly rescinded after the callback finishes. -* The class is `\IntegrationTestCase` deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\TestCase\SystemTestCase` instead. -* The class is `\DatabaseTestCase` deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\TestCase\IntegrationTestCase` instead. -* The class is `\BenchmarkTestCase` deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\TestCase\BenchmarkTestCase` instead. -* The class is `\ConsoleCommandTestCase` deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\TestCase\ConsoleCommandTestCase` instead. -* The class is `\FakeAccess` deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\Mock\FakeAccess` instead. -* The class is `\Piwik\Tests\Fixture` deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\Fixture` instead. -* The class is `\Piwik\Tests\OverrideLogin` deprecated and will be removed from February 6ths 2015. Use `\Piwik\Framework\Framework\OverrideLogin` instead. +* The class `\IntegrationTestCase` is deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\TestCase\SystemTestCase` instead. +* The class `\DatabaseTestCase` is deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\TestCase\IntegrationTestCase` instead. +* The class `\BenchmarkTestCase` is deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\TestCase\BenchmarkTestCase` instead. +* The class `\ConsoleCommandTestCase` is deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\TestCase\ConsoleCommandTestCase` instead. +* The class `\FakeAccess` is deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\Mock\FakeAccess` instead. +* The class `\Piwik\Tests\Fixture` is deprecated and will be removed from February 6th 2015. Use `\Piwik\Tests\Framework\Fixture` instead. +* The class `\Piwik\Tests\OverrideLogin` is deprecated and will be removed from February 6ths 2015. Use `\Piwik\Framework\Framework\OverrideLogin` instead. ### New API Features * The pivotBy and related query parameters can be used to pivot reports by another dimension. Read more about the new query parameters [here](http://developer.piwik.org/api-reference/reporting-api#optional-api-parameters). diff --git a/LEGALNOTICE b/LEGALNOTICE index 5dd1db2ea47..e6c5a1e9c01 100644 --- a/LEGALNOTICE +++ b/LEGALNOTICE @@ -69,10 +69,6 @@ SEPARATELY LICENSED COMPONENTS AND LIBRARIES Link: https://github.com/piwik/device-detector License: LGPL - Name: UserAgentParser - Link: https://github.com/piwik/piwik/blob/master/libs/UserAgentParser/ - License: New BSD - Name: Piwik/Decompress Link: https://github.com/piwik/component-decompress License: LGPL v3.0 diff --git a/core/Updates/2.10.0-b1.php b/core/Updates/2.10.0-b1.php new file mode 100644 index 00000000000..6a739b64688 --- /dev/null +++ b/core/Updates/2.10.0-b1.php @@ -0,0 +1,252 @@ + false); + + // update scheduled reports to use new plugin + $reportsToReplace = array( + 'UserSettings_getBrowserVersion' => 'DevicesDetection_getBrowserVersions', + 'UserSettings_getBrowser' => 'DevicesDetection_getBrowsers', + 'UserSettings_getOSFamily' => 'DevicesDetection_getOsFamilies', + 'UserSettings_getOS' => 'DevicesDetection_getOsVersions', + 'UserSettings_getMobileVsDesktop' => 'DevicesDetection_getType', + 'UserSettings_getBrowserType' => 'DevicesDetection_getBrowserEngines', + 'UserSettings_getWideScreen' => 'UserSettings_getScreenType', + ); + + foreach ($reportsToReplace as $old => $new) { + $sqls["UPDATE " . Common::prefixTable('report') . " SET reports = REPLACE(reports, '".$old."', '".$new."')"] = false; + } + + // update dashboard to use new widgets + $oldWidgets = array( + array('module' => 'UserSettings', 'action' => 'getBrowserVersion', 'params' => array()), + array('module' => 'UserSettings', 'action' => 'getBrowser', 'params' => array()), + array('module' => 'UserSettings', 'action' => 'getOSFamily', 'params' => array()), + array('module' => 'UserSettings', 'action' => 'getOS', 'params' => array()), + array('module' => 'UserSettings', 'action' => 'getMobileVsDesktop', 'params' => array()), + array('module' => 'UserSettings', 'action' => 'getBrowserType', 'params' => array()), + array('module' => 'UserSettings', 'action' => 'getWideScreen', 'params' => array()), + ); + + $newWidgets = array( + array('module' => 'DevicesDetection', 'action' => 'getBrowserVersions', 'params' => array()), + array('module' => 'DevicesDetection', 'action' => 'getBrowsers', 'params' => array()), + array('module' => 'DevicesDetection', 'action' => 'getOsFamilies', 'params' => array()), + array('module' => 'DevicesDetection', 'action' => 'getOsVersions', 'params' => array()), + array('module' => 'DevicesDetection', 'action' => 'getType', 'params' => array()), + array('module' => 'DevicesDetection', 'action' => 'getBrowserEngines', 'params' => array()), + array('module' => 'UserSettings', 'action' => 'getScreenType', 'params' => array()), + ); + + $allDashboards = Db::get()->fetchAll(sprintf("SELECT * FROM %s", Common::prefixTable('user_dashboard'))); + + foreach($allDashboards AS $dashboard) { + + $dashboardLayout = json_decode($dashboard['layout']); + + $dashboardLayout = DashboardModel::replaceDashboardWidgets($dashboardLayout, $oldWidgets, $newWidgets); + + $newLayout = json_encode($dashboardLayout); + if ($newLayout != $dashboard['layout']) { + $sqls["UPDATE " . Common::prefixTable('user_dashboard') . " SET layout = '".addslashes($newLayout)."' WHERE iddashboard = ".$dashboard['iddashboard']] = false; + } + } + + return $sqls; + } + + static function update() + { + Updater::updateDatabase(__FILE__, self::getSql()); + + $archiveBlobTables = self::getAllArchiveBlobTables(); + + foreach ($archiveBlobTables as $table) { + self::updateBrowserArchives($table); + self::updateOsArchives($table); + } + } + + /** + * Returns all available archive blob tables + * + * @return array + */ + public static function getAllArchiveBlobTables() + { + static $archiveBlobTables; + + if (empty($archiveBlobTables)) { + + $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled(); + + $archiveBlobTables = array_filter($archiveTables, function($name) { + return ArchiveTableCreator::getTypeFromTableName($name) == ArchiveTableCreator::BLOB_TABLE; + }); + + // sort tables so we have them in order of their date + rsort($archiveBlobTables); + } + + return (array) $archiveBlobTables; + } + + /** + * Find the first day on which DevicesDetection archives were generated + * + * @return int Timestamp + */ + public static function getFirstDayOfArchivedDeviceDetectorData() + { + static $deviceDetectionBlobAvailableDate; + + if (empty($deviceDetectionBlobAvailableDate)) { + + $archiveBlobTables = self::getAllArchiveBlobTables(); + + $deviceDetectionBlobAvailableDate = null; + foreach ($archiveBlobTables as $table) { + + // Look for all day archives and try to find that with the lowest date + $deviceDetectionBlobAvailableDate = Db::get()->fetchOne(sprintf("SELECT date1 FROM %s WHERE name = 'DevicesDetection_browserVersions' AND period = 1 ORDER BY date1 ASC LIMIT 1", $table)); + + if (!empty($deviceDetectionBlobAvailableDate)) { + break; + } + + } + + $deviceDetectionBlobAvailableDate = strtotime($deviceDetectionBlobAvailableDate); + } + + return $deviceDetectionBlobAvailableDate; + } + + /** + * Updates all browser archives to new structure + * @param string $table + * @throws \Exception + */ + public static function updateBrowserArchives($table) + { + // rename old UserSettings archives where no DeviceDetection archives exists + Db::exec(sprintf("UPDATE IGNORE %s SET name='DevicesDetection_browserVersions' WHERE name = 'UserSettings_browser'", $table)); + + /* + * check dates of remaining (non-day) archives with calculated safe date + * archives before or within that week/month/year of that date will be replaced + */ + $oldBrowserBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'UserSettings_browser' AND `period` > 1", $table)); + foreach ($oldBrowserBlobs as $blob) { + + // if start date of blob is before calculated date us old usersettings archive instead of already existing DevicesDetection archive + if (strtotime($blob['date1']) < self::getFirstDayOfArchivedDeviceDetectorData()) { + + Db::get()->query(sprintf("DELETE FROM %s WHERE idarchive = ? AND name = ?", $table), array($blob['idarchive'], 'DevicesDetection_browserVersions')); + Db::get()->query(sprintf("UPDATE %s SET name = ? WHERE idarchive = ? AND name = ?", $table), array('DevicesDetection_browserVersions', $blob['idarchive'], 'UserSettings_browser')); + } + } + + // rebuild archives without versions + $browserBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'DevicesDetection_browserVersions'", $table)); + foreach ($browserBlobs as $blob) { + self::createArchiveBlobWithoutVersions($blob, 'DevicesDetection_browsers', $table); + } + } + + public static function updateOsArchives($table) { + Db::exec(sprintf("UPDATE IGNORE %s SET name='DevicesDetection_osVersions' WHERE name = 'UserSettings_os'", $table)); + + /* + * check dates of remaining (non-day) archives with calculated safe date + * archives before or within that week/month/year of that date will be replaced + */ + $oldOsBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'UserSettings_os' AND `period` > 1", $table)); + foreach ($oldOsBlobs as $blob) { + + // if start date of blob is before calculated date us old usersettings archive instead of already existing DevicesDetection archive + if (strtotime($blob['date1']) < self::getFirstDayOfArchivedDeviceDetectorData()) { + + Db::get()->query(sprintf("DELETE FROM %s WHERE idarchive = ? AND name = ?", $table), array($blob['idarchive'], 'DevicesDetection_osVersions')); + Db::get()->query(sprintf("UPDATE %s SET name = ? WHERE idarchive = ? AND name = ?", $table), array('DevicesDetection_osVersions', $blob['idarchive'], 'UserSettings_os')); + } + } + + // rebuild archives without versions + $osBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'DevicesDetection_osVersions'", $table)); + foreach ($osBlobs as $blob) { + self::createArchiveBlobWithoutVersions($blob, 'DevicesDetection_os', $table); + } + } + + protected static function createArchiveBlobWithoutVersions($blob, $newName, $table) + { + $blob['value'] = @gzuncompress($blob['value']); + + $datatable = DataTable::fromSerializedArray($blob['value']); + $datatable->filter('GroupBy', array('label', function ($label) { + if (preg_match("/(.+) [0-9]+(?:\.[0-9]+)?$/", $label, $matches)) { + return $matches[1]; // should match for browsers + } + + if (strpos($label, ';')) { + return substr($label, 0, 3); // should match for os + } + + return $label; + })); + + $newData = $datatable->getSerialized(); + + $blob['value'] = @gzcompress($newData[0]); + $blob['name'] = $newName; + + Db::get()->query(sprintf('REPLACE INTO %s (`idarchive`, `name`, `idsite`, `date1`, `date2`, `period`, `ts_archived`, `value`) VALUES (?, ? , ?, ?, ?, ?, ?, ?)', $table), array_values($blob)); + } +} diff --git a/core/Version.php b/core/Version.php index 80614277c56..fcf7e8f40d4 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,5 +20,5 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.9.1'; + const VERSION = '2.10.0-b1'; } diff --git a/core/WidgetsList.php b/core/WidgetsList.php index e67f6b1b770..943dfceb68a 100644 --- a/core/WidgetsList.php +++ b/core/WidgetsList.php @@ -159,18 +159,15 @@ protected static function _sortWidgetCategories($a, $b) } /** - * Adds a report to the list of dashboard widgets. + * Returns the unique id of an widget with the given parameters * - * @param string $widgetCategory The widget category. This can be a translation token. - * @param string $widgetName The name of the widget. This can be a translation token. - * @param string $controllerName The report's controller name (same as the plugin name). - * @param string $controllerAction The report's controller action method name. - * @param array $customParameters Extra query parameters that should be sent while getting - * this report. + * @param $controllerName + * @param $controllerAction + * @param array $customParameters + * @return string */ - public static function add($widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters = array()) + public static function getWidgetUniqueId($controllerName, $controllerAction, $customParameters = array()) { - $widgetName = Piwik::translate($widgetName); $widgetUniqueId = 'widget' . $controllerName . $controllerAction; foreach ($customParameters as $name => $value) { @@ -182,6 +179,24 @@ public static function add($widgetCategory, $widgetName, $controllerName, $contr $widgetUniqueId .= $name . $value; } + return $widgetUniqueId; + } + + /** + * Adds a report to the list of dashboard widgets. + * + * @param string $widgetCategory The widget category. This can be a translation token. + * @param string $widgetName The name of the widget. This can be a translation token. + * @param string $controllerName The report's controller name (same as the plugin name). + * @param string $controllerAction The report's controller action method name. + * @param array $customParameters Extra query parameters that should be sent while getting + * this report. + */ + public static function add($widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters = array()) + { + $widgetName = Piwik::translate($widgetName); + $widgetUniqueId = self::getWidgetUniqueId($controllerName, $controllerAction, $customParameters); + if (!array_key_exists($widgetCategory, self::$widgets)) { self::$widgets[$widgetCategory] = array(); } diff --git a/libs/UserAgentParser/README.md b/libs/UserAgentParser/README.md deleted file mode 100644 index 110e533f17a..00000000000 --- a/libs/UserAgentParser/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# UserAgentParser - -UserAgentParser is a php library to parse user agents, -and extracts browser name & version and operating system. - -UserAgentParser is NOT designed to parse bots user agent strings; -UserAgentParser will only be accurate when parsing user agents -coming from Javascript Enabled browsers! - -UserAgentParser is designed for simplicity, to accurately detect the -most used web browsers, and be regularly updated to detect new OS and browsers. - -Potential limitations: - - * it does NOT detect sub sub versions, ie. the "5" in 1.4.5; this is a design decision to simplify the version number - * it does NOT detect search engine, bots, etc. user agents; it's designed to detect browsers with javascript enabled - * it does NOT detect nested UA strings caused by some browser add-ons - -Feature request: - - * it could have the notion of operating system "types", ie "Windows". It currently only has "Windows XP", "Windows Vista", etc. - -Feedback, patches: hello@piwik.org diff --git a/libs/UserAgentParser/UserAgentParser.php b/libs/UserAgentParser/UserAgentParser.php deleted file mode 100644 index 009bc5a7853..00000000000 --- a/libs/UserAgentParser/UserAgentParser.php +++ /dev/null @@ -1,729 +0,0 @@ - 'FF' - * 'name' => 'Firefox' - * 'short_name' => 'Firefox' - * 'version' => '3.0' - * 'major_number' => '3' - * 'minor_number' => '0' - * - * Operating System info: - * var_dump(UserAgentParser::getOperatingSystem($_SERVER['HTTP_USER_AGENT'])); - * - * Outputs: - * array - * 'id' => 'WXP' - * 'name' => 'Windows XP' - * 'short_name' => 'Win XP' - * - */ -class UserAgentParser -{ - // browser regex => browser ID - // if there are aliases, the common name should be last - static protected $browsers = array( - 'abrowse' => 'AB', - 'amaya' => 'AM', - 'amigavoyager' => 'AV', - 'amiga-aweb' => 'AW', - 'arora' => 'AR', - 'beonex' => 'BE', - - // BlackBerry smartphones and tablets - 'blackberry' => 'BB', // BlackBerry 6 and PlayBook adopted webkit - 'bb10' => 'B2', // BlackBerry 10 - 'playbook' => 'BP', - - 'browsex' => 'BX', - - // Camino (and earlier incarnation) - 'chimera' => 'CA', - 'camino' => 'CA', - - 'cheshire' => 'CS', - - // Chrome, Chromium, and ChromePlus - 'crmo' => 'CH', - 'chrome' => 'CH', - - // Chrome Frame - 'chromeframe' => 'CF', - - 'cometbird' => 'CO', - 'dillo' => 'DI', - 'elinks' => 'EL', - 'epiphany' => 'EP', - 'fennec' => 'FE', - - // Dolfin (or Dolphin) - 'dolfin' => 'DF', - - // Firefox (in its many incarnations and rebranded versions) - 'phoenix' => 'PX', - 'mozilla firebird' => 'FB', - 'firebird' => 'FB', - 'bonecho' => 'FF', - 'minefield' => 'FF', - 'namoroka' => 'FF', - 'shiretoko' => 'FF', - 'granparadiso' => 'FF', - 'iceweasel' => 'FF', - 'icecat' => 'FF', - 'firefox' => 'FF', - - 'thunderbird' => 'TB', - - 'flock' => 'FL', - 'fluid' => 'FD', - 'galeon' => 'GA', - 'google earth' => 'GE', - 'hana' => 'HA', - 'hotjava' => 'HJ', - 'ibrowse' => 'IB', - 'icab' => 'IC', - - // IE (including shells: Acoo, AOL, Avant, Crazy Browser, Green Browser, KKMAN, Maxathon) - 'msie' => 'IE', - 'trident' => 'IE', - 'microsoft internet explorer' => 'IE', - 'internet explorer' => 'IE', - - 'iron' => 'IR', - 'kapiko' => 'KP', - 'kazehakase' => 'KZ', - 'k-meleon' => 'KM', - 'konqueror' => 'KO', - 'links' => 'LI', - 'lynx' => 'LX', - 'midori' => 'MI', - - // SeaMonkey (formerly Mozilla Suite) (and rebranded versions) - 'mozilla' => 'MO', - 'gnuzilla' => 'SM', - 'iceape' => 'SM', - 'seamonkey' => 'SM', - - // NCSA Mosaic (and incarnations) - 'mosaic' => 'MC', - 'ncsa mosaic' => 'MC', - - // Netscape Navigator - 'navigator' => 'NS', - 'netscape6' => 'NS', - 'netscape' => 'NS', - - 'nx' => 'NF', - 'netfront' => 'NF', - - 'omniweb' => 'OW', - - // Opera - 'nitro) opera' => 'OP', - 'opera' => 'OP', - - 'rekonq' => 'RK', - - // Safari - 'safari' => 'SF', - 'applewebkit' => 'SF', - - 'titanium' => 'TI', - - 'webos' => 'WO', - 'webpro' => 'WP', - ); - - // browser family (by layout engine) - static protected $browserType = array( - 'ie' => array('IE'), - 'gecko' => array('NS', 'PX', 'FF', 'FB', 'CA', 'GA', 'KM', 'MO', 'SM', 'CO', 'FE', 'KP', 'KZ', 'TB'), - 'khtml' => array('KO'), - 'webkit' => array('SF', 'CH', 'OW', 'AR', 'EP', 'FL', 'WO', 'AB', 'IR', 'CS', 'FD', 'HA', 'MI', 'GE', 'DF', 'BB', 'BP', 'TI', 'CF', 'RK', 'B2', 'NF'), - 'opera' => array('OP'), - ); - - // WebKit version numbers to Apple Safari version numbers (if Version/X.Y.Z not present) - static protected $safariVersions = array( - '536.25' => array('6', '0'), - '534.48' => array('5', '1'), - '533.16' => array('5', '0'), - '533.4' => array('4', '1'), - '526.11.2' => array('4', '0'), - '525.26' => array('3', '2'), - '525.13' => array('3', '1'), - '522.11' => array('3', '0'), - '412' => array('2', '0'), - '312' => array('1', '3'), - '125' => array('1', '2'), - '100' => array('1', '1'), - '85' => array('1', '0'), - '73' => array('0', '9'), - '48' => array('0', '8'), - ); - - // OmniWeb build numbers to OmniWeb version numbers (if Version/X.Y.Z not present) - static protected $omniWebVersions = array( - '622.15' => array('5', '11'), - '622.10' => array('5', '10'), - '622.8' => array('5', '9'), - '622.3' => array('5', '8'), - '621' => array('5', '7'), - '613' => array('5', '6'), - '607' => array('5', '5'), - '563.34' => array('5', '1'), - '558.36' => array('5', '0'), - '496' => array('4', '5'), - ); - - // OS regex => OS ID - static protected $operatingSystems = array( - 'Android' => 'AND', - 'Maemo' => 'MAE', - 'CrOS ' => 'LIN', - 'Linux' => 'LIN', - - 'Xbox' => 'XBX', - - // workaround for vendors who changed the WinPhone 7 user agent - 'WP7' => 'WPH', - - 'CYGWIN_NT-6.2' => 'WI8', - 'Windows NT 6.2' => 'WI8', - 'Windows NT 6.3' => 'WI8', - 'Windows 8' => 'WI8', - 'CYGWIN_NT-6.1' => 'WI7', - 'Windows NT 6.1' => 'WI7', - 'Windows 7' => 'WI7', - 'CYGWIN_NT-6.0' => 'WVI', - 'Windows NT 6.0' => 'WVI', - 'Windows Vista' => 'WVI', - 'CYGWIN_NT-5.2' => 'WS3', - 'Windows NT 5.2' => 'WS3', - 'Windows Server 2003 / XP x64' => 'WS3', - 'CYGWIN_NT-5.1' => 'WXP', - 'Windows NT 5.1' => 'WXP', - 'Windows XP' => 'WXP', - 'CYGWIN_NT-5.0' => 'W2K', - 'Windows NT 5.0' => 'W2K', - 'Windows 2000' => 'W2K', - 'CYGWIN_NT-4.0' => 'WNT', - 'Windows NT 4.0' => 'WNT', - 'WinNT' => 'WNT', - 'Windows NT' => 'WNT', - 'CYGWIN_ME-4.90' => 'WME', - 'Win 9x 4.90' => 'WME', - 'Windows ME' => 'WME', - 'CYGWIN_98-4.10' => 'W98', - 'Win98' => 'W98', - 'Windows 98' => 'W98', - 'CYGWIN_95-4.0' => 'W95', - 'Win32' => 'W95', - 'Win95' => 'W95', - 'Windows 95' => 'W95', - - // Windows Phone OS 7 and above - 'Windows Phone OS' => 'WPH', - - // Windows Mobile 6.x and some later versions of Windows Mobile 5 - 'IEMobile' => 'WMO', // fallback - 'Windows Mobile' => 'WMO', - - // Windows CE, Pocket PC, and Windows Mobile 5 are indistinguishable without vendor/device specific detection - 'Windows CE' => 'WCE', - - 'iPod' => 'IPD', - 'iPad' => 'IPA', - 'iPhone' => 'IPH', -// 'iOS' => 'IOS', - 'Darwin' => 'MAC', - 'Macintosh' => 'MAC', - 'Power Macintosh' => 'MAC', - 'Mac_PowerPC' => 'MAC', - 'Mac PPC' => 'MAC', - 'PPC' => 'MAC', - 'Mac PowerPC' => 'MAC', - 'Mac OS' => 'MAC', - - 'webOS' => 'WOS', - 'Palm webOS' => 'WOS', - 'PalmOS' => 'POS', - 'Palm OS' => 'POS', - - 'BB10' => 'BBX', - 'BlackBerry' => 'BLB', - 'RIM Tablet OS' => 'QNX', - 'QNX' => 'QNX', - - 'SymbOS' => 'SYM', - 'Symbian OS' => 'SYM', - 'SymbianOS' => 'SYM', - - 'bada' => 'SBA', - - 'SunOS' => 'SOS', - 'AIX' => 'AIX', - 'HP-UX' => 'HPX', - 'OpenVMS' => 'VMS', - - 'FreeBSD' => 'BSD', - 'NetBSD' => 'NBS', - 'OpenBSD' => 'OBS', - 'DragonFly' => 'DFB', - 'Syllable' => 'SYL', - - 'Nintendo WiiU' => 'WIU', - 'Nintendo Wii' => 'WII', - 'Nitro' => 'NDS', - 'Nintendo DSi' => 'DSI', - 'Nintendo DS' => 'NDS', - 'Nintendo 3DS' => '3DS', - - 'PlayStation Vita' => 'PSV', - 'PlayStation Portable' => 'PSP', - 'PlayStation 3' => 'PS3', - - 'IRIX' => 'IRI', - 'OSF1' => 'T64', - 'OS/2' => 'OS2', - 'BEOS' => 'BEO', - 'Amiga' => 'AMI', - 'AmigaOS' => 'AMI', - ); - - // os family - // NOTE: The keys in this array are used by plugins/UserSettings/functions.php . Any changes - // made here should also be made in that file. - static protected $osType = array( - 'Windows' => array('WI8', 'WI7', 'WVI', 'WS3', 'WXP', 'W2K', 'WNT', 'WME', 'W98', 'W95'), - 'Linux' => array('LIN'), - 'Mac' => array('MAC'), - 'iOS' => array('IPD', 'IPA', 'IPH'), - 'Android' => array('AND'), - 'Windows Mobile' => array('WPH', 'WMO', 'WCE'), - 'Gaming Console' => array('WII', 'WIU', 'PS3', 'XBX'), - 'Mobile Gaming Console' => array('PSP', 'PSV', 'NDS', 'DSI', '3DS'), - 'Unix' => array('SOS', 'AIX', 'HP-UX', 'BSD', 'NBS', 'OBS', 'DFB', 'SYL', 'IRI', 'T64'), - 'Other Mobile' => array('MAE', 'WOS', 'POS', 'BLB', 'QNX', 'SYM', 'SBA'), - 'Other' => array('VMS', 'OS2', 'BEOS', 'AMI') - ); - - static protected $browserIdToName; - static protected $browserIdToShortName; - static protected $operatingSystemsIdToName; - static protected $operatingSystemsIdToShortName; - static private $init = false; - - /** - * Returns an array of the OS for the submitted user agent - * 'id' => '', - * 'name' => '', - * 'short_name' => '', - * - * @param string $userAgent - * @return string false if OS couldn't be identified, or 3 letters ID (eg. WXP) - * @see UserAgentParser/OperatingSystems.php for the list of OS (also available in self::$operatingSystems) - */ - static public function getOperatingSystem($userAgent) - { - $userAgent = self::cleanupUserAgent($userAgent); - self::init(); - $info = array( - 'id' => '', - 'name' => '', - 'short_name' => '', - ); - foreach (self::$operatingSystems as $key => $value) { - if (stristr($userAgent, $key) !== false) { - $info['id'] = $value; - break; - } - } - if (empty($info['id'])) { - return false; - } - $info['name'] = self::getOperatingSystemNameFromId($info['id']); - $info['short_name'] = self::getOperatingSystemShortNameFromId($info['id']); - return $info; - } - - static protected function cleanupUserAgent($userAgent) - { - // in case value is URL encoded - return urldecode($userAgent); - } - - /** - * Returns the browser information array, given a user agent string. - * - * @param string $userAgent - * @return array false if the browser is "unknown", or - * array( 'id' => '', // 2 letters ID, eg. FF - * 'name' => '', // 2 letters ID, eg. FF - * 'short_name' => '', // 2 letters ID, eg. FF - * 'major_number' => '', // 2 in firefox 2.0.12 - * 'minor_number' => '', // 0 in firefox 2.0.12 - * 'version' => '', // major_number.minor_number - * ); - * @see self::$browsers for the list of OS - */ - static public function getBrowser($userAgent) - { - $userAgent = self::cleanupUserAgent($userAgent); - - self::init(); - - $info = array( - 'id' => '', - 'name' => '', - 'short_name' => '', - 'major_number' => '', - 'minor_number' => '', - 'version' => '', - ); - - $browsers = self::$browsers; - - // derivative browsers often clone the base browser's useragent - unset($browsers['firefox']); - unset($browsers['mozilla']); - unset($browsers['safari']); - unset($browsers['applewebkit']); - - $browsersPattern = str_replace(')', '\)', implode('|', array_keys($browsers))); - - $results = array(); - - // Misbehaving IE add-ons - $userAgent = preg_replace('/[; ]Mozilla\/[0-9.]+ \([^)]+\)/', '', $userAgent); - - // Clean-up BlackBerry device UAs - $userAgent = preg_replace('~^BlackBerry\d+/~', 'BlackBerry/', $userAgent); - - if (preg_match_all("/($browsersPattern)[\/\sa-z(]*([0-9]+)([\.0-9a-z]+)?/i", $userAgent, $results) - || (strpos($userAgent, 'Shiira') === false && preg_match_all("/(firefox|thunderbird|safari)[\/\sa-z(]*([0-9]+)([\.0-9a-z]+)?/i", $userAgent, $results)) - || preg_match_all("/(applewebkit)[\/\sa-z(]*([0-9]+)([\.0-9a-z]+)?/i", $userAgent, $results) - || preg_match_all("/^(mozilla)\/([0-9]+)([\.0-9a-z-]+)?(?: \[[a-z]{2}\])? (?:\([^)]*\))$/i", $userAgent, $results) - || preg_match_all("/^(mozilla)\/[0-9]+(?:[\.0-9a-z-]+)?\s\(.* rv:([0-9]+)([.0-9a-z]+)\) gecko(\/[0-9]{8}|$)(?:.*)/i", $userAgent, $results) - || (strpos($userAgent, 'Nintendo 3DS') !== false && preg_match_all("/^(mozilla).*version\/([0-9]+)([.0-9a-z]+)?/i", $userAgent, $results)) - ) { - // browser code (usually the first match) - $count = 0; - $info['id'] = self::$browsers[strtolower($results[1][0])]; - - // sometimes there's a better match at the end - if (strpos($userAgent, 'chromeframe') !== false) { - $count = count($results[0]) - 1; - $info['id'] = 'CF'; - } elseif (($info['id'] == 'IE' || $info['id'] == 'LX') && (count($results[0]) > 1)) { - $count = count($results[0]) - 1; - $info['id'] = self::$browsers[strtolower($results[1][$count])]; - } - - // Netscape fix - if ($info['id'] == 'MO' && $count == 0) { - if (stripos($userAgent, 'PlayStation') !== false) { - return false; - } - if (strpos($userAgent, 'Nintendo 3DS') !== false) { - $info['id'] = 'NF'; - } elseif (count($results) == 4) { - $info['id'] = 'NS'; - } - } // BlackBerry devices - elseif (strpos($userAgent, 'BlackBerry') !== false) { - $info['id'] = 'BB'; - } elseif (strpos($userAgent, 'RIM Tablet OS') !== false) { - $info['id'] = 'BP'; - } elseif (strpos($userAgent, 'BB10') !== false) { - $info['id'] = 'B2'; - } elseif (strpos($userAgent, 'Playstation Vita') !== false) { - $info['id'] = 'NF'; - - if (preg_match_all("/(silk)[\/\sa-z(]*([0-9]+)([\.0-9a-z]+)?/i", $userAgent, $newResults)) { - $results = $newResults; - $count = count($results[0]) - 1; - } - } - - // Version/X.Y.Z override - if (preg_match_all("/(version)[\/\sa-z(]*([0-9]+)([\.0-9a-z]+)?/i", $userAgent, $newResults)) { - $results = $newResults; - $count = count($results[0]) - 1; - } - - // major version number (1 in mozilla 1.7) - $info['major_number'] = $results[2][$count]; - - // is an minor version number ? If not, 0 - $match = array(); - - preg_match('/([.\0-9]+)?([\.a-z0-9]+)?/i', $results[3][$count], $match); - - if (isset($match[1])) { - // find minor version number (7 in mozilla 1.7, 9 in firefox 0.9.3) - $dot = strpos(substr($match[1], 1), '.'); - if ($dot !== false) { - $info['minor_number'] = substr($match[1], 1, $dot); - } else { - $info['minor_number'] = substr($match[1], 1); - } - } else { - $info['minor_number'] = '0'; - } - $info['version'] = $info['major_number'] . '.' . $info['minor_number']; - - // IE compatibility mode - if ($info['id'] == 'IE' - && (strncmp($userAgent, 'Mozilla/4.0', 11) == 0 || strncmp($userAgent, 'Mozilla/5.0', 11) == 0) - && preg_match('~ Trident/([0-9]+)\.[0-9]+~', $userAgent, $tridentVersion) - ) { - $info['major_number'] = $tridentVersion[1] + 4; - $info['minor_number'] = '0'; - $info['version'] = $info['major_number'] . '.' . $info['minor_number']; - } - - // Safari fix - if ($info['id'] == 'SF') { - foreach (self::$safariVersions as $buildVersion => $productVersion) { - if (version_compare($info['version'], $buildVersion) >= 0) { - $info['major_number'] = $productVersion[0]; - $info['minor_number'] = $productVersion[1]; - $info['version'] = $info['major_number'] . '.' . $info['minor_number']; - break; - } - } - } - - // OmniWeb fix - if ($info['id'] == 'OW') { - foreach (self::$omniWebVersions as $buildVersion => $productVersion) { - if (version_compare($info['version'], $buildVersion) >= 0) { - $info['major_number'] = $productVersion[0]; - $info['minor_number'] = $productVersion[1]; - $info['version'] = $info['major_number'] . '.' . $info['minor_number']; - break; - } - } - } - - // SeaMonkey fix - if ($info['id'] == 'MO' && $info['version'] == '1.9') { - $info['id'] = 'SM'; - } - - $info['name'] = self::getBrowserNameFromId($info['id']); - $info['short_name'] = self::getBrowserShortNameFromId($info['id']); - - return $info; - } - - return false; - } - - static protected function init() - { - if (self::$init) { - return; - } - self::$init = true; - - // init browser names and short names - self::$browserIdToName = array_map('ucwords', array_flip(self::$browsers)); - self::$browserIdToName['AB'] = 'ABrowse'; - self::$browserIdToName['AV'] = 'AmigaVoyager'; - self::$browserIdToName['AW'] = 'Amiga AWeb'; - self::$browserIdToName['BB'] = 'BlackBerry'; - self::$browserIdToName['BP'] = 'PlayBook'; - self::$browserIdToName['B2'] = 'BlackBerry'; - self::$browserIdToName['BX'] = 'BrowseX'; - self::$browserIdToName['CF'] = 'Chrome Frame'; - self::$browserIdToName['CO'] = 'CometBird'; - self::$browserIdToName['EL'] = 'ELinks'; - self::$browserIdToName['FF'] = 'Firefox'; - self::$browserIdToName['HJ'] = 'HotJava'; - self::$browserIdToName['IB'] = 'IBrowse'; - self::$browserIdToName['IC'] = 'iCab'; - self::$browserIdToName['KM'] = 'K-Meleon'; - self::$browserIdToName['MC'] = 'NCSA Mosaic'; - self::$browserIdToName['NF'] = 'NetFront'; - self::$browserIdToName['OW'] = 'OmniWeb'; - self::$browserIdToName['SF'] = 'Safari'; - self::$browserIdToName['SM'] = 'SeaMonkey'; - self::$browserIdToName['WO'] = 'Palm webOS'; - self::$browserIdToName['WP'] = 'WebPro'; - - self::$browserIdToShortName = self::$browserIdToName; - self::$browserIdToShortName['AW'] = 'AWeb'; - self::$browserIdToShortName['FB'] = 'Firebird'; - self::$browserIdToShortName['IE'] = 'IE'; - self::$browserIdToShortName['MC'] = 'Mosaic'; - self::$browserIdToShortName['BP'] = 'PlayBook'; - self::$browserIdToShortName['WO'] = 'webOS'; - - // init OS names and short names - $operatingSystemsIdToName = array( - 'IPD' => 'iPod', - 'IPA' => 'iPad', - 'WME' => 'Windows Me', - 'BEO' => 'BeOS', - 'T64' => 'Tru64', - 'NDS' => 'Nintendo DS', - 'WIU' => 'Nintendo Wii U', - '3DS' => 'Nintendo 3DS', - - // These are for BC purposes only - 'W75' => 'WinPhone 7.5', - 'WP7' => 'WinPhone 7', - 'W65' => 'WinMo 6.5', - 'W61' => 'WinMo 6.1', - - ); - self::$operatingSystemsIdToName = array_merge(array_flip(self::$operatingSystems), $operatingSystemsIdToName); - $operatingSystemsIdToShortName = array( - 'PS3' => 'PS3', - 'PSP' => 'PSP', - 'WII' => 'Wii', - 'WIU' => 'Wii U', - 'NDS' => 'DS', - 'DSI' => 'DSi', - '3DS' => '3DS', - 'PSV' => 'PS Vita', - 'WI8' => 'Win 8', - 'WI7' => 'Win 7', - 'WVI' => 'Win Vista', - 'WS3' => 'Win S2003', - 'WXP' => 'Win XP', - 'W98' => 'Win 98', - 'W2K' => 'Win 2000', - 'WNT' => 'Win NT', - 'WME' => 'Win Me', - 'W95' => 'Win 95', - 'WPH' => 'WinPhone', - 'WMO' => 'WinMo', - 'WCE' => 'Win CE', - 'WOS' => 'webOS', - 'UNK' => 'Unknown', - ); - self::$operatingSystemsIdToShortName = array_merge(self::$operatingSystemsIdToName, $operatingSystemsIdToShortName); - } - - static public function getBrowserNameFromId($browserId) - { - self::init(); - if (isset(self::$browserIdToName[$browserId])) { - return self::$browserIdToName[$browserId]; - } - if(class_exists('DeviceDetector\\Parser\\Client\\Browser')) { - $browsers = DeviceDetector\Parser\Client\Browser::getAvailableBrowsers(); - if( array_key_exists($browserId, $browsers)) { - return $browsers[$browserId]; - } - } - return false; - } - - static public function getBrowserShortNameFromId($browserId) - { - self::init(); - if (isset(self::$browserIdToShortName[$browserId])) { - return self::$browserIdToShortName[$browserId]; - } - return false; - } - - static public function getBrowserFamilyFromId($browserId) - { - self::init(); - $familyNameToUse = 'unknown'; - foreach (self::$browserType as $familyName => $aBrowsers) { - if (in_array($browserId, $aBrowsers)) { - $familyNameToUse = $familyName; - break; - } - } - return $familyNameToUse; - } - - static public function getOperatingSystemNameFromId($osId) - { - self::init(); - if (isset(self::$operatingSystemsIdToName[$osId])) { - return self::$operatingSystemsIdToName[$osId]; - } - - if(class_exists('DeviceDetector\\Parser\\OperatingSystem')) { - if ($osId == 'BOT') { - return 'Bot'; - } - return DeviceDetector\Parser\OperatingSystem::getNameFromId($osId); - } - return false; - } - - static public function getOperatingSystemShortNameFromId($osId) - { - self::init(); - if (isset(self::$operatingSystemsIdToShortName[$osId])) { - return self::$operatingSystemsIdToShortName[$osId]; - } - return false; - } - - static public function getOperatingSystemIdFromName($osName) - { - return isset(self::$operatingSystems[$osName]) ? self::$operatingSystems[$osName] : false; - } - - static public function getOperatingSystemFamilyFromId($osId) - { - self::init(); - foreach (self::$osType as $familyName => $aSystems) { - if (in_array($osId, $aSystems)) { - return $familyName; - } - } - return 'unknown'; - } -} diff --git a/libs/UserAgentParser/UserAgentParser.test.php b/libs/UserAgentParser/UserAgentParser.test.php deleted file mode 100644 index 5d59eed1985..00000000000 --- a/libs/UserAgentParser/UserAgentParser.test.php +++ /dev/null @@ -1,56 +0,0 @@ -UserAgentParser php library test"; -$testUserAgent = array( - 'my user agent' => '', - 'ie8 on win7' => 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET CLR 3.0.04506; .NET CLR 3.5.21022; InfoPath.2; SLCC1; Zune 3.0)', - 'ie8 on vista (compatibility view)' => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0)', - 'ie8 on vista' => 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)', - 'chrome on winxp' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Chrome/1.0.154.48 Safari/525.19', - 'IE6 on winxp' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 3.0.04506.648)', - 'safari on winxp' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Version/3.1.2 Safari/525.21', - 'FF3 on winxp' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6', - 'opera 9.63 on winxp' => 'Opera/9.63 (Windows NT 5.1; U; en) Presto/2.1.1', - 'Blackberry' => 'BlackBerry8700/4.1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1', - 'opera 9.30 on Nintendo Wii' => 'Opera/9.30 (Nintendo Wii; U; ; 2047-7; en)', - 'iphone' => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_2 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5G77 Safari/525.20', - 'iPod touch' => 'Mozilla/5.0 (iPod; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/3A100a Safari/419.3', - 'iPod' => 'Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11a Safari/525.20', - 'Android' => 'Mozilla/5.0 (Linux; U; Android 1.1; en-us; dream) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2', - 'PalmOS' => 'Mozilla/5.0 [en] (PalmOS; U; WebPro/3.5; Palm-Zi72) ', - 'safari on mac os X' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_5; en-us) AppleWebKit/527.3+ (KHTML, like Gecko) Version/3.1.2 Safari/525.20.1', - 'opera 9.64 on win ME' => 'Opera/9.64 (Windows ME; U; en) Presto/2.1.1', - 'opera 10.00 on XP' => 'Opera/9.80 (Windows NT 5.1; U; en) Presto/2.2.15 Version/10.00', - 'iron on win7' => 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/531.0 (KHTML, like Gecko) Iron/3.0.189.0 Safari/531.0', - 'firefox 3.6 alpha on vista' => 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2a2pre) Gecko/20090826 Namoroka/3.6a2pre', - 'firefox 3.5 alpha on win7' => 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1b4pre) Gecko/20090420 Shiretoko/3.5b4pre (.NET CLR 3.5.30729)', - 'firefox nightly build' => 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:2.0a1pre) Gecko/2008060602 Minefield/4.0a1pre', - 'thunderbird 14.0 with lightning 1.6' => 'Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120713 Thunderbird/14.0 Lightning/1.6', - 'Windows 8' => 'Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; Touch; rv:11.0) like Gecko', -); -echo "Test with another user agent: "; -foreach ($testUserAgent as $name => $userAgent) { - echo "$name, "; -} -echo "
"; - -if (isset($_GET['setUserAgent']) && !empty($_GET['setUserAgent'])) { - echo "User Agent:"; - $userAgent = urldecode($_GET['setUserAgent']); -} else { - echo "Your user agent:"; - $userAgent = $_SERVER['HTTP_USER_AGENT']; -} -echo " " . htmlentities($userAgent) . "

"; - -echo "Browser info:
";
-var_dump(UserAgentParser::getBrowser($userAgent));
-echo "
"; - -echo "Operating System info:
";
-var_dump(UserAgentParser::getOperatingSystem($userAgent));
-echo "
"; - -echo "

UserAgentParser doesn't detect your Operating System or Browser properly?
Please submit your user agent string and the expected result to hello at piwik.org. Patches are also welcome :-) Thanks!"; diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 857c554b170..0a76c67ee3d 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -44,8 +44,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -69,14 +77,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -144,8 +144,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -169,14 +177,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 857c554b170..0a76c67ee3d 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -44,8 +44,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -69,14 +77,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -144,8 +144,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -169,14 +177,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 857c554b170..0a76c67ee3d 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -44,8 +44,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -69,14 +77,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -144,8 +144,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -169,14 +177,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 857c554b170..0a76c67ee3d 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -44,8 +44,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -69,14 +77,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -144,8 +144,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -169,14 +177,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 857c554b170..0a76c67ee3d 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -44,8 +44,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -69,14 +77,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -144,8 +144,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -169,14 +177,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index 91f9066c9b3..1fbae717c6e 100644 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml @@ -117,8 +117,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -142,14 +150,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index a0a12985c3a..bfb3fc9870e 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -81,7 +81,7 @@ public function getDefaultLayout() ], [ {"uniqueId":"widgetUserCountryMapvisitorMap","parameters":{"module":"UserCountryMap","action":"visitorMap"}}, - {"uniqueId":"widgetUserSettingsgetBrowser","parameters":{"module":"UserSettings","action":"getBrowser"}}, + {"uniqueId":"widgetDevicesDetecionGetBrowser","parameters":{"module":"DevicesDetection","action":"getBrowsers"}}, {"uniqueId":"widgetReferrersgetSearchEngines","parameters":{"module":"Referrers","action":"getSearchEngines"}}, {"uniqueId":"widgetVisitTimegetVisitInformationPerServerTime","parameters":{"module":"VisitTime","action":"getVisitInformationPerServerTime"}}, {"uniqueId":"widgetExampleRssWidgetrssPiwik","parameters":{"module":"ExampleRssWidget","action":"rssPiwik"}} diff --git a/plugins/Dashboard/Model.php b/plugins/Dashboard/Model.php index 39dcb065571..790076c1a9a 100644 --- a/plugins/Dashboard/Model.php +++ b/plugins/Dashboard/Model.php @@ -10,6 +10,7 @@ use Piwik\Common; use Piwik\Db; use Piwik\DbHelper; +use Piwik\WidgetsList; class Model { @@ -144,4 +145,101 @@ public static function uninstall() { Db::dropTables(Common::prefixTable(self::$rawPrefix)); } + + /** + * Replaces widgets on the given dashboard layout with other ones + * + * It uses the given widget definitions to find the old and to create the new widgets + * Each widget is defined with an array containing the following information + * array ( + * 'module' => string + * 'action' => string + * 'params' => array() + * ) + * + * if $newWidget does not contain a widget definition at the current position, + * the old widget will simply be removed + * + * @param array $oldWidgets array containing widget definitions + * @param array $newWidgets array containing widget definitions + */ + public static function replaceDashboardWidgets($dashboardLayout, $oldWidgets, $newWidgets) + { + if (empty($dashboardLayout) || !isset($dashboardLayout->columns)) { + return $dashboardLayout; + } + + $newColumns = array(); + + foreach ($dashboardLayout->columns as $id => $column) { + + $newColumn = array(); + + foreach ($column as $widget) { + + foreach ($oldWidgets AS $pos => $oldWidgetData) { + + $oldWidgetId = WidgetsList::getWidgetUniqueId($oldWidgetData['module'], $oldWidgetData['action'], $oldWidgetData['params']); + + if (empty($newWidgets[$pos])) { + continue 2; + } + + $newWidget = $newWidgets[$pos]; + + if ($widget->uniqueId == $oldWidgetId) { + + $newWidgetId = WidgetsList::getWidgetUniqueId($newWidget['module'], $newWidget['action'], $newWidget['params']); + + // is new widget already is on dashboard just remove the old one + if (self::layoutContainsWidget($dashboardLayout, $newWidgetId)) { + continue 2; + } + + $widget->uniqueId = $newWidgetId; + $widget->parameters->module = $newWidget['module']; + $widget->parameters->action = $newWidget['action']; + foreach ($newWidget['params'] as $key => $value) { + $widget->parameters->{$key} = $value; + } + } + } + + + $newColumn[] = $widget; + } + + $newColumns[] = $newColumn; + } + + $dashboardLayout->columns = $newColumns; + + return $dashboardLayout; + } + + /** + * Checks if a given dashboard layout contains a given widget + * + * @param $dashboardLayout + * @param $widgetId + * @return bool + */ + protected static function layoutContainsWidget($dashboardLayout, $widgetId) + { + if (!isset($dashboardLayout->columns)) { + return false; + } + + foreach ($dashboardLayout->columns as $id => $column) { + + foreach ($column as $widget) { + + if ($widget->uniqueId == $widgetId) { + return true; + } + } + } + + return false; + } } diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php index b54b79c6358..b6c58388b9c 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\DevicesDetection; +use DeviceDetector\Parser\Device\DeviceParserAbstract; use Piwik\Archive; use Piwik\DataTable; use Piwik\Metrics; @@ -50,11 +51,36 @@ protected function getDataTable($name, $idSite, $period, $date, $segment) public function getType($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_types', $idSite, $period, $date, $segment); + // ensure all device types are in the list + $this->ensureDefaultRowsInTable($dataTable); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getDeviceTypeLogo')); $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getDeviceTypeLabel')); return $dataTable; } + protected function ensureDefaultRowsInTable($dataTable) + { + $requiredRows = array_fill(0, count(DeviceParserAbstract::getAvailableDeviceTypes()), Metrics::INDEX_NB_VISITS); + + $dataTables = array($dataTable); + + if (!($dataTable instanceof DataTable\Map)) { + foreach ($dataTables as $table) { + if ($table->getRowsCount() == 0) { + continue; + } + foreach ($requiredRows as $requiredRow => $key) { + $row = $table->getRowFromLabel($requiredRow); + if (empty($row)) { + $table->addRowsFromSimpleArray(array( + array('label' => $requiredRow, $key => 0) + )); + } + } + } + } + } + /** * Gets datatable displaying number of visits by device manufacturer name * @param int $idSite @@ -97,8 +123,8 @@ public function getModel($idSite, $period, $date, $segment = false) public function getOsFamilies($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_os', $idSite, $period, $date, $segment); - $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOSFamilyFullNameExtended')); - $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsFamilyLogoExtended')); + $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOSFamilyFullName')); + $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsFamilyLogo')); return $dataTable; } @@ -113,9 +139,9 @@ public function getOsFamilies($idSite, $period, $date, $segment = false) public function getOsVersions($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_osVersions', $idSite, $period, $date, $segment); - $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsLogoExtended')); - $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getOsFullNameExtended')); - + $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsLogo')); + // use GroupBy filter to avoid duplicate rows if old (UserSettings) and new (DevicesDetection) reports were combined + $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOsFullName')); return $dataTable; } @@ -126,12 +152,27 @@ public function getOsVersions($idSite, $period, $date, $segment = false) * @param string $date * @param bool|string $segment * @return DataTable + * + * @deprecated since 2.9.0 Use {@link getBrowsers} instead. */ public function getBrowserFamilies($idSite, $period, $date, $segment = false) + { + return $this->getBrowsers($idSite, $period, $date, $segment); + } + + /** + * Gets datatable displaying number of visits by Browser (Without version) + * @param int $idSite + * @param string $period + * @param string $date + * @param bool|string $segment + * @return DataTable + */ + public function getBrowsers($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_browsers', $idSite, $period, $date, $segment); - $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getBrowserFamilyFullNameExtended')); - $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserFamilyLogoExtended')); + $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getBrowserName')); + $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserFamilyLogo')); return $dataTable; } @@ -146,8 +187,8 @@ public function getBrowserFamilies($idSite, $period, $date, $segment = false) public function getBrowserVersions($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_browserVersions', $idSite, $period, $date, $segment); - $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserLogoExtended')); - $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getBrowserNameExtended')); + $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserLogo')); + $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getBrowserNameWithVersion')); return $dataTable; } diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php index e91a1be0fe5..0d6f40c062f 100644 --- a/plugins/DevicesDetection/Archiver.php +++ b/plugins/DevicesDetection/Archiver.php @@ -26,7 +26,7 @@ class Archiver extends \Piwik\Plugin\Archiver const DEVICE_BRAND_FIELD = "config_device_brand"; const DEVICE_MODEL_FIELD = "config_device_model"; const OS_FIELD = "config_os"; - const OS_VERSION_FIELD = "CONCAT(log_visit.config_os, ';', log_visit.config_os_version)"; + const OS_VERSION_FIELD = "CONCAT(log_visit.config_os, ';', COALESCE(log_visit.config_os_version, ''))"; const BROWSER_FIELD = "config_browser_name"; const BROWSER_ENGINE_FIELD = "config_browser_engine"; const BROWSER_VERSION_DIMENSION = "CONCAT(log_visit.config_browser_name, ';', log_visit.config_browser_version)"; diff --git a/plugins/DevicesDetection/Columns/BrowserName.php b/plugins/DevicesDetection/Columns/BrowserName.php index 1237d6676b9..16b08971996 100644 --- a/plugins/DevicesDetection/Columns/BrowserName.php +++ b/plugins/DevicesDetection/Columns/BrowserName.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\DevicesDetection\Columns; use Piwik\Piwik; +use Piwik\Plugins\DevicesDetection\Segment; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; use Piwik\Tracker\Action; @@ -16,10 +17,20 @@ class BrowserName extends Base { protected $columnName = 'config_browser_name'; + protected $columnType = 'VARCHAR(10) NOT NULL'; + + protected function configureSegments() + { + $segment = new Segment(); + $segment->setSegment('browserCode'); + $segment->setName('UserSettings_ColumnBrowser'); + $segment->setAcceptedValues('FF, IE, CH, SF, OP, etc.'); + $this->addSegment($segment); + } public function getName() { - return Piwik::translate('UserSettings_BrowserFamilies'); + return Piwik::translate('UserSettings_ColumnBrowser'); } /** diff --git a/plugins/DevicesDetection/Columns/BrowserVersion.php b/plugins/DevicesDetection/Columns/BrowserVersion.php index 1fa60f3ab2b..87f7815c8ac 100644 --- a/plugins/DevicesDetection/Columns/BrowserVersion.php +++ b/plugins/DevicesDetection/Columns/BrowserVersion.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\DevicesDetection\Columns; use Piwik\Piwik; +use Piwik\Plugins\DevicesDetection\Segment; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; use Piwik\Tracker\Action; @@ -16,10 +17,20 @@ class BrowserVersion extends Base { protected $columnName = 'config_browser_version'; + protected $columnType = 'VARCHAR(20) NOT NULL'; + + protected function configureSegments() + { + $segment = new Segment(); + $segment->setSegment('browserVersion'); + $segment->setName('UserSettings_ColumnBrowserVersion'); + $segment->setAcceptedValues('1.0, 8.0, etc.'); + $this->addSegment($segment); + } public function getName() { - return Piwik::translate('DevicesDetection_BrowserVersions'); + return Piwik::translate('UserSettings_ColumnBrowserVersion'); } /** diff --git a/plugins/DevicesDetection/Columns/Os.php b/plugins/DevicesDetection/Columns/Os.php index 599edb3285b..62d1a5cb713 100644 --- a/plugins/DevicesDetection/Columns/Os.php +++ b/plugins/DevicesDetection/Columns/Os.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\DevicesDetection\Columns; use Piwik\Piwik; +use Piwik\Plugins\DevicesDetection\Segment; use Piwik\Tracker\Request; use Piwik\Tracker\Settings; use Piwik\Tracker\Visitor; @@ -17,10 +18,20 @@ class Os extends Base { protected $columnName = 'config_os'; + protected $columnType = 'CHAR(3) NOT NULL'; + + protected function configureSegments() + { + $segment = new Segment(); + $segment->setSegment('operatingSystemCode'); + $segment->setName('UserSettings_ColumnOperatingSystem'); + $segment->setAcceptedValues('WXP, WI7, MAC, LIN, AND, IPD, etc.'); + $this->addSegment($segment); + } public function getName() { - return Piwik::translate('DevicesDetection_OperatingSystemFamilies'); + return Piwik::translate('UserSettings_OperatingSystemFamily'); } /** diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php index 78ed29fa931..cf072bb9730 100644 --- a/plugins/DevicesDetection/Controller.php +++ b/plugins/DevicesDetection/Controller.php @@ -14,10 +14,10 @@ use Piwik\Piwik; use Piwik\Plugin\ControllerAdmin; use Piwik\Plugins\DevicesDetection\Reports\GetBrand; -use Piwik\Plugins\DevicesDetection\Reports\GetBrowserFamilies; use Piwik\Plugins\DevicesDetection\Reports\GetBrowserEngines; +use Piwik\Plugins\DevicesDetection\Reports\GetBrowsers; use Piwik\Plugins\DevicesDetection\Reports\GetModel; -use Piwik\Plugins\DevicesDetection\Reports\GetOsFamilies; +use Piwik\Plugins\DevicesDetection\Reports\GetOsVersions; use Piwik\Plugins\DevicesDetection\Reports\GetType; use Piwik\View; @@ -30,8 +30,8 @@ public function index() $view->deviceTypes = $this->renderReport(new GetType()); $view->deviceBrands = $this->renderReport(new GetBrand()); $view->deviceModels = $this->renderReport(new GetModel()); - $view->osReport = $this->renderReport(new GetOsFamilies()); - $view->browserReport = $this->renderReport(new GetBrowserFamilies()); + $view->osReport = $this->renderReport(new GetOsVersions()); + $view->browserReport = $this->renderReport(new GetBrowsers()); $view->browserEngineReport = $this->renderReport(new GetBrowserEngines()); return $view->render(); } @@ -53,14 +53,14 @@ public function deviceDetection() $view->browser_name = $uaParser->getClient('name'); $view->browser_short_name = $uaParser->getClient('short_name'); $view->browser_version = $uaParser->getClient('version'); - $view->browser_logo = getBrowserLogoExtended($uaParser->getClient('short_name')); + $view->browser_logo = getBrowserLogo($uaParser->getClient('short_name')); $view->browser_family = \DeviceDetector\Parser\Client\Browser::getBrowserFamily($uaParser->getClient('short_name')); - $view->browser_family_logo = getBrowserFamilyLogoExtended($view->browser_family); + $view->browser_family_logo = getBrowserFamilyLogo($view->browser_family); $view->os_name = $uaParser->getOs('name'); - $view->os_logo = getOsLogoExtended($uaParser->getOs('short_name')); + $view->os_logo = getOsLogo($uaParser->getOs('short_name')); $view->os_short_name = $uaParser->getOs('short_name'); $view->os_family = \DeviceDetector\Parser\OperatingSystem::getOsFamily($uaParser->getOs('short_name')); - $view->os_family_logo = getOsFamilyLogoExtended($view->os_family); + $view->os_family_logo = getOsFamilyLogo($view->os_family); $view->os_version = $uaParser->getOs('version'); $view->device_type = getDeviceTypeLabel($uaParser->getDeviceName()); $view->device_type_logo = getDeviceTypeLogo($uaParser->getDeviceName()); @@ -96,7 +96,7 @@ public function showList() $availableBrowsers = \DeviceDetector\Parser\Client\Browser::getAvailableBrowsers(); foreach ($availableBrowsers as $short => $name) { - $list[$name] = getBrowserLogoExtended($short); + $list[$name] = getBrowserLogo($short); } break; @@ -104,7 +104,7 @@ public function showList() $availableBrowserFamilies = \DeviceDetector\Parser\Client\Browser::getAvailableBrowserFamilies(); foreach ($availableBrowserFamilies as $name => $browsers) { - $list[$name] = getBrowserFamilyLogoExtended($name); + $list[$name] = getBrowserFamilyLogo($name); } break; @@ -112,7 +112,7 @@ public function showList() $availableOSs = \DeviceDetector\Parser\OperatingSystem::getAvailableOperatingSystems(); foreach ($availableOSs as $short => $name) { - $list[$name] = getOsLogoExtended($short); + $list[$name] = getOsLogo($short); } break; @@ -120,7 +120,7 @@ public function showList() $osFamilies = \DeviceDetector\Parser\OperatingSystem::getAvailableOperatingSystemFamilies(); foreach ($osFamilies as $name => $oss) { - $list[$name] = getOsFamilyLogoExtended($name); + $list[$name] = getOsFamilyLogo($name); } break; diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php index 004fc96721c..312bca614f5 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -49,13 +49,16 @@ public function extendVisitorDetails(&$visitor, $details) $instance = new Visitor($details); $visitor['deviceType'] = $instance->getDeviceType(); + $visitor['operatingSystem'] = $instance->getOperatingSystem(); + $visitor['operatingSystemCode'] = $instance->getOperatingSystemCode(); + $visitor['operatingSystemIcon'] = $instance->getOperatingSystemIcon(); $visitor['browserFamily'] = $instance->getBrowserEngine(); $visitor['browserFamilyDescription'] = $instance->getBrowserEngineDescription(); - - if (!PluginManager::getInstance()->isPluginActivated('UserSettings')) { - $instance = new UserSettings(); - $instance->extendVisitorDetails($visitor, $details); - } + $visitor['browser'] = $instance->getBrowser(); + $visitor['browserName'] = $instance->getBrowserName(); + $visitor['browserIcon'] = $instance->getBrowserIcon(); + $visitor['browserCode'] = $instance->getBrowserCode(); + $visitor['browserVersion'] = $instance->getBrowserVersion(); } } diff --git a/plugins/DevicesDetection/Reports/GetBrowserVersions.php b/plugins/DevicesDetection/Reports/GetBrowserVersions.php index 22105ff8ac5..24c64d052fd 100644 --- a/plugins/DevicesDetection/Reports/GetBrowserVersions.php +++ b/plugins/DevicesDetection/Reports/GetBrowserVersions.php @@ -18,23 +18,23 @@ protected function init() { parent::init(); $this->dimension = new BrowserVersion(); - $this->name = Piwik::translate('DevicesDetection_BrowserVersions'); + $this->name = Piwik::translate('UserSettings_WidgetBrowserVersion'); $this->documentation = ''; // TODO - $this->order = 6; - $this->widgetTitle = 'DevicesDetection_BrowserVersions'; + $this->order = 2; + $this->widgetTitle = 'UserSettings_WidgetBrowserVersion'; } public function configureView(ViewDataTable $view) { $view->config->show_search = false; $view->config->show_exclude_low_population = false; - $view->config->addTranslation('label', Piwik::translate("UserSettings_ColumnBrowserVersion")); + $view->config->addTranslation('label', $this->dimension->getName()); } public function getRelatedReports() { return array( - new GetBrowserFamilies() + new GetBrowsers() ); } } diff --git a/plugins/DevicesDetection/Reports/GetBrowserFamilies.php b/plugins/DevicesDetection/Reports/GetBrowsers.php similarity index 67% rename from plugins/DevicesDetection/Reports/GetBrowserFamilies.php rename to plugins/DevicesDetection/Reports/GetBrowsers.php index 0c2c5cd6212..07be06d4ba6 100644 --- a/plugins/DevicesDetection/Reports/GetBrowserFamilies.php +++ b/plugins/DevicesDetection/Reports/GetBrowsers.php @@ -12,16 +12,16 @@ use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\DevicesDetection\Columns\BrowserName; -class GetBrowserFamilies extends Base +class GetBrowsers extends Base { protected function init() { parent::init(); $this->dimension = new BrowserName(); - $this->name = Piwik::translate('UserSettings_BrowserFamilies'); - $this->documentation = ''; // TODO - $this->order = 5; - $this->widgetTitle = 'UserSettings_BrowserFamilies'; + $this->name = Piwik::translate('UserSettings_WidgetBrowsers'); + $this->documentation = Piwik::translate('UserSettings_WidgetBrowsersDocumentation', '
'); + $this->order = 1; + $this->widgetTitle = 'UserSettings_WidgetBrowsers'; } public function configureView(ViewDataTable $view) @@ -29,7 +29,7 @@ public function configureView(ViewDataTable $view) $view->config->title = $this->name; $view->config->show_search = false; $view->config->show_exclude_low_population = false; - $view->config->addTranslation('label', Piwik::translate("DevicesDetection_dataTableLabelBrowserFamily")); + $view->config->addTranslation('label', $this->dimension->getName()); } public function getRelatedReports() diff --git a/plugins/DevicesDetection/Reports/GetOsFamilies.php b/plugins/DevicesDetection/Reports/GetOsFamilies.php index 703b42830e2..5f9418f75ea 100644 --- a/plugins/DevicesDetection/Reports/GetOsFamilies.php +++ b/plugins/DevicesDetection/Reports/GetOsFamilies.php @@ -29,7 +29,7 @@ public function configureView(ViewDataTable $view) $view->config->title = $this->name; $view->config->show_search = false; $view->config->show_exclude_low_population = false; - $view->config->addTranslation('label', Piwik::translate("UserSettings_OperatingSystemFamily")); + $view->config->addTranslation('label', $this->dimension->getName()); } public function getRelatedReports() diff --git a/plugins/DevicesDetection/Visitor.php b/plugins/DevicesDetection/Visitor.php index 478b76deea7..aa5b16c2ae3 100644 --- a/plugins/DevicesDetection/Visitor.php +++ b/plugins/DevicesDetection/Visitor.php @@ -24,6 +24,21 @@ public function getDeviceType() return getDeviceTypeLabel($this->details['config_device_type']); } + public function getOperatingSystemCode() + { + return $this->details['config_os']; + } + + public function getOperatingSystem() + { + return getOsFullName($this->details['config_os']); + } + + public function getOperatingSystemIcon() + { + return getOsLogo($this->details['config_os']); + } + public function getBrowserEngineDescription() { return getBrowserEngineName($this->getBrowserEngine()); @@ -33,4 +48,29 @@ public function getBrowserEngine() { return $this->details['config_browser_engine']; } + + public function getBrowserCode() + { + return $this->details['config_browser_name']; + } + + public function getBrowserVersion() + { + return $this->details['config_browser_version']; + } + + public function getBrowser() + { + return getBrowserNameWithVersion($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); + } + + public function getBrowserName() + { + return getBrowserName($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); + } + + public function getBrowserIcon() + { + return getBrowserLogo($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); + } } \ No newline at end of file diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index 12f18b19d17..d1582533441 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -25,7 +25,7 @@ function getBrandLogo($label) } } -function getBrowserFamilyFullNameExtended($label) +function getBrowserFamilyFullName($label) { foreach (BrowserParser::getAvailableBrowserFamilies() as $name => $family) { if (in_array($label, $family)) { @@ -35,16 +35,16 @@ function getBrowserFamilyFullNameExtended($label) return Piwik::translate('General_Unknown'); } -function getBrowserFamilyLogoExtended($label) +function getBrowserFamilyLogo($label) { $browserFamilies = BrowserParser::getAvailableBrowserFamilies(); if (!empty($label) && array_key_exists($label, $browserFamilies)) { - return getBrowserLogoExtended($browserFamilies[$label][0]); + return getBrowserLogo($browserFamilies[$label][0]); } - return getBrowserLogoExtended($label); + return getBrowserLogo($label); } -function getBrowserNameExtended($label) +function getBrowserNameWithVersion($label) { $short = substr($label, 0, 2); $ver = substr($label, 3, 10); @@ -56,6 +56,17 @@ function getBrowserNameExtended($label) } } +function getBrowserName($label) +{ + $short = substr($label, 0, 2); + $browsers = BrowserParser::getAvailableBrowsers(); + if (array_key_exists($short, $browsers)) { + return trim(ucfirst($browsers[$short])); + } else { + return Piwik::translate('General_Unknown'); + } +} + /** * Returns the path to the logo for the given browser * @@ -67,7 +78,7 @@ function getBrowserNameExtended($label) * * @return string path to image */ -function getBrowserLogoExtended($short) +function getBrowserLogo($short) { $path = 'plugins/UserSettings/images/browsers/%s.gif'; @@ -82,7 +93,7 @@ function getBrowserLogoExtended($short) } } - $family = getBrowserFamilyFullNameExtended($short); + $family = getBrowserFamilyFullName($short); $browserFamilies = BrowserParser::getAvailableBrowserFamilies(); @@ -173,28 +184,36 @@ function getModelName($label) return $label; } -function getOSFamilyFullNameExtended($label) +function getOSFamilyFullName($label) { if ($label == \Piwik\Tracker\Settings::OS_BOT) { return 'Bot'; } - $label = OperatingSystemParser::getOsFamily($label); + $label = OperatingSystemParser::getOsFamily(_mapLegacyOsShortCodes($label)); + + if ($label == 'unknown') { + $label = Piwik::translate('General_Unknown'); + } else if ($label == 'Gaming Console') { + $label = Piwik::translate('UserSettings_GamingConsole'); + } + if ($label !== false) { return $label; } return Piwik::translate('General_Unknown'); } -function getOsFamilyLogoExtended($label) +function getOsFamilyLogo($label) { + $label = _mapLegacyOsShortCodes($label); $osFamilies = OperatingSystemParser::getAvailableOperatingSystemFamilies(); if (!empty($label) && array_key_exists($label, $osFamilies)) { - return getOsLogoExtended($osFamilies[$label][0]); + return getOsLogo($osFamilies[$label][0]); } - return getOsLogoExtended($label); + return getOsLogo($label); } -function getOsFullNameExtended($label) +function getOsFullName($label) { if (substr($label, 0, 3) == \Piwik\Tracker\Settings::OS_BOT) { return 'Bot'; @@ -202,7 +221,7 @@ function getOsFullNameExtended($label) if (!empty($label) && $label != ";") { $os = substr($label, 0, 3); $ver = substr($label, 4, 15); - $name = OperatingSystemParser::getNameFromId($os, $ver); + $name = OperatingSystemParser::getNameFromId(_mapLegacyOsShortCodes($os), $ver); if (!empty($name)) { return $name; } @@ -210,21 +229,39 @@ function getOsFullNameExtended($label) return Piwik::translate('General_Unknown'); } +function _mapLegacyOsShortCodes($shortCode) +{ + $legacyShortCodes = array( + 'IPA' => 'IOS', // iPad => iOS + 'IPH' => 'IOS', // iPhone => iOS + 'IPD' => 'IOS', // iPod => iOS + 'WIU' => 'WII', // WiiU => Nintendo + '3DS' => 'NDS', // Nintendo 3DS => Nintendo Mobile + 'DSI' => 'NDS', // Nintendo DSi => Nintendo Mobile + 'PSV' => 'PSP', // PlayStation Vita => PlayStation Portable + 'MAE' => 'SMG', // Maemo => MeeGo + //'VMS' => '', // OpenVMS => ?? + ); + return array_key_exists($shortCode, $legacyShortCodes) ? $legacyShortCodes[$shortCode] : $shortCode; +} + /** * Returns the path to the logo for the given OS * * First try to find a logo for the given short code * If none can be found try to find a logo for the os family - * Return unkown logo otherwise + * Return unknown logo otherwise * * @param string $short Shortcode or name of OS * * @return string path to image */ -function getOsLogoExtended($short) +function getOsLogo($short) { $path = 'plugins/UserSettings/images/os/%s.gif'; + $short = _mapLegacyOsShortCodes($short); + // If name is given instead of short code, try to find matching shortcode if (strlen($short) > 3) { @@ -235,7 +272,7 @@ function getOsLogoExtended($short) } } - $family = getOsFamilyFullNameExtended($short); + $family = getOSFamilyFullName($short); $osFamilies = OperatingSystemParser::getAvailableOperatingSystemFamilies(); if (!empty($short) && diff --git a/plugins/DevicesDetection/templates/index.twig b/plugins/DevicesDetection/templates/index.twig index aaba67968b6..9c0e97710b8 100644 --- a/plugins/DevicesDetection/templates/index.twig +++ b/plugins/DevicesDetection/templates/index.twig @@ -8,9 +8,9 @@
-

{{ "DevicesDetection_OperatingSystemFamilies"|translate }}

+

{{ "UserSettings_OperatingSystems"|translate }}

{{ osReport | raw}} -

{{ "UserSettings_BrowserFamilies"|translate }}

+

{{ "UserSettings_Browsers"|translate }}

{{ browserReport | raw }}

{{ "DevicesDetection_BrowserEngines"|translate }}

{{ browserEngineReport | raw }} diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index 9206c5ac51d..77f1c8f2bb4 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -31,7 +31,7 @@ {% endif %}
- {% if visitData.operatingSystemIcon is defined %}{% endif %}{% if visitData.operatingSystemShortName is defined %}{{ visitData.operatingSystemShortName }}{% endif %} + {% if visitData.operatingSystemIcon is defined %}{% endif %}{% if visitData.operatingSystem is defined %}{{ visitData.operatingSystem }}{% endif %}
{% if visitData.resolution is defined %}
  • {{ 'UserSettings_ColumnResolution'|translate }}{{ visitData.resolution }}
    • {% endif %} diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php index 1be5ecc6fc4..0754ccd45ce 100644 --- a/plugins/UserSettings/API.php +++ b/plugins/UserSettings/API.php @@ -20,8 +20,8 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; /** - * The UserSettings API lets you access reports about your Visitors technical settings: browsers, browser types (rendering engine), - * operating systems, plugins supported in their browser, Screen resolution and Screen types (normal, widescreen, dual screen or mobile). + * The UserSettings API lets you access reports about some of your Visitors technical settings: + * plugins supported in their browser, Screen resolution and Screen types (normal, widescreen, dual screen or mobile). * * @method static \Piwik\Plugins\UserSettings\API getInstance() */ @@ -56,111 +56,64 @@ protected function getDevicesDetectorApi() return \Piwik\Plugins\DevicesDetection\API::getInstance(); } + /** + * @deprecated since 2.10.0 See {@link Piwik\Plugins\DevicesDetector\API} for new implementation. + */ public function getOS($idSite, $period, $date, $segment = false, $addShortLabel = true) { - $dataTable = $this->getDataTable(Archiver::OS_RECORD_NAME, $idSite, $period, $date, $segment); - // these filters are applied directly so other API methods can use GroupBy on the result of this method - $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOSLogo')); - if ($addShortLabel) { - $dataTable->filter( - 'ColumnCallbackAddMetadata', array('label', 'shortLabel', __NAMESPACE__ . '\getOSShortLabel')); - } - $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getOSLabel')); - return $dataTable; + return $this->getDevicesDetectorApi()->getOsVersions($idSite, $period, $date, $segment); } /** - * Gets a DataTable displaying number of visits by operating system family. The operating - * system families are listed in vendor piwik/device-detector. + * @deprecated since 2.10.0 See {@link Piwik\Plugins\DevicesDetector\API} for new implementation. */ public function getOSFamily($idSite, $period, $date, $segment = false) { - $dataTable = $this->getOS($idSite, $period, $date, $segment, $addShortLabel = false); - $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOSFamily')); - $dataTable->queueFilter('ColumnCallbackReplace', array('label', array('\\Piwik\\Piwik','translate'))); - return $dataTable; + return $this->getDevicesDetectorApi()->getOsFamilies($idSite, $period, $date, $segment); } /** - * Gets a DataTable displaying number of visits by device type (mobile vs. desktop). + * Gets a DataTable displaying number of visits by device type. + * @deprecated since 2.10.0 See {@link Piwik\Plugins\DevicesDetector\API} for new implementation. */ public function getMobileVsDesktop($idSite, $period, $date, $segment = false) { - $dataTable = $this->getOS($idSite, $period, $date, $segment, $addShortLabel = false); - $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getDeviceTypeFromOS')); - $this->ensureDefaultRowsInTable($dataTable); - - // set the logo metadata - $dataTable->queueFilter('MetadataCallbackReplace', - array('logo', __NAMESPACE__ . '\getDeviceTypeImg', null, array('label'))); - - // translate the labels - $dataTable->queueFilter('ColumnCallbackReplace', array('label', array('\\Piwik\\Piwik','translate'))); - - return $dataTable; - } - - protected function ensureDefaultRowsInTable($dataTable) - { - $requiredRows = array( - 'General_Desktop' => Metrics::INDEX_NB_VISITS, - 'General_Mobile' => Metrics::INDEX_NB_VISITS - ); - - $dataTables = array($dataTable); - - if (!($dataTable instanceof DataTable\Map)) { - foreach ($dataTables as $table) { - if ($table->getRowsCount() == 0) { - continue; - } - foreach ($requiredRows as $requiredRow => $key) { - $row = $table->getRowFromLabel($requiredRow); - if (empty($row)) { - $table->addRowsFromSimpleArray(array( - array('label' => $requiredRow, $key => 0) - )); - } - } - } - } + return $this->getDevicesDetectorApi()->getType($idSite, $period, $date, $segment); } + /** + * @deprecated since 2.10.0 See {@link Piwik\Plugins\DevicesDetector\API} for new implementation. + */ public function getBrowserVersion($idSite, $period, $date, $segment = false) { - $dataTable = $this->getBrowserTable($idSite, $period, $date, $segment); - $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'shortLabel', __NAMESPACE__ . '\getBrowserShortLabel')); - return $dataTable; - } - - protected function getBrowserTable($idSite, $period, $date, $segment) - { - $dataTable = $this->getDataTable(Archiver::BROWSER_RECORD_NAME, $idSite, $period, $date, $segment); - $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowsersLogo')); - $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getBrowserLabel')); - return $dataTable; + return $this->getDevicesDetectorApi()->getBrowserVersions($idSite, $period, $date, $segment); } /** - * Gets a DataTable displaying number of visits by browser (ie, Firefox, Chrome, etc.). - * The browser version is not included in this report. + * @deprecated since 2.10.0 See {@link Piwik\Plugins\DevicesDetector\API} for new implementation. */ public function getBrowser($idSite, $period, $date, $segment = false) { - $dataTable = $this->getBrowserTable($idSite, $period, $date, $segment); - $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getBrowserFromBrowserVersion')); - return $dataTable; + return $this->getDevicesDetectorApi()->getBrowsers($idSite, $period, $date, $segment); } /** - * @deprecated since 2.7.1-b1 See {@link Piwik\Plugins\DevicesDetector\API} for new implementation. + * @deprecated since 2.9.0 See {@link Piwik\Plugins\DevicesDetector\API} for new implementation. */ public function getBrowserType($idSite, $period, $date, $segment = false) { return $this->getDevicesDetectorApi()->getBrowserEngines($idSite, $period, $date, $segment); } + /** + * @deprecated since 2.10.0 Use {@link getScreenType} instead. + */ public function getWideScreen($idSite, $period, $date, $segment = false) + { + return $this->getScreenType($idSite, $period, $date, $segment); + } + + public function getScreenType($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable(Archiver::SCREEN_TYPE_RECORD_NAME, $idSite, $period, $date, $segment); $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getScreensLogo')); diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php index ea4496b16a2..fed904de7d9 100644 --- a/plugins/UserSettings/Archiver.php +++ b/plugins/UserSettings/Archiver.php @@ -28,26 +28,19 @@ class Archiver extends \Piwik\Plugin\Archiver const PLUGIN_RECORD_NAME = 'UserSettings_plugin'; const SCREEN_TYPE_RECORD_NAME = 'UserSettings_wideScreen'; const RESOLUTION_RECORD_NAME = 'UserSettings_resolution'; - const BROWSER_RECORD_NAME = 'UserSettings_browser'; - const OS_RECORD_NAME = 'UserSettings_os'; const CONFIGURATION_RECORD_NAME = 'UserSettings_configuration'; const LANGUAGE_DIMENSION = "log_visit.location_browser_lang"; const RESOLUTION_DIMENSION = "log_visit.config_resolution"; - const BROWSER_VERSION_DIMENSION = "CONCAT(log_visit.config_browser_name, ';', log_visit.config_browser_version)"; - const OS_DIMENSION = "log_visit.config_os"; const CONFIGURATION_DIMENSION = "CONCAT(log_visit.config_os, ';', log_visit.config_browser_name, ';', log_visit.config_resolution)"; /** * Daily archive of User Settings report. Processes reports for Visits by Resolution, - * by Browser, Browser family, etc. Some reports are built from the logs, some reports - * are superset of an existing report (eg. Browser family is built from the Browser report) + * browser plugins, etc. Some reports are built from the logs, some reports are superset of an existing report */ public function aggregateDayReport() { $this->aggregateByConfiguration(); - $this->aggregateByOs(); - $this->aggregateByBrowser(); $this->aggregateByResolutionAndScreenType(); $this->aggregateByPlugin(); $this->aggregateByLanguage(); @@ -60,8 +53,6 @@ public function aggregateMultipleReports() { $dataTableRecords = array( self::CONFIGURATION_RECORD_NAME, - self::OS_RECORD_NAME, - self::BROWSER_RECORD_NAME, self::RESOLUTION_RECORD_NAME, self::SCREEN_TYPE_RECORD_NAME, self::PLUGIN_RECORD_NAME, @@ -76,23 +67,6 @@ protected function aggregateByConfiguration() $this->insertTable(self::CONFIGURATION_RECORD_NAME, $metrics); } - protected function aggregateByOs() - { - $metrics = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::OS_DIMENSION)->asDataTable(); - $this->insertTable(self::OS_RECORD_NAME, $metrics); - } - - protected function aggregateByBrowser() - { - $tableBrowser = $this->aggregateByBrowserVersion(); - } - - protected function aggregateByBrowserVersion() - { - $tableBrowser = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::BROWSER_VERSION_DIMENSION)->asDataTable(); - $this->insertTable(self::BROWSER_RECORD_NAME, $tableBrowser); - return $tableBrowser; - } protected function aggregateByResolutionAndScreenType() { $resolutions = $this->aggregateByResolution(); diff --git a/plugins/UserSettings/Columns/Browser.php b/plugins/UserSettings/Columns/Browser.php deleted file mode 100644 index edb9b6f1505..00000000000 --- a/plugins/UserSettings/Columns/Browser.php +++ /dev/null @@ -1,33 +0,0 @@ -setSegment('browserCode'); - $segment->setName('UserSettings_ColumnBrowser'); - $segment->setAcceptedValues('FF, IE, CH, SF, OP, etc.'); - $this->addSegment($segment); - } - - public function getName() - { - return Piwik::translate('UserSettings_ColumnBrowser'); - } -} \ No newline at end of file diff --git a/plugins/UserSettings/Columns/BrowserVersion.php b/plugins/UserSettings/Columns/BrowserVersion.php deleted file mode 100644 index ea30ea07817..00000000000 --- a/plugins/UserSettings/Columns/BrowserVersion.php +++ /dev/null @@ -1,32 +0,0 @@ -setSegment('browserVersion'); - $segment->setName('UserSettings_ColumnBrowserVersion'); - $segment->setAcceptedValues('1.0, 8.0, etc.'); - $this->addSegment($segment); - } - - public function getName() - { - return Piwik::translate('UserSettings_ColumnBrowserVersion'); - } -} \ No newline at end of file diff --git a/plugins/UserSettings/Columns/MobilevsDesktop.php b/plugins/UserSettings/Columns/MobilevsDesktop.php deleted file mode 100644 index 79721238b7c..00000000000 --- a/plugins/UserSettings/Columns/MobilevsDesktop.php +++ /dev/null @@ -1,20 +0,0 @@ -setSegment('operatingSystemCode'); - $segment->setName('UserSettings_ColumnOperatingSystem'); - $segment->setAcceptedValues('WXP, WI7, MAC, LIN, AND, IPD, etc.'); - $this->addSegment($segment); - } - - public function getName() - { - return Piwik::translate('UserSettings_ColumnOperatingSystem'); - } -} \ No newline at end of file diff --git a/plugins/UserSettings/Columns/OperatingsystemFamily.php b/plugins/UserSettings/Columns/OperatingsystemFamily.php deleted file mode 100644 index 7f8ed89a96f..00000000000 --- a/plugins/UserSettings/Columns/OperatingsystemFamily.php +++ /dev/null @@ -1,20 +0,0 @@ -dataTablePlugin = $this->renderReport(new GetPlugin()); $view->dataTableResolution = $this->renderReport(new GetResolution()); $view->dataTableConfiguration = $this->renderReport(new GetConfiguration()); - $view->dataTableOS = $this->renderReport(new GetOS()); - $view->dataTableBrowser = $this->renderReport(new GetBrowser()); - $view->dataTableMobileVsDesktop = $this->renderReport(new GetMobileVsDesktop()); + $view->dataTableScreenType = $this->renderReport(new GetScreenType()); $view->dataTableBrowserLanguage = $this->renderReport(new GetLanguage()); return $view->render(); diff --git a/plugins/UserSettings/Reports/GetBrowser.php b/plugins/UserSettings/Reports/GetBrowser.php deleted file mode 100644 index 47f262d2ef7..00000000000 --- a/plugins/UserSettings/Reports/GetBrowser.php +++ /dev/null @@ -1,46 +0,0 @@ -dimension = new Browser(); - $this->name = Piwik::translate('UserSettings_WidgetBrowsers'); - $this->documentation = Piwik::translate('UserSettings_WidgetBrowsersDocumentation', '
    '); - $this->order = 1; - $this->widgetTitle = 'UserSettings_WidgetBrowsers'; - } - - public function configureView(ViewDataTable $view) - { - $this->getBasicUserSettingsDisplayProperties($view); - - $view->config->title = Piwik::translate('UserSettings_Browsers'); - $view->config->addTranslation('label', $this->dimension->getName()); - - if ($view->isViewDataTableId(Graph::ID)) { - $view->config->max_graph_elements = 7; - } - } - - public function getRelatedReports() - { - return array( - new GetBrowserVersion() - ); - } -} diff --git a/plugins/UserSettings/Reports/GetBrowserVersion.php b/plugins/UserSettings/Reports/GetBrowserVersion.php deleted file mode 100644 index aa1c39f0422..00000000000 --- a/plugins/UserSettings/Reports/GetBrowserVersion.php +++ /dev/null @@ -1,47 +0,0 @@ -dimension = new BrowserVersion(); - $this->name = Piwik::translate('UserSettings_WidgetBrowserVersion'); - $this->documentation = ''; // TODO - $this->order = 2; - $this->widgetTitle = 'UserSettings_WidgetBrowserVersion'; - } - - public function configureView(ViewDataTable $view) - { - $this->getBasicUserSettingsDisplayProperties($view); - - $view->config->title = Piwik::translate('UserSettings_ColumnBrowserVersion'); - $view->config->addTranslation('label', $this->dimension->getName()); - - if ($view->isViewDataTableId(Graph::ID)) { - $view->config->max_graph_elements = 7; - } - } - - public function getRelatedReports() - { - return array( - new GetBrowser() - ); - } - -} diff --git a/plugins/UserSettings/Reports/GetMobileVsDesktop.php b/plugins/UserSettings/Reports/GetMobileVsDesktop.php deleted file mode 100644 index bbdfe900953..00000000000 --- a/plugins/UserSettings/Reports/GetMobileVsDesktop.php +++ /dev/null @@ -1,43 +0,0 @@ -dimension = new MobilevsDesktop(); - $this->name = Piwik::translate('UserSettings_MobileVsDesktop'); - $this->documentation = ''; // TODO - $this->constantRowsCount = true; - $this->order = 9; - $this->widgetTitle = 'UserSettings_MobileVsDesktop'; - } - - public function configureView(ViewDataTable $view) - { - $this->getBasicUserSettingsDisplayProperties($view); - - $view->config->title = Piwik::translate('UserSettings_MobileVsDesktop'); - $view->config->addTranslation('label', $this->dimension->getName()); - } - - public function getRelatedReports() - { - return array( - new GetWideScreen() - ); - } - -} diff --git a/plugins/UserSettings/Reports/GetOS.php b/plugins/UserSettings/Reports/GetOS.php deleted file mode 100644 index f3b6c028a2a..00000000000 --- a/plugins/UserSettings/Reports/GetOS.php +++ /dev/null @@ -1,41 +0,0 @@ -dimension = new Operatingsystem(); - $this->name = Piwik::translate('UserSettings_WidgetOperatingSystems'); - $this->documentation = ''; // TODO - $this->order = 6; - $this->widgetTitle = 'UserSettings_WidgetOperatingSystems'; - } - - public function configureView(ViewDataTable $view) - { - $this->getBasicUserSettingsDisplayProperties($view); - - $view->config->title = Piwik::translate('UserSettings_OperatingSystems'); - $view->config->addTranslation('label', $this->dimension->getName()); - } - - public function getRelatedReports() - { - return array( - new GetOSFamily() - ); - } -} diff --git a/plugins/UserSettings/Reports/GetOSFamily.php b/plugins/UserSettings/Reports/GetOSFamily.php deleted file mode 100644 index 5e12861b808..00000000000 --- a/plugins/UserSettings/Reports/GetOSFamily.php +++ /dev/null @@ -1,42 +0,0 @@ -dimension = new OperatingsystemFamily(); - $this->name = Piwik::translate('UserSettings_OperatingSystemFamily'); - $this->documentation = ''; // TODO - $this->order = 8; - $this->widgetTitle = 'UserSettings_OperatingSystemFamily'; - } - - public function configureView(ViewDataTable $view) - { - $this->getBasicUserSettingsDisplayProperties($view); - - $view->config->title = $this->name; - $view->config->addTranslation('label', $this->dimension->getName()); - } - - public function getRelatedReports() - { - return array( - new GetOS() - ); - } - -} diff --git a/plugins/UserSettings/Reports/GetWideScreen.php b/plugins/UserSettings/Reports/GetScreenType.php similarity index 87% rename from plugins/UserSettings/Reports/GetWideScreen.php rename to plugins/UserSettings/Reports/GetScreenType.php index 92006d590c4..1b33d0dc4ca 100644 --- a/plugins/UserSettings/Reports/GetWideScreen.php +++ b/plugins/UserSettings/Reports/GetScreenType.php @@ -12,7 +12,7 @@ use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\UserSettings\Columns\TypeOfScreen; -class GetWideScreen extends Base +class GetScreenType extends Base { protected function init() { @@ -34,11 +34,4 @@ public function configureView(ViewDataTable $view) $view->config->show_limit_control = false; $view->config->addTranslation('label', $this->dimension->getName()); } - - public function getRelatedReports() - { - return array( - new GetMobileVsDesktop() - ); - } } diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index 728df69f7e9..450a2f275ce 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -24,22 +24,40 @@ public function getListHooksRegistered() { return array( 'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations', - 'Live.getAllVisitorDetails' => 'extendVisitorDetails' + 'Live.getAllVisitorDetails' => 'extendVisitorDetails', + 'Request.dispatch' => 'mapDeprecatedActions' ); } + /** + * Maps the deprecated actions that were 'moved' to DevicesDetection plugin + * + * @deprecated since 2.10.0 and will be removed from May 1st 2015 + * @param $module + * @param $action + * @param $parameters + */ + public function mapDeprecatedActions(&$module, &$action, &$parameters) + { + $movedMethods = array( + 'getBrowser' => 'getBrowsers', + 'getBrowserVersion' => 'getBrowserVersions', + 'getMobileVsDesktop' => 'getType', + 'getOS' => 'getOsVersions', + 'getOSFamily' => 'getOsFamilies', + 'getBrowserType' => 'getBrowserEngines' + ); + + if ($module == 'UserSettings' && array_key_exists($action, $movedMethods)) { + $module = 'DevicesDetection'; + $action = $movedMethods[$action]; + } + } + public function extendVisitorDetails(&$visitor, $details) { $instance = new Visitor($details); - $visitor['operatingSystem'] = $instance->getOperatingSystem(); - $visitor['operatingSystemCode'] = $instance->getOperatingSystemCode(); - $visitor['operatingSystemShortName'] = $instance->getOperatingSystemShortName(); - $visitor['operatingSystemIcon'] = $instance->getOperatingSystemIcon(); - $visitor['browserName'] = $instance->getBrowser(); - $visitor['browserIcon'] = $instance->getBrowserIcon(); - $visitor['browserCode'] = $instance->getBrowserCode(); - $visitor['browserVersion'] = $instance->getBrowserVersion(); $visitor['screenType'] = $instance->getScreenType(); $visitor['resolution'] = $instance->getResolution(); $visitor['screenTypeIcon'] = $instance->getScreenTypeIcon(); diff --git a/plugins/UserSettings/Visitor.php b/plugins/UserSettings/Visitor.php index 6d114b1124d..03e2bd958a1 100644 --- a/plugins/UserSettings/Visitor.php +++ b/plugins/UserSettings/Visitor.php @@ -63,46 +63,6 @@ function getPluginIcons() return null; } - function getOperatingSystemCode() - { - return $this->details['config_os']; - } - - function getOperatingSystem() - { - return getOSLabel($this->details['config_os']); - } - - function getOperatingSystemShortName() - { - return getOSShortLabel($this->details['config_os']); - } - - function getOperatingSystemIcon() - { - return getOSLogo($this->details['config_os']); - } - - function getBrowserCode() - { - return $this->details['config_browser_name']; - } - - function getBrowserVersion() - { - return $this->details['config_browser_version']; - } - - function getBrowser() - { - return getBrowserLabel($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); - } - - function getBrowserIcon() - { - return getBrowsersLogo($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); - } - function getScreenType() { if (!array_key_exists('config_resolution', $this->details)) { diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index d7ca0fafd46..e367ff8bc98 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -11,12 +11,6 @@ use Piwik\Piwik; use Piwik\Tracker\Request; -use UserAgentParser; - -/** - * @see libs/UserAgentParser/UserAgentParser.php - */ -require_once PIWIK_INCLUDE_PATH . '/libs/UserAgentParser/UserAgentParser.php'; function getPluginsLogo($oldLabel) { @@ -26,69 +20,6 @@ function getPluginsLogo($oldLabel) return 'plugins/UserSettings/images/plugins/' . $oldLabel . '.gif'; } -function getOSLabel($osId) -{ - $osName = UserAgentParser::getOperatingSystemNameFromId($osId); - if ($osName !== false) { - return $osName; - } - if ($osId == 'UNK') { - return Piwik::translate('General_Unknown'); - } - return $osId; -} - -function getOSShortLabel($osId) -{ - $osShortName = UserAgentParser::getOperatingSystemShortNameFromId($osId); - if ($osShortName !== false) { - return $osShortName; - } - if ($osId == 'UNK') { - return Piwik::translate('General_Unknown'); - } - return $osId; -} - -function getOSFamily($osLabel) -{ - $osId = UserAgentParser::getOperatingSystemIdFromName($osLabel); - $osFamily = UserAgentParser::getOperatingSystemFamilyFromId($osId); - - if ($osFamily == 'unknown') { - $osFamily = Piwik::translate('General_Unknown'); - } else if ($osFamily == 'Gaming Console') { - $osFamily = Piwik::translate('UserSettings_GamingConsole'); - } - - return $osFamily; -} - -function getDeviceTypeFromOS($osLabel) -{ - $osId = UserAgentParser::getOperatingSystemIdFromName($osLabel); - $osFamily = UserAgentParser::getOperatingSystemFamilyFromId($osId); - - // NOTE: translations done in another filter - switch ($osFamily) { - case 'Windows': - case 'Linux': - case 'Mac': - case 'Unix': - case 'Other': - case 'Gaming Console': - return 'General_Desktop'; - case 'iOS': - case 'Android': - case 'Windows Mobile': - case 'Other Mobile': - case 'Mobile Gaming Console': - return 'General_Mobile'; - default: - return 'General_Unknown'; - } -} - function getConfigurationLabel($str) { if (strpos($str, ';') === false) { @@ -96,9 +27,9 @@ function getConfigurationLabel($str) } $values = explode(";", $str); - $os = getOSLabel($values[0]); + $os = \Piwik\Plugins\DevicesDetection\getOsFullName($values[0]); $name = $values[1]; - $browser = UserAgentParser::getBrowserNameFromId($name); + $browser = \Piwik\Plugins\DevicesDetection\getBrowserName($name); if ($browser === false) { $browser = Piwik::translate('General_Unknown'); } @@ -106,44 +37,6 @@ function getConfigurationLabel($str) return $os . " / " . $browser . " / " . $resolution; } -function getBrowserLabel($oldLabel) -{ - $browserId = getBrowserId($oldLabel); - $version = getBrowserVersion($oldLabel); - $browserName = UserAgentParser::getBrowserNameFromId($browserId); - if ($browserName !== false) { - return $browserName . " " . $version; - } - if ($browserId == 'UNK') { - return Piwik::translate('General_Unknown'); - } - return $oldLabel; -} - -function getBrowserShortLabel($oldLabel) -{ - $browserId = getBrowserId($oldLabel); - $version = getBrowserVersion($oldLabel); - $browserName = UserAgentParser::getBrowserShortNameFromId($browserId); - if ($browserName !== false) { - return $browserName . " " . $version; - } - if ($browserId == 'UNK') { - return Piwik::translate('General_Unknown'); - } - return $oldLabel; -} - -function getBrowserId($str) -{ - return substr($str, 0, strpos($str, ';')); -} - -function getBrowserVersion($str) -{ - return substr($str, strpos($str, ';') + 1); -} - function getLogoImageFromId($dir, $id) { $path = $dir . '/' . $id . '.gif'; @@ -154,43 +47,11 @@ function getLogoImageFromId($dir, $id) } } -function getBrowsersLogo($label) -{ - $id = getBrowserId($label); - // For aggregated row 'Others' - if (empty($id)) { - $id = 'UNK'; - } - return getLogoImageFromId('plugins/UserSettings/images/browsers', $id); -} - -function getOSLogo($label) -{ - // For aggregated row 'Others' - if (empty($label)) { - $label = 'UNK'; - } - return getLogoImageFromId('plugins/UserSettings/images/os', $label); -} - function getScreensLogo($label) { return 'plugins/UserSettings/images/screens/' . $label . '.gif'; } -function getDeviceTypeImg($oldOSImage, $osFamilyLabel) -{ - switch ($osFamilyLabel) { - case 'General_Desktop': - return 'plugins/UserSettings/images/screens/normal.gif'; - case 'General_Mobile': - return 'plugins/UserSettings/images/screens/mobile.gif'; - case 'General_Unknown': - default: - return 'plugins/UserSettings/images/os/UNK.gif'; - } -} - function getScreenTypeFromResolution($resolution) { if ($resolution === Request::UNKNOWN_RESOLUTION) { @@ -213,24 +74,6 @@ function getScreenTypeFromResolution($resolution) return $name; } -function getBrowserFamily($browserLabel) -{ - $familyNameToUse = UserAgentParser::getBrowserFamilyFromId(substr($browserLabel, 0, 2)); - return $familyNameToUse; -} - -/** - * Extracts the browser name from a string with the browser name and version. - */ -function getBrowserFromBrowserVersion($browserWithVersion) -{ - if (preg_match("/(.+) [0-9]+(?:\.[0-9]+)?$/", $browserWithVersion, $matches) === 0) { - return $browserWithVersion; - } - - return $matches[1]; -} - /** * Returns the given language code to translated language name * diff --git a/plugins/UserSettings/images/os/IOS.gif b/plugins/UserSettings/images/os/IOS.gif index a3b970ae1b0..17ef80cd539 100644 Binary files a/plugins/UserSettings/images/os/IOS.gif and b/plugins/UserSettings/images/os/IOS.gif differ diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json index f4ab9b44605..0c1ed777c11 100644 --- a/plugins/UserSettings/lang/en.json +++ b/plugins/UserSettings/lang/en.json @@ -12,6 +12,7 @@ "ColumnOperatingSystem": "Operating system", "ColumnResolution": "Resolution", "ColumnTypeOfScreen": "Type of screen", + "ScreenTypes": "Screen types", "Configurations": "Configurations", "GamingConsole": "Gaming Console", "Language_aa": "Afar", diff --git a/plugins/UserSettings/templates/index.twig b/plugins/UserSettings/templates/index.twig index 79f6d6072eb..7b6d236d47f 100644 --- a/plugins/UserSettings/templates/index.twig +++ b/plugins/UserSettings/templates/index.twig @@ -1,25 +1,19 @@
    - -

    {{ 'UserSettings_Browsers'|translate }}

    - {{ dataTableBrowser|raw }} -

    {{ 'General_Plugins'|translate }}

    {{ dataTablePlugin|raw }} + +

    {{ 'UserSettings_BrowserLanguage'|translate }}

    + {{ dataTableBrowserLanguage|raw }}
    -

    {{ 'UserSettings_Configurations'|translate }}

    - {{ dataTableConfiguration|raw }} - -

    {{ 'UserSettings_OperatingSystems'|translate }}

    - {{ dataTableOS|raw }}

    {{ 'UserSettings_Resolutions'|translate }}

    {{ dataTableResolution|raw }} -

    {{ 'UserSettings_MobileVsDesktop'|translate }}

    - {{ dataTableMobileVsDesktop|raw }} +

    {{ 'UserSettings_ScreenTypes'|translate }}

    + {{ dataTableScreenType|raw }} -

    {{ 'UserSettings_BrowserLanguage'|translate }}

    - {{ dataTableBrowserLanguage|raw }} +

    {{ 'UserSettings_Configurations'|translate }}

    + {{ dataTableConfiguration|raw }}
    diff --git a/plugins/UserSettings/tests/Unit/UserSettingsTest.php b/plugins/UserSettings/tests/Unit/UserSettingsTest.php deleted file mode 100644 index 408420ed6f1..00000000000 --- a/plugins/UserSettings/tests/Unit/UserSettingsTest.php +++ /dev/null @@ -1,1036 +0,0 @@ -assertFalse($expected[0]); - else { - $family = \Piwik\Plugins\UserSettings\getBrowserFamily($res['id']); - $this->assertEquals($expected[0][0], $res['id']); - $this->assertEquals($expected[0][1], $res['name']); - $this->assertEquals($expected[0][2], $res['short_name']); - $this->assertEquals($expected[0][3], $res['version']); - $this->assertEquals($expected[0][4], $res['major_number']); - $this->assertEquals($expected[0][5], $res['minor_number']); - $this->assertEquals($expected[0][6], $family); - } - } - - /** - * Test getOperatingSystem() - * - * @dataProvider getUserAgents - * @group Plugins - */ - public function testGetOperatingSystem($userAgent, $expected) - { - $res = UserAgentParser::getOperatingSystem($userAgent); - - $this->assertEquals($expected[1][0], $res['id']); - $this->assertEquals($expected[1][1], $res['name']); - $this->assertEquals($expected[1][2], $res['short_name']); - } -} diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index 430db34cedc..cf1c778e843 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -41,7 +41,7 @@ public function testGet() 'VisitsSummary_VisitsSummary' => 6, 'Live!' => 4, 'General_Visitors' => 12, - 'UserSettings_VisitorSettings' => 11, + 'UserSettings_VisitorSettings' => 6, 'General_Actions' => 10, 'Events_Events' => 3, 'Actions_SubmenuSitesearch' => 5, diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php index f54a6aaafd5..8048c31de53 100755 --- a/tests/PHPUnit/System/BlobReportLimitingTest.php +++ b/tests/PHPUnit/System/BlobReportLimitingTest.php @@ -37,8 +37,8 @@ public function getApiForTesting() 'CustomVariables.getCustomVariables', 'Referrers.getReferrerType', 'Referrers.getKeywords', 'Referrers.getSearchEngines', 'Referrers.getWebsites', 'Referrers.getAll', /* TODO 'Referrers.getCampaigns', */ - 'UserSettings.getResolution', 'UserSettings.getConfiguration', 'UserSettings.getOS', - 'UserSettings.getBrowserVersion', + 'UserSettings.getResolution', 'UserSettings.getConfiguration', 'DevicesDetection.getOsVersions', + 'DevicesDetection.getBrowserVersions', 'UserCountry.getRegion', 'UserCountry.getCity', ); diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php index fe91a25fb42..4a9e4d2ff70 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php @@ -109,7 +109,7 @@ public function test_checkArchiveRecords_whenPeriodIsRange() $tests = array( // TODO Implement fix, then remove the +3 below 'archive_blob_2010_12' => ( ($expectedActionsBlobs+3) /*Actions*/ - + 7 /* UserSettings */ + + 5 /* UserSettings */ + 2 /* VisitTime */) * 3, /** diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php index 82ce3d5e232..1122a59c907 100755 --- a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php +++ b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php @@ -33,7 +33,7 @@ public function testApi($api, $params) public function getApiForTesting() { $apiToCall = array( - 'VisitTime', 'VisitsSummary', 'VisitorInterest', 'VisitFrequency', 'UserSettings', + 'VisitTime', 'VisitsSummary', 'VisitorInterest', 'VisitFrequency', 'UserSettings', 'DevicesDetection', 'UserCountry', 'Referrers', 'Provider', 'Goals', 'CustomVariables', 'CoreAdminHome', 'Actions', 'Live.getLastVisitsDetails'); diff --git a/tests/PHPUnit/System/RowEvolutionTest.php b/tests/PHPUnit/System/RowEvolutionTest.php index 0fba18234dc..efdf021061c 100755 --- a/tests/PHPUnit/System/RowEvolutionTest.php +++ b/tests/PHPUnit/System/RowEvolutionTest.php @@ -163,8 +163,8 @@ public function getApiForTesting() 'otherRequestParameters' => array( 'date' => '2010-03-01,2010-03-06', 'period' => 'month', - 'apiModule' => 'UserSettings', - 'apiAction' => 'getBrowser', + 'apiModule' => 'DevicesDetection', + 'apiAction' => 'getBrowsers', 'label' => 'Firefox,Chrome,Opera' ) )); @@ -178,8 +178,8 @@ public function getApiForTesting() 'otherRequestParameters' => array( 'date' => '2010-03-01,2010-03-06', 'period' => 'month', - 'apiModule' => 'UserSettings', - 'apiAction' => 'getMobileVsDesktop', + 'apiModule' => 'DevicesDetection', + 'apiAction' => 'getType', 'label' => 'Desktop,Mobile' ) )); diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index 9a6324b1bb9..0ef089e70cc 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -77,7 +77,6 @@ Mac OS MAC - Mac OS plugins/UserSettings/images/os/MAC.gif webkit WebKit (Safari, Chrome) @@ -174,7 +173,6 @@ Linux LIN - Linux plugins/UserSettings/images/os/LIN.gif Gecko Gecko (Firefox) @@ -271,7 +269,6 @@ Linux LIN - Linux plugins/UserSettings/images/os/LIN.gif webkit WebKit (Safari, Chrome) @@ -368,7 +365,6 @@ Linux LIN - Linux plugins/UserSettings/images/os/LIN.gif webkit WebKit (Safari, Chrome) @@ -465,7 +461,6 @@ Windows 7 WI7 - Win 7 plugins/UserSettings/images/os/WI7.gif ie Trident (IE) @@ -562,7 +557,6 @@ Linux LIN - Linux plugins/UserSettings/images/os/LIN.gif Gecko Gecko (Firefox) @@ -659,7 +653,6 @@ Linux LIN - Linux plugins/UserSettings/images/os/LIN.gif webkit WebKit (Safari, Chrome) @@ -756,7 +749,6 @@ Android AND - Android plugins/UserSettings/images/os/AND.gif unknown Unknown @@ -853,7 +845,6 @@ Mac OS MAC - Mac OS plugins/UserSettings/images/os/MAC.gif unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 17fe7bfe252..7bc0f5a0987 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -186,7 +186,6 @@ Unknown UNK - Unknown plugins/UserSettings/images/os/UNK.gif unknown Unknown @@ -301,7 +300,6 @@ Windows XP WXP - Win XP plugins/UserSettings/images/os/WXP.gif ie Trident (IE) @@ -411,7 +409,6 @@ Mac OS MAC - Mac OS plugins/UserSettings/images/os/MAC.gif unknown Unknown @@ -535,7 +532,6 @@ Mac OS MAC - Mac OS plugins/UserSettings/images/os/MAC.gif unknown Unknown @@ -648,7 +644,6 @@ Mac OS MAC - Mac OS plugins/UserSettings/images/os/MAC.gif unknown Unknown @@ -749,7 +744,6 @@ Bot BOT - BOT plugins/UserSettings/images/os/UNK.gif unknown Unknown @@ -856,7 +850,6 @@ Windows 7 WI7 - Win 7 plugins/UserSettings/images/os/WI7.gif ie Trident (IE) @@ -947,7 +940,6 @@ Unknown UNK - Unknown plugins/UserSettings/images/os/UNK.gif unknown Unknown @@ -1054,7 +1046,6 @@ Android AND - Android plugins/UserSettings/images/os/AND.gif unknown Unknown @@ -1155,7 +1146,6 @@ Mac OS MAC - Mac OS plugins/UserSettings/images/os/MAC.gif unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 188f7cb3c25..121915e8e4d 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -56,14 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Safari - plugins/UserSettings/images/browsers/SF.gif - SF - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -79,8 +71,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif WebKit WebKit (Safari, Chrome) + Safari + Safari + plugins/UserSettings/images/browsers/SF.gif + SF + 0 North America amn @@ -204,14 +204,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -227,8 +219,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown unk @@ -329,14 +329,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -352,8 +344,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown unk @@ -468,14 +468,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -491,8 +483,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -593,14 +593,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -616,8 +608,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -749,14 +749,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -772,8 +764,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -874,14 +874,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -897,8 +889,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -1013,14 +1013,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1036,8 +1028,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -1138,14 +1138,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1161,8 +1153,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -1294,14 +1294,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1317,8 +1309,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -1419,14 +1419,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1442,8 +1434,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -1558,14 +1558,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1581,8 +1573,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -1697,14 +1697,6 @@ - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1720,8 +1712,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 1 Asia asi @@ -1814,14 +1814,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1837,8 +1829,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -1939,14 +1939,6 @@ - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1962,8 +1954,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 0 Asia asi @@ -2095,14 +2095,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -2118,8 +2110,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -2251,14 +2251,6 @@ - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -2274,8 +2266,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 1 Unknown unk @@ -2368,14 +2368,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -2391,8 +2383,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -2493,14 +2493,6 @@ - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -2516,8 +2508,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 0 Unknown unk @@ -2632,14 +2632,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -2655,8 +2647,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -2771,14 +2771,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -2794,8 +2786,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 North America amn @@ -2910,14 +2910,6 @@ - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -2933,8 +2925,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 1 North America amn @@ -3041,14 +3041,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -3064,8 +3056,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Asia asi @@ -3166,14 +3166,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -3189,8 +3181,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -3291,14 +3291,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -3314,8 +3306,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 North America amn @@ -3416,14 +3416,6 @@ - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -3439,8 +3431,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 0 North America amn @@ -3541,14 +3541,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -3564,8 +3556,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Asia asi @@ -3697,14 +3697,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -3720,8 +3712,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -3853,14 +3853,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -3876,8 +3868,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -4009,14 +4009,6 @@ - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -4032,8 +4024,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 1 North America amn @@ -4157,14 +4157,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -4180,8 +4172,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -4282,14 +4282,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -4305,8 +4297,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -4407,14 +4407,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -4430,8 +4422,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -4532,14 +4532,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -4555,8 +4547,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 North America amn @@ -4657,14 +4657,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -4680,8 +4672,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index a0cd8d2485a..9317026f72b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -46,8 +46,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -71,14 +79,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -148,8 +148,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -173,14 +181,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -318,8 +318,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 6 Unknown Unknown @@ -343,14 +351,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -420,8 +420,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -445,14 +453,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -757,8 +757,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 13 Unknown Unknown @@ -782,14 +790,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -859,8 +859,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -884,14 +892,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -957,8 +957,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -982,14 +990,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1123,8 +1123,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 6 Unknown Unknown @@ -1148,14 +1156,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1221,8 +1221,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -1246,14 +1254,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1554,8 +1554,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 13 Unknown Unknown @@ -1579,14 +1587,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index a0cd8d2485a..9317026f72b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -46,8 +46,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -71,14 +79,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -148,8 +148,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -173,14 +181,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -318,8 +318,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 6 Unknown Unknown @@ -343,14 +351,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -420,8 +420,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -445,14 +453,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -757,8 +757,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 13 Unknown Unknown @@ -782,14 +790,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -859,8 +859,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -884,14 +892,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -957,8 +957,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -982,14 +990,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1123,8 +1123,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 6 Unknown Unknown @@ -1148,14 +1156,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1221,8 +1221,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown Unknown @@ -1246,14 +1254,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1554,8 +1554,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 13 Unknown Unknown @@ -1579,14 +1587,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 77308fd9e7e..8723d1a05fa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -14,27 +14,39 @@ - 10 - 13 - 3 - 305 - 8 - 9 - 10 + 5 + 5 + 1 + 0 + 5 + 5 + 5 0 plugins/UserSettings/images/browsers/CH.gif - - 7 - 7 + + 5 + 5 1 0 - 7 - 6 - 7 + 5 + 5 + 5 0 - plugins/UserSettings/images/browsers/UNK.gif + plugins/UserSettings/images/browsers/EP.gif + + + + 5 + 8 + 3 + 305 + 3 + 4 + 5 + 0 + plugins/UserSettings/images/browsers/CH.gif @@ -60,4 +72,16 @@ 0 plugins/UserSettings/images/browsers/FF.gif + + + 2 + 2 + 1 + 0 + 2 + 1 + 2 + 0 + plugins/UserSettings/images/browsers/UNK.gif + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml new file mode 100644 index 00000000000..8723d1a05fa --- /dev/null +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -0,0 +1,87 @@ + + + + + 6 + 6 + 1 + 0 + 6 + 6 + 6 + 0 + plugins/UserSettings/images/browsers/IE.gif + + + + 5 + 5 + 1 + 0 + 5 + 5 + 5 + 0 + plugins/UserSettings/images/browsers/CH.gif + + + + 5 + 5 + 1 + 0 + 5 + 5 + 5 + 0 + plugins/UserSettings/images/browsers/EP.gif + + + + 5 + 8 + 3 + 305 + 3 + 4 + 5 + 0 + plugins/UserSettings/images/browsers/CH.gif + + + + 2 + 2 + 1 + 0 + 2 + 2 + 2 + 0 + plugins/UserSettings/images/browsers/AN.gif + + + + 2 + 2 + 1 + 0 + 2 + 2 + 2 + 0 + plugins/UserSettings/images/browsers/FF.gif + + + + 2 + 2 + 1 + 0 + 2 + 1 + 2 + 0 + plugins/UserSettings/images/browsers/UNK.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 276e8202532..0a059a62d67 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -36,4 +36,39 @@ 0 plugins/DevicesDetection/images/screens/smartphone.png + + + 0 + plugins/DevicesDetection/images/screens/tablet.png + + + + 0 + plugins/DevicesDetection/images/screens/mobile.gif + + + + 0 + plugins/DevicesDetection/images/screens/console.gif + + + + 0 + plugins/DevicesDetection/images/screens/tv.png + + + + 0 + plugins/DevicesDetection/images/screens/carbrowser.png + + + + 0 + plugins/DevicesDetection/images/screens/unknown.gif + + + + 0 + plugins/DevicesDetection/images/screens/camera.png + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index cdcfa194b13..dd6812feea8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -62,8 +62,16 @@ Desktop + Windows 8.1 + W81 + plugins/UserSettings/images/os/W81.gif Blink Blink (Chrome, Opera) + Chrome 33.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 33.0 0 Unknown Unknown @@ -87,14 +95,6 @@ Raleigh, North Carolina, United States 35.771999 -78.639000 - Windows 8.1 - W81 - W81 - plugins/UserSettings/images/os/W81.gif - Chrome 33.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 33.0 wide 1366x768 plugins/UserSettings/images/screens/wide.gif @@ -200,8 +200,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Trident Trident (IE) + Internet Explorer 8.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 8.0 0 Unknown Unknown @@ -225,14 +233,6 @@ Lake Forest, California, United States 33.645000 -117.679001 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Internet Explorer 8.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 8.0 wide 1536x864 plugins/UserSettings/images/screens/wide.gif @@ -313,8 +313,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Blink Blink (Chrome, Opera) + Chrome 34.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 34.0 0 Unknown Unknown @@ -338,14 +346,6 @@ Germany 51 9 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Chrome 34.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 34.0 wide 1920x1200 plugins/UserSettings/images/screens/wide.gif @@ -459,8 +459,16 @@ Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif WebKit WebKit (Safari, Chrome) + Safari 7.0 + Safari + plugins/UserSettings/images/browsers/SF.gif + SF + 7.0 0 Unknown Unknown @@ -484,14 +492,6 @@ United States 38 -97 - Mac OS - MAC - Mac OS - plugins/UserSettings/images/os/MAC.gif - Safari 7.0 - plugins/UserSettings/images/browsers/SF.gif - SF - 7.0 wide 2880x1800 plugins/UserSettings/images/screens/wide.gif @@ -574,8 +574,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Blink Blink (Chrome, Opera) + Chrome 33.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 33.0 0 Unknown Unknown @@ -599,14 +607,6 @@ Maaseik, Limburg, Belgium 51.099998 5.800000 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Chrome 33.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 33.0 wide 1920x1080 plugins/UserSettings/images/screens/wide.gif @@ -700,8 +700,16 @@ Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif Blink Blink (Chrome, Opera) + Chrome 33.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 33.0 0 Unknown Unknown @@ -725,14 +733,6 @@ San Francisco, California, United States 37.792000 -122.408997 - Mac OS - MAC - Mac OS - plugins/UserSettings/images/os/MAC.gif - Chrome 33.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 33.0 wide 1360x768 plugins/UserSettings/images/screens/wide.gif @@ -833,8 +833,16 @@ Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif WebKit WebKit (Safari, Chrome) + Safari 7.0 + Safari + plugins/UserSettings/images/browsers/SF.gif + SF + 7.0 0 Unknown Unknown @@ -858,14 +866,6 @@ Nihon'odori, Kanagawa, Japan 35.450001 139.649994 - Mac OS - MAC - Mac OS - plugins/UserSettings/images/os/MAC.gif - Safari 7.0 - plugins/UserSettings/images/browsers/SF.gif - SF - 7.0 wide 2560x1440 plugins/UserSettings/images/screens/wide.gif @@ -955,8 +955,16 @@ Unknown + Android + AND + plugins/UserSettings/images/os/AND.gif Gecko Gecko (Firefox) + Firefox 27.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 27.0 0 Unknown Unknown @@ -980,14 +988,6 @@ Weilerswist, Nordrhein-Westfalen, Germany 50.766998 6.833000 - Android - AND - Android - plugins/UserSettings/images/os/AND.gif - Firefox 27.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 27.0 mobile 360x640 plugins/UserSettings/images/screens/mobile.gif @@ -1069,8 +1069,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Gecko Gecko (Firefox) + Firefox 27.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 27.0 0 Unknown Unknown @@ -1094,14 +1102,6 @@ Mainz, Rheinland-Pfalz, Germany 50 8.271000 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Firefox 27.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 27.0 wide 2560x1440 plugins/UserSettings/images/screens/wide.gif @@ -1238,8 +1238,16 @@ Desktop + Windows 8 + WI8 + plugins/UserSettings/images/os/WI8.gif Gecko Gecko (Firefox) + Firefox 27.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 27.0 0 Unknown Unknown @@ -1263,14 +1271,6 @@ Moscow, Moscow City, Russian Federation 55.751999 37.616001 - Windows 8 - WI8 - Win 8 - plugins/UserSettings/images/os/WI8.gif - Firefox 27.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 27.0 wide 1920x1080 plugins/UserSettings/images/screens/wide.gif @@ -1356,8 +1356,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Blink Blink (Chrome, Opera) + Chrome 33.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 33.0 0 Unknown Unknown @@ -1381,14 +1389,6 @@ Esentepe, Rize, Turkey 40.979000 40.415001 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Chrome 33.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 33.0 wide 1366x768 plugins/UserSettings/images/screens/wide.gif @@ -1482,8 +1482,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Blink Blink (Chrome, Opera) + Chrome 33.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 33.0 0 Unknown Unknown @@ -1507,14 +1515,6 @@ Maaseik, Limburg, Belgium 51.099998 5.800000 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Chrome 33.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 33.0 wide 1920x1080 plugins/UserSettings/images/screens/wide.gif @@ -1766,8 +1766,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 0 Unknown Unknown @@ -1791,14 +1799,6 @@ Japan 36 138 - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -1882,8 +1882,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Trident Trident (IE) + Internet Explorer 6.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 6.0 0 Unknown Unknown @@ -1907,14 +1915,6 @@ Unknown - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Internet Explorer 6.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 6.0 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1999,8 +1999,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif WebKit WebKit (Safari, Chrome) + Chrome 11.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 11.0 0 Unknown Unknown @@ -2024,14 +2032,6 @@ Unknown - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Chrome 11.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 11.0 wide 1280x800 plugins/UserSettings/images/screens/wide.gif @@ -2132,8 +2132,16 @@ Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif WebKit WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/UserSettings/images/browsers/CH.gif + RM + 0.9 0 Unknown Unknown @@ -2157,14 +2165,6 @@ Japan 36 138 - Mac OS - MAC - Mac OS - plugins/UserSettings/images/os/MAC.gif - RockMelt 0.9 - plugins/UserSettings/images/browsers/UNK.gif - RM - 0.9 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -2257,8 +2257,16 @@ Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif WebKit WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/UserSettings/images/browsers/CH.gif + RM + 0.9 0 Unknown Unknown @@ -2282,14 +2290,6 @@ Japan 36 138 - Mac OS - MAC - Mac OS - plugins/UserSettings/images/os/MAC.gif - RockMelt 0.9 - plugins/UserSettings/images/browsers/UNK.gif - RM - 0.9 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -2389,8 +2389,16 @@ Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif WebKit WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/UserSettings/images/browsers/CH.gif + RM + 0.9 0 Unknown Unknown @@ -2414,14 +2422,6 @@ Japan 36 138 - Mac OS - MAC - Mac OS - plugins/UserSettings/images/os/MAC.gif - RockMelt 0.9 - plugins/UserSettings/images/browsers/UNK.gif - RM - 0.9 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -2497,8 +2497,16 @@ Unknown + Bot + BOT + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 0 Unknown Unknown @@ -2522,14 +2530,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - Bot - BOT - BOT - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -2605,8 +2605,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Trident Trident (IE) + Internet Explorer 9.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 9.0 0 Unknown Unknown @@ -2630,14 +2638,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Internet Explorer 9.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 9.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -2703,8 +2703,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 0 Unknown Unknown @@ -2728,14 +2736,6 @@ Australia -27 133 - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -2811,8 +2811,16 @@ Smartphone + Android + AND + plugins/UserSettings/images/os/AND.gif WebKit WebKit (Safari, Chrome) + Android Browser + Android Browser + plugins/UserSettings/images/browsers/AN.gif + AN + 0 Unknown Unknown @@ -2836,14 +2844,6 @@ Japan 36 138 - Android - AND - Android - plugins/UserSettings/images/os/AND.gif - Android Browser - plugins/UserSettings/images/browsers/AN.gif - AN - unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -2919,8 +2919,16 @@ Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif WebKit WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/UserSettings/images/browsers/CH.gif + RM + 0.9 0 Unknown Unknown @@ -2944,14 +2952,6 @@ Japan 36 138 - Mac OS - MAC - Mac OS - plugins/UserSettings/images/os/MAC.gif - RockMelt 0.9 - plugins/UserSettings/images/browsers/UNK.gif - RM - 0.9 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3023,8 +3023,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif WebKit WebKit (Safari, Chrome) + Chrome 20.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 20.0 0 Unknown Unknown @@ -3048,14 +3056,6 @@ Unknown - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Chrome 20.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 20.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3127,8 +3127,16 @@ Desktop + GNU/Linux + LIN + plugins/UserSettings/images/os/LIN.gif WebKit WebKit (Safari, Chrome) + Epiphany 2.30 + Epiphany + plugins/UserSettings/images/browsers/EP.gif + EP + 2.30 0 Unknown Unknown @@ -3152,14 +3160,6 @@ Unknown - Linux - LIN - Linux - plugins/UserSettings/images/os/LIN.gif - Epiphany 2.30 - plugins/UserSettings/images/browsers/EP.gif - EP - 2.30 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3231,8 +3231,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif WebKit WebKit (Safari, Chrome) + Chrome 20.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 20.0 0 Unknown Unknown @@ -3256,14 +3264,6 @@ Brazil -10 -55 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Chrome 20.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 20.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3335,8 +3335,16 @@ Desktop + GNU/Linux + LIN + plugins/UserSettings/images/os/LIN.gif WebKit WebKit (Safari, Chrome) + Epiphany 2.30 + Epiphany + plugins/UserSettings/images/browsers/EP.gif + EP + 2.30 0 Unknown Unknown @@ -3360,14 +3368,6 @@ Brazil -10 -55 - Linux - LIN - Linux - plugins/UserSettings/images/os/LIN.gif - Epiphany 2.30 - plugins/UserSettings/images/browsers/EP.gif - EP - 2.30 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3439,8 +3439,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Trident Trident (IE) + Internet Explorer 9.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 9.0 0 Unknown Unknown @@ -3464,14 +3472,6 @@ Brazil -10 -55 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Internet Explorer 9.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 9.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3543,8 +3543,16 @@ Desktop + GNU/Linux + LIN + plugins/UserSettings/images/os/LIN.gif WebKit WebKit (Safari, Chrome) + Epiphany 2.30 + Epiphany + plugins/UserSettings/images/browsers/EP.gif + EP + 2.30 0 Unknown Unknown @@ -3568,14 +3576,6 @@ Japan 36 138 - Linux - LIN - Linux - plugins/UserSettings/images/os/LIN.gif - Epiphany 2.30 - plugins/UserSettings/images/browsers/EP.gif - EP - 2.30 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3647,8 +3647,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Trident Trident (IE) + Internet Explorer 9.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 9.0 0 Unknown Unknown @@ -3672,14 +3680,6 @@ Japan 36 138 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Internet Explorer 9.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 9.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3751,8 +3751,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Trident Trident (IE) + Internet Explorer 9.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 9.0 0 Unknown Unknown @@ -3776,14 +3784,6 @@ Unknown - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Internet Explorer 9.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 9.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3855,8 +3855,16 @@ Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif WebKit WebKit (Safari, Chrome) + Chrome 19.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 19.0 0 Unknown Unknown @@ -3880,14 +3888,6 @@ Unknown - Mac OS - MAC - Mac OS - plugins/UserSettings/images/os/MAC.gif - Chrome 19.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 19.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -3959,8 +3959,16 @@ Desktop + GNU/Linux + LIN + plugins/UserSettings/images/os/LIN.gif Gecko Gecko (Firefox) + Firefox 6.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 6.0 0 Unknown Unknown @@ -3984,14 +3992,6 @@ Unknown - Linux - LIN - Linux - plugins/UserSettings/images/os/LIN.gif - Firefox 6.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 6.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -4063,8 +4063,16 @@ Desktop + GNU/Linux + LIN + plugins/UserSettings/images/os/LIN.gif WebKit WebKit (Safari, Chrome) + Chrome 19.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 19.0 0 Unknown Unknown @@ -4088,14 +4096,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - Linux - LIN - Linux - plugins/UserSettings/images/os/LIN.gif - Chrome 19.0 - plugins/UserSettings/images/browsers/CH.gif - CH - 19.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -4167,8 +4167,16 @@ Desktop + GNU/Linux + LIN + plugins/UserSettings/images/os/LIN.gif WebKit WebKit (Safari, Chrome) + Epiphany 2.30 + Epiphany + plugins/UserSettings/images/browsers/EP.gif + EP + 2.30 0 Unknown Unknown @@ -4192,14 +4200,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - Linux - LIN - Linux - plugins/UserSettings/images/os/LIN.gif - Epiphany 2.30 - plugins/UserSettings/images/browsers/EP.gif - EP - 2.30 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -4271,8 +4271,16 @@ Desktop + Windows 7 + WI7 + plugins/UserSettings/images/os/WI7.gif Trident Trident (IE) + Internet Explorer 9.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 9.0 0 Unknown Unknown @@ -4296,14 +4304,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - Windows 7 - WI7 - Win 7 - plugins/UserSettings/images/os/WI7.gif - Internet Explorer 9.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 9.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -4375,8 +4375,16 @@ Desktop + GNU/Linux + LIN + plugins/UserSettings/images/os/LIN.gif Gecko Gecko (Firefox) + Firefox 6.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 6.0 0 Unknown Unknown @@ -4400,14 +4408,6 @@ Japan 36 138 - Linux - LIN - Linux - plugins/UserSettings/images/os/LIN.gif - Firefox 6.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 6.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -4479,8 +4479,16 @@ Desktop + GNU/Linux + LIN + plugins/UserSettings/images/os/LIN.gif WebKit WebKit (Safari, Chrome) + Epiphany 2.30 + Epiphany + plugins/UserSettings/images/browsers/EP.gif + EP + 2.30 0 Unknown Unknown @@ -4504,14 +4512,6 @@ Japan 36 138 - Linux - LIN - Linux - plugins/UserSettings/images/os/LIN.gif - Epiphany 2.30 - plugins/UserSettings/images/browsers/EP.gif - EP - 2.30 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -4583,8 +4583,16 @@ Smartphone + Android + AND + plugins/UserSettings/images/os/AND.gif WebKit WebKit (Safari, Chrome) + Android Browser + Android Browser + plugins/UserSettings/images/browsers/AN.gif + AN + 0 Unknown Unknown @@ -4608,14 +4616,6 @@ Japan 36 138 - Android - AND - Android - plugins/UserSettings/images/os/AND.gif - Android Browser - plugins/UserSettings/images/browsers/AN.gif - AN - unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -4687,8 +4687,16 @@ Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif WebKit WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/UserSettings/images/browsers/CH.gif + RM + 0.9 0 Unknown Unknown @@ -4712,14 +4720,6 @@ Japan 36 138 - Mac OS - MAC - Mac OS - plugins/UserSettings/images/os/MAC.gif - RockMelt 0.9 - plugins/UserSettings/images/browsers/UNK.gif - RM - 0.9 unknown unknown plugins/UserSettings/images/screens/unknown.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 4be2e497a2f..80d06470a3e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -11,7 +11,6 @@ 5 0 plugins/UserSettings/images/browsers/EP.gif - Epiphany 2.30 @@ -24,7 +23,6 @@ 5 0 plugins/UserSettings/images/browsers/IE.gif - Internet Explorer 9.0 @@ -36,11 +34,10 @@ 4 5 0 - plugins/UserSettings/images/browsers/UNK.gif - RockMelt 0.9 + plugins/UserSettings/images/browsers/CH.gif - + 2 2 1 @@ -50,7 +47,6 @@ 2 0 plugins/UserSettings/images/browsers/AN.gif - Android Browser @@ -63,7 +59,6 @@ 2 0 plugins/UserSettings/images/browsers/CH.gif - Chrome 19.0 @@ -76,7 +71,6 @@ 2 0 plugins/UserSettings/images/browsers/CH.gif - Chrome 20.0 @@ -89,7 +83,6 @@ 2 0 plugins/UserSettings/images/browsers/FF.gif - Firefox 6.0 @@ -102,7 +95,6 @@ 2 0 plugins/UserSettings/images/browsers/UNK.gif - Unknown @@ -115,7 +107,6 @@ 1 0 plugins/UserSettings/images/browsers/CH.gif - Chrome 11.0 @@ -128,6 +119,5 @@ 1 0 plugins/UserSettings/images/browsers/IE.gif - Internet Explorer 6.0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 99d9c637a23..8723d1a05fa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -1,7 +1,19 @@ - + + 6 + 6 + 1 + 0 + 6 + 6 + 6 + 0 + plugins/UserSettings/images/browsers/IE.gif + + + 5 5 1 @@ -10,19 +22,19 @@ 5 5 0 - plugins/UserSettings/images/browsers/EP.gif + plugins/UserSettings/images/browsers/CH.gif - - 6 - 6 + + 5 + 5 1 0 - 6 - 6 - 6 + 5 + 5 + 5 0 - plugins/UserSettings/images/browsers/IE.gif + plugins/UserSettings/images/browsers/EP.gif @@ -34,10 +46,10 @@ 4 5 0 - plugins/UserSettings/images/browsers/UNK.gif + plugins/UserSettings/images/browsers/CH.gif - + 2 2 1 @@ -48,18 +60,6 @@ 0 plugins/UserSettings/images/browsers/AN.gif - - - 5 - 5 - 1 - 0 - 5 - 5 - 5 - 0 - plugins/UserSettings/images/browsers/CH.gif - 2 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index 99f2f8d770b..446d719865c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -1,7 +1,7 @@ - + 5 5 1 @@ -12,7 +12,7 @@ 0 - + 5 8 3 @@ -45,7 +45,7 @@ 0 - + 2 2 1 @@ -78,7 +78,7 @@ 0 - + 1 1 1 @@ -89,7 +89,7 @@ 0 - + 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index 27bfc099ba3..0a059a62d67 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -10,30 +10,65 @@ 22 23 0 - plugins/UserSettings/images/screens/normal.gif + plugins/DevicesDetection/images/screens/normal.gif - + 2 2 1 0 2 - 2 + 1 2 0 - plugins/UserSettings/images/screens/mobile.gif + plugins/DevicesDetection/images/screens/unknown.gif - + 2 2 1 0 2 - 1 + 2 2 0 - plugins/UserSettings/images/os/UNK.gif + plugins/DevicesDetection/images/screens/smartphone.png + + + + 0 + plugins/DevicesDetection/images/screens/tablet.png + + + + 0 + plugins/DevicesDetection/images/screens/mobile.gif + + + + 0 + plugins/DevicesDetection/images/screens/console.gif + + + + 0 + plugins/DevicesDetection/images/screens/tv.png + + + + 0 + plugins/DevicesDetection/images/screens/carbrowser.png + + + + 0 + plugins/DevicesDetection/images/screens/unknown.gif + + + + 0 + plugins/DevicesDetection/images/screens/camera.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index cb47530ed22..62d091d83d2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -1,7 +1,7 @@ - + 8 8 1 @@ -22,7 +22,7 @@ 9 9 0 - plugins/UserSettings/images/os/WXP.gif + plugins/UserSettings/images/os/WI7.gif @@ -49,14 +49,26 @@ plugins/UserSettings/images/os/AND.gif - - 2 - 2 + + 1 + 1 1 0 - 2 + 1 1 - 2 + 1 + 0 + plugins/UserSettings/images/os/UNK.gif + + + + 1 + 1 + 1 + 0 + 1 + 0 + 1 0 plugins/UserSettings/images/os/UNK.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index 1ac05e3dda0..7cad47e0a13 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -1,7 +1,7 @@ - + 8 8 1 @@ -11,7 +11,6 @@ 8 0 plugins/UserSettings/images/os/LIN.gif - Linux @@ -24,23 +23,21 @@ 7 0 plugins/UserSettings/images/os/WI7.gif - Win 7 - - 6 - 9 + + 5 + 8 3 305 - 4 - 5 - 6 + 3 + 4 + 5 0 plugins/UserSettings/images/os/MAC.gif - Mac OS - + 2 2 1 @@ -50,7 +47,6 @@ 2 0 plugins/UserSettings/images/os/AND.gif - Android @@ -63,7 +59,6 @@ 2 0 plugins/UserSettings/images/os/WXP.gif - Win XP @@ -76,7 +71,18 @@ 1 0 plugins/UserSettings/images/os/UNK.gif - BOT + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + plugins/UserSettings/images/os/MAC.gif @@ -89,6 +95,5 @@ 1 0 plugins/UserSettings/images/os/UNK.gif - Unknown \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml new file mode 100644 index 00000000000..2048a44e64d --- /dev/null +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml @@ -0,0 +1,39 @@ + + + + + 25 + 28 + 3 + 305 + 23 + 23 + 25 + 0 + plugins/UserSettings/images/screens/unknown.gif + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + plugins/UserSettings/images/screens/normal.gif + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + plugins/UserSettings/images/screens/wide.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 4ca08713739..5f234ed9c57 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -95,7 +95,6 @@ Windows XP WXP - Win XP plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) @@ -219,7 +218,6 @@ Windows XP WXP - Win XP plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) @@ -343,7 +341,6 @@ Windows XP WXP - Win XP plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) @@ -467,7 +464,6 @@ Windows XP WXP - Win XP plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) @@ -622,7 +618,6 @@ Windows XP WXP - Win XP plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) @@ -777,7 +772,6 @@ Windows XP WXP - Win XP plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) @@ -924,7 +918,6 @@ Unknown UNK - Unknown plugins/UserSettings/images/os/UNK.gif unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index 403004b58a1..1e9d9ac92f0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -66,14 +66,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -89,8 +81,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -220,14 +220,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -243,8 +235,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -343,14 +343,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -366,8 +358,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -497,14 +497,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -520,8 +512,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -620,14 +620,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -643,8 +635,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 North America amn @@ -774,14 +774,6 @@ - Unknown - UNK - Unknown - plugins/UserSettings/images/os/UNK.gif - Unknown - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -797,8 +789,16 @@ Unknown + Unknown + UNK + plugins/UserSettings/images/os/UNK.gif Unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + 1 North America amn @@ -889,14 +889,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -912,8 +904,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 46e7e63638d..a1a78762695 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -56,14 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Safari - plugins/UserSettings/images/browsers/SF.gif - SF - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -79,8 +71,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif WebKit WebKit (Safari, Chrome) + Safari + Safari + plugins/UserSettings/images/browsers/SF.gif + SF + 0 North America amn @@ -204,14 +204,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -227,8 +219,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown unk @@ -329,14 +329,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -352,8 +344,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown unk @@ -468,14 +468,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -491,8 +483,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -593,14 +593,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -616,8 +608,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -749,14 +749,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -772,8 +764,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -874,14 +874,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -897,8 +889,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index aa243bc1016..d8315dbc59a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -97,14 +97,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -120,8 +112,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown unk @@ -222,14 +222,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -245,8 +237,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown unk @@ -378,14 +378,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -401,8 +393,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -517,14 +517,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -540,8 +532,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -642,14 +642,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -665,8 +657,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -767,14 +767,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -790,8 +782,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -882,14 +882,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Safari - plugins/UserSettings/images/browsers/SF.gif - SF - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -905,8 +897,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif WebKit WebKit (Safari, Chrome) + Safari + Safari + plugins/UserSettings/images/browsers/SF.gif + SF + 0 North America amn diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 46e7e63638d..a1a78762695 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -56,14 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Safari - plugins/UserSettings/images/browsers/SF.gif - SF - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -79,8 +71,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif WebKit WebKit (Safari, Chrome) + Safari + Safari + plugins/UserSettings/images/browsers/SF.gif + SF + 0 North America amn @@ -204,14 +204,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -227,8 +219,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown unk @@ -329,14 +329,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -352,8 +344,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown unk @@ -468,14 +468,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -491,8 +483,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -593,14 +593,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -616,8 +608,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -749,14 +749,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -772,8 +764,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -874,14 +874,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -897,8 +889,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 51741a69bc7..e5c58280d59 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -56,14 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Safari - plugins/UserSettings/images/browsers/SF.gif - SF - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -79,8 +71,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif WebKit WebKit (Safari, Chrome) + Safari + Safari + plugins/UserSettings/images/browsers/SF.gif + SF + 0 North America amn @@ -204,14 +204,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -227,8 +219,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Unknown unk @@ -329,14 +329,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -352,8 +344,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown unk @@ -468,14 +468,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -491,8 +483,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -593,14 +593,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -616,8 +608,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -749,14 +749,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -772,8 +764,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -874,14 +874,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -897,8 +889,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -1013,14 +1013,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1036,8 +1028,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur @@ -1138,14 +1138,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1161,8 +1153,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Europe eur @@ -1294,14 +1294,6 @@ - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -1317,8 +1309,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 1 Europe eur diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml new file mode 100644 index 00000000000..84860eba92c --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -0,0 +1,14 @@ + + + + + 1 + 2 + 8 + 7 + 1621 + 1 + 2 + plugins/UserSettings/images/browsers/FF.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index 347eac465fa..d1aae4191e4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -11,4 +11,44 @@ 2 plugins/DevicesDetection/images/screens/normal.gif + + + 0 + plugins/DevicesDetection/images/screens/smartphone.png + + + + 0 + plugins/DevicesDetection/images/screens/tablet.png + + + + 0 + plugins/DevicesDetection/images/screens/mobile.gif + + + + 0 + plugins/DevicesDetection/images/screens/console.gif + + + + 0 + plugins/DevicesDetection/images/screens/tv.png + + + + 0 + plugins/DevicesDetection/images/screens/carbrowser.png + + + + 0 + plugins/DevicesDetection/images/screens/unknown.gif + + + + 0 + plugins/DevicesDetection/images/screens/camera.png + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml index 82104979100..6f656fdf684 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml @@ -10,6 +10,5 @@ 1 2 plugins/UserSettings/images/browsers/FF.gif - Firefox 3.6 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml index fe566ebe7c2..d1aae4191e4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml @@ -9,11 +9,46 @@ 1621 1 2 - plugins/UserSettings/images/screens/normal.gif + plugins/DevicesDetection/images/screens/normal.gif - + 0 - plugins/UserSettings/images/screens/mobile.gif + plugins/DevicesDetection/images/screens/smartphone.png + + + + 0 + plugins/DevicesDetection/images/screens/tablet.png + + + + 0 + plugins/DevicesDetection/images/screens/mobile.gif + + + + 0 + plugins/DevicesDetection/images/screens/console.gif + + + + 0 + plugins/DevicesDetection/images/screens/tv.png + + + + 0 + plugins/DevicesDetection/images/screens/carbrowser.png + + + + 0 + plugins/DevicesDetection/images/screens/unknown.gif + + + + 0 + plugins/DevicesDetection/images/screens/camera.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml index 5c3a3311e3d..379e429ee3a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml @@ -9,6 +9,6 @@ 1621 1 2 - plugins/UserSettings/images/os/WXP.gif + plugins/UserSettings/images/os/WI7.gif \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml index 32ec517b60a..4e417535ae5 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml @@ -10,6 +10,5 @@ 1 2 plugins/UserSettings/images/os/WXP.gif - Win XP \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml new file mode 100644 index 00000000000..f1acb38cb94 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml @@ -0,0 +1,14 @@ + + + + + 1 + 2 + 8 + 7 + 1621 + 1 + 2 + plugins/UserSettings/images/screens/normal.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml new file mode 100644 index 00000000000..8ff05bc8ffc --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml @@ -0,0 +1,15 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + plugins/DevicesDetection/images/brand/Unknown.ico + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml new file mode 100644 index 00000000000..5bcb7b02d63 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml @@ -0,0 +1,14 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml new file mode 100644 index 00000000000..968ffc7d900 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml @@ -0,0 +1,15 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + plugins/UserSettings/images/browsers/FF.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml new file mode 100644 index 00000000000..b8deec1d688 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -0,0 +1,15 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + plugins/UserSettings/images/browsers/FF.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml new file mode 100644 index 00000000000..968ffc7d900 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -0,0 +1,15 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + plugins/UserSettings/images/browsers/FF.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml new file mode 100644 index 00000000000..302503d00ef --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml @@ -0,0 +1,14 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml new file mode 100644 index 00000000000..04cebec91e6 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml @@ -0,0 +1,15 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + plugins/UserSettings/images/os/WI7.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml new file mode 100644 index 00000000000..785661d383e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -0,0 +1,15 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + plugins/UserSettings/images/os/WXP.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml new file mode 100644 index 00000000000..782397bace6 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -0,0 +1,55 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + plugins/DevicesDetection/images/screens/normal.gif + + + + 0 + plugins/DevicesDetection/images/screens/smartphone.png + + + + 0 + plugins/DevicesDetection/images/screens/tablet.png + + + + 0 + plugins/DevicesDetection/images/screens/mobile.gif + + + + 0 + plugins/DevicesDetection/images/screens/console.gif + + + + 0 + plugins/DevicesDetection/images/screens/tv.png + + + + 0 + plugins/DevicesDetection/images/screens/carbrowser.png + + + + 0 + plugins/DevicesDetection/images/screens/unknown.gif + + + + 0 + plugins/DevicesDetection/images/screens/camera.png + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 4297f032703..b0e326e03d1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -52,8 +52,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -77,14 +85,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -240,8 +240,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -265,14 +273,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml index 6451b5cbbb5..b8deec1d688 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml @@ -11,6 +11,5 @@ 1 2 plugins/UserSettings/images/browsers/FF.gif - Firefox 3.6 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml index 1456e8c033f..782397bace6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml @@ -10,11 +10,46 @@ 1621 1 2 - plugins/UserSettings/images/screens/normal.gif + plugins/DevicesDetection/images/screens/normal.gif - + 0 - plugins/UserSettings/images/screens/mobile.gif + plugins/DevicesDetection/images/screens/smartphone.png + + + + 0 + plugins/DevicesDetection/images/screens/tablet.png + + + + 0 + plugins/DevicesDetection/images/screens/mobile.gif + + + + 0 + plugins/DevicesDetection/images/screens/console.gif + + + + 0 + plugins/DevicesDetection/images/screens/tv.png + + + + 0 + plugins/DevicesDetection/images/screens/carbrowser.png + + + + 0 + plugins/DevicesDetection/images/screens/unknown.gif + + + + 0 + plugins/DevicesDetection/images/screens/camera.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml index 63f67f61ca5..04cebec91e6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml @@ -10,6 +10,6 @@ 1621 1 2 - plugins/UserSettings/images/os/WXP.gif + plugins/UserSettings/images/os/WI7.gif \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml index e041ea24092..785661d383e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml @@ -11,6 +11,5 @@ 1 2 plugins/UserSettings/images/os/WXP.gif - Win XP \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml new file mode 100644 index 00000000000..1aa955af66a --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml @@ -0,0 +1,15 @@ + + + + + 1 + 2 + 9 + 0 + 8 + 1621 + 1 + 2 + plugins/UserSettings/images/screens/normal.gif + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index dd2dfa26faf..884a614a5bd 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -41,8 +41,16 @@ Inconnu + Bot + BOT + plugins/UserSettings/images/os/UNK.gif Inconnu + Inconnu + Inconnu + plugins/UserSettings/images/browsers/UNK.gif + UNK + 0 Inconnu Inconnu @@ -66,14 +74,6 @@ France - Bot - BOT - BOT - plugins/UserSettings/images/os/UNK.gif - Inconnu - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -148,8 +148,16 @@ Inconnu + Bot + BOT + plugins/UserSettings/images/os/UNK.gif Inconnu + Inconnu + Inconnu + plugins/UserSettings/images/browsers/UNK.gif + UNK + 0 Inconnu Inconnu @@ -173,14 +181,6 @@ France - Bot - BOT - BOT - plugins/UserSettings/images/os/UNK.gif - Inconnu - plugins/UserSettings/images/browsers/UNK.gif - UNK - normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index e38d88d7f53..dfaee585ef3 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -46,8 +46,16 @@ Desktop + Windows Vista + WVI + plugins/UserSettings/images/os/WVI.gif Trident Trident (IE) + Internet Explorer 7.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 7.0 0 Unknown Unknown @@ -71,14 +79,6 @@ Unknown - Windows Vista - WVI - Win Vista - plugins/UserSettings/images/os/WVI.gif - Internet Explorer 7.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 7.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -139,8 +139,16 @@ Desktop + Windows Vista + WVI + plugins/UserSettings/images/os/WVI.gif Trident Trident (IE) + Internet Explorer 7.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 7.0 0 Unknown Unknown @@ -164,14 +172,6 @@ Unknown - Windows Vista - WVI - Win Vista - plugins/UserSettings/images/os/WVI.gif - Internet Explorer 7.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 7.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif @@ -232,8 +232,16 @@ Desktop + Windows Vista + WVI + plugins/UserSettings/images/os/WVI.gif Trident Trident (IE) + Internet Explorer 7.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 7.0 0 Unknown Unknown @@ -257,14 +265,6 @@ Unknown - Windows Vista - WVI - Win Vista - plugins/UserSettings/images/os/WVI.gif - Internet Explorer 7.0 - plugins/UserSettings/images/browsers/IE.gif - IE - 7.0 unknown unknown plugins/UserSettings/images/screens/unknown.gif diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml index 86026aff84e..9ee74c6530c 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml @@ -43,7 +43,7 @@ Desktop (Visits) - plugins/UserSettings/images/screens/normal.gif + plugins/DevicesDetection/images/screens/normal.gif 0 1 @@ -51,7 +51,7 @@ Mobile (Visits) - Mobile vs Desktop + Device type Visits Unique visitors diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index c828bbb0e6d..e0516433ba8 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -41,8 +41,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -66,14 +74,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 5f754663624..fa013321e73 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -76,18 +76,6 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site 800x300,9,41,0%,4.56,00:13:21,11.11% 1024x768,1,2,0%,2,00:06:01,0% -Visitor Browser -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,0%,5,00:15:01,0% -Firefox,1,2,0%,2,00:06:01,0% -Opera,1,1,0%,1,00:00:00,100% - -Browser Version -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,0%,5,00:15:01,0% -Firefox 3.6,1,2,0%,2,00:06:01,0% -Opera 9.63,1,1,0%,1,00:00:00,100% - Browser Plugins label,nb_visits,nb_visits_percentage Cookie,10,100% @@ -106,28 +94,12 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site Dual,9,41,0%,4.56,00:13:21,11.11% Normal,1,2,0%,2,00:06:01,0% -Operating System -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,0%,5,00:15:01,0% -Windows XP,2,3,0%,1.5,00:03:01,50% - Visitor Configuration label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown / Unknown / 800x300,8,40,0%,5,00:15:01,0% Windows XP / Firefox / 1024x768,1,2,0%,2,00:06:01,0% Windows XP / Opera / 800x300,1,1,0%,1,00:00:00,100% -Operating system family -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,0%,5,00:15:01,0% -Windows,2,3,0%,1.5,00:03:01,50% - -Mobile vs Desktop -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,0%,5,00:15:01,0% -Desktop,2,3,0%,1.5,00:03:01,50% -Mobile,0,0,0%,0,00:00:00,0% - Browser language label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,8,40,0%,5,00:15:01,0% @@ -349,6 +321,18 @@ Device brand label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,10,43,0%,4.3,00:12:37,10% +Visitor Browser +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Firefox,1,2,0%,2,00:06:01,0% +Opera,1,1,0%,1,00:00:00,100% + +Browser Version +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Firefox 3.6,1,2,0%,2,00:06:01,0% +Opera 9.63,1,1,0%,1,00:00:00,100% + Device model label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,10,43,0%,4.3,00:12:37,10% @@ -363,18 +347,6 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site Unknown,8,40,0%,5,00:15:01,0% Windows XP,2,3,0%,1.5,00:03:01,50% -Browser families -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,0%,5,00:15:01,0% -Firefox,1,2,0%,2,00:06:01,0% -Opera,1,1,0%,1,00:00:00,100% - -Browser versions -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,0%,5,00:15:01,0% -Firefox 3.6,1,2,0%,2,00:06:01,0% -Opera 9.63,1,1,0%,1,00:00:00,100% - Browser engines label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,8,40,0%,5,00:15:01,0% diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 0d52d558257..560e7ebe33a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -48,16 +48,6 @@

    Screen Resolution - -
  • - - Visitor Browser - -
    • -
  • - - Browser Version -
  • @@ -65,29 +55,14 @@

  • - + Normal / Widescreen -
    • -
  • - - Operating System -
  • Visitor Configuration -
    • -
  • - - Operating system family - -
    • -
  • - - Mobile vs Desktop -
  • @@ -285,28 +260,28 @@

  • - - Device model + + Visitor Browser
  • - - Operating System families + + Browser Version
  • - - Operating System versions + + Device model
  • - - Browser families + + Operating System families
  • - - Browser versions + + Operating System versions
  • @@ -1988,12 +1963,12 @@

    Back to top -

    - Visitor Browser +

    + Browser Plugins

    @@ -2003,73 +1978,89 @@

    -  Browser   +  Plugin    Visits   -  Actions   - - -  Actions per Visit   - - -  Avg. Time on Website   - - -  Bounce Rate   - - -  Conversion Rate   +  % Visits   - +   - Unknown + Cookie - 8 + 10 - 40 + 100% + + + + + +   + Flash - 5 + 10 - 00:15:01 + 100% + + + + + +   + Java - 0% + 10 - 0% + 100% - +   - Firefox + Director - 1 + 0 - 2 + 0% + + + + + +   + Gears - 2 + 0 - 00:06:01 + 0% + + + + + +   + Pdf - 0% + 0 0% @@ -2078,23 +2069,50 @@

    - +   - Opera + Quicktime - 1 + 0 - 1 + 0% + + + + + +   + Realplayer - 1 + 0 - 00:00:00 + 0% + + + + + + +   + Silverlight + + 0 - 100% + 0% + + + + + + +   + Windowsmedia + + 0 0% @@ -2106,12 +2124,12 @@

    Back to top -

    - Browser Version +

    + Normal / Widescreen

    @@ -2121,7 +2139,7 @@

    -  Browser version   +  Type of screen    Visits   @@ -2146,23 +2164,23 @@

    - +   - Unknown + Dual - 8 + 9 - 40 + 41 - 5 + 4.56 - 00:15:01 + 00:13:21 - 0% + 11.11% 0% @@ -2171,9 +2189,9 @@

    - +   - Firefox 3.6 + Normal 1 @@ -2192,31 +2210,6 @@

    0% - - - - - -   - Opera 9.63 - - 1 - - - 1 - - - 1 - - - 00:00:00 - - - 100% - - - 0% - @@ -2224,12 +2217,12 @@

    Back to top -

    - Browser Plugins +

    + Visitor Configuration

    @@ -2239,396 +2232,49 @@

    -  Plugin   +  Configuration    Visits   -  % Visits   +  Actions   + + +  Actions per Visit   + + +  Avg. Time on Website   + + +  Bounce Rate   + + +  Conversion Rate   - -   - Cookie + Unknown / Unknown / 800x300 - 10 + 8 - 100% + 40 - - - - - -   - Flash - 10 + 5 - 100% + 00:15:01 - - - - - -   - Java - 10 + 0% - 100% - - - - - - -   - Director - - 0 - - - 0% - - - - - - -   - Gears - - 0 - - - 0% - - - - - - -   - Pdf - - 0 - - - 0% - - - - - - -   - Quicktime - - 0 - - - 0% - - - - - - -   - Realplayer - - 0 - - - 0% - - - - - - -   - Silverlight - - 0 - - - 0% - - - - - - -   - Windowsmedia - - 0 - - - 0% - - - - -
    - - Back to top - -

    - Normal / Widescreen -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Type of screen   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Dual - 9 - - 41 - - 4.56 - - 00:13:21 - - 11.11% - - 0% -
    - -   - Normal - 1 - - 2 - - 2 - - 00:06:01 - - 0% - - 0% -
    -
    - - Back to top - -

    - Operating System -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Operating system   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Windows XP - 2 - - 3 - - 1.5 - - 00:03:01 - - 50% - - 0% -
    -
    - - Back to top - -

    - Visitor Configuration -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - @@ -2665,224 +2311,13 @@

    - 1 - -

    - - - - -
    -  Configuration   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - Unknown / Unknown / 800x300 - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% + 0%
    - 00:00:00 - - 100% - - 0% -
    -
    - - Back to top - -

    - Operating system family -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Operating system family   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Windows - 2 - - 3 - - 1.5 - - 00:03:01 - - 50% - - 0% -
    -
    - - Back to top - -

    - Mobile vs Desktop -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +   + Unknown + + + + + + + + + + + + + + + + + + + + + Firefox 3.6 + + + + + + + + + + - - - - - - - - - - + Unknown - - + Windows - - - - - - - - - - + Windows XP - - - - - - - - - - - - - - - - - - - - - - -
    -  Mobile vs Desktop   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Desktop - 2 - - 3 - - 1.5 - - 00:03:01 - - 50% - - 0% -
    - -   - Mobile - 0 - - 0 - - 0 + 1 00:00:00 - 0% + 100% 0% @@ -5336,12 +4771,12 @@

    Back to top -

    - Device model +

    + Visitor Browser

    @@ -5351,7 +4786,7 @@

    -  Device model   +  Browser    Visits   @@ -5376,21 +4811,73 @@

    		- Unknown - 10 + 8 - 43 + 40 - 4.3 + 5 - 00:12:37 + 00:15:01 - 10% + 0% + + 0% +
    + +   + Firefox + 1 + + 2 + + 2 + + 00:06:01 + + 0% + + 0% +
    + +   + Opera + 1 + + 1 + + 1 + + 00:00:00 + + 100% 0% @@ -5402,12 +4889,12 @@

    Back to top -

    - Operating System families +

    + Browser Version

    @@ -5417,7 +4904,7 @@

    -  Operating System families   +  Browser version    Visits   @@ -5442,7 +4929,7 @@

    		- +   Unknown @@ -5467,23 +4954,48 @@

    		- +   - Windows + 1 + 2 - 3 + 2 - 1.5 + 00:06:01 - 00:03:01 + 0% - 50% + 0% +
    + +   + Opera 9.63 + 1 + + 1 + + 1 + + 00:00:00 + + 100% 0% @@ -5495,12 +5007,12 @@

    Back to top -

    - Operating System versions +

    + Device model

    @@ -5510,7 +5022,7 @@

    -  Operating System versions   +  Device model    Visits   @@ -5535,48 +5047,21 @@

    		- -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Windows XP - 2 + 10 - 3 + 43 - 1.5 + 4.3 - 00:03:01 + 00:12:37 - 50% + 10% 0% @@ -5588,12 +5073,12 @@

    Back to top -

    - Browser families +

    + Operating System families

    @@ -5603,7 +5088,7 @@

    -  Browser families   +  Operating system family    Visits   @@ -5628,7 +5113,7 @@

    		- +   Unknown @@ -5653,48 +5138,23 @@

    		- +   - Firefox - 1 - - 2 - 2 - 00:06:01 - - 0% - - 0% -
    - -   - Opera - 1 - - 1 + 3 - 1 + 1.5 - 00:00:00 + 00:03:01 - 100% + 50% 0% @@ -5706,12 +5166,12 @@

    Back to top -

    - Browser versions +

    + Operating System versions

    @@ -5721,7 +5181,7 @@

    -  Browser versions   +  Operating System versions    Visits   @@ -5746,7 +5206,7 @@

    		- +   Unknown @@ -5771,48 +5231,23 @@

    		- +   - Firefox 3.6 - 1 - - 2 - 2 - 00:06:01 - - 0% - - 0% -
    - -   - Opera 9.63 - 1 - - 1 + 3 - 1 + 1.5 - 00:00:00 + 00:03:01 - 100% + 50% 0% diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 48a31165e9f..912f27a1643 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -48,16 +48,6 @@

    Screen Resolution - -
  • - - Visitor Browser - -
    • -
  • - - Browser Version -
  • @@ -65,29 +55,14 @@

  • - + Normal / Widescreen -
    • -
  • - - Operating System -
  • Visitor Configuration -
    • -
  • - - Operating system family - -
    • -
  • - - Mobile vs Desktop -
  • @@ -310,28 +285,28 @@

  • - - Device model + + Visitor Browser
  • - - Operating System families + + Browser Version
  • - - Operating System versions + + Device model
  • - - Browser families + + Operating System families
  • - - Browser versions + + Operating System versions
  • @@ -1977,230 +1952,6 @@

    Back to top -

    - Visitor Browser -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Browser   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Firefox - 1 - - 2 - - 2 - - 00:06:01 - - 0% - - 0% -
    - -   - Opera - 1 - - 1 - - 1 - - 00:00:00 - - 100% - - 0% -
    -
    - - Back to top - -

    - Browser Version -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Browser version   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Firefox 3.6 - 1 - - 2 - - 2 - - 00:06:01 - - 0% - - 0% -
    - -   - Opera 9.63 - 1 - - 1 - - 1 - - 00:00:00 - - 100% - - 0% -
    -
    - - Back to top -

    Browser Plugins

    @@ -2356,7 +2107,7 @@

    Back to top -

    +

    Normal / Widescreen

    @@ -2443,93 +2194,6 @@

    Back to top -

    - Operating System -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Operating system   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Windows XP - 2 - - 3 - - 1.5 - - 00:03:01 - - 50% - - 0% -
    -
    - - Back to top -

    Visitor Configuration

    @@ -2598,207 +2262,10 @@

    - 00:06:01 -

    		• - 0% - - 0% -
    - Windows XP / Opera / 800x300 - 1 - - 1 - - 1 - - 00:00:00 - - 100% - - 0% -
    -
    - - Back to top - -

    - Operating system family -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Operating system family   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Windows - 2 - - 3 - - 1.5 - - 00:03:01 - - 50% - - 0% -
    -
    - - Back to top - -

    - Mobile vs Desktop -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Windows XP / Opera / 800x300 + +   + Unknown + + + + + + + + + + + + + + + + + + + + + Firefox 3.6 + + + + + + + + + + - - - - - - - - - - + Unknown - - + Windows - - - - - - - - - - + Windows XP - - - - - - - - + +   + Firefox @@ -6991,12 +6603,12 @@

    Back to top -

    - Operating System families +

    + Browser Version

    @@ -7006,7 +6618,7 @@

    + Firefox 3.6 @@ -7059,12 +6671,12 @@

    Back to top -

    - Operating System versions +

    + Device model

    @@ -7074,7 +6686,7 @@

    + Unknown @@ -7127,12 +6737,12 @@

    Back to top -

    - Browser families +

    + Operating System families

    @@ -7142,7 +6752,7 @@

    + Windows @@ -7195,12 +6805,12 @@

    Back to top -

    - Browser versions +

    + Operating System versions

    @@ -7210,7 +6820,7 @@

    + Windows XP diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 5116a93633d..e38926f7df0 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -48,16 +48,6 @@

    Screen Resolution - -
  • - - Visitor Browser - -
    • -
  • - - Browser Version -
  • @@ -65,29 +55,14 @@

  • - + Normal / Widescreen -
    • -
  • - - Operating System -
  • Visitor Configuration -
    • -
  • - - Operating system family - -
    • -
  • - - Mobile vs Desktop -
  • @@ -370,28 +345,28 @@

  • - - Device model + + Visitor Browser
  • - - Operating System families + + Device model
  • - - Operating System versions + + Browser Version
  • - - Browser families + + Operating System families
  • - - Browser versions + + Operating System versions
  • @@ -2014,130 +1989,6 @@

    Back to top -

    - Visitor Browser -

    - - - -

    • -  Mobile vs Desktop   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Desktop - 2 - - 3 - - 1.5 - - 00:03:01 + 00:06:01 - 50% + 0% 0% @@ -2807,23 +2274,21 @@

    		- -   - Mobile - 0 + 1 - 0 + 1 - 0 + 1 00:00:00 - 0% + 100% 0% @@ -5178,8 +4643,8 @@

    Back to top -

    - Device model +

    + Visitor Browser

    @@ -5187,7 +4652,7 @@

    -  Device model   +  Browser    Visits   @@ -5212,21 +4677,73 @@

    		- Unknown - 10 + 8 - 43 + 40 - 4.3 + 5 - 00:12:37 + 00:15:01 - 10% + 0% + + 0% +
    + +   + Firefox + 1 + + 2 + + 2 + + 00:06:01 + + 0% + + 0% +
    + +   + Opera + 1 + + 1 + + 1 + + 00:00:00 + + 100% 0% @@ -5238,8 +4755,8 @@

    Back to top -

    - Operating System families +

    + Browser Version

    @@ -5247,7 +4764,7 @@

    -  Operating System families   +  Browser version    Visits   @@ -5272,7 +4789,7 @@

    		- +   Unknown @@ -5297,23 +4814,48 @@

    		- +   - Windows + 1 + 2 - 3 + 2 - 1.5 + 00:06:01 - 00:03:01 + 0% - 50% + 0% +
    + +   + Opera 9.63 + 1 + + 1 + + 1 + + 00:00:00 + + 100% 0% @@ -5325,8 +4867,8 @@

    Back to top -

    - Operating System versions +

    + Device model

    @@ -5334,7 +4876,7 @@

    -  Operating System versions   +  Device model    Visits   @@ -5359,48 +4901,21 @@

    		- -   - Unknown - 8 - - 40 - - 5 - - 00:15:01 - - 0% - - 0% -
    - -   - Windows XP - 2 + 10 - 3 + 43 - 1.5 + 4.3 - 00:03:01 + 00:12:37 - 50% + 10% 0% @@ -5412,8 +4927,8 @@

    Back to top -

    - Browser families +

    + Operating System families

    @@ -5421,7 +4936,7 @@

    -  Browser families   +  Operating system family    Visits   @@ -5446,7 +4961,7 @@

    		- +   Unknown @@ -5471,48 +4986,23 @@

    		- +   - Firefox - 1 - - 2 - 2 - 00:06:01 - - 0% - - 0% -
    - -   - Opera - 1 - - 1 + 3 - 1 + 1.5 - 00:00:00 + 00:03:01 - 100% + 50% 0% @@ -5524,8 +5014,8 @@

    Back to top -

    - Browser versions +

    + Operating System versions

    @@ -5533,7 +5023,7 @@

    -  Browser versions   +  Operating System versions    Visits   @@ -5558,7 +5048,7 @@

    		- +   Unknown @@ -5583,48 +5073,23 @@

    		- +   - Firefox 3.6 - 1 - - 2 - 2 - 00:06:01 - - 0% - - 0% -
    - -   - Opera 9.63 - 1 - - 1 + 3 - 1 + 1.5 - 00:00:00 + 00:03:01 - 100% + 50% 0% diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf index 047dd073fdb..28c0b573958 100644 Binary files a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf and b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 0a2549a18e6..f17475d50d2 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -211,63 +211,6 @@ index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04 UserSettings_getResolution - - Visitor Settings - Visitor Browser - UserSettings - getBrowser - Browser - This report contains information about what kind of browser your visitors were using. Each browser version is listed separately. - - Visits - Unique visitors - Actions - Users - - - If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit. - The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day. - The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks. - The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId'). - - - Actions per Visit - Avg. Time on Website - Bounce Rate - Conversion Rate - - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowser&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowser&period=day&date=2008-12-06,2009-01-04 - UserSettings_getBrowser - - - Visitor Settings - Browser Version - UserSettings - getBrowserVersion - Browser version - - Visits - Unique visitors - Actions - Users - - - If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit. - The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day. - The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks. - The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId'). - - - Actions per Visit - Avg. Time on Website - Bounce Rate - Conversion Rate - - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowserVersion&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowserVersion&period=day&date=2008-12-06,2009-01-04 - UserSettings_getBrowserVersion - Visitor Settings Browser Plugins @@ -290,7 +233,7 @@ Visitor Settings Normal / Widescreen UserSettings - getWideScreen + getScreenType Type of screen Visits @@ -310,37 +253,9 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getWideScreen&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getWideScreen&period=day&date=2008-12-06,2009-01-04 - UserSettings_getWideScreen - - - Visitor Settings - Operating System - UserSettings - getOS - Operating system - - Visits - Unique visitors - Actions - Users - - - If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit. - The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day. - The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks. - The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId'). - - - Actions per Visit - Avg. Time on Website - Bounce Rate - Conversion Rate - - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getOS&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getOS&period=day&date=2008-12-06,2009-01-04 - UserSettings_getOS + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2008-12-06,2009-01-04 + UserSettings_getScreenType Visitor Settings @@ -371,62 +286,6 @@ index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getConfiguration&period=day&date=2008-12-06,2009-01-04 UserSettings_getConfiguration - - Visitor Settings - Operating system family - UserSettings - getOSFamily - Operating system family - - Visits - Unique visitors - Actions - Users - - - If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit. - The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day. - The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks. - The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId'). - - - Actions per Visit - Avg. Time on Website - Bounce Rate - Conversion Rate - - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getOSFamily&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getOSFamily&period=day&date=2008-12-06,2009-01-04 - UserSettings_getOSFamily - - - Visitor Settings - Mobile vs Desktop - UserSettings - getMobileVsDesktop - Mobile vs Desktop - - Visits - Unique visitors - Actions - Users - - - If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit. - The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day. - The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks. - The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId'). - - - Actions per Visit - Avg. Time on Website - Bounce Rate - Conversion Rate - - 1 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getMobileVsDesktop&period=day&date=2009-01-04 - UserSettings_getMobileVsDesktop - Visitor Settings Browser language @@ -1854,10 +1713,11 @@ Visitor Devices - Device brand + Visitor Browser DevicesDetection - getBrand - Device brand + getBrowsers + Browser + This report contains information about what kind of browser your visitors were using. Each browser version is listed separately. Visits Unique visitors @@ -1876,16 +1736,16 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2008-12-06,2009-01-04 - DevicesDetection_getBrand + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2008-12-06,2009-01-04 + DevicesDetection_getBrowsers Visitor Devices - Device model + Device brand DevicesDetection - getModel - Device model + getBrand + Device brand Visits Unique visitors @@ -1904,16 +1764,16 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04 - DevicesDetection_getModel + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2008-12-06,2009-01-04 + DevicesDetection_getBrand Visitor Devices - Operating System families + Device model DevicesDetection - getOsFamilies - Operating System families + getModel + Device model Visits Unique visitors @@ -1932,16 +1792,16 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2008-12-06,2009-01-04 - DevicesDetection_getOsFamilies + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04 + DevicesDetection_getModel Visitor Devices - Operating System versions + Browser Version DevicesDetection - getOsVersions - Operating System versions + getBrowserVersions + Browser version Visits Unique visitors @@ -1960,16 +1820,16 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2008-12-06,2009-01-04 - DevicesDetection_getOsVersions + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04 + DevicesDetection_getBrowserVersions Visitor Devices - Browser families + Operating System families DevicesDetection - getBrowserFamilies - Browser families + getOsFamilies + Operating system family Visits Unique visitors @@ -1988,16 +1848,16 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserFamilies&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserFamilies&period=day&date=2008-12-06,2009-01-04 - DevicesDetection_getBrowserFamilies + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2008-12-06,2009-01-04 + DevicesDetection_getOsFamilies Visitor Devices - Browser versions + Operating System versions DevicesDetection - getBrowserVersions - Browser versions + getOsVersions + Operating System versions Visits Unique visitors @@ -2016,9 +1876,9 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04 - DevicesDetection_getBrowserVersions + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2008-12-06,2009-01-04 + DevicesDetection_getOsVersions Visitor Devices diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv index ca2eb265664..5bec541cf6b 100644 Binary files a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv and b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv differ diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 46d72dcf047..76f06919db0 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -79,8 +79,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -104,14 +112,6 @@ Poland - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -290,8 +290,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -315,14 +323,6 @@ Poland - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 9d33118b4cb..d12d299554d 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -155,8 +155,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -180,14 +188,6 @@ Poland - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -485,8 +485,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -510,14 +518,6 @@ Poland - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif @@ -701,8 +701,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -726,14 +734,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 normal 1024x768 plugins/UserSettings/images/screens/normal.gif diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index ad3cd281090..cc0749c4e45 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -75,14 +75,6 @@ Screen Resolution label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate 1024x768,5,16,80%,3.2,00:22:49,20% -Visitor Browser -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox,5,16,80%,3.2,00:22:49,20% - -Browser Version -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox 3.6,5,16,80%,3.2,00:22:49,20% - Browser Plugins label,nb_visits,nb_visits_percentage Cookie,5,100% @@ -100,23 +92,10 @@ Normal / Widescreen label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Normal,5,16,80%,3.2,00:22:49,20% -Operating System -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Windows XP,5,16,80%,3.2,00:22:49,20% - Visitor Configuration label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Windows XP / Firefox / 1024x768,5,16,80%,3.2,00:22:49,20% -Operating system family -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Windows,5,16,80%,3.2,00:22:49,20% - -Mobile vs Desktop -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Desktop,5,16,80%,3.2,00:22:49,20% -Mobile,0,0,0%,0,00:00:00,0% - Browser language label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Polish,4,12,75%,3,00:25:32,25% @@ -499,10 +478,18 @@ Device brand label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,5,16,80%,3.2,00:22:49,20% +Visitor Browser +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Firefox,5,16,80%,3.2,00:22:49,20% + Device model label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,5,16,80%,3.2,00:22:49,20% +Browser Version +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Firefox 3.6,5,16,80%,3.2,00:22:49,20% + Operating System families label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Windows,5,16,80%,3.2,00:22:49,20% @@ -511,14 +498,6 @@ Operating System versions label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Windows XP,5,16,80%,3.2,00:22:49,20% -Browser families -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox,5,16,80%,3.2,00:22:49,20% - -Browser versions -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox 3.6,5,16,80%,3.2,00:22:49,20% - Browser engines label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Gecko (Firefox),5,16,80%,3.2,00:22:49,20% diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index f91034a6518..7861e2ab4e0 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -48,16 +48,6 @@

    Screen Resolution - -
  • - - Visitor Browser - -
    • -
  • - - Browser Version -
  • @@ -65,29 +55,14 @@

  • - + Normal / Widescreen -
    • -
  • - - Operating System -
  • Visitor Configuration -
    • -
  • - - Operating system family - -
    • -
  • - - Mobile vs Desktop -
  • @@ -345,28 +320,28 @@

  • - - Device model + + Visitor Browser
  • - - Operating System families + + Browser Version
  • - - Operating System versions + + Device model
  • - - Browser families + + Operating System families
  • - - Browser versions + + Operating System versions
  • @@ -2025,142 +2000,6 @@

    Back to top -

    - Visitor Browser -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    -  Browser   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Firefox - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top - -

    - Browser Version -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    -  Browser version   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Firefox 3.6 - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top -

    Browser Plugins

    @@ -2322,7 +2161,7 @@

    Back to top -

    +

    Normal / Widescreen

    @@ -2390,74 +2229,6 @@

    Back to top -

    - Operating System -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    -  Operating system   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Windows XP - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top -

    Visitor Configuration

    @@ -2524,167 +2295,6 @@

    Back to top -

    - Operating system family -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    -  Operating system family   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Windows - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top - -

    - Mobile vs Desktop -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Mobile vs Desktop   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Desktop - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    - -   - Mobile - 0 - - 0 - - 0 - - 00:00:00 - - 0% - - 0% -
    -
    - - Back to top -

    Browser language

    @@ -6925,12 +6535,12 @@

    Back to top -

    - Device model +

    + Visitor Browser

    @@ -6940,7 +6550,7 @@

    • -  Device model   +  Browser    Visits   @@ -6965,7 +6575,9 @@

    		- Unknown 5
    -  Operating System families   +  Browser version    Visits   @@ -7031,9 +6643,9 @@

    		- +   - Windows 5
    -  Operating System versions   +  Device model    Visits   @@ -7099,9 +6711,7 @@

    		- -   - Windows XP 5
    -  Browser families   +  Operating system family    Visits   @@ -7167,9 +6777,9 @@

    		- +   - Firefox 5
    -  Browser versions   +  Operating System versions    Visits   @@ -7235,9 +6845,9 @@

    		- +   - Firefox 3.6 5
    - - - - - - - - - - - - - - - - - - - - - -
    -  Browser   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Firefox - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top - -

    - Browser Version -

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Browser version   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Firefox 3.6 - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top -

    Browser Plugins

    @@ -2293,7 +2144,7 @@

    Back to top -

    +

    Normal / Widescreen

    @@ -2355,68 +2206,6 @@

    Back to top -

    - Operating System -

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Operating system   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Windows XP - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top -

    Visitor Configuration

    @@ -2477,155 +2266,6 @@

    Back to top -

    - Operating system family -

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Operating system family   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Windows - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top - -

    - Mobile vs Desktop -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Mobile vs Desktop   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Desktop - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    - -   - Mobile - 0 - - 0 - - 0 - - 00:00:00 - - 0% - - 0% -
    -
    - - Back to top -

    Browser language

    @@ -6695,8 +6335,8 @@

    Back to top -

    - Device model +

    + Visitor Browser

    @@ -6704,7 +6344,7 @@

    -  Device model   +  Browser    Visits   @@ -6729,7 +6369,9 @@

    - Unknown + +   + Firefox 5 @@ -6755,8 +6397,8 @@

    Back to top -

    - Operating System families +

    + Device model

    @@ -6764,7 +6406,7 @@

    -  Operating System families   +  Device model    Visits   @@ -6789,9 +6431,7 @@

    - -   - Windows + Unknown 5 @@ -6817,8 +6457,8 @@

    Back to top -

    - Operating System versions +

    + Browser Version

    @@ -6826,7 +6466,7 @@

    -  Operating System versions   +  Browser version    Visits   @@ -6851,9 +6491,9 @@

    - +   - Windows XP + Firefox 3.6 5 @@ -6879,8 +6519,8 @@

    Back to top -

    - Browser families +

    + Operating System families

    @@ -6888,7 +6528,7 @@

    -  Browser families   +  Operating system family    Visits   @@ -6913,9 +6553,9 @@

    - +   - Firefox + Windows 5 @@ -6941,8 +6581,8 @@

    Back to top -

    - Browser versions +

    + Operating System versions

    @@ -6950,7 +6590,7 @@

    -  Browser versions   +  Operating System versions    Visits   @@ -6975,9 +6615,9 @@

    - +   - Firefox 3.6 + Windows XP 5 diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf index 3db8e7ed770..1a69564d4d6 100644 Binary files a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf and b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_day.xml new file mode 100644 index 00000000000..106f23f16bb --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_day.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_week.xml new file mode 100644 index 00000000000..5cfb246edc1 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_week.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml new file mode 100644 index 00000000000..106f23f16bb --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml new file mode 100644 index 00000000000..5cfb246edc1 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowsers_day.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowsers_day.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index e030350ae3e..53e26b56a67 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -49,8 +49,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.0 0 Unknown Unknown @@ -74,14 +82,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.0 dual 1111x222 plugins/UserSettings/images/screens/dual.gif @@ -164,8 +164,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.0 0 Unknown Unknown @@ -189,14 +197,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.0 dual 1111x222 plugins/UserSettings/images/screens/dual.gif @@ -339,8 +339,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -364,14 +372,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 dual 1111x222 plugins/UserSettings/images/screens/dual.gif diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index e030350ae3e..53e26b56a67 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -49,8 +49,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.0 0 Unknown Unknown @@ -74,14 +82,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.0 dual 1111x222 plugins/UserSettings/images/screens/dual.gif @@ -164,8 +164,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.0 0 Unknown Unknown @@ -189,14 +197,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.0 dual 1111x222 plugins/UserSettings/images/screens/dual.gif @@ -339,8 +339,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.6 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.6 0 Unknown Unknown @@ -364,14 +372,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.6 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.6 dual 1111x222 plugins/UserSettings/images/screens/dual.gif diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 3001bf71772..8cef8c5e23b 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -92,8 +92,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.0 0 Unknown Unknown @@ -117,14 +125,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.0 dual 1111x222 plugins/UserSettings/images/screens/dual.gif @@ -208,8 +208,16 @@ Desktop + Windows XP + WXP + plugins/UserSettings/images/os/WXP.gif Gecko Gecko (Firefox) + Firefox 3.0 + Firefox + plugins/UserSettings/images/browsers/FF.gif + FF + 3.0 0 Unknown Unknown @@ -233,14 +241,6 @@ France - Windows XP - WXP - Win XP - plugins/UserSettings/images/os/WXP.gif - Firefox 3.0 - plugins/UserSettings/images/browsers/FF.gif - FF - 3.0 dual 1111x222 plugins/UserSettings/images/screens/dual.gif diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml similarity index 90% rename from tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml rename to tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index 72dab998db7..a9683715379 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,6 @@ 15 0 plugins/UserSettings/images/browsers/FF.gif - Firefox 6.0 @@ -24,7 +23,6 @@ 15 0 plugins/UserSettings/images/browsers/IE.gif - Internet Explorer 9.0 @@ -37,6 +35,5 @@ 45 0 plugins/UserSettings/images/browsers/UNK.gif - -1 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml similarity index 87% rename from tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getOS_day.xml rename to tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml index 803dcc4819c..c58f00fa96c 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -1,7 +1,7 @@ - + 4 20 20 @@ -11,10 +11,9 @@ 20 0 plugins/UserSettings/images/os/LIN.gif - Linux - + 3 15 15 @@ -24,7 +23,6 @@ 15 0 plugins/UserSettings/images/os/AND.gif - Android @@ -37,6 +35,5 @@ 40 0 plugins/UserSettings/images/os/UNK.gif - -1 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml index 9f4d67971d7..b90214c2e9b 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml @@ -1,7 +1,7 @@ - + 2 10 10 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml similarity index 90% rename from tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml rename to tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml index 72dab998db7..a9683715379 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,6 @@ 15 0 plugins/UserSettings/images/browsers/FF.gif - Firefox 6.0 @@ -24,7 +23,6 @@ 15 0 plugins/UserSettings/images/browsers/IE.gif - Internet Explorer 9.0 @@ -37,6 +35,5 @@ 45 0 plugins/UserSettings/images/browsers/UNK.gif - -1 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml similarity index 87% rename from tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml rename to tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml index 803dcc4819c..c58f00fa96c 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml @@ -1,7 +1,7 @@ - + 4 20 20 @@ -11,10 +11,9 @@ 20 0 plugins/UserSettings/images/os/LIN.gif - Linux - + 3 15 15 @@ -24,7 +23,6 @@ 15 0 plugins/UserSettings/images/os/AND.gif - Android @@ -37,6 +35,5 @@ 40 0 plugins/UserSettings/images/os/UNK.gif - -1 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml index 9f4d67971d7..b90214c2e9b 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml @@ -1,7 +1,7 @@ - + 2 10 10 diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php index 707b4445914..7b5bad19d8c 100644 --- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php @@ -55,6 +55,16 @@ public function test_version2_0_4() $this->assertDeprecatedMethodIsRemoved('Piwik\IP', 'isIpInRange', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\IP', 'getHostByAddr', $validTill); + $validTill = '2015-05-01'; + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getBrowserVersion', $validTill); + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getBrowser', $validTill); + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getOS', $validTill); + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getOSFamily', $validTill); + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getBrowserType', $validTill); + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getMobileVsDesktop', $validTill); + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getWideScreen', $validTill); + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\UserSettings', 'mapDeprecatedActions', $validTill); + $this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add'); }