From 782a4766ea7040f7cfd764e1153042050199532a Mon Sep 17 00:00:00 2001
From: Camille Barneaud <camillebarneaud@gmail.com>
Date: Thu, 28 Feb 2013 19:15:41 +0100
Subject: [PATCH 1/3] Some corrections

---
 share/apps.json                  | 103 ++++++++++++++-----------------
 share/images/icons/Ecodoo.png    | Bin 159 -> 0 bytes
 share/images/icons/Posterous.png | Bin 0 -> 260 bytes
 share/images/icons/Sap.png       | Bin 454 -> 0 bytes
 share/images/icons/chartbeat.png | Bin 133 -> 0 bytes
 share/images/icons/cufon.png     | Bin 758 -> 0 bytes
 share/images/icons/posterous.png | Bin 421 -> 0 bytes
 share/images/icons/wink.png      | Bin 436 -> 0 bytes
 share/images/icons/xajax.png     | Bin 1000 -> 0 bytes
 9 files changed, 45 insertions(+), 58 deletions(-)
 delete mode 100644 share/images/icons/Ecodoo.png
 create mode 100644 share/images/icons/Posterous.png
 delete mode 100644 share/images/icons/Sap.png
 delete mode 100644 share/images/icons/chartbeat.png
 delete mode 100644 share/images/icons/cufon.png
 delete mode 100644 share/images/icons/posterous.png
 delete mode 100644 share/images/icons/wink.png
 delete mode 100644 share/images/icons/xajax.png

diff --git a/share/apps.json b/share/apps.json
index 2f81cf511..9a0da89ea 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -42,7 +42,7 @@
 			"website": "www.1c-bitrix.ru",
 			"cats": [ 1 ],
 			"headers": { "X-Powered-CMS": "Bitrix Site Manager", "Set-Cookie": "BITRIX_" },
-			"html": "<link[^>]+components\/bitrix|(src|href)=\"\/bitrix\/(js|templates)",
+			"html": "(<link[^>]+components\/bitrix|(src|href)=\"\/bitrix\/(js|templates))",
 			"script": "1c-bitrix",
 			"implies": "PHP"
 		},
@@ -75,6 +75,15 @@
 			"script": "addthis\\.com\/js\/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
