From 22925b741824b5e4bb521e460bf53936fa63f014 Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Sat, 20 Oct 2012 15:33:27 +1100 Subject: [PATCH] Improved patterns --- drivers/bookmarklet/images/icons/Hiawatha.png | Bin 374 -> 664 bytes drivers/bookmarklet/json | 24 ++++++++++-------- drivers/chrome/apps.json | 24 ++++++++++-------- drivers/chrome/images/icons/Hiawatha.png | Bin 374 -> 664 bytes drivers/firefox-jetpack/data/apps.json | 24 ++++++++++-------- .../firefox-jetpack/images/icons/Hiawatha.png | Bin 374 -> 664 bytes drivers/firefox/content/apps.json | 24 ++++++++++-------- drivers/firefox/content/js/driver.js | 10 +++++--- drivers/firefox/install.rdf | 2 +- .../firefox/skin/images/icons/Hiawatha.png | Bin 374 -> 664 bytes drivers/html/apps.json | 24 ++++++++++-------- drivers/html/images/icons/Hiawatha.png | Bin 374 -> 664 bytes drivers/php/apps.json | 24 ++++++++++-------- share/apps.json | 23 +++++++++-------- share/images/icons/Hiawatha.png | Bin 374 -> 664 bytes 15 files changed, 105 insertions(+), 74 deletions(-) diff --git a/drivers/bookmarklet/images/icons/Hiawatha.png b/drivers/bookmarklet/images/icons/Hiawatha.png index 90ca84ea1bee4b836c74f2b22b2c207d3274de39..5f2dade9b53ae78f16186cc42dd4e07bf039dd58 100644 GIT binary patch delta 651 zcmV;60(AZM0+4&ikBmUZ~Mg5CB7PpdY4IAfX^4!2=*`&TF-R z8BpboqFbY98eRe+0bu~04Row(J_sv)u&=VVz~FzSW^uheiCR3viE7{4=nECSn`gl1 z1h0$nikAr12Y>1S@sW}z6-UT}GTE96(*xkUTz}DDfJ6W;PN528vrb7(dFMmKf^amiSX{j)KzkcIsp@{5k zMvFy2TF|~5JZ)H}i5_32!+(u0m5lMcAGU8n-!X|?TIT+m35E?lpF`b#h5*#54)C<0 z+jMAYU=G-o385D)q_O7#05W=(yYVEgC{%+Tkx#=y`H9&ym=bIP%jKjiH_FwW+|hDY90VR#^>DhI+421x z%6*2E0!siUZ1cn8@4O$pM_0*#z-BNiVV4cECQQEKu-oGGN6Gw?PrS&ikZJMKJk-uW lEXo96+6`DMLUaj!0Z7HgX`FPXN&o-=07*qoL%{OdOtd zUY~YfrBEHEf<&(a9j}TUuv8wgR35Ta9RNa->)Iy03_qJvE`Zf zuq-R~00001bW%=J06^y0W&i*Hb4f%&R2b7^U|?WSWk3UZ=mKIqXaX_@Xab@tj6i@S zplrgZDJ>v`BwwOr$gL|Y$iT}E7t!Y6;$%fOg~?pRl7T@I#?`W5WR_rHu!74QGw>Oi znxR?EX0D^bk1Qaiz@R9OETG21AdI3#T_4R1c{wNp0A<7m?B##G6951J07*qoM6N<$ Ef@?L9Z2$lO diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json index 6b58f6e24..77cc9aaff 100644 --- a/drivers/bookmarklet/json +++ b/drivers/bookmarklet/json @@ -255,7 +255,7 @@ }, "ClickTale": { "cats": [ "10" ], - "html": "f\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", + "html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", "env": "^ClickTale" }, "Clicky": { @@ -265,7 +265,8 @@ }, "CloudFlare": { "cats": [ "31" ], - "headers": { "Server": "cloudflare" } + "headers": { "Server": "cloudflare" }, + "env": "^CloudFlare$" }, "CMS Made Simple": { "cats": [ "1" ], @@ -491,7 +492,7 @@ }, "Drupal Commerce": { "cats": [ "6" ], - "html": "d=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", + "html": "id=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", "implies": [ "PHP", "Drupal" ] }, "Dynamicweb": { @@ -533,6 +534,7 @@ "eZ Publish": { "cats": [ "1", "6" ], "meta": { "generator": "eZ Publish" }, + "headers": { "X-Powered-By": "^eZ Publish$" }, "implies": [ "PHP" ] }, "Fact Finder": { @@ -675,7 +677,7 @@ }, "IBM WebSphere Portal": { "cats": [ "1" ], - "headers": { "BM-Web2-Location": ".*" }, + "headers": { "IBM-Web2-Location": ".*" }, "url": "/wps/", "implies": [ "Java" ] }, @@ -698,7 +700,7 @@ }, "ImpressPages": { "cats": [ "1" ], - "meta": { "generator": "impressPages" }, + "meta": { "generator": "ImpressPages" }, "implies": [ "PHP" ] }, "Indexhibit": { @@ -708,12 +710,12 @@ }, "InstantCMS": { "cats": [ "1" ], - "meta": { "generator": "nstantCMS" } + "meta": { "generator": "InstantCMS" } }, "Intershop": { "cats": [ "6" ], - "url": "s-bin|INTERSHOP", - "script": "s-bin|INTERSHOP" + "url": "is-bin|INTERSHOP", + "script": "is-bin|INTERSHOP" }, "IPB": { "cats": [ "2" ], @@ -949,6 +951,8 @@ "Moodle": { "cats": [ "21" ], "html": "(var moodleConfigFn = function\\(me\\)|]+moodlelogo)", + "headers": { "Set-Cookie": "MoodleSession" }, + "env": "^moodle", "implies": [ "PHP" ] }, "Moogo": { @@ -1511,7 +1515,7 @@ "vBulletin": { "cats": [ "2" ], "meta": { "generator": "vBulletin" }, - "env": "^(vBulletin|vB_)" + "env": "^(vBulletin|vB_[^g])" }, "viennaCMS": { "cats": [ "1" ], @@ -1523,7 +1527,7 @@ }, "Vimeo": { "cats": [ "14" ], - "html": "<(param|embed)[^>]+vimeo\\.com/moogaloop" + "html": "(<(param|embed)[^>]+vimeo\\.com/moogaloop|]player\.vimeo\.com)" }, "VirtueMart": { "cats": [ "6" ], diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json index 6b58f6e24..77cc9aaff 100644 --- a/drivers/chrome/apps.json +++ b/drivers/chrome/apps.json @@ -255,7 +255,7 @@ }, "ClickTale": { "cats": [ "10" ], - "html": "f\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", + "html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", "env": "^ClickTale" }, "Clicky": { @@ -265,7 +265,8 @@ }, "CloudFlare": { "cats": [ "31" ], - "headers": { "Server": "cloudflare" } + "headers": { "Server": "cloudflare" }, + "env": "^CloudFlare$" }, "CMS Made Simple": { "cats": [ "1" ], @@ -491,7 +492,7 @@ }, "Drupal Commerce": { "cats": [ "6" ], - "html": "d=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", + "html": "id=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", "implies": [ "PHP", "Drupal" ] }, "Dynamicweb": { @@ -533,6 +534,7 @@ "eZ Publish": { "cats": [ "1", "6" ], "meta": { "generator": "eZ Publish" }, + "headers": { "X-Powered-By": "^eZ Publish$" }, "implies": [ "PHP" ] }, "Fact Finder": { @@ -675,7 +677,7 @@ }, "IBM WebSphere Portal": { "cats": [ "1" ], - "headers": { "BM-Web2-Location": ".*" }, + "headers": { "IBM-Web2-Location": ".*" }, "url": "/wps/", "implies": [ "Java" ] }, @@ -698,7 +700,7 @@ }, "ImpressPages": { "cats": [ "1" ], - "meta": { "generator": "impressPages" }, + "meta": { "generator": "ImpressPages" }, "implies": [ "PHP" ] }, "Indexhibit": { @@ -708,12 +710,12 @@ }, "InstantCMS": { "cats": [ "1" ], - "meta": { "generator": "nstantCMS" } + "meta": { "generator": "InstantCMS" } }, "Intershop": { "cats": [ "6" ], - "url": "s-bin|INTERSHOP", - "script": "s-bin|INTERSHOP" + "url": "is-bin|INTERSHOP", + "script": "is-bin|INTERSHOP" }, "IPB": { "cats": [ "2" ], @@ -949,6 +951,8 @@ "Moodle": { "cats": [ "21" ], "html": "(var moodleConfigFn = function\\(me\\)|]+moodlelogo)", + "headers": { "Set-Cookie": "MoodleSession" }, + "env": "^moodle", "implies": [ "PHP" ] }, "Moogo": { @@ -1511,7 +1515,7 @@ "vBulletin": { "cats": [ "2" ], "meta": { "generator": "vBulletin" }, - "env": "^(vBulletin|vB_)" + "env": "^(vBulletin|vB_[^g])" }, "viennaCMS": { "cats": [ "1" ], @@ -1523,7 +1527,7 @@ }, "Vimeo": { "cats": [ "14" ], - "html": "<(param|embed)[^>]+vimeo\\.com/moogaloop" + "html": "(<(param|embed)[^>]+vimeo\\.com/moogaloop|]player\.vimeo\.com)" }, "VirtueMart": { "cats": [ "6" ], diff --git a/drivers/chrome/images/icons/Hiawatha.png b/drivers/chrome/images/icons/Hiawatha.png index 90ca84ea1bee4b836c74f2b22b2c207d3274de39..5f2dade9b53ae78f16186cc42dd4e07bf039dd58 100644 GIT binary patch delta 651 zcmV;60(AZM0+4&ikBmUZ~Mg5CB7PpdY4IAfX^4!2=*`&TF-R z8BpboqFbY98eRe+0bu~04Row(J_sv)u&=VVz~FzSW^uheiCR3viE7{4=nECSn`gl1 z1h0$nikAr12Y>1S@sW}z6-UT}GTE96(*xkUTz}DDfJ6W;PN528vrb7(dFMmKf^amiSX{j)KzkcIsp@{5k zMvFy2TF|~5JZ)H}i5_32!+(u0m5lMcAGU8n-!X|?TIT+m35E?lpF`b#h5*#54)C<0 z+jMAYU=G-o385D)q_O7#05W=(yYVEgC{%+Tkx#=y`H9&ym=bIP%jKjiH_FwW+|hDY90VR#^>DhI+421x z%6*2E0!siUZ1cn8@4O$pM_0*#z-BNiVV4cECQQEKu-oGGN6Gw?PrS&ikZJMKJk-uW lEXo96+6`DMLUaj!0Z7HgX`FPXN&o-=07*qoL%{OdOtd zUY~YfrBEHEf<&(a9j}TUuv8wgR35Ta9RNa->)Iy03_qJvE`Zf zuq-R~00001bW%=J06^y0W&i*Hb4f%&R2b7^U|?WSWk3UZ=mKIqXaX_@Xab@tj6i@S zplrgZDJ>v`BwwOr$gL|Y$iT}E7t!Y6;$%fOg~?pRl7T@I#?`W5WR_rHu!74QGw>Oi znxR?EX0D^bk1Qaiz@R9OETG21AdI3#T_4R1c{wNp0A<7m?B##G6951J07*qoM6N<$ Ef@?L9Z2$lO diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json index 6b58f6e24..77cc9aaff 100644 --- a/drivers/firefox-jetpack/data/apps.json +++ b/drivers/firefox-jetpack/data/apps.json @@ -255,7 +255,7 @@ }, "ClickTale": { "cats": [ "10" ], - "html": "f\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", + "html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", "env": "^ClickTale" }, "Clicky": { @@ -265,7 +265,8 @@ }, "CloudFlare": { "cats": [ "31" ], - "headers": { "Server": "cloudflare" } + "headers": { "Server": "cloudflare" }, + "env": "^CloudFlare$" }, "CMS Made Simple": { "cats": [ "1" ], @@ -491,7 +492,7 @@ }, "Drupal Commerce": { "cats": [ "6" ], - "html": "d=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", + "html": "id=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", "implies": [ "PHP", "Drupal" ] }, "Dynamicweb": { @@ -533,6 +534,7 @@ "eZ Publish": { "cats": [ "1", "6" ], "meta": { "generator": "eZ Publish" }, + "headers": { "X-Powered-By": "^eZ Publish$" }, "implies": [ "PHP" ] }, "Fact Finder": { @@ -675,7 +677,7 @@ }, "IBM WebSphere Portal": { "cats": [ "1" ], - "headers": { "BM-Web2-Location": ".*" }, + "headers": { "IBM-Web2-Location": ".*" }, "url": "/wps/", "implies": [ "Java" ] }, @@ -698,7 +700,7 @@ }, "ImpressPages": { "cats": [ "1" ], - "meta": { "generator": "impressPages" }, + "meta": { "generator": "ImpressPages" }, "implies": [ "PHP" ] }, "Indexhibit": { @@ -708,12 +710,12 @@ }, "InstantCMS": { "cats": [ "1" ], - "meta": { "generator": "nstantCMS" } + "meta": { "generator": "InstantCMS" } }, "Intershop": { "cats": [ "6" ], - "url": "s-bin|INTERSHOP", - "script": "s-bin|INTERSHOP" + "url": "is-bin|INTERSHOP", + "script": "is-bin|INTERSHOP" }, "IPB": { "cats": [ "2" ], @@ -949,6 +951,8 @@ "Moodle": { "cats": [ "21" ], "html": "(var moodleConfigFn = function\\(me\\)|]+moodlelogo)", + "headers": { "Set-Cookie": "MoodleSession" }, + "env": "^moodle", "implies": [ "PHP" ] }, "Moogo": { @@ -1511,7 +1515,7 @@ "vBulletin": { "cats": [ "2" ], "meta": { "generator": "vBulletin" }, - "env": "^(vBulletin|vB_)" + "env": "^(vBulletin|vB_[^g])" }, "viennaCMS": { "cats": [ "1" ], @@ -1523,7 +1527,7 @@ }, "Vimeo": { "cats": [ "14" ], - "html": "<(param|embed)[^>]+vimeo\\.com/moogaloop" + "html": "(<(param|embed)[^>]+vimeo\\.com/moogaloop|]player\.vimeo\.com)" }, "VirtueMart": { "cats": [ "6" ], diff --git a/drivers/firefox-jetpack/images/icons/Hiawatha.png b/drivers/firefox-jetpack/images/icons/Hiawatha.png index 90ca84ea1bee4b836c74f2b22b2c207d3274de39..5f2dade9b53ae78f16186cc42dd4e07bf039dd58 100644 GIT binary patch delta 651 zcmV;60(AZM0+4&ikBmUZ~Mg5CB7PpdY4IAfX^4!2=*`&TF-R z8BpboqFbY98eRe+0bu~04Row(J_sv)u&=VVz~FzSW^uheiCR3viE7{4=nECSn`gl1 z1h0$nikAr12Y>1S@sW}z6-UT}GTE96(*xkUTz}DDfJ6W;PN528vrb7(dFMmKf^amiSX{j)KzkcIsp@{5k zMvFy2TF|~5JZ)H}i5_32!+(u0m5lMcAGU8n-!X|?TIT+m35E?lpF`b#h5*#54)C<0 z+jMAYU=G-o385D)q_O7#05W=(yYVEgC{%+Tkx#=y`H9&ym=bIP%jKjiH_FwW+|hDY90VR#^>DhI+421x z%6*2E0!siUZ1cn8@4O$pM_0*#z-BNiVV4cECQQEKu-oGGN6Gw?PrS&ikZJMKJk-uW lEXo96+6`DMLUaj!0Z7HgX`FPXN&o-=07*qoL%{OdOtd zUY~YfrBEHEf<&(a9j}TUuv8wgR35Ta9RNa->)Iy03_qJvE`Zf zuq-R~00001bW%=J06^y0W&i*Hb4f%&R2b7^U|?WSWk3UZ=mKIqXaX_@Xab@tj6i@S zplrgZDJ>v`BwwOr$gL|Y$iT}E7t!Y6;$%fOg~?pRl7T@I#?`W5WR_rHu!74QGw>Oi znxR?EX0D^bk1Qaiz@R9OETG21AdI3#T_4R1c{wNp0A<7m?B##G6951J07*qoM6N<$ Ef@?L9Z2$lO diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json index 6b58f6e24..77cc9aaff 100644 --- a/drivers/firefox/content/apps.json +++ b/drivers/firefox/content/apps.json @@ -255,7 +255,7 @@ }, "ClickTale": { "cats": [ "10" ], - "html": "f\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", + "html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", "env": "^ClickTale" }, "Clicky": { @@ -265,7 +265,8 @@ }, "CloudFlare": { "cats": [ "31" ], - "headers": { "Server": "cloudflare" } + "headers": { "Server": "cloudflare" }, + "env": "^CloudFlare$" }, "CMS Made Simple": { "cats": [ "1" ], @@ -491,7 +492,7 @@ }, "Drupal Commerce": { "cats": [ "6" ], - "html": "d=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", + "html": "id=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", "implies": [ "PHP", "Drupal" ] }, "Dynamicweb": { @@ -533,6 +534,7 @@ "eZ Publish": { "cats": [ "1", "6" ], "meta": { "generator": "eZ Publish" }, + "headers": { "X-Powered-By": "^eZ Publish$" }, "implies": [ "PHP" ] }, "Fact Finder": { @@ -675,7 +677,7 @@ }, "IBM WebSphere Portal": { "cats": [ "1" ], - "headers": { "BM-Web2-Location": ".*" }, + "headers": { "IBM-Web2-Location": ".*" }, "url": "/wps/", "implies": [ "Java" ] }, @@ -698,7 +700,7 @@ }, "ImpressPages": { "cats": [ "1" ], - "meta": { "generator": "impressPages" }, + "meta": { "generator": "ImpressPages" }, "implies": [ "PHP" ] }, "Indexhibit": { @@ -708,12 +710,12 @@ }, "InstantCMS": { "cats": [ "1" ], - "meta": { "generator": "nstantCMS" } + "meta": { "generator": "InstantCMS" } }, "Intershop": { "cats": [ "6" ], - "url": "s-bin|INTERSHOP", - "script": "s-bin|INTERSHOP" + "url": "is-bin|INTERSHOP", + "script": "is-bin|INTERSHOP" }, "IPB": { "cats": [ "2" ], @@ -949,6 +951,8 @@ "Moodle": { "cats": [ "21" ], "html": "(var moodleConfigFn = function\\(me\\)|]+moodlelogo)", + "headers": { "Set-Cookie": "MoodleSession" }, + "env": "^moodle", "implies": [ "PHP" ] }, "Moogo": { @@ -1511,7 +1515,7 @@ "vBulletin": { "cats": [ "2" ], "meta": { "generator": "vBulletin" }, - "env": "^(vBulletin|vB_)" + "env": "^(vBulletin|vB_[^g])" }, "viennaCMS": { "cats": [ "1" ], @@ -1523,7 +1527,7 @@ }, "Vimeo": { "cats": [ "14" ], - "html": "<(param|embed)[^>]+vimeo\\.com/moogaloop" + "html": "(<(param|embed)[^>]+vimeo\\.com/moogaloop|]player\.vimeo\.com)" }, "VirtueMart": { "cats": [ "6" ], diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js index 685a3e5ed..00442c73d 100644 --- a/drivers/firefox/content/js/driver.js +++ b/drivers/firefox/content/js/driver.js @@ -7,7 +7,7 @@ if ( wappalyzer == null ) return; - var w = wappalyzer, prefs, strings; + var w = wappalyzer, prefs, strings, $; const Cc = Components.classes, @@ -57,6 +57,10 @@ // Load jQuery Cc['@mozilla.org/moz/jssubscript-loader;1'].getService(Ci.mozIJSSubScriptLoader).loadSubScript('chrome://wappalyzer/content/js/lib/jquery.min.js'); + $ = jQuery; + + jQuery.noConflict(true); + // Preferences prefs = Cc['@mozilla.org/preferences-service;1'].getService(Ci.nsIPrefService).getBranch('extensions.wappalyzer.'); @@ -137,7 +141,7 @@ * Display apps */ displayApps: function() { - var image, url = gBrowser.currentURI.spec.split('#')[0]; + var menuItem, menuSeparator, image, url = gBrowser.currentURI.spec.split('#')[0]; if ( w.detected[url] != null && w.detected[url].length ) { // No change @@ -156,7 +160,7 @@ } w.detected[url].map(function(app, i) { - var j, cat, showCat, menuSeparator, menuItem; + var j, cat, showCat; for ( i in w.apps[app].cats ) { showCat = false; diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf index d55b87760..bf35be339 100644 --- a/drivers/firefox/install.rdf +++ b/drivers/firefox/install.rdf @@ -3,7 +3,7 @@ wappalyzer@crunchlabz.com - 2.5.0 + 2.5.1 2 true diff --git a/drivers/firefox/skin/images/icons/Hiawatha.png b/drivers/firefox/skin/images/icons/Hiawatha.png index 90ca84ea1bee4b836c74f2b22b2c207d3274de39..5f2dade9b53ae78f16186cc42dd4e07bf039dd58 100644 GIT binary patch delta 651 zcmV;60(AZM0+4&ikBmUZ~Mg5CB7PpdY4IAfX^4!2=*`&TF-R z8BpboqFbY98eRe+0bu~04Row(J_sv)u&=VVz~FzSW^uheiCR3viE7{4=nECSn`gl1 z1h0$nikAr12Y>1S@sW}z6-UT}GTE96(*xkUTz}DDfJ6W;PN528vrb7(dFMmKf^amiSX{j)KzkcIsp@{5k zMvFy2TF|~5JZ)H}i5_32!+(u0m5lMcAGU8n-!X|?TIT+m35E?lpF`b#h5*#54)C<0 z+jMAYU=G-o385D)q_O7#05W=(yYVEgC{%+Tkx#=y`H9&ym=bIP%jKjiH_FwW+|hDY90VR#^>DhI+421x z%6*2E0!siUZ1cn8@4O$pM_0*#z-BNiVV4cECQQEKu-oGGN6Gw?PrS&ikZJMKJk-uW lEXo96+6`DMLUaj!0Z7HgX`FPXN&o-=07*qoL%{OdOtd zUY~YfrBEHEf<&(a9j}TUuv8wgR35Ta9RNa->)Iy03_qJvE`Zf zuq-R~00001bW%=J06^y0W&i*Hb4f%&R2b7^U|?WSWk3UZ=mKIqXaX_@Xab@tj6i@S zplrgZDJ>v`BwwOr$gL|Y$iT}E7t!Y6;$%fOg~?pRl7T@I#?`W5WR_rHu!74QGw>Oi znxR?EX0D^bk1Qaiz@R9OETG21AdI3#T_4R1c{wNp0A<7m?B##G6951J07*qoM6N<$ Ef@?L9Z2$lO diff --git a/drivers/html/apps.json b/drivers/html/apps.json index 6b58f6e24..77cc9aaff 100644 --- a/drivers/html/apps.json +++ b/drivers/html/apps.json @@ -255,7 +255,7 @@ }, "ClickTale": { "cats": [ "10" ], - "html": "f\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", + "html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", "env": "^ClickTale" }, "Clicky": { @@ -265,7 +265,8 @@ }, "CloudFlare": { "cats": [ "31" ], - "headers": { "Server": "cloudflare" } + "headers": { "Server": "cloudflare" }, + "env": "^CloudFlare$" }, "CMS Made Simple": { "cats": [ "1" ], @@ -491,7 +492,7 @@ }, "Drupal Commerce": { "cats": [ "6" ], - "html": "d=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", + "html": "id=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", "implies": [ "PHP", "Drupal" ] }, "Dynamicweb": { @@ -533,6 +534,7 @@ "eZ Publish": { "cats": [ "1", "6" ], "meta": { "generator": "eZ Publish" }, + "headers": { "X-Powered-By": "^eZ Publish$" }, "implies": [ "PHP" ] }, "Fact Finder": { @@ -675,7 +677,7 @@ }, "IBM WebSphere Portal": { "cats": [ "1" ], - "headers": { "BM-Web2-Location": ".*" }, + "headers": { "IBM-Web2-Location": ".*" }, "url": "/wps/", "implies": [ "Java" ] }, @@ -698,7 +700,7 @@ }, "ImpressPages": { "cats": [ "1" ], - "meta": { "generator": "impressPages" }, + "meta": { "generator": "ImpressPages" }, "implies": [ "PHP" ] }, "Indexhibit": { @@ -708,12 +710,12 @@ }, "InstantCMS": { "cats": [ "1" ], - "meta": { "generator": "nstantCMS" } + "meta": { "generator": "InstantCMS" } }, "Intershop": { "cats": [ "6" ], - "url": "s-bin|INTERSHOP", - "script": "s-bin|INTERSHOP" + "url": "is-bin|INTERSHOP", + "script": "is-bin|INTERSHOP" }, "IPB": { "cats": [ "2" ], @@ -949,6 +951,8 @@ "Moodle": { "cats": [ "21" ], "html": "(var moodleConfigFn = function\\(me\\)|]+moodlelogo)", + "headers": { "Set-Cookie": "MoodleSession" }, + "env": "^moodle", "implies": [ "PHP" ] }, "Moogo": { @@ -1511,7 +1515,7 @@ "vBulletin": { "cats": [ "2" ], "meta": { "generator": "vBulletin" }, - "env": "^(vBulletin|vB_)" + "env": "^(vBulletin|vB_[^g])" }, "viennaCMS": { "cats": [ "1" ], @@ -1523,7 +1527,7 @@ }, "Vimeo": { "cats": [ "14" ], - "html": "<(param|embed)[^>]+vimeo\\.com/moogaloop" + "html": "(<(param|embed)[^>]+vimeo\\.com/moogaloop|]player\.vimeo\.com)" }, "VirtueMart": { "cats": [ "6" ], diff --git a/drivers/html/images/icons/Hiawatha.png b/drivers/html/images/icons/Hiawatha.png index 90ca84ea1bee4b836c74f2b22b2c207d3274de39..5f2dade9b53ae78f16186cc42dd4e07bf039dd58 100644 GIT binary patch delta 651 zcmV;60(AZM0+4&ikBmUZ~Mg5CB7PpdY4IAfX^4!2=*`&TF-R z8BpboqFbY98eRe+0bu~04Row(J_sv)u&=VVz~FzSW^uheiCR3viE7{4=nECSn`gl1 z1h0$nikAr12Y>1S@sW}z6-UT}GTE96(*xkUTz}DDfJ6W;PN528vrb7(dFMmKf^amiSX{j)KzkcIsp@{5k zMvFy2TF|~5JZ)H}i5_32!+(u0m5lMcAGU8n-!X|?TIT+m35E?lpF`b#h5*#54)C<0 z+jMAYU=G-o385D)q_O7#05W=(yYVEgC{%+Tkx#=y`H9&ym=bIP%jKjiH_FwW+|hDY90VR#^>DhI+421x z%6*2E0!siUZ1cn8@4O$pM_0*#z-BNiVV4cECQQEKu-oGGN6Gw?PrS&ikZJMKJk-uW lEXo96+6`DMLUaj!0Z7HgX`FPXN&o-=07*qoL%{OdOtd zUY~YfrBEHEf<&(a9j}TUuv8wgR35Ta9RNa->)Iy03_qJvE`Zf zuq-R~00001bW%=J06^y0W&i*Hb4f%&R2b7^U|?WSWk3UZ=mKIqXaX_@Xab@tj6i@S zplrgZDJ>v`BwwOr$gL|Y$iT}E7t!Y6;$%fOg~?pRl7T@I#?`W5WR_rHu!74QGw>Oi znxR?EX0D^bk1Qaiz@R9OETG21AdI3#T_4R1c{wNp0A<7m?B##G6951J07*qoM6N<$ Ef@?L9Z2$lO diff --git a/drivers/php/apps.json b/drivers/php/apps.json index 6b58f6e24..77cc9aaff 100644 --- a/drivers/php/apps.json +++ b/drivers/php/apps.json @@ -255,7 +255,7 @@ }, "ClickTale": { "cats": [ "10" ], - "html": "f\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", + "html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", "env": "^ClickTale" }, "Clicky": { @@ -265,7 +265,8 @@ }, "CloudFlare": { "cats": [ "31" ], - "headers": { "Server": "cloudflare" } + "headers": { "Server": "cloudflare" }, + "env": "^CloudFlare$" }, "CMS Made Simple": { "cats": [ "1" ], @@ -491,7 +492,7 @@ }, "Drupal Commerce": { "cats": [ "6" ], - "html": "d=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", + "html": "id=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", "implies": [ "PHP", "Drupal" ] }, "Dynamicweb": { @@ -533,6 +534,7 @@ "eZ Publish": { "cats": [ "1", "6" ], "meta": { "generator": "eZ Publish" }, + "headers": { "X-Powered-By": "^eZ Publish$" }, "implies": [ "PHP" ] }, "Fact Finder": { @@ -675,7 +677,7 @@ }, "IBM WebSphere Portal": { "cats": [ "1" ], - "headers": { "BM-Web2-Location": ".*" }, + "headers": { "IBM-Web2-Location": ".*" }, "url": "/wps/", "implies": [ "Java" ] }, @@ -698,7 +700,7 @@ }, "ImpressPages": { "cats": [ "1" ], - "meta": { "generator": "impressPages" }, + "meta": { "generator": "ImpressPages" }, "implies": [ "PHP" ] }, "Indexhibit": { @@ -708,12 +710,12 @@ }, "InstantCMS": { "cats": [ "1" ], - "meta": { "generator": "nstantCMS" } + "meta": { "generator": "InstantCMS" } }, "Intershop": { "cats": [ "6" ], - "url": "s-bin|INTERSHOP", - "script": "s-bin|INTERSHOP" + "url": "is-bin|INTERSHOP", + "script": "is-bin|INTERSHOP" }, "IPB": { "cats": [ "2" ], @@ -949,6 +951,8 @@ "Moodle": { "cats": [ "21" ], "html": "(var moodleConfigFn = function\\(me\\)|]+moodlelogo)", + "headers": { "Set-Cookie": "MoodleSession" }, + "env": "^moodle", "implies": [ "PHP" ] }, "Moogo": { @@ -1511,7 +1515,7 @@ "vBulletin": { "cats": [ "2" ], "meta": { "generator": "vBulletin" }, - "env": "^(vBulletin|vB_)" + "env": "^(vBulletin|vB_[^g])" }, "viennaCMS": { "cats": [ "1" ], @@ -1523,7 +1527,7 @@ }, "Vimeo": { "cats": [ "14" ], - "html": "<(param|embed)[^>]+vimeo\\.com/moogaloop" + "html": "(<(param|embed)[^>]+vimeo\\.com/moogaloop|]player\.vimeo\.com)" }, "VirtueMart": { "cats": [ "6" ], diff --git a/share/apps.json b/share/apps.json index a9dd528c6..77cc9aaff 100644 --- a/share/apps.json +++ b/share/apps.json @@ -255,7 +255,7 @@ }, "ClickTale": { "cats": [ "10" ], - "html": "f\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", + "html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)", "env": "^ClickTale" }, "Clicky": { @@ -265,7 +265,8 @@ }, "CloudFlare": { "cats": [ "31" ], - "headers": { "Server": "cloudflare" } + "headers": { "Server": "cloudflare" }, + "env": "^CloudFlare$" }, "CMS Made Simple": { "cats": [ "1" ], @@ -491,7 +492,7 @@ }, "Drupal Commerce": { "cats": [ "6" ], - "html": "d=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", + "html": "id=\\\"block[_-]commerce[_-]cart[_-]cart|class=\\\"commerce[_-]product[_-]field", "implies": [ "PHP", "Drupal" ] }, "Dynamicweb": { @@ -676,7 +677,7 @@ }, "IBM WebSphere Portal": { "cats": [ "1" ], - "headers": { "BM-Web2-Location": ".*" }, + "headers": { "IBM-Web2-Location": ".*" }, "url": "/wps/", "implies": [ "Java" ] }, @@ -699,7 +700,7 @@ }, "ImpressPages": { "cats": [ "1" ], - "meta": { "generator": "impressPages" }, + "meta": { "generator": "ImpressPages" }, "implies": [ "PHP" ] }, "Indexhibit": { @@ -709,12 +710,12 @@ }, "InstantCMS": { "cats": [ "1" ], - "meta": { "generator": "nstantCMS" } + "meta": { "generator": "InstantCMS" } }, "Intershop": { "cats": [ "6" ], - "url": "s-bin|INTERSHOP", - "script": "s-bin|INTERSHOP" + "url": "is-bin|INTERSHOP", + "script": "is-bin|INTERSHOP" }, "IPB": { "cats": [ "2" ], @@ -950,6 +951,8 @@ "Moodle": { "cats": [ "21" ], "html": "(var moodleConfigFn = function\\(me\\)|]+moodlelogo)", + "headers": { "Set-Cookie": "MoodleSession" }, + "env": "^moodle", "implies": [ "PHP" ] }, "Moogo": { @@ -1512,7 +1515,7 @@ "vBulletin": { "cats": [ "2" ], "meta": { "generator": "vBulletin" }, - "env": "^(vBulletin|vB_)" + "env": "^(vBulletin|vB_[^g])" }, "viennaCMS": { "cats": [ "1" ], @@ -1524,7 +1527,7 @@ }, "Vimeo": { "cats": [ "14" ], - "html": "<(param|embed)[^>]+vimeo\\.com/moogaloop" + "html": "(<(param|embed)[^>]+vimeo\\.com/moogaloop|]player\.vimeo\.com)" }, "VirtueMart": { "cats": [ "6" ], diff --git a/share/images/icons/Hiawatha.png b/share/images/icons/Hiawatha.png index 90ca84ea1bee4b836c74f2b22b2c207d3274de39..5f2dade9b53ae78f16186cc42dd4e07bf039dd58 100644 GIT binary patch delta 651 zcmV;60(AZM0+4&ikBmUZ~Mg5CB7PpdY4IAfX^4!2=*`&TF-R z8BpboqFbY98eRe+0bu~04Row(J_sv)u&=VVz~FzSW^uheiCR3viE7{4=nECSn`gl1 z1h0$nikAr12Y>1S@sW}z6-UT}GTE96(*xkUTz}DDfJ6W;PN528vrb7(dFMmKf^amiSX{j)KzkcIsp@{5k zMvFy2TF|~5JZ)H}i5_32!+(u0m5lMcAGU8n-!X|?TIT+m35E?lpF`b#h5*#54)C<0 z+jMAYU=G-o385D)q_O7#05W=(yYVEgC{%+Tkx#=y`H9&ym=bIP%jKjiH_FwW+|hDY90VR#^>DhI+421x z%6*2E0!siUZ1cn8@4O$pM_0*#z-BNiVV4cECQQEKu-oGGN6Gw?PrS&ikZJMKJk-uW lEXo96+6`DMLUaj!0Z7HgX`FPXN&o-=07*qoL%{OdOtd zUY~YfrBEHEf<&(a9j}TUuv8wgR35Ta9RNa->)Iy03_qJvE`Zf zuq-R~00001bW%=J06^y0W&i*Hb4f%&R2b7^U|?WSWk3UZ=mKIqXaX_@Xab@tj6i@S zplrgZDJ>v`BwwOr$gL|Y$iT}E7t!Y6;$%fOg~?pRl7T@I#?`W5WR_rHu!74QGw>Oi znxR?EX0D^bk1Qaiz@R9OETG21AdI3#T_4R1c{wNp0A<7m?B##G6951J07*qoM6N<$ Ef@?L9Z2$lO