From f5a6bfc76d05d8a90fc598189667aecba66186f1 Mon Sep 17 00:00:00 2001
From: Louis <louis.bels@ako10.com>
Date: Thu, 12 May 2016 15:09:46 +0200
Subject: [PATCH 1/8] Prestashop detection without meta generator or "powered
 by"

---
 src/apps.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/apps.json b/src/apps.json
index 9077d9bbd..14974f416 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -5445,7 +5445,14 @@
 			"cats": [
 				6
 			],
-			"html": "Powered by <a\\s+[^>]+>PrestaShop",
+			"html":
+			[
+				"Powered by <a\\s+[^>]+>PrestaShop",
+				"freeProductTranslation\\;confidence:25",
+				"freeShippingTranslation\\;confidence:25",
+				"priceDisplayMethod\\;confidence:25",
+				"priceDisplayPrecision\\;confidence:25"
+			],
 			"icon": "PrestaShop.png",
 			"implies": "PHP",
 			"meta": {

From 979274f73ab6a76c76feed74ba0d35e5fddba055 Mon Sep 17 00:00:00 2001
From: Louis <louisbels@hotmail.com>
Date: Thu, 12 May 2016 18:27:27 +0200
Subject: [PATCH 2/8] Prestashop detection without meta generator or "powered
 by"

---
 src/apps.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 14974f416..521c8da7e 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -5448,10 +5448,10 @@
 			"html":
 			[
 				"Powered by <a\\s+[^>]+>PrestaShop",
-				"freeProductTranslation\\;confidence:25",
-				"freeShippingTranslation\\;confidence:25",
-				"priceDisplayMethod\\;confidence:25",
-				"priceDisplayPrecision\\;confidence:25"
+				"<script>(?>(?!</?script>).)*(freeProductTranslation)(?>(?!</?script>).)*</script>",
+				"<script>(?>(?!</?script>).)*(freeProductTranslation)(?>(?!</?script>).)*</script>",
+				"<script>(?>(?!</?script>).)*(priceDisplayMethod)(?>(?!</?script>).)*</script>",
+				"<script>(?>(?!</?script>).)*(priceDisplayPrecision)(?>(?!</?script>).)*</script>"
 			],
 			"icon": "PrestaShop.png",
 			"implies": "PHP",

From af4b44d6f5f022ab4ce4122a69839d6bb95814bd Mon Sep 17 00:00:00 2001
From: Louis <louisbels@hotmail.com>
Date: Thu, 12 May 2016 18:35:22 +0200
Subject: [PATCH 3/8] Prestashop detection without meta generator or "powered
 by"

---
 src/apps.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 521c8da7e..21aa2b9f7 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -5448,10 +5448,10 @@
 			"html":
 			[
 				"Powered by <a\\s+[^>]+>PrestaShop",
-				"<script>(?>(?!</?script>).)*(freeProductTranslation)(?>(?!</?script>).)*</script>",
-				"<script>(?>(?!</?script>).)*(freeProductTranslation)(?>(?!</?script>).)*</script>",
-				"<script>(?>(?!</?script>).)*(priceDisplayMethod)(?>(?!</?script>).)*</script>",
-				"<script>(?>(?!</?script>).)*(priceDisplayPrecision)(?>(?!</?script>).)*</script>"
+				"<script>(?:[^<]|<(?!\/script>))*?(freeProductTranslation).*?<\/script>",
+				"<script>(?:[^<]|<(?!\/script>))*?(freeProductTranslation).*?<\/script>",
+				"<script>(?:[^<]|<(?!\/script>))*?(priceDisplayMethod).*?<\/script>",
+				"<script>(?:[^<]|<(?!\/script>))*?(priceDisplayPrecision).*?<\/script>"
 			],
 			"icon": "PrestaShop.png",
 			"implies": "PHP",

From 65603540d0bfb04f92039130c4069c255d1f71b8 Mon Sep 17 00:00:00 2001
From: Louis <louisbels@hotmail.com>
Date: Thu, 12 May 2016 18:39:23 +0200
Subject: [PATCH 4/8] Prestashop detection without meta generator or "powered
 by"

---
 src/apps.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 21aa2b9f7..f478be1aa 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -5448,10 +5448,10 @@
 			"html":
 			[
 				"Powered by <a\\s+[^>]+>PrestaShop",
-				"<script>(?:[^<]|<(?!\/script>))*?(freeProductTranslation).*?<\/script>",
-				"<script>(?:[^<]|<(?!\/script>))*?(freeProductTranslation).*?<\/script>",
-				"<script>(?:[^<]|<(?!\/script>))*?(priceDisplayMethod).*?<\/script>",
-				"<script>(?:[^<]|<(?!\/script>))*?(priceDisplayPrecision).*?<\/script>"
+				"<script>(?:[^<]|<(?!\/script>))*?freeProductTranslation.*?<\/script>",
+				"<script>(?:[^<]|<(?!\/script>))*?freeProductTranslation.*?<\/script>",
+				"<script>(?:[^<]|<(?!\/script>))*?priceDisplayMethod.*?<\/script>",
+				"<script>(?:[^<]|<(?!\/script>))*?priceDisplayPrecision.*?<\/script>"
 			],
 			"icon": "PrestaShop.png",
 			"implies": "PHP",

From c0ef05ae1ab906d91ab6ef7d47ee64fa83a30cc1 Mon Sep 17 00:00:00 2001
From: Louis <louisbels@hotmail.com>
Date: Thu, 12 May 2016 18:52:07 +0200
Subject: [PATCH 5/8] Prestashop detection without meta generator or "powered
 by"

---
 src/apps.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index f478be1aa..2bebc135a 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -5448,10 +5448,10 @@
 			"html":
 			[
 				"Powered by <a\\s+[^>]+>PrestaShop",
-				"<script>(?:[^<]|<(?!\/script>))*?freeProductTranslation.*?<\/script>",
-				"<script>(?:[^<]|<(?!\/script>))*?freeProductTranslation.*?<\/script>",
-				"<script>(?:[^<]|<(?!\/script>))*?priceDisplayMethod.*?<\/script>",
-				"<script>(?:[^<]|<(?!\/script>))*?priceDisplayPrecision.*?<\/script>"
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+<\/script>\\;confidence:25",
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+<\/script>\\;confidence:25",
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayMethod[^>]+<\/script>\\;confidence:25",
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayPrecision[^>]+<\/script>\\;confidence:25"
 			],
 			"icon": "PrestaShop.png",
 			"implies": "PHP",

From 5aa68c15ff1458048a1a205b8ff2a36c129d71a8 Mon Sep 17 00:00:00 2001
From: Louis <louisbels@hotmail.com>
Date: Thu, 12 May 2016 19:28:51 +0200
Subject: [PATCH 6/8] Prestashop detection - match scripts with CDATA too

---
 src/apps.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 2bebc135a..e22deb1bf 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -5448,10 +5448,10 @@
 			"html":
 			[
 				"Powered by <a\\s+[^>]+>PrestaShop",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+<\/script>\\;confidence:25",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+<\/script>\\;confidence:25",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayMethod[^>]+<\/script>\\;confidence:25",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayPrecision[^>]+<\/script>\\;confidence:25"
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+(<\/script>|]]>)\\;confidence:25",
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+(<\/script>|]]>)\\;confidence:25",
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayMethod[^>]+(<\/script>|]]>)\\;confidence:25",
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayPrecision[^>]+(<\/script>|]]>)\\;confidence:25"
 			],
 			"icon": "PrestaShop.png",
 			"implies": "PHP",

