Commit Graph

141 Commits

Author SHA1 Message Date
Kamil Tekiela
6264f6f1ea
Various refactorings 2 (#17965)
* Remove extra blank lines
* Remove useless param annotations
* Refactor Index::singleton
* Refactor Config.php
* Refactor Header::addRecentTable()
* Collapse return statement into a single line
* Refactor Message.php
* Convert $getUniqueCondition into a scalar
* Code style
* Fix invalid return phpdoc
* Remove unused variable
* Remove redundant empty array checks
* Refactor Export::closeFile()
* Simplify else statement
* Remove redundant else
* Refactor TablePartitionDefinition::getDetails
* Simpler returns
* Add types for getCellContent()
* Remove useless method mngInsideStructComm

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-24 12:54:23 -03:00
Maurício Meneghini Fauth
13890a947a
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-16 11:53:18 -03:00
William Desportes
9c4a90137d
Fix #16988 - export as CSV/JSON/SQL/... no database selected
Fixes: #16988

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 23:27:07 +01:00
Maurício Meneghini Fauth
d0d90551c3 Remove the dblist global variable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-13 21:08:00 -03:00
Maurício Meneghini Fauth
32d06ae22e
Extract schema export from schema plugins
Moves the response handling to the SchemaExportController.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-12 12:56:48 -03:00
Maurício Meneghini Fauth
b62062b3aa
Refactor Export::processExportSchema() to use DatabaseName object
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-11 00:57:24 -03:00
Kamil Tekiela
3b49a5bedb Implement quoteString()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-11-06 19:06:48 +00:00
Maurício Meneghini Fauth
c88152cf59
Use more specific exceptions for some errors
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-31 22:32:12 -03:00
Maurício Meneghini Fauth
62530b48a5
Replace Core::fatalError with an exception in Export::processExportSchema()
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-31 20:25:51 -03:00
Umang Patel
fdb5528648
Use Database type instead of string (#17746)
* Refactored tryColumnCreationQuery function inside CreateAddField to use DatabaseName type instead of string
* Refactored exportDatabase and lockTables function to use DatabaseName type instead of string for database name

Signed-off-by: Umang Patel <umang.patel@healthengine.com.au>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-20 21:34:10 -03:00
Maurício Meneghini Fauth
b054d0091e
Merge pull request #17807 from kamil-tekiela/table-dbi
Pass $dbi as argument to Table
2022-10-18 11:08:36 -03:00
Kamil Tekiela
2c416128e5 Pass as argument to Table
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-10-17 22:30:33 +01:00
Kamil Tekiela
32d93281bb Make alias merging cleaner
No useless globals, no overwriting of the same value. The values seem to always be string|null so let's check explicitly for that.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-10-17 14:43:28 +01:00
Kamil Tekiela
1e7997b761 Set property type to string
It must be string as it's used only in string context.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-10-17 14:43:28 +01:00
Kamil Tekiela
53b832211c Make the condition clearer
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-10-17 14:43:28 +01:00
Kamil Tekiela
fd5c96e250 This should only check for empty string
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-10-17 14:43:28 +01:00
Maurício Meneghini Fauth
3890d11dd8
Fix some coding style issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-16 17:18:54 -03:00
Maurício Meneghini Fauth
059705f06e
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-11 19:53:54 -03:00
Kamil Tekiela
c19f6ae9ce Fix isNumeric
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-10-10 15:02:15 +01:00
Maurício Meneghini Fauth
bb97ed988f
Reduce usage of the containerBuilder global variable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-29 22:36:46 -03:00
Maurício Meneghini Fauth
873eb098b9
Remove crlf global variable
The crlf global variable is only diferent for SQL export method,
otherwise is always the value of the PHP_EOL constant.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-13 14:08:57 -03:00
Maurício Meneghini Fauth
3c618c22a9
Add ServerRequest parameter to all controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-28 01:00:08 -03:00
Maurício Meneghini Fauth
a7a7490e15
Merge pull request #17579 from kamil-tekiela/ExportController
Refactor getHtmlForDisplayedExportHeader
2022-06-11 01:20:44 -03:00
Kamil Tekiela
1b663ab3bc Refactor getHTMLForBackButton
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-06-10 21:13:22 +01:00
Maurício Meneghini Fauth
775108a527
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-10 03:16:58 -03:00
Kamil Tekiela
cb06b06bda Refactor getHtmlForDisplayedExportHeader
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-06-02 23:06:36 +01:00
Liviu-Mihail Concioiu
d14e5a74f8 Fix export limit size calculation
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2022-05-31 08:22:25 +02:00
Maurício Meneghini Fauth
5950693fb3
Fix possible undefined globals
Related to https://github.com/phpmyadmin/phpmyadmin/pull/17427.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-10 18:05:21 -03:00
Maurício Meneghini Fauth
1438cb211e
Replace global keyword with $GLOBALS
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-07 17:31:11 -03:00
Maurício Meneghini Fauth
0bee94b27e
Merge branch 'QA_5_1-security' into master-security
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-11 14:31:56 -03:00
Maurício Meneghini Fauth
02e8588404
Merge branch 'QA_4_9-security' into QA_5_1-security
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-10 18:39:23 -03:00
Maurício Meneghini Fauth
6f0d19f394
Do not encrypt params if used in data-post attribute
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-10 12:19:43 -03:00
Kamil Tekiela
3d8a167eff Remove Chrome < 43 check as this version is no longer supported
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-08 15:26:52 +00:00
Kamil Tekiela
ce527035c2 PHPStan checkAlwaysTrueCheckTypeFunctionCall fixes
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-08 15:26:52 +00:00
Maurício Meneghini Fauth
fbd5b0a67c
Redesign the export/import pages to use Bootstrap components
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-11-25 13:37:47 -03:00
Maurício Meneghini Fauth
3e0856c77b
Remove useless string concatenations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-27 21:40:22 -03:00
Maurício Meneghini Fauth
f00d70cccb
Remove useless whitespaces
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-15 17:05:40 -03:00
Maurício Meneghini Fauth
9f3510d11a
Add bool return type where possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-14 20:11:51 -03:00
Maurício Meneghini Fauth
bfaf16f56b
Use only callable controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-11 15:20:46 -03:00
Maurício Meneghini Fauth
96adfe37f4
Extract actions from controllers to new ctrls
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-06 18:30:21 -03:00
Maurício Meneghini Fauth
5f4fd07483
Remove some assignments to the $_POST global
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-03 15:49:39 -03:00
Maurício Meneghini Fauth
a2ed4dfe68
Make controllers callable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-08-30 13:16:29 -03:00
Maurício Meneghini Fauth
04d3c83559
Fix some errors found by PHPStan/Psalm
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-08-05 16:09:08 -03:00
William Desportes
9373c8ec70
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-22 14:51:35 +02:00
William Desportes
d281dcc0bd
Fix #17026 - Handle possible invalid boolean values injected in SaveDir or UploadDir
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-22 12:59:54 +02:00
Maximilian Krög
808cd82780
Use negative length with mb_substr where possible
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2021-07-18 23:59:46 +02:00
Maurício Meneghini Fauth
355f6d9d20
Remove PhpMyAdmin\Config::enableBc method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-09 13:59:04 -03:00
Maurício Meneghini Fauth
1129b68d29
Refactor PhpMyAdmin\Plugins::getPlugin method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-25 17:40:20 -03:00
Maurício Meneghini Fauth
21431578db
Fix some errors found by PHPStan and Psalm
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-24 18:03:14 -03:00
Maurício Meneghini Fauth
1c084de30b
Fix coding standard errors
Related to 62f142c9fa.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-03 16:50:33 -03:00