gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,953 Commits 12 Branches 481 Tags 2.4 GiB
295263d113
Commit Graph

76 Commits

Author SHA1 Message Date
Kamil Tekiela
b62ffe17c7 Merge the logic into Settings 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2025-01-16 19:31:50 +00:00
Maurício Meneghini Fauth
ebea0aa748
Remove the reload global variable 
Replace it with ResponseRenderer::$reload static property.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-07 23:56:16 -03:00
Maurício Meneghini Fauth
b4cd510f07
Remove the new_username global variable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-07 23:06:31 -03:00
Maurício Meneghini Fauth
64f86ad4fe
Remove the pred_hostname global variable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-07 22:28:52 -03:00
Maurício Meneghini Fauth
c481ab304a
Remove the pred_username global variable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-07 21:20:18 -03:00
Maurício Meneghini Fauth
d253986eb5
Remove hostname global variable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-07 19:01:14 -03:00
Maurício Meneghini Fauth
a01fed10cf
Remove username global variable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-07 18:37:36 -03:00
Kamil Tekiela
326da8369f Implement executeQuery 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2025-01-01 19:53:50 +00:00
Maurício Meneghini Fauth
270a7ea2df
Remove user info globals in Server\Privileges class 
The only global variables used were the user TLS options. So they were
replaced with private properties.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-12-23 13:47:37 -03:00
Kamil Tekiela
8015e4de72 Move DatabaseInterface to Dbal 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-22 18:34:53 +00:00
Kamil Tekiela
a07292ecc1 Small changes 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-22 00:07:09 +00:00
Kamil Tekiela
5a8f01c595 Refactor fetchSingleRow() 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-22 00:07:09 +00:00
Kamil Tekiela
b687a6f62b Split off fetchSingleColumn() 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-22 00:07:06 +00:00
Kamil Tekiela
319ae0d2e3 Split off fetchResultSimple 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-22 00:04:18 +00:00
Kamil Tekiela
e2de1af910 Remove $GLOBALS['cached_affected_rows'] 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-22 00:04:18 +00:00
Kamil Tekiela
574bc914ed Remove temp variable 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-17 02:10:36 +00:00
Kamil Tekiela
e8b44fb629 Make $dataLoaded readonly 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-17 02:07:22 +00:00
Kamil Tekiela
54d42dc0c4 Make $usedQueries readonly 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-17 02:01:37 +00:00
Kamil Tekiela
df36e752f8 Narrow down the type 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-17 01:45:07 +00:00
Kamil Tekiela
2e328e6f9f Narrow down the type 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-17 01:34:07 +00:00
Kamil Tekiela
755ec7c450 Narrow down the type 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-17 01:07:05 +00:00
Kamil Tekiela
25ca884d61 Make Status\Data::$status readonly 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-12-17 00:29:49 +00:00
Kamil Tekiela
9ccec4b4c1 Change type hint 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-11-13 14:40:16 -03:00
Kamil Tekiela
3481429708 Remove $GLOBALS['dbname'] 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-11-13 14:40:16 -03:00
Kamil Tekiela
a722ccff8c Add $dbname as param to getExtraDataForAjaxBehavior 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-11-13 14:40:16 -03:00
Kamil Tekiela
e9c2eea461 Unwrap getDataForDBInfo() into separate methods 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-11-13 14:40:16 -03:00
Kamil Tekiela
85b476769c Refactor getDataForDBInfo 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-11-13 14:40:16 -03:00
Kamil Tekiela
281321ed7f Extract getHostname 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-11-13 14:40:16 -03:00
Kamil Tekiela
a22ab3ac3f Move the first condition out of addUser 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-11-13 14:40:16 -03:00
Kamil Tekiela
ffbe0f53c1 Move variable initialization to the right place 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-11-13 14:40:16 -03:00
Maurício Meneghini Fauth
85f862a669
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-11-09 00:44:34 -03:00
Jacek Barecki
003f092277
Fix #17262 - Add warning when setting a password to a blank value if AllowNoPassword is false (#19315) 
* Fix #17262 - Add warning when setting a password to a blank value if AllowNoPassword is false

Closes #17262

