From b30e94991b2ddbb1c9d47d91b2c53a4623eab6c2 Mon Sep 17 00:00:00 2001
From: Ward Oosterlijnck <wardoosterlijnck@gmail.com>
Date: Mon, 10 Apr 2017 10:44:29 +1000
Subject: [PATCH 1/2] icon optional and defaults to default.svg

---
 bin/wappalyzer-validate-icons         |  6 ++---
 schema.json                           |  3 +--
 src/apps.json                         | 39 ---------------------------
 src/drivers/bookmarklet/driver.js     |  2 +-
 src/drivers/phantomjs/driver.js       |  2 +-
 src/drivers/webextension/js/driver.js |  2 +-
 src/drivers/webextension/js/popup.js  |  2 +-
 7 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/bin/wappalyzer-validate-icons b/bin/wappalyzer-validate-icons
index 3ec796ac6..20cc4b70e 100755
--- a/bin/wappalyzer-validate-icons
+++ b/bin/wappalyzer-validate-icons
@@ -12,9 +12,9 @@ var
 for (app in json.apps) {
 	(function(app) {
 		var basePath = process.env.WAPPALYZER_ROOT + '/src/icons/';
-    var iconPath = json.apps[app].icon;
+    var iconPath = json.apps[app].icon || 'default.svg';
     var path = basePath + iconPath;
-    
+
     var type;
     if (path.substr(path.length - 4) === '.png') {
       type = "PNG";
@@ -26,7 +26,7 @@ for (app in json.apps) {
       var err = new Error('Icon file extension specified for app "' + app + '" is not ".png" or ".svg": src/icons/' + iconPath);
       throw err;
     }
-    
+
 		fs.exists(path, function(exists) {
 			if (exists) {
         if (type === "PNG") {
diff --git a/schema.json b/schema.json
index c70605b61..ac366218f 100644
--- a/schema.json
+++ b/schema.json
@@ -85,8 +85,7 @@
 						"required": true
 					},
 					"icon": {
-						"type": "string",
-						"required": true
+						"type": "string"
 					}
 				}
 			}
diff --git a/src/apps.json b/src/apps.json
index eca8e667e..136a5cc28 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -9,7 +9,6 @@
 			"url": "/shop/catalog/browse\\?sessid=",
 			"website": "http://1and1.com"
 		},
-		
 		"1C-Bitrix": {
 			"cats": [
 				"1"
@@ -866,7 +865,6 @@
 				"3"
 			],
 			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\\. ([\\d.b]+)\\;version:\\1",
-			"icon": "default.svg",
 			"implies": [
 				"MySQL",
 				"PHP"
@@ -951,14 +949,12 @@
 			"headers": {
 				"Server": "Boa\\/?([\\d\\.a-z]+)?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://www.boa.org"
 		},
 		"Boba.js": {
 			"cats": [
 				"12"
 			],
-			"icon": "default.svg",
 			"implies": "Google Analytics",
 			"script": "boba(?:\\.min)?\\.js",
 			"website": "http://boba.space150.com"
@@ -1136,7 +1132,6 @@
 			"cats": [
 				"1"
 			],
-			"icon": "default.svg",
 			"implies": "PHP",
 			"meta": {
 				"generator": "CMSimple( [\\d.]+)?\\;version:\\1"
@@ -1874,7 +1869,6 @@
 			"headers": {
 				"Server": "DECORUM(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://example.com"
 		},
 		"DedeCMS": {
@@ -2350,7 +2344,6 @@
 				"25"
 			],
 			"html": "<link[^>]+?href=\"[^\"]+epoch(?:\\.min)?\\.css",
-			"icon": "default.svg",
 			"implies": "D3",
 			"script": "epoch(?:\\.min)?\\.js",
 			"website": "http://fastly.github.io/epoch"
@@ -2547,7 +2540,6 @@
 			"headers": {
 				"Server": "FlashCom/?([\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://example.com"
 		},
 		"Flask": {
@@ -2878,7 +2870,6 @@
 				"<!-- gitphp web interface ([\\d.]+)\\;version:\\1",
 				"<a href=\"http://www.gitphp.org/\" target=\"_blank\">GitPHP by Chris Han"
 			],
-			"icon": "default.svg",
 			"implies": "PHP",
 			"website": "http://gitphp.org"
 		},
@@ -2887,7 +2878,6 @@
 				"47"
 			],
 			"html": "Powered by <a href=\"https://gerrit.googlesource.com/gitiles/\">Gitiles<",
-			"icon": "default.svg",
 			"implies": [
 				"Java",
 				"git"
@@ -3282,7 +3272,6 @@
 			"headers": {
 				"Server": "^http-kit"
 			},
-			"icon": "default.svg",
 			"implies": "Java",
 			"website": "http://http-kit.org"
 		},
@@ -3293,7 +3282,6 @@
 			"headers": {
 				"Server": "(?:^|[^-])\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://example.com"
 		},
 		"HTTP/2": {
@@ -3312,7 +3300,6 @@
 				"4"
 			],
 			"html": "<p>Produced by <a href=\"http://www.haskell.org/haddock/\">Haddock</a> version ([0-9.]+)</p>\\;version:\\1",
-			"icon": "default.svg",
 			"script": "haddock-util\\.js",
 			"website": "http://www.haskell.org/haddock/"
 		},
@@ -3342,7 +3329,6 @@
 			"headers": {
 				"Server": "Happy ICS Server(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"implies": "OmniTouch 8660 My Teamwork",
 			"website": "http://example.com"
 		},
@@ -3636,7 +3622,6 @@
 				"1"
 			],
 			"html": "<(?:link|a href) [^>]+ndxz-studio",
-			"icon": "default.svg",
 			"implies": [
 				"PHP",
 				"Apache",
@@ -3665,7 +3650,6 @@
 			"headers": {
 				"Server": "Indy(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://indyproject.org"
 		},
 		"InfernoJS": {
@@ -4194,7 +4178,6 @@
 			"headers": {
 				"X-Powered-By": "Kolibri"
 			},
-			"icon": "default.svg",
 			"meta": {
 				"generator": "Kolibri"
 			},
@@ -4289,7 +4272,6 @@
 			"cats": [
 				"12"
 			],
-			"icon": "default.svg",
 			"script": "lazy(?:\\.browser)?(?:\\.min)?\\.js",
 			"website": "http://danieltao.com/lazy.js"
 		},
@@ -4987,7 +4969,6 @@
 			"headers": {
 				"Server": "MiniServ\\/?([\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://sourceforge.net/projects/miniserv"
 		},
 		"Mint": {
@@ -5033,7 +5014,6 @@
 			"headers": {
 				"Server": "MochiWeb(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://github.com/mochi/mochiweb"
 		},
 		"Modernizr": {
@@ -5204,7 +5184,6 @@
 			"headers": {
 				"Server": "Motion-httpd(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://lavrsen.dk/foswiki/bin/view/Motion"
 		},
 		"MotoCMS": {
@@ -5467,7 +5446,6 @@
 			"script": "^/nodebb\\.min\\.js\\?",
 			"website": "https://nodebb.org"
 		},
-		
 		"OWL Carousel": {
 			"cats": [
 				"5",
@@ -5945,7 +5923,6 @@
 			"cats": [
 				"25"
 			],
-			"icon": "default.svg",
 			"script": "paths(?:\\.min)?\\.js",
 			"website": "http://github.com/andreaferretti/paths-js"
 		},
@@ -6298,7 +6275,6 @@
 				"25"
 			],
 			"env": "^protovis$",
-			"icon": "default.svg",
 			"script": "protovis.*\\.js",
 			"website": "http://mbostock.github.com/protovis"
 		},
@@ -6433,7 +6409,6 @@
 			"headers": {
 				"Server": "RAID HTTPServer(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://example.com"
 		},
 		"RBS Change": {
@@ -6543,7 +6518,6 @@
 			"headers": {
 				"Server": "Rapid Logic(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://example.com"
 		},
 		"React": {
@@ -6647,7 +6621,6 @@
 				"25"
 			],
 			"env": "^Rickshaw$",
-			"icon": "default.svg",
 			"implies": "D3",
 			"script": "rickshaw(?:\\.min)?\\.js",
 			"website": "http://code.shutterstock.com/rickshaw/"
@@ -7017,7 +6990,6 @@
 			"cats": [
 				"12"
 			],
-			"icon": "default.svg",
 			"implies": "jQuery",
 			"script": "select2.*\\.js",
 			"website": "http://select2.github.io"
@@ -7236,7 +7208,6 @@
 			"headers": {
 				"Server": "SimpleHTTP(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://example.com"
 		},
 		"Site Meter": {
@@ -8101,7 +8072,6 @@
 				"25"
 			],
 			"env": "^twemoji$",
-			"icon": "default.svg",
 			"script": "twemoji(?:\\.min)?\\.js",
 			"website": "http://twitter.github.io/twemoji/"
 		},
@@ -8412,7 +8382,6 @@
 			"headers": {
 				"Server": "Virata-EmWeb(?:/(R?[\\d._]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"implies": [
 				"HP"
 			],
@@ -8719,7 +8688,6 @@
 				"Server": "Winstone Servlet (?:Container|Engine) v?([\\d.]+)?\\;version:\\1",
 				"X-Powered-By": "Winstone(?:.([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://winstone.sourceforge.net"
 		},
 		"Wix": {
@@ -9307,7 +9275,6 @@
 			"headers": {
 				"Server": "dwhttpd\\/?([\\d\\.a-z]+)?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"website": "http://example.com"
 		},
 		"e107": {
@@ -9340,7 +9307,6 @@
 			"headers": {
 				"Server": "\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
 			},
-			"icon": "default.svg",
 			"implies": "HP ProCurve",
 			"website": "http://example.com"
 		},
@@ -9402,7 +9368,6 @@
 				"47"
 			],
 			"html": "<p>Powered by <a[^>]+>GitList ([\\d.]+)\\;version:\\1",
-			"icon": "default.svg",
 			"implies": [
 				"PHP",
 				"git"
@@ -9537,7 +9502,6 @@
 			"cats": [
 				"25"
 			],
-			"icon": "default.svg",
 			"implies": "jQuery",
 			"script": "jquery\\.sparkline.*\\.js",
 			"website": "http://omnipotent.net/jquery.sparkline/"
@@ -9983,7 +9947,6 @@
 				"25"
 			],
 			"env": "^Shine$",
-			"icon": "default.svg",
 			"script": "shine(?:\\.min)?\\.js",
 			"website": "http://bigspaceship.github.io/shine.js/"
 		},
@@ -10091,7 +10054,6 @@
 				"1"
 			],
 			"html": "powered by <a href=\"[^>]+viennacms",
-			"icon": "default.svg",
 			"website": "http://www.viennacms.nl"
 		},
 		"webEdition": {
@@ -10135,7 +10097,6 @@
 			],
 			"env": "^xChart$",
 			"html": "<link[^>]* href=\"[^\"]*xcharts(?:\\.min)?\\.css",
-			"icon": "default.svg",
 			"implies": "D3",
 			"script": "xcharts\\.js",
 			"website": "http://tenxer.github.io/xcharts/"
diff --git a/src/drivers/bookmarklet/driver.js b/src/drivers/bookmarklet/driver.js
index 05b92a81a..01cdb4abb 100644
--- a/src/drivers/bookmarklet/driver.js
+++ b/src/drivers/bookmarklet/driver.js
@@ -112,7 +112,7 @@
 						'<div class="wappalyzer-app' + ( first ? ' wappalyzer-first' : '' ) + '">' +
 							'<a target="_blank" class="wappalyzer-application" href="' + w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '') + '">' +
 								'<strong>' +
-									'<img src="' + w.config.websiteURL + 'images/icons/' + w.apps[app].icon + '" width="16" height="16"/> ' + app +
+									'<img src="' + w.config.websiteURL + 'images/icons/' + (w.apps[app].icon || 'default.svg') + '" width="16" height="16"/> ' + app +
 								'</strong>' +
 							'</a>';
 
diff --git a/src/drivers/phantomjs/driver.js b/src/drivers/phantomjs/driver.js
index 83851390d..e7fc9b621 100644
--- a/src/drivers/phantomjs/driver.js
+++ b/src/drivers/phantomjs/driver.js
@@ -88,7 +88,7 @@
 						name: app,
 						confidence: wappalyzer.detected[url][app].confidenceTotal.toString(),
 						version:    wappalyzer.detected[url][app].version,
-						icon:       wappalyzer.apps[app].icon,
+						icon:       wappalyzer.apps[app].icon || 'default.svg',
 						website:    wappalyzer.apps[app].website,
 						categories: cats
 					});
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index cf4ae7b9f..df13d12ec 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -208,7 +208,7 @@
 				w.driver.categoryOrder.forEach(function(match) {
 					for ( appName in w.detected[url] ) {
 						w.apps[appName].cats.forEach(function(cat) {
-							var icon = w.apps[appName].icon;
+							var icon = w.apps[appName].icon || 'default.svg';
 
 							if ( cat == match && !found ) {
 								if ( /\.svg$/i.test(icon) ) {
diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js
index dbb4444e0..bbe54a871 100644
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@@ -36,7 +36,7 @@ document.addEventListener('DOMContentLoaded', function() {
 							html =
 								'<div class="detected-app">' +
 									'<a target="_blank" href="https://wappalyzer.com/applications/' + slugify(appName) + '">' +
-										'<img src="images/icons/' + response.apps[appName].icon + '"/>' +
+										'<img src="images/icons/' + (response.apps[appName].icon || 'default.svg') + '"/>' +
 										'<span class="label"><span class="name">' + appName + '</span>' + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + '</span>' +
 									'</a>';
 

From 851ba0fadb4a419d29c23307fdbd706d35580f5c Mon Sep 17 00:00:00 2001
From: Ward Oosterlijnck <wardoosterlijnck@gmail.com>
Date: Mon, 10 Apr 2017 10:47:46 +1000
Subject: [PATCH 2/2] Prettify apps.json + validate-icons.js

---
 bin/wappalyzer-validate-icons | 62 +++++++++++++++++------------------
 src/apps.json                 | 50 ++++++++++++++--------------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/bin/wappalyzer-validate-icons b/bin/wappalyzer-validate-icons
index 20cc4b70e..185511826 100755
--- a/bin/wappalyzer-validate-icons
+++ b/bin/wappalyzer-validate-icons
@@ -12,43 +12,43 @@ var
 for (app in json.apps) {
 	(function(app) {
 		var basePath = process.env.WAPPALYZER_ROOT + '/src/icons/';
-    var iconPath = json.apps[app].icon || 'default.svg';
-    var path = basePath + iconPath;
+		var iconPath = json.apps[app].icon || 'default.svg';
+		var path = basePath + iconPath;
 
-    var type;
-    if (path.substr(path.length - 4) === '.png') {
-      type = "PNG";
-    }
-    else if (path.substr(path.length - 4) === '.svg') {
-      type = "SVG";
-    }
-    else {
-      var err = new Error('Icon file extension specified for app "' + app + '" is not ".png" or ".svg": src/icons/' + iconPath);
-      throw err;
-    }
+		var type;
+		if (path.substr(path.length - 4) === '.png') {
+			type = "PNG";
+		}
+		else if (path.substr(path.length - 4) === '.svg') {
+			type = "SVG";
+		}
+		else {
+			var err = new Error('Icon file extension specified for app "' + app + '" is not ".png" or ".svg": src/icons/' + iconPath);
+			throw err;
+		}
 
 		fs.exists(path, function(exists) {
 			if (exists) {
-        if (type === "PNG") {
-          var buffer = fileType(readChunk.sync(path, 0, 262));
-          if (buffer === null) {
-            var err = new Error('Unknown mimetype or bad file for "' + app + '": src/icons/' + iconPath);
-            throw err;
-          }
-          else if (buffer.mime !== 'image/png') {
-            var err = new Error('Incorrect mimetype "' + buffer.mime + '" when expected PNG for app "' + app + '": src/icons/' + iconPath);
-            throw err;
-          }
-        }
-        else if (type === "SVG") {
-          if (!isSvg(fs.readFileSync(path))) {
-            var err = new Error('Incorrect mimetype when expected SVG for app "' + app + '": src/icons/' + iconPath);
-            throw err;
-          }
-        }
+				if (type === "PNG") {
+					var buffer = fileType(readChunk.sync(path, 0, 262));
+					if (buffer === null) {
+						var err = new Error('Unknown mimetype or bad file for "' + app + '": src/icons/' + iconPath);
+						throw err;
+					}
+					else if (buffer.mime !== 'image/png') {
+						var err = new Error('Incorrect mimetype "' + buffer.mime + '" when expected PNG for app "' + app + '": src/icons/' + iconPath);
+						throw err;
+					}
+				}
+				else if (type === "SVG") {
+					if (!isSvg(fs.readFileSync(path))) {
+						var err = new Error('Incorrect mimetype when expected SVG for app "' + app + '": src/icons/' + iconPath);
+						throw err;
+					}
+				}
 			} else {
 				var err = new Error('Missing file for app "' + app + '": src/icons/' + iconPath);
-        throw err;
+				throw err;
 			}
 		});
 	}(app));
diff --git a/src/apps.json b/src/apps.json
index 136a5cc28..9c2baaa6b 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -3178,18 +3178,6 @@
 			},
 			"website": "http://www.greenvalley.nl/Public/Producten/Content_Management/CMS"
 		},
-		"Homeland": {
-			"cats": [
-				"1",
-				"2"
-			],
-			"headers": {
-				"Set-Cookie:": "_homeland_"
-			},
-			"icon": "Homeland.png",
-			"implies": "Ruby on Rails",
-			"website": "https://gethomeland.com"
-		},
 		"HERE": {
 			"cats": [
 				"35"
@@ -3416,6 +3404,18 @@
 			],
 			"website": "http://twitter.github.com/hogan.js"
 		},
+		"Homeland": {
+			"cats": [
+				"1",
+				"2"
+			],
+			"headers": {
+				"Set-Cookie:": "_homeland_"
+			},
+			"icon": "Homeland.png",
+			"implies": "Ruby on Rails",
+			"website": "https://gethomeland.com"
+		},
 		"Hotaru CMS": {
 			"cats": [
 				"1"
@@ -6226,6 +6226,10 @@
 				"^priceDisplayMethod$\\;confidence:25",
 				"^priceDisplayPrecision$\\;confidence:25"
 			],
+			"headers": {
+				"Powered-By": "^Prestashop$",
+				"Set-Cookie": "^PrestaShop"
+			},
 			"html": [
 				"Powered by <a\\s+[^>]+>PrestaShop",
 				"<!-- /Block [a-z ]+ module (?:HEADER|TOP)?\\s?-->",
@@ -6236,10 +6240,6 @@
 			"meta": {
 				"generator": "PrestaShop"
 			},
-			"headers": {
-				"Set-Cookie": "^PrestaShop",
-				"Powered-By": "^Prestashop$"
-			},
 			"website": "http://www.prestashop.com"
 		},
 		"Project Wonderful": {
@@ -7753,15 +7753,6 @@
 			"url": "/typo3/",
 			"website": "http://www.typo3.org"
 		},
-		"Typecho": {
-			"cats": [
-				"11"
-			],
-			"icon": "typecho.svg",
-			"implies": "PHP",
-			"url": "/admin/login\\.php?referer=http%3A%2F%2F",
-			"website": "http://typecho.org/"
-		},
 		"Taiga": {
 			"cats": [
 				"13"
@@ -8105,6 +8096,15 @@
 			"url": "typepad\\.com",
 			"website": "http://www.typepad.com"
 		},
+		"Typecho": {
+			"cats": [
+				"11"
+			],
+			"icon": "typecho.svg",
+			"implies": "PHP",
+			"url": "/admin/login\\.php?referer=http%3A%2F%2F",
+			"website": "http://typecho.org/"
+		},
 		"Typekit": {
 			"cats": [
 				"17"