From 8cd2a1ce7dd39131f196cccab6b5f3f7f57a95fe Mon Sep 17 00:00:00 2001
From: antisnatchor <antisnatchor@b87d56ec-f9c0-11de-8c8a-61c5e9addfc9>
Date: Mon, 14 Mar 2011 12:24:55 +0000
Subject: [PATCH] (Fixed issue 295): added missing Opera browser checks,
 changed the Opera icon with a transparent one.

git-svn-id: https://beef.googlecode.com/svn/trunk@793 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
---
 lib/constants.rb              |  11 +++++++++--
 lib/model/browserdetails.rb   |   1 +
 lib/model/zombie.rb           |   1 +
 public/images/icons/opera.ico | Bin 0 -> 2862 bytes
 public/images/icons/opera.png | Bin 284 -> 0 bytes
 5 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 public/images/icons/opera.ico
 delete mode 100644 public/images/icons/opera.png

diff --git a/lib/constants.rb b/lib/constants.rb
index 46936abe6..575541e7b 100644
--- a/lib/constants.rb
+++ b/lib/constants.rb
@@ -29,6 +29,7 @@ module Constants
   	S       = 'S'        # Safari
   	K       = 'K'        # Konqueror
   	C       = 'C'        # Chrome
+    O       = 'O'        # Opera
   	ALL     = 'ALL'      # ALL
   	UNKNOWN = 'UN'       # Unknown
   	
@@ -37,7 +38,8 @@ module Constants
   	FRIENDLY_IE_NAME  = 'Internet Explorer'
   	FRIENDLY_S_NAME   = 'Safari'
   	FRIENDLY_K_NAME   = 'Konqueror'
-  	FRIENDLY_C_NAME   = 'Chrome'  	
+  	FRIENDLY_C_NAME   = 'Chrome'
+    FRIENDLY_O_NAME   = 'Opera'
   	FRIENDLY_UN_NAME  = "UNKNOWN"
     
   	def self.friendly_name(browser_name)
@@ -48,7 +50,8 @@ module Constants
   	  when IE;       return FRIENDLY_IE_NAME   	   
   	  when S;        return FRIENDLY_S_NAME  	   
   	  when K;        return FRIENDLY_K_NAME  	   
-  	  when C;        return FRIENDLY_C_NAME
+      when C;        return FRIENDLY_C_NAME
+      when O;        return FRIENDLY_O_NAME
       when UNKNOWN;  return FRIENDLY_UN_NAME
   	  end
   	  
@@ -70,6 +73,8 @@ module Constants
 					    matches << K
 					  when /Chrome/
 					    matches << C
+            when /Opera/
+					    matches << O
 					end
 				end
 				matches.uniq
@@ -93,6 +98,8 @@ module Constants
   	AGENT_KONQ_IMG        = 'konqueror.png'
   	AGENT_CHROME_UA_STR   = 'Chrome'
   	AGENT_CHROME_IMG      = 'chrome.png'
+    AGENT_OPERA_UA_STR    = 'Opera'
+  	AGENT_OPERA_IMG       = 'opera.ico'
     
   end
   
diff --git a/lib/model/browserdetails.rb b/lib/model/browserdetails.rb
index 6a62ad6bd..8ee8b00eb 100644
--- a/lib/model/browserdetails.rb
+++ b/lib/model/browserdetails.rb
@@ -67,6 +67,7 @@ class BrowserDetails
     return BeEF::Constants::Agents::AGENT_FIREFOX_IMG if browser.eql? "FF" # Firefox
     return BeEF::Constants::Agents::AGENT_SAFARI_IMG  if browser.eql? "S"  # Safari
     return BeEF::Constants::Agents::AGENT_CHROME_IMG  if browser.eql? "C"  # Chrome
+    return BeEF::Constants::Agents::AGENT_OPERA_IMG   if browser.eql? "O"  # Opera
     
     BeEF::Constants::Agents::AGENT_UNKNOWN_IMG
   end
diff --git a/lib/model/zombie.rb b/lib/model/zombie.rb
index 86ab0303d..2c068280a 100644
--- a/lib/model/zombie.rb
+++ b/lib/model/zombie.rb
@@ -43,6 +43,7 @@ class Zombie
     return BeEF::Constants::Agents::AGENT_SAFARI_IMG  if agent.include? BeEF::Constants::Agents::AGENT_SAFARI_UA_STR
     return BeEF::Constants::Agents::AGENT_KONQ_IMG    if agent.include? BeEF::Constants::Agents::AGENT_KONQ_UA_STR
     return BeEF::Constants::Agents::AGENT_CHROME_IMG  if agent.include? BeEF::Constants::Agents::AGENT_CHROME_UA_STR
+    return BeEF::Constants::Agents::AGENT_OPERA_IMG   if agent.include? BeEF::Constants::Agents::AGENT_OPERA_UA_STR
     
     BeEF::Constants::Agents::AGENT_UNKNOWN_IMG
   end
