1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-25 06:39:48 +03:00

122 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
2fb2477af5 Add phpstan/phpstan-deprecation-rules package
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-09-30 17:14:50 -03:00
Liviu-Mihail Concioiu
82396c4f76 Fix wrong encoding of db group names
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2023-07-01 08:08:44 +02:00
Maurício Meneghini Fauth
e2c7aa8628 Fix error when a db group name is same as container name
Fixes #17659

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-23 18:38:22 -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
4fd7aa7a2c Use POST for Navigation's aPath and vPath
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-10 12:19:44 -03:00
Maurício Meneghini Fauth
d057b68aa1 Add unit tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-10 12:19:43 -03:00
Maurício Meneghini Fauth
3095181bb3 Encrypt query params of Navigation links
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-10 12:19:43 -03: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
4001460066 Merge branch 'QA_5_1'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-11-21 15:00:06 -03:00
Maurício Meneghini Fauth
d7ced91ae2 Fix db selection when nav tree is disabled
$cfg['ShowDatabasesNavigationAsTree'] = false;

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-11-21 12:08:21 -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
Lukas Bixen
9dba96216e Consolidate nested groups in navigation tree:
Combine any groups that have a single child that is a group.

Signed-off-by: Lukas Bixen <lrb2_@outlook.com>
2021-08-13 20:15:09 -05:00
Lukas Bixen
0ee16ff0fe Fix grouping of tables in navigation tree:
Fix conditions for showing a node in the tree, which caused an issue
where the group name of any group of tables that does not have a sibling
would not be shown in the navigation tree.

Signed-off-by: Lukas Bixen <lrb2_@outlook.com>
2021-08-13 11:38:08 -05:00
William Desportes
be702e69d5 Fix "if (! isset($this->pos)) {" not working
Ref: 41c478edd7

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-20 19:30:26 +02:00
William Desportes
3a87667cab Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-20 17:52:16 +02:00
William Desportes
e0adc6cbac Fix #16973 - Undefined array key "n0_pos2_name" and not working pos3
This also fixes a bug introduced in: 52fcbdf422
9 years ago, I tried hard to understand how it is used but for now I could not figure out.
This is now back to working code for the pos3 if.

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-20 01:30:38 +02:00
William Desportes
4d7890d1f6 Fix "TypeError: strlen() expects parameter 1 to be string, null given"
Found on writing tests, should not happen

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-20 01:30:37 +02:00
Maurício Meneghini Fauth
233964a4d8 Extract the NavigationTree::renderNodes method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-19 14:24:42 -03:00
Maurício Meneghini Fauth
3c9a377ac4 Remove $recursive param from NavigationTree::renderNode
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-19 12:56:43 -03:00
Maurício Meneghini Fauth
41c478edd7 Extract the HTML from NavigationTree::renderNode
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-17 13:21:54 -03:00
Maurício Meneghini Fauth
f2871b89fd Merge branch 'QA_5_1' 2021-07-15 13:09:21 -03:00
Maurício Meneghini Fauth
2535853fcc Fix duplicate quote in navigation nodes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-15 13:07:31 -03:00
Maurício Meneghini Fauth
6ae07c96fb Replace strpos !== false with str_contains
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-09 22:30:42 -03:00
Maurício Meneghini Fauth
9adaa912e1 Rename Response class to ResponseRenderer
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-30 12:35:22 -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
Maurício Meneghini Fauth
61eae4dba9 Remove navigation link generation from the Nodes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-05-11 23:50:17 -03:00
Maurício Meneghini Fauth
8e5cc35e72 Extract navigation icons generation from the Nodes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-05-08 20:40:54 -03:00
Maurício Meneghini Fauth
d8a224ec6c Merge pull request #16880 from danielTiringer/14801-extract-small-html-elements-from-navigationtree
14801 - Extract small HTML elements from NavigationTree to Twig
2021-05-07 12:58:37 -03:00
Daniel Tiringer
d47cf0e0d0 Extract NavigationTree->fastFilter HTML to Twig
Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Extract NavigationTree->fastFilter, create twig

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Remove debug data

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Rename variables and refactor template logic

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Remove unnecessary ternary

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>
2021-05-05 21:36:15 +02:00
Daniel Tiringer
15f434a6d5 Extract small navtree functions to twig
Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Extract controls to twig

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Extract quick_warp to twig

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Bugfix

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Keep class names intact

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>
2021-05-05 20:44:13 +02:00
Maurício Meneghini Fauth
8d0c2a339c Move both operands of an assignment to the same line
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-20 22:35:21 -03:00
Maurício Meneghini Fauth
59e4dae52a Remove invalid inline doc comments
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-18 14:49:28 -03:00
William Desportes
9f0fc40cdb Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-02 13:40:28 +02:00
William Desportes
c781a7af75 Fix #16784 - Add a space between .second and .double CSS classes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-02 12:55:12 +02: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
William Desportes
66f38555d4 Ref #14801 - Remove plain HTML for PHP code for ShowDatabasesNavigationAsTree option
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-12-07 10:31:11 +01:00
William Desportes
dfce335134 Some text code improvements
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-12-07 01:03:03 +01:00
William Desportes
d63a72ad51 Fixes #16278 - Remove underscore prefix from property names
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-08-06 15:46:39 +02: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
e81146e4b3 Remove useless return annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-07 10:30:27 -03:00
William Desportes
4f6a1fc161 Fix coding standard issues after merge of #16226
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-27 18:13:45 +02:00
William Desportes
d6a1e4aee2 Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-26 19:19:57 +02:00
William Desportes
425c1c32a7 Fix #16226 - Error 500 after copying a table
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-26 19:11:53 +02:00
William Desportes
055a9bf3bc Be sure to cast the result and not a possibly undefined index that would send a notice
Ref: 490d731d6c

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-05 14:03:13 +02:00
William Desportes
7623fed14a Fix all found errors and add typehints if possible on NavigationTree class
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-02 23:50:49 +02:00
William Desportes
62baf0b8ea Change Node::getChild return to ?Node
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-02 23:10:35 +02:00
William Desportes
6266583e63 Add some typehints on NavigationTree
Ref: #16158

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-02 09:18:51 +02:00
William Desportes
490d731d6c Add some fallbacks if the data is not available
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-31 01:25:23 +02:00