From 27023c2460a286b18af15f51b4c02871216d60b7 Mon Sep 17 00:00:00 2001
From: ElbertF <info@elbertf.com>
Date: Sat, 7 Jan 2012 12:46:56 +1100
Subject: [PATCH] Added PHP, CakePHP, Ruby, Mongrel, CouchDB, Arc Forum, Google
 Sites

---
 drivers/firefox/content/js/custom.js          |  62 --------
 drivers/firefox/content/js/evaluate.js        | 147 ------------------
 drivers/firefox/content/xul/preferences.xul   |   8 +
 .../firefox/defaults/preferences/defaults.js  |   2 +
 share/images/icons/CakePHP.ico                | Bin 0 -> 5430 bytes
 share/images/icons/Mongrel.ico                | Bin 0 -> 1150 bytes
 share/images/icons/Ruby.ico                   | Bin 0 -> 1150 bytes
 share/js/apps.js                              |   7 +-
 share/js/wappalyzer.js                        |   5 +-
 9 files changed, 16 insertions(+), 215 deletions(-)
 delete mode 100644 drivers/firefox/content/js/custom.js
 delete mode 100644 drivers/firefox/content/js/evaluate.js
 create mode 100644 share/images/icons/CakePHP.ico
 create mode 100644 share/images/icons/Mongrel.ico
 create mode 100644 share/images/icons/Ruby.ico

