Merge branch 'master' of github.com:ElbertF/Wappalyzer

drivers/bookmarklet/js/apps.js

@@ -2632,7 +2632,7 @@ var json =
 			"cats": [ 11 ],
 			"html": "<iframe src=\"[^>]+tumblr\\.com",
 			"url": "^https?://(?:www\\.)?[^/]+\\.tumblr\\.com/",
-			"headers": { "X-Tumblr-Usec": ".*" }
+			"headers": { "X-Tumblr-User": ".*" }
 		},
 		"TWiki": {
 			"website": "twiki.org",

drivers/ruby/wappalyzer.rb

@@ -23,7 +23,7 @@ class Wappalyzer
     end
 
     cxt = V8::Context.new
-    cxt.load File.join(@realdir, '..', 'php', 'js', 'wappalyzer.js')
+    cxt.load File.join(@realdir, '..', '..', 'share', 'js', 'wappalyzer.js')
     cxt.load File.join(@realdir, '..', 'php', 'js', 'driver.js')
     data = {'host' => uri.hostname, 'url' => url, 'html' => body, 'headers' => headers}
     output = cxt.eval("w.apps = #{@apps.to_json}; w.categories = #{@categories.to_json}; w.driver.data = #{data.to_json}; w.driver.init();")

share/apps.json

@@ -929,6 +929,12 @@
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
+		"Fat-Free Framework": {
+			"website": "fatfreeframework.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Fat-Free Framework" },
+			"implies": [ "PHP" ]
+		},
 		"Fedora": {
 			"website": "fedoraproject.org",
 			"cats": [ 28 ],
@@ -2655,7 +2661,7 @@
 			"cats": [ 11 ],
 			"html": "<iframe src=\"[^>]+tumblr\\.com",
 			"url": "^https?://(?:www\\.)?[^/]+\\.tumblr\\.com/",
-			"headers": { "X-Tumblr-Usec": ".*" }
+			"headers": { "X-Tumblr-User": ".*" }
 		},
 		"TWiki": {
 			"website": "twiki.org",