-

chrome/content/apps.js

@@ -23,7 +23,9 @@ wappalyzer.cats = {
 	17: { name: 'Font script',          plural: 'Font scripts' },
 	18: { name: 'Web framework',        plural: 'Web frameworks' },
 	19: { name: 'Miscellaneous',        plural: 'Miscellaneous' },
-	20: { name: 'Editor',               plural: 'Editors' }
+	20: { name: 'Editor',               plural: 'Editors' },
+	21: { name: 'LMS',                  plural: 'LMS' },
+	22: { name: 'Web server',           plural: 'Web servers' }
 	};
 
 wappalyzer.apps = {
@@ -32,6 +34,7 @@ wappalyzer.apps = {
 	'AddThis':               { cats: { 1:  5 }, html: /<script[^>]* src=("|')[^>]*addthis\.com\/js/ },
 	'Adobe GoLive':          { cats: { 1: 20 }, html: /<meta name=("|')generator("|') [^>]+Adobe GoLive/i },
 	'Amiro.CMS':             { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Amiro/i },
+	'Apache':                { cats: { 1: 22 }, headers: { 'Server': /Apache/i } },
 	'AWStats':               { cats: { 1: 10 }, html: /<meta name=("|')generator("|') [^>]+AWStats/i },
 	'BIGACE':                { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+BIGACE|Powered by <a href=("|')[^>]+BIGACE|<!--\s+Site is running BIGACE)/i },
 	'BigDump':               { cats: { 1:  3 }, html: /<!-- <h1>BigDump: Staggered MySQL Dump Importer/ },
@@ -40,6 +43,7 @@ wappalyzer.apps = {
 	'Bugzilla':              { cats: { 1: 13 }, html: /<[^>]+(id|title|name)=("|')bugzilla/i },
 	'Burning Board':         { cats: { 1:  2 }, html: /<a href=('|")[^>]+woltlab\.com.+Burning Board/i },
 	'chartbeat':             { cats: { 1: 10 }, html: /function loadChartbeat\(\) {/i },
+	'Chamilo':               { cats: { 1: 21 }, html: /<meta name=("|')generator("|') [^>]+Chamilo/i, headers: { 'X-Powered-By': /Chamilo/ } },
 	'ClickTale':             { cats: { 1: 10 }, html: /if\(typeof ClickTale(Tag)*==("|')function("|')\)/ },
 	'Clicky':                { cats: { 1: 10 }, html: /<script src=("|')http:\/\/static\.getclicky\.com/i },
 	'CMS Made Simple':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+CMS Made Simple/i },
@@ -90,6 +94,7 @@ wappalyzer.apps = {
 	'Koego':                 { cats: { 1: 10 }, html: /<script[^>]* src=("|')http\:\/\/tracking\.koego\.com\/end\/ego\.js("|')/ },
 	'Kolibri CMS':           { cats: { 1:  1 }, html: /<meta name=("|')copyright("|') [^>]+Kolibri/i },
 	'Koobi':                 { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Koobi/i },
+	'lighttpd':              { cats: { 1: 22 }, headers: { 'Server': /lighttpd/i } },
 	'LiveJournal':           { cats: { 1: 11 }, url: /^(www.)?.+\.livejournal\.com/i },
 	'Magento':               { cats: { 1:  6 }, html: /var BLANK_URL = '[^>]+js\/blank\.html'/i },
 	'Mambo':                 { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Mambo/i },
@@ -104,12 +109,14 @@ wappalyzer.apps = {
 	'Modernizr':             { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*modernizr[^>]*\.js/i },
 	'MODx':                  { cats: { 1:  1 }, html: /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)/i },
 	'Mollom':                { cats: { 1: 16 }, html: /(<script[^>]* src=("|')[^>]*mollom\.js|<img[^>]+\/.mollom\/.com)/i },
+	'Moodle':                { cats: { 1: 21 }, html: /(var moodleConfigFn = function\(me\)|<img[^>]+moodlelogo)/i },
 	'Moogo':                 { cats: { 1:  1 }, html: /<script[^>]* src=("|')[^"']+kotisivukone.js/ },
 	'MooTools':              { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*mootools[^>]*\.js("|')/i },
 	'Movable Type':          { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Movable Type/i },
 	'MyBB':                  { cats: { 1:  2 }, html: /(<script .+\s+<!--\s+lang\.no_new_posts|<a[^>]* title=("|')Powered By MyBB)/i },
 	'MyBlogLog':             { cats: { 1:  5 }, html: /<script[^>]* src=("|')[^>]*pub\.mybloglog\.com/i },
 	'Nedstat':               { cats: { 1: 10 }, html: /sitestat\(("|')http:\/\/nl\.sitestat\.com/ },
+	'Nginx':                 { cats: { 1: 22 }, headers: { 'Server': /nginx/i } },
 	'nopCommerce':           { cats: { 1:  6 }, html: /(<!\-\-Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)/i },
 	'OneStat':               { cats: { 1: 10 }, html: /var p=("|')http("|')\+\(d\.URL\.indexOf\('https:'\)==0\?'s':''\)\+("|'):\/\/stat\.onestat\.com\/stat\.aspx\?tagver/i },
 	'OpenCart':              { cats: { 1:  6 }, html: /(Powered By <a href=("|')[^>]+OpenCart|route = getURLVar\(("|')route)/i },

chrome/content/options.xul

@@ -40,6 +40,8 @@
 			<preference id="wappalyzer-cat18"           name="wappalyzer.cat18"          type="bool"  />
 			<preference id="wappalyzer-cat19"           name="wappalyzer.cat19"          type="bool"  />
 			<preference id="wappalyzer-cat20"           name="wappalyzer.cat20"          type="bool"  />
+			<preference id="wappalyzer-cat21"           name="wappalyzer.cat21"          type="bool"  />
+			<preference id="wappalyzer-cat22"           name="wappalyzer.cat22"          type="bool"  />
 		</preferences>
 
 		<tabbox>
@@ -199,6 +201,12 @@
 										<checkbox preference="wappalyzer-cat20" id="wappalyzer-option-cat20" label="&wappalyzer.cat20;"/>
 									</hbox>
 									<hbox align="center">
+										<checkbox preference="wappalyzer-cat21" id="wappalyzer-option-cat21" label="&wappalyzer.cat21;"/>
+									</hbox>
+								</row>
+								<row>
+									<hbox align="center">
+										<checkbox preference="wappalyzer-cat22" id="wappalyzer-option-cat22" label="&wappalyzer.cat22;"/>
 									</hbox>
 								</row>
 							</rows>
@@ -219,9 +227,6 @@
 								</row>
 								<row>
 									<hbox align="center">
-										<!--
-										<label class="text-link" onclick="window.open(wappalyzer.homeUrl + 'custom/', 'helpWindow'); void(0);" value="&wappalyzer.customMoreInfo;"/>
-										-->
 										<label class="text-link" onclick="window.open('http://wappalyzer.com/custom/', 'helpWindow'); void(0);" value="&wappalyzer.customMoreInfo;"/>
 									</hbox>
 								</row>

chrome/content/overlay.js

@@ -55,7 +55,7 @@ wappalyzer =
 		wappalyzer.newInstall     = wappalyzer.prefs.getBoolPref('newInstall');
 		wappalyzer.version        = wappalyzer.prefs.getCharPref('version');
 
-		for ( i = 1; i <= 20; i ++ )
+		for ( i = 1; i <= 22; i ++ )
 		{
 			wappalyzer.showCats[i] = wappalyzer.prefs.getBoolPref('cat' + i);
 		}
@@ -65,16 +65,24 @@ wappalyzer =
 		wappalyzer.moveLocation(locationPref);
 
 		// Open page after upgrade
-		var enabledAddons = gPrefService.getCharPref('extensions.enabledAddons');
-		var version       = enabledAddons.replace(/(^.*wappalyzer[^:]+:)([^,]+),.*$/, '$2');
-
-		if ( wappalyzer.version != version )
+		try
 		{
-			wappalyzer.browser.addEventListener('load', wappalyzer.upgradeSuccess, false);
+			var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+
+			var enabledItems = prefs.getCharPref('extensions.enabledItems');
+			var version       = enabledItems.replace(/(^.*wappalyzer[^:]+:)([^,]+),.*$/, '$2');
+
+			if ( wappalyzer.version != version )
+			{
+				wappalyzer.browser.addEventListener('load', wappalyzer.upgradeSuccess, false);
 
-			wappalyzer.version = version;
+				wappalyzer.version = version;
 
-			wappalyzer.prefs.setCharPref('version', wappalyzer.version);
+				wappalyzer.prefs.setCharPref('version', wappalyzer.version);
+			}
+		}
+		catch(e)
+		{
 		}
 
 		// Open page after installation
@@ -167,6 +175,8 @@ wappalyzer =
 			case 'cat18': wappalyzer.showCats[18] = wappalyzer.prefs.getIntPref('cat18'); break;
 			case 'cat19': wappalyzer.showCats[19] = wappalyzer.prefs.getIntPref('cat19'); break;
 			case 'cat20': wappalyzer.showCats[20] = wappalyzer.prefs.getIntPref('cat20'); break;
+			case 'cat20': wappalyzer.showCats[21] = wappalyzer.prefs.getIntPref('cat21'); break;
+			case 'cat20': wappalyzer.showCats[22] = wappalyzer.prefs.getIntPref('cat22'); break;
 		}
 	},
 

chrome/content/overlay.xul

@@ -30,7 +30,7 @@
 
 			<menupopup id="wappalyzer-menu" position="at_pointer">
 				<menuitem label="&wappalyzer.options;" oncommand="
-					window.openDialog('chrome://wappalyzer/content/options.xul', 'wappalyzer-options', 'chrome, centerscreen, modal');
+					window.openDialog('chrome://wappalyzer/content/options.xul', 'wappalyzer-options', 'chrome, dialog, centerscreen');
 					"/>
 				<menuseparator/>
 				<menuitem label="&wappalyzer.donate;"   oncommand="wappalyzer.openTab(wappalyzer.homeUrl + 'donate/');"/>
@@ -57,6 +57,8 @@
 			context="wappalyzer-menu"
 			tooltiptext="&wappalyzer.title;"
 			onclick="if ( !wappalyzer.autoDetect ) wappalyzer.analyzePage(wappalyzer.browser.contentDocument.location.href, wappalyzer.browser.contentDocument.documentElement.innerHTML, false, true, true);"
+			onmouseover="wappalyzer.showLabels(true);"
+			onmouseout="wappalyzer.showLabels(false);"
 			/>
 	</statusbar>
 </overlay>

chrome/locale/en-US/overlay.dtd

@@ -43,4 +43,6 @@
 <!ENTITY wappalyzer.cat18          "Web frameworks">
 <!ENTITY wappalyzer.cat19          "Miscellaneous">
 <!ENTITY wappalyzer.cat20          "Editors">
+<!ENTITY wappalyzer.cat21          "LMS">
+<!ENTITY wappalyzer.cat22          "Web servers">
 

defaults/preferences/defaults.js

@@ -1,29 +1,33 @@
-pref('wappalyzer.autoDetect',     true);
-pref('wappalyzer.debug',          false);
-pref('wappalyzer.location',       0);
-pref('wappalyzer.enableTracking', true);
-pref('wappalyzer.newInstall',     true);
-pref('wappalyzer.showAppNames',   2);
-pref('wappalyzer.customApps',     '');
-pref('wappalyzer.version',        '');
+pref('wappalyzer.autoDetect',            true);
+pref('wappalyzer.debug',                 false);
+pref('wappalyzer.location',              0);
+pref('wappalyzer.enableTracking',        true);
+pref('wappalyzer.newInstall',            true);
+pref('wappalyzer.showAppNames',          2);
+pref('wappalyzer.customApps',            '');
+pref('wappalyzer.version',               '');
 
-pref('wappalyzer.cat1',           true);
-pref('wappalyzer.cat2',           true);
-pref('wappalyzer.cat3',           true);
-pref('wappalyzer.cat4',           true);
-pref('wappalyzer.cat5',           true);
-pref('wappalyzer.cat6',           true);
-pref('wappalyzer.cat7',           true);
-pref('wappalyzer.cat8',           true);
-pref('wappalyzer.cat9',           true);
-pref('wappalyzer.cat10',          true);
-pref('wappalyzer.cat11',          true);
-pref('wappalyzer.cat12',          true);
-pref('wappalyzer.cat13',          true);
-pref('wappalyzer.cat14',          true);
-pref('wappalyzer.cat15',          true);
-pref('wappalyzer.cat16',          true);
-pref('wappalyzer.cat17',          true);
-pref('wappalyzer.cat18',          true);
-pref('wappalyzer.cat19',          true);
-pref('wappalyzer.cat20',          true);
+pref('wappalyzer.cat1',                  true);
+pref('wappalyzer.cat2',                  true);
+pref('wappalyzer.cat3',                  true);
+pref('wappalyzer.cat4',                  true);
+pref('wappalyzer.cat5',                  true);
+pref('wappalyzer.cat6',                  true);
+pref('wappalyzer.cat7',                  true);
+pref('wappalyzer.cat8',                  true);
+pref('wappalyzer.cat9',                  true);
+pref('wappalyzer.cat10',                 true);
+pref('wappalyzer.cat11',                 true);
+pref('wappalyzer.cat12',                 true);
+pref('wappalyzer.cat13',                 true);
+pref('wappalyzer.cat14',                 true);
+pref('wappalyzer.cat15',                 true);
+pref('wappalyzer.cat16',                 true);
+pref('wappalyzer.cat17',                 true);
+pref('wappalyzer.cat18',                 true);
+pref('wappalyzer.cat19',                 true);
+pref('wappalyzer.cat20',                 true);
+pref('wappalyzer.cat21',                 true);
+pref('wappalyzer.cat22',                 true);
+
+pref('browser.preferences.instantApply', true);

install.rdf

@@ -5,7 +5,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>wappalyzer@crunchlabz.com</em:id>
-		<em:version>1.12.4</em:version>
+		<em:version>1.12.8</em:version>
 		<em:type>2</em:type>
 
 		<em:targetApplication>
@@ -17,19 +17,6 @@
 			</Description>
 		</em:targetApplication>
 
-		<!--
-		<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:optionsURL>chrome://wappalyzer/content/options.xul</em:optionsURL>
 
 		<em:name>Wappalyzer</em:name>