gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,259 Commits 12 Branches 481 Tags 2.4 GiB
de85dad5f1
Commit Graph

66 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
fd692ca382
Fix hide_connection_errors being undefined when a controluser is set 
Fixes #17307
Closes #17304

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-22 12:21:57 -03:00
Maurício Meneghini Fauth
e2b4dda2e9
Fix syntax error for PHP 5 
Fixes #17305
Fixes #17306

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-22 11:37:03 -03:00
William Desportes
ca54f1db05
security - Fix - 2FA/U2F can be disabled without any code change 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-01-13 19:07:34 +01:00
William Desportes
156231d5bf
Fix not isset $GLOBALS['dblist'] 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 15:22:35 +01:00
William Desportes
6c35ea3be7
Fix #15724 - Fix 2FA disabled 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 14:17:03 +01:00
William Desportes
f402a8f2cf
Merge #15681 - Fix #15608 DisableIS is broken on pma 4.9.2 with controluser configured 
Fixes: #15608
Pull-request: #15681
Ref: 2bc8afea5f
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 21:34:05 +01:00
Maurício Meneghini Fauth
542ba3025a Fix control user issue 
Partially reverts commit 2bc8afea5f.

Fixes #15608
Related to #14433

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-21 14:56:59 -03:00
Maurício Meneghini Fauth
9d3f7519c9 Revert "Fix #14433 - "You do not have privileges to manipulate with the users!" on root superadmin" 
This reverts commit b8650115be.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-21 14:54:40 -03:00
William Desportes
6e7e90169a
Fix a possibly undefined index as reported to our server 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 16:38:21 +01:00
William Desportes
c01377b161
Fix undefined index for proxysql on @@version_comment and @@version 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 18:40:21 +01:00
Hugues Peccatte
a52593e6ac Fix operators precedence possible issue 
As "==" has priority over "&", it was firstly checking the equality… which were always true…

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-11-02 00:45:59 +01:00
William Desportes
af344bb4c1
Fix #14433 - return an array with an empty user and empty host 
Fixes: 83602a6b72
This is an unexpected change, detected by unit tests

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-20 15:09:19 +02:00
William Desportes
83602a6b72
Fix #14433 - return an empty array 
Fixes: b8650115be

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-20 15:01:02 +02:00
William Desportes
b8650115be
Fix #14433 - "You do not have privileges to manipulate with the users!" on root superadmin 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-20 14:43:47 +02:00
William Desportes
ec74b34010
Fix "logout and try as another user link" 
- I changed the link to not use ajax mode

Try the query 'GRANT PROXY ON 'root'@'localhost' TO 'root'@'localhost' WITH GRANT OPTION' to reproduce

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-09 17:15:16 +02:00
Maurício Meneghini Fauth
dafc17c52e Add explicit parentheses in nested ternary operators 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-05-22 18:32:42 -03:00
William Desportes
7233a887da
Fix #15251 - SQL queries > affected lines > -1 > does not show as error 
Fixes: #15251
Introduced-by: 4e01371cd251a0f30b26540f22bbda3ea80945feSigned-off-by: William Desportes <williamdes@wdes.fr>
 2019-05-07 10:34:56 +02:00
William Desportes
e39ae0f989
Fix #14614 - "# 2014 - Commands out of sync; you can't run this command now" returned when stored procedure does not return any result set 
Fixes: #14614
Pull-request: #15234
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-05-01 17:08:36 +02:00
William Desportes
77fc2c58e9
Fix #14614 - Commands are out of sync with $cfg['DBG']['sqllog'] = true; 
Fixes: #14614
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-29 23:08:23 +02:00
Vincent Milum Jr
31b40f71bb Fix for SYSTEM VERSIONED tables #14514, #14515, and #14516 (#14536) 
Fixes #14514
Fixes #14515
Possible fix for #14516

 #14514 Tables which enable the new MariaDB 10.3 versioning show up as "SYSTEM VERSIONED" instead of "BASE TABLE" inside of information schema. This patch now checks for both, so these new table types don't incorrectly display as views.

 #14515 MariaDB 10.3 also supports INVISIBLE columns, which is optionally paired with SYSTEM VERSIONED tabled (or implemented separately). This patch helps handle this new column attribute.

 #14516 This patch cannot be fully tested and verified with current MariaDB builds. Version 10.3.9 (currently unreleased) corrects an issue with column information for SYSTEM VERSIONED columns that this patch relies on. https://jira.mariadb.org/browse/MDEV-16804 - the reason for checking with preg_match instead of adding to the list is because there are now combined "extra" information for columns, such as INVISIBLE columns. Just matching entire strings also has a bug with these other "extra" parameters.

