Improved preferences screen

drivers/bookmarklet/js/apps.js

@@ -56,6 +56,11 @@
 			cats: [ 1 ],
 			meta: { 'generator': /2z project/i }
 		},
+		'Accessible Portal': { 
+		    cats:    [ 1 ],
+		    meta:    { 'generator': /Accessible Portal/i },
+		    implies: [ 'PHP' ]
+	    },
 		'AddThis': {
 			cats: [ 5 ],
 			script: /addthis\.com\/js/,
@@ -358,6 +363,11 @@
 			env: /CE2/,
 			script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js/
 		},
+		'Cross Pixel': {
+			cats: [ 10 ],
+			env: /^crsspxl$/,
+			script: /http\:\/\/tag\.crsspxl\.com\/s1\.js/i
+		},
 		'CS Cart': {
 			cats: [ 6 ],
 			env: /fn_compare_strings/i,
@@ -880,6 +890,10 @@
 			cats: [ 1 ],
 			meta: { 'generator': /MaxSite CMS/i }
 		},
+		'MediaElement.js': {
+			cats: [ 14 ],
+			env: /^mejs$/
+		},
 		'MediaWiki': {
 			cats: [ 8 ],
 			meta: { 'generator': /MediaWiki/i },
@@ -1154,6 +1168,10 @@
 			cats: [ 19 ],
 			html: /<iframe src="http:\/\/pluraserver\.com/
 		},
+		'Po.st': {
+			cats: [ 5 ],
+			env: /^pwidget_config$/
+		},		
 		'Posterous': {
 			cats: [ 1, 11 ],
 			html: /<div class=("|')posterous/i,
@@ -1379,8 +1397,13 @@
 			cats: [ 6 ],
 			html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
 		},
+<<<<<<< HEAD
 		'SublimeVideo': {
 		    cats:    [ 14, 31 ],
+=======
+		'SublimeVideo': { 
+		    cats:    [ 14 ],
+>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
 		    script:  /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
 		    env:     /^sublimevideo$/
 	    },

drivers/chrome/js/apps.js

@@ -56,6 +56,11 @@
 			cats: [ 1 ],
 			meta: { 'generator': /2z project/i }
 		},
+		'Accessible Portal': { 
+		    cats:    [ 1 ],
+		    meta:    { 'generator': /Accessible Portal/i },
+		    implies: [ 'PHP' ]
+	    },
 		'AddThis': {
 			cats: [ 5 ],
 			script: /addthis\.com\/js/,
@@ -358,6 +363,11 @@
 			env: /CE2/,
 			script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js/
 		},
+		'Cross Pixel': {
+			cats: [ 10 ],
+			env: /^crsspxl$/,
+			script: /http\:\/\/tag\.crsspxl\.com\/s1\.js/i
+		},
 		'CS Cart': {
 			cats: [ 6 ],
 			env: /fn_compare_strings/i,
@@ -880,6 +890,10 @@
 			cats: [ 1 ],
 			meta: { 'generator': /MaxSite CMS/i }
 		},
+		'MediaElement.js': {
+			cats: [ 14 ],
+			env: /^mejs$/
+		},
 		'MediaWiki': {
 			cats: [ 8 ],
 			meta: { 'generator': /MediaWiki/i },
@@ -1154,6 +1168,10 @@
 			cats: [ 19 ],
 			html: /<iframe src="http:\/\/pluraserver\.com/
 		},
+		'Po.st': {
+			cats: [ 5 ],
+			env: /^pwidget_config$/
+		},		
 		'Posterous': {
 			cats: [ 1, 11 ],
 			html: /<div class=("|')posterous/i,
@@ -1379,8 +1397,13 @@
 			cats: [ 6 ],
 			html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
 		},
+<<<<<<< HEAD
 		'SublimeVideo': {
 		    cats:    [ 14, 31 ],
+=======
+		'SublimeVideo': { 
+		    cats:    [ 14 ],
+>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
 		    script:  /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
 		    env:     /^sublimevideo$/
 	    },

drivers/firefox/content/js/apps.js

@@ -56,6 +56,11 @@
 			cats: [ 1 ],
 			meta: { 'generator': /2z project/i }
 		},
+		'Accessible Portal': { 
+		    cats:    [ 1 ],
+		    meta:    { 'generator': /Accessible Portal/i },
+		    implies: [ 'PHP' ]
+	    },
 		'AddThis': {
 			cats: [ 5 ],
 			script: /addthis\.com\/js/,
@@ -358,6 +363,11 @@
 			env: /CE2/,
 			script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js/
 		},
+		'Cross Pixel': {
+			cats: [ 10 ],
+			env: /^crsspxl$/,
+			script: /http\:\/\/tag\.crsspxl\.com\/s1\.js/i
+		},
 		'CS Cart': {
 			cats: [ 6 ],
 			env: /fn_compare_strings/i,
@@ -880,6 +890,10 @@
 			cats: [ 1 ],
 			meta: { 'generator': /MaxSite CMS/i }
 		},
+		'MediaElement.js': {
+			cats: [ 14 ],
+			env: /^mejs$/
+		},
 		'MediaWiki': {
 			cats: [ 8 ],
 			meta: { 'generator': /MediaWiki/i },
@@ -1154,6 +1168,10 @@
 			cats: [ 19 ],
 			html: /<iframe src="http:\/\/pluraserver\.com/
 		},
+		'Po.st': {
+			cats: [ 5 ],
+			env: /^pwidget_config$/
+		},		
 		'Posterous': {
 			cats: [ 1, 11 ],
 			html: /<div class=("|')posterous/i,
@@ -1379,8 +1397,13 @@
 			cats: [ 6 ],
 			html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
 		},
+<<<<<<< HEAD
 		'SublimeVideo': {
 		    cats:    [ 14, 31 ],
+=======
+		'SublimeVideo': { 
+		    cats:    [ 14 ],
+>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
 		    script:  /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
 		    env:     /^sublimevideo$/
 	    },

drivers/firefox/content/js/content.js

@@ -51,11 +51,18 @@
 		sendAsyncMessage('wappalyzer', {
 			action:   'analyze',
 			hostname: content.location.hostname,
+<<<<<<< HEAD
 			url:      content.location.href,
 			analyze:  {
 				html: html,
 				env:  prefs.analyzeJavaScript ? Object.keys(content.wrappedJSObject) : []
 				}
 			});
+=======
+			html:     html,
+			url:      content.location.href,
+			env: 	  Object.keys(content.wrappedJSObject)
+		});
+>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
 	}
 })();