diff --git a/drivers/firefox/content/js/custom.js b/drivers/firefox/content/js/custom.js
deleted file mode 100644
index 9985186f1..000000000
--- a/drivers/firefox/content/js/custom.js
+++ /dev/null
@@ -1,62 +0,0 @@
-if ( typeof 'wappalyzer'  != 'undefined' ) {
-	wappalyzer.evaluateCustomApps = function(feedback) {
-		wappalyzer.log('evaluateCustomApps');
-
-		if ( wappalyzer.customApps ) {
-			try {
-				var customAppsJSON = JSON.parse(wappalyzer.customApps);
-
-				for ( appName in customAppsJSON ) {
-					wappalyzer.apps[appName] = {};
-
-					// Icon
-					if ( typeof(customAppsJSON[appName].icon) == 'string' ) {
-						wappalyzer.apps[appName].icon = customAppsJSON[appName].icon;
-					}
-					else {
-						wappalyzer.apps[appName].icon = 'chrome://wappalyzer/skin/app_icons/_placeholder.ico';
-					}
-
-					// Categories
-					if ( typeof(customAppsJSON[appName].categories) == 'object' ) {
-						wappalyzer.apps[appName].cats = {};
-
-						for ( i in customAppsJSON[appName].categories ) {
-							wappalyzer.apps[appName].cats[i] = parseInt(customAppsJSON[appName].categories[i]);
-						}
-					}
-
-					// HTML
-					if ( typeof(customAppsJSON[appName].html) == 'string' ) {
-						wappalyzer.apps[appName].html = new RegExp(customAppsJSON[appName].html, 'i');
-					}
-
-					// URL
-					if ( typeof(customAppsJSON[appName].url) == 'string' ) {
-						wappalyzer.apps[appName].url = new RegExp(customAppsJSON[appName].url, 'i');
-					}
-
-					// Headers
-					if ( typeof(customAppsJSON[appName].headers) == 'object' ) {
-						wappalyzer.apps[appName].headers = {};
-
-						for ( headerName in customAppsJSON[appName].headers ) {
-							wappalyzer.apps[appName].headers[headerName] = new RegExp(customAppsJSON[appName].headers[headerName], 'i');
-						}
-					}
-				}
-
-				if ( feedback ) {
-					alert('Ok');
-				}
-			}
-			catch(e) {
-				wappalyzer.log('JSON error in custom applications');
-
-				if ( feedback ) {
-					alert('Error: malformed JSON');
-				}
-			}
-		}
-	};
-}
diff --git a/drivers/firefox/content/js/evaluate.js b/drivers/firefox/content/js/evaluate.js
deleted file mode 100644
index 7f4866e69..000000000
--- a/drivers/firefox/content/js/evaluate.js
+++ /dev/null
@@ -1,147 +0,0 @@
-if ( typeof(wappalyzer) == 'undefined' )
-{
-	var wappalyzer = {};
-
-	wappalyzer.log = function(message)
-	{
-		if ( message )
-		{
-			var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
-
-			consoleService.logStringMessage("Wappalyzer: " + message);
-		}
-	};
-}
-
-wappalyzer.evaluateCustomApps = function(customApps, feedback)
-{
-	wappalyzer.log('evaluateCustomApps');
-
-	var appsAdded = {};
-
-	if ( customApps || wappalyzer.customApps )
-	{
-		try
-		{
-			var customAppsJSON = JSON.parse(feedback ? customApps : wappalyzer.customApps);
-
-			for ( appName in customAppsJSON )
-			{
-				wappalyzer.apps[appName] = {
-					custom: true
-					};
-
-				appsAdded[appName] = true;
-
-				// Icon
-				if ( typeof(customAppsJSON[appName].icon) == 'string' )
-				{
-					wappalyzer.apps[appName].icon = customAppsJSON[appName].icon;
-				}
-				else
-				{
-					wappalyzer.apps[appName].icon = 'chrome://wappalyzer/skin/app_icons/_placeholder.ico';
-				}
-
-				// Categories
-				if ( typeof(customAppsJSON[appName].categories) == 'object' )
-				{
-					wappalyzer.apps[appName].cats = {};
-
-					for ( i in customAppsJSON[appName].categories )
-					{
-						var id = parseInt(customAppsJSON[appName].categories[i]);
-
-						if ( typeof(wappalyzer.cats[id]) != 'undefined' )
-						{
-							wappalyzer.apps[appName].cats[i] = id;
-						}
-					}
-				}
-
-				// HTML
-				if ( typeof(customAppsJSON[appName].html) == 'string' )
-				{
-					wappalyzer.apps[appName].html = new RegExp(customAppsJSON[appName].html, 'i');
-				}
-
-				// URL
-				if ( typeof(customAppsJSON[appName].url) == 'string' )
-				{
-					wappalyzer.apps[appName].url = new RegExp(customAppsJSON[appName].url, 'i');
-				}
-
-				// Headers
-				if ( typeof(customAppsJSON[appName].headers) == 'object' )
-				{
-					wappalyzer.apps[appName].headers = {};
-
-					for ( headerName in customAppsJSON[appName].headers )
-					{
-						wappalyzer.apps[appName].headers[headerName] = new RegExp(customAppsJSON[appName].headers[headerName], 'i');
-					}
-				}
-			}
-
-			if ( feedback )
-			{
-				var text  = '';
-				var count = 0;
-
-				for ( appName in appsAdded )
-				{
-					text += ' \n\n' + appName;
-
-					if ( typeof(wappalyzer.apps[appName].cats) == 'object' )
-					{
-						for ( i in wappalyzer.apps[appName].cats )
-						{
-							text += ' [' + wappalyzer.cats[wappalyzer.apps[appName].cats[i]].name + ']';
-						}
-					}
-
-					text += '\n    Icon [' + ( wappalyzer.apps[appName].icon != 'chrome://wappalyzer/skin/app_icons/_placeholder.ico' ? 'Yes' : 'No' ) + ']';
-
-					text +=
-						'  HTML ['    + ( typeof(wappalyzer.apps[appName].html) == 'object' ? 'Yes' : 'No' ) + ']' +
-						'  URL ['     + ( typeof(wappalyzer.apps[appName].url)  == 'object' ? 'Yes' : 'No' ) + ']'
-						;
-
-					text += '  Headers';
-
-					if ( typeof(wappalyzer.apps[appName].headers) == 'object' )
-					{
-						for ( header in wappalyzer.apps[appName].headers )
-						{
-							text += ' [' + header + ']';
-						}
-					}
-					else
-					{
-						text += ' [No]';
-					}
-
-					count ++;
-				}
-
-				alert('Ok. Found ' + count + ' application(s):' + text);
-			}
-		}
-		catch(e)
-		{
-			wappalyzer.log('evaluateCustomApps: malformed JSON');
-
-			if ( feedback )
-			{
-				alert('Error: malformed JSON.');
-			}
-		}
-	}
-	else
-	{
-		if ( feedback )
-		{
-			alert('Nothing to evaluate!');
-		}
-	}
-};
diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index fcd08bfb0..3b9b75993 100755
--- a/drivers/firefox/content/xul/preferences.xul
+++ b/drivers/firefox/content/xul/preferences.xul
@@ -33,6 +33,8 @@
 			<preference id="wappalyzer-cat23" name="extensions.wappalyzer.cat23" type="bool"/>
 			<preference id="wappalyzer-cat24" name="extensions.wappalyzer.cat24" type="bool"/>
 			<preference id="wappalyzer-cat25" name="extensions.wappalyzer.cat25" type="bool"/>
