1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-03 11:53:04 +03:00
Commit Graph

1070 Commits

Author SHA1 Message Date
William Desportes
df4e8d2221 Fix broken createProfilingChart on monitor analyse query
JQPlotChartFactory was undefined

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-10-19 17:41:29 +02:00
Maurício Meneghini Fauth
4d1546f7c5 Fix indentation issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-16 13:41:31 -03:00
Maurício Meneghini Fauth
72a6045f06 Fix some errors reported by Psalm
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-11 18:19:07 -03:00
Maurício Meneghini Fauth
5d9142674d Allow longer cookie encryption keys to be used
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-26 17:34:18 -03:00
Maurício Meneghini Fauth
0ed04a6c00 Remove trigger_error calls from HomeController
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
(cherry picked from commit c5611531c0)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-26 17:33:38 -03:00
William Desportes
6230c197dd Fix PHP warning on GIS visualization when there is only one GIS column
```
Warning in ./libraries/classes/Controllers/Table/GisVisualizationController.php#174
 Undefined array key "labelColumn"

Backtrace

Routing.php#191: PhpMyAdmin\Controllers\Table\GisVisualizationController->__invoke(
,
array,
)
./../../../../index.php#43: PhpMyAdmin\Routing::callControllerForRoute(
,
string '/table/gis-visualization',
,
,
)
```
Structure:
- A table with only one GIS column

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-09-10 14:05:34 +02: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
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
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
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
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
Maurício Meneghini Fauth
fcea0f39e8 Merge pull request #17517 from aidvu/patch-2
Revert to old behavior for `ShowServerInfo`
2022-06-06 16:30:36 -03:00
Liviu-Mihail Concioiu
479f8472b3 Fix statistics
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2022-06-06 21:12:47 +02:00
Kamil Tekiela
6d0a30a391 Fix errors in InsertEdit
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-06-04 19:06:16 +01:00
Maurício Meneghini Fauth
229d99bb81 Fix checking db and table privileges when case is sensitive
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17558

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-26 16:05:58 -03:00
Maurício Meneghini Fauth
9e4f3833a5 Fix Table\OperationsController failing test
The Partition::getPartitionNames method returns [0=>null] when no
partitions were found.

Related to 346d6c7981.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-21 16:35:36 -03:00
Maurício Meneghini Fauth
346d6c7981 Fix error in table operation page when partitions are broken
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17496

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-20 20:52:55 -03:00
Andrija Vučinić
c6bb867787 Revert to old behavior for ShowServerInfo
Seems we changed the flag behavior here: cd1b8a9b77 (diff-bb8d8aecc2e174245e8b95be9344176aba8971d024f3b2c2311b8e58ddd59b31L149)

I'm not sure whether that was intentional, but it causes the `Database server` panel to always show compared to pre 5.2.0.

Truth be told, it doesn't make sense to have that flag and then the additional checks in the block when we know it's `true`, so I updated the code to take care of that.

Signed-off-by: Andrija Vučinić <andrija.vucinic@gmail.com>
2022-05-11 22:57:55 +02:00
Maurício Meneghini Fauth
54df014550 Remove stickyfilljs JavaScript dependency
This polyfill is not needed anymore.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-27 19:47:31 -03:00
Maurício Meneghini Fauth
04f3f5a4b6 Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-26 21:03:20 -03:00
Maurício Meneghini Fauth
5d80594341 Remove jQuery SVG JS dependency
Removed by https://github.com/phpmyadmin/phpmyadmin/pull/17041.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-24 20:39:12 -03:00
Maurício Meneghini Fauth
b17700dd09 Remove PMA_IS_WINDOWS constant
Gets the value from the Config class instead.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-24 20:37:55 -03:00
Maurício Meneghini Fauth
e4f0a0d1e6 Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-21 15:54:13 -03:00
Maurício Meneghini Fauth
3c3a423727 Fix translation string in Database\DesignerController
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-21 15:38:28 -03:00
Maurício Meneghini Fauth
f7f85bb450 Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-21 12:37:29 -03:00
Maurício Meneghini Fauth
69a8c97e67 Merge pull request #17406 from mauriciofauth/add-index-bug
Fix create index form accepting too many columns
2022-02-21 11:42:04 -03:00
Maurício Meneghini Fauth
366c586330 Add better error handling when IndexedDB is not working
- Fixes #16853

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-20 19:20:34 -03:00
Maurício Meneghini Fauth
1cac3baeab Fix create index form accepting too many columns
- Fixes #16769

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-20 13:11:30 -03:00
Isaac Bennetch
985912f58f Fix merge conflicts from security branch
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2022-01-20 12:28:17 -05:00
Maurício Meneghini Fauth
411bacf613 Use Sodium for auth cookies encryption
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-13 18:46:04 -03:00
Maurício Meneghini Fauth
9b3a1f7734 Merge branch 'QA_5_1-security' into master-security
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-13 17:41:16 -03:00
Maurício Meneghini Fauth
44eb12f15a Improve query params filtering in Setup pages
Note: 'action_done' was not used since
c962ee4287.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-13 15:05:43 -03:00
Kamil Tekiela
86031d2bf6 Deimplement fetchAssoc() helper
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-09 22:44:53 +00:00
Maurício Meneghini Fauth
290f026a02 Merge pull request #17272 from kamil-tekiela/queryAsControlUser
Query as control user
2022-01-06 21:32:46 -03:00
Kamil Tekiela
73b7094b2b Remove redundant isset
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:38:22 +00:00
Kamil Tekiela
9afa59487e Collapse if statements into one
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:38:22 +00:00
Kamil Tekiela
202b17c34c Replace if with coalesce
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:38:21 +00:00
Kamil Tekiela
f5bb90ebb9 Move queryAsControlUser - Dbal refactoring pt.3
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:31:27 +00:00
Kamil Tekiela
83b4dda1a3 Change QUERY_STORE to QUERY_BUFFERED
Set the value to 0 instead of 1 and remove all unnecessary usages of this constant

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-01 01:46:01 +00:00
Kamil Tekiela
47a039d70c Implement ResultInterface & MysqliResult
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-31 23:59:24 +00:00
Maurício Meneghini Fauth
58ed5bfa9e Extract Simulate DML action from ImportController
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 18:37:15 -03:00
Maurício Meneghini Fauth
feca48cc76 Change return type of DatabaseInterface::getError method
Now, it returns last error message or an empty string instead of false
if no errors occurred.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 14:43:14 -03:00
Maurício Meneghini Fauth
2d56a8baac Move Import and ImportStatus ctrls to Controllers\Import ns
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 10:27:28 -03:00
Maurício Meneghini Fauth
2edf663611 Remove the Bookmark::getParams method
Uses BookmarkFeature class instead.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 09:31:53 -03:00
Maurício Meneghini Fauth
0cf1843e3e Fix /check-relations page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-26 19:26:04 -03:00
Maurício Meneghini Fauth
d84af02945 Create VO classes for each RelationParameters features
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-26 19:17:58 -03:00
Maurício Meneghini Fauth
c4e2582e56 Use TableName for RelationParameters tables
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-26 19:17:57 -03:00
Maurício Meneghini Fauth
ca91eaeb38 Accept mixed for DatabaseName and TableName constructors
This avoids redundant type assertions.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-23 16:25:05 -03:00
Maurício Meneghini Fauth
4e0141e19f Merge pull request #17253 from kamil-tekiela/fetchValue
Remove $row_number from DatabaseInterface::fetchValue
2021-12-23 11:40:25 -03:00