diff --git a/drivers/bookmarklet/js/wappalyzer.js b/drivers/bookmarklet/js/wappalyzer.js index 7a4913cee..bde06f5c2 100644 --- a/drivers/bookmarklet/js/wappalyzer.js +++ b/drivers/bookmarklet/js/wappalyzer.js @@ -79,13 +79,20 @@ var wappalyzer = (function() { matches = pattern.regex.exec(value) ; + w.log({ matches: matches, version: version }); + if ( matches ) { matches.map(function(match, i) { // Parse ternary operator var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.+)$').exec(version); if ( ternary && ternary.length === 3 ) { + + w.log({ match: match, i: i, ternary: ternary }); + version = version.replace(ternary[0], match ? ternary[1] : ternary[2]); + + w.log({ version: version }); } // Replace back references diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json index f22be56d6..eb038e45f 100644 --- a/drivers/bookmarklet/json +++ b/drivers/bookmarklet/json @@ -1129,7 +1129,7 @@ "meta": { "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1" }, "html": "(?:]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|]+class=\"pill)\\;confidence:50", "headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" }, - "env": "^jcomments$", + "env": "^(jcomments|Joomla)$", "implies": "PHP" }, "jqPlot": { @@ -1323,7 +1323,7 @@ "Magento": { "website": "www.magentocommerce.com", "cats": [ 6 ], - "script": "(?:js/mage|skin/frontend/(?:default|(enterprise)))\\;version:\\1?Enterprise:Community", + "script": [ "js/mage", "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community" ], "headers": { "Set-Cookie": "frontend=\\;confidence:50" }, "env": "^(?:Mage|VarienForm)$", "implies": "PHP" diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json index f22be56d6..eb038e45f 100644 --- a/drivers/chrome/apps.json +++ b/drivers/chrome/apps.json @@ -1129,7 +1129,7 @@ "meta": { "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1" }, "html": "(?:]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|]+class=\"pill)\\;confidence:50", "headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" }, - "env": "^jcomments$", + "env": "^(jcomments|Joomla)$", "implies": "PHP" }, "jqPlot": { @@ -1323,7 +1323,7 @@ "Magento": { "website": "www.magentocommerce.com", "cats": [ 6 ], - "script": "(?:js/mage|skin/frontend/(?:default|(enterprise)))\\;version:\\1?Enterprise:Community", + "script": [ "js/mage", "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community" ], "headers": { "Set-Cookie": "frontend=\\;confidence:50" }, "env": "^(?:Mage|VarienForm)$", "implies": "PHP" diff --git a/drivers/chrome/js/wappalyzer.js b/drivers/chrome/js/wappalyzer.js index 7a4913cee..bde06f5c2 100644 --- a/drivers/chrome/js/wappalyzer.js +++ b/drivers/chrome/js/wappalyzer.js @@ -79,13 +79,20 @@ var wappalyzer = (function() { matches = pattern.regex.exec(value) ; + w.log({ matches: matches, version: version }); + if ( matches ) { matches.map(function(match, i) { // Parse ternary operator var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.+)$').exec(version); if ( ternary && ternary.length === 3 ) { + + w.log({ match: match, i: i, ternary: ternary }); + version = version.replace(ternary[0], match ? ternary[1] : ternary[2]); + + w.log({ version: version }); } // Replace back references diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json index f22be56d6..eb038e45f 100644 --- a/drivers/firefox-jetpack/data/apps.json +++ b/drivers/firefox-jetpack/data/apps.json @@ -1129,7 +1129,7 @@ "meta": { "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1" }, "html": "(?:]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|]+class=\"pill)\\;confidence:50", "headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" }, - "env": "^jcomments$", + "env": "^(jcomments|Joomla)$", "implies": "PHP" }, "jqPlot": { @@ -1323,7 +1323,7 @@ "Magento": { "website": "www.magentocommerce.com", "cats": [ 6 ], - "script": "(?:js/mage|skin/frontend/(?:default|(enterprise)))\\;version:\\1?Enterprise:Community", + "script": [ "js/mage", "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community" ], "headers": { "Set-Cookie": "frontend=\\;confidence:50" }, "env": "^(?:Mage|VarienForm)$", "implies": "PHP" diff --git a/drivers/firefox-jetpack/lib/wappalyzer.js b/drivers/firefox-jetpack/lib/wappalyzer.js index 7a4913cee..bde06f5c2 100644 --- a/drivers/firefox-jetpack/lib/wappalyzer.js +++ b/drivers/firefox-jetpack/lib/wappalyzer.js @@ -79,13 +79,20 @@ var wappalyzer = (function() { matches = pattern.regex.exec(value) ; + w.log({ matches: matches, version: version }); + if ( matches ) { matches.map(function(match, i) { // Parse ternary operator var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.+)$').exec(version); if ( ternary && ternary.length === 3 ) { + + w.log({ match: match, i: i, ternary: ternary }); + version = version.replace(ternary[0], match ? ternary[1] : ternary[2]); + + w.log({ version: version }); } // Replace back references diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json index f22be56d6..eb038e45f 100644 --- a/drivers/firefox/content/apps.json +++ b/drivers/firefox/content/apps.json @@ -1129,7 +1129,7 @@ "meta": { "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1" }, "html": "(?:]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|]+class=\"pill)\\;confidence:50", "headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" }, - "env": "^jcomments$", + "env": "^(jcomments|Joomla)$", "implies": "PHP" }, "jqPlot": { @@ -1323,7 +1323,7 @@ "Magento": { "website": "www.magentocommerce.com", "cats": [ 6 ], - "script": "(?:js/mage|skin/frontend/(?:default|(enterprise)))\\;version:\\1?Enterprise:Community", + "script": [ "js/mage", "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community" ], "headers": { "Set-Cookie": "frontend=\\;confidence:50" }, "env": "^(?:Mage|VarienForm)$", "implies": "PHP" diff --git a/drivers/firefox/content/js/wappalyzer.js b/drivers/firefox/content/js/wappalyzer.js index 7a4913cee..bde06f5c2 100644 --- a/drivers/firefox/content/js/wappalyzer.js +++ b/drivers/firefox/content/js/wappalyzer.js @@ -79,13 +79,20 @@ var wappalyzer = (function() { matches = pattern.regex.exec(value) ; + w.log({ matches: matches, version: version }); + if ( matches ) { matches.map(function(match, i) { // Parse ternary operator var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.+)$').exec(version); if ( ternary && ternary.length === 3 ) { + + w.log({ match: match, i: i, ternary: ternary }); + version = version.replace(ternary[0], match ? ternary[1] : ternary[2]); + + w.log({ version: version }); } // Replace back references diff --git a/drivers/html/apps.json b/drivers/html/apps.json index f22be56d6..eb038e45f 100644 --- a/drivers/html/apps.json +++ b/drivers/html/apps.json @@ -1129,7 +1129,7 @@ "meta": { "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1" }, "html": "(?:]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|]+class=\"pill)\\;confidence:50", "headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" }, - "env": "^jcomments$", + "env": "^(jcomments|Joomla)$", "implies": "PHP" }, "jqPlot": { @@ -1323,7 +1323,7 @@ "Magento": { "website": "www.magentocommerce.com", "cats": [ 6 ], - "script": "(?:js/mage|skin/frontend/(?:default|(enterprise)))\\;version:\\1?Enterprise:Community", + "script": [ "js/mage", "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community" ], "headers": { "Set-Cookie": "frontend=\\;confidence:50" }, "env": "^(?:Mage|VarienForm)$", "implies": "PHP" diff --git a/drivers/html/js/wappalyzer.js b/drivers/html/js/wappalyzer.js index 7a4913cee..bde06f5c2 100644 --- a/drivers/html/js/wappalyzer.js +++ b/drivers/html/js/wappalyzer.js @@ -79,13 +79,20 @@ var wappalyzer = (function() { matches = pattern.regex.exec(value) ; + w.log({ matches: matches, version: version }); + if ( matches ) { matches.map(function(match, i) { // Parse ternary operator var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.+)$').exec(version); if ( ternary && ternary.length === 3 ) { + + w.log({ match: match, i: i, ternary: ternary }); + version = version.replace(ternary[0], match ? ternary[1] : ternary[2]); + + w.log({ version: version }); } // Replace back references diff --git a/drivers/php/apps.json b/drivers/php/apps.json index f22be56d6..eb038e45f 100644 --- a/drivers/php/apps.json +++ b/drivers/php/apps.json @@ -1129,7 +1129,7 @@ "meta": { "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1" }, "html": "(?:]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|]+class=\"pill)\\;confidence:50", "headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" }, - "env": "^jcomments$", + "env": "^(jcomments|Joomla)$", "implies": "PHP" }, "jqPlot": { @@ -1323,7 +1323,7 @@ "Magento": { "website": "www.magentocommerce.com", "cats": [ 6 ], - "script": "(?:js/mage|skin/frontend/(?:default|(enterprise)))\\;version:\\1?Enterprise:Community", + "script": [ "js/mage", "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community" ], "headers": { "Set-Cookie": "frontend=\\;confidence:50" }, "env": "^(?:Mage|VarienForm)$", "implies": "PHP" diff --git a/drivers/php/js/wappalyzer.js b/drivers/php/js/wappalyzer.js index 7a4913cee..bde06f5c2 100644 --- a/drivers/php/js/wappalyzer.js +++ b/drivers/php/js/wappalyzer.js @@ -79,13 +79,20 @@ var wappalyzer = (function() { matches = pattern.regex.exec(value) ; + w.log({ matches: matches, version: version }); + if ( matches ) { matches.map(function(match, i) { // Parse ternary operator var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.+)$').exec(version); if ( ternary && ternary.length === 3 ) { + + w.log({ match: match, i: i, ternary: ternary }); + version = version.replace(ternary[0], match ? ternary[1] : ternary[2]); + + w.log({ version: version }); } // Replace back references diff --git a/share/apps.json b/share/apps.json index 80ca7ed51..eb038e45f 100644 --- a/share/apps.json +++ b/share/apps.json @@ -1323,7 +1323,7 @@ "Magento": { "website": "www.magentocommerce.com", "cats": [ 6 ], - "script": "(?:js/mage|skin/frontend/(?:default|(enterprise)))\\;version:\\1?Enterprise:Community", + "script": [ "js/mage", "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community" ], "headers": { "Set-Cookie": "frontend=\\;confidence:50" }, "env": "^(?:Mage|VarienForm)$", "implies": "PHP" diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js index 7a4913cee..bde06f5c2 100644 --- a/share/js/wappalyzer.js +++ b/share/js/wappalyzer.js @@ -79,13 +79,20 @@ var wappalyzer = (function() { matches = pattern.regex.exec(value) ; + w.log({ matches: matches, version: version }); + if ( matches ) { matches.map(function(match, i) { // Parse ternary operator var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.+)$').exec(version); if ( ternary && ternary.length === 3 ) { + + w.log({ match: match, i: i, ternary: ternary }); + version = version.replace(ternary[0], match ? ternary[1] : ternary[2]); + + w.log({ version: version }); } // Replace back references