Signed-off-by: Vincent Milum Jr <git@darkain.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 3f6e360a4e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-02-15 17:27:55 -02:00
ales-bulko
0be9c13689 Fixes #14658 - Regression on multi table query (#14681) 
Added functionality to generate SELECT query with JOINs of requested tables. It was mentioned that it's just a bug and it was working in previous versions, but I did not see any code fragments that would make it possible. Please, feel free to suggest any better solution if you don't like that one.

Fixes #14658

Signed-off-by: Aleš Buľko <ales.bulko@student.tuke.sk>
(cherry picked from commit 23ce7cec52)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-11-26 20:59:58 -02:00
William Desportes
8a7f2c30ef
Fix getDatabasesFull query 
Execute: $this->dbi->getDatabasesFull("pma_test")
Fixes missing space after alias

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-08-06 15:15:32 +02:00
William Desportes
8af0343bb2 Patch for issue #14246 
Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-05-02 12:13:49 +02:00
Maurício Meneghini Fauth
d98658187a Replace PhpMyAdmin\Relation static calls 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-25 19:32:13 -03:00
Gabriel Caruso
6ff73257e2 Simplify returns 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-16 10:16:56 -02:00
Michal Čihař
1ebf6c4953 Remove references to sourceforge.net issue trackers 
We do not use it for years and all issues have been migrated.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-02 13:24:05 +01:00
Gabriel Caruso
a8bd364e02 Clean elses 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2017-12-14 22:02:17 -02:00
Maurício Meneghini Fauth
c930c7a030 Fix coding standard errors 
Automatic fixes by phpcbf.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-04 13:40:36 -02:00
Maurício Meneghini Fauth
01fd301003 Use 'elseif' keyword istead of 'else if' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-04 13:31:25 -02:00
Michal Čihař
3b6a994dcd Move collation connection setting to user preferences 
It is now handled same way as other user settings.

Issue #11688
Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 14:16:31 +01:00
Michal Čihař
0f79721570 Remove not needed param from DatabaseInterface::postConnect 
It is called only for user link, so there is no need to make that
parameter.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:00:30 +01:00
Michal Čihař
2bc8afea5f Move storage zeroconfig to the DBI post connect 
This way it is executed only when needed.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:00:23 +01:00
Michal Čihař
1f968ce29b Fix setting variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:24:45 +02:00
Michal Čihař
2c248fa83d Fix documentation for DatabaseInterface::getDefinition 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
ae0a259bac Move link parameter as last in getTablesFull 
It is currently not used here, so move it to the end.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
33cfe75e9f Return calculated value from isUserType 
There is no need to hit the cache again to read the value.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
398e7b8e58 Avoid poluting user cache without database connection 
Returning false is obviously faster than dealing with the cache.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
5f29ace249 Simplify DatabaseInterface link parameter handling 
- check validy only when invoking low level calls
- avoid too early array usage

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
4fe87fb592 Remove usage of $GLOBALS['controllink'] 
This is now stored internally inside DatabaseInterface instance.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
329ce22b73 Correctly handle fallback control user connection using user parameters 
Remember it as CONNECT_CONTROL and avoid running post connect handler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
60c1b32472 Remove usage of $GLOBALS['userlink'] 
The links are internal to DatabaseInterface and user link is default.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
dfc6f7bf8e Remember MySQL links internally in the database interface 
This should replace $GLOBALS['userlink']/$GLOBALS['controllink'].

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
84bce234b0 Use quotes around timezone name 
Otherwise the error message might be confusing.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-23 11:39:49 +02:00
Michal Čihař
fa042eda41 Avoid hard failure on not setting timezone 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-23 11:38:54 +02:00
Michal Čihař
5d9e124449 Move timezone setup to the DatabaseInterface 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-23 11:34:49 +02:00
Michal Čihař
088bdec7f5 Avoid trying to get warnings for non saved queries 
This leads to command out of sync error.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 13:12:12 +02:00
Michal Čihař
9c9c22e516 Load SQL parser context in DatabaseInterface::postConnect 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 12:10:40 +02:00
Michal Čihař
d574aede08 Bind Types to DatabaseInterface 
This wayt it's automatically passed with DBI.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 12:05:02 +02:00
Maurício Meneghini Fauth
f8bd078088 Fix code standard errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-30 18:19:09 -03:00
Michal Čihař
4e01371cd2 Log warnings count in debug log 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-28 14:58:47 +02:00