drivers/html/js/apps.js

@@ -56,6 +56,11 @@
 			cats: [ 1 ],
 			meta: { 'generator': /2z project/i }
 		},
+		'Accessible Portal': { 
+		    cats:    [ 1 ],
+		    meta:    { 'generator': /Accessible Portal/i },
+		    implies: [ 'PHP' ]
+	    },
 		'AddThis': {
 			cats: [ 5 ],
 			script: /addthis\.com\/js/,
@@ -358,6 +363,11 @@
 			env: /CE2/,
 			script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js/
 		},
+		'Cross Pixel': {
+			cats: [ 10 ],
+			env: /^crsspxl$/,
+			script: /http\:\/\/tag\.crsspxl\.com\/s1\.js/i
+		},
 		'CS Cart': {
 			cats: [ 6 ],
 			env: /fn_compare_strings/i,
@@ -880,6 +890,10 @@
 			cats: [ 1 ],
 			meta: { 'generator': /MaxSite CMS/i }
 		},
+		'MediaElement.js': {
+			cats: [ 14 ],
+			env: /^mejs$/
+		},
 		'MediaWiki': {
 			cats: [ 8 ],
 			meta: { 'generator': /MediaWiki/i },
@@ -1154,6 +1168,10 @@
 			cats: [ 19 ],
 			html: /<iframe src="http:\/\/pluraserver\.com/
 		},
