Commit Graph

152 Commits

Author SHA1 Message Date
William Desportes
702a9a444d
Fix "Undefined index: target_db" reported on the error reporting server
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-27 01:10:46 +01:00
Maurício Meneghini Fauth
91bd0df2e5
Rename $err_url global to $errorUrl
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-24 19:39:28 -03:00
Maurício Meneghini Fauth
caa3337411
Extract FK related methods from Util class
Creates the PhpMyAdmin\Utils\ForeignKey class.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-21 15:25:45 -03:00
Maurício Meneghini Fauth
c0e85ed76c
Add flash message support for db structure controller
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-20 18:56:35 -03:00
Maurício Meneghini Fauth
d83abf63e7
Use PSR-12 for control structures spacing
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-05 15:27:03 -03:00
Maurício Meneghini Fauth
0b8edc5bde
Use PSR-12 for namespace use statements
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-05 14:18:35 -03:00
Maurício Meneghini Fauth
1e5fbd57fc
Create Twig\AssetExtension and image Twig function
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-01-28 16:09:17 -03:00
Maurício Meneghini Fauth
3c6955fed5
Move tables export to Database\ExportController
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-12-06 14:08:36 -03:00
William Desportes
ed0c44a621
Update files to follow new coding standard rules
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-11-16 19:36:52 +01:00
Maurício Meneghini Fauth
c11e8d5f64 Remove Common::database method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-11-02 18:56:58 -03:00
Maurício Meneghini Fauth
71c2f2d99a Remove is_show_stats PHP global variable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-11-02 18:48:23 -03:00
Maurício Meneghini Fauth
e7bdd39ae6 Remove DBI dep from Database\AbstractController
Moves the DatabaseInterface class dependency to the classes that use it.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-12 10:46:27 -03:00
Maurício Meneghini Fauth
bb32ba6d9c Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-04 12:31:43 -03:00
Maurício Meneghini Fauth
ea163ffcae Move CentralColumns to the Database namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-30 10:14:22 -03:00
Maurício Meneghini Fauth
5aa2856f7f Remove Util::buildActionTitles and the titles global
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-12 22:50:08 -03:00
Maurício Meneghini Fauth
cd862d4f00 Remove replication_info global variable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-12 09:04:44 -03:00
Maurício Meneghini Fauth
c57dda7315 Use DI for Sql class constructor
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-05 15:31:39 -03:00
Maurício Meneghini Fauth
ceac762e09 Remove pmaThemePath and pmaThemeImage PHP globals
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-02 10:57:57 -03:00
Maurício Meneghini Fauth
46f28b42c9 Extract the Table\MaintenanceController class
Extracts the table maintenance action methods from
the Database\StructureController class to the
new Table\MaintenanceController class and adjust templates
and routes names.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-27 23:33:43 -03:00
Maurício Meneghini Fauth
620cb0a705 Create a dedicated page for Repair Table
Instead of only showing the query results.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-27 22:38:24 -03:00
Maurício Meneghini Fauth
98a1943b35 Create a dedicated page for Optimize Table
Instead of only showing the query results.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-27 22:26:19 -03:00
Maurício Meneghini Fauth
c1ad98f83d Create a dedicated page for Checksum Table
Instead of only showings the query results.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-27 21:59:48 -03:00
Maurício Meneghini Fauth
5c06dede81 Create a dedicated page for Analyze Table
Instead of only showing the query results.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-27 21:12:12 -03:00
Maurício Meneghini Fauth
c112bfd6d6 Create a new page for Check Table
Instead of only showing the query results.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-27 14:22:22 -03:00
Maurício Meneghini Fauth
d0716e9d31 Remove Display\CreateTable::getHtml
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-29 21:49:55 -03:00
Maurício Meneghini Fauth
1dccc10493 Extract method for adding script files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-12 16:58:33 -03:00
Maurício Meneghini Fauth
f8320956ee Remove Config\PageSettings::showGroup method
Related to https://github.com/phpmyadmin/phpmyadmin/issues/16258.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-12 16:01:18 -03:00
Maurício Meneghini Fauth
918b1f38c6 Change return type of Sql::executeQueryAndSendQueryResponse
Remove Response::addHTML call.

