Merge remote-tracking branch 'upstream/master'

Conflicts:
	drivers/bookmarklet/json
	drivers/chrome/apps.json
	drivers/firefox-jetpack/data/apps.json
	drivers/firefox/content/apps.json
	drivers/html/apps.json
	drivers/php/apps.json
	share/apps.json

README.md

@@ -114,6 +114,23 @@ $detectedApps = $wappalyzer->analyze();
 Work in progress, experimental. See https://wiki.mozilla.org/Jetpack.
 
 
+Unofficial drivers and ports
+----------------------------
+
+**Python**
+
+A Python driver by [@ebradbury](https://github.com/ebradbury).
+
+https://github.com/ebradbury/Wappalyzer/tree/master/drivers/python
+
+
+**Ruby**
+
+A Ruby port by [@skroutz](https://github.com/skroutz).
+
+https://github.com/skroutz/wappalyzer-ruby
+
+
 Screenshot
 ----------
 

drivers/bookmarklet/js/wappalyzer.js

@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;

drivers/chrome/_locales/en/messages.json

@@ -42,5 +42,6 @@
 	"categoryName28":           { "message": "Operating System" },
 	"categoryName29":           { "message": "Search Engine" },
 	"categoryName30":           { "message": "Web Mail" },
-	"categoryName31":           { "message": "CDN" }
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Marketing Automation" }
 }

drivers/chrome/_locales/fr/messages.json

@@ -0,0 +1,137 @@
+{
+   "analyzeHeaders": {
+      "message": "Analyser les en-têtes"
+   },
+   "analyzeHeadersDone": {
+      "message": "Fait"
+   },
+   "categoryName1": {
+      "message": "CMS"
+   },
+   "categoryName2": {
+      "message": "Forum"
+   },
+   "categoryName3": {
+      "message": "Gestionnaire de base de données"
+   },
+   "categoryName4": {
+      "message": "Outil de documentation"
+   },
+   "categoryName5": {
+      "message": "Widget"
+   },
+   "categoryName6": {
+      "message": "Boutique en ligne"
+   },
+   "categoryName7": {
+      "message": "Galerie photo"
+   },
+   "categoryName8": {
+      "message": "Wiki"
+   },
+   "categoryName9": {
+      "message": "Gestionnaires de serveur"
+   },
+   "categoryName10": {
+      "message": "Outil de statistiques"
+   },
+   "categoryName11": {
+      "message": "Blog"
+   },
+   "categoryName12": {
+      "message": "Framework JavaScript"
+   },
+   "categoryName13": {
+      "message": "Outils de suivi de problèmes"
+   },
+   "categoryName14": {
+      "message": "Lecteur de vidéos"
+   },
+   "categoryName15": {
+      "message": "Système de commentaires"
+   },
+   "categoryName16": {
+      "message": "Captcha"
+   },
+   "categoryName17": {
+      "message": "Script de police"
+   },
+   "categoryName18": {
+      "message": "Framework web"
+   },
+   "categoryName19": {
+      "message": "Divers"
+   },
+   "categoryName20": {
+      "message": "Editeur"
+   },
+   "categoryName21": {
+      "message": "LMS"
+   },
+   "categoryName22": {
+      "message": "Serveur web"
+   },
+   "categoryName23": {
+      "message": "Outil de cache"
+   },
+   "categoryName24": {
+      "message": "Editeur WYSIWYG"
+   },
+   "categoryName25": {
+      "message": "Graphismes JavaScript"
+   },
+   "categoryName26": {
+      "message": "Framework pour mobiles"
+   },
+   "categoryName27": {
+      "message": "Language de programmation"
+   },
+   "categoryName28": {
+      "message": "Système d'exploitation"
+   },
+   "categoryName29": {
+      "message": "Moteur de recherche"
+   },
+   "categoryName30": {
+      "message": "Web Mail"
+   },
+   "categoryName31": {
+      "message": "CDN"
+   },
+   "categoryName32": {
+      "message": "Logiciel de marketing"
+   },
+   "github": {
+      "message": "Forker Wappalyzer sur GitHub!"
+   },
+   "noAppsDetected": {
+      "message": "Pas d'applications détectées."
+   },
+   "nothingToDo": {
+      "message": "Rien à faire ici."
+   },
+   "optionAutoAnalyzeHeaders": {
+      "message": "Analyser les en-têtes automatiquement"
+   },
+   "optionTracking": {
+      "message": "Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche"
+   },
+   "optionUpgradeMessage": {
+      "message": "M'afficher les mises à jour"
+   },
+   "options": {
+      "message": "Options de Wappalyzer"
+   },
+   "optionsSave": {
+      "message": "Sauver les options"
+   },
+   "optionsSaved": {
+      "message": "Sauvé"
+   },
+   "twitter": {
+      "message": "Suivre Wappalyzer sur Twitter"
+   },
+   "website": {
+      "message": "Aller à wappalyzer.com"
+   }
+}

drivers/chrome/css/options.css

@@ -43,6 +43,7 @@ a:active {
 
 #options-saved {
 	display: none;
+	-webkit-animation: fadeout 2s;
 }
 
 #about {
@@ -57,3 +58,8 @@ a:active {
 	#about button {
 		line-height: 30px;
 	}
+
+@-webkit-keyframes fadeout {
+    from { opacity: 1; }
+    to { opacity: 0; }
+}

drivers/chrome/js/driver.js

@@ -206,6 +206,7 @@
 			15, // Comment System
 			20, // Editor
 			10, // Analytics
+			32, // Marketing Automation
 			31, // CDN
 			23, // Cache Tool
 			17, // Font Script

drivers/chrome/js/options.js

@@ -40,10 +40,11 @@ $(function() {
 			for ( option in options.opts ) {
 				localStorage[option] = options.opts[option];
 			}
+			document.getElementById('options-saved').style.display = 'inline';
+			setTimeout(function(){document.getElementById('options-saved').style.display = 'none';},2000);
 
-			$('#options-saved').stop().show().fadeOut(2000);
 		}
 	};
 
 	options.init();
-});
+});

