diff options
| author | diosmosis <benaka@piwik.pro> | 2014-11-26 20:15:34 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2014-11-26 20:15:34 +0300 |
| commit | dd0212dbec9a0b636befffb76cef994358985575 (patch) | |
| tree | 15c97dfc93388b6c3e7ba495d2bafbcc0c01461d | |
| parent | 2183e1c6fe35dbd42714985ba9be52137c843dcf (diff) | |
| parent | c23bff3e2ead46dd43533a6d54788c63fa14bced (diff) | |
Merge branch 'master' into processed_metrics_metadata
Conflicts:
tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
150 files changed, 3474 insertions, 6635 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cd16152b51..999388087d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,25 @@ # Piwik Platform Changelog -This is a changelog for Piwik platform developers. All changes for our HTTP API's, Plugins, Themes, etc will be listed here. +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 -* The HTTP Tracker API does now respond with a HTTP 400 instead of a HTTP 500 in case an invalid `idsite` or `forcedVisitorId` is used. +* The HTTP Tracker API does now respond with a HTTP 400 instead of a HTTP 500 in case an invalid `idsite` is used ### New APIs * New URL parameter `send_image=0` in the [HTTP Tracking API](http://developer.piwik.org/api-reference/tracking-api) to receive a HTTP 204 response code instead of a GIF image. This improves performance and can fix errors if images are not allowed to be obtained directly (eg Chrome Apps). @@ -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). @@ -170,3 +184,5 @@ We are using `@since` annotations in case we are introducing new API's to make i ### Library updates ### Internal change --> + +Find the general Piwik Changelogs for each release at [piwik.org/changelog](http://piwik.org/changelog/) diff --git a/LEGALNOTICE b/LEGALNOTICE index 5dd1db2ea4..e6c5a1e9c0 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/Common.php b/core/Common.php index 9bb4108739..b5ed581d82 100644 --- a/core/Common.php +++ b/core/Common.php @@ -471,7 +471,13 @@ class Common $ok = false; if ($varType === 'string') { - if (is_string($value)) $ok = true; + if (is_string($value) || is_int($value)) { + $ok = true; + } else if (is_float($value)) { + $value = Common::forceDotAsSeparatorForDecimalPoint($value); + $ok = true; + } + } elseif ($varType === 'integer') { if ($value == (string)(int)$value) $ok = true; } elseif ($varType === 'float') { diff --git a/core/Piwik.php b/core/Piwik.php index 81451af88e..bc5244dd52 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -481,6 +481,7 @@ class Piwik * in case another Login plugin is being used. * * @return string + * @api */ public static function getLoginPluginName() { diff --git a/core/Updates/2.0.3-b7.php b/core/Updates/2.0.3-b7.php index add119e462..9903d999c1 100644 --- a/core/Updates/2.0.3-b7.php +++ b/core/Updates/2.0.3-b7.php @@ -23,9 +23,11 @@ class Updates_2_0_3_b7 extends Updates $errors = array(); try { + $checker = new DoNotTrackHeaderChecker(); + // enable DoNotTrack check in PrivacyManager if DoNotTrack plugin was enabled if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('DoNotTrack')) { - DoNotTrackHeaderChecker::activate(); + $checker->activate(); } // enable IP anonymization if AnonymizeIP plugin was enabled diff --git a/core/Updates/2.10.0-b1.php b/core/Updates/2.10.0-b1.php new file mode 100644 index 0000000000..6a739b6468 --- /dev/null +++ b/core/Updates/2.10.0-b1.php @@ -0,0 +1,252 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ + +namespace Piwik\Updates; + +use Piwik\Common; +use Piwik\DataAccess\ArchiveTableCreator; +use Piwik\DataTable; +use Piwik\Db; +use Piwik\Updater; +use Piwik\Updates; +use DeviceDetector\Parser\Client\Browser AS BrowserParser; +use Piwik\Plugins\Dashboard\Model AS DashboardModel; + +/** + * This Update script will update all browser and os archives of UserSettings and DevicesDetection plugin + * + * In the future only DevicesDetection will handle browser and os archives, so we try to rename all existing archives + * of UserSettings plugin to their corresponding archive name in DevicesDetection plugin: + * - *UserSettings_browser* will now be *DevicesDetection_browserVersions* + * - *UserSettings_os* will now be *DevicesDetection_osVersions* + * + * Unlike DevicesDetection plugin, the UserSettings plugin did not store archives holding the os and browser data without + * their version number. The "version-less" reports were always generated out of the "version-containing" archives . + * For big archives (month/year) that ment that some of the data was truncated, due to the datatable entry limit. + * To avoid that data loss / inaccuracy in the future, DevicesDetection plugin will also store archives without the version. + * For data archived after DevicesDetection plugin was enabled, those archive already exist. As we are removing the + * UserSettings reports, we need to move the existing old data to the new archives, which means we need to build up + * those archives, where they do not exist. + * + * NOTE: Some archives might not contain "all" data. + * That might have happened directly after the day DevicesDetection plugin was enabled. For the days before, there were + * no archives calculated. So week/month/year archives will only contain data for the days, where archives were generated + * To find a date after which it is safe to use DevicesDetection archives we need to find the first day-archive that + * contains DevicesDetection data. Day archives will always contain full data, but week/month/year archives may not. + * So we need to recreate those week/month/year archives. + */ +class Updates_2_10_0_b1 extends Updates +{ + + static function getSql() + { + $sqls = array('# ATTENTION: This update script will execute some more SQL queries than that below as it is necessary to rebuilt some archives #' => 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 80614277c5..fcf7e8f40d 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 e67f6b1b77..943dfceb68 100644 --- a/core/WidgetsList.php +++ b/core/WidgetsList.php @@ -159,18 +159,15 @@ class WidgetsList extends Singleton } /** - * 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 @@ class WidgetsList extends Singleton $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 110e533f17..0000000000 --- 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 009bc5a785..0000000000 --- a/libs/UserAgentParser/UserAgentParser.php +++ /dev/null @@ -1,729 +0,0 @@ -<?php -/** - * Copyright 2009, 2010 Matthieu Aubry & Piwik team - * All rights reserved. - * - * @link https://github.com/piwik/piwik/tree/master/libs/UserAgentParser - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of Matthieu Aubry nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * Example usage - * - * Browser info: - * var_dump(UserAgentParser::getBrowser($_SERVER['HTTP_USER_AGENT'])); - * - * Outputs: - * array - * 'id' => '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 5d59eed198..0000000000 --- a/libs/UserAgentParser/UserAgentParser.test.php +++ /dev/null @@ -1,56 +0,0 @@ -<?php -if (!isset($_GET['setUserAgent']) && !isset($_SERVER['HTTP_USER_AGENT'])) die; - -require_once dirname(__FILE__) . '/UserAgentParser.php'; -echo "<h2>UserAgentParser php library test</h2>"; -$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 "<a href='?setUserAgent=" . urlencode($userAgent) . "'>$name</a>, "; -} -echo "<hr>"; - -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 " <b>" . htmlentities($userAgent) . "</b><br><br>"; - -echo "Browser info:<pre>"; -var_dump(UserAgentParser::getBrowser($userAgent)); -echo "</pre>"; - -echo "Operating System info:<pre>"; -var_dump(UserAgentParser::getOperatingSystem($userAgent)); -echo "</pre>"; - -echo "<br><br><i>UserAgentParser doesn't detect your Operating System or Browser properly? <br>Please submit your user agent string and the expected result to hello at piwik.org. Patches are also welcome :-) Thanks!</i>"; diff --git a/misc/others/api_rest_call.php b/misc/others/api_rest_call.php index c85d5c193e..67c3f9e4ba 100644 --- a/misc/others/api_rest_call.php +++ b/misc/others/api_rest_call.php @@ -20,11 +20,11 @@ if (!$content) { print("Error, content fetched = " . $fetched); } -print("<h1>Keywords for the last month</h1>"); +print("<h1>Keywords for the last month</h1>\n"); foreach ($content as $row) { $keyword = htmlspecialchars(html_entity_decode(urldecode($row['label']), ENT_QUOTES), ENT_QUOTES); $hits = $row['nb_visits']; - print("<b>$keyword</b> ($hits hits)<br>"); + print("<b>$keyword</b> ($hits hits)<br>\n"); } 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 bafb226af0..6c8c8875f0 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 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -69,14 +77,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -144,8 +144,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -169,14 +177,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 bafb226af0..6c8c8875f0 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 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -69,14 +77,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -144,8 +144,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -169,14 +177,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 bafb226af0..6c8c8875f0 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 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -69,14 +77,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -144,8 +144,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -169,14 +177,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 bafb226af0..6c8c8875f0 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 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -69,14 +77,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -144,8 +144,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -169,14 +177,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 bafb226af0..6c8c8875f0 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 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -69,14 +77,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -144,8 +144,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -169,14 +177,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index da59ea9e66..2306147b08 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -22,6 +22,7 @@ use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication; use Piwik\Plugins\CustomVariables\CustomVariables; use Piwik\Plugins\LanguagesManager\API as APILanguagesManager; use Piwik\Plugins\LanguagesManager\LanguagesManager; +use Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker; use Piwik\Plugins\SitesManager\API as APISitesManager; use Piwik\Settings\Manager as SettingsManager; use Piwik\Site; @@ -235,7 +236,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin // get currencies for each viewable site $view->currencySymbols = APISitesManager::getInstance()->getCurrencySymbols(); - $view->serverSideDoNotTrackEnabled = \Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker::isActive(); + $dntChecker = new DoNotTrackHeaderChecker(); + $view->serverSideDoNotTrackEnabled = $dntChecker->isActive(); return $view->render(); } 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 91f9066c9b..1fbae717c6 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 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -142,14 +150,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index a0a12985c3..bfb3fc9870 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -81,7 +81,7 @@ class Dashboard extends \Piwik\Plugin ], [ {"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 39dcb06557..790076c1a9 100644 --- a/plugins/Dashboard/Model.php +++ b/plugins/Dashboard/Model.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\Dashboard; use Piwik\Common; use Piwik\Db; use Piwik\DbHelper; +use Piwik\WidgetsList; class Model { @@ -144,4 +145,101 @@ class Model { 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 b54b79c635..b6c58388b9 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 @@ class API extends \Piwik\Plugin\API 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 @@ class API extends \Piwik\Plugin\API 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 @@ class API extends \Piwik\Plugin\API 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 @@ class API extends \Piwik\Plugin\API * @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 @@ class API extends \Piwik\Plugin\API 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 e91a1be0fe..0d6f40c062 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 1237d6676b..16b0897199 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 @@ use Piwik\Tracker\Action; 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 1fa60f3ab2..87f7815c8a 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 @@ use Piwik\Tracker\Action; 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 599edb3285..62d1a5cb71 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 @@ use Piwik\Tracker\Action; 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 78ed29fa93..cf072bb973 100644 --- a/plugins/DevicesDetection/Controller.php +++ b/plugins/DevicesDetection/Controller.php @@ -14,10 +14,10 @@ use Piwik\Db; 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 @@ class Controller extends \Piwik\Plugin\Controller $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 @@ class Controller extends \Piwik\Plugin\Controller $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 @@ class Controller extends \Piwik\Plugin\Controller $availableBrowsers = \DeviceDetector\Parser\Client\Browser::getAvailableBrowsers(); foreach ($availableBrowsers as $short => $name) { - $list[$name] = getBrowserLogoExtended($short); + $list[$name] = getBrowserLogo($short); } break; @@ -104,7 +104,7 @@ class Controller extends \Piwik\Plugin\Controller $availableBrowserFamilies = \DeviceDetector\Parser\Client\Browser::getAvailableBrowserFamilies(); foreach ($availableBrowserFamilies as $name => $browsers) { - $list[$name] = getBrowserFamilyLogoExtended($name); + $list[$name] = getBrowserFamilyLogo($name); } break; @@ -112,7 +112,7 @@ class Controller extends \Piwik\Plugin\Controller $availableOSs = \DeviceDetector\Parser\OperatingSystem::getAvailableOperatingSystems(); foreach ($availableOSs as $short => $name) { - $list[$name] = getOsLogoExtended($short); + $list[$name] = getOsLogo($short); } break; @@ -120,7 +120,7 @@ class Controller extends \Piwik\Plugin\Controller $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 004fc96721..312bca614f 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -49,13 +49,16 @@ class DevicesDetection extends \Piwik\Plugin $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 22105ff8ac..24c64d052f 100644 --- a/plugins/DevicesDetection/Reports/GetBrowserVersions.php +++ b/plugins/DevicesDetection/Reports/GetBrowserVersions.php @@ -18,23 +18,23 @@ class GetBrowserVersions extends Base { 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 index 0c2c5cd621..07be06d4ba 100644 --- a/plugins/DevicesDetection/Reports/GetBrowserFamilies.php +++ b/plugins/DevicesDetection/Reports/GetBrowsers.php @@ -12,16 +12,16 @@ use Piwik\Piwik; 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', '<br />'); + $this->order = 1; + $this->widgetTitle = 'UserSettings_WidgetBrowsers'; } public function configureView(ViewDataTable $view) @@ -29,7 +29,7 @@ class GetBrowserFamilies extends Base $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 703b42830e..5f9418f75e 100644 --- a/plugins/DevicesDetection/Reports/GetOsFamilies.php +++ b/plugins/DevicesDetection/Reports/GetOsFamilies.php @@ -29,7 +29,7 @@ class GetOsFamilies extends Base $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 478b76deea..aa5b16c2ae 100644 --- a/plugins/DevicesDetection/Visitor.php +++ b/plugins/DevicesDetection/Visitor.php @@ -24,6 +24,21 @@ class Visitor 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 @@ class Visitor { 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 12f18b19d1..d158253344 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 aaba67968b..9c0e97710b 100644 --- a/plugins/DevicesDetection/templates/index.twig +++ b/plugins/DevicesDetection/templates/index.twig @@ -8,9 +8,9 @@ </div> <div id='rightcolumn'> - <h2 piwik-enriched-headline>{{ "DevicesDetection_OperatingSystemFamilies"|translate }}</h2> + <h2 piwik-enriched-headline>{{ "UserSettings_OperatingSystems"|translate }}</h2> {{ osReport | raw}} - <h2 piwik-enriched-headline>{{ "UserSettings_BrowserFamilies"|translate }}</h2> + <h2 piwik-enriched-headline>{{ "UserSettings_Browsers"|translate }}</h2> {{ browserReport | raw }} <h2 piwik-enriched-headline>{{ "DevicesDetection_BrowserEngines"|translate }}</h2> {{ browserEngineReport | raw }} diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index b8f428341c..28650856d9 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -552,8 +552,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin \Piwik\Plugins\Login\Controller::clearSession(); $message = Piwik::translate('Installation_InvalidStateError', array('<br /><strong>', - '</strong>', - '<a href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>', + '</strong><a href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>', '</a>') ); Piwik::exitWithErrorMessage($message); diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json index 992c5ff45f..d8e8b972d3 100644 --- a/plugins/Installation/lang/en.json +++ b/plugins/Installation/lang/en.json @@ -25,7 +25,7 @@ "InstallationStatus": "Installation status", "InsufficientPrivilegesHelp": "You can add these privileges by using a tool such as phpMyAdmin or by executing the right SQL queries. If you don't know how to do these things, please ask your sysadmin to grant these privileges for you.", "InsufficientPrivilegesMain": "Either the Database does not exist (and could not be created), or the specified User has insufficient privileges. Database user must have the following privileges: %s", - "InvalidStateError": "Error: Piwik is already installed. %1$s Go back %3$s to Piwik%4$s.", + "InvalidStateError": "Error: Piwik is already installed. %1$s Go back %2$s to Piwik%3$s.", "JsTagArchivingHelp1": "For medium and high traffic websites there are certain optimizations that should be made to help Piwik run faster (such as %1$ssetting up auto-archiving%2$s).", "JSTracking_EndNote": "Note: After the installation process, you can generate customized tracking code in the %1$sTracking Code%2$s admin section.", "JSTracking_Intro": "To track your web traffic with Piwik you need to make sure some extra code is added to each of your webpages.", diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index 9206c5ac51..77f1c8f2bb 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -31,7 +31,7 @@ {% endif %} <div class="visitor-profile-os"> - {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}"/>{% endif %}{% if visitData.operatingSystemShortName is defined %}<span>{{ visitData.operatingSystemShortName }}</span>{% endif %} + {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}"/>{% endif %}{% if visitData.operatingSystem is defined %}<span>{{ visitData.operatingSystem }}</span>{% endif %} </div> </li> {% if visitData.resolution is defined %}<li><span>{{ 'UserSettings_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %} diff --git a/plugins/Login/templates/_formErrors.twig b/plugins/Login/templates/_formErrors.twig new file mode 100644 index 0000000000..2eaf82c2ab --- /dev/null +++ b/plugins/Login/templates/_formErrors.twig @@ -0,0 +1,9 @@ + +{% if formErrors is defined and formErrors is not empty %} + <div class="message_error"> + {% for data in formErrors %} + <strong>{{ 'General_Error'|translate }}</strong>: {{ data|raw }} + <br/> + {% endfor %} + </div> +{% endif %} diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index 830b8b0f85..aca53736f6 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -74,13 +74,8 @@ {% include '@CoreHome/_warningInvalidHost.twig' %} {% else %} <div id="message_container"> - {% if form_data.errors %} - <div class="message_error"> - {% for data in form_data.errors %} - <strong>{{ 'General_Error'|translate }}</strong>: {{ data|raw }}<br/> - {% endfor %} - </div> - {% endif %} + + {{ include('@Login/_formErrors.twig', {formErrors: form_data.errors } ) }} {% if AccessErrorString %} <div class="message_error"> diff --git a/plugins/Login/templates/resetPassword.twig b/plugins/Login/templates/resetPassword.twig index 4a4debe91d..cd880456f7 100755 --- a/plugins/Login/templates/resetPassword.twig +++ b/plugins/Login/templates/resetPassword.twig @@ -1,12 +1,4 @@ {% if infoMessage is defined and infoMessage is not empty %} <p class="message">{{ infoMessage }}</p> {% endif %} -{% if formErrors is defined and formErrors is not empty %} - <p class="message_error"> - {% for data in formErrors %} - <strong>{{ 'General_Error'|translate }}</strong> - : {{ data }} - <br/> - {% endfor %} - </p> -{% endif %}
\ No newline at end of file +{% include '@Login/_formErrors.twig' %}
\ No newline at end of file diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php index 2cacd93c30..d8965147a3 100644 --- a/plugins/PrivacyManager/Controller.php +++ b/plugins/PrivacyManager/Controller.php @@ -133,7 +133,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin if (Piwik::hasUserSuperUserAccess()) { $view->deleteData = $this->getDeleteDataInfo(); $view->anonymizeIP = $this->getAnonymizeIPInfo(); - $view->dntSupport = DoNotTrackHeaderChecker::isActive(); + $dntChecker = new DoNotTrackHeaderChecker(); + $view->dntSupport = $dntChecker->isActive(); $view->canDeleteLogActions = Db::isLockPrivilegeGranted(); $view->dbUser = PiwikConfig::getInstance()->database['username']; $view->deactivateNonce = Nonce::getNonce(self::DEACTIVATE_DNT_NONCE); @@ -300,7 +301,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin Piwik::checkUserHasSuperUserAccess(); Nonce::checkNonce(self::DEACTIVATE_DNT_NONCE); - DoNotTrackHeaderChecker::deactivate(); + $dntChecker = new DoNotTrackHeaderChecker(); + $dntChecker->deactivate(); $this->redirectToIndex('PrivacyManager', 'privacySettings'); } @@ -310,7 +312,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin Piwik::checkUserHasSuperUserAccess(); Nonce::checkNonce(self::ACTIVATE_DNT_NONCE); - DoNotTrackHeaderChecker::activate(); + $dntChecker = new DoNotTrackHeaderChecker(); + $dntChecker->activate(); $this->redirectToIndex('PrivacyManager', 'privacySettings'); } diff --git a/plugins/PrivacyManager/DoNotTrackHeaderChecker.php b/plugins/PrivacyManager/DoNotTrackHeaderChecker.php index 14938f426e..4b2984c54c 100644 --- a/plugins/PrivacyManager/DoNotTrackHeaderChecker.php +++ b/plugins/PrivacyManager/DoNotTrackHeaderChecker.php @@ -18,10 +18,19 @@ use Piwik\Tracker\Request; * - X-Do-Not-Track header (used by AdBlockPlus and NoScript) * - DNT header (used by Mozilla) * + * Note: visits from Internet Explorer and other browsers that have DoNoTrack enabled by default will be tracked anyway. */ class DoNotTrackHeaderChecker { /** + * @param Config $config + */ + public function __construct($config = null) + { + $this->config = $config ?: new Config(); + } + + /** * Checks for DoNotTrack headers and if found, sets `$exclude` to `true`. */ public function checkHeaderInTracker(&$exclude) @@ -31,25 +40,9 @@ class DoNotTrackHeaderChecker return; } - if (!$this->isActive()) { - Common::printDebug("DoNotTrack support is not enabled, skip check"); - return; - } - - if ((isset($_SERVER['HTTP_X_DO_NOT_TRACK']) && $_SERVER['HTTP_X_DO_NOT_TRACK'] === '1') - || (isset($_SERVER['HTTP_DNT']) && substr($_SERVER['HTTP_DNT'], 0, 1) === '1') - ) { - $request = new Request($_REQUEST); - $ua = $request->getUserAgent(); - if (strpos($ua, 'MSIE') !== false - || strpos($ua, 'Trident') !== false) { - Common::printDebug("INTERNET EXPLORER enable DoNotTrack by default; so Piwik ignores DNT IE browsers..."); - return; - } - - Common::printDebug("DoNotTrack header found!"); + $exclude = $this->isDoNotTrackFound(); - $exclude = true; + if($exclude) { $trackingCookie = IgnoreCookie::getTrackingCookie(); $trackingCookie->delete(); @@ -58,27 +51,50 @@ class DoNotTrackHeaderChecker // /.well-known/dnt // per Tracking Preference Expression (draft) header('Tk: 1'); - } else { + } + } + + /** + * @return bool + */ + public function isDoNotTrackFound() + { + if (!$this->isActive()) { + Common::printDebug("DoNotTrack support is not enabled, skip check"); + return false; + } + + if (!$this->isHeaderDntFound()) { Common::printDebug("DoNotTrack header not found"); + return false; } + + $request = new Request($_REQUEST); + $userAgent = $request->getUserAgent(); + + if ($this->isUserAgentWithDoNotTrackAlwaysEnabled($userAgent)) { + Common::printDebug("INTERNET EXPLORER enable DoNotTrack by default; so Piwik ignores DNT IE browsers..."); + return false; + } + + Common::printDebug("DoNotTrack header found!"); + return true; } /** * Deactivates DoNotTrack header checking. This function will not be called by the Tracker. */ - public static function deactivate() + public function deactivate() { - $config = new Config(); - $config->doNotTrackEnabled = false; + $this->config->doNotTrackEnabled = false; } /** * Activates DoNotTrack header checking. This function will not be called by the Tracker. */ - public static function activate() + public function activate() { - $config = new Config(); - $config->doNotTrackEnabled = true; + $this->config->doNotTrackEnabled = true; } /** @@ -86,9 +102,50 @@ class DoNotTrackHeaderChecker * * @return bool */ - public static function isActive() + public function isActive() + { + return $this->config->doNotTrackEnabled; + } + + /** + * @return bool + */ + protected function isHeaderDntFound() + { + return (isset($_SERVER['HTTP_X_DO_NOT_TRACK']) && $_SERVER['HTTP_X_DO_NOT_TRACK'] === '1') + || (isset($_SERVER['HTTP_DNT']) && substr($_SERVER['HTTP_DNT'], 0, 1) === '1'); + } + + /** + * + * @param $userAgent + * @return bool + */ + protected function isUserAgentWithDoNotTrackAlwaysEnabled($userAgent) + { + $browsersWithDnt = $this->getBrowsersWithDNTAlwaysEnabled(); + foreach($browsersWithDnt as $userAgentBrowserFragment) { + if (stripos($userAgent, $userAgentBrowserFragment) !== false) { + return true; + } + } + return false; + } + + /** + * Some browsers have DNT enabled by default. For those we will ignore DNT and always track those users. + * + * @return array + */ + protected function getBrowsersWithDNTAlwaysEnabled() { - $config = new Config(); - return $config->doNotTrackEnabled; + return array( + // IE + 'MSIE', + 'Trident', + + // Maxthon + 'Maxthon', + ); } } diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index ddce27fa3c..c803638a04 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -177,7 +177,7 @@ class PrivacyManager extends Plugin // default values $form->addDataSource(new HTML_QuickForm2_DataSource_Array(array( - 'do_not_track' => DoNotTrackHeaderChecker::isActive(), + 'do_not_track' => $this->dntChecker->isActive(), 'anonymise_ip' => IPAnonymizer::isActive(), ))); } @@ -190,10 +190,11 @@ class PrivacyManager extends Plugin public function installationFormSubmit(FormDefaultSettings $form) { $doNotTrack = (bool) $form->getSubmitValue('do_not_track'); + $dntChecker = new DoNotTrackHeaderChecker(); if ($doNotTrack) { - DoNotTrackHeaderChecker::activate(); + $dntChecker->activate(); } else { - DoNotTrackHeaderChecker::deactivate(); + $dntChecker->deactivate(); } $anonymiseIp = (bool) $form->getSubmitValue('anonymise_ip'); diff --git a/plugins/PrivacyManager/tests/Framework/Mock/Config.php b/plugins/PrivacyManager/tests/Framework/Mock/Config.php new file mode 100644 index 0000000000..38cc5a2f98 --- /dev/null +++ b/plugins/PrivacyManager/tests/Framework/Mock/Config.php @@ -0,0 +1,18 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +namespace Piwik\Plugins\PrivacyManager\tests\Framework\Mock; + +/** + * Stub for Piwik\Plugins\PrivacyManager\Config + * + */ +class Config +{ + +}
\ No newline at end of file diff --git a/plugins/PrivacyManager/tests/Unit/DoNotTrackHeaderCheckerTest.php b/plugins/PrivacyManager/tests/Unit/DoNotTrackHeaderCheckerTest.php new file mode 100644 index 0000000000..a0bf82e958 --- /dev/null +++ b/plugins/PrivacyManager/tests/Unit/DoNotTrackHeaderCheckerTest.php @@ -0,0 +1,165 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +namespace Piwik\Plugins\PrivacyManager\tests; + + +use Piwik\Plugins\PrivacyManager\Config; +use Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker; + +/** + * Class DoNotTrackHeaderCheckerTest + * @group DoNotTrackHeaderCheckerTest + */ +class DoNotTrackHeaderCheckerTest extends \PHPUnit_Framework_TestCase +{ + public function setUp() + { + $this->cleanupServerGlobals(); + + $this->setUserAgentToChrome(); + } + + public function tearDown() + { + $this->cleanupServerGlobals(); + } + + public function test_isDoNotTrackFound_whenDntNotActivated() + { + $dntChecker = $this->makeDntHeaderChecker(); + + $this->assertFalse( $dntChecker->isActive() ); + $this->assertFalse( $dntChecker->isDoNotTrackFound() ); + } + + public function getHeader_DntIsActivated() + { + return array( + array('HTTP_X_DO_NOT_TRACK', '1'), + array('HTTP_DNT', '1'), + array('HTTP_DNT', '10'), + ); + } + + public function getHeader_DntIsNotActivated() + { + return array( + array('HTTP_DNT', '0'), + array('HTTP_DNT', 'x'), + array('HTTP_X_DO_NOT_TRACK', 'false'), + array('HTTP_X_DO_NOT_TRACK', 'ok'), + array('HTTP_X_DO_NOT_TRACK', '11'), + ); + } + + /** + * @dataProvider getHeader_DntIsActivated + */ + public function test_isDoNotTrackFound_whenDntActivated_BrowserHasDntHeader($headerName, $headerValue) + { + $dntChecker = $this->makeDntHeaderCheckerEnabled(); + + $_SERVER[$headerName] = $headerValue; + $this->assertTrue( $dntChecker->isDoNotTrackFound() ); + } + + /** + * @dataProvider getHeader_DntIsNotActivated + */ + public function test_isDoNotTrackFound_whenDntActivated_BrowserDoesNotHaveDntHeader($headerName, $headerValue) + { + $dntChecker = $this->makeDntHeaderCheckerEnabled(); + + $_SERVER[$headerName] = $headerValue; + $this->assertFalse( $dntChecker->isDoNotTrackFound() ); + } + + public function getUserAgents_whereDNTIsAlwaysEnabled() + { + return array( + // IE + array('Mozilla/4.0 (compatible; MSIE 4.01; Mac_PowerPC)'), + array('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; OfficeLiveConnector.1.4; OfficeLivePatch.1.3)'), + array('Mozilla/5.0 (IE 11.0; Windows NT 6.3; Trident/7.0; .NET4.0E; .NET4.0C; rv:11.0) like Gecko'), + + // Maxthon + array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; MAXTHON 2.0)'), + array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; Maxthon/4.2.0.4000)'), + array('Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Maxthon/4.4.3.1000 Chrome/30.0.1599.101 Safari/537.36'), + + // With capital letters + array('Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) MAXTHON/4.4.3.1000 Chrome/30.0.1599.101 Safari/537.36'), + ); + } + + /** + * @dataProvider getUserAgents_whereDNTIsAlwaysEnabled + */ + public function test_isDoNotTrackFound_whenDntActivated_InternetExplorerDoNotTrackIsIgnored($userAgent) + { + $dntChecker = $this->makeDntHeaderCheckerEnabled(); + + $this->activateDoNotTrackInBrowser(); + + $_SERVER['HTTP_USER_AGENT'] = $userAgent; + $this->assertFalse($dntChecker->isDoNotTrackFound()); + } + + /** + * @return Config + */ + protected function makeConfig() + { + return new \Piwik\Plugins\PrivacyManager\tests\Framework\Mock\Config(); + } + + /** + * @return DoNotTrackHeaderChecker + */ + protected function makeDntHeaderChecker() + { + $config = $this->makeConfig(); + $config->doNotTrackEnabled = false; + + $dntChecker = new DoNotTrackHeaderChecker($config); + + $this->assertFalse($dntChecker->isActive()); + + return $dntChecker; + } + + protected function cleanupServerGlobals() + { + $_SERVER['HTTP_X_DO_NOT_TRACK'] = null; + $_SERVER['HTTP_DNT'] = null; + $_SERVER['HTTP_USER_AGENT'] = null; + } + + /** + * @return DoNotTrackHeaderChecker + */ + protected function makeDntHeaderCheckerEnabled() + { + $dntChecker = $this->makeDntHeaderChecker(); + $dntChecker->activate(); + $this->assertTrue($dntChecker->isActive()); + return $dntChecker; + } + + protected function setUserAgentToChrome() + { + $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 ArchLinux (X11; U; Linux x86_64; en-US) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30'; + } + + protected function activateDoNotTrackInBrowser() + { + $_SERVER['HTTP_DNT'] = '1'; + } +} +
\ No newline at end of file diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php index a554585dc3..28d224cbdf 100644 --- a/plugins/UserSettings/API.php +++ b/plugins/UserSettings/API.php @@ -21,8 +21,8 @@ use Piwik\Plugins\CoreHome\Columns\Metrics\VisitsPercent; 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() */ @@ -57,112 +57,65 @@ class API extends \Piwik\Plugin\API 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')); $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst')); diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php index ea4496b16a..fed904de7d 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 @@ class Archiver extends \Piwik\Plugin\Archiver { $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 @@ class Archiver extends \Piwik\Plugin\Archiver $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 edb9b6f150..0000000000 --- a/plugins/UserSettings/Columns/Browser.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Columns; - -use Piwik\Piwik; -use Piwik\Plugins\DevicesDetection\Columns\BrowserName; -use Piwik\Plugins\UserSettings\Segment; - -class Browser extends BrowserName -{ - 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_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 ea30ea0781..0000000000 --- a/plugins/UserSettings/Columns/BrowserVersion.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Columns; - -use Piwik\Piwik; -use Piwik\Plugins\UserSettings\Segment; - -class BrowserVersion extends \Piwik\Plugins\DevicesDetection\Columns\BrowserVersion -{ - 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('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 79721238b7..0000000000 --- a/plugins/UserSettings/Columns/MobilevsDesktop.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Columns; - -use Piwik\Columns\Dimension; -use Piwik\Piwik; - -class MobilevsDesktop extends Dimension -{ - public function getName() - { - return Piwik::translate('UserSettings_MobileVsDesktop'); - } -}
\ No newline at end of file diff --git a/plugins/UserSettings/Columns/Operatingsystem.php b/plugins/UserSettings/Columns/Operatingsystem.php deleted file mode 100644 index 82a00aa8c4..0000000000 --- a/plugins/UserSettings/Columns/Operatingsystem.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Columns; - -use Piwik\Piwik; -use Piwik\Plugins\DevicesDetection\Columns\Os; -use Piwik\Plugins\UserSettings\Segment; - -class Operatingsystem extends Os -{ - 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('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 7f8ed89a96..0000000000 --- a/plugins/UserSettings/Columns/OperatingsystemFamily.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Columns; - -use Piwik\Columns\Dimension; -use Piwik\Piwik; - -class OperatingsystemFamily extends Dimension -{ - public function getName() - { - return Piwik::translate('UserSettings_OperatingSystemFamily'); - } -}
\ No newline at end of file diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php index 21ebadd617..5334ee20b2 100644 --- a/plugins/UserSettings/Controller.php +++ b/plugins/UserSettings/Controller.php @@ -8,13 +8,11 @@ */ namespace Piwik\Plugins\UserSettings; -use Piwik\Plugins\UserSettings\Reports\GetBrowser; use Piwik\Plugins\UserSettings\Reports\GetConfiguration; use Piwik\Plugins\UserSettings\Reports\GetLanguage; -use Piwik\Plugins\UserSettings\Reports\GetMobileVsDesktop; -use Piwik\Plugins\UserSettings\Reports\GetOS; use Piwik\Plugins\UserSettings\Reports\GetPlugin; use Piwik\Plugins\UserSettings\Reports\GetResolution; +use Piwik\Plugins\UserSettings\Reports\GetScreenType; use Piwik\View; /** @@ -29,9 +27,7 @@ class Controller extends \Piwik\Plugin\Controller $view->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 47f262d2ef..0000000000 --- a/plugins/UserSettings/Reports/GetBrowser.php +++ /dev/null @@ -1,46 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Reports; - -use Piwik\Piwik; -use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\CoreVisualizations\Visualizations\Graph; -use Piwik\Plugins\UserSettings\Columns\Browser; - -class GetBrowser extends Base -{ - protected function init() - { - parent::init(); - $this->dimension = new Browser(); - $this->name = Piwik::translate('UserSettings_WidgetBrowsers'); - $this->documentation = Piwik::translate('UserSettings_WidgetBrowsersDocumentation', '<br />'); - $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 aa1c39f042..0000000000 --- a/plugins/UserSettings/Reports/GetBrowserVersion.php +++ /dev/null @@ -1,47 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Reports; - -use Piwik\Piwik; -use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\CoreVisualizations\Visualizations\Graph; -use Piwik\Plugins\UserSettings\Columns\BrowserVersion; - -class GetBrowserVersion extends Base -{ - protected function init() - { - parent::init(); - $this->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 bbdfe90095..0000000000 --- a/plugins/UserSettings/Reports/GetMobileVsDesktop.php +++ /dev/null @@ -1,43 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Reports; - -use Piwik\Piwik; -use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\UserSettings\Columns\MobilevsDesktop; - -class GetMobileVsDesktop extends Base -{ - protected function init() - { - parent::init(); - $this->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 f3b6c028a2..0000000000 --- a/plugins/UserSettings/Reports/GetOS.php +++ /dev/null @@ -1,41 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Reports; - -use Piwik\Piwik; -use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\UserSettings\Columns\Operatingsystem; - -class GetOS extends Base -{ - protected function init() - { - parent::init(); - $this->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 5e12861b80..0000000000 --- a/plugins/UserSettings/Reports/GetOSFamily.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Reports; - -use Piwik\Piwik; -use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\UserSettings\Columns\OperatingsystemFamily; - -class GetOSFamily extends Base -{ - protected function init() - { - parent::init(); - $this->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 index 92006d590c..1b33d0dc4c 100644 --- a/plugins/UserSettings/Reports/GetWideScreen.php +++ b/plugins/UserSettings/Reports/GetScreenType.php @@ -12,7 +12,7 @@ use Piwik\Piwik; 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 @@ class GetWideScreen extends Base $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 728df69f7e..d36ce093b6 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -24,22 +24,44 @@ class UserSettings extends \Piwik\Plugin { 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]; + } + + if ($module == 'UserSettings' && $action == 'getWideScreen') { + $action = 'getScreenType'; + } + } + 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 6d114b1124..03e2bd958a 100644 --- a/plugins/UserSettings/Visitor.php +++ b/plugins/UserSettings/Visitor.php @@ -63,46 +63,6 @@ class Visitor 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 d7ca0fafd4..e367ff8bc9 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -11,12 +11,6 @@ namespace Piwik\Plugins\UserSettings; 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 Binary files differindex a3b970ae1b..17ef80cd53 100644 --- a/plugins/UserSettings/images/os/IOS.gif +++ b/plugins/UserSettings/images/os/IOS.gif diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json index f4ab9b4460..0c1ed777c1 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 79f6d6072e..7b6d236d47 100644 --- a/plugins/UserSettings/templates/index.twig +++ b/plugins/UserSettings/templates/index.twig @@ -1,25 +1,19 @@ <div id='leftcolumn'> - - <h2 piwik-enriched-headline>{{ 'UserSettings_Browsers'|translate }}</h2> - {{ dataTableBrowser|raw }} - <h2 piwik-enriched-headline>{{ 'General_Plugins'|translate }}</h2> {{ dataTablePlugin|raw }} + + <h2 piwik-enriched-headline>{{ 'UserSettings_BrowserLanguage'|translate }}</h2> + {{ dataTableBrowserLanguage|raw }} </div> <div id='rightcolumn'> - <h2 piwik-enriched-headline>{{ 'UserSettings_Configurations'|translate }}</h2> - {{ dataTableConfiguration|raw }} - - <h2 piwik-enriched-headline>{{ 'UserSettings_OperatingSystems'|translate }}</h2> - {{ dataTableOS|raw }} <h2 piwik-enriched-headline>{{ 'UserSettings_Resolutions'|translate }}</h2> {{ dataTableResolution|raw }} - <h2 piwik-enriched-headline>{{ 'UserSettings_MobileVsDesktop'|translate }}</h2> - {{ dataTableMobileVsDesktop|raw }} + <h2 piwik-enriched-headline>{{ 'UserSettings_ScreenTypes'|translate }}</h2> + {{ dataTableScreenType|raw }} - <h2 piwik-enriched-headline>{{ 'UserSettings_BrowserLanguage'|translate }}</h2> - {{ dataTableBrowserLanguage|raw }} + <h2 piwik-enriched-headline>{{ 'UserSettings_Configurations'|translate }}</h2> + {{ dataTableConfiguration|raw }} </div> diff --git a/plugins/UserSettings/tests/Unit/UserSettingsTest.php b/plugins/UserSettings/tests/Unit/UserSettingsTest.php deleted file mode 100644 index 408420ed6f..0000000000 --- a/plugins/UserSettings/tests/Unit/UserSettingsTest.php +++ /dev/null @@ -1,1036 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -namespace Piwik\Plugins\UserSettings\tests\Unit; - -use UserAgentParser; - -require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/UserSettings.php'; -require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; - -class UserSettingsTest extends \PHPUnit_Framework_TestCase -{ - // User agent strings and expected parser results - public function getUserAgents() - { - return array( - // array('User Agent String', array( - // array( browser_id, name, short_name, version, major_number, minor_number, family ), - // array( os_id, name, short_name ))), - - // Special: URL encoded IE8 - array('Mozilla/4.0+(compatible;+MSIE+8.0;+Windows+NT+6.1;+WOW64;+Trident/4.0;+GTB7.4;+SLCC2;+.NET+CLR+2.0.50727;+.NET+CLR+3.5.30729;+.NET+CLR+3.0.30729;+Media+Center+PC+6.0;+.NET4.0C;+.NET4.0E;+MS-RTC+LM+8;+InfoPath.2)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WI7', 'Windows 7', 'Win 7'))), - - // ABrowse - array('Mozilla/5.0 (compatible; U; ABrowse 0.6; Syllable) AppleWebKit/420+ (KHTML, like Gecko)', array( - array('AB', 'ABrowse', 'ABrowse', '0.6', '0', '6', 'webkit'), - array('SYL', 'Syllable', 'Syllable'))), - array('Mozilla/5.0 (compatible; ABrowse 0.4; Syllable)', array( - array('AB', 'ABrowse', 'ABrowse', '0.4', '0', '4', 'webkit'), - array('SYL', 'Syllable', 'Syllable'))), - - // Acoo Browser (treat as IE) - array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; GTB6; Acoo Browser; .NET CLR 1.1.4322; .NET CLR 2.0.50727)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Acoo Browser; .NET CLR 2.0.50727; .NET CLR 1.1.4322)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Acoo Browser; .NET CLR 1.1.4322; .NET CLR 2.0.50727)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Amaya - array('amaya/9.52 libwww/5.4.0', array( - array('AM', 'Amaya', 'Amaya', '9.52', '9', '52', 'unknown'), - false)), - - // AmigaVoyager - array('AmigaVoyager/3.2 (AmigaOS/MC680x0)', array( - array('AV', 'AmigaVoyager', 'AmigaVoyager', '3.2', '3', '2', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - array('AmigaVoyager/2.95 (compatible; MC680x0; AmigaOS; SV1)', array( - array('AV', 'AmigaVoyager', 'AmigaVoyager', '2.95', '2', '95', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - array('AmigaVoyager/2.95 (compatible; MC680x0; AmigaOS)', array( - array('AV', 'AmigaVoyager', 'AmigaVoyager', '2.95', '2', '95', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - - // Android - array('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', array( - array('SF', 'Safari', 'Safari', '3.0', '3', '0', 'webkit'), - array('AND', 'Android', 'Android'))), - array('Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; Nexus One Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - array('AND', 'Android', 'Android'))), - array('Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; device Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Safari/533.1', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - array('AND', 'Android', 'Android'))), - array('Mozilla/5.0 (Linux; U; Android 4.0.1; en-us; Galaxy Nexus Build/ITL41D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - array('AND', 'Android', 'Android'))), - - // Android - Mobile Chrome - /* - array('rray('Mozilla/5.0 (Linux; U; Android 4.1; en-us) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.16 Safari/534.24', array( - array('CH', 'Chrome', 'Chrome', '11.0', '11', '0', 'webkit'), - array('AND', 'Android', 'Android'))), - */ - array('Mozilla/5.0 (Linux; U; Android 4.0.1; en-us; Galaxy Nexus Build/ITL41F) AppleWebKit/535.7 (KHTML, like Gecko) CrMo/16.0.912.75 Mobile Safari/535.7', array( - array('CH', 'Chrome', 'Chrome', '16.0', '16', '0', 'webkit'), - array('AND', 'Android', 'Android'))), - - // AOL / America Online Browser (treat as IE) - array('Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.5; AOLBuild 4337.43; Windows NT 5.1; .NET CLR 1.1.4322)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.1; AOLBuild 4334.5009; Windows NT 5.1; GTB5; .NET CLR 1.1.4322)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.0; Windows NT 5.1; InfoPath.1)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 6.0; AOL 8.0; Windows NT 5.1; SV1)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; AOL 7.0; Windows NT 5.1)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 5.5; AOL 6.0; Windows 98; Win 9x 4.90)', array( - array('IE', 'Internet Explorer', 'IE', '5.5', '5', '5', 'ie'), - array('WME', 'Windows Me', 'Win Me'))), - array('Mozilla/4.0 (compatible; MSIE 5.5; AOL 5.0; Windows NT 5.0)', array( - array('IE', 'Internet Explorer', 'IE', '5.5', '5', '5', 'ie'), - array('W2K', 'Windows 2000', 'Win 2000'))), - array('Mozilla/4.0 (compatible; MSIE 4.01; AOL 4.0; Windows 95)', array( - array('IE', 'Internet Explorer', 'IE', '4.01', '4', '01', 'ie'), - array('W95', 'Windows 95', 'Win 95'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; America Online Browser 1.1; Windows NT 5.1; (R1 1.5); .NET CLR 2.0.50727; InfoPath.1)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 6.0; America Online Browser 1.1; Windows 98)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('W98', 'Windows 98', 'Win 98'))), - - // Arora - array('Mozilla/5.0 (X11; U; Linux; de-DE) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.8.0', array( - array('AR', 'Arora', 'Arora', '0.8', '0', '8', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux; en-US) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.6', array( - array('AR', 'Arora', 'Arora', '0.6', '0', '6', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.2; pt-BR) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.4 (Change: )', array( - array('AR', 'Arora', 'Arora', '0.4', '0', '4', 'webkit'), - array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN) AppleWebKit/523.15 (KHTML, like Gecko, Safari/419.3) Arora/0.3 (Change: 287 c9dfb30)', array( - array('AR', 'Arora', 'Arora', '0.3', '0', '3', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (X11; U; Linux; en-US) AppleWebKit/523.15 (KHTML, like Gecko, Safari/419.3) Arora/0.2 (Change: 189 35c14e0)', array( - array('AR', 'Arora', 'Arora', '0.2', '0', '2', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - - // Avant (treat as IE) - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Avant Browser; .NET CLR 2.0.50727; MAXTHON 2.0)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; Avant Browser; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WI7', 'Windows 7', 'Win 7'))), - - // AWeb - array('Amiga-AWeb/3.5.07 beta', array( - array('AW', 'Amiga AWeb', 'AWeb', '3.5', '3', '5', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - array('Mozilla/6.0; (Spoofed by Amiga-AWeb/3.5.07 beta)', array( - array('AW', 'Amiga AWeb', 'AWeb', '3.5', '3', '5', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - array('MSIE/6.0; (Spoofed by Amiga-AWeb/3.4APL)', array( - array('AW', 'Amiga AWeb', 'AWeb', '3.4', '3', '4', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - - // Beonex - array('Mozilla/5.0 (Windows; U; WinNT; en; rv:1.0.2) Gecko/20030311 Beonex/0.8.2-stable', array( - array('BE', 'Beonex', 'Beonex', '0.8', '0', '8', 'unknown'), - array('WNT', 'Windows NT', 'Win NT'))), - array('Mozilla/5.0 (Windows; U; WinNT; en; Preview) Gecko/20020603 Beonex/0.8-stable', array( - array('BE', 'Beonex', 'Beonex', '0.8', '0', '8', 'unknown'), - array('WNT', 'Windows NT', 'Win NT'))), - - // BlackBerry - array('BlackBerry8700/4.1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1', array( - array('BB', 'BlackBerry', 'BlackBerry', '4.1', '4', '1', 'webkit'), - array('BLB', 'BlackBerry', 'BlackBerry'))), - - array('Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en) AppleWebKit/534.1+ (KHTML, Like Gecko) Version/6.0.0.141 Mobile Safari/534.1+', array( - array('BB', 'BlackBerry', 'BlackBerry', '6.0', '6', '0', 'webkit'), - array('BLB', 'BlackBerry', 'BlackBerry'))), - - array('Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/0.0.1 Safari/534.11+', array( - array('BP', 'PlayBook', 'PlayBook', '0.0', '0', '0', 'webkit'), - array('QNX', 'QNX', 'QNX'))), - - // BrowseX - array('Mozilla/4.61 [en] (X11; U; ) - BrowseX (2.0.0 Windows)', array( - array('BX', 'BrowseX', 'BrowseX', '2.0', '2', '0', 'unknown'), - false)), - - // Camino (formerly known as Chimera; not to be confused with another browser also named Chimera) - array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en; rv:1.9.0.8pre) Gecko/2009022800 Camino/2.0b3pre', array( - array('CA', 'Camino', 'Camino', '2.0', '2', '0', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en; rv:1.9.0.10pre) Gecko/2009041800 Camino/2.0b3pre (like Firefox/3.0.10pre)', array( - array('CA', 'Camino', 'Camino', '2.0', '2', '0', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en; rv:1.8.1.4pre) Gecko/20070511 Camino/1.6pre', array( - array('CA', 'Camino', 'Camino', '1.6', '1', '6', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en; rv:1.8.1.6) Gecko/20070809 Firefox/2.0.0.6 Camino/1.5.1', array( - array('CA', 'Camino', 'Camino', '1.5', '1', '5', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.0.1) Gecko/20030306 Camino/0.7', array( - array('CA', 'Camino', 'Camino', '0.7', '0', '7', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; pl-PL; rv:1.0.1) Gecko/20021111 Chimera/0.6', array( - array('CA', 'Camino', 'Camino', '0.6', '0', '6', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - - // Cheshire - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.8 (KHTML, like Gecko, Safari) Cheshire/1.0.UNOFFICIAL', array( - array('CS', 'Cheshire', 'Cheshire', '1.0', '1', '0', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/419 (KHTML, like Gecko, Safari/419.3) Cheshire/1.0.ALPHA', array( - array('CS', 'Cheshire', 'Cheshire', '1.0', '1', '0', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.9 (KHTML, like Safari) Cheshire/1.0.ALPHA', array( - array('CS', 'Cheshire', 'Cheshire', '1.0', '1', '0', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - - // Chrome / Chromium - array('Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US) AppleWebKit/532.9 (KHTML, like Gecko) Chrome/5.0.310.0 Safari/532.9', array( - array('CH', 'Chrome', 'Chrome', '5.0', '5', '0', 'webkit'), - array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))), - array('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', array( - array('CH', 'Chrome', 'Chrome', '1.0', '1', '0', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Linux; U; en-US) AppleWebKit/525.13 (KHTML, like Gecko) Chrome/0.2.149.27 Safari/525.13', array( - array('CH', 'Chrome', 'Chrome', '0.2', '0', '2', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Windows NT 6.0; WOW64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.16 Safari/534.24', array( - array('CH', 'Chrome', 'Chrome', '11.0', '11', '0', 'webkit'), - array('WVI', 'Windows Vista', 'Win Vista'))), - array('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.16 Safari/534.24', array( - array('CH', 'Chrome', 'Chrome', '11.0', '11', '0', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - - // Chrome Frame - array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; chromeframe/11.0.660.0)', array( - array('CF', 'Chrome Frame', 'Chrome Frame', '11.0', '11', '0', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) chromeframe/11.0.660.0', array( - array('CF', 'Chrome Frame', 'Chrome Frame', '11.0', '11', '0', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; chromeframe/11.0.660.0) AppleWebKit/534.18 (KHTML, like Gecko) Chrome/11.0.660.0 Safari/534.18', array( - array('CF', 'Chrome Frame', 'Chrome Frame', '11.0', '11', '0', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/534.18 (KHTML, like Gecko) Chrome/11.0.660.0 Safari/534.18', array( - array('CH', 'Chrome', 'Chrome', '11.0', '11', '0', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - - // ChromePlus (treat as Chrome) - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.2 (KHTML, like Gecko) ChromePlus/4.0.222.3 Chrome/4.0.222.3 Safari/532.2', array( - array('CH', 'Chrome', 'Chrome', '4.0', '4', '0', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.28.3 (KHTML, like Gecko) Version/3.2.3 ChromePlus/4.0.222.3 Chrome/4.0.222.3 Safari/525.28.3', array( - array('CH', 'Chrome', 'Chrome', '3.2', '3', '2', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - - // CometBird - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.5) Gecko/2009011615 Firefox/3.0.5 CometBird/3.0.5', array( - array('CO', 'CometBird', 'CometBird', '3.0', '3', '0', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Crazy Browser (treat as IE) - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; InfoPath.2; .NET CLR 2.0.50727; .NET CLR 1.1.4322; Crazy Browser 3.0.0 Beta2)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Avant Browser; .NET CLR 2.0.50727; .NET CLR 3.0.04506.590; .NET CLR 3.5.20706; Crazy Browser 2.0.1)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Dillo - array('Dillo/2.0', array( - array('DI', 'Dillo', 'Dillo', '2.0', '2', '0', 'unknown'), - false)), - array('Dillo/0.6.4', array( - array('DI', 'Dillo', 'Dillo', '0.6', '0', '6', 'unknown'), - false)), - - // Dolfin (or Dolphin, depending on which Samsung documentation you read); and yes, it's "bada" (lower-case) - array('Mozilla/5.0 (SAMSUNG; SAMSUNG-GT-S5250/S5250AIJI3; U; Bada/1.0; it-it) AppleWebKit/533.1 (KHTML, like Gecko) Dolfin/2.0 Mobile WQVGA SMM-MMS/1.2.0 NexPlayer/3.0 profile/MIDP-2.1 configuration/CLDC-1.1 OPN-B', array( - array('DF', 'Dolfin', 'Dolfin', '2.0', '2', '0', 'webkit'), - array('SBA', 'bada', 'bada'))), - array('Mozilla/5.0 (SAMSUNG; SAMSUNG-GT-S8530/S8530XXJKA; U; Bada/1.2; en-us) AppleWebKit/533.1 (KHTML, like Gecko) Dolfin/2.2 Mobile WVGA SMM-MMS/1.2.0 OPN-B', array( - array('DF', 'Dolfin', 'Dolfin', '2.2', '2', '2', 'webkit'), - array('SBA', 'bada', 'bada'))), - - // ELinks - array('ELinks/0.12~pre2.dfsg0-1ubuntu1-lite (textmode; Debian; Linux 2.6.32-4-jolicloud i686; 143x37-2)', array( - array('EL', 'ELinks', 'ELinks', '0.12', '0', '12', 'unknown'), - array('LIN', 'Linux', 'Linux'))), - array('ELinks/0.12pre5.GIT (textmode; CYGWIN_NT-6.1 1.7.1(0.218/5/3) i686; 80x24-2)', array( - array('EL', 'ELinks', 'ELinks', '0.12', '0', '12', 'unknown'), - array('WI7', 'Windows 7', 'Win 7'))), - array('ELinks (0.4.3; NetBSD 3.0.2_PATCH sparc64; 141x19)', array( - array('EL', 'ELinks', 'ELinks', '0.4', '0', '4', 'unknown'), - array('NBS', 'NetBSD', 'NetBSD'))), - - // Epiphany - array('Mozilla/5.0 (X11; U; Linux i686; en-us) AppleWebKit/531.2+ (KHTML, like Gecko) Safari/531.2+ Epiphany/2.29.5', array( - array('EP', 'Epiphany', 'Epiphany', '2.29', '2', '29', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux i686; en; rv:1.9.0.11) Gecko/20080528 Epiphany/2.22 Firefox/3.0', array( - // technically, this should be 'gecko' but UserAgentParser only supports one browserType (family) per browser - array('EP', 'Epiphany', 'Epiphany', '2.22', '2', '22', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - - // Fennec - array('Mozilla/5.0 (Android; Linux armv7l; rv:2.0.1) Gecko/20100101 Firefox/4.0.1 Fennec/2.0.1', array( - array('FE', 'Fennec', 'Fennec', '2.0', '2', '0', 'gecko'), - array('AND', 'Android', 'Android'))), - array('Mozilla/5.0 (Maemo; Linux armv7l; rv2.0.1) Gecko/20100101 Firefox/4.0.1 Fennec/2.0.1', array( - array('FE', 'Fennec', 'Fennec', '2.0', '2', '0', 'gecko'), - array('MAE', 'Maemo', 'Maemo'))), - array('Mozilla/5.0 (X11; Linux i686; rv2.0.1) Gecko/20100101 Firefox/4.0.1 Fennec/2.0.1', array( - array('FE', 'Fennec', 'Fennec', '2.0', '2', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.2a1pre) Gecko/20090626 Fennec/1.0b2', array( - array('FE', 'Fennec', 'Fennec', '1.0', '1', '0', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (X11; U; Linux armv6l; en-US; rv:1.9.1b1pre) Gecko/20081005220218 Gecko/2008052201 Fennec/0.9pre', array( - array('FE', 'Fennec', 'Fennec', '0.9', '0', '9', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux armv6l; en-US; rv:1.9.1a1pre) Gecko/2008071707 Fennec/0.5', array( - array('FE', 'Fennec', 'Fennec', '0.5', '0', '5', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - - // Firefox (formerly Firebird, formerly Phoenix; and rebranded versions) - array('Mozilla/5.0 (X11; Linux i686; rv:5.0a2) Gecko/20110413 Firefox/5.0a2', array( - array('FF', 'Firefox', 'Firefox', '5.0', '5', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0.1', array( - array('FF', 'Firefox', 'Firefox', '4.0', '4', '0', 'gecko'), - array('WI7', 'Windows 7', 'Win 7'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:2.0a1pre) Gecko/2008060602 Minefield/4.0a1pre', array( - array('FF', 'Firefox', 'Firefox', '4.0', '4', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:2.0a1pre) Gecko/2008060602 Minefield/4.0a1p', array( - array('FF', 'Firefox', 'Firefox', '4.0', '4', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2a2pre) Gecko/20090826 Namoroka/3.6a2pre', array( - array('FF', 'Firefox', 'Firefox', '3.6', '3', '6', 'gecko'), - array('WVI', 'Windows Vista', 'Win Vista'))), - array('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2) Gecko/20100119 Namoroka/3.6', array( - array('FF', 'Firefox', 'Firefox', '3.6', '3', '6', 'gecko'), - array('WI7', 'Windows 7', 'Win 7'))), - array('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)', array( - array('FF', 'Firefox', 'Firefox', '3.5', '3', '5', 'gecko'), - array('WI7', 'Windows 7', 'Win 7'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.2) Gecko/20090803 Ubuntu/9.04 (jaunty) Shiretoko/3.5.2', array( - array('FF', 'Firefox', 'Firefox', '3.5', '3', '5', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6', array( - array('FF', 'Firefox', 'Firefox', '3.0', '3', '0', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9a7) Gecko/2007080210 GranParadiso/3.0a7', array( - array('FF', 'Firefox', 'Firefox', '3.0', '3', '0', 'gecko'), - array('WVI', 'Windows Vista', 'Win Vista'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.1) Gecko/2008072716 IceCat/3.0.1-g1', array( - array('FF', 'Firefox', 'Firefox', '3.0', '3', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.0.1) Gecko/2008071420 Iceweasel/3.0.1 (Debian-3.0.1-1)', array( - array('FF', 'Firefox', 'Firefox', '3.0', '3', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1b2) Gecko/20060821 BonEcho/2.0b2', array( - array('FF', 'Firefox', 'Firefox', '2.0', '2', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Darwin Power Macintosh; en-US; rv:1.8.0.12) Gecko/20070803 Firefox/1.5.0.12 Fink Community Edition', array( - array('FF', 'Firefox', 'Firefox', '1.5', '1', '5', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6b) Gecko/20031212 Firebird/0.7+', array( - array('FB', 'Firebird', 'Firebird', '0.7', '0', '7', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Windows; U; Win98; de-DE; rv:1.4b) Gecko/20030516 Mozilla Firebird/0.6', array( - array('FB', 'Firebird', 'Firebird', '0.6', '0', '6', 'gecko'), - array('W98', 'Windows 98', 'Win 98'))), - array('Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.3a) Gecko/20021207 Phoenix/0.5', array( - array('PX', 'Phoenix', 'Phoenix', '0.5', '0', '5', 'gecko'), - array('WNT', 'Windows NT', 'Win NT'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.2b) Gecko/20020923 Phoenix/0.1', array( - array('PX', 'Phoenix', 'Phoenix', '0.1', '0', '1', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Nintendo DS v4; U; M3 Adapter CF + PassMe2; en-US; rv:1.8.0.6 ) Gecko/20060728 Firefox/1.5.0.6 (firefox.gba.ds)', array( - array('FF', 'Firefox', 'Firefox', '1.5', '1', '5', 'gecko'), - array('NDS', 'Nintendo DS', 'DS'))), - array('Mozilla/5.0 (Android; Mobile; rv:15.0) Gecko/15.0 Firefox/15.0a1', array( - array('FF', 'Firefox', 'Firefox', '15.0', '15', '0', 'gecko'), - array('AND', 'Android', 'Android'))), - - // Flock - array('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Flock/3.0.0.3737 Chrome/4.1.249.1071 Safari/532.5', array( - array('FL', 'Flock', 'Flock', '3.0', '3', '0', 'webkit'), - array('WI7', 'Windows 7', 'Win 7'))), - // pre-3.0 is actually gecko - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7 Flock/2.5.6 (.NET CLR 3.5.30729)', array( - array('FL', 'Flock', 'Flock', '2.5', '2', '5', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko/20091221 AppleWebKit/531.21.8 KHTML/4.3.5 (like Gecko) Firefox/3.5.7 Flock/2.5.6 (.NET CLR 3.5.30729)', array( - array('FL', 'Flock', 'Flock', '2.5', '2', '5', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko/20091221 AppleWebKit/531.21.8 (KHTML, like Gecko) Firefox/3.5.7 Flock/2.5.6 (.NET CLR 3.5.30729)', array( - array('FL', 'Flock', 'Flock', '2.5', '2', '5', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.9) Gecko/20071106 Firefox/2.0.0.9 Flock/1.0.1', array( - array('FL', 'Flock', 'Flock', '1.0', '1', '0', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.8.1.8) Gecko/20071101 Firefox/2.0.0.8 Flock/1.0', array( - array('FL', 'Flock', 'Flock', '1.0', '1', '0', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.8b5) Gecko/20051021 Flock/0.4 Firefox/1.0+', array( - array('FL', 'Flock', 'Flock', '0.4', '0', '4', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - - // Fluid - array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_1; nl-nl) AppleWebKit/532.3+ (KHTML, like Gecko) Fluid/0.9.6 Safari/532.3+', array( - array('FD', 'Fluid', 'Fluid', '0.9', '0', '9', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.13 (KHTML, like Gecko) Fluid/0.9.4 Safari/525.13', array( - array('FD', 'Fluid', 'Fluid', '0.9', '0', '9', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Galeon - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.8) Gecko/20090327 Galeon/2.0.7', array( - array('GA', 'Galeon', 'Galeon', '2.0', '2', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; OpenBSD i386; en-US; rv:1.8.1.19) Gecko/20090701 Galeon/2.0.7', array( - array('GA', 'Galeon', 'Galeon', '2.0', '2', '0', 'gecko'), - array('OBS', 'OpenBSD', 'OpenBSD'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.19) Gecko/20081216 Galeon/2.0.4 Firefox/2.0.0.19', array( - array('GA', 'Galeon', 'Galeon', '2.0', '2', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.13pre) Gecko/20080207 Galeon/2.0.1 (Ubuntu package 2.0.1-1ubuntu2) Firefox/1.5.0.13pre', array( - array('GA', 'Galeon', 'Galeon', '2.0', '2', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.6) Gecko/20040406 Galeon/1.3.15', array( - array('GA', 'Galeon', 'Galeon', '1.3', '1', '3', 'gecko'), - array('BSD', 'FreeBSD', 'FreeBSD'))), - array('Mozilla/5.0 Galeon/1.2.9 (X11; Linux i686; U;) Gecko/20021213 Debian/1.2.9-0.bunk', array( - array('GA', 'Galeon', 'Galeon', '1.2', '1', '2', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 Galeon/1.0.3 (X11; Linux i686; U;) Gecko/0', array( - array('GA', 'Galeon', 'Galeon', '1.0', '1', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - - // Google Earth embedded browser - array('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/532.4 (KHTML, like Gecko) Google Earth/5.2.1.1329 Safari/532.4', array( - array('GE', 'Google Earth', 'Google Earth', '5.2', '5', '2', 'webkit'), - array('WI7', 'Windows 7', 'Win 7'))), - - // GreenBrowser (treat as IE) - array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; SLCC1; .NET CLR 2.0.50727; .NET CLR 3.0.04506; Media Center PC 5.0; .NET CLR 3.5.21022; GreenBrowser)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0; SLCC1; .NET CLR 2.0.50727; .NET CLR 3.5.30729; InfoPath.2; .NET CLR 3.0.30729; GreenBrowser)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WVI', 'Windows Vista', 'Win Vista'))), - - // Hana - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.9 (KHTML, like Gecko) Hana/1.1', array( - array('HA', 'Hana', 'Hana', '1.1', '1', '1', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/417.9 (KHTML, like Gecko) Hana/1.0', array( - array('HA', 'Hana', 'Hana', '1.0', '1', '0', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - - // HotJava - array('HotJava/1.1.2 FCS', array( - array('HJ', 'HotJava', 'HotJava', '1.1', '1', '1', 'unknown'), - false)), - array('HotJava/1.0.1/JRE1.1.x', array( - array('HJ', 'HotJava', 'HotJava', '1.0', '1', '0', 'unknown'), - false)), - - // iBrowse - array('Mozilla/5.0 (compatible; IBrowse 3.0; AmigaOS4.0)', array( - array('IB', 'IBrowse', 'IBrowse', '3.0', '3', '0', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - array('Mozilla/4.0 (compatible; IBrowse 2.3; AmigaOS4.0)', array( - array('IB', 'IBrowse', 'IBrowse', '2.3', '2', '3', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - array('IBrowse/2.4 (AmigaOS 3.9; 68K)', array( - array('IB', 'IBrowse', 'IBrowse', '2.4', '2', '4', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - array('IBrowse/2.3 (AmigaOS V51)', array( - array('IB', 'IBrowse', 'IBrowse', '2.3', '2', '3', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - array('IBrowse/2.3 (AmigaOS 4.0)', array( - array('IB', 'IBrowse', 'IBrowse', '2.3', '2', '3', 'unknown'), - array('AMI', 'AmigaOS', 'AmigaOS'))), - - // iCab - array('iCab/4.5 (Macintosh; U; PPC Mac OS X)', array( - array('IC', 'iCab', 'iCab', '4.5', '4', '5', 'unknown'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('iCab/4.5 (Macintosh; U; Mac OS X Leopard 10.5.7)', array( - array('IC', 'iCab', 'iCab', '4.5', '4', '5', 'unknown'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (compatible; iCab 3.0.5; Macintosh; U; PPC Mac OS)', array( - array('IC', 'iCab', 'iCab', '3.0', '3', '0', 'unknown'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (compatible; iCab 3.0.5; Macintosh; U; PPC Mac OS X)', array( - array('IC', 'iCab', 'iCab', '3.0', '3', '0', 'unknown'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS; en) iCab 3', array( - array('IC', 'iCab', 'iCab', '3.0', '3', '0', 'unknown'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/4.5 (compatible; iCab 2.7.1; Macintosh; I; PPC)', array( - array('IC', 'iCab', 'iCab', '2.7', '2', '7', 'unknown'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('iCab/2.9.8 (Macintosh; U; 68K)', array( - array('IC', 'iCab', 'iCab', '2.9', '2', '9', 'unknown'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Lynx/2.8 (compatible; iCab 2.9.8; Macintosh; U; 68K)', array( - array('IC', 'iCab', 'iCab', '2.9', '2', '9', 'unknown'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/4/5 (compatible; iCab 2.9.8; Macintosh; U; 68K)', array( - array('IC', 'iCab', 'iCab', '2.9', '2', '9', 'unknown'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC)', array( - array('IE', 'Internet Explorer', 'IE', '5.0', '5', '0', 'ie'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/4.76 (Macintosh; I; PPC)', array( - array('NS', 'Netscape', 'Netscape', '4.76', '4', '76', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - - // Internet Explorer - array('Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; Xbox)', array( - array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'), - array('XBX', 'Xbox', 'Xbox'))), - array('Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; Xbox)', array( - array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'), - array('XBX', 'Xbox', 'Xbox'))), - array('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)', array( - array('IE', 'Internet Explorer', 'IE', '10.0', '10', '0', 'ie'), - array('WI8', 'Windows 8', 'Win 8'))), - array('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)', array( - array('IE', 'Internet Explorer', 'IE', '10.0', '10', '0', 'ie'), - array('WI7', 'Windows 7', 'Win 7'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/6.0)', array( - array('IE', 'Internet Explorer', 'IE', '10.0', '10', '0', 'ie'), - array('WI7', 'Windows 7', 'Win 7'))), - array('Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)', array( - array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'), - array('WI7', 'Windows 7', 'Win 7'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/5.0)', array( - array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'), - array('WVI', 'Windows Vista', 'Win Vista'))), - array('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)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WI7', 'Windows 7', 'Win 7'))), - array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WVI', 'Windows Vista', 'Win Vista'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WVI', 'Windows Vista', 'Win Vista'))), - array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('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)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; SV1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))), - array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; WOW64; SV1; .NET CLR 2.0.50727)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))), - array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; Win64; x64; SV1; .NET CLR 2.0.50727)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))), - - // IE Mobile - array('Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; SAMSUNG; SGH-i917)', array( - array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'), - array('WPH', 'Windows Phone OS', 'WinPhone'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; XBLWP7; ZuneWP7)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WPH', 'Windows Phone OS', 'WinPhone'))), - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; DeviceManufacturer; DeviceModel)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WPH', 'Windows Phone OS', 'WinPhone'))), - array('Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 7.11)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('WMO', 'Windows Mobile', 'WinMo'))), - array('Mozilla/4.0 (compatible; MSIE 4.01; Windows CE; PPC; 240x320)', array( - array('IE', 'Internet Explorer', 'IE', '4.01', '4', '01', 'ie'), - array('WCE', 'Windows CE', 'Win CE'))), - - // Internet Explorer with misbehaving Google Tool Bar - array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; GTB6.5; 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.4506.2152; .NET CLR 3.5.30729)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; GTB0.0; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)', array( - array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Iron - array('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', array( - array('IR', 'Iron', 'Iron', '3.0', '3', '0', 'webkit'), - array('WI7', 'Windows 7', 'Win 7'))), - - // K-Meleon - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.21) Gecko/20090331 K-Meleon/1.5.3', array( - array('KM', 'K-Meleon', 'K-Meleon', '1.5', '1', '5', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Darwin; FreeBSD 5.6; en-GB; rv:1.8.1.17pre) Gecko/20080716 K-Meleon/1.5.0', array( - array('KM', 'K-Meleon', 'K-Meleon', '1.5', '1', '5', 'gecko'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.2b) Gecko/20021016 K-Meleon 0.7', array( - array('KM', 'K-Meleon', 'K-Meleon', '0.7', '0', '7', 'gecko'), - array('WNT', 'Windows NT', 'Win NT'))), - - // Kapiko - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.0.1) Gecko/20080722 Firefox/3.0.1 Kapiko/3.0', array( - array('KP', 'Kapiko', 'Kapiko', '3.0', '3', '0', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Kazehakase - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.11) Gecko Kazehakase/0.5.4 Debian/0.5.4-2.1ubuntu3', array( - array('KZ', 'Kazehakase', 'Kazehakase', '0.5', '0', '5', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.13) Gecko/20080311 (Debian-1.8.1.13+nobinonly-0ubuntu1) Kazehakase/0.5.2', array( - array('KZ', 'Kazehakase', 'Kazehakase', '0.5', '0', '5', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; Linux x86_64; U;) Gecko/20060207 Kazehakase/0.3.5 Debian/0.3.5-1', array( - array('KZ', 'Kazehakase', 'Kazehakase', '0.3', '0', '3', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - - // KKMAN (treat as IE) - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; KKMAN3.2)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Konqueror - array('Mozilla/5.0 (compatible; Konqueror/4.0; Linux) KHTML/4.0.5 (like Gecko)', array( - array('KO', 'Konqueror', 'Konqueror', '4.0', '4', '0', 'khtml'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (compatible; Konqueror/4.0; Microsoft Windows) KHTML/4.0.80 (like Gecko)', array( - array('KO', 'Konqueror', 'Konqueror', '4.0', '4', '0', 'khtml'), - false)), - array('Mozilla/5.0 (compatible; Konqueror/3.5; GNU/kFreeBSD) KHTML/3.5.9 (like Gecko) (Debian)', array( - array('KO', 'Konqueror', 'Konqueror', '3.5', '3', '5', 'khtml'), - array('BSD', 'FreeBSD', 'FreeBSD'))), - array('Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)', array( - array('KO', 'Konqueror', 'Konqueror', '2.1', '2', '1', 'khtml'), - false)), - - // Links - array('Links', array( - false, - false)), - array('Links (2.1pre31; Linux 2.6.21-omap1 armv6l; x)', array( - array('LI', 'Links', 'Links', '2.1', '2', '1', 'unknown'), - array('LIN', 'Linux', 'Linux'))), - array('Links (0.99; OS/2 1 i386; 80x33)', array( - array('LI', 'Links', 'Links', '0.99', '0', '99', 'unknown'), - array('OS2', 'OS/2', 'OS/2'))), - - // Lunascape (identity crisis) - array('Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1) Gecko/20090701 Firefox/3.5 Lunascape/5.1.2.3', array( - array('FF', 'Firefox', 'Firefox', '3.5', '3', '5', 'gecko'), - array('WVI', 'Windows Vista', 'Win Vista'))), - array('Mozilla/5.0 (Windows; U; ; cs-CZ) AppleWebKit/532+ (KHTML, like Gecko, Safari/532.0) Lunascape/5.1.2.3', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - false)), - array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; InfoPath.1; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Lunascape 5.1.2.3)', array( - array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Lynx - array('Lynx (textmode)', array( - false, - false)), - array('Lynx/2.8.7dev.9 libwww-FM/2.14', array( - array('LX', 'Lynx', 'Lynx', '2.8', '2', '8', 'unknown'), - false)), - - // Maxathon (treat as IE) - array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; SV1; Maxthon; .NET CLR 1.1.4322)', array( - array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Midori - array('Midori/0.1.9 (X11; Linux i686; U; fr-fr) WebKit/532+', array( - array('MI', 'Midori', 'Midori', '0.1', '0', '1', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux; pt-br) AppleWebKit/531+ (KHTML, like Gecko) Safari/531.2+ Midori/0.3', array( - array('MI', 'Midori', 'Midori', '0.3', '0', '3', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - - // Mozilla Suite - array('Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.7) Gecko/20070606', array( - array('MO', 'Mozilla', 'Mozilla', '1.7', '1', '7', 'gecko'), - array('SOS', 'SunOS', 'SunOS'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.8) Gecko/20050927 Debian/1.7.8-1sarge3', array( - array('MO', 'Mozilla', 'Mozilla', '1.7', '1', '7', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - - // NCSA Mosaic - array('PATHWORKS Mosaic/1.0 libwww/2.15_Spyglass', array( - array('MC', 'NCSA Mosaic', 'Mosaic', '1.0', '1', '0', 'unknown'), - false)), - array('WinMosaic/Version 2.0 (ALPHA 2)', array( - array('MC', 'NCSA Mosaic', 'Mosaic', '2.0', '2', '0', 'unknown'), - false)), - array('VMS_Mosaic/3.8-1 (Motif;OpenVMS V7.3-2 DEC 3000 - M700) libwww/2.12_Mosaic', array( - array('MC', 'NCSA Mosaic', 'Mosaic', '3.8', '3', '8', 'unknown'), - array('VMS', 'OpenVMS', 'OpenVMS'))), - array('Mosaic from Digital/1.02_Win32', array( - array('MC', 'NCSA Mosaic', 'Mosaic', '1.02', '1', '02', 'unknown'), - array('W95', 'Windows 95', 'Win 95'))), - array('NCSA Mosaic/2.0.0b4 (Windows AXP)', array( - array('MC', 'NCSA Mosaic', 'Mosaic', '2.0', '2', '0', 'unknown'), - false)), - array('NCSA_Mosaic/2.7b5 (X11;Linux 2.6.7 i686) libwww/2.12 modified', array( - array('MC', 'NCSA Mosaic', 'Mosaic', '2.7', '2', '7', 'unknown'), - array('LIN', 'Linux', 'Linux'))), - array('mMosaic/3.6.6 (X11;SunOS 5.8 sun4m)', array( - array('MC', 'NCSA Mosaic', 'Mosaic', '3.6', '3', '6', 'unknown'), - array('SOS', 'SunOS', 'SunOS'))), - - // Netscape Navigator (9.x) - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071015 Firefox/2.0.0.7 Navigator/9.0', array( - array('NS', 'Netscape', 'Netscape', '9.0', '9', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.5) Gecko/20070321 Netscape/9.0', array( - array('NS', 'Netscape', 'Netscape', '9.0', '9', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - - // Netscape (6.x - 8.x) - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.5) Gecko/20070321 Netscape/8.1.3', array( - array('NS', 'Netscape', 'Netscape', '8.1', '8', '1', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.2) Gecko/20040804 Netscape/7.2 (ax)', array( - array('NS', 'Netscape', 'Netscape', '7.2', '7', '2', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (X11; U; OSF1 alpha; en-US; rv:0.9.4.1) Gecko/20020517 Netscape6/6.2.3', array( - array('NS', 'Netscape', 'Netscape', '6.2', '6', '2', 'gecko'), - array('T64', 'Tru64', 'Tru64'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:0.9.2) Gecko/20010726 Netscape6/6.1', array( - array('NS', 'Netscape', 'Netscape', '6.1', '6', '1', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - - // Netscape Communicator (4.x) - array('Mozilla/4.76C-SGI [en] (X11; I; IRIX64 6.5 IP30)', array( - array('NS', 'Netscape', 'Netscape', '4.76', '4', '76', 'gecko'), - array('IRI', 'IRIX', 'IRIX'))), - array('Mozilla/4.72 [en] (X11; I; HP-UX B.11.00 9000/800)', array( - array('NS', 'Netscape', 'Netscape', '4.72', '4', '72', 'gecko'), - array('HPX', 'HP-UX', 'HP-UX'))), - array('Mozilla/4.41 (BEOS; U ;Nav)', array( - array('NS', 'Netscape', 'Netscape', '4.41', '4', '41', 'gecko'), - array('BEO', 'BeOS', 'BeOS'))), - array('Mozilla/4.0 (compatible; Windows NT 5.1; U; en)', array( - array('NS', 'Netscape', 'Netscape', '4.0', '4', '0', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Netscape Navigator (up to 3.x) - array('Mozilla/3.0 (X11; I; AIX 2)', array( - array('NS', 'Netscape', 'Netscape', '3.0', '3', '0', 'gecko'), - array('AIX', 'AIX', 'AIX'))), - array('Mozilla/2.02 [fr] (WinNT; I)', array( - array('NS', 'Netscape', 'Netscape', '2.02', '2', '02', 'gecko'), - array('WNT', 'Windows NT', 'Win NT'))), - - // NetFront NX - array('Mozilla/5.0 (Nintendo WiiU) AppleWebKit/534.52 (KHTML, like Gecko) NX/2.1.0.8.21 NintendoBrowser/1.0.0.7494.US', array( - array('NF', 'NetFront', 'NetFront', '2.1', '2', '1', 'webkit'), - array('WIU', 'Nintendo Wii U', 'Wii U'))), - array('Mozilla/5.0 (Nintendo 3DS; U; ; en) Version/1.7498.US', array( - array('NF', 'NetFront', 'NetFront', '1.7498', '1', '7498', 'webkit'), - array('3DS', 'Nintendo 3DS', '3DS'))), - array('Mozilla/5.0 (Playstation Vita 1.61) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2', array( - array('NF', 'NetFront', 'NetFront', '3.2', '3', '2', 'webkit'), - array('PSV', 'PlayStation Vita', 'PS Vita'))), - - // Kindle - array('Mozilla/4.0 (compatible; Linux 2.6.10) NetFront/3.3 Kindle/1.0 (screen 600x800)', array( - array('NF', 'NetFront', 'NetFront', '3.3', '3', '3', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - array('AND', 'Android', 'Android'))), - array('Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) Version/4.0 Kindle/3.0 (screen 600×800; rotate)', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.1.0-80) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true', array( - array('SF', 'Safari', 'Safari', '5.0', '5', '0', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - - // Omniweb - array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US) AppleWebKit/525.18 (KHTML, like Gecko, Safari/525.20) OmniWeb/v622.3.0.105198', array( - array('OW', 'OmniWeb', 'OmniWeb', '5.8', '5', '8', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/522+ (KHTML, like Gecko, Safari/522) OmniWeb/v613', array( - array('OW', 'OmniWeb', 'OmniWeb', '5.6', '5', '6', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/420+ (KHTML, like Gecko, Safari/420) OmniWeb/v607', array( - array('OW', 'OmniWeb', 'OmniWeb', '5.5', '5', '5', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/125.4 (KHTML, like Gecko, Safari) OmniWeb/v563.34', array( - array('OW', 'OmniWeb', 'OmniWeb', '5.1', '5', '1', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/85 (KHTML, like Gecko) OmniWeb/v558.36', array( - array('OW', 'OmniWeb', 'OmniWeb', '5.0', '5', '0', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/85 (KHTML, like Gecko) OmniWeb/v496', array( - array('OW', 'OmniWeb', 'OmniWeb', '4.5', '4', '5', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - - // Opera - array('Opera/9.63 (Windows NT 5.1; U; en) Presto/2.1.1', array( - array('OP', 'Opera', 'Opera', '9.63', '9', '63', 'opera'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Opera/9.30 (Nintendo Wii; U; ; 2047-7; en)', array( - array('OP', 'Opera', 'Opera', '9.30', '9', '30', 'opera'), - array('WII', 'Nintendo Wii', 'Wii'))), - array('Opera/9.64 (Windows ME; U; en) Presto/2.1.1', array( - array('OP', 'Opera', 'Opera', '9.64', '9', '64', 'opera'), - array('WME', 'Windows Me', 'Win Me'))), - array('Opera/9.80 (Windows NT 5.1; U; en) Presto/2.2.15 Version/10.00', array( - array('OP', 'Opera', 'Opera', '10.00', '10', '0', 'opera'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/4.0 (compatible; MSIE 6.0; Nitro) Opera 8.50 [en Mozilla/4.0 (compatible; MSIE 6.0; Nitro) Opera 8.50 [ja]', array( - array('OP', 'Opera', 'Opera', '8.50', '8', '50', 'opera'), - array('NDS', 'Nintendo DS', 'DS'))), - array('Opera/9.00 (Nintendo DS U; ; 1309-9; de)', array( - array('OP', 'Opera', 'Opera', '9.00', '9', '00', 'opera'), - array('NDS', 'Nintendo DS', 'DS'))), - array('Opera/9.50 (Nintendo DSi; Opera/507; U; en-US) ', array( - array('OP', 'Opera', 'Opera', '9.50', '9', '50', 'opera'), - array('DSI', 'Nintendo DSi', 'DSi'))), - - // PlayStation - array('Mozilla/5.0 (PLAYSTATION 3; 1.00)', array( - false, - array('PS3', 'PlayStation 3', 'PS3'))), - - // PSP - array('PSP (PlayStation Portable); 2.00', array( - false, - array('PSP', 'PlayStation Portable', 'PSP'))), - array('Mozilla/4.0 (PSP (PlayStation Portable); 2.00)', array( - false, - array('PSP', 'PlayStation Portable', 'PSP'))), - - // Rekonq 1.0+ - array('Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.34 (KHTML, like Gecko) rekonq/1.0 Safari/534.34', array( - array('RK', 'Rekonq', 'Rekonq', '1.0', '1', '0', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - - // Safari - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Version/3.1.2 Safari/525.21', array( - array('SF', 'Safari', 'Safari', '3.1', '3', '1', 'webkit'), - array('WXP', 'Windows XP', 'Win XP'))), - array('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', array( - array('SF', 'Safari', 'Safari', '3.1', '3', '1', 'webkit'), - array('IPH', 'iPhone', 'iPhone'))), - array('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', array( - array('SF', 'Safari', 'Safari', '3.0', '3', '0', 'webkit'), - array('IPD', 'iPod', 'iPod'))), - array('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', array( - array('SF', 'Safari', 'Safari', '3.1', '3', '1', 'webkit'), - array('IPD', 'iPod', 'iPod'))), - array('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', array( - array('SF', 'Safari', 'Safari', '3.1', '3', '1', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - array('IPA', 'iPad', 'iPad'))), - array('Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B367 Safari/531.21.10', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - array('IPA', 'iPad', 'iPad'))), - array('Mozilla/5.0 (iPod; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - array('IPD', 'iPod', 'iPod'))), - array('Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7', array( - array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'), - array('IPH', 'iPhone', 'iPhone'))), - array('Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US) AppleWebKit/533.19.4 (KHTML, like Gecko) ', array( - array('SF', 'Safari', 'Safari', '5.0', '5', '0', 'webkit'), - array('WVI', 'Windows Vista', 'Win Vista'))), - array('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.50 (KHTML, like Gecko) Version/5.1 Safari/534.50', array( - array('SF', 'Safari', 'Safari', '5.1', '5', '1', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Mobile/10B141', array( - array('SF', 'Safari', 'Safari', '6.0', '6', '0', 'webkit'), - array('IPH', 'iPhone', 'iPhone'))), - array('Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B141 Safari/8536.25', array( - array('SF', 'Safari', 'Safari', '6.0', '6', '0', 'webkit'), - array('IPH', 'iPhone', 'iPhone'))), - - // SeaMonkey (formerly Mozilla Suite and rebranded versions) - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8) Gecko/20071008 Iceape/1.1.5 (Ubuntu-1.1.5-1ubuntu0.7.10)', array( - array('SM', 'SeaMonkey', 'SeaMonkey', '1.1', '1', '1', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b4pre) Gecko/20090405 SeaMonkey/2.0b1pre', array( - array('SM', 'SeaMonkey', 'SeaMonkey', '2.0', '2', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9) Gecko', array( - // this pre-2.0 UA is missing the SeaMonkey/X.Y - array('SM', 'SeaMonkey', 'SeaMonkey', '1.9', '1', '9', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - array('Mozilla/5.0 (Windows; U; Windows NT 5.1; cs; rv:1.9) Gecko/2008052906', array( - // this pre-2.0 UA is missing the SeaMonkey/X.Y - array('SM', 'SeaMonkey', 'SeaMonkey', '1.9', '1', '9', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - - // Palm webOS - array('Mozilla/5.0 (webOS/1.0; U; en-us) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pre/1.0', array( - array('WO', 'Palm webOS', 'webOS', '1.0', '1', '0', 'webkit'), - array('WOS', 'Palm webOS', 'webOS'))), - array('Mozilla/5.0 (webOS/Palm webOS 1.2.9; U; en-US) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pixi/1.0', array( - array('WO', 'Palm webOS', 'webOS', '1.0', '1', '0', 'webkit'), - array('WOS', 'Palm webOS', 'webOS'))), - array('Mozilla/5.0 [en] (PalmOS; U; WebPro/3.5; Palm-Zi72)', array( - array('WP', 'WebPro', 'WebPro', '3.5', '3', '5', 'unknown'), - array('POS', 'Palm OS', 'Palm OS'))), - - // Palm WebPro - array('Mozilla/4.76 [en] (PalmOS; U; WebPro/3.0.1a; Palm-Cct1)', array( - array('WP', 'WebPro', 'WebPro', '3.0', '3', '0', 'unknown'), - array('POS', 'Palm OS', 'Palm OS'))), - array('Mozilla/4.76 [en] (PalmOS; U; WebPro/3.0; Palm-Arz1)', array( - array('WP', 'WebPro', 'WebPro', '3.0', '3', '0', 'unknown'), - array('POS', 'Palm OS', 'Palm OS'))), - - // Shiira 1.x - treat as Safari since it uses the installed version of Safari's WebKit - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/417.9 (KHTML, like Gecko, Safari) Shiira/1.1', array( - array('SF', 'Safari', 'Safari', '2.0', '2', '0', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; pl-pl) AppleWebKit/312.8 (KHTML, like Gecko) Shiira/1.2.1 Safari/125', array( - array('SF', 'Safari', 'Safari', '1.3', '1', '3', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - - // Shiira 2.x - ditto - array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_7; en-us) AppleWebKit/525.28.3 (KHTML, like Gecko) Shiira Safari/125', array( - array('SF', 'Safari', 'Safari', '3.2', '3', '2', 'webkit'), - array('MAC', 'Mac OS', 'Mac OS'))), - - // SymbianOS - array('Nokia3650/1.0 SymbianOS/6.1 Series60/1.2 Profile/MIDP-1.0 Configuration/CLDC-1.0', array( - false, - array('SYM', 'SymbianOS', 'SymbianOS'))), - array('Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0 Nokia5800d-1b/20.2.014; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413', array( - array('SF', 'Safari', 'Safari', '2.0', '2', '0', 'webkit'), - array('SYM', 'SymbianOS', 'SymbianOS'))), - array('Opera/9.80 (S60; SymbOS; Opera Mobi/499; U; en-GB) Presto/2.4.18 Version/10.00', array( - array('OP', 'Opera', 'Opera', '10.00', '10', '00', 'opera'), - array('SYM', 'SymbianOS', 'SymbianOS'))), - array('SonyEricssonG700/R100 Mozilla/4.0 (compatible; MSIE 6.0; Symbian OS; 958) Opera 8.65 [ru]', array( - array('OP', 'Opera', 'Opera', '8.65', '8', '65', 'opera'), - array('SYM', 'SymbianOS', 'SymbianOS'))), - - // Appcelerator Titanium - array('Appcelerator Titanium/1.8.0 (iPhone Simulator/4.3; iPhone OS; en_US;)', array( - array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'), - array('IPH', 'iPhone', 'iPhone'))), - - array('Appcelerator Titanium/1.8.0 (iPod touch/4.3.1; iPhone OS; de_DE;)', array( - array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'), - array('IPD', 'iPod', 'iPod'))), - - array('Appcelerator Titanium/1.8.0 (iPad/4.3.3; iPhone OS; de_DE;)', array( - array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'), - array('IPA', 'iPad', 'iPad'))), - - array('Dalvik/1.1.0 (Linux; U; Android 2.1; google_sdk Build/ERD79) Titanium/1.8.0', array( - array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'), - array('AND', 'Android', 'Android'))), - - array('Dalvik/1.4.0 (Linux; U; Android 2.3.3; GT-I9100 Build/GINGERBREAD) Titanium/1.8.0', array( - array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'), - array('AND', 'Android', 'Android'))), - - array('Mozilla/5.0 (X11; U; CrOS i686 9.10.0; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Chrome/4.0.253.0 Safari/532.5', array( - array('CH', 'Chrome', 'Chrome', '4.0', '4', '0', 'webkit'), - array('LIN', 'Linux', 'Linux'))), - - // Email Clients - - // Thunderbird - array('Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120713 Thunderbird/14.0 Lightning/1.6', array( - array('TB', 'Thunderbird', 'Thunderbird', '14.0', '14', '0', 'gecko'), - array('WXP', 'Windows XP', 'Win XP'))), - - array('Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121011 Thunderbird/16.0.1', array( - array('TB', 'Thunderbird', 'Thunderbird', '16.0', '16', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))), - - array('Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 Lightning/1.9', array( - array('TB', 'Thunderbird', 'Thunderbird', '17.0', '17', '0', 'gecko'), - array('WI7', 'Windows 7', 'Win 7'))), - - array('Mozilla/5.0 (X11; Linux i686 on x86_64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1', array( - array('TB', 'Thunderbird', 'Thunderbird', '15.0', '15', '0', 'gecko'), - array('LIN', 'Linux', 'Linux'))) - - ); - } - - /** - * Test getBrowser() - * - * @dataProvider getUserAgents - * @group Plugins - */ - public function testGetBrowser($userAgent, $expected) - { - $res = UserAgentParser::getBrowser($userAgent); - $family = false; - - if ($res === false) - $this->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/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index 2608bc13c1..6735a8d126 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -228,7 +228,8 @@ class Fixture extends \PHPUnit_Framework_Assert if ($this->configureComponents) { IPAnonymizer::deactivate(); - DoNotTrackHeaderChecker::deactivate(); + $dntChecker = new DoNotTrackHeaderChecker(); + $dntChecker->deactivate(); } if ($this->createSuperUser) { diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index 430db34ced..cf1c778e84 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -41,7 +41,7 @@ class Core_WidgetsListTest extends IntegrationTestCase '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 b2e9f39774..b539e111b8 100755 --- a/tests/PHPUnit/System/BlobReportLimitingTest.php +++ b/tests/PHPUnit/System/BlobReportLimitingTest.php @@ -37,8 +37,8 @@ class BlobReportLimitingTest extends SystemTestCase '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 fe91a25fb4..4a9e4d2ff7 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php @@ -109,7 +109,7 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa $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 82ce3d5e23..1122a59c90 100755 --- a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php +++ b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php @@ -33,7 +33,7 @@ class OneVisitorTwoVisitsWithCookieSupportTest extends SystemTestCase 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 0fba18234d..efdf021061 100755 --- a/tests/PHPUnit/System/RowEvolutionTest.php +++ b/tests/PHPUnit/System/RowEvolutionTest.php @@ -163,8 +163,8 @@ class RowEvolutionTest extends SystemTestCase '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 @@ class RowEvolutionTest extends SystemTestCase '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 9a6324b1bb..0ef089e70c 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 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> @@ -174,7 +173,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> @@ -271,7 +269,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> @@ -368,7 +365,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> @@ -465,7 +461,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>ie</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> @@ -562,7 +557,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> @@ -659,7 +653,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> @@ -756,7 +749,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemShortName>Android</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> @@ -853,7 +845,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> 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 17fe7bfe25..7bc0f5a098 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 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> @@ -301,7 +300,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>ie</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> @@ -411,7 +409,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> @@ -535,7 +532,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> @@ -648,7 +644,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> @@ -749,7 +744,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemShortName>BOT</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> @@ -856,7 +850,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>ie</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> @@ -947,7 +940,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> @@ -1054,7 +1046,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemShortName>Android</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> @@ -1155,7 +1146,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> 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 368e7d54fb..a7be13ef56 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 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Safari </browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> - <browserCode>SF</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -79,8 +71,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Safari</browser> + <browserName>Safari</browserName> + <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserCode>SF</browserCode> + <browserVersion /> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -204,14 +204,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -227,8 +219,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -329,14 +329,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -352,8 +344,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -468,14 +468,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -491,8 +483,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -593,14 +593,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -616,8 +608,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -749,14 +749,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -772,8 +764,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -874,14 +874,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -897,8 +889,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1013,14 +1013,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1036,8 +1028,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1138,14 +1138,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1161,8 +1153,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1294,14 +1294,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1317,8 +1309,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1419,14 +1419,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1442,8 +1434,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1558,14 +1558,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1581,8 +1573,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1697,14 +1697,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1720,8 +1712,16 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>1</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -1814,14 +1814,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1837,8 +1829,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1939,14 +1939,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1962,8 +1954,16 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>0</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -2095,14 +2095,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -2118,8 +2110,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -2251,14 +2251,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -2274,8 +2266,16 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>1</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -2368,14 +2368,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -2391,8 +2383,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -2493,14 +2493,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -2516,8 +2508,16 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>0</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -2632,14 +2632,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -2655,8 +2647,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -2771,14 +2771,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -2794,8 +2786,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -2910,14 +2910,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -2933,8 +2925,16 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3041,14 +3041,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -3064,8 +3056,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -3166,14 +3166,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -3189,8 +3181,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -3291,14 +3291,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -3314,8 +3306,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3416,14 +3416,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -3439,8 +3431,16 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3541,14 +3541,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -3564,8 +3556,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -3697,14 +3697,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -3720,8 +3712,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -3853,14 +3853,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -3876,8 +3868,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4009,14 +4009,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -4032,8 +4024,16 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -4157,14 +4157,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -4180,8 +4172,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4282,14 +4282,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -4305,8 +4297,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4407,14 +4407,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -4430,8 +4422,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4532,14 +4532,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -4555,8 +4547,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -4657,14 +4657,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -4680,8 +4672,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> 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 469e4d6471..cabb71c501 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 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -71,14 +79,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -148,8 +148,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -173,14 +181,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -318,8 +318,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -343,14 +351,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -420,8 +420,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -445,14 +453,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -757,8 +757,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -782,14 +790,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -859,8 +859,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -884,14 +892,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -957,8 +957,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -982,14 +990,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1123,8 +1123,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1148,14 +1156,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1221,8 +1221,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1246,14 +1254,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1554,8 +1554,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1579,14 +1587,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 469e4d6471..cabb71c501 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 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -71,14 +79,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -148,8 +148,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -173,14 +181,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -318,8 +318,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -343,14 +351,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -420,8 +420,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -445,14 +453,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -757,8 +757,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -782,14 +790,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -859,8 +859,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -884,14 +892,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -957,8 +957,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -982,14 +990,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1123,8 +1123,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1148,14 +1156,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1221,8 +1221,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1246,14 +1254,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1554,8 +1554,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1579,14 +1587,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 77308fd9e7..8723d1a05f 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 @@ </row> <row> <label>Chrome</label> - <nb_visits>10</nb_visits> - <nb_actions>13</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>8</bounce_count> - <nb_visits_converted>9</nb_visits_converted> - <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> - <label>Unknown</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> + <label>Epiphany</label> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <bounce_count>5</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/UserSettings/images/browsers/EP.gif</logo> + </row> + <row> + <label>RockMelt</label> + <nb_visits>5</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>305</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -60,4 +72,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> + <row> + <label>Unknown</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + </row> </result>
\ 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 0000000000..8723d1a05f --- /dev/null +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Internet Explorer</label> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>6</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + </row> + <row> + <label>Chrome</label> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> + <label>Epiphany</label> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/EP.gif</logo> + </row> + <row> + <label>RockMelt</label> + <nb_visits>5</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>305</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> + <label>Android Browser</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/AN.gif</logo> + </row> + <row> + <label>Firefox</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + </row> + <row> + <label>Unknown</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + </row> +</result>
\ 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 276e820253..0a059a62d6 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 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> + <row> + <label>Tablet</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> + </row> + <row> + <label>Feature phone</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + </row> + <row> + <label>Console</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/console.gif</logo> + </row> + <row> + <label>Tv</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tv.png</logo> + </row> + <row> + <label>Car browser</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> + </row> + <row> + <label>Smart display</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> + <label>Camera</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/camera.png</logo> + </row> </result>
\ 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 c53a94ae90..23cef7562d 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 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 8.1</operatingSystem> + <operatingSystemCode>W81</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 33.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>33.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -87,14 +95,6 @@ <location>Raleigh, North Carolina, United States</location> <latitude>35.771999</latitude> <longitude>-78.639000</longitude> - <operatingSystem>Windows 8.1</operatingSystem> - <operatingSystemCode>W81</operatingSystemCode> - <operatingSystemShortName>W81</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon> - <browserName>Chrome 33.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>33.0</browserVersion> <screenType>wide</screenType> <resolution>1366x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -200,8 +200,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 8.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>8.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -225,14 +233,6 @@ <location>Lake Forest, California, United States</location> <latitude>33.645000</latitude> <longitude>-117.679001</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Internet Explorer 8.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>8.0</browserVersion> <screenType>wide</screenType> <resolution>1536x864</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -313,8 +313,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 34.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>34.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -338,14 +346,6 @@ <location>Germany</location> <latitude>51</latitude> <longitude>9</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Chrome 34.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>34.0</browserVersion> <screenType>wide</screenType> <resolution>1920x1200</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -459,8 +459,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Safari 7.0</browser> + <browserName>Safari</browserName> + <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserCode>SF</browserCode> + <browserVersion>7.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -484,14 +492,6 @@ <location>United States</location> <latitude>38</latitude> <longitude>-97</longitude> - <operatingSystem>Mac OS</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> - <browserName>Safari 7.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> - <browserCode>SF</browserCode> - <browserVersion>7.0</browserVersion> <screenType>wide</screenType> <resolution>2880x1800</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -574,8 +574,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 33.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>33.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -599,14 +607,6 @@ <location>Maaseik, Limburg, Belgium</location> <latitude>51.099998</latitude> <longitude>5.800000</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Chrome 33.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>33.0</browserVersion> <screenType>wide</screenType> <resolution>1920x1080</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -700,8 +700,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 33.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>33.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -725,14 +733,6 @@ <location>San Francisco, California, United States</location> <latitude>37.792000</latitude> <longitude>-122.408997</longitude> - <operatingSystem>Mac OS</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> - <browserName>Chrome 33.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>33.0</browserVersion> <screenType>wide</screenType> <resolution>1360x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -833,8 +833,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Safari 7.0</browser> + <browserName>Safari</browserName> + <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserCode>SF</browserCode> + <browserVersion>7.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -858,14 +866,6 @@ <location>Nihon'odori, Kanagawa, Japan</location> <latitude>35.450001</latitude> <longitude>139.649994</longitude> - <operatingSystem>Mac OS</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> - <browserName>Safari 7.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> - <browserCode>SF</browserCode> - <browserVersion>7.0</browserVersion> <screenType>wide</screenType> <resolution>2560x1440</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -955,8 +955,16 @@ </row> </customVariables> <deviceType>Unknown</deviceType> + <operatingSystem>Android</operatingSystem> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 27.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>27.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -980,14 +988,6 @@ <location>Weilerswist, Nordrhein-Westfalen, Germany</location> <latitude>50.766998</latitude> <longitude>6.833000</longitude> - <operatingSystem>Android</operatingSystem> - <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemShortName>Android</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> - <browserName>Firefox 27.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>27.0</browserVersion> <screenType>mobile</screenType> <resolution>360x640</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/mobile.gif</screenTypeIcon> @@ -1069,8 +1069,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 27.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>27.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1094,14 +1102,6 @@ <location>Mainz, Rheinland-Pfalz, Germany</location> <latitude>50</latitude> <longitude>8.271000</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Firefox 27.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>27.0</browserVersion> <screenType>wide</screenType> <resolution>2560x1440</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -1238,8 +1238,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 8</operatingSystem> + <operatingSystemCode>WI8</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 27.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>27.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1263,14 +1271,6 @@ <location>Moscow, Moscow City, Russian Federation</location> <latitude>55.751999</latitude> <longitude>37.616001</longitude> - <operatingSystem>Windows 8</operatingSystem> - <operatingSystemCode>WI8</operatingSystemCode> - <operatingSystemShortName>Win 8</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon> - <browserName>Firefox 27.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>27.0</browserVersion> <screenType>wide</screenType> <resolution>1920x1080</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -1356,8 +1356,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 33.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>33.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1381,14 +1389,6 @@ <location>Esentepe, Rize, Turkey</location> <latitude>40.979000</latitude> <longitude>40.415001</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Chrome 33.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>33.0</browserVersion> <screenType>wide</screenType> <resolution>1366x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -1482,8 +1482,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 33.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>33.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1507,14 +1515,6 @@ <location>Maaseik, Limburg, Belgium</location> <latitude>51.099998</latitude> <longitude>5.800000</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Chrome 33.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>33.0</browserVersion> <screenType>wide</screenType> <resolution>1920x1080</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -1766,8 +1766,16 @@ <customVariables> </customVariables> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1791,14 +1799,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -1882,8 +1882,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 6.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>6.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -1907,14 +1915,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Internet Explorer 6.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>6.0</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1999,8 +1999,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Chrome 11.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>11.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -2024,14 +2032,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Chrome 11.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>11.0</browserVersion> <screenType>wide</screenType> <resolution>1280x800</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> @@ -2132,8 +2132,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -2157,14 +2165,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Mac OS</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> - <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>RM</browserCode> - <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -2257,8 +2257,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -2282,14 +2290,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Mac OS</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> - <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>RM</browserCode> - <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -2389,8 +2389,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -2414,14 +2422,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Mac OS</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> - <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>RM</browserCode> - <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -2497,8 +2497,16 @@ </row> </customVariables> <deviceType>Unknown</deviceType> + <operatingSystem>Bot</operatingSystem> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -2522,14 +2530,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <operatingSystem>Bot</operatingSystem> - <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemShortName>BOT</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -2605,8 +2605,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 9.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>9.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -2630,14 +2638,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Internet Explorer 9.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -2703,8 +2703,16 @@ </row> </customVariables> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -2728,14 +2736,6 @@ <location>Australia</location> <latitude>-27</latitude> <longitude>133</longitude> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -2811,8 +2811,16 @@ </row> </customVariables> <deviceType>Smartphone</deviceType> + <operatingSystem>Android</operatingSystem> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Android Browser</browser> + <browserName>Android Browser</browserName> + <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserCode>AN</browserCode> + <browserVersion /> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -2836,14 +2844,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Android</operatingSystem> - <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemShortName>Android</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> - <browserName>Android Browser </browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> - <browserCode>AN</browserCode> - <browserVersion /> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -2919,8 +2919,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -2944,14 +2952,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Mac OS</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> - <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>RM</browserCode> - <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3023,8 +3023,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Chrome 20.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>20.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3048,14 +3056,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Chrome 20.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>20.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3127,8 +3127,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Epiphany 2.30</browser> + <browserName>Epiphany</browserName> + <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserCode>EP</browserCode> + <browserVersion>2.30</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3152,14 +3160,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> - <browserName>Epiphany 2.30</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> - <browserCode>EP</browserCode> - <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3231,8 +3231,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Chrome 20.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>20.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3256,14 +3264,6 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Chrome 20.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>20.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3335,8 +3335,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Epiphany 2.30</browser> + <browserName>Epiphany</browserName> + <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserCode>EP</browserCode> + <browserVersion>2.30</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3360,14 +3368,6 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <operatingSystem>Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> - <browserName>Epiphany 2.30</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> - <browserCode>EP</browserCode> - <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3439,8 +3439,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 9.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>9.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3464,14 +3472,6 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Internet Explorer 9.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3543,8 +3543,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Epiphany 2.30</browser> + <browserName>Epiphany</browserName> + <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserCode>EP</browserCode> + <browserVersion>2.30</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3568,14 +3576,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> - <browserName>Epiphany 2.30</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> - <browserCode>EP</browserCode> - <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3647,8 +3647,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 9.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>9.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3672,14 +3680,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Internet Explorer 9.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3751,8 +3751,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 9.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>9.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3776,14 +3784,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Internet Explorer 9.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3855,8 +3855,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Chrome 19.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>19.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3880,14 +3888,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Mac OS</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> - <browserName>Chrome 19.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>19.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -3959,8 +3959,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 6.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>6.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -3984,14 +3992,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> - <browserName>Firefox 6.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>6.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -4063,8 +4063,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Chrome 19.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>19.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -4088,14 +4096,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <operatingSystem>Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> - <browserName>Chrome 19.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> - <browserCode>CH</browserCode> - <browserVersion>19.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -4167,8 +4167,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Epiphany 2.30</browser> + <browserName>Epiphany</browserName> + <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserCode>EP</browserCode> + <browserVersion>2.30</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -4192,14 +4200,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <operatingSystem>Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> - <browserName>Epiphany 2.30</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> - <browserCode>EP</browserCode> - <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -4271,8 +4271,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 9.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>9.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -4296,14 +4304,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <operatingSystem>Windows 7</operatingSystem> - <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemShortName>Win 7</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> - <browserName>Internet Explorer 9.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -4375,8 +4375,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 6.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>6.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -4400,14 +4408,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> - <browserName>Firefox 6.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>6.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -4479,8 +4479,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Epiphany 2.30</browser> + <browserName>Epiphany</browserName> + <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserCode>EP</browserCode> + <browserVersion>2.30</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -4504,14 +4512,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Linux</operatingSystem> - <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemShortName>Linux</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> - <browserName>Epiphany 2.30</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> - <browserCode>EP</browserCode> - <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -4583,8 +4583,16 @@ <customVariables> </customVariables> <deviceType>Smartphone</deviceType> + <operatingSystem>Android</operatingSystem> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Android Browser</browser> + <browserName>Android Browser</browserName> + <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserCode>AN</browserCode> + <browserVersion /> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -4608,14 +4616,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Android</operatingSystem> - <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemShortName>Android</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> - <browserName>Android Browser </browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> - <browserCode>AN</browserCode> - <browserVersion /> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -4687,8 +4687,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -4712,14 +4720,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <operatingSystem>Mac OS</operatingSystem> - <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemShortName>Mac OS</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> - <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>RM</browserCode> - <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> 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 4be2e497a2..80d06470a3 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 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/EP.gif</logo> - <shortLabel>Epiphany 2.30</shortLabel> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +23,6 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - <shortLabel>Internet Explorer 9.0</shortLabel> </row> <row> <label>RockMelt 0.9</label> @@ -36,11 +34,10 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> - <shortLabel>RockMelt 0.9</shortLabel> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> - <label>Android Browser </label> + <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -50,7 +47,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/AN.gif</logo> - <shortLabel>Android Browser </shortLabel> </row> <row> <label>Chrome 19.0</label> @@ -63,7 +59,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - <shortLabel>Chrome 19.0</shortLabel> </row> <row> <label>Chrome 20.0</label> @@ -76,7 +71,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - <shortLabel>Chrome 20.0</shortLabel> </row> <row> <label>Firefox 6.0</label> @@ -89,7 +83,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> - <shortLabel>Firefox 6.0</shortLabel> </row> <row> <label>Unknown</label> @@ -102,7 +95,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> - <shortLabel>Unknown</shortLabel> </row> <row> <label>Chrome 11.0</label> @@ -115,7 +107,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - <shortLabel>Chrome 11.0</shortLabel> </row> <row> <label>Internet Explorer 6.0</label> @@ -128,6 +119,5 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - <shortLabel>Internet Explorer 6.0</shortLabel> </row> </result>
\ 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 99d9c637a2..8723d1a05f 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 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Epiphany</label> + <label>Internet Explorer</label> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>6</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + </row> + <row> + <label>Chrome</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> <max_actions>1</max_actions> @@ -10,19 +22,19 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> - <label>Internet Explorer</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> + <label>Epiphany</label> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <bounce_count>5</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/UserSettings/images/browsers/EP.gif</logo> </row> <row> <label>RockMelt</label> @@ -34,10 +46,10 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> - <label>Android Browser </label> + <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -49,18 +61,6 @@ <logo>plugins/UserSettings/images/browsers/AN.gif</logo> </row> <row> - <label>Chrome</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - </row> - <row> <label>Firefox</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> 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 99f2f8d770..446d719865 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 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux / Epiphany / unknown</label> + <label>GNU/Linux / Epiphany / unknown</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> <max_actions>1</max_actions> @@ -12,7 +12,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Mac OS / RockMelt / unknown</label> + <label>Mac / RockMelt / unknown</label> <nb_visits>5</nb_visits> <nb_actions>8</nb_actions> <max_actions>3</max_actions> @@ -45,7 +45,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Linux / Firefox / unknown</label> + <label>GNU/Linux / Firefox / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -78,7 +78,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Linux / Chrome / unknown</label> + <label>GNU/Linux / Chrome / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -89,7 +89,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Mac OS / Chrome / unknown</label> + <label>Mac / Chrome / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> 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 27bfc099ba..0a059a62d6 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 @@ <nb_visits_converted>22</nb_visits_converted> <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> + <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> - <label>Mobile</label> + <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/screens/mobile.gif</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> - <label>Unknown</label> + <label>Smartphone</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + </row> + <row> + <label>Tablet</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> + </row> + <row> + <label>Feature phone</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + </row> + <row> + <label>Console</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/console.gif</logo> + </row> + <row> + <label>Tv</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tv.png</logo> + </row> + <row> + <label>Car browser</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> + </row> + <row> + <label>Smart display</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> + <label>Camera</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> </result>
\ 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 cb47530ed2..62d091d83d 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 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux</label> + <label>GNU/Linux</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> <max_actions>1</max_actions> @@ -22,7 +22,7 @@ <nb_visits_converted>9</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> <label>Mac</label> @@ -49,14 +49,26 @@ <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> - <label>Unknown</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Bot</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> + <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/UNK.gif</logo> + </row> + <row> + <label>Unknown</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> 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 1ac05e3dda..7cad47e0a1 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 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux</label> + <label>GNU/Linux</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> <max_actions>1</max_actions> @@ -11,7 +11,6 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/LIN.gif</logo> - <shortLabel>Linux</shortLabel> </row> <row> <label>Windows 7</label> @@ -24,23 +23,21 @@ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WI7.gif</logo> - <shortLabel>Win 7</shortLabel> </row> <row> - <label>Mac OS</label> - <nb_visits>6</nb_visits> - <nb_actions>9</nb_actions> + <label>Mac 10.6</label> + <nb_visits>5</nb_visits> + <nb_actions>8</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <bounce_count>3</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> - <shortLabel>Mac OS</shortLabel> </row> <row> - <label>Android</label> + <label>Android 2.3</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -50,7 +47,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.gif</logo> - <shortLabel>Android</shortLabel> </row> <row> <label>Windows XP</label> @@ -63,7 +59,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WXP.gif</logo> - <shortLabel>Win XP</shortLabel> </row> <row> <label>Bot</label> @@ -76,7 +71,18 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> - <shortLabel>BOT</shortLabel> + </row> + <row> + <label>Mac 10.8</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> <label>Unknown</label> @@ -89,6 +95,5 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> - <shortLabel>Unknown</shortLabel> </row> </result>
\ 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 0000000000..2048a44e64 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Unknown</label> + <nb_visits>25</nb_visits> + <nb_actions>28</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>305</sum_visit_length> + <bounce_count>23</bounce_count> + <nb_visits_converted>23</nb_visits_converted> + <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/screens/unknown.gif</logo> + </row> + <row> + <label>Normal</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/screens/normal.gif</logo> + </row> + <row> + <label>Wide</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/UserSettings/images/screens/wide.gif</logo> + </row> +</result>
\ 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 4ca0871373..5f234ed9c5 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 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> @@ -219,7 +218,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> @@ -343,7 +341,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> @@ -467,7 +464,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> @@ -622,7 +618,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> @@ -777,7 +772,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> @@ -924,7 +918,6 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> 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 b20e40002c..8e034ec059 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 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -89,8 +81,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -220,14 +220,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -243,8 +235,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -343,14 +343,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -366,8 +358,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -497,14 +497,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -520,8 +512,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -620,14 +620,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -643,8 +635,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -774,14 +774,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -797,8 +789,16 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -889,14 +889,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -912,8 +904,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> 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 d8d596799c..c6ff4bfdff 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 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Safari </browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> - <browserCode>SF</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -79,8 +71,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Safari</browser> + <browserName>Safari</browserName> + <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserCode>SF</browserCode> + <browserVersion /> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -204,14 +204,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -227,8 +219,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -329,14 +329,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -352,8 +344,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -468,14 +468,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -491,8 +483,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -593,14 +593,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -616,8 +608,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -749,14 +749,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -772,8 +764,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -874,14 +874,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -897,8 +889,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> 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 668f5347a8..9c5c5cc080 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 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -120,8 +112,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -222,14 +222,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -245,8 +237,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -378,14 +378,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -401,8 +393,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -517,14 +517,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -540,8 +532,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -642,14 +642,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -665,8 +657,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -767,14 +767,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -790,8 +782,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -882,14 +882,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Safari </browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> - <browserCode>SF</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -905,8 +897,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Safari</browser> + <browserName>Safari</browserName> + <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserCode>SF</browserCode> + <browserVersion /> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> 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 d8d596799c..c6ff4bfdff 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 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Safari </browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> - <browserCode>SF</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -79,8 +71,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Safari</browser> + <browserName>Safari</browserName> + <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserCode>SF</browserCode> + <browserVersion /> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -204,14 +204,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -227,8 +219,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -329,14 +329,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -352,8 +344,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -468,14 +468,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -491,8 +483,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -593,14 +593,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -616,8 +608,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -749,14 +749,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -772,8 +764,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -874,14 +874,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -897,8 +889,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> 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 e38cadcaad..6bc6d4b5aa 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 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Safari </browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> - <browserCode>SF</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -79,8 +71,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Safari</browser> + <browserName>Safari</browserName> + <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserCode>SF</browserCode> + <browserVersion /> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -204,14 +204,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -227,8 +219,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -329,14 +329,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -352,8 +344,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -468,14 +468,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -491,8 +483,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -593,14 +593,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -616,8 +608,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -749,14 +749,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -772,8 +764,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -874,14 +874,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -897,8 +889,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1013,14 +1013,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1036,8 +1028,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1138,14 +1138,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1161,8 +1153,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1294,14 +1294,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -1317,8 +1309,16 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> 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 0000000000..84860eba92 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Firefox</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>7</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + </row> +</result>
\ 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 347eac465f..d1aae4191e 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 @@ <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> + <row> + <label>Smartphone</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + </row> + <row> + <label>Tablet</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> + </row> + <row> + <label>Feature phone</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + </row> + <row> + <label>Console</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/console.gif</logo> + </row> + <row> + <label>Tv</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tv.png</logo> + </row> + <row> + <label>Car browser</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> + </row> + <row> + <label>Smart display</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> + <label>Camera</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/camera.png</logo> + </row> </result>
\ 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 8210497910..6f656fdf68 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 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> - <shortLabel>Firefox 3.6</shortLabel> </row> </result>
\ 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 fe566ebe7c..d1aae4191e 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 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> + <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> - <label>Mobile</label> + <label>Smartphone</label> <nb_visits>0</nb_visits> - <logo>plugins/UserSettings/images/screens/mobile.gif</logo> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + </row> + <row> + <label>Tablet</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> + </row> + <row> + <label>Feature phone</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + </row> + <row> + <label>Console</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/console.gif</logo> + </row> + <row> + <label>Tv</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tv.png</logo> + </row> + <row> + <label>Car browser</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> + </row> + <row> + <label>Smart display</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> + <label>Camera</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> </result>
\ 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 5c3a3311e3..379e429ee3 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 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> </result>
\ 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 32ec517b60..4e417535ae 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 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/UserSettings/images/os/WXP.gif</logo> - <shortLabel>Win XP</shortLabel> </row> </result>
\ 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 0000000000..f1acb38cb9 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Normal</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>7</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/UserSettings/images/screens/normal.gif</logo> + </row> +</result>
\ 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 0000000000..8ff05bc8ff --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Unknown</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> + </row> +</result>
\ 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 0000000000..5bcb7b02d6 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Gecko (Firefox)</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + </row> +</result>
\ 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 0000000000..968ffc7d90 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Firefox</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + </row> +</result>
\ 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 0000000000..b8deec1d68 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Firefox 3.6</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + </row> +</result>
\ 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 0000000000..968ffc7d90 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Firefox</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + </row> +</result>
\ 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 0000000000..302503d00e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Unknown</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + </row> +</result>
\ 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 0000000000..04cebec91e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Windows</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/UserSettings/images/os/WI7.gif</logo> + </row> +</result>
\ 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 0000000000..785661d383 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Windows XP</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/UserSettings/images/os/WXP.gif</logo> + </row> +</result>
\ 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 0000000000..782397bace --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Desktop</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> + </row> + <row> + <label>Smartphone</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + </row> + <row> + <label>Tablet</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> + </row> + <row> + <label>Feature phone</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + </row> + <row> + <label>Console</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/console.gif</logo> + </row> + <row> + <label>Tv</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tv.png</logo> + </row> + <row> + <label>Car browser</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> + </row> + <row> + <label>Smart display</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> + <label>Camera</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/camera.png</logo> + </row> +</result>
\ 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 dd5f7b87e6..849af36fed 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 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -77,14 +85,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -240,8 +240,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -265,14 +273,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 6451b5cbbb..b8deec1d68 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 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> - <shortLabel>Firefox 3.6</shortLabel> </row> </result>
\ 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 1456e8c033..782397bace 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 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> + <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> - <label>Mobile</label> + <label>Smartphone</label> <nb_visits>0</nb_visits> - <logo>plugins/UserSettings/images/screens/mobile.gif</logo> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + </row> + <row> + <label>Tablet</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> + </row> + <row> + <label>Feature phone</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + </row> + <row> + <label>Console</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/console.gif</logo> + </row> + <row> + <label>Tv</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/tv.png</logo> + </row> + <row> + <label>Car browser</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> + </row> + <row> + <label>Smart display</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> + <label>Camera</label> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/camera.png</logo> </row> </result>
\ 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 63f67f61ca..04cebec91e 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 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> </result>
\ 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 e041ea2409..785661d383 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 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/UserSettings/images/os/WXP.gif</logo> - <shortLabel>Win XP</shortLabel> </row> </result>
\ 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 0000000000..1aa955af66 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Normal</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>8</max_actions> + <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <logo>plugins/UserSettings/images/screens/normal.gif</logo> + </row> +</result>
\ 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 b536206779..8173b17251 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 @@ <customVariables> </customVariables> <deviceType>Inconnu</deviceType> + <operatingSystem>Bot</operatingSystem> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> + <browser>Inconnu</browser> + <browserName>Inconnu</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>0</events> <provider>Inconnu</provider> <providerName>Inconnu</providerName> @@ -66,14 +74,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Bot</operatingSystem> - <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemShortName>BOT</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Inconnu</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -148,8 +148,16 @@ <customVariables> </customVariables> <deviceType>Inconnu</deviceType> + <operatingSystem>Bot</operatingSystem> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> + <browser>Inconnu</browser> + <browserName>Inconnu</browserName> + <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> <events>0</events> <provider>Inconnu</provider> <providerName>Inconnu</providerName> @@ -173,14 +181,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Bot</operatingSystem> - <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemShortName>BOT</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserName>Inconnu</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 e38d88d7f5..dfaee585ef 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 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows Vista</operatingSystem> + <operatingSystemCode>WVI</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 7.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>7.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -71,14 +79,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Windows Vista</operatingSystem> - <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemShortName>Win Vista</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> - <browserName>Internet Explorer 7.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>7.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -139,8 +139,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows Vista</operatingSystem> + <operatingSystemCode>WVI</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 7.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>7.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -164,14 +172,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Windows Vista</operatingSystem> - <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemShortName>Win Vista</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> - <browserName>Internet Explorer 7.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>7.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> @@ -232,8 +232,16 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows Vista</operatingSystem> + <operatingSystemCode>WVI</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 7.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>7.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -257,14 +265,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <operatingSystem>Windows Vista</operatingSystem> - <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemShortName>Win Vista</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> - <browserName>Internet Explorer 7.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> - <browserCode>IE</browserCode> - <browserVersion>7.0</browserVersion> <screenType>unknown</screenType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> 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 86026aff84..9ee74c6530 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 @@ <metrics> <nb_visits_0> <name>Desktop (Visits)</name> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> + <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> <min>0</min> <max>1</max> </nb_visits_0> @@ -51,7 +51,7 @@ <name>Mobile (Visits)</name> </nb_visits_1> </metrics> - <dimension>Mobile vs Desktop</dimension> + <dimension>Device type</dimension> <columns> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_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 c828bbb0e6..e0516433ba 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 @@ <customVariables> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -66,14 +74,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 97677526fc..b2a1214433 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.6,00:13:21,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.6,00:13:21,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 0d52d55825..560e7ebe33 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 @@ -50,46 +50,21 @@ </a> </li> <li> - <a href="#UserSettings_getBrowser" style="text-decoration:none; color: rgb(68,68,68);"> - Visitor Browser - </a> - </li> - <li> - <a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);"> - Browser Version - </a> - </li> - <li> <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);"> Browser Plugins </a> </li> <li> - <a href="#UserSettings_getWideScreen" style="text-decoration:none; color: rgb(68,68,68);"> + <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> Normal / Widescreen </a> </li> <li> - <a href="#UserSettings_getOS" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> </li> <li> - <a href="#UserSettings_getOSFamily" style="text-decoration:none; color: rgb(68,68,68);"> - Operating system family - </a> - </li> - <li> - <a href="#UserSettings_getMobileVsDesktop" style="text-decoration:none; color: rgb(68,68,68);"> - Mobile vs Desktop - </a> - </li> - <li> <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);"> Browser language </a> @@ -285,28 +260,28 @@ </a> </li> <li> - <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> - Device model + <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);"> + Visitor Browser </a> </li> <li> - <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System families + <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Browser Version </a> </li> <li> - <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System versions + <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> + Device model </a> </li> <li> - <a href="#DevicesDetection_getBrowserFamilies" style="text-decoration:none; color: rgb(68,68,68);"> - Browser families + <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> + Operating System families </a> </li> <li> - <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Browser versions + <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Operating System versions </a> </li> <li> @@ -1988,242 +1963,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getBrowser" style="color: rgb(126,115,99); font-size: 11pt;"> - Visitor Browser -</h2> - - <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAMZUlEQVR4nO3da2xb12HA8UNLfjQqLdvS5C6x68KMnRrFYDvJmgqznQccr13QwUU6JE2BrsO2fMgGrF8CpEMxFHt02IAtabp3VhSouz4WZMjQb3HiLnZSLagdx+kCdUpZO36oih+JbcmerdfdB6o0Q8nUkUjqitTv98EgLy+p4xjR/fOce8lMkiQBAGA6i9IeAADQGEQDABBFNAAAUUQDABBFNAAAUUQDABBFNAAAUURDrFwuN+XGKbdXfhYANCLRUK18Ph//qIYAoHG1pj2A+eIrXz9YtuWPf/f20rv5fD6Xy5VGQNldAGhuomHCmycujoyMFO8uXrz41KlTN91007RPnFwSxdtlnVF4qLhD4dHSnav7GwBAfYmGay5fvly83d7e3t/fHxMNpSoERJiqIcxbANBAnNMwA6VzAzHH+BlFgGIAYJ4TDbVUqIrIsx1ntDMApM7yxDU33HBD9S9SmDAopEDkVETkzgCQLtEw4VP35PpPnZp2t+IKRcyVlvFTDsE5DQDMe6Jhwm/uWBfCuipfZEYHfpUAQGMRDbU0+SrKKS+guN7OczNIAJidTJIkaY8BAGgArp4AAKKIBgAgimgAAKKIBgAgimgAAKKIBgAgimgAAKIsiA938hlKMG/5aFSYJ2KOlc0fDWW/kvyGgvnDt7zCPBF5rLQ8AaRDwUPDEQ1AChQDNKLmX54A5hvFAPNN5HcoigYgBaW/njQEpC7ynAbRAMw15yZDg3JOAwAQpflnGiLXaQBgwYo8VmaSJJmrIQEADczyBAAQRTQAAFFEAwAQRTQAAFFEAwAQRTQAAFEWUDQcOnQo7SEA1/T39/f396c9CuCaaQ+UCygaAIBqiAYAIIpoAACiiAYAIErzf2FVqQOvnkh7CMCEd999N4SwcmAs7YEAE44eu3TbbZV2WFjR8Pieg2kPAQDmr8/dX+lRyxMAQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQJTZREMul6v5OACAee5aNExOAXEAAAtWrkRhS2u6AwIA5qFcLpfP58vuTr88UeiLstaY/OjkfcoKpfS5Zbcr/wgAYD6ImmkozY2y433p9rJ9ygplRj+i9LkAwHwQdSLklIfwskP7tIf5fD5fnFEoux3zdABgzhSO1EWFw/Qsz2kwGQAATWyW5zRMqThVAAAsENeioawDpp1LmEU3FJ5SXI8wXQEADeQ9yxOlHRBzOK9w4C9LCnEAAA1kyuN4JkmS9IY0pw4dOvQX3zqe9igAYP76j8c/VeFR3z0BAEQRDQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAERpnX6XJvLkYzvTHgIw4fTp0yGErq6utAcCTHjjjTcq77CwomHN6mzaQwAmLBobDCHc6P9KmDfePrm48g6WJwCAKKIBAIgiGgCAKKIBAIgiGgCAKKIBAIgiGgCAKKIBAIiysD7c6cCrJ9IeQt1tv3Vt2kMAoDktrGh4fM/BtIdQd7esW9XV0Zb2KABoQpYnAIAoogEAiCIaAIAoogEAiCIaAIAoogEAiCIaAIAoogEAiCIaAIAoogEAiCIaAIAojffdE72HD65Zv6Fw+9vf73n2wrLd7VdCCEvPHQ4h3LHj3jXrN2Tb29McIgA0owaLhsELF17Zv7dw+5X9e5eGsLtj67MXloUQHgjhwU3PDfY888z+++///CO6AQBqa06XJ3K5XC6Xq/JFdq49lj36VPboUzvXHits2d1+ZXf7lasdW7/buyt7c3bn2mPf/n5PtWMFAN5rZjMNZYf8fD6fy+Xy+XzkcyP3rODkz97MhtD5/r4QwtmhjdlzL/3Ts/+z8tO/P/Fwa/fOoWOd7+/rfO1rIXy8yp/VBAr/XtX/ZweAMIvlibIj0BwfkF7Zv/fBTX2DPx0MIYQPhDu2rHntyn3hrYshhLvXLf/BWxefH/3Qg5v6dnzg7bkc1fxUqLTqp3YAoKDa5YnCMan0z+L2otIdivtMuUPpa15PoRiS/jP/9fXnP/21oeL2H7x1MYRwZN+LIYT9A6ur/Hs1ARMMANRWzU6ELF19KFuJKL7ljdmh8irGkX0v/savnCnd8m/L/vmlI2P/eMsjhbvbNrfU6m8EAJSacTSUTgOUHt3n7H3tYN/57MYVmRt/6ddvDLv6Xxr8yfmweVvPge+99qsPbPnR98L2uRkFACw41Z7TcD2zWEqPOa3y4S//ec+XHtgVRpP+MyGE5w63Hmrt7jmwolAMj24/f8eWNSH0DXZsm+lPBwAqq9fnNMxi4iFmeWLN+g3/0rqhu68nu3FFCGHX1tFw+M2wPHT/7z988dd6l29bH0LfF/9+6cNfvreq0QMAk8zFhzvV5GLLgmx7+4d/6ws933kzHA7dbWdDCLu2rtgVeguPDv50cP/A6s33bCt+ZCQAUCt1iYayK/0mF8PkHYphMe1kw0Of7H7m3O8d2fdiuBRCCN19Zwvbey51Hvpx5+Z7tvk4yILSC1WCiykAqNrMomHKw3+F7RW2VLhb+fCWbW+///OPXO3YeujpJ3oudvzd5dC9/FzPxY7u5ec233PnHTvuVQwFKgGA2mqw754oyLa3P/TJ7pMf6Xw4hP1vnA0hPPyRzhCCr6oCgPppyGgIIWTb2zdtvT2EsGlr2kMBgIVhTr+wCgBoXKIBAIgiGgCAKKIBAIgiGgCAKKIBAIgiGgCAKKIBAIgiGgCAKKIBAIgiGgCAKI363ROz8+RjO9MeQt11dbSlPQQAmtPCioY1q7NpDwEAGpXlCQAgimgAAKKIBgAgimgAAKKIBgAgimgAAKKIBgAgimgAAKIsrA93OvDqibSHUHfbb12b9hAAaE4LKxoe33Mw7SHU3S3rVvkkaQDqwfIEABBFNAAAUUQDABBFNAAAUUQDABBFNAAAUUQDABBFNAAAUUQDABBFNAAAUUQDABClkb97Ynw8XLkSBgeT8SSzPBuWLQstLWmPCQCaVg2iIZfLFW/n8/nqX3B6SZKcOBl+2DPS+5Mrl4bGx8aWtrQsvfnmzN13ZTbcHBaZPgGA2qs2GnK5XGkolN2tiyRJXv/x+L8/PXb+/PGWzLLPfCbJZE7v2bP2hRdaXn655Xd+u+Wuu3QDANRcVdEwORHy+Xxh4qF4I/xi+mHyhETh6cUXKdv/epIzZ0a/8Y3MmbNnft7f9bd/s3zLlhDC4PLlAw999sZsdviv/nrpunWLSn7WQlb8t0h7IAA0g3qd01DaE5MPXaWhUNxeuv91j3NJMvbyD8d6exeNjA6HsLSrq7B5SUfH+KqV48dPjI2Njjz7n0u/8EfObyg2WdoDAaBJ1GsaP/Ld7YzfBI+Ojr7w/Hh//9jPT2WWLL5WBi0tyYoVl4YGhy5fvrD3uWRsbIbjbUImGACorbm7emLat7xR74mTZLS3d+zc2SRJxtauLW7OLFo0smTJ2dHR4fHxzPHjnUmSqXK4AMB7zV00VH7jO3k5Y0pJCJdCuDwyMh7C1feWwdXR0fMjI8NJsiSEkCQ1GTMAUFTV8sTkJfPIqydmv9Ceyfzfxo2nR0YGhocvDQ0l4+MT28fGhoaGTg4PnxoeHtmwwdUTAFBz1c40lHXDlLMF17t6osLrXE+mtfV9n/jEwDe/eTWEG44fHx8ZKWwfGxkZOHq0f3h4PAm3796daW3kD60CgHmpBgfXKacWpsyCyluiTtzLZFZu3754+46fPb+3ZWDg1tdff98HPxhCGOzre6uv71II6z760fX33Zcx0wAAtdZ478iXrFx5+19+5e2BgVOvH9n36KPbBgYyLS3//dWvXsmEm2758MefeKLtF9dhLnDFmRuf1gBATdQlGup9fOrauvWuf31q75f+5MK+F175gz/MZDLvjI+vvPPuO//sT3/5Yx+r649uICoBgNpqvJmGgg/ddtvnnnn6wjvvXDl7NiTJ0s7O9lWrlrW1ZTKutQSAumjUaMhkMsva2pa1tYWST2sAAOrHCYMAQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQJRG/e6J2XnysZ1pD6Huujra0h4CAM1pYUXDmtXZtIcAAI3K8gQAEEU0AABRRAMAEEU0AABRMkmSpD0GAKABmGkAAKKIBgAgimgAAKKIBgAgimgAAKKIBgAgimgAAKKIBgAgyv8DgC4nKhDzackAAAAASUVORK5CYII=" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Browser - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> - - Firefox </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> - - Opera </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 100% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> -<h2 id="UserSettings_getBrowserVersion" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser Version -</h2> - - <img alt="" - src="data:image/png;base64,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" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Browser version - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> - - Firefox 3.6 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> - - Opera 9.63 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 100% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;"> Browser Plugins </h2> @@ -2385,7 +2124,7 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getWideScreen" style="color: rgb(126,115,99); font-size: 11pt;"> +<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> Normal / Widescreen </h2> @@ -2478,99 +2217,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getOS" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System -</h2> - - <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAIw0lEQVR4nO3dz4ucdx3A8W/sTjekSXYhFXU3kNAHsTmUpUQTxRJNDsEgCDmI7bkHPQrqwRL0Ur3Gf6AHQTEXAx4kKGKgWKToUkKQtIbBYLvTgAQ3aRKz2bTjYdInT5+ZPPvZ2dl5ntl9vQ5hfjzz7LdQ5vue7/M8Mzu63W4CAFjLp+oeAAAwGUQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ2bJcuygQ8OfLz6VQDQBKJh3NrtdvxZDQFAc0zVPYBJ9fPX/l565JWXv1i82263sywrRkDpLgBMFtEwpKvv3lpdXc3vtlqtpaWl+fn5NV/YXxL57VJn9J7KN+g9W9x4Y/8FALA+omF4d+/ezW/PzMx0Op1INBRVBEQa1BDWLQCokXMaNlFxbSAyx68rAhQDAGMmGurUq4rg2Y7r2hgARs7hieHt2rVr4zvpLRj0UiC4FBHcGABGSzQM6fSJrLO0tOZm+RGKyJWW8SWH5JwGAMZONAzpW8cOpHRggztZ18SvEgCol2ioU/9VlAMvoHjcxuMZJAD07Oh2u3WPAQCYAK6eAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAjx5U4D+A4lqJ2vQIUxi8x9oqGs9FblnQvGz6+5wpgF5z6HJ4BmUerQWKIBaBDFAE3m8ATQFIoB6hL8TUTRADRI8W1LQ8DYBM9pEA1AUzgHGRrOOQ0AQIiVhrLgcR0A2DKCc9+Obrc7riEBABPM4QkAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGh5rcXGx7iHAdtTpdDqdTt2jgO1ozYlPNAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACETNU9gEb79e//UfcQYNu5fft2Smn37v/WPRDYdq5fXz58uGoD0VDlt3/6Z91DAIDx+UHlsw5PAAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgJBxREOWZWP4KwDApho+GvpTQBwAwJaRFfQemap3QABAA2VZ1m63S3dHf3ii1yOlNul/tn+bUtEUX1u6Xf0nAIDNsCkrDcU8Kc33xcdL25SKZl1/ovhaAGAzbMqJkAOn8NLUvuY032638xWF0u3IywGAofVm3lxv2h3TOQ0WAwBggozpnIaB8qUCAGBCDR8NpQ5Ycy1hiG7ovSQ/HmG5AgBqtKHDE8UOiEznFRN/KSnEAQDUaOC8vKPb7dY3pEZbXFz82a/+XfcoAGB8zp89XfGs354AAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAiZqnsAjfbSqUN1DwG2nVu3Pkgp7d27p+6BwLaz1OlUbyAaqnz75LN1DwG2nU6nk1Kam5ureyCw7Swu3qnewOEJACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQvzKZZXVBx/VPQSG1JoSxAAjJhqqfOdHv6t7CAzp/NnTdQ8BYKvxaQwACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgJCpugcwJqsrtz/84D9P7Pl0Sql3ozU9ldLOuscFABNj9NGQZVm73R75bjdideX20h+/u3zlxuyhfctXbty9ce3i/fkvvfSLY8/s/rge0urKg9b07rpHCgDN9SgaSpN99d1xGjiSLMuK21SP7dby1c5fFudeOFx88G+/+f6lrzy9cPDM4QMPUkr7PnNopKOmKYr/qzQtZwEmywQcnuglQu/tvhgQwzXN3RvX8ts3p997/f3vvf5+Sin99Bt/aE2PbtA0Q3PaF2ALeBQN/XNz8W6+WemDfv8GxS0H7jx98r174A5H6l5Kade+gyml5Ss38kf/9/V7vRszK/tvTr836j9KI0gEgBEaZqWhNOWnvg/9adAnvOAOB8qrYog5YHXlwbu//HEqFMPF+/P5s71imFnZv97dAsB2M0w0DPfpLV9sGPjvEDuM+8nbz2ZHX3w4jLfPHZ25XNpg4eCZTR0ATeDYBMAGDYiG/L21dExh8wy3kBA8we3ipX9dnz3V2/SNd26m2VNvLqejM5fz1YWZlf3Hntnt0oktbOhlKgCKPhENAz/0j2cxoP88x/4xpMefCFnhzLnOV78wc+r5py68daf3yNGZy8efXNp1rZVSml242vlz687Xln1jw1ZlgQFgVAZ8I2TxHXa977bVbVFcuhjbMkbJZ5cv9G7MLlydXbiaUpp74fBTT8yOeRiMh2IAGKERXHJZuvYhXwqOXx9ffelEaXVhuGngwlt33njnZn537sRqfnvPkR/ufPpz690hk2JdX+kBQIVyNPS/peYLAwM3KD1bsWX/g8EDDWv+xWqvvjj36LVvnkspHX9yKfhaJp1EABihCfhypw06eeS5lFJK944vPLj4/MuXrr168a/z37zU6h2bSPe/vHf2836EAgDWtPWj4WM7W9Pp5JHnji+89uGJh79c1eO6CQCI2D7R8FBr2tWVADCMAVdPAAD0Ew0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAyVfcAGu382dN1DwEAmsJKAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQnZ0u926xwAATAArDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACPk/szH61ZrdgZQAAAAASUVORK5CYII=" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Operating system - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows XP </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> @@ -2683,217 +2329,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getOSFamily" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating system family -</h2> - - <img alt="" - src="data:image/png;base64,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" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Operating system family - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> -<h2 id="UserSettings_getMobileVsDesktop" style="color: rgb(126,115,99); font-size: 11pt;"> - Mobile vs Desktop -</h2> - - <img alt="" - src="data:image/png;base64,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" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Mobile vs Desktop - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Desktop </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/mobile.gif'> - - Mobile </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;"> Browser language </h2> @@ -5336,12 +4771,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> - Device model +<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;"> + Visitor Browser </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700"/> @@ -5351,7 +4786,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Device model + Browser </th> <th style="padding: 6px 0;"> Visits @@ -5376,21 +4811,73 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown </td> + <img src='plugins/UserSettings/images/browsers/UNK.gif'> + + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10 + 8 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 43 + 40 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.3 + 5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:12:37 + 00:15:01 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10% + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + + <tr style="background-color: rgb(249,250,250)"> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + <img src='plugins/UserSettings/images/browsers/FF.gif'> + + Firefox </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:06:01 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + <img src='plugins/UserSettings/images/browsers/OP.gif'> + + Opera </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:00:00 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 100% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -5402,12 +4889,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System families +<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Browser Version </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700"/> @@ -5417,7 +4904,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Operating System families + Browser version </th> <th style="padding: 6px 0;"> Visits @@ -5442,7 +4929,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/UserSettings/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5467,23 +4954,48 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/UserSettings/images/browsers/FF.gif'> - Windows </td> + Firefox 3.6 </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 + 2 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 + 00:06:01 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 + 0% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% + 0% + </td> + </tr> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + <img src='plugins/UserSettings/images/browsers/OP.gif'> + + Opera 9.63 </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:00:00 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 100% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -5495,12 +5007,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System versions +<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> + Device model </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700"/> @@ -5510,7 +5022,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Operating System versions + Device model </th> <th style="padding: 6px 0;"> Visits @@ -5535,48 +5047,21 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows XP </td> + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 + 10 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 + 43 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 + 4.3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 + 00:12:37 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% + 10% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -5588,12 +5073,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser families +<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> + Operating System families </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700"/> @@ -5603,7 +5088,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser families + Operating system family </th> <th style="padding: 6px 0;"> Visits @@ -5628,7 +5113,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/UserSettings/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5653,48 +5138,23 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/UserSettings/images/os/WI7.gif'> - Firefox </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> + Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> - - Opera </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 1.5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:03:01 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 100% + 50% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -5706,12 +5166,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser versions +<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Operating System versions </h2> <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAM5UlEQVR4nO3dX4xc1X0H8DNegx2c9dp4Y1JjZyMPdmJFFRjTOFZt/ljGTYpSOSIVhEppq7Y8pFTNCxKpoipqm1St1EKI+pdGkeKENkVUVLxhIMVAtqheDKTEdMkEsPF2wTbYXpuand29fRgyO8yuZ3873t27M/v5PFgzd86992evvOc755x7byHLsgQAMJVFeRcAALQGoQEACBEaAIAQoQEACBEaAIAQoQEACBEaAIAQoWFmFIvFSTdOur3xXgAwPwkNs6tUKsU/lSEAmM8W511Aa/jGtw/Ubfmj37mm9m2pVCoWi7UhoO4tALQ6oSHk5SOny+Vy9e1FF1109OjRyy+/fModJyaJ6uu6nFH5qNqg8mlt4wv7GwDAhRIaot55553q666uroGBgUhoqNUgQKTJMoRxCwDmFWsaZkzt2ECkj59WCJAYAMid0DB3KqkiuNpxWo0BYA6Ynoi65JJLLvwglQGDShQIDkUEGwPAbBMaQj63szhw9OiUzaozFJErLeNDDsmaBgDmAaEh5Neu7Ump5wIPMq2OX0oAYL4RGubOxKsoJ72A4nyN56ZIADifQpZledcAALQAV08AACFCAwAQIjQAACFCAwAQIjQAACFCAwAQIjQAACFu7pTcQwnmD/dChbxEesOFHhrqfkP5hQU58lhXyEuwNzQ9AcwLIjvMf0IDkD+JAVrCQp+eAHInMUDugk9JFBqA/NX+tpIhYO4F1zQIDUDOLEaGVmFNAwAQstBHGoKzOADQxoK9YSHLsrkqCQBoYaYnAIAQoQEACBEaAIAQoQEACBEaAIAQoQEACBEa3tPX15d3CbCgDQwMDAwM5F0FLGhTdoVCAwAQIjQAACFCAwAQIjQAACEL/YFVtZ589kjeJcDC9fbbb6eUVg6O5l0ILFyvvHp2y5ZGDYSGcXfvPZB3CQCQpy/e3OhT0xMAQIjQAACECA0AQIjQAACECA0AQIjQAACECA0AQIjQAACECA0AQIjQAACECA0AQIjQAACECA0AQMjMh4ZisTjjxwQAchcNDROjgHAAAG2sWKOyZXG+BQEA81CxWCyVSnVvL3R6opI+6pLIxE8ntqnLL7X71r1ufAoAYG7MwEhDbRip6+9rt9e1qcsv0zpF7b4AwNyYgYWQk3bhdV37lN18qVSqjijUvY7sDgDMoEpfXFXpiGdlTYPBAABoabOypmFS1aECAKBtRENDXQ6YciyhidxQ2aU6H2G4AgDmlWlMT9TmgEh33qDjr4sUwgEAzCuT9tSFLMvyK2ke6evr+/r3DuddBQDk6d/u/lyDTz17AgAIERoAgBChAQAIERoAgBChAQAIERoAgBChAQAIERoAgBChAQAIERoAgBChAQAIERoAgBChAQAImcajsdvevXftyrsEWLjefPPNlNLq1avzLgQWrhdffLFxA6Fh3NrLOvMuARauRaNDKaU1/htCft54/aLGDUxPAAAhQgMAECI0AAAhQgMAECI0AAAhQgMAECI0AAAhQgMAEOLmTuOefPZI3iXMrh1Xr8u7BABamNAw7u69B/IuYXaVy2M7t/bkXQUArcr0BAAQIjQAACFCAwAQIjQAACFCAwAQIjQAACFCAwAQIjQAACFCAwAQIjQAACFCAwAQ0obPnjh08MDa9Rsqr+9/uPehU0v3dJ1LKS05cTCltPXaG9eu39DZ1ZVniQDQgtotNAydOvXM/n2V18/s37ckpT2rNj90amlK6ZaUbt30yFDvgw/uv/nm3/qS3AAA0zLD0xPFYrFYLM7sMadr17pXO1+5r/OV+3ate7WyZU/XuT1d595dtflfDu3uvKJz17pX73+4N9caAaD11I801HX5pVKpWCyWSqXIseItz7d77XkbNGhwltd/9nJnSt0f7E8pHT+zsfPEU3//0H+v/Pzvvffx4m27zrza/cH+7ue+ldKnmy61DVT+MS/k5wXAQjPJ9ERdRzI3/Upd4JiYP4KJ5Jn9+27d1D/006GUUvpw2nrV2ufO3ZReO51SuqFn+Q9fO/3oyEdv3dR/7YffmOG/QEup/GPmPiYEQGuZenqi0rXU/lndXlXboNpm0ga1x6zVOBBMawyjkhiygWP/8e1HP/+tM9XtP3ztdErp+cefSCntH7wseLS2ZIABgCZMYyFkbc896cBAsEFzsxhTTl5UPP/4E7/6i8dqt3x/6T889fzo333sS5W326/smO6pAYA0aWg4X/c8B19PG6xaaDx5UWuo/2TnxhWFNR/6lTVp98BTQy+dTFdu733yB8/90i1X/dcP0o7ZKBwA2t/UaxrOp4kZ8SmHGc43UBF3+9f+rPert+xOI9nAsZTSIwcX9y3e1vvkikpiuHPHya1XrU2pf2jV9iYODgALWfP3aWhuiqHp6Ymgtes3/OPiDdv6ezs3rkgp7d48kg6+nJanbf/zt1/55UPLt69Pqf8rf7Pk9q/dOEsFAEC7mpmbO114Dpj0CE0ctrOr6+O//uXef345HUzblh1PKe3evGJ3OlT5dOinQ/sHL7ty5/bqLSMBgKAmQ0PdBXuTLkGoa1BNAJMONjQ+4JSnq3XbZ7c9eOJ3n3/8iXQ2pZS29R+vbO8929334+4rd253O8jaK1ySiykAiClkWZZ3DTNv6NSp+x/ufemBe3pPr0opbVt+ovf0qm3LT1y587qt1964afM1E3fp6+v7+vcOz3mlc+qOW6/eubUn7ypgcgMDAymlNWvW5F0ILFx9fX1btmxp0KDdnj1R0dnVddtnt73+ie7bU9r/4vGU0u2f6E4peVQVADStPUNDSqmzq6syorBpc96lAEBbmOEHVgEA7UpoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIKRtnz3RhHvv2pV3CbNr7WWdeZcAQAsTGsbpUwGgAdMTAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhLi507gnnz2Sdwmza8fV6/IuAYAWJjSMu3vvgbxLmF3l8tjOrT15VwFAqzI9AQCECA0AQIjQAACECA0AQIjQAACECA0AQIjQAACECA0AQIjQAACECA0AQIjQAACEtPWzJ8bG0rlzaWgoG8sKyzvT0qWpoyPvmgCgVdWHhmKxWH1dKpVm6axTnqXaoPrp9ArLsuzI6+lHveVDL507e2ZsdHRJR8eSK64o3HB9YcMVaZHxFQCYtveFhmKxWNsf172dKVOeZcotUxSWZdkLPx771wdGT5483FFY+oUvZIXCm3v3rnvssY6nn+747d/suP56uQEApms8NEzsiUulUuX7ffVF+vm3/Inf+yu7Vw8ycaggaNJAMK2DZMeOjXznO4Vjx4/978Dqv/6r5VddlVIaWr588LbfWNPZOfwXf7mkp2dRTf0LU/Unm3chALSM0JqG2o58YmdTGxSq22vbN5Ebqq+n3atl2ejTPxo9dGhReWQ4pSWrV1c2X7xq1dilK8cOHxkdHSk/9O9LvvyHC3l9QzXh5V0IAK0kFBqCPfdMfW0930xEaPRiZGTksUfHBgaykXKhp2c8GXR0ZCtWnP3JT0aybNG+Rz70B3cUFnBoMMAAQBOavHpiyi+pDRo0/R03NHqRZSOHDo2eOJ5l2ei6ddXNhUWLyhdffHxkZHhsrHD4cHeWFZqoAAAWsCZDQ+OvqpMOD5xv95kdJM9SOpvSO+XyWErvvj8ZvDsycrJcHs6yi1NKWTaDJwWAhWD8IoKJAwDB5QgX0utPGS+mfYpC4f82bnyzXB4cHj575kw2Nvbe9tHRM2fOvD48fHR4uLxhg6snAGC63jfSUJcbGtwjofFaxSknIBqsTpi0hvMVNlFh8eIPfOYzg9/97rspXXL48Fi5XNk+Wi4PvvLKwPDwWJau2bOnsLit72oFALOgvu+ctD+OXAM58XLNBmdtfJZgDZMrFFbu2HHRjmt/9ui+jsHBq1944QMf+UhKaai//7X+/rMp9Xzyk+tvuqlgpAEApqkNv3BfvHLlNX/+jTcGB4++8Pzjd965fXCw0NHxn9/85rlCuvxjH//0Pfcs+/l1mAtWddjG3RoAiJs6NLRij7J68+br/+m+fV/941OPP/bM799RKBTeGhtbed0N1/3pn/zCpz6Vd3X5a8WfKQC5a8ORhoqPbtnyxQcfOPXWW+eOH09ZtqS7u+vSS5cuW1YouNYSAJrRtqGhUCgsXbZs6bJlqeZuDQBA06wHBABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABC2vbZE024965deZcwu9Ze1pl3CQC0MKFhnD4VABowPQEAhAgNAECI0AAAhAgNAEBIIcuyvGsAAFqAkQYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABC/h80GKujltrXjQAAAABJRU5ErkJggg==" + src="data:image/png;base64,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" height="200" width="700"/> @@ -5721,7 +5181,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser versions + Operating System versions </th> <th style="padding: 6px 0;"> Visits @@ -5746,7 +5206,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/UserSettings/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5771,48 +5231,23 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/UserSettings/images/os/WXP.gif'> - Firefox 3.6 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> + Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> - - Opera 9.63 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 1.5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:03:01 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 100% + 50% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 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 f81da6d67a..d4bfc0bb5d 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 @@ -50,46 +50,21 @@ </a> </li> <li> - <a href="#UserSettings_getBrowser" style="text-decoration:none; color: rgb(68,68,68);"> - Visitor Browser - </a> - </li> - <li> - <a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);"> - Browser Version - </a> - </li> - <li> <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);"> Browser Plugins </a> </li> <li> - <a href="#UserSettings_getWideScreen" style="text-decoration:none; color: rgb(68,68,68);"> + <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> Normal / Widescreen </a> </li> <li> - <a href="#UserSettings_getOS" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> </li> <li> - <a href="#UserSettings_getOSFamily" style="text-decoration:none; color: rgb(68,68,68);"> - Operating system family - </a> - </li> - <li> - <a href="#UserSettings_getMobileVsDesktop" style="text-decoration:none; color: rgb(68,68,68);"> - Mobile vs Desktop - </a> - </li> - <li> <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);"> Browser language </a> @@ -310,28 +285,28 @@ </a> </li> <li> - <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> - Device model + <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);"> + Visitor Browser </a> </li> <li> - <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System families + <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Browser Version </a> </li> <li> - <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System versions + <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> + Device model </a> </li> <li> - <a href="#DevicesDetection_getBrowserFamilies" style="text-decoration:none; color: rgb(68,68,68);"> - Browser families + <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> + Operating System families </a> </li> <li> - <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Browser versions + <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Operating System versions </a> </li> <li> @@ -1977,230 +1952,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getBrowser" style="color: rgb(126,115,99); font-size: 11pt;"> - Visitor Browser -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Browser - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> - - Firefox </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> - - Opera </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 100% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> -<h2 id="UserSettings_getBrowserVersion" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser Version -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Browser version - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> - - Firefox 3.6 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> - - Opera 9.63 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 100% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;"> Browser Plugins </h2> @@ -2356,7 +2107,7 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getWideScreen" style="color: rgb(126,115,99); font-size: 11pt;"> +<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> Normal / Widescreen </h2> @@ -2443,93 +2194,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getOS" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Operating system - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows XP </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> @@ -2636,205 +2300,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getOSFamily" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating system family -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Operating system family - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> -<h2 id="UserSettings_getMobileVsDesktop" style="color: rgb(126,115,99); font-size: 11pt;"> - Mobile vs Desktop -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Mobile vs Desktop - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Desktop </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/mobile.gif'> - - Mobile </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;"> Browser language </h2> @@ -5198,8 +4663,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> - Device model +<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;"> + Visitor Browser </h2> @@ -5207,7 +4672,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Device model + Browser </th> <th style="padding: 6px 0;"> Visits @@ -5232,21 +4697,73 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown </td> + <img src='plugins/UserSettings/images/browsers/UNK.gif'> + + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10 + 8 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 43 + 40 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.3 + 5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:12:37 + 00:15:01 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10% + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + + <tr style="background-color: rgb(249,250,250)"> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + <img src='plugins/UserSettings/images/browsers/FF.gif'> + + Firefox </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:06:01 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + <img src='plugins/UserSettings/images/browsers/OP.gif'> + + Opera </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:00:00 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 100% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -5258,8 +4775,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System families +<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Browser Version </h2> @@ -5267,7 +4784,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Operating System families + Browser version </th> <th style="padding: 6px 0;"> Visits @@ -5292,7 +4809,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/UserSettings/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5317,23 +4834,48 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/UserSettings/images/browsers/FF.gif'> - Windows </td> + Firefox 3.6 </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 + 2 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 + 00:06:01 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 + 0% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% + 0% + </td> + </tr> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + <img src='plugins/UserSettings/images/browsers/OP.gif'> + + Opera 9.63 </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:00:00 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 100% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -5345,8 +4887,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System versions +<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> + Device model </h2> @@ -5354,7 +4896,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Operating System versions + Device model </th> <th style="padding: 6px 0;"> Visits @@ -5379,48 +4921,21 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> - - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows XP </td> + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 + 10 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3 + 43 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1.5 + 4.3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:03:01 + 00:12:37 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 50% + 10% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -5432,8 +4947,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser families +<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> + Operating System families </h2> @@ -5441,7 +4956,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser families + Operating system family </th> <th style="padding: 6px 0;"> Visits @@ -5466,7 +4981,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/UserSettings/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5491,48 +5006,23 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/UserSettings/images/os/WI7.gif'> - Firefox </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> + Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> - - Opera </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 1.5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:03:01 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 100% + 50% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -5544,8 +5034,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser versions +<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Operating System versions </h2> @@ -5553,7 +5043,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser versions + Operating System versions </th> <th style="padding: 6px 0;"> Visits @@ -5578,7 +5068,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/UserSettings/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5603,48 +5093,23 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/UserSettings/images/os/WXP.gif'> - Firefox 3.6 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> + Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> - - Opera 9.63 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 1.5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:03:01 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 100% + 50% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 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 Binary files differindex 9c54f6ea2f..28c0b57395 100644 --- 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 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 a55590bfb6..901b065d9d 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -215,63 +215,6 @@ </row> <row> <category>Visitor Settings</category> - <name>Visitor Browser</name> - <module>UserSettings</module> - <action>getBrowser</action> - <dimension>Browser</dimension> - <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - </metrics> - <metricsDocumentation> - <nb_visits>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.</nb_visits> - <nb_uniq_visitors>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.</nb_uniq_visitors> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>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').</nb_users> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowser&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowser&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getBrowser</uniqueId> - </row> - <row> - <category>Visitor Settings</category> - <name>Browser Version</name> - <module>UserSettings</module> - <action>getBrowserVersion</action> - <dimension>Browser version</dimension> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - </metrics> - <metricsDocumentation> - <nb_visits>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.</nb_visits> - <nb_uniq_visitors>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.</nb_uniq_visitors> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>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').</nb_users> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowserVersion&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowserVersion&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getBrowserVersion</uniqueId> - </row> - <row> - <category>Visitor Settings</category> <name>Browser Plugins</name> <module>UserSettings</module> <action>getPlugin</action> @@ -294,7 +237,7 @@ <category>Visitor Settings</category> <name>Normal / Widescreen</name> <module>UserSettings</module> - <action>getWideScreen</action> + <action>getScreenType</action> <dimension>Type of screen</dimension> <metrics> <nb_visits>Visits</nb_visits> @@ -314,37 +257,9 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getWideScreen&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getWideScreen&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getWideScreen</uniqueId> - </row> - <row> - <category>Visitor Settings</category> - <name>Operating System</name> - <module>UserSettings</module> - <action>getOS</action> - <dimension>Operating system</dimension> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - </metrics> - <metricsDocumentation> - <nb_visits>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.</nb_visits> - <nb_uniq_visitors>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.</nb_uniq_visitors> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>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').</nb_users> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getOS&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getOS&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getOS</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>UserSettings_getScreenType</uniqueId> </row> <row> <category>Visitor Settings</category> @@ -377,62 +292,6 @@ </row> <row> <category>Visitor Settings</category> - <name>Operating system family</name> - <module>UserSettings</module> - <action>getOSFamily</action> - <dimension>Operating system family</dimension> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - </metrics> - <metricsDocumentation> - <nb_visits>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.</nb_visits> - <nb_uniq_visitors>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.</nb_uniq_visitors> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>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').</nb_users> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getOSFamily&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getOSFamily&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getOSFamily</uniqueId> - </row> - <row> - <category>Visitor Settings</category> - <name>Mobile vs Desktop</name> - <module>UserSettings</module> - <action>getMobileVsDesktop</action> - <dimension>Mobile vs Desktop</dimension> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - </metrics> - <metricsDocumentation> - <nb_visits>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.</nb_visits> - <nb_uniq_visitors>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.</nb_uniq_visitors> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>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').</nb_users> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <constantRowsCount>1</constantRowsCount> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getMobileVsDesktop&period=day&date=2009-01-04</imageGraphUrl> - <uniqueId>UserSettings_getMobileVsDesktop</uniqueId> - </row> - <row> - <category>Visitor Settings</category> <name>Browser language</name> <module>UserSettings</module> <action>getLanguage</action> @@ -1973,10 +1832,11 @@ </row> <row> <category>Visitor Devices</category> - <name>Device brand</name> + <name>Visitor Browser</name> <module>DevicesDetection</module> - <action>getBrand</action> - <dimension>Device brand</dimension> + <action>getBrowsers</action> + <dimension>Browser</dimension> + <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1995,16 +1855,16 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getBrand</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getBrowsers</uniqueId> </row> <row> <category>Visitor Devices</category> - <name>Device model</name> + <name>Device brand</name> <module>DevicesDetection</module> - <action>getModel</action> - <dimension>Device model</dimension> + <action>getBrand</action> + <dimension>Device brand</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -2023,16 +1883,16 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getModel</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getBrand</uniqueId> </row> <row> <category>Visitor Devices</category> - <name>Operating System families</name> + <name>Device model</name> <module>DevicesDetection</module> - <action>getOsFamilies</action> - <dimension>Operating System families</dimension> + <action>getModel</action> + <dimension>Device model</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -2051,16 +1911,16 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getOsFamilies</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getModel</uniqueId> </row> <row> <category>Visitor Devices</category> - <name>Operating System versions</name> + <name>Browser Version</name> <module>DevicesDetection</module> - <action>getOsVersions</action> - <dimension>Operating System versions</dimension> + <action>getBrowserVersions</action> + <dimension>Browser version</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -2079,16 +1939,16 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getOsVersions</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getBrowserVersions</uniqueId> </row> <row> <category>Visitor Devices</category> - <name>Browser families</name> + <name>Operating System families</name> <module>DevicesDetection</module> - <action>getBrowserFamilies</action> - <dimension>Browser families</dimension> + <action>getOsFamilies</action> + <dimension>Operating system family</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -2107,16 +1967,16 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserFamilies&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserFamilies&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getBrowserFamilies</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsFamilies&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getOsFamilies</uniqueId> </row> <row> <category>Visitor Devices</category> - <name>Browser versions</name> + <name>Operating System versions</name> <module>DevicesDetection</module> - <action>getBrowserVersions</action> - <dimension>Browser versions</dimension> + <action>getOsVersions</action> + <dimension>Operating System versions</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -2135,9 +1995,9 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getBrowserVersions</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getOsVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getOsVersions</uniqueId> </row> <row> <category>Visitor Devices</category> diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 672bc648cc..5bec541cf6 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv 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 62f736ac83..a6103ff862 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 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -104,14 +112,6 @@ <location>Poland</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -290,8 +290,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -315,14 +323,6 @@ <location>Poland</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 0029166a94..de1db7a777 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 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -180,14 +188,6 @@ <location>Poland</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -485,8 +485,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -510,14 +518,6 @@ <location>Poland</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> @@ -701,8 +701,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -726,14 +734,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>normal</screenType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> 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 ff003cfbf1..a600e41eb7 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 f91034a651..7861e2ab4e 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 @@ -50,46 +50,21 @@ </a> </li> <li> - <a href="#UserSettings_getBrowser" style="text-decoration:none; color: rgb(68,68,68);"> - Visitor Browser - </a> - </li> - <li> - <a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);"> - Browser Version - </a> - </li> - <li> <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);"> Browser Plugins </a> </li> <li> - <a href="#UserSettings_getWideScreen" style="text-decoration:none; color: rgb(68,68,68);"> + <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> Normal / Widescreen </a> </li> <li> - <a href="#UserSettings_getOS" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> </li> <li> - <a href="#UserSettings_getOSFamily" style="text-decoration:none; color: rgb(68,68,68);"> - Operating system family - </a> - </li> - <li> - <a href="#UserSettings_getMobileVsDesktop" style="text-decoration:none; color: rgb(68,68,68);"> - Mobile vs Desktop - </a> - </li> - <li> <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);"> Browser language </a> @@ -345,28 +320,28 @@ </a> </li> <li> - <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> - Device model + <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);"> + Visitor Browser </a> </li> <li> - <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System families + <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Browser Version </a> </li> <li> - <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System versions + <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> + Device model </a> </li> <li> - <a href="#DevicesDetection_getBrowserFamilies" style="text-decoration:none; color: rgb(68,68,68);"> - Browser families + <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> + Operating System families </a> </li> <li> - <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Browser versions + <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Operating System versions </a> </li> <li> @@ -2025,142 +2000,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getBrowser" style="color: rgb(126,115,99); font-size: 11pt;"> - Visitor Browser -</h2> - - <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAIY0lEQVR4nO3db4jUeR3A8Y+5opjrKG4YunLh4JUcoVuKLf4JRC2KiwsvlKPioDLyQRTRg6IHPYjoYdD1j+hhV0cI0tETFc09YZFuUamwVreU0+EuXdQdb+vQmh6M7Y17u7Mfd9f97c6+Xg9kf7/57ex3R8bf2+/3NzMLarVaAABM5F1FDwAAmBtEAwCQIhoAgBTRAACkiAYAIEU0AAApogEASBENERHlcnnMnWPub/5dANCqREMzAwMD+Vs1BACtra3oAcyE7//y1VF7vv2FLY2bAwMD5XK5MQJGbQIA8yIaLr02dO/evZHNRYsWXb9+fe3atRN+4ztLYuTrUZ1Rv2nkgPqtjQdP7TcAgOLNi2iIiOHh4ZGvS6VSpVLJREOjJgERYzWEeQsAWoxrGh5onBvInOMfKQIUAwAtQDRk1asiebXjIx0MAHPCfFmeWLp06dTvpD5hUE+B5FRE8mAAmP3mRTR8ene5cv36hIeNrFBkXmmZn3II1zQA0BLmRTR8atcTEU9M8U4e6cSvEgBoPfMiGqbFO19FOeYLKMY7eGYGCQCPz4JarVb0GACAOcCrJwCAFNEAAKSIBgAgRTQAACmiAQBIEQ0AQIpoAABSRAMAkDLn3xHSGy/C7Od5CnNC4/saj3nA3I6GUR/x4BMfYBbyPIU5IfPctDwBPF4SAWa/ZM3P7ZkGAGBaZJYRRQMwEyZcKwWKlVlGFA3ATBj5B8g1DTB3uaYBAEgRDcDj1bhQCsxpC2q1WtFjmBKv/4bZz/MUZr/M83TORwMAMDMsTwAAKaIBAEgRDQBAimgAAFJEAwCQIhoAgJQWiYa+vr6ihwA0U6lUKpVK0aMAmpnwZNoi0QAAPG6iAQBIEQ0AQIpoAABSRAMAkCIaAIAU0QAApIgGACBFNAAAKaIBAEgRDQBAimgAAFJEAwCQIhoAgBTRAACktBU9gGlz7Y1q0UMAxvXPwX9FxH8Xep4yQzpXtxc9hBbUOtHw1R+cKHoIAMwW3/j81u1dnUWPotVYngAAUkQDAJAiGgCAFNEAAKSIBgAgRTQAACmiAQBIEQ0AQIpoAABSRAMAkCIaAIAU0QAApIgGACBFNAAAKaIBAEgRDQBAimgAAFJEAwCQIhoAgBTRAACkiAYAIEU0AAApogEASBENAECKaAAAUkQDAJAiGgCAFNEAAKSIBgAgRTQAACmiAQBIEQ0AQIpoAABSRAMAkCIaAIAU0QAApIgGACBFNAAAKaIBAEgRDQBAimgAAFJEAwCQIhoAgBTRAACkiAYAIEU0AAApogEASBENAECKaAAAUtqKHsBDLp57tXP9hvrXL77ce/TOkmdK/46IxYPnImLbrr2d6ze0l0pFDhEA5qtpi4ZyuRwRAwMDk76H6p07Z3uO178+23N8ccQzq7qO3lkSEQciDm48Vu09cqRn//7nD+sGAJh5b0dD/aw/YmBgoFwuJyMgf2Rze9ZdiX/8IiL2rIsTr70vIuozDW9F128uxsGNx/bcvfLiy71f/uzHp/6zAGh5o05tMbX/3PLQTMOoh3KGH9lrf7/UHtGxrD8ibt59sn3wzM+O/nnls196cHNb9567VzqW9Xec/1GEaAAgRSVMo2YXQtYDrfHPkf0jGg8YOWbMAxrvc0xne453LOuvXq5WL1cjYtvmzvNbD5y6OnTq6lBEnLo6VJ972PXeNyb7ywIAk5e6pqFx9WHUSkR9M3nAhKsY9VyoVW784fcnXhj+SGx9sL/eDRdOnj64MXpeX70///sBML81/mfVrMMUPRQN4z2yM/MoXzh5+hMfvNG451dLfn7mwn9++v7D9c0dmxbOwDAAaBmjzl/TdQXevNXsmobxNFliGE/ysspq/+32J1csWPOej62JfZUz1b/ejk07el956fzWA5v/+FLsfNQfCwBMm8m85HISmZZZnjj03e/1fufAvrhfq9yIiGPn2vrauntfWVEvhm/uvL1tc2dEf3XVjkmMGQCYoqm+I+QkZh3G07l+Q1/bhmr/7frmvq77H75/qXv54Ff+9pPfbT/zyR3DHcv6v/Xjxdt27Z2unwhAa5vGkxQxiZmG+oRB4+aEB4xMMDSfbGgvlT7wma/1/vpSnIvud9+MiH1dK/bFxfqt1cvVntdXb9q9Y+QtIwGguQnPWTySt6NhzNN/k/1N9jTZbP4X9tzT3UcGv3jh5Ol4MyKiu/9mfX/vmx19f+rYtHuHt4ME4JEIhWk0uz57or1U2v/84bdWdfX99oe9Q6teGI7u5YO9Q6u6lw9u2v3Rbbv2KgYAKMrsioaIaC+Vnnu6+9pTHYciev5yMyIOPdURET6qCgCKNeuiISLaS6WNXVsiYmNX0UMBAP5vqq+eAADmCdEAAKSIBgAgRTQAACmiAQBIEQ0AQIpoAABSRAMAkCIaAIAU0QAApIgGACBFNAAAKaIBAEgRDQBAimgAAFJEAwCQIhoAgBTRAACkiAYAIEU0AAApogEASBENAECKaAAAUkQDAJAiGgCAFNEAAKSIBgAgRTQAACmiAQBIEQ0AQIpoAABSRAMAkCIaAIAU0QAApIgGACBFNAAAKaIBAEgRDQBAimgAAFJEAwCQIhoAgBTRAACkiAYAIEU0AAApogEASBENAECKaAAAUkQDAJDSVvQAps3XP7el6CEA47p161ZErFy5suiBMF9s7+oseggtqHWiYeeH1hU9BGBclcrCiFizZk3RAwEmz/IEAJAiGgCAFNEAAKSIBgAgRTQAACmiAQBIEQ0AQIpoAABSRAMAkCIaAIAU0QAApIgGACBFNAAAKaIBAEgRDQBAyoJarVb0GACAOcBMAwCQIhoAgBTRAACkiAYAIEU0AAApogEASBENAECKaAAAUv4HGWY6S4ZdfLYAAAAASUVORK5CYII=" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Browser - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> - - Firefox </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> -<h2 id="UserSettings_getBrowserVersion" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser Version -</h2> - - <img alt="" - src="data:image/png;base64,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" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Browser version - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> - - Firefox 3.6 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;"> Browser Plugins </h2> @@ -2322,7 +2161,7 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getWideScreen" style="color: rgb(126,115,99); font-size: 11pt;"> +<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> Normal / Widescreen </h2> @@ -2390,74 +2229,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getOS" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System -</h2> - - <img alt="" - src="data:image/png;base64,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" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Operating system - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows XP </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> @@ -2524,167 +2295,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getOSFamily" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating system family -</h2> - - <img alt="" - src="data:image/png;base64,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" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Operating system family - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> -<h2 id="UserSettings_getMobileVsDesktop" style="color: rgb(126,115,99); font-size: 11pt;"> - Mobile vs Desktop -</h2> - - <img alt="" - src="data:image/png;base64,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" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Mobile vs Desktop - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Desktop </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/mobile.gif'> - - Mobile </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;"> Browser language </h2> @@ -6925,12 +6535,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> - Device model +<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;"> + Visitor Browser </h2> <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAF7UlEQVR4nO3dP24jVQDH8QmbNCuhKBVSAtpibkC2hYIDIOUAVPRItPQguj0BHfWegCPgE6BpgIwEEooEUigiMRQWZjJx4p8TO+M3/nwq/xk7b3c1O9+8N2MfdF1XAQCs8s7YAwAAyiAaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAi+xUNdV0vfXDp4w+/CgD2zX5Fw32apsmf1RAA7KfDsQewSd989+Pgka8+f92/2zRNXdf9CBjcBQDuM6lo+OmXP29ubhZ3j46OLi8vz87OVr7wbkksbg86Y/7UYoP5s/2Nn/YnAIDdNaloqKrq+vp6cfv4+Lht2yQa+h4IiGpZQ5i3AGBP7N05Df25geQYv1YEKAYAJmzvomGleVWEZzuutTEAFG1qyxMvX758+pvMJwzmKRBORYQbA0C5JhUNF5/U7eXlys0WKxTJlZb5lEPlnAYAJm1S0fDpx6+q6tUT32StA79KAGB/TCoaNuLuVZRLL6C4b+PnGSQAPL+DruvGHgMAUABXTwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBApJhPhPTBi1AW+ywUp/95x0s3KCMaBl/x4BsfYMfZZ6E4yX5qeQLYPIkAZQnLvoyZBgBgq5IlRdEAbMvK9VFgdyRLiqIB2JbFfzrOaYBpcE4DABARDcDm9RdHgck46Lpu7DFEXPMNZbHPQlmSfbaYaAAAxmV5AgCIiAYAICIaAICIaAAAIqIBAIiIBgAgUlg0zGazsYcApNq2bdt27FEAqZUH2cKiAQAYi2gAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIHI49gLX9+ttfYw8BiPz+x99VVf3zwj7Ls3r/vXfHHsJklRcNX3z7w9hDAGB3vX1zMfYQJsvyBAAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQOQx0VDX9cbHAQDsuMPFrbqum6bpP3f3EQAowt3fbx3Rnu5w9SYAUCCVsHGrlyfmsVb/575n725T91S3o29w++EfAQDsgmimob9OMTje9x8fbNNPvJUpcN9bAcDj9A89DisbEZ0IufTvenBoX/nv0TTNYkZhcDt5OQDkmttMY2/EIy+5NBkAAPvmkdGg2gBg3/wfDYMOWDmX8IhumL9ksR5hugKALfGb7TbcOhGy3wHJ4fyBA/8gKcQBAM/JYWgbDrquG3sMa5jNZl9///PYowBgd719czH2EEo1m83Oz88f2MB3TwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQORx7AGv78rPXYw8BiFxdXVVVdXJyMvZAgM0oLxo++vCDsYcARNr2RVVVp6enYw8E2AzLEwBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABEDrquG3sMAEABzDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQORf+Zdxfjze1KoAAAAASUVORK5CYII=" + src="data:image/png;base64,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" height="200" width="700"/> @@ -6940,7 +6550,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Device model + Browser </th> <th style="padding: 6px 0;"> Visits @@ -6965,7 +6575,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown </td> + <img src='plugins/UserSettings/images/browsers/FF.gif'> + + Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -6991,12 +6603,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System families +<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Browser Version </h2> <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAHz0lEQVR4nO3dz4ucdwHH8W9sthu2ibOQSjUbSdJBtIew1NREaQ0m0GIQhB6EevDUg55EwYsS9FLEm/4DPXgyJy8eiiIEikWKDRJ6SEsYEmh2U38s7PZHzGYTxsNsn53MTnc/+/OZmX29DuGZZ5559jsLT573Pj9m9rXb7QIAsJ7P1D0AAGA4iAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoiDSbzb4z+85f+1UAMKREw5a0Wq38WQ0BwFDbX/cABsKvX32rZ84vXn6m+2Gr1Wo2m90R0PMQAEaeaCillOvvfbC0tFQ9HBsbm5mZmZqaWveFq0uimu7pjM5T1QKdZ7sX3to7AIAdJxqW3blzp5puNBqzs7NJNHRbIyBKv4Zw3AKA4eKahlT3sYFkH7+hCFAMAAw+0bBtOlURXu24oYUBYBA4PbFsYmJi6yvpHDDopEB4KCJcGABqJxpKKeXF883ZmZl1F6vOUCR3WuaHHIprGgAYBqKhlFK+e/ZYKce2uJIN7fhVAgBDRzRsm9V3Ufa9geLTFt6dQQLApu1rt9t1jwEAGALungAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAyOh/IqQPXoRBY6uEwdT9scV9FxjxaOj5igff+AC1s1XCYEo2RqcngF0lEWAAhfk+4kcaAIBEct5QNAA1WPfUKbDLkvOGogGoQfX/kWsaYIi4pgEAiIgGYFd1nzcFhsu+drtd9xh2ljvCYdDYKmEAJRvm6EcDALAtnJ4AACKiAQCIiAYAICIaAICIaAAAIqIBAIjslWi4cuVK3UMAHmKrhEGz7la5V6IBANgi0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABDZX/cAds+tf31Y9xCAFf9dWLJVstOOPnGo7iGMlD0UDT/+zV/rHgLwsD/drnsEjLg//vbFuocwUpyeAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAi++sewIYtLX704MP/PHLoc6WUzsTY+P5SDtQ9LgAYcdsfDc1ms9VqbftqO5YWP5r5yw/nr81NPnV4/trcnbmbl+9Nfe37vzv75MFP6qEsLd4fGz+4QwMAgD1rJRp6dvZrP6zLB/PXZ/925chzp7pn/uMPP7n6jcenj188dex+KeXwE0/VNDoABlGz2eyZMwh7tGE0fKcnKnfmblbTC+O3Xr/9o9dvl1LKr77957HxugYFwCBSCdtiJRparVZ1OKEz0f2wWqx6qnpV6RdxPTO711YePm7Rd4Wf4m4pZeLw8VLK/LW5au7/vnW3M9FYPLowfit52wDARm3mSEPPLr88vKfvzFl9diNc4RqWFu+/9/ufl65iuHxvqnq2UwyNxaP5GwFgj+j5O7bGkQy1zUTD5n7d1cGGvv+GK/nlO19pnnlpeYXvXDrTeLtngenjFzcxNgBGWM9ua0Cu0htGfT6nofptbmh3vhWdH7Tuz7p89cb7kxc602+8u/D+5IU3F06WUhqLRzsHGBqLR88+edCtEwCwEx6Khr6VsDtF1mq11m2Ui5dmn/1y48LTj1VzzjTePvfozPM3F56/ufC9xlvPXrn68YP5nR4qAOxNfY40dCfCRnNh7b1+9+WQPZdGbsLn51/rTExOX5+cvl5KOfLcqccemdz0CgEYSbtz1Hwv2IZbLnvufagujcyvOslunVj22j8/fuPdherhkfNL1fSh0z878PgXNjJ2AEbfhnZJrKE3Glb/KqsDA30X6Hl2jSVXz1x7ydVeeenIymvfvFRKOffoTPJCAPY4obAthunDnV44fbKUUsrdc9P3Lz/98tWbr1z++9R3ro51zk2Ue1//7OSXfAkFAOyQYYqGTxwYGy8vnD55bvrVB+eXv7mqw30TALBzhjEalo2Nu7sSAHZPn7snAABWEw0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAET21z2A3fPTHzxT9xCAFTdu3Dhx4kTdowA2YA9Fwze/+sW6hwCsmGj/+5StEoaK0xMAQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAARPa12+26xwAADAFHGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAg8n+lhSjia6QRugAAAABJRU5ErkJggg==" + src="data:image/png;base64,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" height="200" width="700"/> @@ -7006,7 +6618,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Operating System families + Browser version </th> <th style="padding: 6px 0;"> Visits @@ -7031,9 +6643,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/UserSettings/images/browsers/FF.gif'> - Windows </td> + Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -7059,12 +6671,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System versions +<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> + Device model </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAF7UlEQVR4nO3dP24jVQDH8QmbNCuhKBVSAtpibkC2hYIDIOUAVPRItPQguj0BHfWegCPgE6BpgIwEEooEUigiMRQWZjJx4p8TO+M3/nwq/xk7b3c1O9+8N2MfdF1XAQCs8s7YAwAAyiAaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAi+xUNdV0vfXDp4w+/CgD2zX5Fw32apsmf1RAA7KfDsQewSd989+Pgka8+f92/2zRNXdf9CBjcBQDuM6lo+OmXP29ubhZ3j46OLi8vz87OVr7wbkksbg86Y/7UYoP5s/2Nn/YnAIDdNaloqKrq+vp6cfv4+Lht2yQa+h4IiGpZQ5i3AGBP7N05Df25geQYv1YEKAYAJmzvomGleVWEZzuutTEAFG1qyxMvX758+pvMJwzmKRBORYQbA0C5JhUNF5/U7eXlys0WKxTJlZb5lEPlnAYAJm1S0fDpx6+q6tUT32StA79KAGB/TCoaNuLuVZRLL6C4b+PnGSQAPL+DruvGHgMAUABXTwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBApJhPhPTBi1AW+ywUp/95x0s3KCMaBl/x4BsfYMfZZ6E4yX5qeQLYPIkAZQnLvoyZBgBgq5IlRdEAbMvK9VFgdyRLiqIB2JbFfzrOaYBpcE4DABARDcDm9RdHgck46Lpu7DFEXPMNZbHPQlmSfbaYaAAAxmV5AgCIiAYAICIaAICIaAAAIqIBAIiIBgAgUlg0zGazsYcApNq2bdt27FEAqZUH2cKiAQAYi2gAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIHI49gLX9+ttfYw8BiPz+x99VVf3zwj7Ls3r/vXfHHsJklRcNX3z7w9hDAGB3vX1zMfYQJsvyBAAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQOQx0VDX9cbHAQDsuMPFrbqum6bpP3f3EQAowt3fbx3Rnu5w9SYAUCCVsHGrlyfmsVb/575n725T91S3o29w++EfAQDsgmimob9OMTje9x8fbNNPvJUpcN9bAcDj9A89DisbEZ0IufTvenBoX/nv0TTNYkZhcDt5OQDkmttMY2/EIy+5NBkAAPvmkdGg2gBg3/wfDYMOWDmX8IhumL9ksR5hugKALfGb7TbcOhGy3wHJ4fyBA/8gKcQBAM/JYWgbDrquG3sMa5jNZl9///PYowBgd719czH2EEo1m83Oz88f2MB3TwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQORx7AGv78rPXYw8BiFxdXVVVdXJyMvZAgM0oLxo++vCDsYcARNr2RVVVp6enYw8E2AzLEwBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABEDrquG3sMAEABzDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQORf+Zdxfjze1KoAAAAASUVORK5CYII=" height="200" width="700"/> @@ -7074,7 +6686,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Operating System versions + Device model </th> <th style="padding: 6px 0;"> Visits @@ -7099,9 +6711,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows XP </td> + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -7127,12 +6737,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser families +<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> + Operating System families </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700"/> @@ -7142,7 +6752,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser families + Operating system family </th> <th style="padding: 6px 0;"> Visits @@ -7167,9 +6777,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/UserSettings/images/os/WI7.gif'> - Firefox </td> + Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -7195,12 +6805,12 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser versions +<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Operating System versions </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAIBUlEQVR4nO3dz4/Udx3H8Q/CuoSCu4Q26C4G0olRDs1at4LGisKhkZiY9KaHnnrQk9HEgxqiFzXe6j/Qg4mJHEyvaGMkaWxM1Q0hHGhDNhLLTv2RDUtbKMtSx8PQ6TA7zL52dne+M+zjcSDz47tf3kCG73O+P2Z2NBqNAgCwlo9UPQAAMBpEAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDRslVqt1vXBro/3/ikAGAaiYdDm5+fzZzUEAMNjV9UDjKpfvPj3jkd+/PxT7Xfn5+drtVp7BHTcBYDRIhr6dOXNt1dWVlp3x8bGFhYWpqen1/zB1SXRut3RGc2nWgs0n21feGN/AgBYH9HQv1u3brVuT0xM1Ov1JBra9QiI0q0h7LcAoELOadhC7fsGkm38uiJAMQAwYKKhSs2qCM92XNfCALDpHJ7o3549eza+kuYOg2YKhLsiwoUBYHOJhj49e6pWX1hYc7HWEYrkSst8l0NxTgMAAyca+vSNE4dLObzBlaxrw68SAKiWaKjS6qsou15A8aCFBzMkADTtaDQaVc8AAIwAV08AABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQMQnQnbhgxehKl59UKH2zyDuuoBo6NTxFQ++8QEGxqsPKpS84hyeAIaFRICqhI1uTwMAEB0cFA3AcFnzqCqwFZKDg6IBGC6t/6qc0wDDxjkNAEBENADDov2QKjCEdjQajapnGDquFIeqePVBVZJXn2gAACIOTwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAARETDA83NzVU9AmxH9Xq9Xq9XPQVsR2tu+EQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAAJFdVQ8w1K79+52qR4Bt5z+L75VS/rfTq49Nc+jgvqpHeEiIhl6++8s/Vj0CABv10gvPVj3CQ8LhCQAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgsqvqAQZkZfnd99/57859j5VSmjfGxneVsrvquQBgZGx+NNRqtfn5+U1f7UasLL+78PK3ly4vTh49sHR58dbi1fN3pj//rV+deHzvB/VQVpbvjo3vrXpSABheH0ZDx8a+991B6jpJrVZrX6b3bG8vXan/eW7q6dn2B//22+9d/OKjM0fOzB6+W0o5cPDopk4NwHDp2HCUtbYdrDYChyeaidD8p20PiP6a5tbi1dbtG+PXXnnrO6+8VUopP/3aH8bGN29oAIaPStigD6Nh9ba5/W5rsY43+qsXaF+y68rL/dv4rivcVLdLKXsOHCmlLF1ebD363ldvN29MLB+6MX5ts39TAHjY9LOnoWOTX1a96S/djimEK+yqVRV9JMXK8t03f/2j0lYM5+9Mt55tFsPE8qH1rhaAkdPxbrbCSUZUP9HQ3190a2dD11/7WGHuJ69/pnb8m/fGeP3s8YlLHQvMHDmzpQMAULmOjdcQnrY//LpEQ+vvseOYwtbpb0dCGIznL/7jX5Onm4u++saNMnn6taVyfOJSa+/CxPKhE4/vdekEAPR2XzR0fdM/mJ0Bq89zXD1DefCJkD2cOVv/0qcnTj/5yLkLN5uPHJ+4dPKjC3uujpVSJmeu1P80dvMrSz6xAQB66/KJkO0b4/XuZujdFu27Lga2G6PDx5fONW9MzlyZnLlSSpl6evaRnZMDHgOAAdvqd7/bwSZcctlx7UPrQEN+vknvSyc69i70lxrnLtx89Y0brbtTp1Zat/cd+8HuRz+x3hUCMFrWtWGiqx2NRqPqGbbWy3+9d9rjuQs35187W0r54WO/vy8aPvu7AwePrv5I6bm5uZ//5p8DmxOALfLSC89WPcJomJubm52d7bHACHy40wY9c+yJUkopt0/O3D3/5PMXr/7s/F+mv35xrHlsotz5wscmP+VLKABgTQ9/NHxg99h4eebYEydnXnz/1L1vrmpy3QQAJLZPNNwzNu7qSgDoR5erJwAAVhMNAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABEdlU9wFD7/nNPVT0CbDvXr18vpezfv7/qQYBOoqGXL3/uk1WPANtOvb6zlDI1NVX1IEAnhycAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiOxoNBpVzwAAjAB7GgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAg8n/j6k/2lSrybwAAAABJRU5ErkJggg==" height="200" width="700"/> @@ -7210,7 +6820,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser versions + Operating System versions </th> <th style="padding: 6px 0;"> Visits @@ -7235,9 +6845,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/UserSettings/images/os/WXP.gif'> - Firefox 3.6 </td> + Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> 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 1b012a722e..723af81cb0 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 @@ -50,46 +50,21 @@ </a> </li> <li> - <a href="#UserSettings_getBrowser" style="text-decoration:none; color: rgb(68,68,68);"> - Visitor Browser - </a> - </li> - <li> - <a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);"> - Browser Version - </a> - </li> - <li> <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);"> Browser Plugins </a> </li> <li> - <a href="#UserSettings_getWideScreen" style="text-decoration:none; color: rgb(68,68,68);"> + <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> Normal / Widescreen </a> </li> <li> - <a href="#UserSettings_getOS" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> </li> <li> - <a href="#UserSettings_getOSFamily" style="text-decoration:none; color: rgb(68,68,68);"> - Operating system family - </a> - </li> - <li> - <a href="#UserSettings_getMobileVsDesktop" style="text-decoration:none; color: rgb(68,68,68);"> - Mobile vs Desktop - </a> - </li> - <li> <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);"> Browser language </a> @@ -370,28 +345,28 @@ </a> </li> <li> - <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> - Device model + <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);"> + Visitor Browser </a> </li> <li> - <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System families + <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> + Device model </a> </li> <li> - <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Operating System versions + <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Browser Version </a> </li> <li> - <a href="#DevicesDetection_getBrowserFamilies" style="text-decoration:none; color: rgb(68,68,68);"> - Browser families + <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> + Operating System families </a> </li> <li> - <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Browser versions + <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Operating System versions </a> </li> <li> @@ -2014,130 +1989,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getBrowser" style="color: rgb(126,115,99); font-size: 11pt;"> - Visitor Browser -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Browser - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> - - Firefox </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> -<h2 id="UserSettings_getBrowserVersion" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser Version -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Browser version - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> - - Firefox 3.6 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;"> Browser Plugins </h2> @@ -2293,7 +2144,7 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getWideScreen" style="color: rgb(126,115,99); font-size: 11pt;"> +<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> Normal / Widescreen </h2> @@ -2355,68 +2206,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getOS" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Operating system - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows XP </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> @@ -2477,155 +2266,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getOSFamily" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating system family -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Operating system family - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> - - Windows </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> -<h2 id="UserSettings_getMobileVsDesktop" style="color: rgb(126,115,99); font-size: 11pt;"> - Mobile vs Desktop -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Mobile vs Desktop - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Desktop </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/mobile.gif'> - - Mobile </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;"> Browser language </h2> @@ -6679,8 +6319,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> - Device model +<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;"> + Visitor Browser </h2> @@ -6688,7 +6328,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Device model + Browser </th> <th style="padding: 6px 0;"> Visits @@ -6713,7 +6353,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown </td> + <img src='plugins/UserSettings/images/browsers/FF.gif'> + + Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -6739,8 +6381,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System families +<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> + Device model </h2> @@ -6748,7 +6390,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Operating System families + Device model </th> <th style="padding: 6px 0;"> Visits @@ -6773,9 +6415,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> - - Windows </td> + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -6801,8 +6441,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Operating System versions +<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Browser Version </h2> @@ -6810,7 +6450,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Operating System versions + Browser version </th> <th style="padding: 6px 0;"> Visits @@ -6835,9 +6475,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> + <img src='plugins/UserSettings/images/browsers/FF.gif'> - Windows XP </td> + Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -6863,8 +6503,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser families +<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> + Operating System families </h2> @@ -6872,7 +6512,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser families + Operating system family </th> <th style="padding: 6px 0;"> Visits @@ -6897,9 +6537,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/UserSettings/images/os/WI7.gif'> - Firefox </td> + Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -6925,8 +6565,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser versions +<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Operating System versions </h2> @@ -6934,7 +6574,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser versions + Operating System versions </th> <th style="padding: 6px 0;"> Visits @@ -6959,9 +6599,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/UserSettings/images/os/WXP.gif'> - Firefox 3.6 </td> + Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> 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 Binary files differindex fbfae51937..1a69564d4d 100644 --- 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 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 0000000000..106f23f16b --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_day.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<results> + <result date="2009-01-04" /> + <result date="2009-01-05" /> + <result date="2009-01-06" /> + <result date="2009-01-07" /> + <result date="2009-01-08" /> + <result date="2009-01-09" /> + <result date="2009-01-10" /> +</results>
\ 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 0000000000..5cfb246edc --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_week.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<results> + <result date="From 2008-12-29 to 2009-01-04" /> + <result date="From 2009-01-05 to 2009-01-11" /> + <result date="From 2009-01-12 to 2009-01-18" /> + <result date="From 2009-01-19 to 2009-01-25" /> + <result date="From 2009-01-26 to 2009-02-01" /> + <result date="From 2009-02-02 to 2009-02-08" /> + <result date="From 2009-02-09 to 2009-02-15" /> +</results>
\ 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 0000000000..106f23f16b --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<results> + <result date="2009-01-04" /> + <result date="2009-01-05" /> + <result date="2009-01-06" /> + <result date="2009-01-07" /> + <result date="2009-01-08" /> + <result date="2009-01-09" /> + <result date="2009-01-10" /> +</results>
\ 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 0000000000..5cfb246edc --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<results> + <result date="From 2008-12-29 to 2009-01-04" /> + <result date="From 2009-01-05 to 2009-01-11" /> + <result date="From 2009-01-12 to 2009-01-18" /> + <result date="From 2009-01-19 to 2009-01-25" /> + <result date="From 2009-01-26 to 2009-02-01" /> + <result date="From 2009-02-02 to 2009-02-08" /> + <result date="From 2009-02-09 to 2009-02-15" /> +</results>
\ 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 0000000000..c234bed59e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowsers_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result />
\ 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 0000000000..c234bed59e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result />
\ 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 8e0b0b794b..a4a21e48af 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 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -74,14 +82,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.0</browserVersion> <screenType>dual</screenType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> @@ -164,8 +164,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -189,14 +197,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.0</browserVersion> <screenType>dual</screenType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> @@ -339,8 +339,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -364,14 +372,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>dual</screenType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> 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 8e0b0b794b..a4a21e48af 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 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -74,14 +82,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.0</browserVersion> <screenType>dual</screenType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> @@ -164,8 +164,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -189,14 +197,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.0</browserVersion> <screenType>dual</screenType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> @@ -339,8 +339,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -364,14 +372,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> <screenType>dual</screenType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> 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 a80688cc03..b1e550645e 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 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -117,14 +125,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.0</browserVersion> <screenType>dual</screenType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> @@ -208,8 +208,16 @@ </row> </customVariables> <deviceType>Desktop</deviceType> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.0</browserVersion> <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> @@ -233,14 +241,6 @@ <location>France</location> <latitude /> <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserName>Firefox 3.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.0</browserVersion> <screenType>dual</screenType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index 72dab998db..a968371537 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 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> - <shortLabel>Firefox 6.0</shortLabel> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +23,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - <shortLabel>Internet Explorer 9.0</shortLabel> </row> <row> <label>Others</label> @@ -37,6 +35,5 @@ <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> - <shortLabel>-1</shortLabel> </row> </result>
\ 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 index 803dcc4819..c58f00fa96 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 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux</label> + <label>GNU/Linux</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> @@ -11,10 +11,9 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/LIN.gif</logo> - <shortLabel>Linux</shortLabel> </row> <row> - <label>Android</label> + <label>Android 4.0</label> <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> @@ -24,7 +23,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/AND.gif</logo> - <shortLabel>Android</shortLabel> </row> <row> <label>Others</label> @@ -37,6 +35,5 @@ <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/UNK.gif</logo> - <shortLabel>-1</shortLabel> </row> </result>
\ 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 9f4d67971d..b90214c2e9 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 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux / Firefox / 1920x1080</label> + <label>GNU/Linux / Firefox / 1920x1080</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> 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 index 72dab998db..a968371537 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 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> - <shortLabel>Firefox 6.0</shortLabel> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +23,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - <shortLabel>Internet Explorer 9.0</shortLabel> </row> <row> <label>Others</label> @@ -37,6 +35,5 @@ <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> - <shortLabel>-1</shortLabel> </row> </result>
\ 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 index 803dcc4819..c58f00fa96 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 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux</label> + <label>GNU/Linux</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> @@ -11,10 +11,9 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/LIN.gif</logo> - <shortLabel>Linux</shortLabel> </row> <row> - <label>Android</label> + <label>Android 4.0</label> <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> @@ -24,7 +23,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/AND.gif</logo> - <shortLabel>Android</shortLabel> </row> <row> <label>Others</label> @@ -37,6 +35,5 @@ <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/UNK.gif</logo> - <shortLabel>-1</shortLabel> </row> </result>
\ 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 9f4d67971d..b90214c2e9 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 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux / Firefox / 1920x1080</label> + <label>GNU/Linux / Firefox / 1920x1080</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject 81e01e6c9f0e5c8938a725a416bc6c7c7d26543 +Subproject 93f49336d80b701cbb8b15513a26304452da6fd diff --git a/tests/PHPUnit/Unit/CommonTest.php b/tests/PHPUnit/Unit/CommonTest.php index 22ee2c52da..de1b6a2d24 100644 --- a/tests/PHPUnit/Unit/CommonTest.php +++ b/tests/PHPUnit/Unit/CommonTest.php @@ -15,6 +15,8 @@ use Piwik\Filesystem; /** * @backupGlobals enabled + * @group Common + * @group Core_CommonTest */ class Core_CommonTest extends PHPUnit_Framework_TestCase { @@ -96,7 +98,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getInputValues - * @group Core */ public function testSanitizeInputValues($input, $output) { @@ -113,7 +114,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * emptyvarname => exception - * @group Core */ public function testGetRequestVarEmptyVarName() { @@ -128,7 +128,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * nodefault Notype Novalue => exception - * @group Core */ public function testGetRequestVarNoDefaultNoTypeNoValue() { @@ -142,7 +141,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * nodefault Notype WithValue => value - * @group Core */ public function testGetRequestVarNoDefaultNoTypeWithValue() { @@ -151,24 +149,33 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase } + public function testGetRequestVar_GetStringFloatGiven() + { + $_GET['test'] = 1413.431413; + $value = Common::getRequestVar('test', null, 'string'); + $this->assertEquals('1413.431413', $value); + } + + public function testGetRequestVar_GetStringIntegerGiven() + { + $_GET['test'] = 1413; + $value = Common::getRequestVar('test', null, 'string'); + $this->assertEquals('1413', $value); + } + /** * nodefault Withtype WithValue => exception cos type not matching - * @group Core + * @expectedException \Exception + * @expectedExceptionMessage The parameter 'test' isn't set in the Request */ public function testGetRequestVarNoDefaultWithTypeWithValue() { - try { - $_GET['test'] = 1413.431413; - Common::getRequestVar('test', null, 'string'); - } catch (Exception $e) { - return; - } - $this->fail('Expected exception not raised'); + $_GET['test'] = false; + Common::getRequestVar('test', null, 'string'); } /** * nodefault Withtype WithValue => exception cos type not matching - * @group Core */ public function testGetRequestVarNoDefaultWithTypeWithValue2() { @@ -246,9 +253,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase } } - /** - * @group Core - */ public function testIsValidFilenameValidValues() { $valid = array( @@ -263,9 +267,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase } } - /** - * @group Core - */ public function testIsValidFilenameNotValidValues() { $notvalid = array( @@ -426,7 +427,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getLanguageDataToExtractLanguageRegionCode - * @group Core */ public function testExtractLanguageAndRegionCodeFromBrowserLanguage($browserLanguage, $validLanguages, $expected) { @@ -461,16 +461,12 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getLanguageDataToExtractLanguageCode - * @group Core */ public function testExtractLanguageCodeFromBrowserLanguage($browserLanguage, $validLanguages, $expected) { $this->assertEquals($expected, Common::extractLanguageCodeFromBrowserLanguage($browserLanguage, $validLanguages), "test with {$browserLanguage} failed, expected {$expected}"); } - /** - * @group Core - */ public function testSearchEnginesDefinedCorrectly() { include "DataFiles/SearchEngines.php"; diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php index 46dfca652f..7b5bad19d8 100644 --- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php @@ -22,7 +22,7 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase { public function test_version2_0_4() { - $validTill = '2014-11-25'; + $validTill = '2015-02-25'; $this->assertDeprecatedMethodIsRemoved('\Piwik\Period', 'factory', $validTill); $this->assertDeprecatedMethodIsRemoved('\Piwik\Config', 'getConfigSuperUserForBackwardCompatibility', $validTill); $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuAdmin', 'addEntry', $validTill); @@ -55,6 +55,16 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase $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'); } @@ -113,4 +123,4 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase $errorMessage = $className . '::' . $method . ' should be removed as the method is deprecated but it is not.'; $this->assertFalse($methodExists, $errorMessage); } -}
\ No newline at end of file +} |
