Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-01-29 22:45:59 +0300
committervipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-01-29 22:45:59 +0300
commit8c62b4f285a683e78090f9f85eab15b8c74d6499 (patch)
tree8f89b8d2043a1b5df7f642af08755f79ee789b97 /plugins/UserSettings
parentd88f013029abba71eac27f95c2af7ad03c7197a1 (diff)
fixes #1123, fixes #1132 - convert WebKit version numbers to Safari product versions; add Epiphany browser detection; re-organize browser families for consistency
Diffstat (limited to 'plugins/UserSettings')
-rw-r--r--plugins/UserSettings/UserSettings.php18
-rw-r--r--plugins/UserSettings/images/browsers/EP.gifbin0 -> 317 bytes
2 files changed, 10 insertions, 8 deletions
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index 20f10758be..af612646ed 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -31,17 +31,19 @@ class Piwik_UserSettings extends Piwik_Plugin
// source: http://en.wikipedia.org/wiki/List_of_web_browsers
static public $browserType = array(
- "ie" => array("IE"),
- "gecko" => array("NS", "PX", "FF", "FB", "CA", "GA", "KM", "MO", "SM"),
- "khtml" => array("SF", "KO", "OW", "CH", "AR"),
- "opera" => array("OP")
+ 'ie' => array('IE'),
+ 'gecko' => array('NS', 'PX', 'FF', 'FB', 'CA', 'GA', 'KM', 'MO', 'SM'),
+ 'khtml' => array('KO'),
+ 'webkit' => array('SF', 'CH', 'OW', 'AR', 'EP'),
+ 'opera' => array('OP'),
);
static public $browserType_display = array(
- 'ie' => 'Internet Explorer',
- 'gecko' => 'Gecko (Mozilla, Netscape)',
- 'khtml' => 'KHTML (Safari, Chrome)',
- 'opera' => 'Opera',
+ 'ie' => 'Trident (Internet Explorer)',
+ 'gecko' => 'Gecko (Mozilla, Netscape)',
+ 'khtml' => 'KHTML (Konqueror)',
+ 'webkit' => 'WebKit (Safari, Chrome)',
+ 'opera' => 'Presto (Opera)',
);
function getListHooksRegistered()
diff --git a/plugins/UserSettings/images/browsers/EP.gif b/plugins/UserSettings/images/browsers/EP.gif
new file mode 100644
index 0000000000..647095ec78
--- /dev/null
+++ b/plugins/UserSettings/images/browsers/EP.gif
Binary files differ