From 473f71e42dda16a31ef1fb96859665e2fc92f893 Mon Sep 17 00:00:00 2001 From: antisnatchor Date: Wed, 27 Jun 2012 10:23:43 +0100 Subject: [PATCH] Added missing WebOS constant/image that were preventing admin_ui to work properly. --- core/main/constants/os.rb | 129 +++++++++--------- .../admin_ui/media/images/icons/webos.png | Bin 0 -> 6621 bytes 2 files changed, 65 insertions(+), 64 deletions(-) create mode 100644 extensions/admin_ui/media/images/icons/webos.png diff --git a/core/main/constants/os.rb b/core/main/constants/os.rb index 15c8a1b67..7f94ba0c4 100644 --- a/core/main/constants/os.rb +++ b/core/main/constants/os.rb @@ -15,73 +15,74 @@ # module BeEF -module Core -module Constants - - # @note The OS'es strings for os detection. - module Os - - OS_UNKNOWN_IMG = 'unknown.png' - OS_WINDOWS_UA_STR = 'Windows' - OS_WINDOWS_IMG = 'win.png' - OS_LINUX_UA_STR = 'Linux' - OS_LINUX_IMG = 'linux.png' - OS_MAC_UA_STR = 'Mac' - OS_MAC_IMG = 'mac.png' - OS_QNX_UA_STR = 'QNX' - OS_QNX_IMG = 'qnx.ico' - OS_BEOS_UA_STR = 'BeOS' - OS_BEOS_IMG = 'beos.png' - OS_OPENBSD_UA_STR = 'OpenBSD' - OS_OPENBSD_IMG = 'openbsd.ico' - OS_IOS_UA_STR = 'iOS' - OS_IOS_IMG = 'ios.png' - OS_IPHONE_UA_STR = 'iPhone' - OS_IPHONE_IMG = 'iphone.jpg' - OS_IPAD_UA_STR = 'iPad' - OS_IPAD_IMG = 'ipad.png' - OS_IPOD_UA_STR = 'iPod' - OS_IPOD_IMG = 'ipod.jpg' - OS_MAEMO_UA_STR = 'Maemo' - OS_MAEMO_IMG = 'maemo.ico' - OS_BLACKBERRY_UA_STR = 'BlackBerry' - OS_BLACKBERRY_IMG = 'blackberry.png' - OS_ANDROID_UA_STR = 'Android' - OS_ANDROID_IMG = 'android.png' - OS_ALL_UA_STR = 'All' + module Core + module Constants + + # @note The OS'es strings for os detection. + module Os + + OS_UNKNOWN_IMG = 'unknown.png' + OS_WINDOWS_UA_STR = 'Windows' + OS_WINDOWS_IMG = 'win.png' + OS_LINUX_UA_STR = 'Linux' + OS_LINUX_IMG = 'linux.png' + OS_MAC_UA_STR = 'Mac' + OS_MAC_IMG = 'mac.png' + OS_QNX_UA_STR = 'QNX' + OS_QNX_IMG = 'qnx.ico' + OS_BEOS_UA_STR = 'BeOS' + OS_BEOS_IMG = 'beos.png' + OS_OPENBSD_UA_STR = 'OpenBSD' + OS_OPENBSD_IMG = 'openbsd.ico' + OS_IOS_UA_STR = 'iOS' + OS_IOS_IMG = 'ios.png' + OS_IPHONE_UA_STR = 'iPhone' + OS_WEBOS_UA_STR = 'webos.png' + OS_IPHONE_IMG = 'iphone.jpg' + OS_IPAD_UA_STR = 'iPad' + OS_IPAD_IMG = 'ipad.png' + OS_IPOD_UA_STR = 'iPod' + OS_IPOD_IMG = 'ipod.jpg' + OS_MAEMO_UA_STR = 'Maemo' + OS_MAEMO_IMG = 'maemo.ico' + OS_BLACKBERRY_UA_STR = 'BlackBerry' + OS_BLACKBERRY_IMG = 'blackberry.png' + OS_ANDROID_UA_STR = 'Android' + OS_ANDROID_IMG = 'android.png' + OS_ALL_UA_STR = 'All' # Attempt to match operating system string to constant # @param [String] name Name of operating system # @return [String] Constant name of matched operating system, returns 'ALL' if nothing are matched - def self.match_os(name) - case name.downcase - when /win/ - OS_WINDOWS_UA_STR - when /lin/ - OS_LINUX_UA_STR - when /os x/, /osx/, /mac/ - OS_MAC_UA_STR - when /qnx/ - OS_QNX_UA_STR - when /beos/ - OS_BEOS_UA_STR - when /openbsd/ - OS_OPENBSD_UA_STR - when /ios/, /iphone/, /ipad/, /ipod/ - OS_IOS_UA_STR - when /maemo/ - OS_MAEMO_UA_STR - when /blackberry/ - OS_BLACKBERRY_UA_STR - when /android/ - OS_ANDROID_UA_STR - else - 'ALL' - end - end - + def self.match_os(name) + case name.downcase + when /win/ + OS_WINDOWS_UA_STR + when /lin/ + OS_LINUX_UA_STR + when /os x/, /osx/, /mac/ + OS_MAC_UA_STR + when /qnx/ + OS_QNX_UA_STR + when /beos/ + OS_BEOS_UA_STR + when /openbsd/ + OS_OPENBSD_UA_STR + when /ios/, /iphone/, /ipad/, /ipod/ + OS_IOS_UA_STR + when /maemo/ + OS_MAEMO_UA_STR + when /blackberry/ + OS_BLACKBERRY_UA_STR + when /android/ + OS_ANDROID_UA_STR + else + 'ALL' + end + end + + end + + end end - -end -end end diff --git a/extensions/admin_ui/media/images/icons/webos.png b/extensions/admin_ui/media/images/icons/webos.png new file mode 100644 index 0000000000000000000000000000000000000000..d5c0b70d7e766842e52f00a2e9c912feff9b6ea4 GIT binary patch literal 6621 zcmV<386xJ1P)pF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;i7Ety%y88Cpq1K~#8N?OSJ*6;;-SZi1L|&N+->oG~$@nE1>I1XRQX4k$s< z5fPCn8Kj|s&N=6t=}hM)HCaHSiU9>|Oepp3eeS*W>b-uzW3BmVuXR?{tE#Sd_dffa zdv180I{o$c7XyDW@D~IBBL*zX>U;$A!*##rmRA3;@W@MoL&6>i3Jx6rdnGtHbR>?i z!(M>(4h@UAy1J&e3!gvA`{aB6N6kL=YmU_reP2Lo^FMIlK$qOyypzKtqV5U_2^$a4 zMZqDV`(VH0{14clu){D*A9>E}xG&FD3+OK z95;9$KpTc_kFQy?wrglu_&*`zC|J7!`J9mBAVkQ3GK?xz-U!`@?|9Hx5_}@SJah~K{L|7iPF}P)C;(n( zQWL3)$2D-{RRfwpqoZT3=$MWc6BFllJqpi7MJsZI7!m@NP#q+KAtFSm&}heZkFBbz z>2bUv;WalLL;50nfV>Fc3!Pq9v8^N?NpGX!F3@onLB_Jg+3L6Pxim2@*Otup6EdS4t zVN}5|lF-m$;R*?xgs`%*rOt3TVy)1Dgrik)=^2?PFAQ8Q zK?7tmEhW`Tp{1sIH{453PF17`8A=_B2&D)&H6S;5knksR!W56h=v!fQ6axGgEL=1L z@~6ynvNQ3nW1Zj`<05r<+<4o72H@1RbTK4QE8VtCoYT~`G~R~^K|+Qi!YD%Wg^&>E z3W<&+{EVFRlux1HL(&8Iz-N~P1?z0DV_uS-!}9mc4jhOJ3xzWS*Vv z0#1+x1%*~YVUbl>SZoy)DJwLF>%5nbXGn%2g33{9P$A(|f*lTM51m5iNK$kaN@XDb z6vs%_EfkJOz|LK}=>1tpe5$`k)~EDYR0ZKb897LA{Iy|}nUkzx~(FUnzPP)$w}R8B|~C$K%HPH?F}Lg5hF-TO$n zz#9S5=cC5I7_q;*gZC+YdY?%T$%xsR2`?ozRb`Vnud!-sYOUJZWy+T6BhGo9_YDzLgCc=SU^o;Cxz11!6(p%% z!7Ue{MxoPW3G*C^Z-oii=C7=ODREiqbRKDsbciR*7~Pphs|ZiQm^Qt2@Cn3_KM;0{lOl zzu*&B_Sfl>_whDO^O8`U|l z^L}k@osduk5*QAW6QCrLN)<4_7!@$_vgl%+LG|z%j0mMIbdaMkIs^sZ;u8S@0Si-( z6#q5>w)~O#k(AtG-*_JqrWe^TdY0f;ty*oZSh2!tY;3ZcnwlNfB-cm;GPbpL?K*ju zs$kM&C@`OpToO{>&|uZzoeVjX422-p66iTdJ`*Kt0$myY2{rWf3Z`A;Wl#@EAbEUuZXWW0DX}r0U=_-O zjKgMjhf)-APSH%EscE|fzA9k9Hv-tz&?97?1W?xP?d{Sqvc7ZYPVo*ufBp5>)=xjR zTL%vOB%nzIy~gwX`wv(L4<59B`|UURf2<`)SbX>0ck-Mfpg~ka^{igqCTgInwr<^O ztzEZHh-cWb_mS?n&xGTUx0D;nb%<^nJrMq|U zUTHKxQ=arBJxf5}eDjR}rnij(80VBdz0LEVfBsoQg3t1Oe3vKy@}~kw%C>FWR3el_ zr|JQ=W$V^2tmc*$sYZPuAl_F6IK}|3u|I17#{Z8${wUrjKqkL^`}RrW>1j5Q3Lz;3 zMbFY>>mXZ0fP@i%k_37Z>xgpBcTgFgA@Ic)+eBHVrK%`W1(6yXuuCKfzJvgBK#;FV zaJgGAAW1M<7eVn7kB1K*7J$sQOkUK%1kNZH#trA2ym~ns_?TLN-5b42 zH4rq9%G|3#(*smisdAVDDj6bkWTX(8WZTbKs^I&&j~n5;G_t`fxu)Y2(e8voaUSiag6{m42JZXThv?t zysxLrjrUav>_z^rDRPViqi^+;zqdlj-uZ#y@RgVq{?_}X2!_RGLR8NNyJm%SD42;6 zkide)%m=EuKun8)3>pccQ6bK`K_*c%FKED<*&yZ|CSTX=u*bxx9s@Y$0+xa36OW4k z3`x5p3_|T;v0E~9pBU*dFKDL5GzlzRWO~d&1hYDmq%nTxU`l3(kw9HD!)mR-ITdD0 zU&lVnUrByuYTPW9=>-zxv7x9p+)7}2|ELNeTbLHR9Wz7Rj^dUKow-2f201&#P|)3? z=@n!Z2%|&-P*dZs^#GC~rl-Qqbhu=C8Pj9p!=4RRNlz9?8238yIcJ1T?7NKsRr1?} z=g#-${bLc}hXSQ5NC-qta9AcsohtBH8?dLx?Ikg_4#>pF*&5~r7ZF$-kp&Wm@iR=V z5P7T)K~YNf4)8}?6L3v}`~mNe`u+Dq&h2&X3nRx^8}tW*S3m_{I7f$Wb%A4&)Q}+4 z5j3Fr~xT$`a>E5x!FNRyy?2G=UF%o>Xt)DpSc7l6<}EXy*urvWfQn|%UQ5&LPTNYJarvMt7Q zlZ4(cAe$uIOl^#i4HSCk2o+?2t6d^$y35`w!#zWKtBl$`hW&)DQD1p+S;c8>8@6_5 z+gny|=-RkqU6$|kB-rx_+{!J^_`8BUx@7Jlcy4kO)VTFHf)2c3YEp1(DnpSnI zZd}z3*Sc5MuQ;K$X>|`=?@`~n=A@{YxSLTNVf(Au59p}`y-h}Tia7QMkqAgv?G18m zl@X90X7&ro!lw;fdEIP^u)8~5?z({w3EPmInsIHz^0lY1&DD)7Pb3Z+F;zFL>{d~? zyesim)-U((R9w~A1tfHZbz557dO}H6Q;(&!Ehm=Mw47X4(|k%mFEKF*=#d#oL*Yfd@7Eo5EHPS1nW^;)zrPHvawsIg7W(Ag%u4wU?+iuQ$WaR zCDl!5fQYkT=iu{sunTa05nga92)R5yDg99pu-26myzCb9BtnOVYrCAWz~f_6j;SOk&8pHYqjpae%uLj=LP7F9FDl(Dn;)1cs(_hzX!i2i8-I zDjQBFW)g4`>{Qt4xOi4kMZ>vx=)&U4#!GO#9Cj7#TD<6b*iCrJEgY#YGdf;Qg-yPj>=7%m6kOMvr29M3DPs6PwmXOMt1VEk}CZd?rGgID7L{By(2 zIKK_{PuQJ!rYG!P*!{4F^2?Sz8W9!C-r+ZANSKY2+_U4{BW&*t<~CTEY@PM64qIgP zhHA4-*4{6y7Ca9{#>A!Ml~zBE_VtE62(Z0yycgCJc9(AZZ5qoB_eL*YSP3qT^HM zWEPaalwDLg0PX6RTUyg6ueA0VwD-w^^18=>gQPs53Au-uaP3yujl@dKB*1{b2In`y z{tmkvFS!q(9|Gt{0r=^Rf{MOrxn%>Avx;6$$jE;+HYI0pWJ3CXLSvHOUJ@QRYC%xM zM+*XjvQRbdkp?<8P|NQG9KR6|U}jsqIrp+np5Au;Zh-H_`}YQ5u44Y;u!)O8V@8KW zCyk6s%orAzmOCURyZH6=yrqM(i>h7(8U29aIXLhs;CYma1p)UF8|-%2-(c5}0LH~t zFnXTs+^NAooLyY~cxGY6vuSxt`zK`(EK zCVlwHlxd^Kd_4P|_s0f}pD?*%?!5VX&}H%`F!nD+L>XEg>PHdY%=v2){bLD?MX+N1 z{rHKK>xYkeKkBVf?+3j5!MHhN@tu>V&z&$UAZRSw^IlkN>PWP4D2Nygb-t2QQvCw3 zJP#6{fl(0;=@7mP$J?j`5^$*|fU>v^58egO-v`h4&MK;W0*pSFoLxKsFMcI5A!A5L zRMJ}uf}`G<9kAqsDKkI&c-+KklSYpjKYjQ+AIuvvY~;d0ue}-k{D6VcPd(c=qi??f z^&>{UvwPCysRvO>n%@UGemY}*LgV_GjQMp4euHp$=Bzmf#*Q1m^^GAzEBe1UD7oJY zFGmj;_-e$<_>RHDMh4+8t=!nsCN4__9#(&37m^yCK^iQVFoc|G&_w=iV%%z1(15f+oD%$PTI z;yF*K#x$aun6{Z_J2OlngF&|t3BM~>^A8)}6 zZYLQ~L{Bh!FUYtb3Gt!y{H6bgFMBj4r{sx*^!z?i3F(8vVv>i1Mkl=)5|ubKI5J^a zP(=J&NRUX9u_G3T#f*fF3Ji%F6&M=zj#!A;y9;^5=S88>qiB4N&j*FajR=m6AC7mu z4Wfr3;SLRtOMNpsDeL9rtl~aU=F@P@lW5Q5aMUB{33{Wg52DSz(Dr|8Z?pSm(z}J2 zH1I2NWawW&0#1gV20If*BF@)}-~)V+-Nkiy;f;9l&FK4Y%`2TphvQiaLf8C*bQf24Z1XFa5v9 zdL{`t0d}G$LMlQB84M39gCRn7T!tdz3Unt|;Y+Vg$|$%kHYNMc_|%-cVfVzR=JtgB z8|VK{NXxw!=l8*S#ixngk8AfQq~|?=^9P(q&uhGIKcAM@3t;a{OwYR)&)ti6@ZJA{ z^-M_1yF06}0$>}i17J#;&SH;76%#Dm%(fE)vCzSEG%=n+%p{--tQ)MmCZh+AERU%S z5<+#bTI4^nVmt?#^*n&QJSHjgs@UYrtD%5v@cCNUb!gZPXe{kUW%)NHW{CZb2GW#e z7TkOUll$g*`Cq;R2EaG+{WN|T4T`uXEw}VCRDc(N2zr)<-PyXWY%|+V48%fA#72yC beE0tcPUKD)3OU|*00000NkvXXu0mjfp1*}o literal 0 HcmV?d00001