From 3f0f686f02b822fabbdf8df1442e681f91c4e488 Mon Sep 17 00:00:00 2001
From: Camille Barneaud <camillebarneaud@gmail.com>
Date: Sun, 27 Oct 2013 18:30:58 +0100
Subject: [PATCH 1/7] Fix a mistyping in apps.json

#367: Fix an error in apps.json
#368: Add CMS Dotclear
---
 share/apps.json                 |   8 +++++++-
 share/images/icons/Dotclear.png | Bin 0 -> 247 bytes
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 share/images/icons/Dotclear.png

diff --git a/share/apps.json b/share/apps.json
index 29ba0442c..52b9ae1f4 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -725,6 +725,12 @@
 			"headers": { "Set-Cookie": "DokuWiki=" },
 			"implies": "PHP"
 		},
+		"Dotclear": {
+			"website": "dotclear.org",
+			"cats": [ 1 ],
+			"meta": { "dc.title": ".*" },
+			"implies": "PHP"
+		},
 		"DotNetNuke": {
 			"website": "dotnetnuke.com",
 			"cats": [ 1 ],
@@ -1956,7 +1962,7 @@
 		},
 		"Perl": {
 			"website": "perl.org",
-			"cats": [ 27 ]
+			"cats": [ 27 ],
 			"url": "\\.pl(?:$|\\?)"
 		},
 		"PHP": {
diff --git a/share/images/icons/Dotclear.png b/share/images/icons/Dotclear.png
new file mode 100644
index 0000000000000000000000000000000000000000..af514f6e5f767ffc63621bd33d193975bd675f4b
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VYh7)5b5qT^Gl$NfJ$(1}
zg%{6m@7uHa&8vIYubu`<ZP~Q);`w7IkMCQwV8-W9uh*_w+~3!B)A?!!P&;EukY6x^
z!?PP{Ku(dTi(^PdT<rOie1{D<ST1aMZ2I&6dflzj%Bg;bCtI8;J)5asd~EOP4f#<A
z{9OJt2e>Wj6Iwc<cH!2(-nR`$Zr%~HIW%p<?kntUdN(8sUSD9*kvhdGs&e3dL+j_I
v>~|DC-T&0EE$YfMN%I8_Q4Z&xoBn6s_nBR~@VLripzREvu6{1-oD!M<;ZAW-

literal 0
HcmV?d00001


From 57c3c313d9ef37a70395a420946b7bd8cf036333 Mon Sep 17 00:00:00 2001
From: Camille Barneaud <camillebarneaud@gmail.com>
Date: Sun, 27 Oct 2013 21:10:49 +0100
Subject: [PATCH 2/7] Add a pattern for Doxygen

#292: Add Doxygen detection via meta tag
#357: Fix version detection jQuery
---
 share/apps.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/apps.json b/share/apps.json
index 52b9ae1f4..1411791a2 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -743,6 +743,7 @@
 		"Doxygen": {
 			"website": "stack.nl/~dimitri/doxygen",
 			"cats": [ 4 ],
+			"meta": { "generator": "Doxygen ([\\d.]+)\\;version:\\1" },
 			"html": "(?:<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
 		"DreamWeaver": {
@@ -1323,7 +1324,7 @@
 		"jQuery": {
 			"website": "jquery.com",
 			"cats": [ 12 ],
-			"script": [ "jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
+			"script": [ "jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "/([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
 			"env": "^jQuery$"
 		},
 		"jQuery Mobile": {

From 6af4090231754a5961690a1473ffd78c427e96dd Mon Sep 17 00:00:00 2001
From: Camille Barneaud <camillebarneaud@gmail.com>
Date: Thu, 31 Oct 2013 01:41:40 +0100
Subject: [PATCH 3/7] Make header field case insensitive

#315: Header field name is now case insensitive
---
 drivers/chrome/js/headers.js         | 2 +-
 drivers/firefox/content/js/driver.js | 2 +-
 drivers/php/Wappalyzer.php           | 2 +-
 drivers/ruby/wappalyzer.rb           | 2 +-
 share/js/wappalyzer.js               | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/chrome/js/headers.js b/drivers/chrome/js/headers.js
index 7c07f9db9..49cd21099 100644
--- a/drivers/chrome/js/headers.js
+++ b/drivers/chrome/js/headers.js
@@ -26,7 +26,7 @@
 
 						headers.forEach(function(line) {
 							if ( line ) {
-								name  = line.substring(0, line.indexOf(': '));
+								name  = line.substring(0, line.indexOf(': ')).toLowerCase();
 								value = line.substring(line.indexOf(': ') + 2, line.length - 1);
 
 								responseHeaders[name] = value;
diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js
index 509dabd5a..3e21b6786 100644
--- a/drivers/firefox/content/js/driver.js
+++ b/drivers/firefox/content/js/driver.js
@@ -100,7 +100,7 @@
 										var headers = {};
 
 										request.nsIHttpChannel.visitResponseHeaders(function(header, value) {
-											headers[header] = value;
+											headers[header.toLowerCase()] = value;
 										});
 
 										w.analyze(progress.currentURI.host, progress.currentURI.spec, { headers: headers });
diff --git a/drivers/php/Wappalyzer.php b/drivers/php/Wappalyzer.php
index 7c40fa764..b2fe9f24d 100644
--- a/drivers/php/Wappalyzer.php
+++ b/drivers/php/Wappalyzer.php
@@ -136,7 +136,7 @@ class Wappalyzer
 			if ( strpos(trim($line), ': ') !== false ) {
 				list($key, $value) = explode(': ', $line);
 
-				$result->headers[$key] = $value;
+				$result->headers[strtolower($key)] = $value;
 			}
 		}
 
diff --git a/drivers/ruby/wappalyzer.rb b/drivers/ruby/wappalyzer.rb
index d66b9a01e..01fde3180 100755
--- a/drivers/ruby/wappalyzer.rb
+++ b/drivers/ruby/wappalyzer.rb
@@ -18,7 +18,7 @@ class Wappalyzer
     uri, body, headers = URI(url), nil, {}
     Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https', :open_timeout => 5) do |http|
       resp = http.get(uri.request_uri)
-      resp.canonical_each{|k,v| headers[k] = v}
+      resp.each_header{|k,v| headers[k.downcase] = v}
       body = resp.body.encode('UTF-8', :invalid => :replace, :undef => :replace)
     end
 
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 438c253cd..6f66052de 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -351,8 +351,8 @@ var wappalyzer = (function() {
 							for ( header in w.apps[app].headers ) {
 								parse(w.apps[app][type][header]).map(function(pattern) {
 
-									if ( typeof data[type][header] === 'string' && pattern.regex.test(data[type][header]) ) {
-										apps[app].setDetected(pattern, type, data[type][header], header);
+									if ( typeof data[type][header.toLowerCase()] === 'string' && pattern.regex.test(data[type][header.toLowerCase()]) ) {
+										apps[app].setDetected(pattern, type, data[type][header.toLowerCase()], header);
 									}
 									profiler.checkPoint(app, type, pattern.regex);
 								});

From c8947ca817617b2a0b5d7588d319ae10327ed302 Mon Sep 17 00:00:00 2001
From: Sean Steimer <ssteimer@crownpartners.com>
Date: Thu, 31 Oct 2013 14:33:09 -0700
Subject: [PATCH 4/7] new logo for CQ5

---
 share/images/icons/Adobe CQ5.png | Bin 783 -> 832 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/share/images/icons/Adobe CQ5.png b/share/images/icons/Adobe CQ5.png
index aecd04a38ebdd1bbe1c82dbd1eab1c8a10186400..46da78df41400d509a367d376db897fac816524c 100644
GIT binary patch
delta 820
zcmV-41Izr62EYc88Gix*005AYXf^-<00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m?d01m?e$8V@)0000QbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQ
zF)%Rna-jeK0<TF#K~y+THIC~~(@+?P`v)6iB8f4^=m&y|27kE-B03ntfFU3X3BxhR
zI<^7X+!Z!D7+X(IPuq1py{+wf86IMM^L%*E`Td^crEJ@FUDx;hVGs-hFBp1(?|VVu
zlV#}nf#=_OLz0j<@JW**!eB7)$OPUXa7|awqil@XjWhdsl*3++i0++pZ+bpyQvH7a
zpW}E|nvHK?e}84vismbLs4!anC-W`Q+4r1*?|QB~a2$uSOw)7>%dvl4Z(YbGD{#!d
zmCDemlM~%ENbOQBes4xBPqzn_Wm}YC=%%A)x#I#lZ(P;h%}hUd`Z$$4$>q-;jy!t%
zVY*T)l)J?=7q`gtO-j=-HkHWL7sJ*kKh9!9Po|QGzklPgqr(K9R1Ed~{G4r@8_Y7c
zd!}JfiiVrGk!;0uMR_vze06JG!Ps#uf~qRf-RQ`RXIih921gCKs%a{P6(uXsC6uAl
zw4}-tvr}f@uq>0%w~UE}DNRulG~JM@X^=3mPIVQrz@Oz{vRbL^#}7g)OS-9<#yy6i
zEpM&t9e*AaO2v|pJ7;N(WlEGq&}(fs))cinIzD!oj2Fv)R2{2^TCSCUC1WqgUujt0
zV>a6|BVj~IlGyE{waRi^YtDy1WefT6=IYqQ>(R+Kp-8w`DNKdt1kA2i7o{E&dpv~%
z*cF7TSllUXKp93hqto+q^jYTg{B-8y3^_@La(}cDuJL6_LZXN$h=9cNNCKxUy;56f
z$`?`>HJgokvo6X4E8axvpEI3fQWXRqAxLo$@USEBfENJ6SEJR%NNs7m5#6arBDK)k
zMfeg`1%ZQN8}S^3fa-u2%iRLl<{(Sn9M7`iEhAhqsNNCVPyjsQAP?>%*aqA!b=$da
yvn@CG8fXL1;W+j`fCGTz2rT(0u%OjpZ~g)rOpE|!KStaD0000<MNUMnLSTYiNq7tZ

delta 770
zcmV+d1O5EK29E}i8Gi-<001BJ|6u?C0@g`HK~y-)g_A){oJADJe=|F~`?2eX2o_MG
z#DFSEp{TK0YB7>%tqn1nSYt2s>Y*1KO-wJIJb2L<)uflk#KcQgTdb(*0ZWQ$ZN%0D
zL0TGGwg@a_yJdm>cE5ek!|qz`rE{9R<o(|KX6A1)naqct=YRECYmK!QV+?m%s*0*=
zsZ?5WVHl?3@p#Hw%k6-ftJ4&U1$w%+|F5p9hzP}Ealr*a5UUbVRRHpvd5#?WnBmjk
zP?j>gQ+ql1+M6^r-22}X5Qd?1s$wbyp%4`LZtPnw&iqb;-+&jdBP^Hj;vSzJ`-t|I
z4)#5_A1@ZKLVv`#Tg@d7fASW;PM!r6KUvS)2M&|)61@NUdt|ap0F0hL#RrEz#ZUUE
zDrR=}@<eOveUDwZHp;c-S*~1K<?{R`Qrn(lC6}SIyPjY@!uYuf?(rLGYu-w-F3J8q
z2gv1e87orp*(~NcJ9nID^CG+Yp62NA5&oK+Vl}_O#DCu>7#!^7=6a4VMvk(YTR~M&
zRb1^xqY)2-A-9>KkV~Vg#A6;_ED1n%W0~~wJOFj^1R|9_rz(gDzSl^qbBJ_yhSGYJ
z=ll2KY?Q0h1)h9#h$3q=`c3TY8KAwT0}(-0s457VoAaEzGQyU-+IabyeN4|y@%{J-
zejFd+%YUy=^2Gfw(*58zM#hJknwvzVGT2o%ilT^?nOXXcSTw<&XZxA@vxAL|P1;)8
z`Qgk-&RjfAPzs=`Eh5;OLU(IFeeHuptRpCG@W<jQT06_sC+j)>^H<zh%M!5>cJ>Z1
zwCg2mgI$eO=X{2G-e4u4W^&;d0P;bW8*3f_341TeJFmY>SKGq?w<`$77>qGAB_Ckm
zp;u`3w{jspO7U*X!B-Eld&dhzB9ZFz)xNXfR8?;QsD{SyNXrhowmgn(SE4QoK)Eb{
z{tFNhbz@^=KRFk@9)@A861Y3Z8Ngaow$@(%2VZ`iF(oe3vj6}907*qoM6N<$f|}QT
A_5c6?


From 7ffceada9b24ee76b44eeee37818c0220fe405ae Mon Sep 17 00:00:00 2001
From: Sean Steimer <ssteimer@crownpartners.com>
Date: Thu, 31 Oct 2013 14:33:37 -0700
Subject: [PATCH 5/7] added new html recognition patterns for CQ5 for etc
 designs and etc clientlibs

---
 share/apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/apps.json b/share/apps.json
index 1411791a2..fc972e447 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -102,8 +102,8 @@
 		"Adobe CQ5": {
 			"website": "adobe.com/products/cq.html",
 			"cats": [ 1 ],
-			"url": "/etc/designs/",
-			"html": "<div class=\"[^\"]*parbase",
+			"url": "",
+			"html": ["<div class=\"[^\"]*parbase","_jcr_content","/etc/designs/","/etc/clientlibs/"],
 			"implies": "Java"
 		},
 		"Adobe GoLive": {

From a7f6b5be604e9cc94d5905aa33aa7354078f59bc Mon Sep 17 00:00:00 2001
From: Camille Barneaud <camillebarneaud@gmail.com>
Date: Sat, 2 Nov 2013 19:08:41 +0100
Subject: [PATCH 6/7] Replace array.map() by array.forEach()

As told by @q-- in #376 replace array.map() by array.forEach() because
it's faster and the array returned by map() is not used
---
 drivers/bookmarklet/js/driver.js |  2 +-
 drivers/chrome/js/driver.js      |  6 +++---
 drivers/chrome/js/popup.js       |  2 +-
 drivers/html/js/driver.js        |  2 +-
 drivers/php/js/driver.js         |  2 +-
 share/js/wappalyzer.js           | 20 ++++++++++----------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/bookmarklet/js/driver.js b/drivers/bookmarklet/js/driver.js
index eb5d2db9e..19b3f8121 100644
--- a/drivers/bookmarklet/js/driver.js
+++ b/drivers/bookmarklet/js/driver.js
@@ -125,7 +125,7 @@
 				;
 
 			if ( w.detected[url] != null && w.detected[url].length ) {
-				w.detected[url].map(function(app, i) {
+				w.detected[url].forEach(function(app, i) {
 					html +=
 						'<div class="wappalyzer-app' + ( !i ? ' wappalyzer-first' : '' ) + '">' +
 							'<a target="_blank" class="wappalyzer-application" href="' + w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '') + '">' +
diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index 078362a18..de0b651d2 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -102,7 +102,7 @@
 			});
 
 			chrome.tabs.query({}, function(tabs) {
-				tabs.map(function(tab) {
+				tabs.forEach(function(tab) {
 					if ( tab.url.match(/^https?:\/\//) ) {
 						chrome.tabs.executeScript(tab.id, { file: 'js/content.js' });
 					}
@@ -152,9 +152,9 @@
 				// Find the main application to display
 				var i, appName, found = false;
 
-				w.driver.categoryOrder.map(function(match) {
+				w.driver.categoryOrder.forEach(function(match) {
 					for ( appName in w.detected[tab.url] ) {
-						w.apps[appName].cats.map(function(cat) {
+						w.apps[appName].cats.forEach(function(cat) {
 							if ( cat == match && !found ) {
 								chrome.browserAction.setIcon({ tabId: tab.id, path: 'images/icons/' + appName + '.png' });
 
diff --git a/drivers/chrome/js/popup.js b/drivers/chrome/js/popup.js
index 10b2a7e0f..d21be18fb 100644
--- a/drivers/chrome/js/popup.js
+++ b/drivers/chrome/js/popup.js
@@ -68,7 +68,7 @@ document.addEventListener('DOMContentLoaded', function() {
 										'<span class="label">' + appName + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + '</span>' +
 									'</a>';
 
-							response.apps[appName].cats.map(function(cat) {
+							response.apps[appName].cats.forEach(function(cat) {
 								html +=
 									'<a target="_blank" href="http://wappalyzer.com/categories/' + response.categories[cat] + '?utm_source=chrome&utm_medium=popup&utm_campaign=extensions">' +
 										'<span class="category">' + chrome.i18n.getMessage('categoryName' + cat) + '</span>' +
diff --git a/drivers/html/js/driver.js b/drivers/html/js/driver.js
index 085d2223f..98a622b17 100644
--- a/drivers/html/js/driver.js
+++ b/drivers/html/js/driver.js
@@ -46,7 +46,7 @@
 		displayApps: function() {
 			document.getElementById('apps').innerHTML = '';
 
-			w.detected['http://google.com'].map(function(app) {
+			w.detected['http://google.com'].forEach(function(app) {
 				document.getElementById('apps').innerHTML += '<img src="images/icons/' + app + '.png" width="16" height="16"/> ' + app + '<br/>';
 			});
 		},
diff --git a/drivers/php/js/driver.js b/drivers/php/js/driver.js
index 91416520c..f6e6994bd 100644
--- a/drivers/php/js/driver.js
+++ b/drivers/php/js/driver.js
@@ -30,7 +30,7 @@ w.driver = {
 				version:    w.detected[w.driver.data.url][app].version
 				};
 
-			w.apps[app].cats.map(function(cat) {
+			w.apps[app].cats.forEach(function(cat) {
 				apps[app].categories.push(w.categories[cat]);
 			});
 		};
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 6f66052de..06645a6d4 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -78,7 +78,7 @@ var wappalyzer = (function() {
 				w.log({ matches: matches, version: version });
 
 				if ( matches ) {
-					matches.map(function(match, i) {
+					matches.forEach(function(match, i) {
 						// Parse ternary operator
 						var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.+)$').exec(version);
 
@@ -158,10 +158,10 @@ var wappalyzer = (function() {
 			patterns = [ patterns ];
 		}
 
-		patterns.map(function(pattern) {
+		patterns.forEach(function(pattern) {
 			attrs = {};
 
-			pattern.split('\\;').map(function(attr, i) {
+			pattern.split('\\;').forEach(function(attr, i) {
 				if ( i ) {
 					// Key value pairs
 					attr = attr.split(':');
@@ -276,7 +276,7 @@ var wappalyzer = (function() {
 				for ( type in w.apps[app] ) {
 					switch ( type ) {
 						case 'url':
-							parse(w.apps[app][type]).map(function(pattern) {
+							parse(w.apps[app][type]).forEach(function(pattern) {
 
 								if ( pattern.regex.test(url) ) {
 									apps[app].setDetected(pattern, type, url);
@@ -290,7 +290,7 @@ var wappalyzer = (function() {
 								break;
 							}
 
-							parse(w.apps[app][type]).map(function(pattern) {
+							parse(w.apps[app][type]).forEach(function(pattern) {
 
 								if ( pattern.regex.test(data[type]) ) {
 									apps[app].setDetected(pattern, type, data[type]);
@@ -306,7 +306,7 @@ var wappalyzer = (function() {
 
 							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
 
-							parse(w.apps[app][type]).map(function(pattern) {
+							parse(w.apps[app][type]).forEach(function(pattern) {
 
 								while ( match = regexScript.exec(data.html) ) {
 									if ( pattern.regex.test(match[2]) ) {
@@ -331,7 +331,7 @@ var wappalyzer = (function() {
 									if ( new RegExp('name=["\']' + meta + '["\']', 'i').test(match) ) {
 										content = match.toString().match(/content=("|')([^"']+)("|')/i);
 
-										parse(w.apps[app].meta[meta]).map(function(pattern) {
+										parse(w.apps[app].meta[meta]).forEach(function(pattern) {
 
 											if ( content && content.length === 4 && pattern.regex.test(content[2]) ) {
 												apps[app].setDetected(pattern, type, content[2], meta);
@@ -349,7 +349,7 @@ var wappalyzer = (function() {
 							}
 
 							for ( header in w.apps[app].headers ) {
-								parse(w.apps[app][type][header]).map(function(pattern) {
+								parse(w.apps[app][type][header]).forEach(function(pattern) {
 
 									if ( typeof data[type][header.toLowerCase()] === 'string' && pattern.regex.test(data[type][header.toLowerCase()]) ) {
 										apps[app].setDetected(pattern, type, data[type][header.toLowerCase()], header);
@@ -364,7 +364,7 @@ var wappalyzer = (function() {
 								break;
 							}
 
-							parse(w.apps[app][type]).map(function(pattern) {
+							parse(w.apps[app][type]).forEach(function(pattern) {
 								for ( i in data[type] ) {
 
 									if ( pattern.regex.test(data[type][i]) ) {
@@ -402,7 +402,7 @@ var wappalyzer = (function() {
 							w.apps[app].implies = [ w.apps[app].implies ];
 						}
 
-						w.apps[app].implies.map(function(implied) {
+						w.apps[app].implies.forEach(function(implied) {
 							implied = parse(implied)[0];
 
 							if ( !w.apps[implied.string] ) {

From 884e428a48bbff7ec49d7c662ec36459fac0cb8c Mon Sep 17 00:00:00 2001
From: Alexandros Sketo <omikr0n@hotmail.com>
Date: Sun, 3 Nov 2013 11:23:41 +0200
Subject: [PATCH 7/7] Added UIKit

---
 share/apps.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/share/apps.json b/share/apps.json
index fc972e447..1b9f82e52 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -2994,6 +2994,11 @@
 			"website": "ophal.org",
 			"cats": [ 1, 11, 18 ],
 			"headers": { "X-Powered-By": "^Ophal/" }
+		},
+		"UIKit": {
+			"website": "getuikit.com",
+			"cats": [ 18 ],
+			"script": "uikit.*\\.js"
 		}
 	}
 }