From cb1f636b9761da5791358f5ae8ff21ac562dd880 Mon Sep 17 00:00:00 2001
From: ElbertF <info@elbertf.com>
Date: Fri, 15 Oct 2010 17:50:44 +1100
Subject: [PATCH] Added support for Firefox Mobile and moved icons to the
 address bar

---
 chrome.manifest                          |   6 +-
 chrome/content/apps.js                   | 160 ++++++++
 chrome/content/content.js                |  75 ++++
 chrome/content/mobile/dialogs/prompt.xul |  19 +
 chrome/content/mobile/options.xul        |   8 +
 chrome/content/mobile/overlay.xul        |  31 ++
 chrome/content/overlay.js                | 470 ++++++++++-------------
 chrome/content/overlay.xul               |  39 +-
 chrome/locale/en-US/overlay.properties   |   1 +
 chrome/skin/app_icons/TYPO3.ico          | Bin 894 -> 21590 bytes
 chrome/skin/mobile/overlay.css           |   9 +
 chrome/skin/overlay.css                  |  10 +-
 install.rdf                              |  48 ++-
 13 files changed, 574 insertions(+), 302 deletions(-)
 create mode 100644 chrome/content/apps.js
 create mode 100644 chrome/content/content.js
 create mode 100755 chrome/content/mobile/dialogs/prompt.xul
 create mode 100755 chrome/content/mobile/options.xul
 create mode 100755 chrome/content/mobile/overlay.xul
 create mode 100755 chrome/locale/en-US/overlay.properties
 create mode 100755 chrome/skin/mobile/overlay.css

diff --git a/chrome.manifest b/chrome.manifest
index cc3605458..808d7b4ae 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -2,4 +2,8 @@ content wappalyzer chrome/content/
 locale  wappalyzer en-US chrome/locale/en-US/
 skin    wappalyzer classic/1.0 chrome/skin/
 
