From ae66a578baf9bd1d1daa07bbc44ec755998c618e Mon Sep 17 00:00:00 2001
From: ElbertF <info@elbertf.com>
Date: Sat, 24 Dec 2011 16:13:46 +1100
Subject: [PATCH] Work on Firefox adapter

---
 adapters/firefox/chrome.manifest              |   8 +-
 adapters/firefox/chrome/content/js/adapter.js | 675 ------------------
 adapters/firefox/chrome/content/js/content.js | 122 ----
 .../firefox/chrome/content/xul/wappalyzer.xul |  58 --
 .../chrome/locale/en-US/wappalyzer.dtd        |  51 --
 .../chrome/locale/en-US/wappalyzer.properties |   3 -
 adapters/firefox/content/js/adapter.js        |  68 ++
 .../firefox/{chrome => }/content/js/apps.js   |   0
 adapters/firefox/content/js/content.js        |  28 +
 .../firefox/{chrome => }/content/js/custom.js |   0
 .../{chrome => }/content/js/evaluate.js       |   0
 .../{chrome => }/content/js/options.js        |   0
 .../{chrome => }/content/js/wappalyzer.js     |   0
 .../{chrome => }/content/xul/options.xul      |   0
 adapters/firefox/content/xul/wappalyzer.xul   |  40 ++
 adapters/firefox/locale/en-US/wappalyzer.dtd  |  27 +
 .../locale/en-US/wappalyzer.properties        |   1 +
 .../{chrome => }/skin/css/wappalyzer.css      |   0
 .../{chrome => }/skin/images/donate.png       | Bin
 .../{chrome => }/skin/images/feedback.png     | Bin
 .../{chrome => }/skin/images/github.ico       | Bin
 .../{chrome => }/skin/images/icon16x16.ico    | Bin
 .../skin/images/icon16x16_hot.ico             | Bin
 .../{chrome => }/skin/images/icon32x32.png    | Bin
 .../firefox/{chrome => }/skin/images/icons    |   0
 .../{chrome => }/skin/images/options.png      | Bin
 .../{chrome => }/skin/images/twitter.ico      | Bin
 adapters/html/images/icon.png                 | Bin 0 -> 12044 bytes
 adapters/html/index.html                      |   2 +
 adapters/html/js/adapter.js                   |   7 +
 wappalyzer.js                                 | 158 ++--
 31 files changed, 265 insertions(+), 983 deletions(-)
 delete mode 100644 adapters/firefox/chrome/content/js/adapter.js
 delete mode 100644 adapters/firefox/chrome/content/js/content.js
 delete mode 100755 adapters/firefox/chrome/content/xul/wappalyzer.xul
 delete mode 100755 adapters/firefox/chrome/locale/en-US/wappalyzer.dtd
 delete mode 100755 adapters/firefox/chrome/locale/en-US/wappalyzer.properties
 create mode 100644 adapters/firefox/content/js/adapter.js
 rename adapters/firefox/{chrome => }/content/js/apps.js (100%)
 create mode 100644 adapters/firefox/content/js/content.js
 rename adapters/firefox/{chrome => }/content/js/custom.js (100%)
 rename adapters/firefox/{chrome => }/content/js/evaluate.js (100%)
 rename adapters/firefox/{chrome => }/content/js/options.js (100%)
 rename adapters/firefox/{chrome => }/content/js/wappalyzer.js (100%)
 rename adapters/firefox/{chrome => }/content/xul/options.xul (100%)
 create mode 100755 adapters/firefox/content/xul/wappalyzer.xul
 create mode 100755 adapters/firefox/locale/en-US/wappalyzer.dtd
 create mode 100755 adapters/firefox/locale/en-US/wappalyzer.properties
 rename adapters/firefox/{chrome => }/skin/css/wappalyzer.css (100%)
 rename adapters/firefox/{chrome => }/skin/images/donate.png (100%)
 rename adapters/firefox/{chrome => }/skin/images/feedback.png (100%)
 rename adapters/firefox/{chrome => }/skin/images/github.ico (100%)
 rename adapters/firefox/{chrome => }/skin/images/icon16x16.ico (100%)
 rename adapters/firefox/{chrome => }/skin/images/icon16x16_hot.ico (100%)
 rename adapters/firefox/{chrome => }/skin/images/icon32x32.png (100%)
 rename adapters/firefox/{chrome => }/skin/images/icons (100%)
 rename adapters/firefox/{chrome => }/skin/images/options.png (100%)
 rename adapters/firefox/{chrome => }/skin/images/twitter.ico (100%)
 create mode 100644 adapters/html/images/icon.png

diff --git a/adapters/firefox/chrome.manifest b/adapters/firefox/chrome.manifest
index a8be77a4a..2c74ed59d 100644
--- a/adapters/firefox/chrome.manifest
+++ b/adapters/firefox/chrome.manifest
@@ -1,5 +1,5 @@
-content wappalyzer chrome/content/
-locale  wappalyzer en-US chrome/locale/en-US/
-skin    wappalyzer classic/1.0 chrome/skin/
+content wappalyzer content/
+locale  wappalyzer en-US locale/en-US/
+skin    wappalyzer classic/1.0 skin/
 