diff --git a/public/images/icons/opera.ico b/public/images/icons/opera.ico
new file mode 100644
index 0000000000000000000000000000000000000000..036dc5785cc29eead9a583c34e5b3565302e1fa2
GIT binary patch
literal 2862
zcmeHJU2Icj7=C-s={arJu4Uc2A8_qj*8OB_Mj)EZ;K~?=i*1aAjGsiqmBAY_xge3N
z&L)m46K@EJkwn=<Fp{lugNB~kIZ^9OyfO6xmKZU>;>a$R1zlgC_p~MZiG-+^dz<IH
zKhO8P-*>*RX+I(xspRwd;5BNs5j{_YoRB-{gq`SB)QWkCPH03kI#H{P0YZT2)|+r;
zOGto6q7)=bNdg7aG>L`BgG&LI61ECjU!U+=e=a9Mf3B}T7bh(@T|ykSX_Uq1;?L?e
zYkaxKG|_(ay^S8){<CL`6I$~w_pmwVUG6cBId3v)8e`dH(#VWujm*Z6RFlcEtZ5{Z
zb6(R}?wRwh-6scaFzl_EqP#_egSX(nqHwqX{{Z-qbmbQc1pYw$9pWYUDLQ$wK;7Ms
z5uc+<j8_!luae6px|?+RH29Y!eusvK#m@o-aw#)Zsoz5UHhRraG+Lm5eh>KsRq1!A
zv9Um>PDyXkyay}-pFww%&YUSwFM1w3R)BVvbiIJNXNrs8d~WW*<_`R)9f*llidj)H
zYZNP2Dnl(b_Mp9{B~&kLeaJ&Dco%uBLVa-ScB#j<Zw+FAt={ADS-H>Sskg;~+k8<O
z4nfqnEf~{l9gZq1uW~qQ^_WxhHY--HG<!8?tPWOd<+T#V+#MZTO8J(K4tFfpq^gF+
z8_%gt2$~|*ktlo=zC(yepuMdj+R)Y>h)5cX1uDY+R)4r6P)zX*`(efG|NWf}{hPCJ
zK@<QQO5XE~P4HJ2f0^j@gj2nEK_D?v_W<-=rC$Hg>V-CkdMQ<@=h&zJ#1+~X79<xq
z)DKcbkvPPmjSXIDaB7ozw>`^>?L2EV&N`)j1kxIPjM_PN+cWIaZY&bLC~NVr?%_~V
zDW~=&{&7Wn1={g9%RG9FXfy%tU94dWxS9voS>}m8>8j9fgC7Szf_4htx(+-UqSGX5
z7l89v$Jg+0BtXg@lU<ok80t5u-C!G~puZ;lJ;Ieu-o=LZAiB(|?HU{Er)h9<K4hqQ
z#IxYOXN9uRU&*1oUY}ObpXhU7ik<58J&cjFC8s(M{e9GbgZ}5I=w;pC0yAt^et<9P
z9mY!9ZZEK=t+1v%c#1v`&9A^5+iZ74Z=FF+4POG-?`N*`%$N0R&PU$gu0CW{U13G}
z6Z-q|jygci%{&BfB*GjFK88Ley(7YvO={KE%vDv)J|DB&{qV{8%9vfd`0mb~%sX~q
z4bBX{10%1YY^?#>xZB8B{lj6IgBR-Rc=eTzdV094x0e_8>|u^|{EjtDF52nhgie>=
zhkl{Gb)L)pJ3INf%(>nM2Doczi0>Xaz`U<-iQ8N9+!oDqyl08`?PK1%mlt;L=Arev
z)%nq*>;sM;Il|WuALjJ%FsBb4;_C+w^2p%e+BJ*ruOOR`<YuPghGsL3%xE$>YK~<`
XC0q~O@yt=&=TzM14AXezo%8+;wl49>

literal 0
HcmV?d00001

diff --git a/public/images/icons/opera.png b/public/images/icons/opera.png
deleted file mode 100644
index 9b709885e0beff5d836b0d2d14918d713d7a4c64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~>?NMQuI!hXnFM6ma(Dha4iw@n
z@Q5sCVBi)4Va7{$>;3=*S<)SS9T^xl_H+M9WCijK0(?STr^(26yEt!EQaf#HTbi4@
zq@w&<X8POit`$p`oIiH#^UlqmU%&qU`t|qk-~R*A|NqM7lRbcX^F3W0Ln>}1{{RZT
zyZif}@t^<ygEb=m+D@3a;$QFzJ`eVr|MNGb{rGRJ^S{1X>hOR0$glsUr!;P{m~l_&
zP|hxKjdvTHPaaY>=smd9`NTHYHC+pj9zIyt9?g5$SKR&U{6nuL{=F*@G-8|iyWISQ
a9K(}Lv)L_Cw%$Oi89ZJ6T-G@yGywqEVS1_n