From 263b2f98caca171d9a93735baa31dcff598970ce Mon Sep 17 00:00:00 2001
From: Benoit Pointet <benoit.pointet@liip.ch>
Date: Sun, 30 Oct 2011 18:33:02 +0100
Subject: [PATCH] added Graphics category, moved d3, protovis and raphael to it

---
 chrome/content/apps.js             | 9 +++++----
 chrome/content/options.xul         | 6 ++++++
 chrome/content/wappalyzer.js       | 3 ++-
 chrome/locale/en-US/wappalyzer.dtd | 2 +-
 defaults/preferences/defaults.js   | 1 +
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/chrome/content/apps.js b/chrome/content/apps.js
index dd6957a77..d7bf14845 100644
--- a/chrome/content/apps.js
+++ b/chrome/content/apps.js
@@ -23,7 +23,8 @@ if ( typeof wappalyzer != 'undefined' ) {
 		21: { name: 'LMS',                  plural: 'LMS' },
 		22: { name: 'Web server',           plural: 'Web servers' },
 		23: { name: 'Cache tool',           plural: 'Cache tools' },
-		24: { name: 'Rich text editor',     plural: 'Rich text editors' }
+		24: { name: 'Rich text editor',     plural: 'Rich text editors' },
+		25: { name: 'Graphics',             plural: 'Graphics' }
 	};
 
 	wappalyzer.apps = {
@@ -64,7 +65,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'CS Cart':               { cats: { 1:  6 }, html: /&nbsp;Powered by (<a href=.http:\/\/www\.cs\-cart\.com|CS\-Cart)/i },
 		'CubeCart':              { cats: { 1:  6 }, html: /Powered by <a href=.http:\/\/www\.cubecart\.com/i },
 		'cufon':                 { cats: { 1: 17 }, html: /(<script[^>]* src=("|')[^>]*cufon\-yui\.js|<script[^>]*>[^<]+Cufon\.now\(\))/i },
-		'd3':                    { cats: { 1: 12 }, html: /<script[^>]*src=[^>]+d3[^>]*\.js/i, env: 'd3' },
+		'd3':                    { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+d3[^>]*\.js/i, env: 'd3' },
 		'Danneo CMS':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Danneo/i },
 		'DataLife Engine':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+DataLife Engine/i },
 		'DHTMLX':                { cats: { 1: 12 }, html: /<script [^>]+dhtmlxcommon\.js/i },
@@ -156,11 +157,11 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'posterous':             { cats: { 1:  1, 2: 11 }, html: /<div class=("|')posterous/i },
 		'Prestashop':            { cats: { 1:  6 }, html: /(<meta name=("|')generator("|') [^>]+PrestaShop|Powered by <a href=("|')[^>]+PrestaShop)/i },
 		'Prototype':             { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*(prototype|protoaculous)\.js("|')/i, env: /^Prototype$/ },
-		'Protovis':              { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*protovis[^>]*\.js/i, env: /^protovis$/ },
+		'Protovis':              { cats: { 1: 25 }, html: /<script[^>]* src=("|')[^>]*protovis[^>]*\.js/i, env: /^protovis$/ },
 		'punBB':                 { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+punbb/i },
 		'Quantcast':             { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/edge\.quantserve\.com\/quant\.js("|')>/i, env: /^quantserve$/ },
 		'Quick.Cart':            { cats: { 1:  6 }, html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
-		'Raphael':               { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*raphael[^>]*\.js/i, env: /^Raphael$/ },
+		'Raphael':               { cats: { 1: 25 }, html: /<script[^>]* src=("|')[^>]*raphael[^>]*\.js/i, env: /^Raphael$/ },
 		'reCAPTCHA':             { cats: { 1: 16 }, html: /(<div[^>]+id=("|')recaptcha_image|<script[^>]+ src=("|')(api\-secure\.recaptcha\.net|recaptcha_ajax\.js))/ },
 		'Reddit':                { cats: { 1:  2 }, html: /(<script[^>]+>var reddit = {|<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)/i, url: /^(www.)?reddit\.com/ },
 		'Redmine':               { cats: { 1: 13 }, html: /(<meta name=("|')description("|')Redmine("|')|Powered by <a href=("|')[^>]+Redmine)/i },
diff --git a/chrome/content/options.xul b/chrome/content/options.xul
index 0fd6d8983..931b6dc36 100755
--- a/chrome/content/options.xul
+++ b/chrome/content/options.xul
@@ -44,6 +44,7 @@
 			<preference id="wappalyzer-cat22"           name="wappalyzer.cat22"          type="bool"  />
 			<preference id="wappalyzer-cat23"           name="wappalyzer.cat23"          type="bool"  />
 			<preference id="wappalyzer-cat24"           name="wappalyzer.cat24"          type="bool"  />
+			<preference id="wappalyzer-cat25"           name="wappalyzer.cat25"          type="bool"  />
 		</preferences>
 
 		<tabbox>
@@ -219,6 +220,11 @@
 										<checkbox preference="wappalyzer-cat24" id="wappalyzer-option-cat24" label="&wappalyzer.cat24;"/>
 									</hbox>
 								</row>
+								<row>
+									<hbox align="center">
+										<checkbox preference="wappalyzer-cat25" id="wappalyzer-option-cat25" label="&wappalyzer.cat25;"/>
+									</hbox>
+								</row>
 							</rows>
 						</grid>
 					</groupbox>
diff --git a/chrome/content/wappalyzer.js b/chrome/content/wappalyzer.js
index bde16888a..7f3007120 100644
--- a/chrome/content/wappalyzer.js
+++ b/chrome/content/wappalyzer.js
@@ -50,7 +50,7 @@ var wappalyzer = (function() {
 			self.newInstall     = self.prefs.getBoolPref('newInstall');
 			self.version        = self.prefs.getCharPref('version');
 
-			for ( var i = 1; i <= 24; i ++ ) {
+			for ( var i = 1; i <= 25; i ++ ) {
 				self.showCats[i] = self.prefs.getBoolPref('cat' + i);
 			}
 
@@ -166,6 +166,7 @@ var wappalyzer = (function() {
 				case 'cat22': self.showCats[22] = self.prefs.getIntPref('cat22'); break;
 				case 'cat23': self.showCats[23] = self.prefs.getIntPref('cat23'); break;
 				case 'cat24': self.showCats[24] = self.prefs.getIntPref('cat24'); break;
+				case 'cat25': self.showCats[25] = self.prefs.getIntPref('cat25'); break;
 			}
 		},
 
diff --git a/chrome/locale/en-US/wappalyzer.dtd b/chrome/locale/en-US/wappalyzer.dtd
index c0c5ba56e..b9182bcb2 100755
--- a/chrome/locale/en-US/wappalyzer.dtd
+++ b/chrome/locale/en-US/wappalyzer.dtd
@@ -47,4 +47,4 @@
 <!ENTITY wappalyzer.cat22          "Web servers">
 <!ENTITY wappalyzer.cat23          "Cache tools">
 <!ENTITY wappalyzer.cat24          "Rich text editors">
-
+<!ENTITY wappalyzer.cat25          "Graphics">
diff --git a/defaults/preferences/defaults.js b/defaults/preferences/defaults.js
index 41efa0c06..44fe72afc 100644
--- a/defaults/preferences/defaults.js
+++ b/defaults/preferences/defaults.js
@@ -32,3 +32,4 @@ pref('wappalyzer.cat21',          true);
 pref('wappalyzer.cat22',          true);
 pref('wappalyzer.cat23',          true);
 pref('wappalyzer.cat24',          true);
+pref('wappalyzer.cat25',          true);