From bad10422e63296358fc6a0bea41c50bbfb499b62 Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Thu, 9 Jan 2020 20:57:59 +0100 Subject: [PATCH 1/2] Match phpMyAdmin versions --- src/apps.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 87b034175..52e69fad7 100644 --- a/src/apps.json +++ b/src/apps.json @@ -13663,7 +13663,10 @@ "cats": [ 3 ], - "html": "(?: \\| phpMyAdmin ([\\d.]+)<\\/title>|PMA_sendHeaderLocation\\(|]*href=\"[^\"]*phpmyadmin\\.css\\.php)\\;version:\\1", + "html": [ + "]*>[\\S\\s]*\\[CDATA[^<]*PMA_VERSION:\\\"([\\d.]+)\\;version:\\1", + "(?: \\| phpMyAdmin ([\\d.]+)<\\/title>|PMA_sendHeaderLocation\\(|]*href=\"[^\"]*phpmyadmin\\.css\\.php)\\;version:\\1" + ], "icon": "phpMyAdmin.png", "implies": [ "PHP", From e1d2a17093aba1a8159554c93ae4c4e62f62fcd8 Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Thu, 9 Jan 2020 21:57:12 +0100 Subject: [PATCH 2/2] Optimize regex --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 52e69fad7..68e09c346 100644 --- a/src/apps.json +++ b/src/apps.json @@ -13664,7 +13664,7 @@ 3 ], "html": [ - "]*>[\\S\\s]*\\[CDATA[^<]*PMA_VERSION:\\\"([\\d.]+)\\;version:\\1", + "!\\[CDATA\\[[^<]*PMA_VERSION:\\\"([\\d.]+)\\;version:\\1", "(?: \\| phpMyAdmin ([\\d.]+)<\\/title>|PMA_sendHeaderLocation\\(|]*href=\"[^\"]*phpmyadmin\\.css\\.php)\\;version:\\1" ], "icon": "phpMyAdmin.png",