-overlay chrome://browser/content/browser.xul chrome://wappalyzer/content/wappalyzer.xul
+overlay chrome://browser/content/browser.xul chrome://wappalyzer/content/xul/wappalyzer.xul
diff --git a/adapters/firefox/chrome/content/js/adapter.js b/adapters/firefox/chrome/content/js/adapter.js
deleted file mode 100644
index aa0f7bdc3..000000000
--- a/adapters/firefox/chrome/content/js/adapter.js
+++ /dev/null
@@ -1,675 +0,0 @@
-// Wappalyzer by ElbertF 2009 http://elbertf.com
-
-var wappalyzer = (function() {
-	var self = {
-		apps:           {},
-		appsDetected:   0,
-		browser:        false,
-		cats:           {},
-		checkUnique:    {},
-		currentTab:     false,
-		customApps:     '',
-		debug:          false,
-		enableTracking: true,
-		githubUrl:      'https://github.com/ElbertF/Wappalyzer',
-		history:        {},
-		hitCount:       0,
-		homeUrl:        'http://wappalyzer.com/',
-		hoverTimeout:   false,
-		newInstall:     false,
-		popupOnHover:   true,
-		prevUrl:        '',
-		prefs:          {},
-		regexBlacklist: /(dev\.|\/admin|\.local)/,
-		regexDomain:    /^[a-z0-9._\-]+\.[a-z]+/,
-		req:            false,
-		request:        false,
-		showApps:       1,
-		showCats:       [],
-		strings:        {},
-		twitterUrl:     'https://twitter.com/Wappalyzer',
-		version:        '',
-
-		init: function() {
-			self.log('init');
-
-			self.browser = gBrowser;
-
-			self.strings = document.getElementById('wappalyzer-strings');
-
-			// Preferences
-			self.prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService).getBranch('wappalyzer.');
-
-			self.prefs.QueryInterface(Components.interfaces.nsIPrefBranch2);
-			self.prefs.addObserver('', wappalyzer, false);
-
-			self.showApps       = self.prefs.getIntPref( 'showApps');
-			self.customApps     = self.prefs.getCharPref('customApps');
-			self.debug          = self.prefs.getBoolPref('debug');
-			self.enableTracking = self.prefs.getBoolPref('enableTracking');
-			self.popupOnHover   = self.prefs.getBoolPref('popupOnHover');
-			self.newInstall     = self.prefs.getBoolPref('newInstall');
-			self.version        = self.prefs.getCharPref('version');
-
-			var i = 0;
-
-			while ( ++ i ) {
-				try {
-					self.showCats[i] = self.prefs.getBoolPref('cat' + i);
-				} catch (e) {
-					break;
-				}
-			}
-
-			var locationPref = self.prefs.getIntPref('location');
-
-			self.moveLocation(locationPref);
-
-			// Open page after installation
-			if ( self.newInstall ) {
-				self.prefs.setBoolPref('newInstall', false);
-
-				gBrowser.addEventListener('DOMContentLoaded', self.installSuccess, false);
-			} else {
-				// Open page after upgrade
-				try {
-					var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
-
-					var enabledItems = prefs.getCharPref('extensions.enabledAddons');
-					var version      = enabledItems.replace(/(^.*wappalyzer[^:]+:)([^,]+),.*$/, '$2');
-
-					if ( version && self.version != version ) {
-						gBrowser.addEventListener('DOMContentLoaded', self.upgradeSuccess, false);
-
-						self.version = version;
-
-						self.prefs.setCharPref('version', self.version);
-					}
-				}
-				catch(e) { }
-			}
-
-			// Listen messages sent from the content process
-			if ( typeof messageManager != 'undefined' ) {
-				messageManager.addMessageListener('wappalyzer:onPageLoad', self.onContentPageLoad);
-
-				messageManager.loadFrameScript('chrome://wappalyzer/content/content.js', true);
-			}
-
-			// Listen for URL changes
-			self.browser.addProgressListener(self.urlChange, Components.interfaces.nsIWebProgress.NOTIFY_LOCATION);
-
-			// Listen for page loads
-			self.browser.addEventListener('DOMContentLoaded', self.onPageLoad, true);
-
-			self.evaluateCustomApps();
-		},
-
-		// Log messages to console
-		log: function(message) {
-			if ( self.debug && message ) {
-				var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
-
-				consoleService.logStringMessage("Wappalyzer: " + message);
-			}
-		},
-
-		// Listen for preference changes
-		observe: function(subject, topic, data) {
-			if ( topic != 'nsPref:changed' ) {
-				return;
-			}
-
-			switch(true) {
-				case data == 'customApps':
-					self.customApps = self.prefs.getCharPref('customApps');
-
-					break;
-				case data == 'debug':
-					self.debug = self.prefs.getBoolPref('debug');
-
-					break;
-				case data == 'enableTracking':
-					self.enableTracking = self.prefs.getBoolPref('enableTracking');
-
-					break;
-				case data == 'popupOnHover':
-					self.popupOnHover = self.prefs.getBoolPref('popupOnHover');
-
-					self.moveLocation();
-
-					break;
-				case data == 'showApps':
-					self.showApps = self.prefs.getIntPref('showApps');
-
-					break;
-				case data == 'location':
-					var locationPref = self.prefs.getIntPref('location');
-
-					self.moveLocation(locationPref);
-
-					break;
-				case data.test(/^cat[0-9]+$/):
-					var cat = data.replace(/^cat([0-9]+)$/, '$1');
-
-					self.showCats[cat] = self.prefs.getIntPref('cat' + cat);
-
-					break;
-			}
-		},
-
-		openTab: function(url) {
-			self.browser.selectedTab = self.browser.addTab(url);
-		},
-
-		moveLocation: function(locationPref) {
-			self.log('moveLocation');
-
-			switch ( locationPref ) {
-				case 1:
-					var containerId = 'wappalyzer-statusbar';
-
-					// Show status bar panel
-					document.getElementById('wappalyzer-statusbar').style.visibility = '';
-					document.getElementById('wappalyzer-statusbar').style.padding    = '1px';
-
-					break;
-				default:
-					var containerId = 'urlbar-icons';
-
-					// Hide status bar panel
-					document.getElementById('wappalyzer-statusbar').style.visibility = 'hidden';
-					document.getElementById('wappalyzer-statusbar').style.padding    = '0';
-			}
-
-			var e         = document.getElementById(containerId);
-			var container = document.getElementById('wappalyzer-container');
-
-			if ( self.popupOnHover ) {
-				container.addEventListener('mouseover', function() {
-					self.hoverTimeout = setTimeout(function() {
-						document.getElementById('wappalyzer-apps').openPopup(document.getElementById('wappalyzer-container'), 'after_end');
-						}, 200);
-				}, false);
-
-				container.addEventListener('mouseout', function() { clearTimeout(self.hoverTimeout); }, false);
-			}
-
-			e.appendChild(container);
-		},
-
-		onPageLoad: function(event) {
-			self.log('onPageLoad');
-
-			var target = event.originalTarget;
-
-			if ( !target.request ) {
-				self.request = false;
-			}
-
-			self.analyzePage(
-				target.documentElement,
-				target.location.href,
-				target.documentElement.innerHTML,
-				[],
-				[],
-				true
-				);
-		},
-
-		onContentPageLoad: function(message) {
-			self.log('onContentPageLoad');
-
-			self.analyzePage(
-				null,
-				message.json.href,
-				message.json.html,
-				message.json.headers,
-				message.json.environmentVars,
-				true
-				);
-		},
-
-		onUrlChange: function(request) {
-			self.log('onUrlChange');
-
-			self.clearDetectedApps();
-
-			var doc = self.browser.contentDocument;
-
-			self.request = doc.request ? doc.request : request;
-
-			self.currentTab = false;
-
-			self.analyzePage(
-				doc,
-				doc.location.href   ? doc.location.href             : '',
-				doc.documentElement ? doc.documentElement.innerHTML : '',
-				[],
-				[],
-				false
-				);
-		},
-
-		urlChange: {
-			QueryInterface: function(iid) {
-				if ( iid.equals(Components.interfaces.nsIWebProgressListener)   ||
-					 iid.equals(Components.interfaces.nsISupportsWeakReference) ||
-					 iid.equals(Components.interfaces.nsISupports) ) {
-					return this;
-				}
-
-				throw Components.results.NS_NOINTERFACE;
-			},
-
-			onLocationChange: function(progress, request, url) {
-				self.log('urlChange.onLocationChange');
-
-				if ( !url ) {
-					self.prevUrl = '';
-
-					return;
-				}
-
-				if ( url.spec != self.prevUrl ) {
-					self.prevUrl = url.spec;
-
-					self.onUrlChange(request);
-				}
-			},
-
-			onStateChange:    function(a, b, c, d)       {},
-			onProgressChange: function(a, b, c, d, e, f) {},
-			onStatusChange:   function(a, b, c, d)       {},
-			onSecurityChange: function(a, b, c)          {}
-		},
-
-		analyzePage: function(doc, href, html, headers, environmentVars, doCount) {
-			self.log('analyzePage');
-
-			self.currentTab = false;
-
-			if ( href == self.browser.contentDocument.location.href ) {
-				self.currentTab = true;
-
-				if ( !doc ) {
-					doc = self.browser.contentDocument;
-				}
-
-				self.clearDetectedApps();
-			}
-
-			if ( typeof html == 'undefined' ) {
-				html = '';
-			}
-
-			// Prevent large documents from slowing things down
-			if ( html.length > 50000 ) {
-				html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
-			}
-
-			// Scan URL, domain and response headers for patterns
-			if ( html || self.request ) {
-				// Check cached application names
-				if ( doc && typeof doc.detectedApps != 'undefined' ) {
-					for ( i in doc.detectedApps ) {
-						var appName = doc.detectedApps[i];
-
-						if ( typeof self.checkUnique[appName] == 'undefined' ) {
-							self.log('CACHE'); //
-
-							self.showApp(appName, doc, href, doCount);
-
-							self.checkUnique[appName] = true;
-						}
-					}
-				}
-
-				for ( var appName in self.apps ) {
-					// Don't scan for apps that have already been detected
-					if ( typeof self.checkUnique[appName] == 'undefined' ) {
-						// Scan HTML
-						if ( html && typeof self.apps[appName].html != 'undefined' ) {
-							if ( self.apps[appName].html.test(html) ) {
-								self.showApp(appName, doc, href, doCount);
-							}
-						}
-
-						// Scan script tags
-						if ( html && typeof self.apps[appName].script != 'undefined' ) {
-							var
-								regex = /<script[^>]+src=("|')([^"']+)\1/ig,
-								match = []
-								;
-
-							while ( match = regex.exec(html) ) {
-								if ( self.apps[appName].script.test(match[2]) ) {
-									self.showApp(appName, doc, href, doCount);
-
-									break;
-								}
-							}
-						}
-
-						// Scan meta tags
-						if ( html && typeof self.apps[appName].meta != 'undefined' ) {
-							var
-								regex = /<meta[^>]+>/ig,
-								match = []
-								;
-
-							while ( match = regex.exec(html) ) {
-								for ( meta in self.apps[appName].meta ) {
-									if ( new RegExp('name=["\']' + meta + '["\']', 'i').test(match) ) {
-										var content = match.toString().match(/content=("|')([^"']+)("|')/i);
-
-										if ( self.apps[appName].meta[meta].test(content[2]) ) {
-											self.showApp(appName, doc, href, doCount);
-
-											break;
-										}
-									}
-								}
-							}
-						}
-
-						// Scan URL
-						if ( href && typeof self.apps[appName].url != 'undefined' ) {
-							var regex = self.apps[appName].url;
-
-							if ( regex.test(href) ) {
-								self.showApp(appName, doc, href, doCount);
-							}
-						}
-
-						// Scan response headers
-						if ( typeof self.apps[appName].headers != 'undefined' && self.request ) {
-							for ( var header in self.apps[appName].headers ) {
-								var regex = self.apps[appName].headers[header];
-
-								try {
-									if ( regex.test(self.request.nsIHttpChannel.getResponseHeader(header)) ) {
-										self.showApp(appName, doc, href, doCount);
-									}
-								}
-								catch(e) { }
-							}
-						}
-
-						// Scan environment variables
-						if ( environmentVars && typeof self.apps[appName].env != 'undefined' ) {
-							var regex = self.apps[appName].env;
-
-							for ( var i in environmentVars ) {
-								try {
-									if ( regex.test(environmentVars[i]) ) {
-										self.showApp(appName, doc, href, doCount);
-									}
-								}
-								catch(e) { }
-							}
-						}
-					}
-				}
-			}
-
-			html = ''; // Free memory
-		},
-
-		showApp: function(detectedApp, doc, href, doCount) {
-			self.log('showApp ' + detectedApp);
-
-			self.report(detectedApp, href);
-
-			// Keep detected application names in memory
-			if ( doc ) {
-				if ( typeof doc.detectedApps == 'undefined' ) {
-					doc.detectedApps = [];
-				}
-
-				doc.detectedApps.push(detectedApp);
-			}
-
-			if ( detectedApp && typeof self.checkUnique[detectedApp] == 'undefined' ) {
-				var show = false;
-
-				for ( var i in self.apps[detectedApp].cats ) {
-					if ( self.showCats[self.apps[detectedApp].cats[i]] ) {
-						show = true;
-
-						break;
-					}
-				}
-
-				if ( show && self.currentTab ) {
-					var e = document.getElementById('wappalyzer-detected-apps');
-
-					if ( self.showApps == 2 ) {
-						document.getElementById('wappalyzer-icon').setAttribute('src', 'chrome://wappalyzer/skin/icon16x16_hot.ico');
-
-						document.getElementById('wappalyzer-detected-apps').style.display = 'none';
-					}
-					else {
-						// Hide Wappalyzer icon
-						document.getElementById('wappalyzer-icon').style.display = 'none';
-
-						document.getElementById('wappalyzer-detected-apps').style.display = '';
-					}
-
-					// Show app icon and label
-					var child = document.createElement('image');
-
-					if ( typeof self.apps[detectedApp].icon == 'string' ) {
-						child.setAttribute('src', self.apps[detectedApp].icon);
-					}
-					else {
-						child.setAttribute('src', 'chrome://wappalyzer/skin/icons/' + detectedApp + '.ico');
-					}
-
-					child.setAttribute('class', 'wappalyzer-icon');
-
-					if ( self.appsDetected ) {
-						child.setAttribute('style', 'margin-left: .5em');
-					}
-
-					e.appendChild(child);
-
-					if ( self.showApps == 0 ) {
-						var child = document.createElement('label');
-
-						child.setAttribute('value', detectedApp);
-						child.setAttribute('class', 'wappalyzer-app-name');
-
-						e.appendChild(child);
-					}
-
-					// Show application in popup
-					var e = document.getElementById('wappalyzer-apps');
-
-					if ( !self.appsDetected ) {
-						// Remove "no apps detected" message
-						document.getElementById('wappalyzer-apps').removeChild(document.getElementById('wappalyzer-no-detected-apps'));
-					}
-					else {
-						var child = document.createElement('menuseparator');
-
-						e.appendChild(child);
-					}
-
-					var child = document.createElement('menuitem');
-
-					child.setAttribute('class', 'menuitem-iconic');
-					child.setAttribute('type',  '');
-
-					child.addEventListener('command', function() { self.openTab(self.homeUrl + 'stats/app/' + escape(detectedApp)); }, false);
-
-					if ( typeof self.apps[detectedApp].custom == 'undefined' ) {
-						child.setAttribute('label', detectedApp);
-						child.setAttribute('image', 'chrome://wappalyzer/skin/icons/' + detectedApp + '.ico');
-					}
-					else {
-						child.setAttribute('label',    detectedApp + ' (' + self.strings.getString('wappalyzer.custom') + ')');
-						child.setAttribute('disabled', 'true');
-						child.setAttribute('image',    self.apps[detectedApp].icon);
-					}
-
-					e.appendChild(child);
-
-					if ( self.apps[detectedApp].cats ) {
-						for ( var i in self.apps[detectedApp].cats ) {
-							var child = document.createElement('menuitem');
-
-							child.setAttribute('label',    self.cats[self.apps[detectedApp].cats[i]].name);
-							child.setAttribute('disabled', 'true');
-
-							e.appendChild(child);
-						}
-					}
-				}
-
-				if ( doCount ) {
-					self.report(detectedApp, href);
-				}
-
-				self.appsDetected ++;
-
-				self.checkUnique[detectedApp] = true;
-			}
-		},
-
-		report: function(detectedApp, href) {
-			self.log('report');
-
-			if ( typeof self.apps[detectedApp].custom == 'undefined' ) {
-				var
-					regex  = /:\/\/(.[^/]+)/,
-					domain = href.match(regex) ? href.match(regex)[1] : ''
-					;
-
-				if ( self.enableTracking && self.regexDomain.test(domain) && !self.regexBlacklist.test(href) ) {
-					if ( typeof self.history[domain] == 'undefined' ) {
-						self.history[domain] = [];
-					}
-
-					if ( typeof self.history[domain][detectedApp] == 'undefined' ) {
-						self.history[domain][detectedApp] = 0;
-					}
-
-					self.history[domain][detectedApp] ++;
-
-					self.hitCount ++;
-
-					if ( self.hitCount > 200 ) {
-						self.sendReport();
-					}
-				}
-			}
-		},
-
-		// Anonymously send the name of the detected apps and domains to wappalyzer.com
-		// You can turn this off in the options dialog
-		// This is used to track the distribution of software, stats are publicly available on the site
-		sendReport: function() {
-			self.log('sendReport');
-
-			if ( self.enableTracking && !self.req ) {
-				var report = '';
-
-				if ( self.history ) {
-					for ( var i in self.history ) {
-						report += '[' + i;
-
-						for ( var j in self.history[i] ) {
-							report += '|' + j + ':' + self.history[i][j];
-						}
-
-						report += ']';
-					}
-				}
-
-				// Make POST request
-				self.req = new XMLHttpRequest();
-
-				self.req.open('POST', self.homeUrl + 'report/', true);
-
-				self.req.channel.loadFlags |= Components.interfaces.nsIRequest.LOAD_BYPASS_CACHE;
-
-				self.req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
-
-				self.req.onreadystatechange = function(e) {
-					if ( self.req.readyState == 4 ) {
-						if ( self.req.status == 200 ) {
-							// Reset
-							report = '';
-
-							self.hitCount = 0;
-							self.history  = [];
-						}
-
-						self.req.close();
-
-						self.req = false;
-					}
-				};
-
-				self.req.send('d=' + encodeURIComponent(report));
-			}
-		},
-
-		clearDetectedApps: function() {
-			self.log('clearDetectedApps');
-
-			self.appsDetected = 0;
-			self.checkUnique  = [];
-
-			// Show Wappalyzer icon
-			document.getElementById('wappalyzer-icon').setAttribute('src', 'chrome://wappalyzer/skin/icon16x16.ico');
-			document.getElementById('wappalyzer-icon').style.display = '';
-
-			// Clear app icons and labels
-			var e = document.getElementById('wappalyzer-detected-apps');
-
-			while ( e.childNodes.length > 0 ) {
-				e.removeChild(e.childNodes.item(0));
-			}
-
-			// Clear application popup
-			var e = document.getElementById('wappalyzer-apps');
-
-			while ( e.childNodes.length > 0 ) {
-				e.removeChild(e.childNodes.item(0));
-			}
-
-			var child = document.createElement('menuitem');
-
-			child.setAttribute('label',     self.strings.getString('wappalyzer.noDetectedApps'));
-			child.setAttribute('id',        'wappalyzer-no-detected-apps');
-			child.setAttribute('class',     'menuitem-iconic');
-			child.setAttribute('disabled', 	'true');
-			child.setAttribute('type',      '');
-
-			e.appendChild(child);
-		},
-
-		installSuccess: function() {
-			self.log('installSuccess');
-
-			gBrowser.removeEventListener('DOMContentLoaded', self.installSuccess, false);
-
-			self.openTab(self.homeUrl + 'install/success/');
-		},
-
-		upgradeSuccess: function() {
-			self.log('upgradeSuccess');
-
-			gBrowser.removeEventListener('DOMContentLoaded', self.upgradeSuccess, false);
-
-			self.openTab(self.homeUrl + 'install/upgraded/');
-		}
-	};
-
-	addEventListener('load',   function() { self.init();       }, false);
-	addEventListener('unload', function() { self.sendReport(); }, false);
-
-	return self;
-})();
diff --git a/adapters/firefox/chrome/content/js/content.js b/adapters/firefox/chrome/content/js/content.js
deleted file mode 100644
index 8ec2b7304..000000000
--- a/adapters/firefox/chrome/content/js/content.js
+++ /dev/null
@@ -1,122 +0,0 @@
-(function() {
-	var self = {
-		element: false,
-		prevUrl: '',
-
-		init: function() {
-			self.log('init');
-
-			addEventListener('DOMContentLoaded', self.onPageLoad, false);
-		},
-
-		log: function(message) {
-			return; //
-
-			var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
-
-			consoleService.logStringMessage("Wappalyzer content.js: " + message);
-		},
-
-		onPageLoad: function(e) {
-			self.log('onPageLoad');
-
-			self.getEnvironmentVars();
-		},
-
-		onUrlChange: function(request) {
-			self.log('onUrlChange');
-
-			self.getEnvironmentVars();
-		},
-
-		urlChange: {
-			QueryInterface: function(iid) {
-				if ( iid.equals(Components.interfaces.nsIWebProgressListener)   ||
-					 iid.equals(Components.interfaces.nsISupportsWeakReference) ||
-					 iid.equals(Components.interfaces.nsISupports) ) {
-					return this;
-				}
-
-				throw Components.results.NS_NOINTERFACE;
-			},
-
-			onLocationChange: function(progress, request, url) {
-				if ( !url ) {
-					self.prevUrl = '';
-
-					return;
-				}
-
-				if ( url.spec != self.prevUrl ) {
-					self.prevUrl = url.spec;
-
-					self.onUrlChange(request);
-				}
-			},
-
-			onStateChange:    function(a, b, c, d)       {},
-			onProgressChange: function(a, b, c, d, e, f) {},
-			onStatusChange:   function(a, b, c, d)       {},
-			onSecurityChange: function(a, b, c)          {}
-		},
-
-		getEnvironmentVars: function() {
-			self.log('getEnvironmentVars');
-
-			if ( content.document.contentType != 'text/html' || typeof content.document.html == 'undefined' ) {
-				return;
-			}
-
-			var environmentVars = '';
-
-			try {
-				var element = content.document.createElement('wappalyzerData');
-
-				element.setAttribute('id',    'wappalyzerData');
-				element.setAttribute('style', 'display: none');
-
-				content.document.documentElement.appendChild(element);
-
-				content.location.href = 'javascript:' +
-					'(function() {' +
-						'try {' +
-							'var event = document.createEvent("Events");' +
-
-							'event.initEvent("wappalyzerEvent", true, false);' +
-
-							'var environmentVars = "";' +
-
-							'for ( var i in window ) environmentVars += i + " ";' +
-
-							'document.getElementById("wappalyzerData").appendChild(document.createComment(environmentVars));' +
-
-							'document.getElementById("wappalyzerData").dispatchEvent(event);' +
-						'}' +
-						'catch(e) { }' +
-					'})();';
-
-				element.addEventListener('wappalyzerEvent', (function(event) {
-					environmentVars = event.target.childNodes[0].nodeValue;
-
-					self.log('getEnvironmentVars: ' + environmentVars);
-
-					element.parentNode.removeChild(element);
-
-					sendAsyncMessage('wappalyzer:onPageLoad', {
-						href:            content.document.location.href,
-						html:            content.document.documentElement.innerHTML,
-						headers:         [],
-						environmentVars: environmentVars.split(' ')
-						});
-				}), true);
-			}
-			catch(e) { }
-
-			return environmentVars;
-		}
-	}
-
-	self.init();
-
-	return self;
-})();
diff --git a/adapters/firefox/chrome/content/xul/wappalyzer.xul b/adapters/firefox/chrome/content/xul/wappalyzer.xul
deleted file mode 100755
index 21fe6b4d2..000000000
--- a/adapters/firefox/chrome/content/xul/wappalyzer.xul
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet type="text/css" href="chrome://wappalyzer/skin/wappalyzer.css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/wappalyzer.dtd">
-
-<overlay id="wappalyzer-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/x-javascript" src="chrome://wappalyzer/content/wappalyzer.js"/>
-	<script type="application/x-javascript" src="chrome://wappalyzer/content/evaluate.js"/>
-	<script type="application/x-javascript" src="chrome://wappalyzer/content/apps.js"/>
-
-	<stringbundleset id="stringbundleset">
-		<stringbundle id="wappalyzer-strings" src="chrome://wappalyzer/locale/wappalyzer.properties"/>
-	</stringbundleset>
-	
-	<hbox>
-		<hbox
-			id="wappalyzer-container"
-			context="wappalyzer-menu"
-			popup="wappalyzer-apps"
-			>
-			<image
-				id="wappalyzer-icon"
-				class="wappalyzer-icon"
-				label="&wappalyzer.title;"
-				src="chrome://wappalyzer/skin/icon16x16.ico"/>
-			
-			<box align="start" id="wappalyzer-detected-apps"/>
-
-			<menupopup id="wappalyzer-apps" position="after_end"></menupopup>
-
-			<menupopup id="wappalyzer-menu">
-				<menuitem label="&wappalyzer.options;" oncommand="
-					window.openDialog('chrome://wappalyzer/content/options.xul', 'wappalyzer-options', 'chrome, dialog, centerscreen');
-					" image="chrome://wappalyzer/skin/options.png"/>
-				<menuseparator/>
-				<menuitem label="&wappalyzer.donate;"       oncommand="wappalyzer.openTab(wappalyzer.homeUrl + 'donate/');"            image="chrome://wappalyzer/skin/donate.png"/>
-				<menuitem label="&wappalyzer.feedback;"     oncommand="wappalyzer.openTab(wappalyzer.homeUrl + '?redirect=feedback');" image="chrome://wappalyzer/skin/feedback.png"/>
-				<menuitem label="&wappalyzer.forkOnGithub;" oncommand="wappalyzer.openTab(wappalyzer.githubUrl);"                      image="chrome://wappalyzer/skin/github.ico"/>
-				<menuitem label="&wappalyzer.twitter;"      oncommand="wappalyzer.openTab(wappalyzer.twitterUrl);"                     image="chrome://wappalyzer/skin/twitter.ico"/>
-				<menuitem label="&wappalyzer.home;"         oncommand="wappalyzer.openTab(wappalyzer.homeUrl);"                        image="chrome://wappalyzer/skin/icon16x16_hot.ico"/>
-			</menupopup>
-		</hbox>
-	</hbox>
-
-	<hbox
-		id="urlbar-icons"
-		/>
-
-	<statusbar id="status-bar">
-		<statusbarpanel
-			id="wappalyzer-statusbar"
-			class="statusbarpanel-iconic"
-			context="wappalyzer-menu"
-			popup="wappalyzer-apps"
-			/>
-	</statusbar>
-</overlay>
diff --git a/adapters/firefox/chrome/locale/en-US/wappalyzer.dtd b/adapters/firefox/chrome/locale/en-US/wappalyzer.dtd
deleted file mode 100755
index 83d5c22d3..000000000
--- a/adapters/firefox/chrome/locale/en-US/wappalyzer.dtd
+++ /dev/null
@@ -1,51 +0,0 @@
-<!ENTITY wappalyzer.title          "Wappalyzer">
-<!ENTITY wappalyzer.feedback       "Feedback">
-<!ENTITY wappalyzer.forkOnGithub   "Fork on Github">
-<!ENTITY wappalyzer.options        "Settings">
-<!ENTITY wappalyzer.custom         "Custom code">
-<!ENTITY wappalyzer.enableTracking "Allow anonymous application data collection for research">
-<!ENTITY wappalyzer.general        "General">
-<!ENTITY wappalyzer.location       "Display icons in">
-<!ENTITY wappalyzer.addressBar     "Address bar">
-<!ENTITY wappalyzer.statusBar      "Add-on bar">
-<!ENTITY wappalyzer.showApps       "Show applications as">
-<!ENTITY wappalyzer.labels         "Icons, text and popup">
-<!ENTITY wappalyzer.icons          "Icons and popup">
-<!ENTITY wappalyzer.popup          "Popup only">
-<!ENTITY wappalyzer.popupOnHover   "Show popup">
-<!ENTITY wappalyzer.onHover        "On hover and click">
-<!ENTITY wappalyzer.onClick        "On click only">
-<!ENTITY wappalyzer.categories     "Categories">
-<!ENTITY wappalyzer.twitter        "Twitter">
-<!ENTITY wappalyzer.home           "Go to Wappalyzer">
-<!ENTITY wappalyzer.privacy        "Privacy">
-<!ENTITY wappalyzer.donate         "Donate">
-<!ENTITY wappalyzer.evaluate       "Evaluate code">
-<!ENTITY wappalyzer.customBody     "Add applications for personal use with JSON and regular expressions.">
-<!ENTITY wappalyzer.customMoreInfo "Click here to learn more">
-
-<!ENTITY wappalyzer.cat1           "CMS">
-<!ENTITY wappalyzer.cat2           "Message boards">
-<!ENTITY wappalyzer.cat3           "Database managers">
-<!ENTITY wappalyzer.cat4           "Documentation tools">
-<!ENTITY wappalyzer.cat5           "Widgets">
-<!ENTITY wappalyzer.cat6           "Web shops">
-<!ENTITY wappalyzer.cat7           "Photo galleries">
-<!ENTITY wappalyzer.cat8           "Wikis">
-<!ENTITY wappalyzer.cat9           "Hosting panels">
-<!ENTITY wappalyzer.cat10          "Analytics">
-<!ENTITY wappalyzer.cat11          "Blogs">
-<!ENTITY wappalyzer.cat12          "JavaScript frameworks">
-<!ENTITY wappalyzer.cat13          "Issue trackers">
-<!ENTITY wappalyzer.cat14          "Video players">
-<!ENTITY wappalyzer.cat15          "Comment systems">
-<!ENTITY wappalyzer.cat16          "CAPTCHAs">
-<!ENTITY wappalyzer.cat17          "Font scripts">
-<!ENTITY wappalyzer.cat18          "Web frameworks">
-<!ENTITY wappalyzer.cat19          "Miscellaneous">
-<!ENTITY wappalyzer.cat20          "Editors">
-<!ENTITY wappalyzer.cat21          "LMS">
-<!ENTITY wappalyzer.cat22          "Web servers">
-<!ENTITY wappalyzer.cat23          "Cache tools">
-<!ENTITY wappalyzer.cat24          "Rich text editors">
-<!ENTITY wappalyzer.cat25          "Javascript Graphics">
diff --git a/adapters/firefox/chrome/locale/en-US/wappalyzer.properties b/adapters/firefox/chrome/locale/en-US/wappalyzer.properties
deleted file mode 100755
index 82179bc44..000000000
--- a/adapters/firefox/chrome/locale/en-US/wappalyzer.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-wappalyzer.title          = Wappalyzer
-wappalyzer.noDetectedApps = No applications detected
-wappalyzer.custom         = custom
diff --git a/adapters/firefox/content/js/adapter.js b/adapters/firefox/content/js/adapter.js
new file mode 100644
index 000000000..1c3fca8cd
--- /dev/null
+++ b/adapters/firefox/content/js/adapter.js
@@ -0,0 +1,68 @@
+/**
+ * Firefox adapter
+ */
+
+(function() {
+	if ( wappalyzer == null ) return;
+
+	var w = wappalyzer;
+
+	w.adapter = {
+		/**
+		 * Log messages to console
+		 */
+		log: function(args) {
+			var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
+
+			consoleService.logStringMessage(args.message);
+		},
+
+		/**
+		 * Initialize
+		 */
+		init: function() {
+			// Get version number
+			Components.utils.import('resource://gre/modules/AddonManager.jsm');
+
+			AddonManager.getAddonByID('wappalyzer@crunchlabz.com', function(extension) {
+				w.version = extension.version;
+			});
+
+			// Load content script
+			if ( messageManager != null ) {
+				// Listen for messages from content script
+				messageManager.addMessageListener('wappalyzer', content);
+
+				messageManager.loadFrameScript('chrome://wappalyzer/content/js/content.js', true);
+			}
+		},
+
+		/**
+		 * Display apps
+		 */
+		displayApps: function(args) {
+		},
+
+		/**
+		 * Go to URL
+		 */
+		goToURL: function(args) {
+		}
+	};
+
+	/**
+	 * Content message listener
+	 */
+	function content(msg) {
+		w.log('content.js');
+
+		w.analyze(msg.json.hostname, msg.json.url, {
+			html:     msg.json.html,
+			env:      msg.json.env
+		});
+
+		delete msg;
+	}
+
+	w.init();
+})();
diff --git a/adapters/firefox/chrome/content/js/apps.js b/adapters/firefox/content/js/apps.js
similarity index 100%
rename from adapters/firefox/chrome/content/js/apps.js
rename to adapters/firefox/content/js/apps.js
diff --git a/adapters/firefox/content/js/content.js b/adapters/firefox/content/js/content.js
new file mode 100644
index 000000000..1de72121b
--- /dev/null
+++ b/adapters/firefox/content/js/content.js
@@ -0,0 +1,28 @@
+(function() {
+	addEventListener('DOMContentLoaded', onLoad, false);
+
+	function onLoad() {
+		if ( content.document.contentType != 'text/html' ) return;
+
+		// Environment variables
+		var sandbox = Components.utils.Sandbox(content);
+
+		sandbox.win = content;
+
+		Components.utils.evalInSandbox('var env = new String; for ( i in win.wrappedJSObject ) env += " " + i;', sandbox);
+
+		var env = sandbox.env.split(' ');
+
+		// HTML
+		var html = content.document.documentElement.innerHTML
+
+		if ( html.length > 50000 ) html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
+
+		sendAsyncMessage('wappalyzer', {
+			hostname: content.location.hostname,
+			html:     html,
+			env:      env,
+			url:      content.location.href
+			});
+	}
+})();
diff --git a/adapters/firefox/chrome/content/js/custom.js b/adapters/firefox/content/js/custom.js
similarity index 100%
rename from adapters/firefox/chrome/content/js/custom.js
rename to adapters/firefox/content/js/custom.js
diff --git a/adapters/firefox/chrome/content/js/evaluate.js b/adapters/firefox/content/js/evaluate.js
similarity index 100%
rename from adapters/firefox/chrome/content/js/evaluate.js
rename to adapters/firefox/content/js/evaluate.js
diff --git a/adapters/firefox/chrome/content/js/options.js b/adapters/firefox/content/js/options.js
similarity index 100%
rename from adapters/firefox/chrome/content/js/options.js
rename to adapters/firefox/content/js/options.js
diff --git a/adapters/firefox/chrome/content/js/wappalyzer.js b/adapters/firefox/content/js/wappalyzer.js
similarity index 100%
rename from adapters/firefox/chrome/content/js/wappalyzer.js
rename to adapters/firefox/content/js/wappalyzer.js
diff --git a/adapters/firefox/chrome/content/xul/options.xul b/adapters/firefox/content/xul/options.xul
similarity index 100%
rename from adapters/firefox/chrome/content/xul/options.xul
rename to adapters/firefox/content/xul/options.xul
diff --git a/adapters/firefox/content/xul/wappalyzer.xul b/adapters/firefox/content/xul/wappalyzer.xul
new file mode 100755
index 000000000..fe4e134ac
--- /dev/null
+++ b/adapters/firefox/content/xul/wappalyzer.xul
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet type="text/css" href="chrome://wappalyzer/skin/css/wappalyzer.css"?>
+
+<!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/wappalyzer.dtd">
+
+<overlay id="wappalyzer-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+	<script type="application/x-javascript" src="chrome://wappalyzer/content/js/wappalyzer.js"/>
+	<script type="application/x-javascript" src="chrome://wappalyzer/content/js/apps.js"/>
+	<script type="application/x-javascript" src="chrome://wappalyzer/content/js/adapter.js"/>
+
+	<stringbundleset id="stringbundleset">
+		<stringbundle id="wappalyzer-strings" src="chrome://wappalyzer/locale/wappalyzer.properties"/>
+	</stringbundleset>
+
+	<hbox id="urlbar-icons">
+		<hbox
+			id="wappalyzer-container"
+			popup="wappalyzer-apps"
+			>
+			<image
+				id="wappalyzer-icon"
+				class="wappalyzer-icon"
+				label="&wappalyzer.name;"
+				src="chrome://wappalyzer/skin/images/icon16x16.ico"/>
+			
+			<box align="start" id="wappalyzer-apps"/>
+
+			<menupopup id="wappalyzer-menu" position="after_end">
+				<menu label="&wappalyzer.name;">
+					<menupopup>
+						<menuitem label="sub" image="chrome://wappalyzer/skin/images/icon16x16_hot.ico"/>
+					</menupopup>
+				</menu>
+
+				<menuitem label="foo"/>
+			</menupopup>
+		</hbox>
+	</hbox>
+</overlay>
diff --git a/adapters/firefox/locale/en-US/wappalyzer.dtd b/adapters/firefox/locale/en-US/wappalyzer.dtd
new file mode 100755
index 000000000..f6c2f9838
--- /dev/null
+++ b/adapters/firefox/locale/en-US/wappalyzer.dtd
@@ -0,0 +1,27 @@
+<!ENTITY wappalyzer.name           "Wappalyzer">
+
+<!ENTITY wappalyzer.cat1           "CMS">
+<!ENTITY wappalyzer.cat2           "Message boards">
+<!ENTITY wappalyzer.cat3           "Database managers">
+<!ENTITY wappalyzer.cat4           "Documentation tools">
+<!ENTITY wappalyzer.cat5           "Widgets">
+<!ENTITY wappalyzer.cat6           "Web shops">
+<!ENTITY wappalyzer.cat7           "Photo galleries">
+<!ENTITY wappalyzer.cat8           "Wikis">
+<!ENTITY wappalyzer.cat9           "Hosting panels">
+<!ENTITY wappalyzer.cat10          "Analytics">
+<!ENTITY wappalyzer.cat11          "Blogs">
+<!ENTITY wappalyzer.cat12          "JavaScript frameworks">
+<!ENTITY wappalyzer.cat13          "Issue trackers">
+<!ENTITY wappalyzer.cat14          "Video players">
+<!ENTITY wappalyzer.cat15          "Comment systems">
+<!ENTITY wappalyzer.cat16          "CAPTCHAs">
+<!ENTITY wappalyzer.cat17          "Font scripts">
+<!ENTITY wappalyzer.cat18          "Web frameworks">
+<!ENTITY wappalyzer.cat19          "Miscellaneous">
+<!ENTITY wappalyzer.cat20          "Editors">
+<!ENTITY wappalyzer.cat21          "LMS">
+<!ENTITY wappalyzer.cat22          "Web servers">
+<!ENTITY wappalyzer.cat23          "Cache tools">
+<!ENTITY wappalyzer.cat24          "Rich text editors">
+<!ENTITY wappalyzer.cat25          "Javascript Graphics">
diff --git a/adapters/firefox/locale/en-US/wappalyzer.properties b/adapters/firefox/locale/en-US/wappalyzer.properties
new file mode 100755
index 000000000..1bbd57974
--- /dev/null
+++ b/adapters/firefox/locale/en-US/wappalyzer.properties
@@ -0,0 +1 @@
+wappalyzer.name = Wappalyzer
diff --git a/adapters/firefox/chrome/skin/css/wappalyzer.css b/adapters/firefox/skin/css/wappalyzer.css
similarity index 100%
rename from adapters/firefox/chrome/skin/css/wappalyzer.css
rename to adapters/firefox/skin/css/wappalyzer.css
diff --git a/adapters/firefox/chrome/skin/images/donate.png b/adapters/firefox/skin/images/donate.png
similarity index 100%
rename from adapters/firefox/chrome/skin/images/donate.png
rename to adapters/firefox/skin/images/donate.png
diff --git a/adapters/firefox/chrome/skin/images/feedback.png b/adapters/firefox/skin/images/feedback.png
similarity index 100%
rename from adapters/firefox/chrome/skin/images/feedback.png
rename to adapters/firefox/skin/images/feedback.png
diff --git a/adapters/firefox/chrome/skin/images/github.ico b/adapters/firefox/skin/images/github.ico
similarity index 100%
rename from adapters/firefox/chrome/skin/images/github.ico
rename to adapters/firefox/skin/images/github.ico
diff --git a/adapters/firefox/chrome/skin/images/icon16x16.ico b/adapters/firefox/skin/images/icon16x16.ico
similarity index 100%
rename from adapters/firefox/chrome/skin/images/icon16x16.ico
rename to adapters/firefox/skin/images/icon16x16.ico
diff --git a/adapters/firefox/chrome/skin/images/icon16x16_hot.ico b/adapters/firefox/skin/images/icon16x16_hot.ico
similarity index 100%
rename from adapters/firefox/chrome/skin/images/icon16x16_hot.ico
rename to adapters/firefox/skin/images/icon16x16_hot.ico
diff --git a/adapters/firefox/chrome/skin/images/icon32x32.png b/adapters/firefox/skin/images/icon32x32.png
similarity index 100%
rename from adapters/firefox/chrome/skin/images/icon32x32.png
rename to adapters/firefox/skin/images/icon32x32.png
diff --git a/adapters/firefox/chrome/skin/images/icons b/adapters/firefox/skin/images/icons
similarity index 100%
rename from adapters/firefox/chrome/skin/images/icons
rename to adapters/firefox/skin/images/icons
diff --git a/adapters/firefox/chrome/skin/images/options.png b/adapters/firefox/skin/images/options.png
similarity index 100%
rename from adapters/firefox/chrome/skin/images/options.png
rename to adapters/firefox/skin/images/options.png
diff --git a/adapters/firefox/chrome/skin/images/twitter.ico b/adapters/firefox/skin/images/twitter.ico
similarity index 100%
rename from adapters/firefox/chrome/skin/images/twitter.ico
rename to adapters/firefox/skin/images/twitter.ico
diff --git a/adapters/html/images/icon.png b/adapters/html/images/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ddebb14299dc8859ad295aff36567886f9c51f6
GIT binary patch
literal 12044
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

