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

519 Commits

Author SHA1 Message Date
Kamil Tekiela
2d3c4bf749 Minor code simplifications
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
William Desportes
007915bc0a Merge branch 'QA_5_2'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-10-14 20:49:18 +02:00
Kamil Tekiela
dcdbcc019b Fix method casing
Ref: https://github.com/tecnickcom/TCPDF/pull/462

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-10-14 20:44:26 +02: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
9d2350d28c Extract dbi global variable from Index::loadIndexes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-07 21:59:03 -03:00
Maurício Meneghini Fauth
10b937511d Replace $analyzedSqlResults array with StatementInfo object
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-24 21:35:30 -03:00
Maurício Meneghini Fauth
4d7cb34a68 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-15 17:27:03 -03:00
Maurício Meneghini Fauth
9f076774e5 Remove table-light CSS classes
These classes were added by 6408b7179a.
However they aren't exactly the same as thead-light classes that exists
in Bootstrap 4.

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

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-14 17:31:31 -03:00
Maurício Meneghini Fauth
4750e0f234 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-11 15:07:07 -03:00
Maurício Meneghini Fauth
1c7aab1a4d Fix issue reported by Psalm
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-11 14:52:05 -03:00
Maurício Meneghini Fauth
7aa512c357 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-08 14:15:49 -03:00
Maurício Meneghini Fauth
a34dc9f064 Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-08 14:14:52 -03:00
Maurício Meneghini Fauth
e2c4c4a10f Replace for with foreach in Display\Results::getTable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-07 14:13:18 -03:00
Maurício Meneghini Fauth
92ce086c15 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-06 10:05:37 -03:00
Maurício Meneghini Fauth
973023737f Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-06 09:52:52 -03:00
Maurício Meneghini Fauth
29170a28f9 Remove UI props if cached fields count differs from actual
- Fixes #17428
- Fixes #17498

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-05 22:33:58 -03:00
Maurício Meneghini Fauth
6dc859cbc2 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-28 15:56:18 -03: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
6d54ac471a Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-23 14:35:34 -03:00
Maurício Meneghini Fauth
d70644ecf0 Extract results nav buttons into table template
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-13 21:26:15 -03: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
c482cd47ef Remove gridEditingConfig JS global
- Uses data attribute instead.
- Uses Bootstrap's tooltip instead of the jQuery plugin.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-14 23:19:29 -03:00
Lukas Bixen
78544d04d8 Fix navigation layout if row count unknown:
Remove 'End' button and fix missing separator

Signed-off-by: Lukas Bixen <lrb2_@outlook.com>
2022-02-07 20:46:44 -06:00
Maurício Meneghini Fauth
bc58521a17 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-07 13:55:53 -03:00
Maurício Meneghini Fauth
b59d46bc8d Fix some Psalm errors after #17059 merge
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-07 13:44:53 -03:00
Philip Kroloq
8bd45c8ec0 fixed missing navigation buttons in view result tables
Signed-off-by: Philip Kroloq <kroloq@web.de>
(cherry picked from commit 09aaa10b33)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-07 13:03:06 -03:00
Maurício Meneghini Fauth
b5096a42e5 Merge pull request #17059 from kroloq/fix-navigation-buttons-on-views
Fix #17055 - missing navigation buttons on views
2022-02-07 13:01:02 -03:00
William Desportes
a7b222db8a Merge branch 'origin/QA_5_2'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-02-06 15:47:17 +01:00
William Desportes
65c9f49c1e Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-02-06 15:45:57 +01:00
Kamil Tekiela
b5a6729886 Fix #17239 - Repeating headers are not working
Ref: 97810b3a21

igned-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-02-06 01:37:22 +01:00
William Desportes
c5dba46ca4 fix a coding standard unsolvable case
Moving the return line did not help, so I removed it

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-02-04 18:42:33 +01:00
Maurício Meneghini Fauth
dca5b1b893 Create the DisplayParts class
Replaces the displayParts array with the DisplayParts object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-03 14:42:09 -03:00
William Desportes
4bea65e29a Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-02-03 13:47:51 +01:00
William Desportes
3bd3ee074c Fix #17315 - Unsupported operand types in Results.php
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-02-03 13:40:20 +01: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
0b575ff2e9 Fix URL encryption for Util::linkOrButton method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-10 12:19:44 -03:00
Kamil Tekiela
6e8a04c4ab Remove redundant condition
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:38:21 +00:00
Kamil Tekiela
0cd422954b Remove redundant arguments
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:38:21 +00:00
Kamil Tekiela
75b5c3241c Remove optional $onclick parameter
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:38:21 +00:00
Kamil Tekiela
cf16a3c55a Remove redundant parentheses
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:38:21 +00:00
Kamil Tekiela
af4b8938b8 Collapse if statements into one
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:38:21 +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
8e9dfe79db Merge pull request #17243 from kamil-tekiela/Refactor-Results.php
Refactor results.php
2021-12-27 09:21:49 -03:00
Kamil Tekiela
e2dc2a9c86 Remove getUnsortedSqlAndSortByKeyDropDown()
This was stupid abstraction. This method did 2 things. When the code that prepares unsorted SQL is moved out of this method, the rest can be absorbed by getSortByKeyDropDown(). This method didn't declare any local variables, it took parameters that were just passed along to other methods. The code to get unsorted SQL was just a single instruction that was self-explanatory. Indexes relied on properties so they didn't need to be a parameter to the other method.

This method only added complexity instead of reducing it.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-26 23:10:34 +00:00
Kamil Tekiela
7a735ddf92 Redesign CSS class generation
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-26 23:10:34 +00:00
Kamil Tekiela
9969b9d103 $printview global is always null
The variable is not set anywhere in the current codebase.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-26 23:10:34 +00:00