Related to https://github.com/phpmyadmin/phpmyadmin/issues/16258.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-12 15:22:57 -03:00
Maurício Meneghini Fauth
3b285ff17e Use identical operator for non-empty strings
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-10 18:06:29 -03:00
Maurício Meneghini Fauth
a22f7b1b7a Fix some PHPStan errors
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-04 00:00:59 -03:00
Maurício Meneghini Fauth
2a981907d6 Extract copy action from db structure index method
Fixes #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-24 21:10:11 -03:00
Maurício Meneghini Fauth
a05557a273 Extract copy with prefix from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-24 20:55:22 -03:00
Maurício Meneghini Fauth
427bd8dfdf Extract replace prefix from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-21 18:54:14 -03:00
Maurício Meneghini Fauth
b91e9784ba Extract add prefix from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-21 02:34:55 -03:00
Maurício Meneghini Fauth
7ce0ae202d Fix missing message after dropping tables
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-21 01:54:48 -03:00
Maurício Meneghini Fauth
7cca45723e Extract empty action from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-21 01:40:24 -03:00
Maurício Meneghini Fauth
c9c17a2946 Extract drop action from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-21 00:08:25 -03:00
Maurício Meneghini Fauth
be5e055b9e Extract repair action from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-20 19:35:51 -03:00
Maurício Meneghini Fauth
d1e10a9158 Extract optimize action from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-20 15:09:10 -03:00
Maurício Meneghini Fauth
ec0c941dc8 Extract checksum action from db structure index method
Related to #16173;

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-20 01:49:37 -03:00
Maurício Meneghini Fauth
4ee25bee29 Extract analyze action from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-17 20:36:43 -03:00
Maurício Meneghini Fauth
f3e5a30102 Extract check action from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-17 17:47:02 -03:00
Maurício Meneghini Fauth
b64e41fb8f Use early exit for db structure multiSubmitAction method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-17 14:54:47 -03:00
Maurício Meneghini Fauth
9b0173c207 Extract empty form action from db structure index method
Related to #16173 and #15248.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-17 14:35:07 -03:00
Maurício Meneghini Fauth
0befcf6432 Extract drop action from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-16 19:46:19 -03:00
Maurício Meneghini Fauth
63a41eba87 Extract change prefix form from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-16 15:14:22 -03:00
Maurício Meneghini Fauth
11df26d9ab Extract add prefix form from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-13 23:28:04 -03:00
Maurício Meneghini Fauth
982914922b Extract make consistent action from db structure index
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-13 17:58:50 -03:00
Maurício Meneghini Fauth
e7a35f8e50 Extract central col remove from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-13 14:22:48 -03:00
Maurício Meneghini Fauth
0ec86b7b0f Extract central col add action from db structure index method
Related to #16173.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-12 15:56:07 -03:00
Maurício Meneghini Fauth
058729db08 Extract copy form action from db structure index method
Related to #16173 and #15248.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-12 14:39:29 -03:00
Maurício Meneghini Fauth
31e484ac75 Extract showCreate logic from templates
Create the Database\StructureController::getShowCreateTables method.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-12 01:09:08 -03:00
Maurício Meneghini Fauth
d7bc1d9e4f Extract show-create action from db structure index method
Related to #16173

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-11 23:35:27 -03:00
Maurício Meneghini Fauth
4e8484229a Extract export action from db structure index method
Related to #16173

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-11 21:48:36 -03:00
Maurício Meneghini Fauth
58eee2e371 Use early exit when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-27 21:46:12 -03:00
Maurício Meneghini Fauth
f4582e083e Use early exit when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-27 00:35:24 -03:00
Maurício Meneghini Fauth
94955f187a Fix function call signatures indentation
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 04:22:02 -03:00
Maurício Meneghini Fauth
3ae05c785d Use short list syntax and single line arrays
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 03:32:59 -03:00
Maurício Meneghini Fauth
3baad2eb1c Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-25 22:42:37 -03:00
William Desportes
0138cb471f
Some minor code improvements
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-17 22:29:57 +02:00
William Desportes
9bc55b2bc9
Remove some unused variable assignements
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-15 22:44:50 +02:00
Maurício Meneghini Fauth
a64393e7f5 Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-13 00:23:28 -03:00
Maurício Meneghini Fauth
4a0bce1d53 Extract db structure bulk actions from mult_submits
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-04-22 23:13:35 -03:00
Maurício Meneghini Fauth
9b7c4931d3 Add AbstractController::render method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-04-16 20:15:42 -03:00
William Desportes
01cd7dc33b
Some code improvements suggested by Scrutinizer
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-02-14 22:23:16 +01:00
Maurício Meneghini Fauth
8029ea9875 Move request handling from routes to controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-02-12 15:00:02 -03:00
Maurício Meneghini Fauth
f5c970639c Move response handling from routes to controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-02-12 14:59:42 -03:00
Maurício Meneghini Fauth
206199105e Remove useless return type annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-23 13:03:29 -03:00
Maurício Meneghini Fauth
6584b01824 Use short versions of scalar types in PHP docs
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-23 12:20:04 -03:00
Maurício Meneghini Fauth
6b7af13f8f Reference global funcs and consts via use statement
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-23 00:33:24 -03:00
Maurício Meneghini Fauth
676f48349a Reference global funcs and consts via use statement
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-21 22:13:36 -03:00
Maurício Meneghini Fauth
f80d3e3bd4 Remove unnecessary annotations
@package, @subpackage and others.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 17:35:56 -03:00
Maurício Meneghini Fauth
6283caaabf Use one line for comments with a single line
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 16:04:09 -03:00
Maurício Meneghini Fauth
c231652c67 Remove useless comments in PHP docs
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 14:38:49 -03:00
Maurício Meneghini Fauth
8ec4209002 Fix some coding standard issues
- Inverts yoda comparisons
- Removes parentheses from return
- Removes useless ternary operators
- Adds paretheses to new instances
- Adds trailing array comma

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 00:38:34 -03:00
Maurício Meneghini Fauth
385e7f86c0 Refactor database pages common code
Extracts db_common.inc.php code to the Common::database() method and
removes the include file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-07 22:49:24 -03:00
Maurício Meneghini Fauth
08afb43653 Remove replication.inc.php file
Extracts the replication.inc.php code to the ReplicationInfo class and
removes the file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-07 14:31:46 -03:00
William Desportes
666e06904d
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-30 17:38:28 +01:00
William Desportes
8033c15fe6
Fix #15722 - Get Database structure fails with PHP error on replicated server
Fixes: #15722
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-30 17:37:49 +01:00
Maurício Meneghini Fauth
39f42f848b Remove some useless docblock comments
Fixes docblock spacing

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-13 21:15:00 -03:00
Maurício Meneghini Fauth
f6a17433a2 Use null coalesce operator when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-11 20:16:58 -03:00
Maurício Meneghini Fauth
351e34ecf5 Upgrade PHPStan to version 0.12.0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-07 20:26:39 -03:00
Maurício Meneghini Fauth
dd06cd38f8 Defines rules for double quote usage
Makes sure that any use of double quotes strings are warranted.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-01 14:10:07 -03:00
Hugues Peccatte
3255e4ad7b Split Util class regarding the responsabilities (#15567)
PhpMyAdmin\Util is a very huge class with a lot of responsabilities.

There is a lot of work to split it, but this may be just a small start, waiting for a more normalized code.

* Split Util class regarding the responsabilities
* Split the buttonOrImage function

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-11-21 20:20:05 -03:00
Maurício Meneghini Fauth
acd62791b8 Move database structure entry point to routes file
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-11-03 21:01:00 -03:00
Oleg Abrazhaev
43e1d4cade use twig in Structure and Variables controller and add missing tests #14801 (#15534)
* use twig in Structure and Variables controller and add missing tests #14801

Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>

* fix lint

Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>

* Update templates/database/structure/overhead.twig

fix code review

Co-Authored-By: Maurício Meneghini Fauth <mauricio@fauth.dev>

* Update libraries/classes/Controllers/Database/StructureController.php

fix code review

Co-Authored-By: Maurício Meneghini Fauth <mauricio@fauth.dev>

* fix code review

Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>
2019-10-29 22:48:29 -03:00
Maurício Meneghini Fauth
1a14b3e4d3 Remove vim modelines
These settings are no longer required as they are guaranteed through
other coding standard tools.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-02 09:43:21 -03:00
Maurício Meneghini Fauth
208b0e25e1 Use the router for the sql pages
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-03 21:25:27 -03:00
Maurício Meneghini Fauth
efe576cdc0 Fix double encoding in database struture page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-07-22 23:24:52 -03:00
Maurício Meneghini Fauth
aec0402679 Use the router for table structure page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-07-19 20:18:06 -03:00
Maurício Meneghini Fauth
682e7a160e Use the router for database structure page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-07-18 14:33:43 -03:00
Maurício Meneghini Fauth
064e5eef0a Use Collation value object when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-28 23:01:30 -03:00
Maurício Meneghini Fauth
e1f9ae00cd Add a trailing comma in multi-line arrays
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-14 14:09:26 -03:00
Maurício Meneghini Fauth
0feae32056 Rename Sanitize::sanitize to Sanitize::sanitizeMessage
...to avoid the PHP 4 constructor format

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-12 15:21:48 -03:00
William Desportes
96fc4d45af
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-06-03 21:29:07 +02:00
Maurício Meneghini Fauth
dfd49d16b8 Fix ESLint warnings in js/functions.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 17:30:16 -03:00
Hugues Peccatte
380707fbcd Define controllers as services in an external configuration file
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-19 01:54:44 +02:00
Hugues Peccatte
3243a9158d Remove use of unexisting variables
Remove useless variables

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-11 00:34:57 +02:00
Maurício Meneghini Fauth
0305c0a2c2 Rename Database\Controller to Database\AbstractController
Rename PhpMyAdmin\Controllers\Database\Controller to PhpMyAdmin\Controllers\Database\AbstractController

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-03-11 15:04:28 -03:00
Maurício Meneghini Fauth
e700760685 Refactor Controllers\Database\StructureController
Move request and response handling to db_structure.php

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-03-03 23:20:48 -03:00