When an user revert a setting to its default value, the setting is not
removed from the storage.
Related to https://github.com/phpmyadmin/phpmyadmin/pull/19925
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
Extended the 2FA preservation logic to handle both storage paths:
- Session storage (when pmadb is not configured)
- Database storage (when pmadb is available)
Previously only the database path was protected, causing 2FA
settings to be lost when using session storage.
Fixes#19900
Signed-off-by: efturtle <mexslacker@gmail.com>
Prevent two-factor authentication configuration from being lost
when saving page-specific settings by merging existing 2FA data
with new preferences instead of overwriting completely.
Fixes#19900
Signed-off-by: efturtle <mexslacker@gmail.com>
Now, it returns last error message or an empty string instead of false
if no errors occurred.
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
* Use str_starts_with()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Remove redundant !empty()
!empty() on a declared variable is redundant.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Replace loop with array_column()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Simpify assignment by removing temporary variable
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Remove redundant if statements and array_merge
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Remove temporary variable
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Unindent code
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Add helper method fetchByMode()
This is done to avoid calling methods through variables. It is the same
in terms of performance.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Move if statements to where they are relevant
I had a choice to either move the while loop out of the if statements
or move the if statements inside. I decided it made more sense to move
them inside.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Add NULL to phpdoc for the two parameters that can be null
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Simplify return statement
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Improve performance and simplify code
Since we are always using STORE mode then we can use data_seek() method.
This will allow us to get rid of the loop and use fetchByMode() method.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Inline value defaulting
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Remove redundant check
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* [bugfix] getColumnNames() should return an array of strings
There were multiple issues here. If we are selecting only a certain
column from the SQL then let's use the handy function instead of
array_keys. We will never get anything other than an array so checking
if it is not an array makes no sense. Returning null only to cast it to
an array is pointless. If really necessary, we could still check for an
empty array. The ColumnController returned the value without even
casting it to an array. I am not sure how jQuery/JavaScript dealt with it.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Refactor getColumnMapFromSql and add type hint
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Refactor getVirtualTables
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Remove redundant loop
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Remove redundant usage of freeResult()
If there was no chance for the object to leak the scope and it is the
end of the scope then there's no reason to call this method.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Replace dynamic variable with declare one
It's always the same name. If we were creating more than one, we could
use associative array, but in this case there seems to be absolutely no
need for any of this. Dynamic variables make it harder to debug the code.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Update psalm-baseline.xml
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* Widen the condition per williamdes suggestion
This will allow value such as '' and '0' to pass through. Previously
`if(! empty($database))` and `if($database)` dissallowed them.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
* fetchResult() should return only arrays
Tests fixed to return arrays. Non-empty in case of true, empty in case
of false.
Fixed a lot of Psalm issues where the condition was always true.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
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>