-overlay chrome://browser/content/browser.xul chrome://wappalyzer/content/overlay.xul
\ No newline at end of file
+overlay chrome://browser/content/browser.xul chrome://wappalyzer/content/overlay.xul
+
+override chrome://wappalyzer/content/overlay.xul chrome://wappalyzer/content/mobile/overlay.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+override chrome://wappalyzer/content/options.xul chrome://wappalyzer/content/mobile/options.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+override chrome://wappalyzer/skin/overlay.css    chrome://wappalyzer/skin/mobile/overlay.css    application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
diff --git a/chrome/content/apps.js b/chrome/content/apps.js
new file mode 100644
index 000000000..2a09d868c
--- /dev/null
+++ b/chrome/content/apps.js
@@ -0,0 +1,160 @@
+if ( typeof(wappalyzer) != 'undefined' )
+{
+	wappalyzer.apps = {
+		'phpBB':                 { html: /(Powered by (<a href=("|')[^>]+)?phpBB|<meta name=("|')copyright("|') [^>]+phpBB Group)/i },
+		'WordPress':             { html: /(<link rel=("|')stylesheet("|') [^>]+wp-content|<meta name=("|')generator("|') [^>]+WordPress)/i },
+		'MediaWiki':             { html: /(<meta name=("|')generator("|') [^>]+MediaWiki|<a[^>]+>Powered by MediaWiki<\/a>)/i },
+		'Joomla':                { html: /(<meta name=("|')generator("|') [^>]+Joomla|<!\-\- JoomlaWorks "K2")/i, headers: { 'X-Content-Encoded-By': /Joomla/ } },
+		'Drupal':                { html: /(<script [^>]+drupal\.js|jQuery\.extend\(Drupal\.settings, \{|Drupal\.extend\(\{ settings: \{|<link[^>]+sites\/(default|all)\/themes\/|<style.+sites\/(default|all)\/(themes|modules)\/)/i, headers: { 'X-Drupal-Cache': /.*/ } },
+		'Kolibri CMS':           { html: /<meta name=("|')copyright("|') [^>]+Kolibri/i },
+		'vBulletin':             { html: /<meta name=("|')generator("|') [^>]+vBulletin/i },
+		'SMF':                   { html: /<script .+\s+var smf_/i },
+		'IPB':                   { html: /<script [^>]+jscripts\/ips_/i },
+		'Coppermine':            { html: /<!--Coppermine Photo Gallery/i },
+		'MiniBB':                { html: /<a href=("|')[^>]+minibb.+\s+<!--End of copyright link/i },
+		'punBB':                 { html: /Powered by <a href=("|')[^>]+punbb/i },
+		'XMB':                   { html: /<!-- Powered by XMB/i },
+		'YaBB':                  { html: /Powered by <a href=("|')[^>]+yabbforum/i },
+		's9y':                   { html: /<meta name=("|')Powered-By("|') [^>]+Serendipity/i },
+		'e107':                  { html: /<script [^>]+e107\.js/i },
+		'PHP-Fusion':            { html: /Powered by <a href=("|')[^>]+php-fusion/i },
+		'DokuWiki':              { html: /<meta name=("|')generator("|') [^>]+DokuWiki/i },
+		'Squarespace':           { html: /Squarespace\.Constants\.CURRENT_MODULE_ID/i },
+		'MyBB':                  { html: /(<script .+\s+<!--\s+lang\.no_new_posts|<a[^>]* title=("|')Powered By MyBB)/i },
+		'FluxBB':                { html: /Powered by (<strong>)?<a href=("|')[^>]+fluxbb/i },
+		'Vanilla':               { html: /<body id=("|')(DiscussionsPage|vanilla)/i, headers: { 'X-Powered-By': /Vanilla/ } },
+		'TYPO3':                 { html: /(<meta name=("|')generator("|') [^>]+TYPO3|<(script[^>]* src|link[^>]* href)=[^>]*fileadmin)/i, url: /\/typo3/i },
+		'Prestashop':            { html: /(<meta name=("|')generator("|') [^>]+PrestaShop|Powered by <a href=("|')[^>]+PrestaShop)/i },
+		'Zen Cart':              { html: /<meta name=("|')generator("|') [^>]+Zen Cart/i },
+		'osCommerce':            { html: /<!-- header_eof \/\/-->/i },
+		'WikkaWiki':             { html: /(Powered by <a href=("|')[^>]+WikkaWiki|<meta name=("|')generator("|') [^>]+WikkaWiki)/i },
+		'osCSS':                 { html: /<body onload=("|')window\.defaultStatus='oscss templates';("|')/i },
+		'Google Analytics':      { html: /(\.google\-analytics\.com\/ga\.js|<script src=("|')[^"]+google-analytics\.com\/urchin\.js("|'))/i },
+		'Crazy Egg':             { html: /<script type=("|')text\/javascript("|') src=("|')http:\/\/cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js("|')/ },
+		'OneStat':               { html: /var p=("|')http("|')\+\(d\.URL\.indexOf\('https:'\)==0\?'s':''\)\+("|'):\/\/stat\.onestat\.com\/stat\.aspx\?tagver/i },
+		'Clicky':                { html: /<script src=("|')http:\/\/static\.getclicky\.com/i },
+		'Quantcast':             { html: /<script[^>]* src=("|')http:\/\/edge\.quantserve\.com\/quant\.js("|')>/i },
+		'StatCounter':           { html: /<script[^>]* src=("|')http:\/\/www\.statcounter\.com\/counter\/counter/i },
+		'W3Counter':             { html: /<script[^>]* src=("|')http:\/\/www\.w3counter\.com\/tracker\.js("|')>/i },
+		'Site Meter':            { html: /<script[^>]* src=("|')http:\/\/[^.]+\.sitemeter.com\/js\/counter\.js\?site=/i },
+		'CubeCart':              { html: /Powered by <a href=.http:\/\/www\.cubecart\.com/i },
+		'jQuery':                { html: /<script[^>]* src=("|')[^>]*jquery[^>]*\.js/i },
+		'MooTools':              { html: /<script[^>]* src=("|')[^>]*mootools[^>]*\.js("|')/i },
+		'Prototype':             { html: /<script[^>]* src=("|')[^>]*prototype\.js("|')/i },
+		'MochiKit':              { html: /<script[^>]* src=("|')[^>]*MochiKit\.js/i },
+		'viennaCMS':             { html: /powered by <a href=("|')[^>]+viennacms/i },
+		'Movable Type':          { html: /<meta name=("|')generator("|') [^>]+Movable Type/i },
+		'Tumblr':                { html: /<iframe src=("|')http:\/\/www\.tumblr\.com/i, url: /^(www.)?.+\.tumblr\.com/i, headers: { 'X-Tumblr-Usec': /.*/ } },
+		'Google Friend Connect': { html: /<script[^>]* src=("|')[^>]*google.com\/friendconnect/i },
+		'MyBlogLog':             { html: /<script[^>]* src=("|')[^>]*pub\.mybloglog\.com/i },
+		'Google Maps':           { html: /(<script[^>]* src=("|')[^>]*maps\.google\.com\/maps\?file=api|maps\.google\.com\/maps\/api\/staticmap)/i },
+		'AWStats':               { html: /<meta name=("|')generator("|') [^>]+AWStats/i },
+		'phpMyAdmin':            { html: /(var pma_absolute_uri = '|PMA_sendHeaderLocation\(|<title>phpMyAdmin<\/title>)/i },
+		'phpDocumentor':         { html: /<!-- Generated by phpDocumentor/ },
+		'BigDump':               { html: /<!-- <h1>BigDump: Staggered MySQL Dump Importer/ },
+		'MODx':                  { html: /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)/i },
+		'VP-ASP':                { html: /(<a[^>]+>Powered By VP\-ASP Shopping Cart<\/a>|<script[^>]* src=("|')[^>]*vs350\.js)/ },
+		'SPIP':                  { html: /<meta name=("|')generator("|') [^>]+SPIP/i, headers: { 'X-Spip-Cache': /.*/ } },
+		'Plesk':                 { html: /<script[^>]* src=("|')[^>]*common\.js\?plesk/i },
+		'Magento':               { html: /var BLANK_URL = '[^>]+js\/blank\.html'/i },
+		'DirectAdmin':           { html: /<a[^>]+>DirectAdmin<\/a> Web Control Panel/i },
+		'cPanel':                { html: /<!-- cPanel/i },
+		'webEdition':            { html: /(<meta name=("|')generator("|') [^>]+webEdition|<meta name=("|')DC.title("|') [^>]+webEdition)/i },
+		'CMS Made Simple':       { html: /<meta name=("|')generator("|') [^>]+CMS Made Simple/i },
+		'xtCommerce':            { html: /(<meta name=("|')generator("|') [^>]+xt:Commerce|<div class=("|')copyright("|')>.+<a[^>]+>xt:Commerce)/i },
+		'BIGACE':                { html: /(<meta name=("|')generator("|') [^>]+BIGACE|Powered by <a href=("|')[^>]+BIGACE|<!--\s+Site is running BIGACE)/i },
+		'Ubercart':              { html: /<script[^>]* src=("|')[^>]*uc_cart\/uc_cart_block\.js/i },
+		'Contao':                { html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
+		'posterous':             { html: /<div class=("|')posterous/i },
+		'papaya CMS':            { html: /<link[^>]*\/papaya-themes\//i },
+		'eZ Publish':            { html: /<meta name=("|')generator("|') [^>]+eZ Publish/i },
+		'script.aculo.us':       { html: /<script[^>]* src=("|')[^>]*scriptaculous\.js("|')/i },
+		'dojo':                  { html: /<script[^>]* src=("|')[^>]*dojo(\.xd)?\.js("|')/i },
+		'ExtJS':                 { html: /<script[^>]* src=("|')[^>]*ext\-base\.js("|')/i },
+		'WebPublisher':          { html: /<meta name=("|')generator("|') [^>]+WEB\|Publisher/i },
+		'ConversionLab':         { html: /<script[^>]* src=("|')http:\/\/conversionlab\.trackset\.com\/track\/tsend\.js("|')/ },
+		'Koego':                 { html: /<script[^>]* src=("|')http\:\/\/tracking\.koego\.com\/end\/ego\.js("|')/ },
+		'YUI':                   { html: /<script[^>]* src=("|')[^'"]*(\/yui\/|yui\.yahooapis\.com)[^'"]*("|')/ },
+		'VisualPath':            { html: /<script[^>]* src=("|')http:\/\/visualpath[^\/]*\.trackset\.it\/[^\/]+\/track\/include\.js("|')/ },
+		'WebGUI':                { html: /<meta name=("|')generator("|') [^>]+WebGUI/i },
+		'Plone':                 { html: /<meta name=("|')generator("|') [^>]+Plone/i },
+		'CS Cart':               { html: /&nbsp;Powered by (<a href=.http:\/\/www\.cs\-cart\.com|CS\-Cart)/i },
+		'Web Optimizer':         { html: /<title [^>]*lang=("|')wo("|')>/ },
+		'K2':                    { html: /<!\-\- JoomlaWorks "K2"/ },
+		'AddThis':               { html: /<script[^>]* src=("|')[^>]*addthis\.com\/js/ },
+		'Koobi':                 { html: /<meta name=("|')generator("|') [^>]+Koobi/i },
+		'XiTi':                  { html: /<[^>]+src=("|')[^>]+xiti.com\/hit.xiti/i },
+		'Kampyle':               { html: /<script[^>]* src=("|')http:\/\/cf\.kampyle\.com\/k_button\.js("|')/ },
+		'ClickTale':             { html: /if\(typeof ClickTale(Tag)*==("|')function("|')\)/ },
+		'Yahoo! Web Analytics':  { html: /<script[^>]* src=("|')[^>]*http:\/\/d\.yimg\.com\/mi\/ywa\.js/ },
+		'XOOPS':                 { html: /<meta name=("|')generator("|') [^>]+XOOPS/i },
+		'Amiro.CMS':             { html: /<meta name=("|')generator("|') [^>]+Amiro/i },
+		'Blogger':               { html: /<meta content=("|')blogger("|') [^>]+generator/i, url: /^(www.)?.+\.blogspot\.com/i },
+		'DataLife Engine':       { html: /<meta name=("|')generator("|') [^>]+DataLife Engine/i },
+		'Nedstat':               { html: /sitestat\(("|')http:\/\/nl\.sitestat\.com/ },
+		'Microsoft ASP.NET':     { html: /<input[^>]+name=("|')__VIEWSTATE/ },
+		'Yandex.Metrika':        { html: /<script[^>]* src=("|')[^"']+mc\.yandex\.ru\/metrika\/watch\.js("|')/ },
+		'Snoobi':                { html: /<script[^>]* src=("|')[^"']+snoobi\.com\/snoop\.php/ },
+		'Moogo':                 { html: /<script[^>]* src=("|')[^"']+kotisivukone.js/ },
+		'Trac':                  { html: /(<a id=("|')tracpowered)/i },
+		'MantisBT':              { html: /<img[^>]+ alt=("|')Powered by Mantis Bugtracker/i },
+		'Bugzilla':              { html: /<[^>]+(id|title|name)=("|')bugzilla/i },
+		'Redmine':               { html: /(<meta name=("|')description("|')Redmine("|')|Powered by <a href=("|')[^>]+Redmine)/i },
+		'2z Project':            { html: /<meta name=("|')generator("|') [^>]+2z project/i },
+		'Get Satisfaction':      { html: /var feedback_widget = new GSFN\.feedback_widget\(feedback_widget_options\)/ },
+		'Swiftlet':              { html: /(<meta name=("|')generator("|') [^>]+Swiftlet|Powered by <a href=("|')[^>]+Swiftlet)/i, headers: { 'X-Swiftlet-Cache': /.*/, 'X-Powered-By': /Swiftlet/ } },
+		'YouTube':               { html: /<(param|embed)[^>]+youtube\.com\/v/i },
+		'Vimeo':                 { html: /<(param|embed)[^>]+vimeo\.com\/moogaloop/i },
+		'blip.tv':               { html: /<(param|embed)[^>]+blip\.tv\/play/i },
+		'SWFObject':             { html: /<script[^>]+swfobject\.js/i },
+		'Textpattern CMS':       { html: /<meta name=("|')generator("|') [^>]+Textpattern/i },
+		'1C-Bitrix':             { html: /(<link[^>]+components\/bitrix|<script[^>]+1c\-bitrix)/i },
+		'InstantCMS':            { html: /<meta name=("|')generator("|') [^>]+InstantCMS/i },
+		'MaxSite CMS':           { html: /<meta name=("|')generator("|') [^>]+MaxSite CMS/i },
+		'S.Builder':             { html: /<meta name=("|')generator("|') [^>]+S\.Builder/i },
+		'openEngine':            { html: /<meta[^>]+openEngine/i },
+		'SiteEdit':              { html: /<meta name=("|')generator("|') [^>]+SiteEdit/i },
+		'Kentico CMS':           { html: /<meta name=("|')generator("|') [^>]+Kentico CMS/i },
+		'ShareThis':             { html: /<script[^>]+ src=("|')[^"']+w\.sharethis\.com\//i },
+		'chartbeat':             { html: /function loadChartbeat\(\) {/i },
+		'Meebo':                 { html: /(<iframe id=("|')meebo\-iframe("|')|Meebo\('domReady'\))/ },
+		'Gravity Insights':      { html: /gravityInsightsParams\.site_guid = '/ },
+		'Disqus':                { html: /(<div[^>]+id=("|')disqus_thread("|')|<script[^>]+disqus_url)/ },
+		'reCAPTCHA':             { html: /(<div[^>]+id=("|')recaptcha_image|<script[^>]+ src=("|')https:\/\/api\-secure\.recaptcha\.net)/ },
+		'DotNetNuke':            { html: /(<meta name=("|')generator("|') [^>]+DotNetNuke|<!\-\- by DotNetNuke Corporation)/i },
+		'jQuery UI':             { html: /<script[^>]* src=("|')[^>]*jquery\-ui[^>]*\.js/i },
+		'Typekit':               { html: /<script[^>]* src=("|')[^>]*use.typekit.com/i },
+		'Mint':                  { html: /<script[^>]* src=("|')[^>]*mint\/\?js/i },
+		'cufon':                 { html: /(<script[^>]* src=("|')[^>]*cufon\-yui\.js|<script[^>]*>[^<]+Cufon\.now\(\))/i },
+		'sIFR':                  { html: /<script[^>]* src=("|')[^>]*sifr\.js/i },
+		'Mollom':                { html: /(<script[^>]* src=("|')[^>]*mollom\.js|<img[^>]+\/.mollom\/.com)/i },
+		'YUI Doc':               { html: /<html[^>]* yuilibrary\.com\/rdf\/[0-9.]+\/yui\.rdf/i },
+		'Piwik':                 { html: /var piwikTracker = Piwik\.getTracker\(/i },
+		'SOBI 2':                { html: /(<!\-\- start of Sigsiu Online Business Index|<div[^>]* class=("|')sobi2)/i },
+		'DreamWeaver':           { html: /(<!\-\-[^>]*(InstanceBeginEditable|Dreamweaver[^>]+target|DWLayoutDefaultTable)|function MM_preloadImages\(\) {)/ },
+		'FrontPage':             { html: /<meta name=("|')GENERATOR("|') [^>]+Microsoft FrontPage/i },
+		'TypePad':               { html: /<meta name=("|')generator("|') [^>]+typepad/i, url: /^(www.)?.+\.typepad\.com/i },
+		'LiveJournal':           { url: /^(www.)?.+\.livejournal\.com/i },
+		'Vox':                   { url: /^(www.)?.+\.vox\.com/i },
+		'xajax':                 { html: /<script[^>]* src=("|')[^>]*xajax_core\.js/i },
+		'OpenCart':              { html: /(Powered By <a href=("|')[^>]+OpenCart|route = getURLVar\(("|')route)/i },
+		'SQL Buddy':             { html: /(<title>SQL Buddy<\/title>|<[^>]+onclick=("|')sideMainClick\(("|')home\.php)/i },
+		'phpPgAdmin':            { html: /(<title>phpPgAdmin<\/title>|<span class=("|')appname("|')>phpPgAdmin)/i },
+		'Flyspray':              { html: /(<a[^>]+>Powered by Flyspray|<map id=("|')projectsearchform)/ },
+		'swift.engine':          { headers: { 'X-Powered-By': /swift\.engine/ } },
+		'sNews':                 { html: /<meta name=("|')Generator("|') [^>]+sNews/ },
+		'Plura':                 { html: /<iframe src="http:\/\/pluraserver\.com/ },
+		'comScore':              { html: /<iframe[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/ },
+		'Google Font API':       { html: /<link[^>]* href=("|')http:\/\/fonts\.googleapis\.com/ },
+		'CO2Stats':              { html: /src=("|')http:\/\/www\.co2stats\.com\/propres\.php/ },
+		'Woopra':                { html: /<script[^>]* src=("|')[^>]*static\.woopra\.com/i },
+		'Webtrekk':              { html: /var webtrekk = new Object/ },
+		'Reinvigorate':          { html: /reinvigorate\.track\("/ },
+		'Quick.Cart':            { html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
+		'VirtueMart':            { html: /<div id=("|')vmMainPage/ },
+		'Cotonti':               { html: /<meta name=("|')generator("|') [^>]+Cotonti/i },
+		'Mambo':                 { html: /<meta name=("|')generator("|') [^>]+Mambo/i },
+		'Concrete5':             { html: /<meta name=("|')generator("|') [^>]+concrete5/i },
+		'Webtrends':             { html: /<img[^>]+id=("|')DCSIMG("|')[^>]+webtrends/i }
+		};
+}
diff --git a/chrome/content/content.js b/chrome/content/content.js
new file mode 100644
index 000000000..28a91700d
--- /dev/null
+++ b/chrome/content/content.js
@@ -0,0 +1,75 @@
+var wappalyzer = {};
+
+wappalyzer =
+{
+	prevUrl: '',
+
+	init: function()
+	{
+		wappalyzer.log('init');
+
+		addEventListener('DOMContentLoaded', wappalyzer.onPageLoad, false);
+
+		//Browser.selectedBrowser.addProgressListener(wappalyzer.urlChange, Components.interfaces.nsIWebProgress.NOTIFY_LOCATION);
+	},
+
+	log: function(message)
+	{
+		var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
+
+		consoleService.logStringMessage("Wappalyzer content.js: " + message);
+	},
+
+	onPageLoad: function(e)
+	{
+		sendAsyncMessage('wappalyzer:onPageLoad', {
+			href:    content.document.location.href,
+			html:    content.document.documentElement.innerHTML,
+			headers: []
+			});
+	},
+
+	onUrlChange: function(request)
+	{
+		wappalyzer.log('onUrlChange');
+	},
+
+	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 )
+			{
+				wappalyzer.prevUrl = '';
+
+				return;
+			}
+
+			if ( url.spec != wappalyzer.prevUrl )
+			{
+				wappalyzer.prevUrl = url.spec;
+
+				wappalyzer.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)          {}
+	}
+};
+
+wappalyzer.init();
diff --git a/chrome/content/mobile/dialogs/prompt.xul b/chrome/content/mobile/dialogs/prompt.xul
new file mode 100755
index 000000000..701c19f9d
--- /dev/null
+++ b/chrome/content/mobile/dialogs/prompt.xul
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/overlay.dtd">
+
+<dialog id="wappalyzer-prompt" 
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	title="TEST"
+	buttons="accept,cancel"
+	style="min-height: 100px;"
+	onload=""
+	ondialogaccept="">
+	<hbox>
+		<vbox align="center" pack="start">
+			<image src="chrome://wappalyzer/skin/icon32x32.png" style="padding: 20px;"/>
+		</vbox>
+	</hbox>
+</dialog>
diff --git a/chrome/content/mobile/options.xul b/chrome/content/mobile/options.xul
new file mode 100755
index 000000000..93b116e52
--- /dev/null
+++ b/chrome/content/mobile/options.xul
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/overlay.dtd">
+
+<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+</vbox>
diff --git a/chrome/content/mobile/overlay.xul b/chrome/content/mobile/overlay.xul
new file mode 100755
index 000000000..99feaff2a
--- /dev/null
+++ b/chrome/content/mobile/overlay.xul
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet type="text/css" href="chrome://wappalyzer/skin/overlay.css"?>
+
+<!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/overlay.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/overlay.js"/>
+	<script type="application/x-javascript" src="chrome://wappalyzer/content/apps.js"/>
+	
+	<stringbundleset id="stringbundleset">
+		<stringbundle id="wappalyzer-strings" src="chrome://wappalyzer/locale/overlay.properties" />
+	</stringbundleset>
+
+	<script type="application/x-javascript">
+		<![CDATA[
+		if ( typeof(wappalyzer) != 'undefined' )
+		{
+			wappalyzer.isMobile = true;
+		}
+		]]>
+	</script>
+
+	<hbox id="urlbar-container">
+		<hbox id="wappalyzer-detected-apps" align="middle">
+		</hbox>
+		<hbox id="wappalyzer-icon" align="middle">
+			<image src="chrome://wappalyzer/skin/icon32x32.png" class="wappalyzer-icon"/>
+		</hbox>
+	</hbox>
+</overlay>
diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
index 4397e2d49..2cfef90d0 100644
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@@ -2,191 +2,35 @@
 
 var wappalyzer = {};
 
-window.addEventListener('load',   function() { wappalyzer.init();       }, false);
-window.addEventListener('unload', function() { wappalyzer.sendReport(); }, false);
+addEventListener('load',   function() { wappalyzer.init();       }, false);
+addEventListener('unload', function() { wappalyzer.sendReport(); }, false);
 
 wappalyzer =
 {
-	homeUrl:        'http://wappalyzer.com/',
-	prevUrl:        '',
-	regexDomain:    /^[a-z0-9._\-]+\.[a-z]+$/,
+	apps:           {},
 	appsDetected:   0,
-	checkUnique:    {},
-	currentTab:     false,
-	prefs:          null,
 	autoDetect:     true,
+	browser:        {},
+	currentTab:     false,
+	checkUnique:    {},
 	enableTracking: true,
-	newInstall:     false,
-	showAppNames:   3,
 	history:        {},
 	hitCount:       0,
+	homeUrl:        'http://wappalyzer.com/',
 	isBookmarklet:  false,
+	isMobile:       false,
+	newInstall:     false,
+	prevUrl:        '',
+	prefs:          {},
+	regexDomain:    /^[a-z0-9._\-]+\.[a-z]+/,
 	req:            false,
-
-	apps: {
-		'phpBB':                 { html: /(Powered by (<a href=("|')[^>]+)?phpBB|<meta name=("|')copyright("|') [^>]+phpBB Group)/i },
-		'WordPress':             { html: /(<link rel=("|')stylesheet("|') [^>]+wp-content|<meta name=("|')generator("|') [^>]+WordPress)/i },
-		'MediaWiki':             { html: /(<meta name=("|')generator("|') [^>]+MediaWiki|<a[^>]+>Powered by MediaWiki<\/a>)/i },
-		'Joomla':                { html: /(<meta name=("|')generator("|') [^>]+Joomla|<!\-\- JoomlaWorks "K2")/i, headers: { 'X-Content-Encoded-By': /Joomla/ } },
-		'Drupal':                { html: /(<script [^>]+drupal\.js|jQuery\.extend\(Drupal\.settings, \{|Drupal\.extend\(\{ settings: \{|<link[^>]+sites\/(default|all)\/themes\/|<style.+sites\/(default|all)\/(themes|modules)\/)/i, headers: { 'X-Drupal-Cache': /.*/ } },
-		'Kolibri CMS':           { html: /<meta name=("|')copyright("|') [^>]+Kolibri/i },
-		'vBulletin':             { html: /<meta name=("|')generator("|') [^>]+vBulletin/i },
-		'SMF':                   { html: /<script .+\s+var smf_/i },
-		'IPB':                   { html: /<script [^>]+jscripts\/ips_/i },
-		'Coppermine':            { html: /<!--Coppermine Photo Gallery/i },
-		'MiniBB':                { html: /<a href=("|')[^>]+minibb.+\s+<!--End of copyright link/i },
-		'punBB':                 { html: /Powered by <a href=("|')[^>]+punbb/i },
-		'XMB':                   { html: /<!-- Powered by XMB/i },
-		'YaBB':                  { html: /Powered by <a href=("|')[^>]+yabbforum/i },
-		's9y':                   { html: /<meta name=("|')Powered-By("|') [^>]+Serendipity/i },
-		'e107':                  { html: /<script [^>]+e107\.js/i },
-		'PHP-Fusion':            { html: /Powered by <a href=("|')[^>]+php-fusion/i },
-		'DokuWiki':              { html: /<meta name=("|')generator("|') [^>]+DokuWiki/i },
-		'Squarespace':           { html: /Squarespace\.Constants\.CURRENT_MODULE_ID/i },
-		'MyBB':                  { html: /(<script .+\s+<!--\s+lang\.no_new_posts|<a[^>]* title=("|')Powered By MyBB)/i },
-		'FluxBB':                { html: /Powered by (<strong>)?<a href=("|')[^>]+fluxbb/i },
-		'Vanilla':               { html: /<body id=("|')(DiscussionsPage|vanilla)/i, headers: { 'X-Powered-By': /Vanilla/ } },
-		'TYPO3':                 { html: /(<meta name=("|')generator("|') [^>]+TYPO3|<(script[^>]* src|link[^>]* href)=[^>]*fileadmin)/i, url: /\/typo3/i },
-		'Prestashop':            { html: /(<meta name=("|')generator("|') [^>]+PrestaShop|Powered by <a href=("|')[^>]+PrestaShop)/i },
-		'Zen Cart':              { html: /<meta name=("|')generator("|') [^>]+Zen Cart/i },
-		'osCommerce':            { html: /<!-- header_eof \/\/-->/i },
-		'WikkaWiki':             { html: /(Powered by <a href=("|')[^>]+WikkaWiki|<meta name=("|')generator("|') [^>]+WikkaWiki)/i },
-		'osCSS':                 { html: /<body onload=("|')window\.defaultStatus='oscss templates';("|')/i },
-		'Google Analytics':      { html: /(\.google\-analytics\.com\/ga\.js|<script src=("|')[^"]+google-analytics\.com\/urchin\.js("|'))/i },
-		'Crazy Egg':             { html: /<script type=("|')text\/javascript("|') src=("|')http:\/\/cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js("|')/ },
-		'OneStat':               { html: /var p=("|')http("|')\+\(d\.URL\.indexOf\('https:'\)==0\?'s':''\)\+("|'):\/\/stat\.onestat\.com\/stat\.aspx\?tagver/i },
-		'Clicky':                { html: /<script src=("|')http:\/\/static\.getclicky\.com/i },
-		'Quantcast':             { html: /<script[^>]* src=("|')http:\/\/edge\.quantserve\.com\/quant\.js("|')>/i },
-		'StatCounter':           { html: /<script[^>]* src=("|')http:\/\/www\.statcounter\.com\/counter\/counter/i },
-		'W3Counter':             { html: /<script[^>]* src=("|')http:\/\/www\.w3counter\.com\/tracker\.js("|')>/i },
-		'Site Meter':            { html: /<script[^>]* src=("|')http:\/\/[^.]+\.sitemeter.com\/js\/counter\.js\?site=/i },
-		'CubeCart':              { html: /Powered by <a href=.http:\/\/www\.cubecart\.com/i },
-		'jQuery':                { html: /<script[^>]* src=("|')[^>]*jquery[^>]*\.js/i },
-		'MooTools':              { html: /<script[^>]* src=("|')[^>]*mootools[^>]*\.js("|')/i },
-		'Prototype':             { html: /<script[^>]* src=("|')[^>]*prototype\.js("|')/i },
-		'MochiKit':              { html: /<script[^>]* src=("|')[^>]*MochiKit\.js/i },
-		'viennaCMS':             { html: /powered by <a href=("|')[^>]+viennacms/i },
-		'Movable Type':          { html: /<meta name=("|')generator("|') [^>]+Movable Type/i },
-		'Tumblr':                { html: /<iframe src=("|')http:\/\/www\.tumblr\.com/i, url: /^(www.)?.+\.tumblr\.com/i, headers: { 'X-Tumblr-Usec': /.*/ } },
-		'Google Friend Connect': { html: /<script[^>]* src=("|')[^>]*google.com\/friendconnect/i },
-		'MyBlogLog':             { html: /<script[^>]* src=("|')[^>]*pub\.mybloglog\.com/i },
-		'Google Maps':           { html: /(<script[^>]* src=("|')[^>]*maps\.google\.com\/maps\?file=api|maps\.google\.com\/maps\/api\/staticmap)/i },
-		'AWStats':               { html: /<meta name=("|')generator("|') [^>]+AWStats/i },
-		'phpMyAdmin':            { html: /(var pma_absolute_uri = '|PMA_sendHeaderLocation\(|<title>phpMyAdmin<\/title>)/i },
-		'phpDocumentor':         { html: /<!-- Generated by phpDocumentor/ },
-		'BigDump':               { html: /<!-- <h1>BigDump: Staggered MySQL Dump Importer/ },
-		'MODx':                  { html: /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)/i },
-		'VP-ASP':                { html: /(<a[^>]+>Powered By VP\-ASP Shopping Cart<\/a>|<script[^>]* src=("|')[^>]*vs350\.js)/ },
-		'SPIP':                  { html: /<meta name=("|')generator("|') [^>]+SPIP/i, headers: { 'X-Spip-Cache': /.*/ } },
-		'Plesk':                 { html: /<script[^>]* src=("|')[^>]*common\.js\?plesk/i },
-		'Magento':               { html: /var BLANK_URL = '[^>]+js\/blank\.html'/i },
-		'DirectAdmin':           { html: /<a[^>]+>DirectAdmin<\/a> Web Control Panel/i },
-		'cPanel':                { html: /<!-- cPanel/i },
-		'webEdition':            { html: /(<meta name=("|')generator("|') [^>]+webEdition|<meta name=("|')DC.title("|') [^>]+webEdition)/i },
-		'CMS Made Simple':       { html: /<meta name=("|')generator("|') [^>]+CMS Made Simple/i },
-		'xtCommerce':            { html: /(<meta name=("|')generator("|') [^>]+xt:Commerce|<div class=("|')copyright("|')>.+<a[^>]+>xt:Commerce)/i },
-		'BIGACE':                { html: /(<meta name=("|')generator("|') [^>]+BIGACE|Powered by <a href=("|')[^>]+BIGACE|<!--\s+Site is running BIGACE)/i },
-		'Ubercart':              { html: /<script[^>]* src=("|')[^>]*uc_cart\/uc_cart_block\.js/i },
-		'Contao':                { html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
-		'posterous':             { html: /<div class=("|')posterous/i },
-		'papaya CMS':            { html: /<link[^>]*\/papaya-themes\//i },
-		'eZ Publish':            { html: /<meta name=("|')generator("|') [^>]+eZ Publish/i },
-		'script.aculo.us':       { html: /<script[^>]* src=("|')[^>]*scriptaculous\.js("|')/i },
-		'dojo':                  { html: /<script[^>]* src=("|')[^>]*dojo(\.xd)?\.js("|')/i },
-		'ExtJS':                 { html: /<script[^>]* src=("|')[^>]*ext\-base\.js("|')/i },
-		'WebPublisher':          { html: /<meta name=("|')generator("|') [^>]+WEB\|Publisher/i },
-		'ConversionLab':         { html: /<script[^>]* src=("|')http:\/\/conversionlab\.trackset\.com\/track\/tsend\.js("|')/ },
-		'Koego':                 { html: /<script[^>]* src=("|')http\:\/\/tracking\.koego\.com\/end\/ego\.js("|')/ },
-		'YUI':                   { html: /<script[^>]* src=("|')[^'"]*(\/yui\/|yui\.yahooapis\.com)[^'"]*("|')/ },
-		'VisualPath':            { html: /<script[^>]* src=("|')http:\/\/visualpath[^\/]*\.trackset\.it\/[^\/]+\/track\/include\.js("|')/ },
-		'WebGUI':                { html: /<meta name=("|')generator("|') [^>]+WebGUI/i },
-		'Plone':                 { html: /<meta name=("|')generator("|') [^>]+Plone/i },
-		'CS Cart':               { html: /&nbsp;Powered by (<a href=.http:\/\/www\.cs\-cart\.com|CS\-Cart)/i },
-		'Web Optimizer':         { html: /<title [^>]*lang=("|')wo("|')>/ },
-		'K2':                    { html: /<!\-\- JoomlaWorks "K2"/ },
-		'AddThis':               { html: /<script[^>]* src=("|')[^>]*addthis\.com\/js/ },
-		'Koobi':                 { html: /<meta name=("|')generator("|') [^>]+Koobi/i },
-		'XiTi':                  { html: /<[^>]+src=("|')[^>]+xiti.com\/hit.xiti/i },
-		'Kampyle':               { html: /<script[^>]* src=("|')http:\/\/cf\.kampyle\.com\/k_button\.js("|')/ },
-		'ClickTale':             { html: /if\(typeof ClickTale(Tag)*==("|')function("|')\)/ },
-		'Yahoo! Web Analytics':  { html: /<script[^>]* src=("|')[^>]*http:\/\/d\.yimg\.com\/mi\/ywa\.js/ },
-		'XOOPS':                 { html: /<meta name=("|')generator("|') [^>]+XOOPS/i },
-		'Amiro.CMS':             { html: /<meta name=("|')generator("|') [^>]+Amiro/i },
-		'Blogger':               { html: /<meta content=("|')blogger("|') [^>]+generator/i, url: /^(www.)?.+\.blogspot\.com/i },
-		'DataLife Engine':       { html: /<meta name=("|')generator("|') [^>]+DataLife Engine/i },
-		'Nedstat':               { html: /sitestat\(("|')http:\/\/nl\.sitestat\.com/ },
-		'Microsoft ASP.NET':     { html: /<input[^>]+name=("|')__VIEWSTATE/ },
-		'Yandex.Metrika':        { html: /<script[^>]* src=("|')[^"']+mc\.yandex\.ru\/metrika\/watch\.js("|')/ },
-		'Snoobi':                { html: /<script[^>]* src=("|')[^"']+snoobi\.com\/snoop\.php/ },
-		'Moogo':                 { html: /<script[^>]* src=("|')[^"']+kotisivukone.js/ },
-		'Trac':                  { html: /(<a id=("|')tracpowered)/i },
-		'MantisBT':              { html: /<img[^>]+ alt=("|')Powered by Mantis Bugtracker/i },
-		'Bugzilla':              { html: /<[^>]+(id|title|name)=("|')bugzilla/i },
-		'Redmine':               { html: /(<meta name=("|')description("|')Redmine("|')|Powered by <a href=("|')[^>]+Redmine)/i },
-		'2z Project':            { html: /<meta name=("|')generator("|') [^>]+2z project/i },
-		'Get Satisfaction':      { html: /var feedback_widget = new GSFN\.feedback_widget\(feedback_widget_options\)/ },
-		'Swiftlet':              { html: /(<meta name=("|')generator("|') [^>]+Swiftlet|Powered by <a href=("|')[^>]+Swiftlet)/i, headers: { 'X-Swiftlet-Cache': /.*/, 'X-Powered-By': /Swiftlet/ } },
-		'YouTube':               { html: /<(param|embed)[^>]+youtube\.com\/v/i },
-		'Vimeo':                 { html: /<(param|embed)[^>]+vimeo\.com\/moogaloop/i },
-		'blip.tv':               { html: /<(param|embed)[^>]+blip\.tv\/play/i },
-		'SWFObject':             { html: /<script[^>]+swfobject\.js/i },
-		'Textpattern CMS':       { html: /<meta name=("|')generator("|') [^>]+Textpattern/i },
-		'1C-Bitrix':             { html: /(<link[^>]+components\/bitrix|<script[^>]+1c\-bitrix)/i },
-		'InstantCMS':            { html: /<meta name=("|')generator("|') [^>]+InstantCMS/i },
-		'MaxSite CMS':           { html: /<meta name=("|')generator("|') [^>]+MaxSite CMS/i },
-		'S.Builder':             { html: /<meta name=("|')generator("|') [^>]+S\.Builder/i },
-		'openEngine':            { html: /<meta[^>]+openEngine/i },
-		'SiteEdit':              { html: /<meta name=("|')generator("|') [^>]+SiteEdit/i },
-		'Kentico CMS':           { html: /<meta name=("|')generator("|') [^>]+Kentico CMS/i },
-		'ShareThis':             { html: /<script[^>]+ src=("|')[^"']+w\.sharethis\.com\//i },
-		'chartbeat':             { html: /function loadChartbeat\(\) {/i },
-		'Meebo':                 { html: /(<iframe id=("|')meebo\-iframe("|')|Meebo\('domReady'\))/ },
-		'Gravity Insights':      { html: /gravityInsightsParams\.site_guid = '/ },
-		'Disqus':                { html: /(<div[^>]+id=("|')disqus_thread("|')|<script[^>]+disqus_url)/ },
-		'reCAPTCHA':             { html: /(<div[^>]+id=("|')recaptcha_image|<script[^>]+ src=("|')https:\/\/api\-secure\.recaptcha\.net)/ },
-		'DotNetNuke':            { html: /(<meta name=("|')generator("|') [^>]+DotNetNuke|<!\-\- by DotNetNuke Corporation)/i },
-		'jQuery UI':             { html: /<script[^>]* src=("|')[^>]*jquery\-ui[^>]*\.js/i },
-		'Typekit':               { html: /<script[^>]* src=("|')[^>]*use.typekit.com/i },
-		'Mint':                  { html: /<script[^>]* src=("|')[^>]*mint\/\?js/i },
-		'cufon':                 { html: /(<script[^>]* src=("|')[^>]*cufon\-yui\.js|<script[^>]*>[^<]+Cufon\.now\(\))/i },
-		'sIFR':                  { html: /<script[^>]* src=("|')[^>]*sifr\.js/i },
-		'Mollom':                { html: /(<script[^>]* src=("|')[^>]*mollom\.js|<img[^>]+\/.mollom\/.com)/i },
-		'YUI Doc':               { html: /<html[^>]* yuilibrary\.com\/rdf\/[0-9.]+\/yui\.rdf/i },
-		'Piwik':                 { html: /var piwikTracker = Piwik\.getTracker\(/i },
-		'SOBI 2':                { html: /(<!\-\- start of Sigsiu Online Business Index|<div[^>]* class=("|')sobi2)/i },
-		'DreamWeaver':           { html: /(<!\-\-[^>]*(InstanceBeginEditable|Dreamweaver[^>]+target|DWLayoutDefaultTable)|function MM_preloadImages\(\) {)/ },
-		'FrontPage':             { html: /<meta name=("|')GENERATOR("|') [^>]+Microsoft FrontPage/i },
-		'TypePad':               { html: /<meta name=("|')generator("|') [^>]+typepad/i, url: /^(www.)?.+\.typepad\.com/i },
-		'LiveJournal':           { url: /^(www.)?.+\.livejournal\.com/i },
-		'Vox':                   { url: /^(www.)?.+\.vox\.com/i },
-		'xajax':                 { html: /<script[^>]* src=("|')[^>]*xajax_core\.js/i },
-		'OpenCart':              { html: /Powered By <a href=("|')[^>]+OpenCart/i },
-		'SQL Buddy':             { html: /(<title>SQL Buddy<\/title>|<[^>]+onclick=("|')sideMainClick\(("|')home\.php)/i },
-		'phpPgAdmin':            { html: /(<title>phpPgAdmin<\/title>|<span class=("|')appname("|')>phpPgAdmin)/i },
-		'Flyspray':              { html: /(<a[^>]+>Powered by Flyspray|<map id=("|')projectsearchform)/ },
-		'swift.engine':          { headers: { 'X-Powered-By': /swift\.engine/ } },
-		'sNews':                 { html: /<meta name=("|')Generator("|') [^>]+sNews/ },
-		'Plura':                 { html: /<iframe src="http:\/\/pluraserver\.com/ },
-		'comScore':              { html: /<iframe[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/ },
-		'Google Font API':       { html: /<link[^>]* href=("|')http:\/\/fonts\.googleapis\.com/ },
-		'CO2Stats':              { html: /src=("|')http:\/\/www\.co2stats\.com\/propres\.php/ },
-		'Woopra':                { html: /<script[^>]* src=("|')[^>]*static\.woopra\.com/i },
-		'Webtrekk':              { html: /var webtrekk = new Object/ },
-		'Reinvigorate':          { html: /reinvigorate\.track\("/ },
-		'Quick.Cart':            { html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
-		'VirtueMart':            { html: /<div id=("|')vmMainPage/ },
-		'Cotonti':               { html: /<meta name=("|')generator("|') [^>]+Cotonti/i },
-		'Mambo':                 { html: /<meta name=("|')generator("|') [^>]+Mambo/i },
-		'Concrete5':             { html: /<meta name=("|')generator("|') [^>]+concrete5/i },
-		'Webtrends':             { html: /<img[^>]+id=("|')DCSIMG("|')[^>]+webtrends/i }
-		},
+	showAppNames:   3,
 
 	init: function()
 	{
-		if ( wappalyzer.isBookmarklet )
-		{
-			return;
-		}
+		wappalyzer.log('init');
+
+		wappalyzer.browser = typeof(Browser) != 'undefined' ? Browser.selectedBrowser : gBrowser;
 
 		// Preferences
 		wappalyzer.prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService).getBranch('wappalyzer.');
@@ -204,18 +48,30 @@ wappalyzer =
 		{
 			wappalyzer.prefs.setBoolPref('newInstall', false);
 
-			gBrowser.addEventListener('load', wappalyzer.installSuccess, false);
+			wappalyzer.browser.addEventListener('load', wappalyzer.installSuccess, false);
 		}
 
+		// Listen messages sent from the content process
+		messageManager.addMessageListener('wappalyzer:onPageLoad', wappalyzer.onContentPageLoad);
+
+		messageManager.loadFrameScript('chrome://wappalyzer/content/content.js', true);
+
 		// Listen for URL changes
-		gBrowser.addProgressListener(wappalyzer.urlChange, Components.interfaces.nsIWebProgress.NOTIFY_LOCATION);
+		wappalyzer.browser.addProgressListener(wappalyzer.urlChange, Components.interfaces.nsIWebProgress.NOTIFY_LOCATION);
 
-		var appContent = document.getElementById('appcontent');
+		// Listen for page loads
+		wappalyzer.browser.addEventListener('DOMContentLoaded', wappalyzer.onPageLoad, true);
+	},
 
-		if ( appContent )
-		{
-			appContent.addEventListener('DOMContentLoaded', wappalyzer.onPageLoad, true);
-		}
+	log: function(message) {
+		var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
+
+		consoleService.logStringMessage("Wappalyzer: " + message);
+	},
+
+	get strings()
+	{
+		return document.getElementById('wappalyzer-strings');
 	},
 
 	observe: function(subject, topic, data)
@@ -244,18 +100,54 @@ wappalyzer =
 
 	onPageLoad: function(event)
 	{
+		wappalyzer.log('onPageLoad');
+
+		/*
+		var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+		                        .getService(Components.interfaces.nsIPromptService);
+
+		var re = prompts.alert(null, 'Wappalyzer', 'Wappalyzer for Firefox Mobile is not yet functional.');
+		*/
+
 		var doc = event.originalTarget;
 
-		wappalyzer.analyzePage(doc, true, false);
+		wappalyzer.analyzePage(
+			document.location.href,
+			document.documentElement.innerHTML,
+			[],
+			true,
+			false
+			);
+	},
+
+	onContentPageLoad: function(message)
+	{
+		wappalyzer.log('onContentPageLoad');
+
+		wappalyzer.analyzePage(
+			message.json.href,
+			message.json.html,
+			message.json.headers,
+			true,
+			false
+			);
 	},
 
 	onUrlChange: function(request)
 	{
-		var doc = gBrowser.selectedBrowser.contentDocument;
+		wappalyzer.log('onUrlChange');
+
+		var doc = wappalyzer.browser.contentDocument;
 
 		doc.request = request;
 
-		wappalyzer.analyzePage(doc, false, false);
+		wappalyzer.analyzePage(
+			doc.location.href,
+			doc.documentElement.innerHTML,
+			[],
+			false,
+			false
+			);
 	},
 
 	urlChange:
@@ -295,13 +187,15 @@ wappalyzer =
 		onSecurityChange: function(a, b, c)          {}
 	},
 
-	analyzePage: function(doc, doCount, manualDetect)
+	analyzePage: function(href, html, headers, doCount, manualDetect)
 	{
+		wappalyzer.log('analyzePage');
+
 		wappalyzer.currentTab = false;
 
 		if ( !wappalyzer.isBookmarklet )
 		{
-			if ( doc.location && doc.location.href == gBrowser.selectedBrowser.contentDocument.location.href )
+			if ( href == wappalyzer.browser.contentDocument.location.href )
 			{
 				wappalyzer.currentTab = true;
 
@@ -309,11 +203,14 @@ wappalyzer =
 			}
 		}
 
+		if ( typeof(html) == 'undefined' )
+		{
+			html = '';
+		}
+
 		if ( wappalyzer.autoDetect || ( !wappalyzer.autoDetect && manualDetect ) )
 		{
 			// Scan URL, domain and response headers for patterns
-			var html = doc.documentElement.innerHTML;
-
 			if ( html.length > 50000 ) // Prevent large documents from slowing things down
 			{
 				html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
@@ -332,21 +229,22 @@ wappalyzer =
 
 							if ( regex.test(html) )
 							{
-								wappalyzer.showApp(appName, doc, doCount);
+								wappalyzer.showApp(appName, href, doCount);
 							}
 						}
 
 						// Scan URL
-						if ( typeof(wappalyzer.apps[appName].url) != 'undefined' && typeof(doc.location.href) != 'undefined' )
+						if ( href && typeof(wappalyzer.apps[appName].url) != 'undefined' )
 						{
 							var regex = wappalyzer.apps[appName].url;
 
-							if ( regex.test(doc.location.href) )
+							if ( regex.test(href) )
 							{
-								wappalyzer.showApp(appName, doc, doCount);
+								wappalyzer.showApp(appName, href, doCount);
 							}
 						}
 
+						/*
 						// Scan response header
 						if ( typeof(wappalyzer.apps[appName].headers) != 'undefined' && typeof(doc.request) != 'undefined' )
 						{
@@ -366,6 +264,7 @@ wappalyzer =
 								}
 							}
 						}
+						*/
 					}
 				}
 			}
@@ -374,105 +273,110 @@ wappalyzer =
 		}
 	},
 
-	showApp: function(detectedApp, doc, doCount)
+	showApp: function(detectedApp, href, doCount)
 	{
+		wappalyzer.log('showApp ' + detectedApp);
+
 		if ( !wappalyzer.currentTab && !wappalyzer.isBookmarklet )
 		{
-			wappalyzer.report(detectedApp, doc.domain);
+			wappalyzer.report(detectedApp, href);
 
 			return;
 		}
 
 		if ( detectedApp && typeof(wappalyzer.checkUnique[detectedApp]) == 'undefined' )
 		{
-			domain = doc.domain;
-
-			if ( !wappalyzer.isBookmarklet )
+			switch ( true )
 			{
-				// Hide Wappalyzer icon
-				document.getElementById('wappalyzer-icon').style.display = 'none';
+				case wappalyzer.isBookmarklet:
+					var e = document.getElementById('wappalyzer-bookmarklet-apps');
+
+					e.innerHTML =
+						( wappalyzer.appsDetected ? e.innerHTML : '' ) +
+						'<a href="' + wappalyzer.homeUrl + 'stats/app/' + escape(wappalyzer.app[i]) + '" style="color: #332;">' +
+						wappalyzer.app[i] +
+						'</a><br/>'
+						;
 
-				// Show app icon and label
-				var e = document.getElementById('wappalyzer-detected-apps');
+					break;
+				case wappalyzer.isMobile:
+				default:
+					// Hide Wappalyzer icon
+					document.getElementById('wappalyzer-icon').style.display = 'none';
 
-				var child = document.createElement('image');
+					// Show app icon and label
+					var e = document.getElementById('wappalyzer-detected-apps');
 
-				child.setAttribute('src',   'chrome://wappalyzer/skin/app_icons/' + detectedApp + '.ico');
-				child.setAttribute('class', 'wappalyzer-icon');
+					var child = document.createElement('image');
 
-				if ( wappalyzer.showAppNames == 2 )
-				{
-					var panel = document.getElementById('wappalyzer-panel');
+					child.setAttribute('src',   'chrome://wappalyzer/skin/app_icons/' + detectedApp + '.ico');
+					child.setAttribute('class', 'wappalyzer-icon');
 
-					var tooltiptext = panel.getAttribute('tooltiptext') + ( panel.getAttribute('tooltiptext') ? '\n' : '' ) + detectedApp;
+					if ( !wappalyzer.isMobile )
+					{
+						if ( wappalyzer.showAppNames == 2 )
+						{
+							var urlbar = document.getElementById('wappalyzer-urlbar');
 
-					panel.setAttribute('tooltiptext', tooltiptext);
-				}
+							var tooltiptext = urlbar.getAttribute('tooltiptext') + '\n' + detectedApp;
 
-				if ( wappalyzer.showAppNames == 3 )
-				{
-					child.setAttribute('onmouseover', 'wappalyzer.showLabels(true)');
-					child.setAttribute('onmouseout',  'wappalyzer.showLabels(false)');
-				}
+							urlbar.setAttribute('tooltiptext', tooltiptext);
+						}
 
-				if ( wappalyzer.appsDetected )
-				{
-					child.setAttribute('style', 'margin-left: .5em');
-				}
+						if ( wappalyzer.showAppNames == 3 )
+						{
+							child.setAttribute('onmouseover', 'wappalyzer.showLabels(true)');
+							child.setAttribute('onmouseout',  'wappalyzer.showLabels(false)');
+						}
 
-				e.appendChild(child);
+						if ( wappalyzer.appsDetected )
+						{
+							child.setAttribute('style', 'margin-left: .5em');
+						}
+					}
 
-				child = document.createElement('label');
+					e.appendChild(child);
 
-				child.setAttribute('value', detectedApp);
-				child.setAttribute('class', 'wappalyzer-app-name');
+					if ( !wappalyzer.isMobile )
+					{
+						child = document.createElement('label');
 
-				if ( wappalyzer.showAppNames != 1 )
-				{
-					child.setAttribute('style', 'display: none;');
-				}
+						child.setAttribute('value', detectedApp);
+						child.setAttribute('class', 'wappalyzer-app-name');
 
-				if ( wappalyzer.showAppNames == 3 )
-				{
-					child.setAttribute('onmouseover', 'wappalyzer.showLabels(true)');
-					child.setAttribute('onmouseout',  'wappalyzer.showLabels(false)');
-				}
+						if ( wappalyzer.showAppNames != 1 )
+						{
+							child.setAttribute('style', 'display: none;');
+						}
 
-				e.appendChild(child);
-			}
-			else
-			{
-				var e = document.getElementById('wappalyzer-bookmarklet-apps');
-
-				e.innerHTML =
-					( wappalyzer.appsDetected ? e.innerHTML : '' ) +
-					'<a href="' + wappalyzer.homeUrl + 'stats/app/' + escape(wappalyzer.app[i]) + '" style="color: #332;">' +
-					wappalyzer.app[i] +
-					'</a><br/>'
-					;
-			}
+						if ( wappalyzer.showAppNames == 3 )
+						{
+							child.setAttribute('onmouseover', 'wappalyzer.showLabels(true)');
+							child.setAttribute('onmouseout',  'wappalyzer.showLabels(false)');
+						}
 
-			if ( doCount )
-			{
-				wappalyzer.report(detectedApp, domain);
-			}
+						e.appendChild(child);
 
-			if ( !wappalyzer.isBookmarklet )
-			{
-				// Enable application statistics menu item
-				var e = document.getElementById('wappalyzer-app-stats');
+						// Enable application statistics menu item
+						var e = document.getElementById('wappalyzer-app-stats');
 
-				e.parentNode.setAttribute('disabled', false);
+						e.parentNode.setAttribute('disabled', false);
 
-				var child = document.createElement('menuitem');
+						var child = document.createElement('menuitem');
 
-				child.setAttribute('label',     detectedApp);
-				child.setAttribute('class',     'menuitem-iconic');
-				child.setAttribute('type',      '');
-				child.setAttribute('image',     'chrome://wappalyzer/skin/app_icons/' + detectedApp + '.ico');
-				child.setAttribute('oncommand', 'wappalyzer.openTab(\'' + wappalyzer.homeUrl + 'stats/app/' + escape(detectedApp) + '\');');
+						child.setAttribute('label',     detectedApp);
+						child.setAttribute('class',     'menuitem-iconic');
+						child.setAttribute('type',      '');
+						child.setAttribute('image',     'chrome://wappalyzer/skin/app_icons/' + detectedApp + '.ico');
+						child.setAttribute('oncommand', 'wappalyzer.openTab(\'' + wappalyzer.homeUrl + 'stats/app/' + escape(detectedApp) + '\');');
 
-				e.appendChild(child);
+						e.appendChild(child);
+					}
+			}
+
+			if ( doCount )
+			{
+				wappalyzer.report(detectedApp, href);
 			}
 
 			wappalyzer.appsDetected ++;
@@ -481,8 +385,12 @@ wappalyzer =
 		}
 	},
 
-	report: function(detectedApp, domain)
+	report: function(detectedApp, href)
 	{
+		wappalyzer.log('report');
+
+		domain = href.match(/:\/\/(.[^/]+)/)[1];
+
 		if ( wappalyzer.enableTracking && wappalyzer.regexDomain.test(domain) )
 		{
 			if ( typeof(wappalyzer.history[domain]) == 'undefined' )
@@ -511,6 +419,8 @@ wappalyzer =
 	// You can turn this off in the options dialog
 	// This is used to track the distibution of software, stats are publically available on the site
 	{
+		wappalyzer.log('sendReport');
+
 		if ( wappalyzer.enableTracking && !wappalyzer.req )
 		{
 			var report = '';
@@ -566,11 +476,13 @@ wappalyzer =
 
 	clearDetectedApps: function()
 	{
+		wappalyzer.log('clearDetectedApps');
+
 		wappalyzer.appsDetected = 0;
 		wappalyzer.checkUnique  = [];
 
 		// Show Wappalyzer icon
-		document.getElementById('wappalyzer-icon').style.display = 'inline';
+		document.getElementById('wappalyzer-icon').style.display = '';
 
 		// Clear app icons and labels
 		e = document.getElementById('wappalyzer-detected-apps');
@@ -580,22 +492,23 @@ wappalyzer =
 			e.removeChild(e.childNodes.item(0));
 		}
 
-		// Clear tooltip
-		var panel = document.getElementById('wappalyzer-panel');
+		if ( !wappalyzer.isMobile )
+		{
+			// Clear tooltip
+			var urlbar = document.getElementById('wappalyzer-urlbar');
 
-		panel.setAttribute('tooltiptext', '');
+			urlbar.setAttribute('tooltiptext', wappalyzer.strings.getString('wappalyzer.title') + '\n---');
 
-		/* */
-		// Disable and clear application statistics menu item
-		e = document.getElementById('wappalyzer-app-stats');
+			// Disable and clear application statistics menu item
+			e = document.getElementById('wappalyzer-app-stats');
 
-		e.parentNode.setAttribute('disabled', true);
+			e.parentNode.setAttribute('disabled', true);
 
-		while ( e.childNodes.length > 0 )
-		{
-			e.removeChild(e.childNodes.item(0));
+			while ( e.childNodes.length > 0 )
+			{
+				e.removeChild(e.childNodes.item(0));
+			}
 		}
-		/* */
 	},
 
 	showLabels: function(show)
@@ -610,19 +523,19 @@ wappalyzer =
 
 	installSuccess: function()
 	{
-		gBrowser.removeEventListener('load', wappalyzer.installSuccess, false);
+		wappalyzer.browser.removeEventListener('load', wappalyzer.installSuccess, false);
 
 		wappalyzer.openTab(wappalyzer.homeUrl + 'install/success/');
 	},
 
 	openTab: function(url)
 	{
-		gBrowser.selectedTab = gBrowser.addTab(url);
+		wappalyzer.browser.selectedTab = wappalyzer.browser.addTab(url);
 	},
 
 	bookmarklet: function()
 	{
-		if ( typeof(gBrowser) == 'undefined' )
+		if ( typeof(gBrowser) == 'undefined' && typeof(Browser) == 'undefined' )
 		{
 			wappalyzer.isBookmarklet = true;
 
@@ -671,7 +584,12 @@ wappalyzer =
 
 					body.appendChild(container);
 
-					wappalyzer.analyzePage(document, false, false);
+					wappalyzer.analyzePage(
+						document.location.href,
+						document.documentElement.innerHTML,
+						[],
+						false
+						);
 				}
 			}
 		}
diff --git a/chrome/content/overlay.xul b/chrome/content/overlay.xul
index ca8001578..fe7a8db18 100755
--- a/chrome/content/overlay.xul
+++ b/chrome/content/overlay.xul
@@ -6,7 +6,43 @@
 
 <overlay id="wappalyzer-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<script type="application/x-javascript" src="chrome://wappalyzer/content/overlay.js"/>
-	
+	<script type="application/x-javascript" src="chrome://wappalyzer/content/apps.js"/>
+
+	<stringbundleset id="stringbundleset">
+		<stringbundle id="wappalyzer-strings" src="chrome://wappalyzer/locale/overlay.properties" />
+	</stringbundleset>
+
+	<hbox id="urlbar-icons"> 
+		<hbox
+			id="wappalyzer-urlbar"
+			context="wappalyzer-menu"
+			>
+			<image
+				id="wappalyzer-icon"
+				onclick="wappalyzer.analyzePage(gBrowser.selectedBrowser.contentDocument, true, true);"
+				class="wappalyzer-icon"
+				tooltiptext="&wappalyzer.title;"
+				label="&wappalyzer.title;"
+				src="chrome://wappalyzer/skin/icon16x16.ico"/>
+			
+			<box align="start" id="wappalyzer-detected-apps"/>
+
+			<menupopup id="wappalyzer-menu" position="at_pointer">
+				<menuitem label="&wappalyzer.options;" oncommand="
+					window.openDialog('chrome://wappalyzer/content/options.xul', 'wappalyzer-options', 'chrome, centerscreen, modal');
+					"/>
+				<menuseparator/>
+				<menuitem label="&wappalyzer.feedback;" oncommand="wappalyzer.openTab(wappalyzer.homeUrl + '?redirect=feedback');"/>
+				<menuitem label="&wappalyzer.home;"     oncommand="wappalyzer.openTab(wappalyzer.homeUrl);"/>
+				<menuseparator/>
+				<menu label="&wappalyzer.appStats;" disabled="true">
+					<menupopup id="wappalyzer-app-stats"/>
+				</menu>
+			</menupopup>
+		</hbox>
+	</hbox>  
+
+	<!--
 	<statusbar id="status-bar">
 		<statusbarpanel
 			id="wappalyzer-panel"
@@ -37,4 +73,5 @@
 			</menupopup>
 		</statusbarpanel>
 	</statusbar>
+	-->
 </overlay>
diff --git a/chrome/locale/en-US/overlay.properties b/chrome/locale/en-US/overlay.properties
new file mode 100755
index 000000000..20108bcd6
--- /dev/null
+++ b/chrome/locale/en-US/overlay.properties
@@ -0,0 +1 @@
+wappalyzer.title=Wappalyzer
diff --git a/chrome/skin/app_icons/TYPO3.ico b/chrome/skin/app_icons/TYPO3.ico
index cd7420a100bfd36313cf9f5f1035ba781b70b1d6..04fa8a08e6053a093ba6d15c7f86584be31e4fdc 100644
GIT binary patch
literal 21590
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

literal 894
zcmZQzU<5(|0R|u`!H~hsz#zuJz@P!dKp_SNAO?xUfG{@$0|>*we^hY)-M{9&zt>;=
zgDQ-jcjED1_1>R?jX!{B#z_KN9)0+yI{~CpsPP9+Jz*_n+kZn$hLAjUAT4XJV7KM&
zyMKyZKX}2$Lev9o0WxITf9$&b7t{6SJAOfwA(PfKex82v_x-p3|Nf!qc=qX^Quhyt
z1K{cvyMEq&i>eN$Y1XMfKxG182f!KAVBz!Q&yRD@uE5m(|M};?$9#0h7)}29<tNDS
z7oT63?QVBn9Jlk%A&8dKPyPYD#@_()9UPTx`wf)+{r6ABo^J1DDL~}EBJJM0M?k^(
zXHgx~@PoVV$CjI*FgbAlBt$WUTyk+eP_ShmNIe_@eXZU9<KqvY%>T|K(~;HZZEyPX
z_s^WuQ1x&prL6}!=G(8YQELm_mnOosM6AjG`s>?=@BgZH{<fO_6COSt2S9Op>E%t&
zrO80WUSJZ)@Litr`s-_u#s5K}wEy1UiXFe5=l-nQ12X^GtJ}WI)7+PU%=cfBp1rkx
r$DMtD(P9p)_sdT(_5c6%S9gv-I)CcPrAHs10bLFeWnlRKpArlJ<zi(q

diff --git a/chrome/skin/mobile/overlay.css b/chrome/skin/mobile/overlay.css
new file mode 100755
index 000000000..44c7edf53
--- /dev/null
+++ b/chrome/skin/mobile/overlay.css
@@ -0,0 +1,9 @@
+.wappalyzer-icon {
+	background: transparent !important;
+	-moz-box-orient: vertical;
+	list-style-image: url('chrome://wappalyzer/skin/icon32x32.png');
+	margin-left: 7px;
+	width: 32px;
+	height: 32px;
+}
+
diff --git a/chrome/skin/overlay.css b/chrome/skin/overlay.css
index f78189ad8..02c374950 100755
--- a/chrome/skin/overlay.css
+++ b/chrome/skin/overlay.css
@@ -1,13 +1,13 @@
+#wappalyzer-urlbar {
+	margin-left: 2px;
+}
+
 .wappalyzer-icon {
+	margin-left: 4px !important;
 	width: 16px;
 	height: 16px;
 }
 
-#wappalyzer-tag {
-	display: none;
-	margin-right: .5em;
-}
-
 #wappalyzer-detected-apps label {
 	margin: 0 0 0 .3em;
 }
diff --git a/install.rdf b/install.rdf
index 970a3d36a..15903c445 100644
--- a/install.rdf
+++ b/install.rdf
@@ -3,26 +3,36 @@
 <!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/overlay.dtd">
 
 <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>1.9.4</em:version>
-    <em:type>2</em:type>
+	<Description about="urn:mozilla:install-manifest">
+		<em:id>wappalyzer@crunchlabz.com</em:id>
+		<em:version>1.9.4</em:version>
+		<em:type>2</em:type>
 
-    <em:targetApplication>
-      <Description>
-        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>3.0</em:minVersion>
-        <em:maxVersion>4.0b7pre</em:maxVersion>
-      </Description>
-    </em:targetApplication>
+		<em:targetApplication>
+			<!-- Firefox -->
+			<Description>
+				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+				<em:minVersion>3.0</em:minVersion>
+				<em:maxVersion>4.0b8pre</em:maxVersion>
+			</Description>
+		</em:targetApplication>
 
-	<em:optionsURL>chrome://wappalyzer/content/options.xul</em:optionsURL>
+		<em:targetApplication>
+			<!-- Firefox Mobile -->
+			<Description>
+				<em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
+				<em:minVersion>1.1</em:minVersion>
+				<em:maxVersion>4.0b1</em:maxVersion>
+			</Description>
+		</em:targetApplication>
 
-	<em:name>Wappalyzer</em:name>
-    <em:description>Wappalyzer is an add-on for Firefox that uncovers the technologies used on websites.</em:description>
-	<em:iconURL>chrome://wappalyzer/skin/icon32x32.png</em:iconURL>
-    <em:author>ElbertF</em:author>
-    <em:creator>ElbertF</em:creator>
-    <em:homepageURL>http://wappalyzer.com</em:homepageURL>
-  </Description>      
+		<em:optionsURL>chrome://wappalyzer/content/options.xul</em:optionsURL>
+
+		<em:name>Wappalyzer</em:name>
+		<em:description>Wappalyzer is an add-on for Firefox that uncovers the technologies used on websites.</em:description>
+		<em:iconURL>chrome://wappalyzer/skin/icon32x32.png</em:iconURL>
+		<em:author>ElbertF</em:author>
+		<em:creator>ElbertF</em:creator>
+		<em:homepageURL>http://wappalyzer.com</em:homepageURL>
+	</Description>      
 </RDF>