Commit Graph

123578 Commits

Author SHA1 Message Date
Eric P
85bb635361
Set data type should be an array in column_row.twig template (#17650)
The column_row.twig template that was introduced with version 5.2.0 seems to define set fields as single values rather than as array values. This causes any inserts to set fields to fail and result in a blank page.

The previous version had sets properly defined as arrays:
https://github.com/phpmyadmin/phpmyadmin/blob/RELEASE_5_1_4/libraries/classes/InsertEdit.php#L1307

Fixes: #17557

Signed-off-by: Eric Perrino <ericpp@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-22 13:44:22 -03:00
Liviu-Mihail Concioiu
9f395c7ca3
Disable translate options on Edge/Chrome browsers (#17653)
* Disable translate options on Edge/Chrome browsers

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-21 22:57:31 -03:00
Maurício Meneghini Fauth
dbe3db564e
Fix Enum/Set editor error when creating a new column
Fixes #17551

https://github.com/phpmyadmin/phpmyadmin/issues/17551#issuecomment-1136074722

Co-authored-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-20 20:54:07 -03:00
Maurício Meneghini Fauth
fda386a998
Fix LanguageTest failing test when locale file is missing
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19 18:52:03 -03:00
Ankush Patil
987cb5043d
fixed find replace regex issue if no matching result set found
When find and replace searching used with regex, at the time of replace
empty CASE END condition was causing issue.

Fixes #17388
Closes #17641

Signed-off-by: Ankush Patil <aspraz2658@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19 15:28:43 -03:00
Maurício Meneghini Fauth
f82e460805
Upgrade JavaScript dependencies
- Bumps Bootstrap version to 5.2.0
- Bumps OpenLayers version to 6.15.1

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19 14:50:46 -03:00
Angelo Grebenarov
64f2c7b360
Fixed broken filtering - ticket #17593
Fixes #17593
Closes #17610

In (Page-related settings) -> (Where to show the table row links) there
are 4 options: Left, Right, Both, and Nowhere.
The 3 dummy elements (mentioned in this ticket) are only needed for
Left, Both, and Nowhere... and they are NOT needed for "Right".
Since the main thing that distinguishes the "Right" position from the
other 3 is - "colspan", my code checks for the presence of "colspan"
on the first existing (non-dummy) element, and then decides whether
or not to add the 3 additional dummy- elements.

Signed-off-by: Angelo Grebenarov <grebenarov@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19 13:47:16 -03:00
atomu330
6957064cea
replace isset to empty
IF statement ! isset($this->uiprefs) was causing issue.

Private property 'uiprefs' is initialized to empty array, so ! isset($this->uiprefs) is always FALSE;
It's not hopefull, so I replace ! isset($this->uiprefs) to empty($this->uiprefs) to fix #17617 bug;

Fixes #17617
Closes #17644

Signed-off-by: Atomu Oku <atomu.work@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19 13:04:59 -03:00
Maurício Meneghini Fauth
ddb4d5b730
Bump jquery-validation version from 1.19.3 to 1.19.5
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-18 15:31:14 -03:00
Maurício Meneghini Fauth
519522428e
Fix some languages not getting correctly detected
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-15 21:32:22 -03:00
William Desportes
f5dac447a0
Cleanup paragonie/sodium_compat vendor folder
Ref: https://github.com/paragonie/sodium_compat/pull/147

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 19:49:58 +02:00
William Desportes
458e7902bc
Remove some useless files from the release bundle
Ref: https://github.com/php-fig/http-factory/pull/12

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 19:49:56 +02:00
William Desportes
024b93a441
Allow composer/ca-bundle pem file in release bundle
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 19:23:32 +02:00
William Desportes
3732dec17d
Stop allowing openssl.cnf in check release script
Ref: 124bb336fd

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 19:22:26 +02:00
William Desportes
0fb9f4c266
Fix PHP 8.2: ${var} deprecated string interpolation syntax on Git class
Ref: af7338f706

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 15:28:08 +02:00
William Desportes
fd006f1555
Write a test for Git::extractDataFormTextBody
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 15:27:33 +02:00
William Desportes
0daa68d85c
Remove ignore config.inc.php for psalm because it fails the CI
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 14:56:40 +02:00
William Desportes
9054339999
Update psalm baseline and ignore config.inc.php for psalm
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 11:50:42 +02:00
William Desportes
03e27019ad
Add a ChangeLog entry for 6a69face6c
Ref: 6a69face6c

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 11:15:43 +02:00
William Desportes
6a69face6c
Fix PHP 8.2: ${var} deprecated string interpolation syntax
Ref: https://php.watch/versions/8.2/$%7Bvar%7D-string-interpolation-deprecated

Left over to patch:
- libraries/classes/Git.php#L397
- libraries/classes/Database/Qbe.php#L878
- libraries/classes/Database/Qbe.php#L879

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 11:14:20 +02:00
William Desportes
af7338f706
Remove gd extension for PHP 8.2
It causes issues in the CI: https://github.com/phpmyadmin/phpmyadmin/runs/7313899827?check_suite_focus=true

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 11:12:59 +02:00
Kristijan Fremen Velkovski
1dfa7eafcb
Translated using Weblate (Macedonian)
Currently translated at 16.1% (553 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2022-07-13 06:14:25 +02:00
Kristijan Fremen Velkovski
a15fb85294
Translated using Weblate (Macedonian)
Currently translated at 15.9% (544 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2022-07-11 17:20:29 +02:00
William Desportes
47e7cfe761
Translated using Weblate (Indonesian)
Currently translated at 75.8% (2594 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/id/
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-09 10:14:10 +02:00
Jason Ren
b221bb2654
Translated using Weblate (Chinese (Simplified))
Currently translated at 99.8% (3414 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/zh_Hans/
Signed-off-by: Jason Ren <tempren19990743@gmail.com>
2022-07-06 20:40:55 +02:00
Artem
3975e7bb9d
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3418 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/uk/
Signed-off-by: Artem <artem@molotov.work>
2022-06-30 19:21:19 +02:00
Andriy Khyliuk
3b40c5e58f
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3418 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/uk/
Signed-off-by: Andriy Khyliuk <winfon@ukr.net>
2022-06-30 19:21:19 +02:00
Maurício Meneghini Fauth
14890914dc
Update PHPStan baseline
[ci-skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-30 01:28:52 -03:00
Kristijan Fremen Velkovski
0f8fafb1b5
Translated using Weblate (Macedonian)
Currently translated at 15.5% (532 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2022-06-28 03:09:36 +02:00
Maurício Meneghini Fauth
ee69302544
Update Psalm baseline
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-27 21:55:15 -03:00
Kristijan Fremen Velkovski
dd31dd245b
Translated using Weblate (Macedonian)
Currently translated at 15.2% (521 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2022-06-28 01:47:12 +02:00
Kristjan Räts
cfdc0d0302
Translated using Weblate (Estonian)
Currently translated at 100.0% (3418 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/et/
Signed-off-by: Kristjan Räts <kristjanrats@gmail.com>
2022-06-26 21:20:30 +02:00
Leonardo José de Lima Ferrucci
eb939d71e5
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (3413 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/pt_BR/
Signed-off-by: Leonardo José de Lima Ferrucci <leojau@gmail.com>
2022-06-24 00:58:09 +02:00
Artem
5068174190
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3418 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/uk/
Signed-off-by: Artem <artem@molotov.work>
2022-06-23 19:42:26 +02:00
Nelson de Barros
af8dbebb4e
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (3413 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/pt_BR/
Signed-off-by: Nelson de Barros <nelsinho.527@gmail.com>
2022-06-22 08:29:25 +02:00
AHOHNMYC
e708520a97
Translated using Weblate (Russian)
Currently translated at 97.7% (3340 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/
Signed-off-by: AHOHNMYC <lqwh2h2cwa@protonmail.com>
2022-06-18 11:20:43 +02:00
Maurício Meneghini Fauth
df8dd7792b
Fix double encoding in Show Create page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-16 22:02:35 -03:00
Maurício Meneghini Fauth
9e554da5d8
Fix Symfony exception when db/table has two %%
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17584

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-16 21:20:47 -03:00
Maurício Meneghini Fauth
b6ba539194
Merge pull request #17608 from MauricioFauth/sidebar-index-links
Fix preview SQL modal not working inside Index modal
Fixes #17606
2022-06-15 21:02:54 -03:00
Maurício Meneghini Fauth
bf2add8312
Fix preview SQL modal not working inside Index modal
- Fixes #17606

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-15 20:09:13 -03:00
Bebek Lucknut
dbf52a93f7
Translated using Weblate (Indonesian)
Currently translated at 75.9% (2595 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/id/
Signed-off-by: Bebek Lucknut <bebeklucknut@gmail.com>
2022-06-15 13:20:39 +02:00
Kristjan Räts
82da6b7d2c
Translated using Weblate (Estonian)
Currently translated at 99.1% (3389 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/et/
Signed-off-by: Kristjan Räts <kristjanrats@gmail.com>
2022-06-15 13:20:38 +02:00
Maurício Meneghini Fauth
d6ee05001a
Fix error when clicking New index in sidebar
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17592

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-14 20:20:13 -03:00
Maurício Meneghini Fauth
e87d1795c9
Reduce initial height of New Routine dialog
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-14 17:22:57 -03:00
Maurício Meneghini Fauth
1a8a2b5c77
Ignore PHPCS and PHPStan errors
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-14 15:04:32 -03:00
Maurício Meneghini Fauth
bf084233ea
Add ChangeLog entry for #17586
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-11 14:04:58 -03:00
Maurício Meneghini Fauth
bc61c2f8c3
Merge pull request #17587 from liviuconcioiu/statistics
Fix #17586 Statistics not showing for empty databases

Fixes #17586
2022-06-11 11:35:19 -03:00
Maurício Meneghini Fauth
d4942baecd
Add ChangeLog entry for #17121
[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-11 11:17:04 -03:00
Maurício Meneghini Fauth
fd5300e9e0
Merge pull request #17583 from kamil-tekiela/password_hash_5_2
5.2 backport of #17582

Fixes #17121
Closes #17120
2022-06-11 10:53:46 -03:00
nathannaveen
995f6887b4
Set permissions for GitHub actions
Pull-request: #17591

Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: nathan naveen <42319948+nathannaveen@users.noreply.github.com>
2022-06-11 14:23:47 +02:00