Added Worpress Super Cache, W3 Total Cache, fixed dropdown menu in FF driver

drivers/bookmarklet/js/apps.js

@@ -813,10 +813,9 @@
 			env: /^Liferay$/,
 			headers: { 'Liferay-Portal': /.*/i }
 		},
-		'LightMon': {
+		'LightMon Engine': {
 			cats: [ 1 ],
-			meta: { 'generator': /LightMon/i },
-			headers: { 'X-Powered-By': /LightMon/i },
+			html: /<!-- Lightmon Engine Copyright Lightmon/i,
 			implies: [ 'PHP' ]
 		},
 		'lighttpd': {
@@ -1102,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1495,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1562,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i

drivers/bookmarklet/js/wappalyzer.js

@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;

drivers/chrome/js/apps.js

@@ -813,10 +813,9 @@
 			env: /^Liferay$/,
 			headers: { 'Liferay-Portal': /.*/i }
 		},
-		'LightMon': {
+		'LightMon Engine': {
 			cats: [ 1 ],
-			meta: { 'generator': /LightMon/i },
-			headers: { 'X-Powered-By': /LightMon/i },
+			html: /<!-- Lightmon Engine Copyright Lightmon/i,
 			implies: [ 'PHP' ]
 		},
 		'lighttpd': {
@@ -1102,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1495,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1562,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i

drivers/chrome/js/wappalyzer.js

@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;

drivers/firefox/content/js/apps.js

@@ -813,10 +813,9 @@
 			env: /^Liferay$/,
 			headers: { 'Liferay-Portal': /.*/i }
 		},
-		'LightMon': {
+		'LightMon Engine': {
 			cats: [ 1 ],
-			meta: { 'generator': /LightMon/i },
-			headers: { 'X-Powered-By': /LightMon/i },
+			html: /<!-- Lightmon Engine Copyright Lightmon/i,
 			implies: [ 'PHP' ]
 		},
 		'lighttpd': {
@@ -1102,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1495,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1562,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i

drivers/firefox/content/js/content.js

@@ -7,7 +7,12 @@
 		if ( content.document.contentType != 'text/html' ) { return };
 
 		// HTML
-		var html = content.document.documentElement.outerHTML
+		var html = content.document.documentElement.outerHTML;
+
+		// Comments outside HTML
+		//if ( content.document.lastChild.nodeType === 8 ) {
+			//content.alert(content.document.lastChild.nodeValue);
+		//}
 
 		if ( html.length > 50000 ) {
 			html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);

drivers/firefox/content/js/driver.js

@@ -101,8 +101,7 @@
 		 * Display apps
 		 */
 		displayApps: function() {
-			var
-				i, j, showCat, cat, image, menuSeparator, menuItem, url = gBrowser.currentURI.spec.split('#')[0];
+			var image, url = gBrowser.currentURI.spec.split('#')[0];
 
 			$('#wappalyzer-container > image, #wappalyzer-menu > menuitem, #wappalyzer-menu > menuseparator').addClass('wappalyzer-remove');
 
@@ -114,6 +113,8 @@
 				}
 
 				w.detected[url].map(function(app, i) {
+					var j, cat, showCat, menuSeparator, menuItem;
+
 					for ( i in w.apps[app].cats ) {
 						showCat = false;
 
@@ -145,7 +146,7 @@
 							$('#wappalyzer-menu').append(menuItem);
 
 							for ( j in w.apps[app].cats ) {
-								cat = w.apps[app].cats[i];
+								var cat = w.apps[app].cats[j];
 
 								menuItem = $('<menuitem/>')
 									.attr('class', 'wappalyzer-category')

drivers/firefox/content/js/wappalyzer.js

@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;

drivers/firefox/install.rdf

@@ -3,7 +3,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>wappalyzer@crunchlabz.com</em:id>
-		<em:version>2.3.1</em:version>
+		<em:version>2.3.2</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 

drivers/html/js/apps.js

@@ -813,10 +813,9 @@
 			env: /^Liferay$/,
 			headers: { 'Liferay-Portal': /.*/i }
 		},
-		'LightMon': {
+		'LightMon Engine': {
 			cats: [ 1 ],
-			meta: { 'generator': /LightMon/i },
-			headers: { 'X-Powered-By': /LightMon/i },
+			html: /<!-- Lightmon Engine Copyright Lightmon/i,
 			implies: [ 'PHP' ]
 		},
 		'lighttpd': {
@@ -1102,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1495,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1562,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i

drivers/html/js/wappalyzer.js

@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;

share/js/apps.js

@@ -1101,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1494,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1561,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i

share/js/wappalyzer.js

@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;