drivers/chrome/js/wappalyzer.js

@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;

drivers/chrome/manifest.json

@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=extension&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.14",
+	"version": "2.15",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {

drivers/firefox-jetpack/lib/wappalyzer.js

@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;

drivers/firefox/content/js/driver.js

@@ -7,7 +7,7 @@
 
 	if ( wappalyzer == null ) return;
 
-	var w = wappalyzer, prefs, strings;
+	var w = wappalyzer, prefs, strings, $;
 
 	const
 		Cc = Components.classes,
@@ -57,6 +57,10 @@
 					// Load jQuery
 					Cc['@mozilla.org/moz/jssubscript-loader;1'].getService(Ci.mozIJSSubScriptLoader).loadSubScript('chrome://wappalyzer/content/js/lib/jquery.min.js');
 
+					$ = jQuery;
+
+					jQuery.noConflict(true);
+
 					// Preferences
 					prefs = Cc['@mozilla.org/preferences-service;1'].getService(Ci.nsIPrefService).getBranch('extensions.wappalyzer.');
 
@@ -137,7 +141,7 @@
 		 * Display apps
 		 */
 		displayApps: function() {
-			var image, url = gBrowser.currentURI.spec.split('#')[0];
+			var menuItem, menuSeparator, image, url = gBrowser.currentURI.spec.split('#')[0];
 
 			if ( w.detected[url] != null && w.detected[url].length ) {
 				// No change
@@ -146,8 +150,8 @@
 				if ( w.driver.lastDisplayed === 'empty' ) { return; }
 			}
 
-			$('#wappalyzer-container > image, #wappalyzer-menu > menuitem, #wappalyzer-menu > menuseparator').addClass('wappalyzer-remove');
-
+			$('#wappalyzer-container > image, #wappalyzer-menu > menuitem, #wappalyzer-menu > menuseparator').attr('class', 'wappalyzer-remove');
+			
 			if ( w.detected[url] != null && w.detected[url].length ) {
 				if ( !prefs.getBoolPref('showIcons') ) {
 					image = $('<image/>').attr('src', 'chrome://wappalyzer/skin/images/icon_hot.png');
@@ -156,7 +160,7 @@
 				}
 
 				w.detected[url].map(function(app, i) {
-					var j, cat, showCat, menuSeparator, menuItem;
+					var j, cat, showCat;
 
 					for ( i in w.apps[app].cats ) {
 						showCat = false;

drivers/firefox/content/js/wappalyzer.js

@@ -92,6 +92,8 @@ var wappalyzer = (function() {
 		analyze: function(hostname, url, data) {
 			w.log('w.analyze');
 
+			url = url.split('#')[0];
+
 			data.url = url;
 
 			if ( w.apps == null || w.categories == null ) {
@@ -156,7 +158,7 @@ var wappalyzer = (function() {
 							}
 
 							regex       = new RegExp(w.apps[app][type].replace('/', '\\\/'), 'i');
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)\1', 'ig');
+							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
 							profiler.regexCount ++;
 
@@ -266,7 +268,7 @@ var wappalyzer = (function() {
 				}
 			}
 
-			w.log(apps.length + ' apps detected: ' + apps.join(', '));
+			w.log(apps.length + ' apps detected: ' + apps.join(', ') + ' on ' + url);
 
 			// Keep history of detected apps
 			var i, app, match;

drivers/firefox/content/xul/preferences.xul

@@ -46,6 +46,7 @@
 			<preference id="wappalyzer-cat29" name="extensions.wappalyzer.cat29" type="bool"/>
 			<preference id="wappalyzer-cat30" name="extensions.wappalyzer.cat30" type="bool"/>
 			<preference id="wappalyzer-cat31" name="extensions.wappalyzer.cat31" type="bool"/>
+			<preference id="wappalyzer-cat31" name="extensions.wappalyzer.cat32" type="bool"/>
 
 			<preference id="wappalyzer-tracking" name="extensions.wappalyzer.tracking" type="bool"/>
 		</preferences>
@@ -132,10 +133,11 @@
 							<checkbox preference="wappalyzer-cat27" label="&wappalyzer.cat27;"/>
 							<checkbox preference="wappalyzer-cat28" label="&wappalyzer.cat28;"/>
 							<checkbox preference="wappalyzer-cat29" label="&wappalyzer.cat29;"/>
-							<checkbox preference="wappalyzer-cat29" label="&wappalyzer.cat30;"/>
+							<checkbox preference="wappalyzer-cat30" label="&wappalyzer.cat30;"/>
 						</row>
 						<row>
-							<checkbox preference="wappalyzer-cat29" label="&wappalyzer.cat31;"/>
+							<checkbox preference="wappalyzer-cat31" label="&wappalyzer.cat31;"/>
+							<checkbox preference="wappalyzer-cat32" label="&wappalyzer.cat31;"/>
 						</row>
 					</rows>
 				</grid>

drivers/firefox/defaults/preferences/defaults.js

@@ -38,3 +38,4 @@ pref('extensions.wappalyzer.cat28',             true);
 pref('extensions.wappalyzer.cat29',             true);
 pref('extensions.wappalyzer.cat30',             true);
 pref('extensions.wappalyzer.cat31',             true);
+pref('extensions.wappalyzer.cat32',             true);

drivers/firefox/install.rdf

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

drivers/firefox/locale/de-DE/wappalyzer.dtd

@@ -49,3 +49,4 @@
 <!ENTITY wappalyzer.cat29             "Suchmaschinen">
 <!ENTITY wappalyzer.cat30             "Web mail">
 <!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Marketing Automation">

drivers/firefox/locale/de-DE/wappalyzer.properties

@@ -33,3 +33,4 @@ wappalyzer.cat28          = Operating System
 wappalyzer.cat29          = Search Engine
 wappalyzer.cat30          = Web mail
 wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Marketing Automation

drivers/firefox/locale/en-US/wappalyzer.dtd

@@ -50,3 +50,4 @@
 <!ENTITY wappalyzer.cat29             "Search Engines">
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Marketing Automation">

drivers/firefox/locale/en-US/wappalyzer.properties

@@ -33,3 +33,4 @@ wappalyzer.cat28          = Operating System
 wappalyzer.cat29          = Search Engine
 wappalyzer.cat30          = Web Mail
 wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Marketing Automation

drivers/firefox/locale/fr-FR/wappalyzer.dtd

@@ -9,9 +9,9 @@
 <!ENTITY wappalyzer.interface         "Interface">
 <!ENTITY wappalyzer.tracking          "Traçage">
 <!ENTITY wappalyzer.research          "Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche">
-<!ENTITY wappalyzer.analyzeHeaders    "Analyze response headers">
-<!ENTITY wappalyzer.analyzeJavaScript "Analyze JavaScript">
-<!ENTITY wappalyzer.analyzeOnload     "Analyze onLoad events">
+<!ENTITY wappalyzer.analyzeHeaders    "Analyser les headers">
+<!ENTITY wappalyzer.analyzeJavaScript "Analyser le JavaScript">
+<!ENTITY wappalyzer.analyzeOnload     "Analyser les évènements au chargement">
 
 <!ENTITY wappalyzer.feedback          "Donner votre avis">
 <!ENTITY wappalyzer.github            "Github">
@@ -49,3 +49,4 @@
 <!ENTITY wappalyzer.cat29             "Moteurs de recherche">
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Logiciel de marketing">

drivers/firefox/locale/fr-FR/wappalyzer.properties

@@ -33,3 +33,4 @@ wappalyzer.cat28          = Système d'exploitation
 wappalyzer.cat29          = Moteur de recherche
 wappalyzer.cat30          = Web Mail
 wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Logiciel de marketing

drivers/firefox/locale/nl-NL/wappalyzer.dtd

@@ -48,3 +48,4 @@
 <!ENTITY wappalyzer.cat28             "Operating Systems">
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Marketing Automatisering">

drivers/firefox/locale/nl-NL/wappalyzer.properties

@@ -33,3 +33,4 @@ wappalyzer.cat28          = Operating System
 wappalyzer.cat29          = Zoek Machine
 wappalyzer.cat30          = Web Mail
 wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Marketing Automatisering