+			<preference id="wappalyzer-cat26" name="extensions.wappalyzer.cat26" type="bool"/>
+			<preference id="wappalyzer-cat27" name="extensions.wappalyzer.cat27" type="bool"/>
 
 			<preference id="wappalyzer-tracking" name="extensions.wappalyzer.tracking" type="bool"/>
 		</preferences>
@@ -144,6 +146,12 @@
 									<hbox align="center">
 										<checkbox preference="wappalyzer-cat25" id="wappalyzer-option-cat25" label="&wappalyzer.cat25;"/>
 									</hbox>
+									<hbox align="center">
+										<checkbox preference="wappalyzer-cat26" id="wappalyzer-option-cat26" label="&wappalyzer.cat26;"/>
+									</hbox>
+									<hbox align="center">
+										<checkbox preference="wappalyzer-cat27" id="wappalyzer-option-cat27" label="&wappalyzer.cat27;"/>
+									</hbox>
 								</row>
 							</rows>
 						</grid>
diff --git a/drivers/firefox/defaults/preferences/defaults.js b/drivers/firefox/defaults/preferences/defaults.js
index ae978ff25..1982b0b52 100644
--- a/drivers/firefox/defaults/preferences/defaults.js
+++ b/drivers/firefox/defaults/preferences/defaults.js
@@ -29,3 +29,5 @@ pref('extensions.wappalyzer.cat22',     true);
 pref('extensions.wappalyzer.cat23',     true);
 pref('extensions.wappalyzer.cat24',     true);
 pref('extensions.wappalyzer.cat25',     true);
