Added several apps

15 years ago · 5884dca60f
parent fe3f912b7a
commit 5884dca60f
22 changed files with 239 additions and 352 deletions
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@ -11,303 +11,176 @@ wappalyzer =
 	prevUrl:        '',
 	regexDomain:    /^[a-z0-9._\-]+\.[a-z]+$/,
 	appsDetected:   0,
-	checkUnique:    [],
+	checkUnique:    {},
 	currentTab:     false,
-	lastHref:       '',
 	prefs:          null,
 	autoDetect:     true,
 	enableTracking: true,
 	newInstall:     false,
 	showAppNames:   3,
-	history:        [],
+	history:        {},
 	hitCount:       0,
 	isBookmarklet:  false,
 	req:            false,

-	app: [
-		'phpBB',
-		'WordPress',
-		'MediaWiki',
-		'Joomla',
-		'Drupal',
-		'Kolibri CMS',
-		'vBulletin',
-		'SMF',
-		'IPB',
-		'Coppermine',
-		'MiniBB',
-		'punBB',
-		'XMB',
-		'YaBB',
-		's9y',
-		'e107',
-		'PHP-Fusion',
-		'DokuWiki',
-		'Squarespace',
-		'MyBB',
-		'FluxBB',
-		'Vanilla',
-		'TYPO3',
-		'Prestashop',
-		'Zen Cart',
-		'osCommerce',
-		'WikkaWiki',
-		'osCSS',
-		'Google Analytics',
-		'Crazy Egg',
-		'OneStat',
-		'Clicky',
-		'Quantcast',
-		'StatCounter',
-		'W3Counter',
-		'Site Meter',
-		'CubeCart',
-		'jQuery',
-		'MooTools',
-		'Prototype',
-		'MochiKit',
-		'viennaCMS',
-		'Movable Type',
-		'Tumblr',
-		'Google Friend Connect',
-		'MyBlogLog',
-		'Google Maps',
-		'AWStats',
-		'phpMyAdmin',
-		'phpDocumentor',
-		'BigDump',
-		'MODx',
-		'VP-ASP',
-		'SPIP',
-		'Plesk',
-		'Magento',
-		'DirectAdmin',
-		'cPanel',
-		'webEdition',
-		'CMS Made Simple',
-		'xtCommerce',
-		'BIGACE',
-		'Ubercart',
-		'TYPOlight',
-		'posterous',
-		'papaya CMS',
-		'eZ Publish',
-		'script.aculo.us',
-		'dojo',
-		'ExtJS',
-		'WebPublisher',
-		'ConversionLab',
-		'Koego',
-		'YUI',
-		'VisualPath',
-		'WebGUI',
-		'Plone',
-		'CS Cart',
-		'Web Optimizer',
-		'K2',
-		'AddThis',
-		'Koobi',
-		'XiTi',
-		'Kampyle',
-		'ClickTale',
-		'Yahoo! Web Analytics',
-		'XOOPS',
-		'Amiro.CMS',
-		'Blogger',
-		'DataLife Engine',
-		'Nedstat',
-		'Microsoft ASP.NET',
-		'Yandex.Metrika',
-		'Snoobi',
-		'Moogo',
-		'Trac',
-		'MantisBT',
-		'Bugzilla',
-		'Redmine',
-		'2z Project',
-		'Get Satisfaction',
-		'Swiftlet',
-		'YouTube',
-		'Vimeo',
-		'blip.tv',
-		'SWFObject',
-		'Textpattern CMS',
-		'1C-Bitrix',
-		'InstantCMS',
-		'MaxSite CMS',
-		'S.Builder',
-		'openEngine',
-		'SiteEdit',
-		'Kentico CMS',
-		'ShareThis',
-		'chartbeat',
-		'Meebo',
-		'Gravity Insights',
-		'Disqus',
-		'reCAPTCHA',
-		'DotNetNuke',
-		'jQuery UI',
-		'Typekit',
-		'Mint',
-		'cufon',
-		'sIFR',
-		'Mollom'
-		],
-
-	match: [
-		/(Powered by (<a href=("|')[^>]+)?phpBB|<meta name=("|')copyright("|') [^>]+phpBB Group)/i,
-		/(<link rel=("|')stylesheet("|') [^>]+wp-content|<meta name=("|')generator("|') [^>]+WordPress)/i,
-		/(<meta name=("|')generator("|') [^>]+MediaWiki|<a[^>]+>Powered by MediaWiki<\/a>)/i,
-		/<meta name=("|')generator("|') [^>]+Joomla/i,
-		/(<script [^>]+drupal\.js|jQuery\.extend\(Drupal\.settings, \{|Drupal\.extend\(\{ settings: \{|<link[^>]+sites\/(default|all)\/themes\/|<style.+sites\/(default|all)\/(themes|modules)\/)/i,
-		/<meta name=("|')copyright("|') [^>]+Kolibri/i,
-		/<meta name=("|')generator("|') [^>]+vBulletin/i,
-		/<script .+\s+var smf_/i,
-		/<script [^>]+jscripts\/ips_/i,
-		/<!--Coppermine Photo Gallery/i,
-		/<a href=("|')[^>]+minibb.+\s+<!--End of copyright link/i,
-		/Powered by <a href=("|')[^>]+punbb/i,
-		/<!-- Powered by XMB/i,
-		/Powered by <a href=("|')[^>]+yabbforum/i,
-		/<meta name=("|')Powered-By("|') [^>]+Serendipity/i,
-		/<script [^>]+e107\.js/i,
-		/Powered by <a href=("|')[^>]+php-fusion/i,
-		/<meta name=("|')generator("|') [^>]+DokuWiki/i,
-		/Squarespace\.Constants\.CURRENT_MODULE_ID/i,
-		/(<script .+\s+<!--\s+lang\.no_new_posts|<a[^>]* title=("|')Powered By MyBB)/i,
-		/Powered by (<strong>)?<a href=("|')[^>]+fluxbb/i,
-		/<body id=("|')DiscussionsPage("|')/i,
-		/(<meta name=("|')generator("|') [^>]+TYPO3|<(script[^>]* src|link[^>]* href)=[^>]*fileadmin)/i,
-		/Powered by <a href=("|')[^>]+PrestaShop/i,
-		/<meta name=("|')generator("|') [^>]+Zen Cart/i,
-		/<!-- header_eof \/\/-->/i,
-		/(Powered by <a href=("|')[^>]+WikkaWiki|<meta name=("|')generator("|') [^>]+WikkaWiki)/i,
-		/<body onload=("|')window\.defaultStatus='oscss templates';("|')/i,
-		/(\.google\-analytics\.com\/ga\.js|<script src=("|')[^"]+google-analytics\.com\/urchin\.js("|'))/i,
-		/<script type=("|')text\/javascript("|') src=("|')http:\/\/cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js("|')/,
-		/var p=("|')http("|')\+\(d\.URL\.indexOf\('https:'\)==0\?'s':''\)\+("|'):\/\/stat\.onestat\.com\/stat\.aspx\?tagver/i,
-		/<script src=("|')http:\/\/static\.getclicky\.com/i,
-		/<script[^>]* src=("|')http:\/\/edge\.quantserve\.com\/quant\.js("|')>/i,
-		/<script[^>]* src=("|')http:\/\/www\.statcounter\.com\/counter\/counter/i,
-		/<script[^>]* src=("|')http:\/\/www\.w3counter\.com\/tracker\.js("|')>/i,
-		/<script[^>]* src=("|')http:\/\/[^.]+\.sitemeter.com\/js\/counter\.js\?site=/i,
-		/Powered by <a href=.http:\/\/www\.cubecart\.com/i,
-		/<script[^>]* src=("|')[^>]*jquery[^>]*\.js/i,
-		/<script[^>]* src=("|')[^>]*mootools[^>]*\.js("|')/i,
-		/<script[^>]* src=("|')[^>]*prototype\.js("|')/i,
-		/<script[^>]* src=("|')[^>]*MochiKit\.js/i,
-		/powered by <a href=("|')[^>]+viennacms/i,
-		/<meta name=("|')generator("|') [^>]+Movable Type/i,
-		/<iframe src=("|')http:\/\/www\.tumblr\.com/i,
-		/<script[^>]* src=("|')[^>]*google.com\/friendconnect/i,
-		/<script[^>]* src=("|')[^>]*pub\.mybloglog\.com/i,
-		/<script[^>]* src=("|')[^>]*maps\.google\.com\/maps\?file=api/i,
-		/<meta name=("|')generator("|') [^>]+AWStats/i,
-		/var pma_absolute_uri = '/i,
-		/<!-- Generated by phpDocumentor/,
-		/<!-- <h1>BigDump: Staggered MySQL Dump Importer/,
-		/(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)/i,
-		/(<a[^>]+>Powered By VP\-ASP Shopping Cart<\/a>|<script[^>]* src=("|')[^>]*vs350\.js)/,
-		/<meta name=("|')generator("|') [^>]+SPIP/i,
-		/<script[^>]* src=("|')[^>]*common\.js\?plesk/i,
-		/var BLANK_URL = '[^>]+js\/blank\.html'/i,
-		/<a[^>]+>DirectAdmin<\/a> Web Control Panel/i,
-		/<!-- cPanel/i,
-		/(<meta name=("|')generator("|') [^>]+webEdition|<meta name=("|')DC.title("|') [^>]+webEdition)/i,
-		/<meta name=("|')generator("|') [^>]+CMS Made Simple/i,
-		/(<meta name=("|')generator("|') [^>]+xt:Commerce|<div class=("|')copyright("|')>.+<a[^>]+>xt:Commerce)/i,
-		/(<meta name=("|')generator("|') [^>]+BIGACE|Powered by <a href=("|')[^>]+BIGACE|<!--\s+Site is running BIGACE)/i,
-		/<script[^>]* src=("|')[^>]*uc_cart\/uc_cart_block\.js/i,
-		/(<!--\s+This website is powered by TYPOlight|<link[^>]+typolight.css)/i,
-		/<div class=("|')posterous/i,
-		/<link[^>]*\/papaya-themes\//i,
-		/<meta name=("|')generator("|') [^>]+eZ Publish/i,
-		/<script[^>]* src=("|')[^>]*scriptaculous\.js("|')/i,
-		/<script[^>]* src=("|')[^>]*dojo(\.xd)?\.js("|')/i,
-		/<script[^>]* src=("|')[^>]*ext\-base\.js("|')/i,
-		/<meta name=("|')generator("|') [^>]+WEB\|Publisher/i,
-		/<script[^>]* src=("|')http:\/\/conversionlab\.trackset\.com\/track\/tsend\.js("|')/,
-		/<script[^>]* src=("|')http\:\/\/tracking\.koego\.com\/end\/ego\.js("|')/,
-		/<script[^>]* src=("|')[^'"]*(\/yui\/|yui\.yahooapis\.com)[^'"]*("|')/,
-		/<script[^>]* src=("|')http:\/\/visualpath[^\/]*\.trackset\.it\/[^\/]+\/track\/include\.js("|')/,
-		/<meta name=("|')generator("|') [^>]+WebGUI/i,
-		/<meta name=("|')generator("|') [^>]+Plone/i,
-		/&nbsp;Powered by (<a href=.http:\/\/www\.cs\-cart\.com|CS\-Cart)/i,
-		/<title [^>]*lang=("|')wo("|')>/,
-		/<!-- JoomlaWorks "K2"/,
-		/<script[^>]* src=("|')[^>]*addthis\.com\/js/,
-		/<meta name=("|')generator("|') [^>]+Koobi/i,
-		/<[^>]+src=("|')[^>]+xiti.com\/hit.xiti/i,
-		/<script[^>]* src=("|')http:\/\/cf\.kampyle\.com\/k_button\.js("|')/,
-		/if\(typeof ClickTale(Tag)*==("|')function("|')\)/,
-		/<script[^>]* src=("|')[^>]*http:\/\/d\.yimg\.com\/mi\/ywa\.js/,
-		/<meta name=("|')generator("|') [^>]+XOOPS/i,
-		/<meta name=("|')generator("|') [^>]+Amiro/i,
-		/<meta content=("|')blogger("|') [^>]+generator/i,
-		/<meta name=("|')generator("|') [^>]+DataLife Engine/i,
-		/sitestat\(("|')http:\/\/nl\.sitestat\.com/,
-		/<input[^>]+name=("|')__VIEWSTATE/,
-		/<script[^>]* src=("|')[^"']+mc\.yandex\.ru\/metrika\/watch\.js("|')/,
-		/<script[^>]* src=("|')[^"']+snoobi\.com\/snoop\.php/,
-		/<script[^>]* src=("|')[^"']+kotisivukone.js/,
-		/(<a id=("|')tracpowered)/i,
-		/<img[^>]+ alt=("|')Powered by Mantis Bugtracker/i,
-		/<[^>]+(id|title|name)=("|')bugzilla/i,
-		/(<meta name=("|')description("|')Redmine("|')|Powered by <a href=("|')[^>]+Redmine)/i,
-		/<meta name=("|')generator("|') [^>]+2z project/i,
-		/var feedback_widget = new GSFN\.feedback_widget\(feedback_widget_options\)/,
-		/(<meta name=("|')generator("|') [^>]+Swiftlet|Powered by <a href=("|')[^>]+Swiftlet)/i,
-		/<(param|embed)[^>]+youtube\.com\/v/i,
-		/<(param|embed)[^>]+vimeo\.com\/moogaloop/i,
-		/<(param|embed)[^>]+blip\.tv\/play/i,
-		/<script[^>]+swfobject\.js/i,
-		/<meta name=("|')generator("|') [^>]+Textpattern/i,
-		/(<link[^>]+components\/bitrix|<script[^>]+1c\-bitrix)/i,
-		/<meta name=("|')generator("|') [^>]+InstantCMS/i,
-		/<meta name=("|')generator("|') [^>]+MaxSite CMS/i,
-		/<meta name=("|')generator("|') [^>]+S\.Builder/i,
-		/<meta[^>]+openEngine/i,
-		/<meta name=("|')generator("|') [^>]+SiteEdit/i,
-		/<meta name=("|')generator("|') [^>]+Kentico CMS/i,
-		/<script[^>]+ src=("|')[^"']+w\.sharethis\.com\//i,
-		/function loadChartbeat\(\) {/i,
-		/(<iframe id=("|')meebo\-iframe("|')|Meebo\('domReady'\))/,
-		/gravityInsightsParams\.site_guid = '/,
-		/(<div[^>]+id=("|')disqus_thread("|')|<script[^>]+disqus_url)/,
-		/(<div[^>]+id=("|')recaptcha_image|<script[^>]+ src=("|')https:\/\/api\-secure\.recaptcha\.net)/,
-		/(<meta name=("|')generator("|') [^>]+DotNetNuke|<!\-\- by DotNetNuke Corporation)/i,
-		/<script[^>]* src=("|')[^>]*jquery\-ui[^>]*\.js/i,
-		/<script[^>]* src=("|')[^>]*use.typekit.com/i,
-		/<script[^>]* src=("|')[^>]*mint\/\?js/i,
-		/(<script[^>]* src=("|')[^>]*cufon\-yui\.js|<script[^>]*>[^<]+Cufon\.now\(\))/i,
-		/<script[^>]* src=("|')[^>]*sifr\.js/i,
-		/(<script[^>]* src=("|')[^>]*mollom\.js|<img[^>]+\/.mollom\/.com)/i
-		],
-
-	appDomain: [
-		'Blogger',
-		'TypePad',
-		'LiveJournal',
-		'Vox',
-		'TYPO3'
-		],
-
-	matchDomain: [
-		/(www.)?.+\.blogspot\.com$/i,
-		/(www.)?.+\.typepad\.com$/i,
-		/(www.)?.+\.livejournal\.com$/i,
-		/(www.)?.+\.vox\.com$/i,
-		/\/typo3/i
-		],
-
-	init: function() 
+	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/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 },
+		'TYPOlight':             { 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 }
+		},
+
+	init: function()
 	{
 		if ( wappalyzer.isBookmarklet )
 		{
 			return;
 		}

-		// Preferences		
+		// Preferences
 		wappalyzer.prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService).getBranch('wappalyzer.');

 		wappalyzer.prefs.QueryInterface(Components.interfaces.nsIPrefBranch2);
@ -318,11 +191,11 @@ wappalyzer =
 		wappalyzer.enableTracking = wappalyzer.prefs.getBoolPref('enableTracking');
 		wappalyzer.newInstall     = wappalyzer.prefs.getBoolPref('newInstall');

-		// Open page after installation		
+		// Open page after installation
 		if ( wappalyzer.newInstall )
 		{
 			wappalyzer.prefs.setBoolPref('newInstall', false);
-			
+
 			gBrowser.addEventListener('load', wappalyzer.installSuccess, false);
 		}

@ -343,20 +216,20 @@ wappalyzer =
 		{
 			return;
 		}
-		
+
 		switch(data)
 		{
 			case 'autoDetect':
 				wappalyzer.autoDetect     = wappalyzer.prefs.getBoolPref('autoDetect');
-				
+
 				break;
 			case 'enableTracking':
 				wappalyzer.enableTracking = wappalyzer.prefs.getBoolPref('enableTracking');
-				
+
 				break;
 			case 'showAppNames':
 				wappalyzer.showAppNames   = wappalyzer.prefs.getIntPref('showAppNames');
-				
+
 				break;
 		}
 	},
@ -367,11 +240,13 @@ wappalyzer =

 		wappalyzer.analyzePage(doc, true, false);
 	},
-	
-	onUrlChange: function()
+
+	onUrlChange: function(request)
 	{
 		var doc = gBrowser.selectedBrowser.contentDocument;

+		doc.request = request;
+
 		wappalyzer.analyzePage(doc, false, false);
 	},

@ -401,9 +276,8 @@ wappalyzer =
 			if ( url.spec != wappalyzer.prevUrl )
 			{
 				wappalyzer.prevUrl = url.spec;
-				
-				// A tiny pauze to let the page load, otherwise some elements are displayed incorrectly in FF 3.5
-				setTimeout('wappalyzer.onUrlChange()', 50);
+
+				wappalyzer.onUrlChange(request);
 			}
 		},

@ -421,13 +295,6 @@ wappalyzer =
 		{
 			if ( doc.location.href == gBrowser.selectedBrowser.contentDocument.location.href )
 			{
-				if ( wappalyzer.lastHref == doc.location.href )
-				{
-					return;
-				}
-				
-				wappalyzer.lastHref = doc.location.href;
-				
 				wappalyzer.currentTab = true;

 				wappalyzer.clearDetectedApps();
@ -436,48 +303,59 @@ wappalyzer =

 		if ( wappalyzer.autoDetect || ( !wappalyzer.autoDetect && manualDetect ) )
 		{
-			// Scan URL for patterns
-			for ( i = 0; i < wappalyzer.appDomain.length; i ++ )
-			{
-				if ( typeof(wappalyzer.checkUnique[wappalyzer.appDomain[i]]) == 'undefined' ) // Don't scan for apps that have already been detected
-				{
-					var regexDomain = wappalyzer.matchDomain[i];
-
-					if ( typeof(doc.domain) != 'undefined' )
-					{
-						if ( regexDomain.test(doc.domain) )
-						{
-							wappalyzer.showApp(wappalyzer.appDomain[i], doc, doCount);
-						}
-					}
-				}
-			}
-
-			// Scan HTML for patterns
-			var html = doc.getElementsByTagName('html')[0].innerHTML;
+			// 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);
 			}
-			
+
 			if ( html )
 			{
-				for ( i = 0; i < wappalyzer.app.length; i ++ )
+				for ( var appName in wappalyzer.apps )
 				{
-					if ( typeof(wappalyzer.checkUnique[wappalyzer.app[i]]) == 'undefined' ) // Don't scan for apps that have already been detected
+					if ( typeof(wappalyzer.checkUnique[appName]) == 'undefined' ) // Don't scan for apps that have already been detected
 					{
-						var regex = wappalyzer.match[i];
+						// Scan HTML
+						if ( typeof(wappalyzer.apps[appName].html) != 'undefined' )
+						{
+							var regex = wappalyzer.apps[appName].html;

-						if ( regex.test(html) )
+							if ( regex.test(html) )
+							{
+								wappalyzer.showApp(appName, doc, doCount);
+							}
+						}
+
+						// Scan URL
+						if ( typeof(wappalyzer.apps[appName].url) != 'undefined' && typeof(doc.location.href) != 'undefined' )
 						{
-							if ( wappalyzer.currentTab || wappalyzer.isBookmarklet )
+							var regex = wappalyzer.apps[appName].url;
+
+							if ( regex.test(doc.location.href) )
 							{
-								wappalyzer.showApp(wappalyzer.app[i], doc, doCount);
+								wappalyzer.showApp(appName, doc, doCount);
 							}
-							else
+						}
+
+						// Scan response header
+						if ( typeof(wappalyzer.apps[appName].headers) != 'undefined' && typeof(doc.request) != 'undefined' )
+						{
+							for ( var header in wappalyzer.apps[appName].headers )
 							{
-								wappalyzer.report(wappalyzer.app[i], doc.domain);
+								var regex = wappalyzer.apps[appName].headers[header];
+
+								try
+								{
+									if ( regex.test(doc.request.nsIHttpChannel.getResponseHeader(header)) )
+									{
+										wappalyzer.showApp(appName, doc, doCount);
+									}
+								}
+								catch(e)
+								{
+								}
 							}
 						}
 					}
@ -490,6 +368,13 @@ wappalyzer =

 	showApp: function(detectedApp, doc, doCount)
 	{
+		if ( !wappalyzer.currentTab && !wappalyzer.isBookmarklet )
+		{
+			wappalyzer.report(detectedApp, doc.domain);
+
+			return;
+		}
+
 		if ( detectedApp && typeof(wappalyzer.checkUnique[detectedApp]) == 'undefined' )
 		{
 			domain = doc.domain;
@ -516,7 +401,7 @@ wappalyzer =
 					panel.setAttribute('tooltiptext', tooltiptext);
 				}

-				if ( wappalyzer.showAppNames == 3 ) 
+				if ( wappalyzer.showAppNames == 3 )
 				{
 					child.setAttribute('onmouseover', 'wappalyzer.showLabels(true)');
 					child.setAttribute('onmouseout',  'wappalyzer.showLabels(false)');
@ -539,7 +424,7 @@ wappalyzer =
 					child.setAttribute('style', 'display: none;');
 				}

-				if ( wappalyzer.showAppNames == 3 ) 
+				if ( wappalyzer.showAppNames == 3 )
 				{
 					child.setAttribute('onmouseover', 'wappalyzer.showLabels(true)');
 					child.setAttribute('onmouseout',  'wappalyzer.showLabels(false)');
@ -550,11 +435,12 @@ wappalyzer =
 			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] +
-					'<br/>'
+					'</a><br/>'
 					;
 			}

@ -563,22 +449,23 @@ wappalyzer =
 				wappalyzer.report(detectedApp, domain);
 			}

-			/* */
-			// Enable application statistics menu item
-			var e = document.getElementById('wappalyzer-app-stats');
+			if ( !wappalyzer.isBookmarklet )
+			{
+				// 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);
+			}

 			wappalyzer.appsDetected ++;

@ -672,7 +559,7 @@ wappalyzer =
 	clearDetectedApps: function()
 	{
 		wappalyzer.appsDetected = 0;
-		wappalyzer.checkUnique  = [];		
+		wappalyzer.checkUnique  = [];

 		// Show Wappalyzer icon
 		document.getElementById('wappalyzer-icon').style.display = 'inline';
@ -684,7 +571,7 @@ wappalyzer =
 		{
 			e.removeChild(e.childNodes.item(0));
 		}
-		
+
 		// Clear tooltip
 		var panel = document.getElementById('wappalyzer-panel');

@ -695,7 +582,7 @@ wappalyzer =
 		e = document.getElementById('wappalyzer-app-stats');

 		e.parentNode.setAttribute('disabled', true);
-		
+
 		while ( e.childNodes.length > 0 )
 		{
 			e.removeChild(e.childNodes.item(0));
@ -714,9 +601,9 @@ wappalyzer =
 	},

 	installSuccess: function()
-	{		
+	{
 		gBrowser.removeEventListener('load', wappalyzer.installSuccess, false);
-		
+
 		wappalyzer.openTab(wappalyzer.homeUrl + 'install/success/');
 	},

@ -732,9 +619,9 @@ wappalyzer =
 			wappalyzer.isBookmarklet = true;

 			if ( !document.getElementById('wappalyzer-bookmarklet') )
-			{			
+			{
 				var body = document.getElementsByTagName('body')[0];
-				
+
 				if ( body )
 				{
 					var container = document.createElement('div');
--- a/chrome/skin/app_icons/AddThis.ico
+++ b/chrome/skin/app_icons/AddThis.ico
--- a/chrome/skin/app_icons/CO2Stats.ico
+++ b/chrome/skin/app_icons/CO2Stats.ico
--- a/chrome/skin/app_icons/DreamWeaver.ico
+++ b/chrome/skin/app_icons/DreamWeaver.ico
--- a/chrome/skin/app_icons/Flyspray.ico
+++ b/chrome/skin/app_icons/Flyspray.ico
--- a/chrome/skin/app_icons/FrontPage.ico
+++ b/chrome/skin/app_icons/FrontPage.ico
--- a/chrome/skin/app_icons/Google
+++ b/chrome/skin/app_icons/Google
--- a/chrome/skin/app_icons/OpenCart.ico
+++ b/chrome/skin/app_icons/OpenCart.ico
--- a/chrome/skin/app_icons/Piwik.ico
+++ b/chrome/skin/app_icons/Piwik.ico
--- a/chrome/skin/app_icons/Plura.ico
+++ b/chrome/skin/app_icons/Plura.ico
--- a/chrome/skin/app_icons/SOBI
+++ b/chrome/skin/app_icons/SOBI
--- a/chrome/skin/app_icons/SQL
+++ b/chrome/skin/app_icons/SQL
--- a/chrome/skin/app_icons/Vanilla.ico
+++ b/chrome/skin/app_icons/Vanilla.ico
--- a/chrome/skin/app_icons/Woopra.ico
+++ b/chrome/skin/app_icons/Woopra.ico
--- a/chrome/skin/app_icons/YUI
+++ b/chrome/skin/app_icons/YUI
--- a/chrome/skin/app_icons/comScore.ico
+++ b/chrome/skin/app_icons/comScore.ico
--- a/chrome/skin/app_icons/jQuery.ico
+++ b/chrome/skin/app_icons/jQuery.ico
--- a/chrome/skin/app_icons/phpPgAdmin.ico
+++ b/chrome/skin/app_icons/phpPgAdmin.ico
--- a/chrome/skin/app_icons/sNews.ico
+++ b/chrome/skin/app_icons/sNews.ico
--- a/chrome/skin/app_icons/swift.engine.ico
+++ b/chrome/skin/app_icons/swift.engine.ico
--- a/chrome/skin/app_icons/xajax.ico
+++ b/chrome/skin/app_icons/xajax.ico
--- a/install.rdf
+++ b/install.rdf
@ -5,14 +5,14 @@
 <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.8.1</em:version>
+    <em:version>1.9.3a1</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>3.7a1pre</em:maxVersion>
+        <em:maxVersion>4.0b1</em:maxVersion>
      </Description>
    </em:targetApplication>