+		'Po.st': {
+			cats: [ 5 ],
+			env: /^pwidget_config$/
+		},		
 		'Posterous': {
 			cats: [ 1, 11 ],
 			html: /<div class=("|')posterous/i,
@@ -1379,8 +1397,13 @@
 			cats: [ 6 ],
 			html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
 		},
+<<<<<<< HEAD
 		'SublimeVideo': {
 		    cats:    [ 14, 31 ],
+=======
+		'SublimeVideo': { 
+		    cats:    [ 14 ],
+>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
 		    script:  /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
 		    env:     /^sublimevideo$/
 	    },

drivers/php/js/apps.js

@@ -56,6 +56,11 @@
 			cats: [ 1 ],
 			meta: { 'generator': /2z project/i }
 		},
+		'Accessible Portal': { 
+		    cats:    [ 1 ],
+		    meta:    { 'generator': /Accessible Portal/i },
+		    implies: [ 'PHP' ]
+	    },
 		'AddThis': {
 			cats: [ 5 ],
 			script: /addthis\.com\/js/,
@@ -358,6 +363,11 @@
 			env: /CE2/,
 			script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js/
 		},
+		'Cross Pixel': {
+			cats: [ 10 ],
+			env: /^crsspxl$/,
+			script: /http\:\/\/tag\.crsspxl\.com\/s1\.js/i
+		},
 		'CS Cart': {
 			cats: [ 6 ],
 			env: /fn_compare_strings/i,
@@ -880,6 +890,10 @@
 			cats: [ 1 ],
 			meta: { 'generator': /MaxSite CMS/i }
 		},
+		'MediaElement.js': {
+			cats: [ 14 ],
+			env: /^mejs$/
+		},
 		'MediaWiki': {
 			cats: [ 8 ],
 			meta: { 'generator': /MediaWiki/i },
@@ -1154,6 +1168,10 @@
 			cats: [ 19 ],
 			html: /<iframe src="http:\/\/pluraserver\.com/
 		},
+		'Po.st': {
+			cats: [ 5 ],
+			env: /^pwidget_config$/
+		},		
 		'Posterous': {
 			cats: [ 1, 11 ],
 			html: /<div class=("|')posterous/i,
@@ -1379,8 +1397,13 @@
 			cats: [ 6 ],
 			html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
 		},
+<<<<<<< HEAD
 		'SublimeVideo': {
 		    cats:    [ 14, 31 ],
+=======
+		'SublimeVideo': { 
+		    cats:    [ 14 ],
+>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
 		    script:  /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
 		    env:     /^sublimevideo$/
 	    },

share/js/apps.js

@@ -56,6 +56,11 @@
 			cats: [ 1 ],
 			meta: { 'generator': /2z project/i }
 		},
+		'Accessible Portal': { 
+		    cats:    [ 1 ],
+		    meta:    { 'generator': /Accessible Portal/i },
+		    implies: [ 'PHP' ]
+	    },
 		'AddThis': {
 			cats: [ 5 ],
 			script: /addthis\.com\/js/,
@@ -358,6 +363,11 @@
 			env: /CE2/,
 			script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js/
 		},
+		'Cross Pixel': {
+			cats: [ 10 ],
+			env: /^crsspxl$/,
+			script: /http\:\/\/tag\.crsspxl\.com\/s1\.js/i
+		},
 		'CS Cart': {
 			cats: [ 6 ],
 			env: /fn_compare_strings/i,
@@ -880,6 +890,10 @@
 			cats: [ 1 ],
 			meta: { 'generator': /MaxSite CMS/i }
 		},
+		'MediaElement.js': {
+			cats: [ 14 ],
+			env: /^mejs$/
+		},
 		'MediaWiki': {
 			cats: [ 8 ],
 			meta: { 'generator': /MediaWiki/i },
@@ -1154,6 +1168,10 @@
 			cats: [ 19 ],
 			html: /<iframe src="http:\/\/pluraserver\.com/
 		},
+		'Po.st': {
+			cats: [ 5 ],
+			env: /^pwidget_config$/
+		},		
 		'Posterous': {
 			cats: [ 1, 11 ],
 			html: /<div class=("|')posterous/i,
@@ -1379,8 +1397,13 @@
 			cats: [ 6 ],
 			html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
 		},
+<<<<<<< HEAD
 		'SublimeVideo': {
 		    cats:    [ 14, 31 ],
+=======
+		'SublimeVideo': { 
+		    cats:    [ 14 ],
+>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
 		    script:  /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
 		    env:     /^sublimevideo$/
 	    },