+pref('extensions.wappalyzer.cat26',     true);
+pref('extensions.wappalyzer.cat27',     true);
diff --git a/share/images/icons/CakePHP.ico b/share/images/icons/CakePHP.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b88e45daf7f1dc2725c54160850bd93acf1cddbc
GIT binary patch
literal 5430
zcmd^DdrZ_<7N*-xn*F0`H=9lW=w?&5NxQqvW}7so+eaFy?bdcnA8M7SiuHja?_mIk
z=g4aqU}hLzGt3MF%z%g>3IaY*R1^X6QBg!h<Tb+p!!W$9;<x8scDfX6-KHj+?2=sW
zonL<Uo^$W{&Ue21b8>ph=@(AVKkr0;FFE=A(#h!+HhO8{_g;FQPS5^GKiMnn@l*W2
zlhX=%zVr{kQ%|zB)>kewrU{KD3X!!UFM0NWHf6RTInZJoHvRf>c1mOs8*7Z&_XY<C
zF+6I8dB_6G@F*Ipieb8Q^Ti*VU#U*`@N8`v+8U3cGGB(W+yorZNKvUvL!NjCdONSY
z%;uM8$9`Ux8RfimEq!u8QAM5vCl3{)zrPP7RvSjg#$mNhpygBzvLZGqv*Sa$WQkFb
z2D+9mou3)zF*q>Lj~myn;MCz#9MsEDtcXIfJQBJDf21WwL!&D|o<<8vklWp*^ABhw
zca5?r9Nn+O^(z-(GMO<nJi^;eT2maf88N%u5aYWJQJX)8)!g^2V~vj1hF5c=wt$_R
zWn>h$I<KRtz8WVE8c<(Zgp&sgAr9OCl}e2~tsb#{?l@kWv(+)bJUcF_{bDoO&WDlw
zJ#5ILGcQ3)LoF`Qd206fBF4`HaRD0;=kLYWDoP1VbIjK#>{8}LevNP1nt0qyW;6F?
zU|;|P{ryM?aDzN00V;JKH2H;4%F`eV{Ib?DKUd`4*4xv~=de9En#nwbYGV!*=~85*
zrywOd1c`p@us0_Ws_3m&$Nb{-@HTc<6oBvM4h|0B){X0k@m>jaq5wzsX>jdQ3qMyD
z*J9ajyJLQpCfWJee(gPmHHU51_jGr0ELcXY7&Mu{_QT#eQ@bB!nbF%F^I2b`PhVan
z4ZTL^e(!eI4UXL*%P<z2g|Btt?D5%RnW(=~mGIHxxr@i=YWBWmObJ%(%Zxo~Ob;J4
zqzTP5K5LMMC{G>8U%B|*Coy(%0)9?oJo6H@71SI&6U(`Y9xVEM62AVguQ7lB{xf##
z@UrHk<q-yHa9ehSmo-DMel~meh7r~jp{|n|f_1Zpv`GhNCdXfRlIQW@!GovIAK5Qb
zMR_AP>T8r{#i6cLjdMpUiT{pJt3xyKK~0GYvY^!%HTC}GN!cIh?sz9t=wZ)K4#LHA
zCt$W%U>%>p*!U#I>{GDWr>RY0YHl8*#K*Z&n=#aTYx$F~-`jcBS?cS;InOpRgNd1Y
z+~zRlyoorVulEk_-0tRWpr81KI6y`AsUE%cbM2dZyOzfjKee8&!#!GTcyx?7sujm7
z3Q(FI2fZX1d2u_D8@&}d#P6zDA7~Q;Al~#I`fs&ARKu7*GgJ28KA4|>`f<M9zxVC0
z^ohGV&K*BQuL6y=<w*5k1BJj1g=yg^S0@u^=HYZr8P1=mrgoUO#v>Jw?EDmWIxc;W
z!>%`<+^CJ))}!0w(>*sc^_$1pA0HihIYa2i&(}cqq`N*xNk%j-H=p60X&q;ApIV4N
z#l<!;jq&L@%sl|KRFC>@wmaXQoqmouF)feminqI9Pmni+Yu~{1gzd4paiy`&S1xcx
zdf*xuWD&UC)d{P8lH-nXJgX<HmJah~rQS-KV2oq1Fjat*9WF@T`5D9ko{&*(S5sZj
zH<V)crjOB3u2DX2{|9o#NBlncJ+HHDZwz}(bC`#Q(AU?;HNg4$D%6&$NK43Zs6dYD
zqD-EHd4z)~pRbUerR17Iqsu2<p@ZI7hIqkNs3N^BkF&3d-QH6m6=3#0D5vabzuZE#
zHfsTM;+-6C8DXAabzL3j!?CA|*~WiIyZ;Tzk^a!=i+DZPQm>}ko<sgb`K(5o-)Ch0
z$8}|PxQG2#X9sR}TqBJ8LKeJ^u<g(H+1yaWal!Io#5&IX8y&NAJvL3s>3F#g@gd$&
zYYU(xUBGlnn8yl)d98%N^<6}|F30@*{bwHK1LHcS&~37&B!^<?LVMkgOXp8x>|YqO
z67R4$m`Q_~%qG$d)Tn2gz)lXFJ64I%b?+j4(<cb?d>?}KZzFogTF9mG$W){u@RL_C
zGT8IiN7=WHm|hjQ{2B7#^=La=&v}m7WO~O;jqRK99(%?x!EndVf;2J1|D~oA5UhO@
z;^42LOp|b3$6}x>FcKd02>Rl6oUbd5`Jppl+;Fj>DnPt(1#Vvd2IG^nw6=}o+%h_f
zZi-1`T?OZV7WWLHCvk!+<e_d*P}37fQ(Z#1*ZXw-`Op;_p(RbHAzhi9n+s{25IaBo
z0}g4DaCdIzxus`tcXsBv@@z4xNn;Y#^1Nbtw~DZxM|qv<_a%~d`~&ik^-vSei&Dc-
zLOPo9p;0CxZVE%ts$~#(lCC4nDbpoLitt6W&srXfQ1|!X|LJQmN`o;wJ^2t1v1i8A
z5VW2-N_)LQco#t8`#I@*Z^E7eo$Z$?1{QwatOnU8S#D1Ac+AX$aCsXd*S8Sj?hMfu
z7YIF^Iqu^8Jt3Efp)DwaMC1o$=sHY{4KG`||0(;}i^RM9ZV<nDCA0~F9DB@$eQJ(#
zj+yCa!W^qLTtidOaABo9Eldr?j#Yo6yMQ~A!hH#EGCKbvZa0tO!SuB(DHgF_Z=>gW
z+s8}oTl#M;m-wtg_?p*A?`x^veam@|VVv1wx_Pk%c8r;3zS?pIBCi#YrzSyPTt+qx
zbf3^cou}a#V85CDq{v|SeegTf@5@y!wcm2AB0~7ZYiOW*)&%7e+v|eef9rmSO-Ik}
z6O4Zu_I7VyOFX-m-=mmqjlK{$Ik`v@1wy!C6++g(14+PFh;(}sOhYZTU#5(y&kEnb
zbBf(BAGKeHZPt&B*?7)HcsV0enL%8yL%L)S5(syqZL8@_R)WPcN3@CdWgy-d<oC`W
z;^8u7)X5S>B+qRgV_JW)t)*jr4<tVoLU-)?ayi5yTOiuB3gRt)hce6qW!ZahwY8CB
z#c^k4SgNlmL{^ylcXu4eIkX->5SkI{zHl#j=+3m%mjR3r7uD@mBjBT#$p;UV$VF%*
zP0-)hOMGnSxxwls^ONC~;mAgu!gDn#;Htx}qi6YNkOW;hY*2FSvHQ`Z;?MLKi+vN-
z!AngIJSS~avy_X|+<(WNY#~qjxepA_mzz%`&HoE@U2a<Au)DaoTP@47!aS|?Z34sO
z`xw<;#=Sq}2Ybf&m+|oeUIxFPCp>2cDV}!j*Qx5gq-9(v_bxt^dy9RTvfEy$$QB=A
z+Vg0cmaom~5Bu(6p)+Cm&i2mEm7guELA;siUHUda?=XGBGz-hkrsGwdpLOD$o&Tve
zW_9qJv&Xh(2;3$!Lfs}0Q~hrtE!x%5&h0Zi4b$EiY7o^SsuOI?Y<JTg_hQpY{>?xg
zx4kFbfA#!{{aVG`%=AN?zj)t|8k<Q^*A^)X^zo!UB0QlX4N@o#B^-rwU06)oknZfD
zJ2tfOe#qIq5t_JdIH*pn>TbW_@~Cxx%JXmU&OOVt;|Sett~S+s*BO-g`!YnQ3X=S<
nGOb)96E@Wp$c$|b)d7~i?l%~hvwHSZZ2Z5zyXaHEe`WYj{#P~s

literal 0
HcmV?d00001

diff --git a/share/images/icons/Mongrel.ico b/share/images/icons/Mongrel.ico
new file mode 100644
index 0000000000000000000000000000000000000000..36829b9a5194426788a086ffabc266061549a29c
GIT binary patch
literal 1150
zcmbtSeN4=89R8%EKN>ZSjkU?xFf&`xN=;Xs8dA=sVbVeiTg@b!P=B#$Z8k4MFGePB
z)hJ0+!mJbtrS*E3>0EVJQoE>rkLR+4HGgoo&+l{h{65di_eI2xUuS3G(@kPjA~Qu~
zA&U@^A2{2D9{}>dHKA}=*d$ROaF#Xk(?uOQg)?@4&W-tg=!F;uAl(W$k~~Q~_c_fA
zOY~lukXzt;r1+7W?pUa(V`hsw+1|{&#u132@AurJ`aV&P&g&AFE{jY}^E}aP@wy5u
zF9N(WtY6&sX63tTlhoq9)5$hF=56bvT+axn<q^k|J&sm<^1TeK%?32r0p9{({Uact
z81TF>VDZ|Ues+=e(5zoIWO3N!=u<_h?&lQ*WC0=MZX#E61MsK+2J&@f)MWS02X<W2
zXNyO)>Su=DHran&pSdCf2qriDHn8!A0!^-hwa>_Z0&K4UHa`VcGsmt%rSxlO>-f11
zndD%e>6Rb8bveK`daTbGLhyYBx>_K#n%Hal)-VG#_LSiz2F>GqSR}sSbIB^^-BJi_
zB`^5SFhZF(yaCX@qwX6Z>OFH&Yxi?Be`u&3&yN8~D6zf`yh|T)*5!{tTReg|&L?!y
zx0%>0YSnXJs1@-7rk45|$Dixx8N`(j8G`O{ww(Exb)TMVtpxm-H`)Ni8p)$hNF6n*
z(bwME=rYE)_L)`Mhv-<q?1AJip@z#X7WZ<-HFloGd}{kwaV>4ECRjgq80U`hZT(!s
z@JaI9Bpr%e092X4RPN_g-k~X1IB=0gd~qHcvh+$yzs2-hew)U(?iN*5YnRXAawTO^
zHX7v&!P9_i7Cy$7BCWF35;WY?;qa@k?RRHKyYv{_#oDPC^fU|lngrc?hX-|L&CQw~
vUH>P;v{8)j22BR(H5x`af9m|(f8jk4QIbRk=ZNSXL>}A!y=-$fj;+1}#fz*i

literal 0
HcmV?d00001

diff --git a/share/images/icons/Ruby.ico b/share/images/icons/Ruby.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7f8cb129e27da5e63aa927b5c74a768c1ce524a6
GIT binary patch
literal 1150
zcmbu8d29@E6vyA}F|*g~%xo_$t!+~jL8MBM;4int9}-tW1P$>A{YQvUP0>ndZPb>w
z(kgA2tlq7vs<v7y&Jdz*K^$=eb*1Rno3KeEgv3m~^WMC?&-=aiGD9Trt*XRNH?1%c
zg%eQ%i$fgw5ohz;3jqDE4CWHerg%!Nj;!aZ`Oq_qwcwWM@LqIids~#yqAD%Cv?x5P
zVpnub<K~2f!0M!=t4pHdio=5ET9y25b~zWavkWd<1#Ds=NX!9AnUL%`2-RxPuTKl&
zV=iH6{7po}_%SBw_KYBJQwy48xdd^8F2L<R1E*LFLCWPC*&uTU%oYz^&T2%4HNzIV
z4@TE^uG6_F$Xi2>9v?BH84H&_#pGEJ5TPE0V9sOS%gW*!TVW7A5ETyuZ3`?RIdJzq
zpAzH;j=bcrJN61~9Ul-l{{@Q|oCVQt2$ljC&tfU%S#&=YCM^RN&5JO#Aw9^KSHCSx
z&wPl)u}zpWuN?V>*DyS(8G^kQl2*t0^)T7@gG^~K*wfhG4ar>M4e~cSKjy^@sOO${
z@VVRI2-}N!%iA$^_7%hq2_SZ802YP&FlF*QX%I|1IWNx_<X^q+o)+DI4@lS!k~xoe
zNsfb<IsY`Wy)Uq0%{_>E+{8KJF5U;%A#Y=l*X@Q)trbMPE3FLV@`IFe&hue?`gK&-
zKI$RLXZ8Tc^cq`1hOBeF`L6ffiK8Y~ej-yb*QfxgRoq84B(`feUV{=@1EcJR(QyQV
zRqtg>XK!BjZ{B@7H+ER%XEONs{2Gw6p7&mdk>djxH{~)kcRSSR#vW15h9IUq`IXn-
z@7(X2o;azgi->2iGOwI~HL?Sx{x?{*>UxjORrF1AX2I-8ef&FKkG=o!Wx}S6&Wj=O
ztvzIEMa1B%@K?P={IFV(tpHYaCqzd|;h*@QapUtB-J=^$z4M%G>ncxPdCMoe+7BCT
tm3~R_tTRf<@?ZFW{I7{x6r#<>UJ}^<sTQ`n9<bi9KC`~EAhGx>_zvG_M(6+l

literal 0
HcmV?d00001

diff --git a/share/js/apps.js b/share/js/apps.js
index f845d9cef..5478763b0 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -54,6 +54,7 @@
 		'Blogger':               { cats: { 1: 11 }, meta: { 'generator': /blogger/i }, url: /^(www.)?.+\.blogspot\.com/i },
 		'Bugzilla':              { cats: { 1: 13 }, html: /<[^>]+(id|title|name)=("|')bugzilla/i },
 		'Burning Board':         { cats: { 1:  2 }, html: /<a href=('|")[^>]+woltlab\.com.+Burning Board/i },
+		'CakePHP':               { cats: { 1: 18 }, headers: { 'Set-Cookie': /CAKEPHP=/ }, meta: { 'application-name': /CakePHP/ } },
 		'Chameleon':             { cats: { 1:  1 }, meta: { 'generator': /chameleon\-cms/i } },
 		'chartbeat':             { cats: { 1: 10 }, html: /function loadChartbeat\(\) {/i },
 		'Chamilo':               { cats: { 1: 21 }, meta: { 'generator': /Chamilo/i }, headers: { 'X-Powered-By': /Chamilo/ } },
@@ -150,6 +151,7 @@
 		'Modernizr':             { cats: { 1: 12 }, script: /modernizr.*\.js/ },
 		'MODx':                  { cats: { 1:  1 }, html: /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)|<(link|script)[^>]+assets\/(templates|snippets)\//i },
 		'Mollom':                { cats: { 1: 16 }, script: /mollom\.js/, html: /<img[^>]+\/.mollom\/.com/i },
+		'Mongrel':               { cats: { 1: 22 }, headers: { 'Server': /Mongrel/ } },
 		'Moodle':                { cats: { 1: 21 }, html: /(var moodleConfigFn = function\(me\)|<img[^>]+moodlelogo)/i },
 		'Moogo':                 { cats: { 1:  1 }, script: /kotisivukone.js/ },
 		'MooTools':              { cats: { 1: 12 }, script: /mootools.*\.js/, env: /^MooTools$/ },
@@ -194,6 +196,7 @@
 		'Redmine':               { cats: { 1: 13 }, meta: { 'description': /Redmine/i }, html: /Powered by <a href=("|')[^>]+Redmine/i },
 		'Reinvigorate':          { cats: { 1: 10 }, html: /reinvigorate\.track\("/ },
 		'RequireJS':             { cats: { 1: 12 }, script: /require.*\.js/ , env: /^requirejs$/},
+		'Ruby':                  { cats: { 1: 27 }, headers: { 'Server': /(Mongrel|WEBrick|Ruby)/ } },
 		'S.Builder':             { cats: { 1:  1 }, meta: { 'generator': /S\.Builder/i } },
 		's9y':                   { cats: { 1:  1 }, meta: { 'generator': /Serendipity/i } },
 		'script.aculo.us':       { cats: { 1: 12 }, script: /(scriptaculous|protoaculous)\.js/, env: /^Scriptaculous$/ },
@@ -225,9 +228,9 @@
 		'Twitter Bootstrap':     { cats: { 1: 18 }, script: /twitter\.github\.com\/bootstrap/, html: /<link[^>]+bootstrap[^>]+css/, env: /^Twipsy$/ },
 		'Typekit':               { cats: { 1: 17 }, script: /use.typekit.com/, env: /^Typekit$/ },
 		'TypePad':               { cats: { 1: 11 }, meta: { 'generator': /typepad/i }, url: /^(www.)?.+\.typepad\.com/i },
-		'TYPO3':                 { cats: { 1:  1 }, meta: { 'generator': /TYPO3/i }, html: /(<(script[^>]* src|link[^>]* href)=[^>]*fileadmin)/i, url: /\/typo3/i },
+		'TYPO3':                 { cats: { 1:  1 }, meta: { 'generator': /TYPO3/i }, html: /(<(script[^>]* src|link[^>]* href)=[^>]*fileadmin|<!--TYPO3SEARCH)/i, url: /\/typo3/i },
 		'Ubercart':              { cats: { 1:  6 }, script: /uc_cart\/uc_cart_block\.js/ },
-		'Umbraco':               { cats: { 1:  1 }, headers: { 'X-Umbraco-Version': /.+/ } },
+		'Umbraco':               { cats: { 1:  1 }, meta: { 'generator': /umbraco/i }, headers: { 'X-Umbraco-Version': /.+/ }, html: /powered by <a href=[^>]+umbraco/i },
 		'Underscore.js':         { cats: { 1: 12 }, script: /underscore.*\.js/ },
 		'UserRules':             { cats: { 1: 13 }, html: /var _usrp =/ , env: /^\_usrp$/ },
 		'Vanilla':               { cats: { 1:  2 }, html: /<body id=("|')(DiscussionsPage|vanilla)/i, headers: { 'X-Powered-By': /Vanilla/ } },
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 64d85fc65..5349f7fa0 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -153,7 +153,6 @@ var wappalyzer = wappalyzer || (function() {
 
 								for ( var header in w.apps[app].headers ) {
 									if ( data[type][header] != null && w.apps[app][type][header].test(data[type][header]) ) {
-					if ( app == 'PHP' ) alert('x');
 										apps.push(app);
 
 										break;
@@ -199,9 +198,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 
 					// Per URL
-					var index = w.detected[url].indexOf(app);
-
-					if ( index === -1 ) w.detected[url].push(app);
+					if ( w.detected[url].indexOf(app) === -1 ) w.detected[url].push(app);
 				});
 
 				delete apps, data;