Signed-off-by: Jacek Barecki <jacek.barecki@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-10-11 14:35:11 -03:00
Maurício Meneghini Fauth
71fac7eb4c
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-09-06 11:35:28 -03:00
Kamil Tekiela
ae0157293b Small refactoring 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-08-15 17:10:19 +02:00
Kamil Tekiela
adfa88acb5 Fix privileges assignment 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-08-15 16:52:03 +02:00
Maurício Meneghini Fauth
dc1bd60dd1
Fix boolean usage of the return value of preg_match() 
preg_match() and preg_match_all() returns the number of pattern matches
(which might be zero), or false on failure. However, preg_match() always
returns 1 when a pattern is matched as it stops searching after the
first match.

- https://www.php.net/manual/en/function.preg-match.php
- https://www.php.net/manual/en/function.preg-match-all.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-07-13 14:43:05 -03:00
Maurício Meneghini Fauth
90ee00efd5
Create the 'pma' global variable for Twig templates 
Creates the Twig\PmaGlobalVariable class to handle the 'pma' Twig global
variable.

The idea of this global variable is to automatically inject in all
templates some useful information.

For now it only includes `pma.version` to get the phpMyAdmin version
and `pma.text_dir` to get the text direction ('ltr' or 'rtl').

Adding new variables to the `pma` global variable should be done with
caution.

- https://twig.symfony.com/doc/3.x/advanced.html#globals

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-07-09 20:30:48 -03:00
Maurício Meneghini Fauth
256a847af7
Fix invalid value for sql_query global variable 
Fixes #19162

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-05-15 12:57:29 -03:00
Kamil Tekiela
d265dbbd91 Replace Message constants with enum 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-05-14 16:30:45 +02:00
William Desportes
241506fb77
Merge branch 'QA_5_2' 2024-04-28 16:49:40 +02:00
Kamil Tekiela
82c85d26c0
Clean up of tests (#19067) 
* Fix wrong type hint

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use $this instead of parent

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* setUp should be a protected method

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* onNotSuccessfulTest should be protected

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* $command doesn't need to be a property

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Give alertText() proper return type

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use null-safe operator

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Call Message static constructors statically

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Call StorageEngine methods statically

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Add better type hints in PrivilegesController

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use packed (without keys) arrays in tests

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use type casts instead of function casts

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use const instead of private property

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use const instead of private property

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Fix testAuthFailsTooLongPass()

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Replace loop with array_shift

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use ob_get_clean

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove duplicated code

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use assert instead of phpdoc

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-03-20 13:34:55 -03:00
Kamil Tekiela
ae239083e2 Remove last of register globals 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-03-15 21:10:32 +01:00
Kamil Tekiela
54b5464ec2 Replace function casts with normal casts 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-03-03 15:07:57 +01:00
Kamil Tekiela
8e4443b17b
Applying suggestions from static analysis tools (#19013) 
* Drop array keys from lists

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Import UrlTest

When it doesn't exist in Prod, the code will still work the same.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Drop redundant return [];

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Fix object access checks

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use strict comparison

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Int keys should be specified as integers

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use empty string check instead of strlen

Potential null deprecations are replaced with loose condition.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use stripos instead of *substr

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Simplify substr's 3rd param

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove unnecessary defaults

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Replace isZeroBasedArray with array_is_list

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Simplify texEscape()

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Simplify exportZeroBasedArray()

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Replace for loop with array_diff

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Replace for with foreach

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove nullable param in backquoteCompat

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use null-coalescing operator

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Inline $result variable

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Turn $event into a constant

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Move selectDb outside the loop

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Fix code style order of operation

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove unnecessary isset argument

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove line break

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use foreach instead of for

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-02-27 12:29:02 -03:00
Robert Johnson Nallori
54f14eaa6c
Fix Error When adding a user on MariaDB (#19002) 
* Fix Error When adding a user on MariaDB

Signed-off-by: Robert Johnson Nallori <johnson361@gmail.com>

* Fix coding standard and static analysis issues

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

* Add unit tests

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>


Fixes #18989
---------

Signed-off-by: Robert Johnson Nallori <johnson361@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-02-23 13:19:37 -03:00
Maurício Meneghini Fauth
8ee44a377e
Refactor UserPrivileges to use instance instead of static props 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-02-09 15:49:00 -03:00
Kamil Tekiela
b715c8143f Remove confusing continue 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-02-06 17:00:22 +01:00
Kamil Tekiela
092af6e878 Remove unnecessary comments 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-02-06 17:00:22 +01:00
Kamil Tekiela
8be66c5d13 Remove $sectionFound 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-02-06 17:00:22 +01:00
Kamil Tekiela
de970d2291 Remove useless comments, mark final and readonly 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-02-06 17:00:22 +01:00