Fixed Django pattern, added version detection to PHP driver

drivers/bookmarklet/json

@@ -492,7 +492,7 @@
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django[^\\;]=" },
+			"headers": { "Set-Cookie": "django[^;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {

drivers/chrome/apps.json

@@ -492,7 +492,7 @@
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django[^\\;]=" },
+			"headers": { "Set-Cookie": "django[^;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {

drivers/chrome/js/content.js

@@ -49,7 +49,7 @@
 
 					c.log('getEnvironmentVars: ' + environmentVars);
 
-					environmentVars = environmentVars.split(' ');
+					environmentVars = environmentVars.split(' ').slice(0, 500);
 
 					chrome.extension.sendRequest({ id: 'analyze', subject: { env: environmentVars } });
 				}), true);

drivers/chrome/manifest.json

@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=context&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.17",
+	"version": "2.18",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {

drivers/firefox-jetpack/data/apps.json

@@ -492,7 +492,7 @@
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django[^\\;]=" },
+			"headers": { "Set-Cookie": "django[^;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {

drivers/firefox/content/apps.json

@@ -492,7 +492,7 @@
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django[^\\;]=" },
+			"headers": { "Set-Cookie": "django[^;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {

drivers/firefox/install.rdf

@@ -3,7 +3,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>wappalyzer@crunchlabz.com</em:id>
-		<em:version>2.6.2</em:version>
+		<em:version>2.7.0</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 

drivers/html/apps.json

@@ -492,7 +492,7 @@
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django[^\\;]=" },
+			"headers": { "Set-Cookie": "django[^;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {

drivers/php/apps.json

@@ -492,7 +492,7 @@
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django[^\\;]=" },
+			"headers": { "Set-Cookie": "django[^;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {

drivers/php/index.php

@@ -22,7 +22,7 @@ try {
 
 	if ( $detectedApps ) {
 		foreach ( $detectedApps as $detectedApp => $data ) {
-			echo $detectedApp . ', ' . $data->confidence . '%, ', implode(', ', $data->categories) . "\n";
+			echo $detectedApp . ', ' . $data->version . ', ', $data->confidence . '%, ', implode(', ', $data->categories) . "\n";
 		}
 	} else {
 		echo "No applications detected\n";

drivers/php/js/driver.js

@@ -25,7 +25,8 @@ w.driver = {
 		for ( app in w.detected[w.driver.data.url] ) {
 			apps[app] = {
 				categories: [],
-				confidence: w.detected[w.driver.data.url][app].confidenceTotal
+				confidence: w.detected[w.driver.data.url][app].confidenceTotal,
+				version:    w.detected[w.driver.data.url][app].version
 				};
 
 			w.apps[app].cats.map(function(cat) {

share/apps.json

@@ -492,7 +492,7 @@
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django[^\\;]=" },
+			"headers": { "Set-Cookie": "django[^;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {