1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Commit Graph

120 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
d01e1c26b9 Fix active page on navigation bar
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-26 15:14:17 -03:00
William Desportes
803d07d868 Merge branch 'QA_5_0' into 'master'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-23 14:19:56 +02:00
William Desportes
b8527d90dd Fix typo introduced by 1af61f88b3
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-23 13:49:25 +02:00
William Desportes
1af61f88b3 Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-23 12:34:24 +02:00
William Desportes
027f39057a Merge branch 'QA_4_9' into QA_5_0
- Fixed css img urls for designer

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-23 12:22:37 +02:00
William Desportes
6d0f3083ca Fix display field can return a boolean
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-23 12:15:21 +02:00
William Desportes
a23f2ba51a Fix some bugs with strange table and database names
- Fix export
- Fix split on . to have db and table
- Replace some $_REQUEST occurences
- Add translations to "add tables from another database" : "None" > strNone
- Refactor the ugly code that used globals to use an object "DesignerTable"
- Fix save a new added table
- Fix delete page items
- Fix more bugs

Fixes: #15446
Fixes: #13370
Fixes: #14945
Closes: #15438

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-23 00:55:41 +02:00
Hugues Peccatte
de57539fb7 Build "tables list" in JS
This will allow to have the list generation in only one place, as the tables can now be added on the fly. So JS also needs to add items to this list.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-08-21 00:01:17 +02:00
Hugues Peccatte
14ba5a1b24 Retrieve DB instead of relying on current one
When adding a table to the designer, it is useful to know the DB of this table to be able to jump to its structure.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-08-20 22:23:35 +02:00
Maurício Meneghini Fauth
c3c58e6cd4 Use the router for the database QBE page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-07 23:43:44 -03:00
Maurício Meneghini Fauth
18a9d4f9db Use the router for the multi table query page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-07 23:00:18 -03:00
Hugues Peccatte
0d8f6a3a93 Merge isset and unset calls
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-07-16 23:21:25 -03:00
Hugues Peccatte
04616ff7fe Import instead of using FQN
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-07-05 23:21:14 +02:00
William Desportes
a2268169ae Use strict compare for count function
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-06-22 17:44:49 +02:00
William Desportes
6cc352ac12 phpstan level 3 fixes
21 errors left

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-06-22 14:37:38 +02: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
c9129e9bd8 Remove unnecessary string concatenation
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-12 17:47:33 -03:00
Maurício Meneghini Fauth
7be0f6bfae Reference class names in use statements
Sort use statements

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-12 00:14:26 -03:00
Hugues Peccatte
9abd308837 Inject dependencies (#15271)
Inject dependencies instead of building them.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-06-01 15:13:41 -03:00
Hugues Peccatte
ff3325870f Remove unused variables
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-14 21:59:57 +02:00
Maurício Meneghini Fauth
422cd3ade2 Merge pull request #15258 from Tithugues/feature/use-strpos-instead-of-strstr
Use "strpos" instead of "strstr" to improve performances
2019-05-08 14:20:45 -03:00
Hugues Peccatte
69895e4bb1 Use "strpos" instead of "strstr" to improve performances
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-07 23:58:05 +02:00
Hugues Peccatte
4b628b6553 Replace class name as string by ":class"
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-07 22:56:59 +02:00
William Desportes
40cc2dc813 Fix @var comments to match the phpdoc reference
See: http://docs.phpdoc.org/references/phpdoc/tags/var.html

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-01 10:54:43 +02:00
William Desportes
e453ad1320 Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-04-27 19:15:57 +02:00
William Desportes
5566aa6976 Fix #15228 - Notice - Undefined index: foreign_keys_data
Fixes: #15228
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-04-26 23:45:20 +02:00
William Desportes
292d2db727 Merge branch 'QA_4_8' 2019-04-01 20:46:54 +02:00
William Desportes
b6b9926a08 Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-04-01 16:27:24 +02:00
William Desportes
a80785198d Fix #15141 - php notice Undefined index: designer_settings
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-04-01 16:12:24 +02:00
Maurício Meneghini Fauth
21e2ca4c4c Fix some PHPStan and phpcs errors
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-03-19 15:17:41 -03:00
Maurício Meneghini Fauth
e49d46b277 Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-28 14:51:43 -02:00
Hugues Peccatte
f06883d2a7 Remove useless parenthesis
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-20 01:23:53 +01:00
Hugues Peccatte
9406e922cc Update PHPDoc
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-13 09:52:46 +01:00
Maurício Meneghini Fauth
ae20364830 Upgrade phpmyadmin/coding-standard to v1.0
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-08 01:26:26 -02:00
Maurício Meneghini Fauth
23c3579804 Format array declarations
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-07 14:31:39 -02:00
Maurício Meneghini Fauth
4cee0cbc12 Adds space after not (!) and type cast
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-05 21:56:34 -02:00
Maurício Meneghini Fauth
3a7e1503ac Fix some coding standard errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-04 19:42:10 -02:00
Madhura Jayaratne
d676d6941f Issue phpmyadmin-security/267 SQL injection in Designer feature
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2018-12-26 22:48:47 +11:00
Maurício Meneghini Fauth
ef5d7dd66b Use Bootstrap buttons component
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 01:01:12 -02:00
Maurício Meneghini Fauth
9eba565bf4 Remove unnecessary HTML closing tags
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 00:12:54 -02:00
Maurício Meneghini Fauth
76d8bfdafa Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-12 21:04:19 -02:00
Madhura Jayaratne
048670f1a5 Merge branch 'QA_4_8' into QA_4_8-security 2018-12-07 16:33:18 +11:00
William Desportes
69fb1d0237 Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-30 23:50:56 +01:00
William Desportes
cc2b1c8b99 Fix #14352 - JavaScript errors with Designer
Closes: #14352

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-30 11:29:31 +01:00
William Desportes
18c23df20f Issue #13032 - fix designer on QA_4_8
Used cherry-pick : Merge pull request #14376 from williamdes/issue-13032-designer

Cherry-picked-from: cb2dae58be

Issue #13032 - fix designer

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-29 20:19:02 +01:00
Tomas Votruba
637fe6de06 [cs] remove unused brackets, clean unused property assign
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
2018-11-26 17:54:40 +01:00
Tomas Votruba
bf720bad29 remove unused and fix @param, @var and @return annotation values
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
2018-11-24 21:47:26 +01:00
Maurício Meneghini Fauth
0be9a53fcf Retrieve parameters from $_POST in db_search.php
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-10 20:48:59 -02:00
Maurício Meneghini Fauth
6c03ebad38 Retrieve parameters from $_POST in database QBE
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-10 20:48:58 -02:00
Maurício Meneghini Fauth
28a8452d23 Fix uncaught TypeError in database QBE
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-02 23:00:05 -03:00