From 0e3ad5103f2ba76a18820f64d810a49aa0aaf69e Mon Sep 17 00:00:00 2001
From: Simon Schaufelberger <simonschaufi@googlemail.com>
Date: Fri, 15 Feb 2013 20:01:13 +0100
Subject: [PATCH] Refs #3252 Update Thunderbird icon and name
---
libs/UserAgentParser/UserAgentParser.php | 5 +++--
libs/UserAgentParser/UserAgentParser.test.php | 1 +
plugins/UserSettings/images/browsers/TB.gif | Bin 0 -> 1061 bytes
3 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 plugins/UserSettings/images/browsers/TB.gif
diff --git a/libs/UserAgentParser/UserAgentParser.php b/libs/UserAgentParser/UserAgentParser.php
index d36608eb39..07f59f709b 100644
--- a/libs/UserAgentParser/UserAgentParser.php
+++ b/libs/UserAgentParser/UserAgentParser.php
@@ -5,7 +5,6 @@
*
* @link http://dev.piwik.org/trac/browser/trunk/libs/UserAgentParser
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version $Id$
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -114,6 +113,8 @@ class UserAgentParser
'icecat' => 'FF',
'firefox' => 'FF',
+ 'thunderbird' => 'TB',
+
'flock' => 'FL',
'fluid' => 'FD',
'galeon' => 'GA',
@@ -430,7 +431,7 @@ class UserAgentParser
$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|safari)[\/\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)
diff --git a/libs/UserAgentParser/UserAgentParser.test.php b/libs/UserAgentParser/UserAgentParser.test.php
index 9429961b18..f5468c1b6b 100644
--- a/libs/UserAgentParser/UserAgentParser.test.php
+++ b/libs/UserAgentParser/UserAgentParser.test.php
@@ -27,6 +27,7 @@ $testUserAgent = array(
'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',
);
echo "Test with another user agent: ";
foreach($testUserAgent as $name => $userAgent) {
diff --git a/plugins/UserSettings/images/browsers/TB.gif b/plugins/UserSettings/images/browsers/TB.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d4dc60b25bc8c54efcffde74cdef6d178eeb86d3
GIT binary patch
literal 1061
zcmZ?wbhEHb6krfwcz&FLK{|;=CV^QtSy(<!Ksk#+y^KpOLtHghN+p3`JwseGOHwOc
z+Bj9hw35N5ozbRU+`LxFJX7APO4Fju$UKeHxr@uWL)p1n(Y4XQHBQ*GSH`_h&U>PS
zf4{G1fU^Izc~%;3z9j)cIWlpJRpTZ_hK8ubE>wtL92i;c9yQfEzDF)&k!4DMOk77o
ze2G>1w5)`%tc1wiq%f8I4F<W(^HZYq3OCv2t<KFz)hb(SQo7!_VvA<=?yUUk$f8M_
zwYv>!cAD30)T`TVRJX^tZl7WO9^c9p`VD&w8}{fn?$d4DpHtFl(74aFZc%kfj!nZ3
z!{!6V&HHUy_cT@Ho3<Y;teR}zeju)Pi(AV!yS6<J?fb2}4q0~{tE}&}?>pMnQ0CRU
zue-6_ankX+_PJh@kNQnH=rip|e^+b7l%wT++k&T`44!e^Z}zEaz0KjX4$qj_Ics8j
z@|;t_3ofV6J3V`9-|XpA7R>0+TX<&S%>JTPXUkS!S+!v0++~|9*IjE~zo~rFg{3Rj
zH*L7uvhiyDmYeI>uUo%<L+g%Pz1yx=@42~c!^({tH?H5bcgLocTX!8ex?|n;UB@=<
zxv^)@p51#7?A~|c*uE`uk3HOf;P9~n+g6=?wEWbg6DLlbId|j2`STYpT)2GU)U}Jp
zuU|fU<mRi}*Up~4_4?@DH+ODdKYjo0ojZ3P-Mx12!OJ%f&Rl)+;mzY~Z=c<I@aprc
zSFb+3y8r(5qc?BfetP%h%ZKM*f#~D&Z$R|v<(DsCe*F0H=f{U{zyAFE_2<v;@4tTk
z{R0Aj|Nr~>|KG2F|Ni~||K<PxU;l>=Q2fcl$i?uVL5BedKzV|J;~zsmr-%d>uUgQu
zI^GzKf)Ej-=)OM!M(Lu5liOz~{Ca$hN7^uC5=+#KOb<Ex)UXK?l#Wjj*Jxt-wCT_x
zjt&_<E(QrhWp8=ab$y{+MUJkMd2Ek$By4c*=hZ9hTUjaC=-+9)v`_T&#fK~t9bNkr
z4+gNZ%O)Rc`<a#U@Z4lmn?6QEgOkE?Aq#}IHU>I!^BUOqE%iK*Iempe{DXi?OB~xd
zb<F#0g*KcB(~a7ZcQEPc3&wW-@IKbr1rK-^M{G&k8nm^Yp@nw>OCHw)#kL;JGQHZY
ziwTZham>0qHC$HoO_nlJ(O57cOL0T^ax2%ME35|@L^kPhsZ8^}G)bVLgqfFzgTWdA
DI9O{s
literal 0
HcmV?d00001
--
GitLab