Merge branch 'QA_5_2'

williamdes · williamdes · commit b5899c2d53ac · 2023-05-06T11:25:42.000+02:00
Signed-off-by: William Desportes &lt;williamdes@wdes.fr&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -37,6 +37,9 @@ phpMyAdmin - ChangeLog
 - issue        Stop pmadb database detection when all features are disabled
 - issue        Replace slim/psr7 by nyholm/psr7 (CVE-2023-30536)
 - issue #17654 Fix unprivileged user cannot change password on MySQL >= 5.7.37
+- issue        Add CVE MITRE link to allowed domains and use cve.org
+- issue #18330 Fix TypeError when no-datetime field is modified
+- issue #18212 Fix Query Builder doesn't replace a table name with it's alias in the `WHERE` block
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/js/src/database/query_generator.ts b/js/src/database/query_generator.ts
@@ -31,7 +31,10 @@ function getFormatsText () {
 }
 
 function generateCondition (criteriaDiv, table) {
-    var query = '`' + escapeBacktick(table.val()) + '`.';
+    const tableName = table.val();
+    const tableAlias = table.siblings('.table_alias').val();
+
+    var query = '`' + escapeBacktick(tableAlias === '' ? tableName : tableAlias) + '`.';
     query += '`' + escapeBacktick(table.siblings('.columnNameSelect').first().val()) + '`';
     if (criteriaDiv.find('.criteria_rhs').first().val() === 'text') {
         var formatsText = getFormatsText();
diff --git a/js/src/modules/functions.ts b/js/src/modules/functions.ts
@@ -3647,25 +3647,28 @@ function onloadLoginForm () {
  * @param $inputField
  */
 function toggleDatepickerIfInvalid ($td, $inputField) {
-    // Regex allowed by the Datetimepicker UI
-    var dtexpDate = new RegExp([
-        '^([0-9]{4})',
-        '-(((01|03|05|07|08|10|12)-((0[1-9])|([1-2][0-9])|(3[0-1])))|((02|04|06|09|11)',
-        '-((0[1-9])|([1-2][0-9])|30)))$'
-    ].join(''));
-    var dtexpTime = new RegExp([
-        '^(([0-1][0-9])|(2[0-3]))',
-        ':((0[0-9])|([1-5][0-9]))',
-        ':((0[0-9])|([1-5][0-9]))(.[0-9]{1,6}){0,1}$'
-    ].join(''));
-
-    // If key-ed in Time or Date values are unsupported by the UI, close it
-    if ($td.attr('data-type') === 'date' && ! dtexpDate.test($inputField.val())) {
-        $inputField.datepicker('hide');
-    } else if ($td.attr('data-type') === 'time' && ! dtexpTime.test($inputField.val())) {
-        $inputField.datepicker('hide');
-    } else {
-        $inputField.datepicker('show');
+    // If the Datetimepicker UI is not present, return
+    if ($inputField.hasClass('hasDatepicker')) {
+        // Regex allowed by the Datetimepicker UI
+        var dtexpDate = new RegExp([
+            '^([0-9]{4})',
+            '-(((01|03|05|07|08|10|12)-((0[1-9])|([1-2][0-9])|(3[0-1])))|((02|04|06|09|11)',
+            '-((0[1-9])|([1-2][0-9])|30)))$'
+        ].join(''));
+        var dtexpTime = new RegExp([
+            '^(([0-1][0-9])|(2[0-3]))',
+            ':((0[0-9])|([1-5][0-9]))',
+            ':((0[0-9])|([1-5][0-9]))(.[0-9]{1,6}){0,1}$'
+        ].join(''));
+
+        // If key-ed in Time or Date values are unsupported by the UI, close it
+        if ($td.attr('data-type') === 'date' && ! dtexpDate.test($inputField.val())) {
+            $inputField.datepicker('hide');
+        } else if ($td.attr('data-type') === 'time' && ! dtexpTime.test($inputField.val())) {
+            $inputField.datepicker('hide');
+        } else {
+            $inputField.datepicker('show');
+        }
     }
 }
 
diff --git a/libraries/classes/Controllers/ChangeLogController.php b/libraries/classes/Controllers/ChangeLogController.php
@@ -81,7 +81,7 @@ public function __invoke(ServerRequest $request): void
 
             // CVE/CAN entries
             '/((CAN|CVE)-[0-9]+-[0-9]+)/' => '<a href="' . Url::getFromRoute('/url') . '&url='
-                . 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=\\1">\\1</a>',
+                . 'https://www.cve.org/CVERecord?id=\\1">\\1</a>',
 
             // PMASAentries
             '/(PMASA-[0-9]+-[0-9]+)/' => '<a href="'
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
@@ -559,6 +559,8 @@ public static function isAllowedDomain(string $url): bool
             'www.github.com',
             /* Percona domains */
             'www.percona.com',
+            /* CVE domain */
+            'www.cve.org',
             /* Following are doubtful ones. */
             'mysqldatabaseadministration.blogspot.com',
         ];
diff --git a/public/themes/pmahomme/scss/_tables.scss b/public/themes/pmahomme/scss/_tables.scss
@@ -9,7 +9,6 @@
 
   th {
     color: $th-color;
-    text-align: left;
   }
 
   td {
diff --git a/templates/database/structure/overhead.twig b/templates/database/structure/overhead.twig
@@ -1,4 +1,3 @@
 <a href="{{ url('/table/structure', table_url_params) }}#showusage" id="overhead">
-  <span>{{ formatted_overhead }}</span>&nbsp;
-  <span class="unit">{{ overhead_unit }}</span>
+  <span>{{ formatted_overhead }}</span>&nbsp;<span class="unit">{{ overhead_unit }}</span>
 </a>

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`	`th {`
`11`	`11`	`color: $th-color;`
`12`		`- text-align: left;`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`td {`