+		"Adobe ColdFusion": {
+			"website": "adobe.com\/products\/coldfusion-family.html",
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "\/cfajax\/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
 		"Adobe CQ5": {
 			"website": "adobe.com\/products\/cq.html",
 			"cats": [ 1 ],
@@ -219,7 +228,7 @@
 			"website": "bigace.de",
 			"cats": [ 1 ],
 			"meta": { "generator": "BIGACE ([\\d.]+)\\;version:\\1" },
-			"html": "Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE",
+			"html": "(Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE)",
 			"implies": "PHP"
 		},
 		"Bigcommerce": {
@@ -239,9 +248,9 @@
 		"Bigware": {
 			"website": "bigware.de",
 			"cats": [ 6 ],
-			"html": "Diese <a href=.+bigware\\.de|<a href=[^>]+\/main_bigware_\\d+\\.php",
+			"html": "(Diese <a href=.+bigware\\.de|<a href=[^>]+\/main_bigware_\\d+\\.php)",
 			"url": "(\\?|&)bigWAdminID=[a-z\\d]+(&|$)",
-			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
+			"headers": { "Set-Cookie": "(bigwareCsid|bigWAdminID)" },
 			"implies": "PHP"
 		},
 		"BittAds": {
@@ -496,15 +505,6 @@
 			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
-		"Adobe ColdFusion": {
-			"website": "adobe.com\/products\/coldfusion-family.html",
-			"cats": [ 18 ],
-			"url": "\\.cfm$",
-			"html": "<!-- START headerTags\\.cfm",
-			"script": "\/cfajax\/",
-			"env": "^_cfEmails$",
-			"implies": "CFML"
-		},
 		"CubeCart": {
 			"website": "www.cubecart.com",
 			"cats": [ 6 ],
@@ -556,8 +556,7 @@
 		"Debian": {
 			"website": "debian.org",
 			"cats": [ 28 ],
-			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2"
-			}
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" }
 		},
 		"DedeCMS": {
 			"website": "dedecms.com",
@@ -616,7 +615,7 @@
 			"website": "dokeos.com",
 			"cats": [ 21 ],
 			"meta": { "generator": "Dokeos" },
-			"html": "Portal <a[^>]+>Dokeos|@import \"[^\"]+dokeos_blue",
+			"html": "(Portal <a[^>]+>Dokeos|@import \"[^\"]+dokeos_blue)",
 			"headers": { "X-Powered-By": "Dokeos" },
 			"implies": [ "PHP", "Xajax", "jQuery", "CKEditor" ]
 		},
@@ -631,8 +630,7 @@
 			"website": "dotnetnuke.com",
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+"
-			},
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke$",
 			"implies": "Microsoft ASP.NET"
@@ -640,7 +638,7 @@
 		"Doxygen": {
 			"website": "stack.nl\/~dimitri\/doxygen",
 			"cats": [ 4 ],
-			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
+			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\2"
 		},
 		"DreamWeaver": {
 			"website": "www.adobe.com\/products\/dreamweaver",
@@ -659,7 +657,7 @@
 		"Drupal Commerce": {
 			"website": "drupalcommerce.org",
 			"cats": [ 6 ],
-			"html": "id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field",
+			"html": "(id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field)",
 			"implies": "Drupal"
 		},
 		"Dynamicweb": {
@@ -761,7 +759,7 @@
 			"cats": [ 29 ],
 			"html": "<!-- Factfinder",
 			"script": "Suggest\\.ff",
-			"url": "\/ViewParametricSearch|ffsuggest\\.[a-z]htm"
+			"url": "(\/ViewParametricSearch|ffsuggest\\.[a-z]htm)"
 		},
 		"FAST ESP": {
 			"website": "microsoft.com\/enterprisesearch",
@@ -785,8 +783,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
 			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
-			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+"
-			}
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
 		},
 		"FluxBB": {
 			"website": "fluxbb.org",
@@ -825,7 +822,7 @@
 		"Gambio": {
 			"website": "gambio.de",
 			"cats": [ 6 ],
-			"html": "<link[^>]* href=\"templates\/gambio\/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
+			"html": "(<link[^>]* href=\"templates\/gambio\/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->)",
 			"implies": "PHP"
 		},
 		"Gauges": {
@@ -1014,8 +1011,7 @@
 			"cats": [ 1 ],
 			"script": "include\/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+="
-			},
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
 			"implies": "PHP"
 		},
 		"ImpressPages": {
@@ -1045,7 +1041,7 @@
 		"Intershop": {
 			"website": "intershop.com",
 			"cats": [ 6 ],
-			"script": "is-bin|INTERSHOP"
+			"script": "(is-bin|INTERSHOP)"
 		},
 		"IPB": {
 			"website": "www.invisionpower.com",
@@ -1221,8 +1217,7 @@
 		"Kohana": {
 			"website": "kohanaframework.org",
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1"
-			},
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
@@ -1274,7 +1269,7 @@
 			"headers": { "Server": "lighttpd(\/([\\d.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
-			"website": "limesurvey.org/",
+			"website": "limesurvey.org\/",
 			"cats": [ 19 ],
 			"headers": { "generator": "LimeSurvey" }
 		},
@@ -1361,8 +1356,7 @@
 			"cats": [ 18 ],
 			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
-			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1"
-			},
+			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": [ "IIS", "Windows Server" ]
 		},
 		"Microsoft SharePoint": {
@@ -1404,10 +1398,9 @@
 		"MODx": {
 			"website": "modxcms.com",
 			"cats": [ 1 ],
-			"html": "<a[^>]+>Powered by MODx<\/a>|<(link|script)[^>]+assets\/snippets\/",
+			"html": "(<a[^>]+>Powered by MODx<\/a>|<(link|script)[^>]+assets\/snippets\/)",
 			"env": "^MODX_MEDIA_PATH$",
-			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}"
-			},
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
@@ -1425,15 +1418,13 @@
 		"mod_rack": {
 			"website": "phusionpassenger.com",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rack(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(\/([\\d.]+))?\\;version:\\2"
-			},
+			"headers": { "Server": "mod_rack(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(\/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_rails": {
 			"website": "phusionpassenger.com",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rails(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(\/([\\d.]+))?\\;version:\\2"
-			},
+			"headers": { "Server": "mod_rails(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(\/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_ssl": {
@@ -1445,8 +1436,7 @@
 		"mod_wsgi": {
 			"website": "code.google.com\/p\/modwsgi",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_wsgi(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(\/([\\d.]+))?\\;version:\\2"
-			},
+			"headers": { "Server": "mod_wsgi(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(\/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python\\;confidence:50", "Apache" ]
 		},
 		"MoinMoin": {
@@ -1515,7 +1505,7 @@
 		"MyBB": {
 			"website": "www.mybboard.net",
 			"cats": [ 2 ],
-			"html": "<script [^>]+\\s+<!--\\s+lang\\.no_new_posts|<a[^>]* title=\"Powered By MyBB",
+			"html": "(<script [^>]+\\s+<!--\\s+lang\\.no_new_posts|<a[^>]* title=\"Powered By MyBB)",
 			"env": "^MyBB$"
 		},
 		"MyBlogLog": {
@@ -1546,7 +1536,7 @@
 		"New Relic": {
 			"website": "newrelic.com",
 			"cats": [ 10 ],
-			"html": "<script[^>]+>(var NREUMQ=NREUMQ|if \\(!NREUMQ\\.f)",
+			"html": "(<script[^>]+>(var NREUMQ=NREUMQ|if \\(!NREUMQ\\.f))",
 			"env": "^NREUM"
 		},
 		"Nginx": {
@@ -1565,7 +1555,7 @@
 		"NOIX": {
 			"website": "www.noix.com.br\/tecnologias\/joomla",
 			"cats": [ 19 ],
-			"html": "<[^>]+(src|href)=[^>]*(\/media\/noix)|<!-- NOIX"
+			"html": "(<[^>]+(src|href)=[^>]*(\/media\/noix)|<!-- NOIX)"
 		},
 		"nopCommerce": {
 			"website": "www.nopcommerce.com",
@@ -1586,7 +1576,7 @@
 		"OpenCart": {
 			"website": "www.opencart.com",
 			"cats": [ 6 ],
-			"html": "index\\.php\\?route=[a-z]+\/|Powered By <a href=\"[^>]+OpenCart",
+			"html": "(index\\.php\\?route=[a-z]+\/|Powered By <a href=\"[^>]+OpenCart)",
 			"implies": "PHP"
 		},
 		"openEngine": {
@@ -1923,7 +1913,7 @@
 			"env": "^requirejs$"
 		},
 		"Reveal.js": {
-			"website": "lab.hakim.se/reveal-js",
+			"website": "lab.hakim.se\/reveal-js",
 			"cats": [ 12 ],
 			"script": "reveal(\\.min)?\\.js",
 			"env": "^Reveal$"
@@ -1962,8 +1952,7 @@
 		"s9y": {
 			"website": "s9y.org",
 			"cats": [ 1 ],
-			"meta": { "generator": "Serendipity", "Powered-By": "Serendipity"
-			}
+			"meta": { "generator": "Serendipity", "Powered-By": "Serendipity v\\.(.+)\\;version:\\1" }
 		},
 		"SAP": {
 			"website": "sap.com",
@@ -2087,7 +2076,7 @@
 			"implies": "Joomla"
 		},
 		"SobiPro": {
-			"website": "sigsiu.net/sobipro.html",
+			"website": "sigsiu.net\/sobipro.html",
 			"cats": [ 19 ],
 			"env": "^SobiProUrl$",
 			"html": " <(script|link)[^>].*com_sobipro.*>",
@@ -2296,8 +2285,7 @@
 		"Ubuntu": {
 			"website": "ubuntu.com\/business\/server\/overview",
 			"cats": [ 28 ],
-			"headers": { "Server": "Ubuntu", "X-Powered-By": "Ubuntu"
-			}
+			"headers": { "Server": "Ubuntu", "X-Powered-By": "Ubuntu" }
 		},
 		"Umbraco": {
 			"website": "umbraco.com",
@@ -2367,7 +2355,7 @@
 		"Vimeo": {
 			"website": "vimeo.com",
 			"cats": [ 14 ],
-			"html": "<(param|embed)[^>]+vimeo\\.com\/moogaloop|<iframe[^>]player\\.vimeo\\.com"
+			"html": "(<(param|embed)[^>]+vimeo\\.com\/moogaloop|<iframe[^>]player\\.vimeo\\.com)"
 		},
 		"VirtueMart": {
 			"website": "virtuemart.net",
@@ -2411,6 +2399,7 @@
 			"website": "www.w3-edge.com\/wordpress-plugins\/w3-total-cache",
 			"cats": [ 23 ],
 			"html": "<!--[^>]+W3 Total Cache",
+			"headers": { "X-Powered-By": "W3 Total Cache(\/([\\d.]+))?\\;version:\\2" },
 			"implies": "WordPress"
 		},
 		"Web Optimizer": {
@@ -2421,8 +2410,7 @@
 		"webEdition": {
 			"website": "webedition.de\/en",
 			"cats": [ 1 ],
-			"meta": { "generator": "webEdition", "DC.title": "webEdition"
-			}
+			"meta": { "generator": "webEdition", "DC.title": "webEdition" }
 		},
 		"WebGUI": {
 			"website": "www.webgui.org",
@@ -2487,8 +2475,7 @@
 			"website": "wix.com",
 			"cats": [ 1 ],
 			"script": "static\\.wix\\.com",
-			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com"
-			},
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
 			"env": "^wix(Events|Data|Errors)"
 		},
 		"Wolf CMS": {
@@ -2528,7 +2515,7 @@
 		"XenForo": {
 			"website": "xenforo.com",
 			"cats": [ 2 ],
-			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
+			"html": "(jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding)"
 		},
 		"AT Internet Analyzer": {
 			"website": "atinternet.com\/en",
@@ -2601,7 +2588,7 @@
 		"YUI": {
 			"website": "yuilibrary.com",
 			"cats": [ 12 ],
-			"script": "\/yui\/|yui\\.yahooapis\\.com",
+			"script": "(\/yui\/|yui\\.yahooapis\\.com)",
 			"env": "^YAHOO$"
 		},
 		"Zen Cart": {
diff --git a/share/images/icons/Ecodoo.png b/share/images/icons/Ecodoo.png
deleted file mode 100644
index 0a25dd711f17bdedaa326367da17be508dd885ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=7x|O?`_!@=B`y{Q2|$
z|NqTB^Zo-xJv?0;LpZLdb{*txaNuBJxBYjaacKb4{MY+M71@#>?Md6r+`MDwLsc2I
zCdKJrv^GxsKI=z+p2<zs^kYFns!@-W&x^{ge^If6(a(cz-6x+*_kd<Hc)I$ztaD0e
F0suE5J2C(O

diff --git a/share/images/icons/Posterous.png b/share/images/icons/Posterous.png
new file mode 100644
index 0000000000000000000000000000000000000000..3150f4f93d04786532cc4df857870b997cc7f7d6
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}RDe&2>;M1%|GYnvnjD*+99Ec{
zP+6AOSXbEDS`i-`>g(;2nVyiHnUIr}lAoLA=i?mc@9FAno0JfBc<0O`yJj8TJ?Gfo
zd1sC+Id^2~`J>A&99!n$?hqR6TacgO<Y;w(?fnU$EsP~We!&b5&u*jvIT4;Njv*Cs
zy+^k*9yVZLHVC@A_qxje{gS@V795RenDjp_ZgKZ@QS07sD(Ax%+nrc^%^>l9^Tmv1
zYcA?9@t<bGwmmoR!iun>wI=UcWAb`0p4%*I`YZmLz4*VlR~)%%i)H+Qb})Fl`njxg
HN@xNAC%$X%

literal 0
HcmV?d00001

diff --git a/share/images/icons/Sap.png b/share/images/icons/Sap.png
deleted file mode 100644
index 9217c8f8778fbf43987e6c9bdf94ab76c63925e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2w>(5FusUd0zkk0aHmt
zK~y-)?UT<dg8>-FKkxRU2`#%Zl7xdFXE`k=C%^8BqjHv`iyMW56aD}rL@9D{VKsXt
z$(o|x2{qn#<K5=<dR(xEQXE`-&QITOeLp>li0~U+{F1*9P-~a;pO2s@n%by33^tYH
zFHzaMO0#g3V4&HDo_b{e(xR`y`+gsc8pKmJ00J5XY5?8LN;2~#p^Kz!NAF~0^IYB-
zT0IjHk(28O5fRyn8B#wHmiozXq;BTW3*a&>o6;gT&mt^FuIQ*KC7F2wp!>Bws9h5`
zvy`~OzRzf+9|N)BRs(?c@m&dq;$m9%d-L&SN<Ly*wv2B?Bh{lj-n<!>_jGCWmr>?X
zsVw(=xmEx4KB3sH=D3tVY^u}9vv6>7gUfLMSWBb<m|Z`m!dFaJTNMCC;z294vI9qR
wJ;o;yErZM7Y19xIJDl%b$=OqK0sp_i3us}$609}P-~a#s07*qoM6N<$f`XjDEC2ui

diff --git a/share/images/icons/chartbeat.png b/share/images/icons/chartbeat.png
deleted file mode 100644
index 2cb597cc7ed6478bd165b27d0a3864f9bb5143d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uK$gMLFoT~wWBL10tFdM
zg8YIR9G=}s19G%HT^vI=t|uonFdw^cfr0JXg$n`_6S<T(ZE84j<%(ti(;3$wc9jEF
bjtmU4NBGwK3^Q;5>SFM8^>bP0l+XkKb$uxq

diff --git a/share/images/icons/cufon.png b/share/images/icons/cufon.png
deleted file mode 100644
index cd2e3f02990ac17fa7a351b4e7da90cb2f6090f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008LNkl<ZILlR&
zJ&Pn&7=@qrz4umCcTc<Htj@TuftwgO(FURz2pWr_8yFY}W`YR&69h33BaO^-5it=&
zFcH~BG+9t&6Te4iduH7E*s1QS?y9=?y#}+O9yq}Xp5z>ke0cMhm*(Q%I?3fD-YZTa
z8FWLY@Paz9d%5(2bC6R)R>R&@x;Ny#@BeIPa^Fa*04kVe`rZhIA}Uz=H#;X}%M6_{
z3C4PRJoj@8BV7w1U}kJ8Y+oo45sv%JcZWSisi=ZkX6TJjDyB-S<<$4UB4sQku3V^i
zYNO!4dhWdEgWZn9&Uocw$(Kh1zpe~orfCfA%$RqP?UDWuZd0aBnT?=ay)@#*t%Ap<
zo|R?l&NyxpNeykHQ8$r?$I7j`=hNE_Ki=)ABy+3o`TB5$nQ{4?!^~Jlqh3am!jLn*
zZjEjPd&|g2e>9v7f)DW8r7_Q*FSz#Cl5fd8xgG#mEEBy5W>5`=wl=U5;fuY7{gsfM
z(xJTl^MYAB@cdTb{hgMS(wWuhG3G<!;B-Luo1Wb|@_Vhc_X?dadrs?~Pj*`>jE7w2
z^VyP=5{tpupAYQZ=~-ArEkn~L>I{dyaWL<A+#8=geU7O+oA&Zp_~xj?%s5>|>Ly`9
zPz4neib@FqlnhC@UK_9eaF;7vju<1)Y$!M912IPEBcW1!04IX3jXkaqL_ku;j};vk
z{InF_{cVN!p8Ko73!5c3P7JLS34jQSM<=C2oj?|J?2w=!LiPpMjv^l)^n?(2`O!5F
zOt?7l061VW5`3v=FqL3>b{tYBl}eU^H+PnNb*JNr2P$rNiCJf87ILYSN$^uk&9tz|
zkvd`qHKQ*T6Uf<7dgVr+xISB<q7(@jdDbPeX}0hW=H=_#tKpr$bC?cM5Y5N{IYWwq
oY6b-|V1l@eOR$lL#gugQA9=`!x3Bkh<NyEw07*qoM6N<$f|~+mW&i*H

diff --git a/share/images/icons/posterous.png b/share/images/icons/posterous.png
deleted file mode 100644
index 3730d31aa8e3f1840346fd1822beddedf936eaf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004ONkl<ZILob*
zO-n*S6o&mlebTl?v}@C*T@XaIh@=n<3!*{-!3YuQy9m-y2%(59&8?fl!a~aOW+__g
z)vE~CaP>CL!7j)w#2R?u%z5WL!z@Op`|DCw6+WM@C2F-AxF8Vl1L`$U@i&KhBM_8N
z0eQPQ%4Y(Bat!3`guFxh@;Ojq;-U-4Z)kbR+bFmM3Qpj|LdZ^7XL@0t=;j1HCf3{2
z^1_ioklzQ=i$u}Q2D=arI`Acjc#VRaWy_Sy2LeHM9Y`7p`H&5DLV5MDr<_pzvIV3}
zl;<`Dg7g|7O%mB%n8!O1zGA&fh}ZaJ0%?l!j7=a&t^lzSBI95~?Y{(FY%npe<td9m
zkXQhsLquv7=CL*?l9$(r8-T}QEq_~T6kM=Fvp{5kh#O(m_dvO0y@x@qUq_k~2x8Mf
zxQ~diq39@Z&u+Wz*ZOsy4Vs`@t<n?TZNQVhIg)lR;GgNo(&}f@{m1$S?s3~fbYu6e
P00000NkvXXu0mjfIIO-t

diff --git a/share/images/icons/wink.png b/share/images/icons/wink.png
deleted file mode 100644
index 3e7204032da80b5f8feebe0d8ef3275371cd4795..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004dNkl<ZILl*T
z7^;9>L_|c*(b3VEBwd1%l5zzF1=Zc%-G`=5oqD{zy?qH$8aX&P<ilbTIu34G^P;D_
z`>dXxUL{b>2`HtGS0hlNSZHW?-IgtzpZ;G^`2T-zz<)P4mja*^GhU5A|M5mgM`ul$
zGWk|wTIT=0rt1Iy6L|msud?{>;}@8UQzO5eoS=(;NMcKS*V)qYivMB~lK*+-)c#+X
z1hn0c;s3{p$-mVMO*~OF$;im)8XFtC)i>6+ZJgY8<NKaP{})g0`fp|L_&+8#`u~M#
zmH+?82><_|F8_aFXYCoF7I72<nwpx{RMpfTSi5%B^Zzqr|NnPo`2Rmi{Qv)2r~m&;
z4FCW42l1u;Ut8GzRa#9W9&1<uu{HxUTVQ=z;mKFi^Zx%YGynfTQ|bTzeBJ;5y2Jjj
zpIHAwRnMpzsE&tFj2S5D7_`PkN9``lO+A;H5_i<f-f1oa8<#&&j+^LI2E_6}tP8|y
eps-~a-T(lO=9RSj0s5u@0000<MNUMnLSTZLjogp`

diff --git a/share/images/icons/xajax.png b/share/images/icons/xajax.png
deleted file mode 100644
index bba0d40abf857893a87ce6de8a55dabc16aa31a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1000
zcmV<E0~h>>P)<h;3K|Lk000e1NJLTq000#L000mO1^@s6`Pwuk000B8Nkl<ZILnQc
z%WGV96vxjw_c0GAcQTL6BpJ1n#HK-mF=Ly?2i79RjYSZtN);lw(2cq)s90R6o4Ro4
z1N9%UO1lsQtJFxa?IbF(dDuW`?93#Y_uM;~+<SlbcU*KPbVQ^Fe(>9z&w2cQ-!C#V
z+-Be{_y0|z+k`3Hjy6#FSCOtz_ewLj4*&pTJBa|mBO(tGg8<Mgr7R<&jfmvBF0=~)
z5rL|z-OxtE1k18ectR1b@EqG_UDw3$$jE>Mc(q=yA4Gt7Bpi+az&F5r`tp^mZJMUa
z%w95);7n!`n7OM{l2U>co?wM^5%AyZNtsz%S$*wlcD`QB<>&RDP&GX|x_^A~fm4Zi
zY;4!IpK)wQFaQc6u(Rt96cJG}bJ!+)qrCjrbHyKjNt%mG;ryj+%NGn-x)GYHRx7w>
zw<@!Dr<M-A`25qHPG2O$IM0s#6#$glD`RA40svVlmq#|MweQWj?1=TlthCmz!`9*=
zQluAs$v8xhKMB`9`2s{xhwU315EvK$tuI=QA3N3<K6=znMk7y6Ox%BsnTa~D*b?Hy
zom^pL`=ih7=`-&^|4Yx(ftiyqv;I3L9)FaRqxbL=pMK0Q|8bd(u`zyg{#TipIu!Zs
z{SPdsR*PwV|C!FzY6ptUCI)=4pqOl&`xYCy0*C<N+~;4);J!P-NDV;g&lSj>`ws6L
zpM=7NpJ7xrpl>L%ON#18fa2aNnHd3q%jHU}T(6(~dwKcDPw$@IEiGh~BQvikjr=Bs
zjW7&mCSl>NcOXc9P*p$Q5$hA71N%4lh2ts>-*vS=5;>W9FjHe@#EznBwK_B!b;V^k
zQLEQa<ga8W0?g^{t?h;D7cRQWMqckRdcjf17nvAOMh;G{Sy5xIC(=7BcUtEY{Yg1}
zcnX*q_Mp{j4Nc2L;kwfEB!Q-d;<4!4n>TW=7fYoT)3VmBR!d6^4&(+?sY`3Ct7p*>
zCIYkL3QYDVVfyeCcl}dDWFm!0VO2_3vg0(Q<D5#T_kEp84L-Kp+O>&r#W0M;a;dzf
zO90SRLL_2DucM|eMTNr#^z?*4Q4~?w+=NEGfeZjr%6TGM(tNtEsj8#tdJBlq5ia=s
ze)-754}qd60EnIDx;h1-oBkp_38rOnB9RCdi=|{CUr=h5iqmZExPz&bFBXe6P1Cf6
z5TI$=P3Wx-^k3H3Y&M}`n#husQmG_&YBdSX7EmaNo~lwj9tT8}M8rcwX+Z2YtbYJ%
WJl|b)e_1X70000<MNUMnLSTaCwAso4


From 3b78dd1b2788fd3e4cce8e129086a5553ab9f053 Mon Sep 17 00:00:00 2001
From: Camille Barneaud <camillebarneaud@gmail.com>
Date: Thu, 28 Feb 2013 19:17:06 +0100
Subject: [PATCH 2/3] Correct case of some icon

---
 share/images/icons/Chartbeat.png | Bin 0 -> 133 bytes
 share/images/icons/Cufon.png     | Bin 0 -> 758 bytes
 share/images/icons/SAP.png       | Bin 0 -> 454 bytes
 share/images/icons/Wink.png      | Bin 0 -> 436 bytes
 share/images/icons/Xajax.png     | Bin 0 -> 1000 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 share/images/icons/Chartbeat.png
 create mode 100644 share/images/icons/Cufon.png
 create mode 100644 share/images/icons/SAP.png
 create mode 100644 share/images/icons/Wink.png
 create mode 100644 share/images/icons/Xajax.png

diff --git a/share/images/icons/Chartbeat.png b/share/images/icons/Chartbeat.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cb597cc7ed6478bd165b27d0a3864f9bb5143d8
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uK$gMLFoT~wWBL10tFdM
zg8YIR9G=}s19G%HT^vI=t|uonFdw^cfr0JXg$n`_6S<T(ZE84j<%(ti(;3$wc9jEF
bjtmU4NBGwK3^Q;5>SFM8^>bP0l+XkKb$uxq

literal 0
HcmV?d00001

diff --git a/share/images/icons/Cufon.png b/share/images/icons/Cufon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd2e3f02990ac17fa7a351b4e7da90cb2f6090f5
GIT binary patch
literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008LNkl<ZILlR&
zJ&Pn&7=@qrz4umCcTc<Htj@TuftwgO(FURz2pWr_8yFY}W`YR&69h33BaO^-5it=&
zFcH~BG+9t&6Te4iduH7E*s1QS?y9=?y#}+O9yq}Xp5z>ke0cMhm*(Q%I?3fD-YZTa
z8FWLY@Paz9d%5(2bC6R)R>R&@x;Ny#@BeIPa^Fa*04kVe`rZhIA}Uz=H#;X}%M6_{
z3C4PRJoj@8BV7w1U}kJ8Y+oo45sv%JcZWSisi=ZkX6TJjDyB-S<<$4UB4sQku3V^i
zYNO!4dhWdEgWZn9&Uocw$(Kh1zpe~orfCfA%$RqP?UDWuZd0aBnT?=ay)@#*t%Ap<
zo|R?l&NyxpNeykHQ8$r?$I7j`=hNE_Ki=)ABy+3o`TB5$nQ{4?!^~Jlqh3am!jLn*
zZjEjPd&|g2e>9v7f)DW8r7_Q*FSz#Cl5fd8xgG#mEEBy5W>5`=wl=U5;fuY7{gsfM
z(xJTl^MYAB@cdTb{hgMS(wWuhG3G<!;B-Luo1Wb|@_Vhc_X?dadrs?~Pj*`>jE7w2
z^VyP=5{tpupAYQZ=~-ArEkn~L>I{dyaWL<A+#8=geU7O+oA&Zp_~xj?%s5>|>Ly`9
zPz4neib@FqlnhC@UK_9eaF;7vju<1)Y$!M912IPEBcW1!04IX3jXkaqL_ku;j};vk
z{InF_{cVN!p8Ko73!5c3P7JLS34jQSM<=C2oj?|J?2w=!LiPpMjv^l)^n?(2`O!5F
zOt?7l061VW5`3v=FqL3>b{tYBl}eU^H+PnNb*JNr2P$rNiCJf87ILYSN$^uk&9tz|
zkvd`qHKQ*T6Uf<7dgVr+xISB<q7(@jdDbPeX}0hW=H=_#tKpr$bC?cM5Y5N{IYWwq
oY6b-|V1l@eOR$lL#gugQA9=`!x3Bkh<NyEw07*qoM6N<$f|~+mW&i*H

literal 0
HcmV?d00001

diff --git a/share/images/icons/SAP.png b/share/images/icons/SAP.png
new file mode 100644
index 0000000000000000000000000000000000000000..9217c8f8778fbf43987e6c9bdf94ab76c63925e1
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2w>(5FusUd0zkk0aHmt
zK~y-)?UT<dg8>-FKkxRU2`#%Zl7xdFXE`k=C%^8BqjHv`iyMW56aD}rL@9D{VKsXt
z$(o|x2{qn#<K5=<dR(xEQXE`-&QITOeLp>li0~U+{F1*9P-~a;pO2s@n%by33^tYH
zFHzaMO0#g3V4&HDo_b{e(xR`y`+gsc8pKmJ00J5XY5?8LN;2~#p^Kz!NAF~0^IYB-
zT0IjHk(28O5fRyn8B#wHmiozXq;BTW3*a&>o6;gT&mt^FuIQ*KC7F2wp!>Bws9h5`
zvy`~OzRzf+9|N)BRs(?c@m&dq;$m9%d-L&SN<Ly*wv2B?Bh{lj-n<!>_jGCWmr>?X
zsVw(=xmEx4KB3sH=D3tVY^u}9vv6>7gUfLMSWBb<m|Z`m!dFaJTNMCC;z294vI9qR
wJ;o;yErZM7Y19xIJDl%b$=OqK0sp_i3us}$609}P-~a#s07*qoM6N<$f`XjDEC2ui

literal 0
HcmV?d00001

diff --git a/share/images/icons/Wink.png b/share/images/icons/Wink.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e7204032da80b5f8feebe0d8ef3275371cd4795
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004dNkl<ZILl*T
z7^;9>L_|c*(b3VEBwd1%l5zzF1=Zc%-G`=5oqD{zy?qH$8aX&P<ilbTIu34G^P;D_
z`>dXxUL{b>2`HtGS0hlNSZHW?-IgtzpZ;G^`2T-zz<)P4mja*^GhU5A|M5mgM`ul$
zGWk|wTIT=0rt1Iy6L|msud?{>;}@8UQzO5eoS=(;NMcKS*V)qYivMB~lK*+-)c#+X
z1hn0c;s3{p$-mVMO*~OF$;im)8XFtC)i>6+ZJgY8<NKaP{})g0`fp|L_&+8#`u~M#
zmH+?82><_|F8_aFXYCoF7I72<nwpx{RMpfTSi5%B^Zzqr|NnPo`2Rmi{Qv)2r~m&;
z4FCW42l1u;Ut8GzRa#9W9&1<uu{HxUTVQ=z;mKFi^Zx%YGynfTQ|bTzeBJ;5y2Jjj
zpIHAwRnMpzsE&tFj2S5D7_`PkN9``lO+A;H5_i<f-f1oa8<#&&j+^LI2E_6}tP8|y
eps-~a-T(lO=9RSj0s5u@0000<MNUMnLSTZLjogp`

literal 0
HcmV?d00001

diff --git a/share/images/icons/Xajax.png b/share/images/icons/Xajax.png
new file mode 100644
index 0000000000000000000000000000000000000000..bba0d40abf857893a87ce6de8a55dabc16aa31a1
GIT binary patch
literal 1000
zcmV<E0~h>>P)<h;3K|Lk000e1NJLTq000#L000mO1^@s6`Pwuk000B8Nkl<ZILnQc
z%WGV96vxjw_c0GAcQTL6BpJ1n#HK-mF=Ly?2i79RjYSZtN);lw(2cq)s90R6o4Ro4
z1N9%UO1lsQtJFxa?IbF(dDuW`?93#Y_uM;~+<SlbcU*KPbVQ^Fe(>9z&w2cQ-!C#V
z+-Be{_y0|z+k`3Hjy6#FSCOtz_ewLj4*&pTJBa|mBO(tGg8<Mgr7R<&jfmvBF0=~)
z5rL|z-OxtE1k18ectR1b@EqG_UDw3$$jE>Mc(q=yA4Gt7Bpi+az&F5r`tp^mZJMUa
z%w95);7n!`n7OM{l2U>co?wM^5%AyZNtsz%S$*wlcD`QB<>&RDP&GX|x_^A~fm4Zi
zY;4!IpK)wQFaQc6u(Rt96cJG}bJ!+)qrCjrbHyKjNt%mG;ryj+%NGn-x)GYHRx7w>
zw<@!Dr<M-A`25qHPG2O$IM0s#6#$glD`RA40svVlmq#|MweQWj?1=TlthCmz!`9*=
zQluAs$v8xhKMB`9`2s{xhwU315EvK$tuI=QA3N3<K6=znMk7y6Ox%BsnTa~D*b?Hy
zom^pL`=ih7=`-&^|4Yx(ftiyqv;I3L9)FaRqxbL=pMK0Q|8bd(u`zyg{#TipIu!Zs
z{SPdsR*PwV|C!FzY6ptUCI)=4pqOl&`xYCy0*C<N+~;4);J!P-NDV;g&lSj>`ws6L
zpM=7NpJ7xrpl>L%ON#18fa2aNnHd3q%jHU}T(6(~dwKcDPw$@IEiGh~BQvikjr=Bs
zjW7&mCSl>NcOXc9P*p$Q5$hA71N%4lh2ts>-*vS=5;>W9FjHe@#EznBwK_B!b;V^k
zQLEQa<ga8W0?g^{t?h;D7cRQWMqckRdcjf17nvAOMh;G{Sy5xIC(=7BcUtEY{Yg1}
zcnX*q_Mp{j4Nc2L;kwfEB!Q-d;<4!4n>TW=7fYoT)3VmBR!d6^4&(+?sY`3Ct7p*>
zCIYkL3QYDVVfyeCcl}dDWFm!0VO2_3vg0(Q<D5#T_kEp84L-Kp+O>&r#W0M;a;dzf
zO90SRLL_2DucM|eMTNr#^z?*4Q4~?w+=NEGfeZjr%6TGM(tNtEsj8#tdJBlq5ia=s
ze)-754}qd60EnIDx;h1-oBkp_38rOnB9RCdi=|{CUr=h5iqmZExPz&bFBXe6P1Cf6
z5TI$=P3Wx-^k3H3Y&M}`n#husQmG_&YBdSX7EmaNo~lwj9tT8}M8rcwX+Z2YtbYJ%
WJl|b)e_1X70000<MNUMnLSTaCwAso4

literal 0
HcmV?d00001


From dfdb07a55243b7a9338b2b075493b88fb5e2a56f Mon Sep 17 00:00:00 2001
From: Camille Barneaud <camillebarneaud@gmail.com>
Date: Thu, 28 Feb 2013 21:03:37 +0100
Subject: [PATCH 3/3] Relocalise some code

---
 drivers/chrome/js/driver.js          | 15 +++++++++++----
 drivers/firefox/content/js/driver.js | 23 ++++++++++++++++++-----
 share/js/wappalyzer.js               | 20 +-------------------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index fe4b3d023..c9490deb5 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -18,7 +18,7 @@
 		/**
 		 * Initialize
 		 */
-		init: function(callback) {
+		init: function() {
 			w.log('init');
 
 			chrome.browserAction.setBadgeBackgroundColor({ color: [255, 102, 0, 255] });
@@ -44,14 +44,14 @@
 				var version = chrome.app.getDetails().version;
 
 				if ( localStorage['version'] == null ) {
-					w.config.firstRun = true;
+					firstRun = true;
 
 					// Set defaults
 					for ( option in defaults ) {
 						localStorage[option] = defaults[option];
 					}
 				} else if ( version !== localStorage['version'] && localStorage['upgradeMessage'] ) {
-					w.config.upgraded = true;
+					upgraded = true;
 				}
 
 				localStorage['version'] = version;
@@ -112,7 +112,14 @@
 				tabCache[tabId] = null;
 			});
 
-			callback();
+			if ( firstRun ) {
+				driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
+					firstRun = false;
+				}
+			if ( upgraded ) {
+				driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
+				upgraded = false;
+			}
 		},
 
 		goToURL: function(args) {
diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js
index 19ea3c3b6..f6e910b4b 100644
--- a/drivers/firefox/content/js/driver.js
+++ b/drivers/firefox/content/js/driver.js
@@ -7,7 +7,10 @@
 
 	if ( wappalyzer == null ) return;
 
-	var w = wappalyzer, prefs, strings;
+	var w = wappalyzer,
+		firstRun = false,
+		upgraded = false,
+		prefs, strings;
 
 	const
 		d  = document,
@@ -30,7 +33,7 @@
 		/**
 		 * Initialize
 		 */
-		init: function(callback) {
+		init: function() {
 			var handler = function() {
 				window.removeEventListener('load', handler, false);
 
@@ -68,9 +71,9 @@
 					addon.version = addon.version;
 
 					if ( !prefs.getCharPref('version') ) {
-						w.config.firstRun = true;
+						firstRun = true;
 					} else if ( prefs.getCharPref('version') != addon.version ) {
-						w.config.upgraded = true;
+						upgraded = true;
 					}
 
 					prefs.setCharPref('version', addon.version);
@@ -109,7 +112,17 @@
 
 					gBrowser.tabContainer.addEventListener('TabSelect', w.driver.displayApps, false);
 
-					callback();
+					if ( firstRun ) {
+						driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
+
+						firstRun = false;
+					}
+
+					if ( upgraded ) {
+						driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
+
+						upgraded = false;
+					}
 				});
 			};
 
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 6257ac81e..7a4913cee 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -172,15 +172,9 @@ var wappalyzer = (function() {
 
 		config: {
 			environment: 'dev', // dev | live
-
-			version: false,
-
 			websiteURL: 'http://wappalyzer.com/',
 			twitterURL: 'https://twitter.com/Wappalyzer',
 			githubURL:  'https://github.com/ElbertF/Wappalyzer',
-
-			firstRun: false,
-			upgraded: false
 		},
 
 		/**
@@ -214,19 +208,7 @@ var wappalyzer = (function() {
 			}
 
 			// Initialize driver
-			driver('init', function() {
-				if ( w.config.firstRun ) {
-					driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
-
-					w.config.firstRun = false;
-				}
-
-				if ( w.config.upgraded ) {
-					driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
-
-					w.config.upgraded = false;
-				}
-			});
+			driver('init');
 		},
 
 		/**