From 2a8fc864e57b8436bad83019e7df305425519bb3 Mon Sep 17 00:00:00 2001
From: Louis <louisbels@hotmail.com>
Date: Thu, 12 May 2016 19:34:06 +0200
Subject: [PATCH 7/8] Prestashop detection (?: )

---
 src/apps.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index e22deb1bf..679b10d7b 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -5448,10 +5448,10 @@
 			"html":
 			[
 				"Powered by <a\\s+[^>]+>PrestaShop",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+(<\/script>|]]>)\\;confidence:25",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+(<\/script>|]]>)\\;confidence:25",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayMethod[^>]+(<\/script>|]]>)\\;confidence:25",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayPrecision[^>]+(<\/script>|]]>)\\;confidence:25"
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+(?:<\/script>|]]>)\\;confidence:25",
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+(?:<\/script>|]]>)\\;confidence:25",
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayMethod[^>]+(?:<\/script>|]]>)\\;confidence:25",
+				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayPrecision[^>]+(?:<\/script>|]]>)\\;confidence:25"
 			],
 			"icon": "PrestaShop.png",
 			"implies": "PHP",

From e7c9328616986c90d72350c43e32bbb1bbe9a048 Mon Sep 17 00:00:00 2001
From: Louis <louisbels@hotmail.com>
Date: Fri, 13 May 2016 00:42:37 +0200
Subject: [PATCH 8/8] Use ENV

---
 src/apps.json | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 679b10d7b..25539f13c 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -5445,14 +5445,13 @@
 			"cats": [
 				6
 			],
-			"html":
-			[
-				"Powered by <a\\s+[^>]+>PrestaShop",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+(?:<\/script>|]]>)\\;confidence:25",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?freeProductTranslation[^>]+(?:<\/script>|]]>)\\;confidence:25",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayMethod[^>]+(?:<\/script>|]]>)\\;confidence:25",
-				"<script[^>]+(?:[^<]|<(?!\/script>))*?priceDisplayPrecision[^>]+(?:<\/script>|]]>)\\;confidence:25"
+			"env": [
+				"^freeProductTranslation$\\;confidence:25",
+				"^freeProductTranslation$\\;confidence:25",
+				"^priceDisplayMethod$\\;confidence:25",
+				"^priceDisplayPrecision$\\;confidence:25"
 			],
+			"html":"Powered by <a\\s+[^>]+>PrestaShop",
 			"icon": "PrestaShop.png",
 			"implies": "PHP",
 			"meta": {