literal 0
HcmV?d00001

diff --git a/adapters/html/index.html b/adapters/html/index.html
index 3f82b3cea..8028fe8fc 100644
--- a/adapters/html/index.html
+++ b/adapters/html/index.html
@@ -4,6 +4,8 @@
 	<head>
 		<title>Wappalyzer</title>
 
+		<link rel="icon" type="image/png" href="images/icon.png"/>
+
 		<script type="text/javascript" src="js/wappalyzer.js"></script>
 		<script type="text/javascript" src="js/apps.js"></script>
 		<script type="text/javascript" src="js/adapter.js"></script>
diff --git a/adapters/html/js/adapter.js b/adapters/html/js/adapter.js
index 5958dfce4..a6a9ac020 100644
--- a/adapters/html/js/adapter.js
+++ b/adapters/html/js/adapter.js
@@ -4,6 +4,13 @@
 	var w = wappalyzer;
 
 	w.adapter = {
+		/**
+		 * Log messages to console
+		 */
+		log: function(args) {
+			if ( console != null ) console[args.type](args.message);
+		},
+
 		/**
 		 * Initialize
 		 */
diff --git a/wappalyzer.js b/wappalyzer.js
index 3f0f9aa05..256cc7cd2 100644
--- a/wappalyzer.js
+++ b/wappalyzer.js
@@ -17,7 +17,7 @@ var wappalyzer = wappalyzer || (function() {
 			return;
 		}
 
-		w.log('w.adapter.' + func);
+		if ( func != 'log' ) w.log('w.adapter.' + func);
 
 		return w.adapter[func](args);
 	};
@@ -27,11 +27,14 @@ var wappalyzer = wappalyzer || (function() {
 	 */
 	var w = {
 		// Cache detected applications per URL
-		cache: new Array,
+		history:  new Array,
+		detected: new Array,
 
 		config: {
 			environment: 'dev', // dev | live
 
+			version: false,
+
 			websiteURL: 'http://wappalyzer.com/',
 			twitterURL: 'https://twitter.com/Wappalyzer',
 			githubURL:  'https://github.com/ElbertF/Wappalyzer',
@@ -44,10 +47,10 @@ var wappalyzer = wappalyzer || (function() {
 		 * Log messages to console
 		 */
 		log: function(message, type) {
-			if ( w.config.environment == 'dev' ) {
-				console[type || 'debug'](typeof message === 'string' ? '[wappalyzer] ' + message : message);
+			if ( w.config.environment === 'dev' ) {
+				if ( type == null ) type = 'debug';
 
-				return true;
+				adapter('log', { message: '[wappalyzer ' + type + '] ' + message, type: type });
 			}
 		},
 
@@ -80,106 +83,121 @@ var wappalyzer = wappalyzer || (function() {
 		/**
 		 * Analyze the request
 		 */
-		analyze: function(url, callback) {
+		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
-			if ( !w.cache[url] ) {
-				var
-					apps = new Array(),
-					data = callback()
-					;
+			var apps = new Array();
 
-				if ( data ) {
-					for ( var app in w.apps ) {
-						for ( var type in w.apps[app] ) {
-							if ( apps.indexOf(app) !== -1 ) continue; // Skip if the app has already been detected
+			if ( w.history [hostname] == null ) w.history [hostname] = new Array();
+			if ( w.detected[url]      == null ) w.detected[url]      = new Array();
 
-							switch ( type ) {
-								case 'url':
-									if ( w.apps[app].url.test(data[type]) ) apps.push(app);
+			if ( data ) {
+				for ( var app in w.apps ) {
+					for ( var type in w.apps[app] ) {
+						if ( w.detected[url].indexOf(app) !== -1 && apps.indexOf(app) !== -1 ) continue; // Skip if the app has already been detected
 
-									break;
-								case 'html':
-									if ( w.apps[app].html.test(data[type]) ) apps.push(app);
+						switch ( type ) {
+							case 'url':
+								if ( w.apps[app].url.test(url) ) apps.push(app);
 
-									break;
-								case 'script':
-									if ( data['html'] == null ) break;
+								break;
+							case 'html':
+								if ( data[type] == null ) break;
 
-									var
-										regex = /<script[^>]+src=("|')([^"']+)\1/ig,
-										match = []
-										;
+								if ( w.apps[app].html.test(data[type]) ) apps.push(app);
 
-									while ( match = regex.exec(data['html']) ) {
-										if ( w.apps[app].script.test(match[2]) ) {
-											apps.push(app);
+								break;
+							case 'script':
+								if ( data[type] == null || data['html'] == null ) break;
 
-											break;
-										}
+								var
+									regex = /<script[^>]+src=("|')([^"']+)\1/ig,
+									match = []
+									;
+
+								while ( match = regex.exec(data['html']) ) {
+									if ( w.apps[app].script.test(match[2]) ) {
+										apps.push(app);
+
+										break;
 									}
+								}
 
-									break;
-								case 'meta':
-									if ( data['html'] == null ) break;
+								break;
+							case 'meta':
+								if ( data[type] == null || data['html'] == null ) break;
 
-									var
-										regex = /<meta[^>]+>/ig,
-										match = []
-										;
+								var
+									regex = /<meta[^>]+>/ig,
+									match = []
+									;
 
-									while ( match = regex.exec(data['html']) ) {
-										for ( meta in w.apps[app].meta ) {
-											if ( new RegExp('name=["\']' + meta + '["\']', 'i').test(match) ) {
-												var content = match.toString().match(/content=("|')([^"']+)("|')/i);
+								while ( match = regex.exec(data['html']) ) {
+									for ( meta in w.apps[app].meta ) {
+										if ( new RegExp('name=["\']' + meta + '["\']', 'i').test(match) ) {
+											var content = match.toString().match(/content=("|')([^"']+)("|')/i);
 
-												if ( w.apps[app].meta[meta].test(content[2]) ) {
-													apps.push(app);
+											if ( w.apps[app].meta[meta].test(content[2]) ) {
+												apps.push(app);
 
-													break;
-												}
+												break;
 											}
 										}
 									}
+								}
 
-									break;
-								case 'headers':
-									for ( var header in w.apps[app].headers ) {
-										if ( data[type][header] != null && w.apps[app].headers[header].test(data[type][header]) ) {
-											apps.push(app);
+								break;
+							case 'headers':
+								if ( data[type] == null ) break;
 
-											break;
-										}
+								for ( var header in w.apps[app].headers ) {
+									if ( data[type][header] != null && w.apps[app].headers[header].test(data[type][header]) ) {
+										apps.push(app);
+
+										break;
 									}
+								}
 
-									break;
-								case 'env':
-									for ( var i in data[type] ) {
-										if ( w.apps[app].env.test(data[type][i]) ) {
-											apps.push(app);
+								break;
+							case 'env':
+								if ( data[type] == null ) break;
 
-											break;
-										}
+								for ( var i in data[type] ) {
+									if ( w.apps[app].env.test(data[type][i]) ) {
+										apps.push(app);
+
+										break;
 									}
+								}
 
-									break;
-							}
+								break;
 						}
 					}
 				}
 
 				w.log(apps.length + ' apps detected: ' + apps.join(', '));
 
-				w.cache[url] = { hits: 0, apps: apps };
+				// Keep history of detected apps
+				apps.map(function(app) {
+					// Per hostname
+					var index = w.history.indexOf(app);
 
-				delete apps, data;
-			} else {
-				w.cache[url].hits ++;
+					if ( index === -1 ) {
+						w.history[hostname].push({ app: app, hits: 1 });
+					} else {
+						w.history[hostname][index].hits ++;
+					}
 
-				w.log(w.cache[url].apps.length + ' apps cached (hit ' + w.cache[url].hits + '): ' + w.cache[url].apps.join(', '));
+					// Per URL
+					var index = w.detected.indexOf(app);
+
+					if ( index === -1 ) w.detected[url].push(app);
+				});
+
+				delete apps, data;
 			}
 
-			adapter('displayApps', { apps: w.cache[url].apps });
+			adapter('displayApps', { url: url, apps: w.detected[url] });
 		}
 	};