gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,217 Commits 12 Branches 481 Tags 2.4 GiB
616d216fd1
Commit Graph

92 Commits

Author SHA1 Message Date
Michal Čihař
a34e314952 Reuse getCurrentUser method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-02 11:12:07 +01:00
Michal Čihař
0fc20266a4 Merge branch 'QA_4_6' 2016-12-02 11:10:55 +01:00
Deven Bansod
7d4f188c72 Current user might vary from the actual defined user 
Use CURRENT_USER instead, which would give the actual user defined in User accounts table

Fix #12769

ChangeLog entry for #12769

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-02 01:07:48 +05:30
Deven Bansod
ace8d9c945 Merge branch 'QA_4_6' 2016-11-16 09:24:49 +05:30
Deven Bansod
74fd7986eb Remove debugging calls 
Fix #12706

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-16 09:23:06 +05:30
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Deven Bansod
cb7abad0b5 Remove call to old methods, fix tests 
Remove definition of old method. Remove related tests

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-09 10:40:00 +05:30
Deven Bansod
956f3179cb Fix Navigation tests and Export tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-04 11:55:46 +05:30
Deven Bansod
f14cffdbe7 Properly escape strings in MySQL statement values 
Use *_real_escape string functions provided by connectors to escape strings while exporting

Fix #12453

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/server_privileges.lib.php
 2016-10-29 10:45:12 +05:30
Deven Bansod
5f84046759 Make PHPCS happy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-29 09:21:50 +05:30
Michal Čihař
7fc28626fd Merge branch 'QA_4_6' 2016-09-19 10:51:50 +02:00
Deven Bansod
f8ea67f2bc Fix #12530: Show enabled links for Edit and Execute after proper priv checks 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:51:34 +05:30
Michal Čihař
42d54a938a Remove MySQL version caching 
In my testing the session/cache access is slower than fetching single
value from MySQL and calculating the values.

Also the caching would need some logic for invalidation as the server
can be upgraded or configuration changed.

Fixes #11924

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-07 09:28:13 +02:00
Michal Čihař
aee8184faf Merge branch 'QA_4_6' 2016-09-02 14:40:23 +02:00
Michal Čihař
e01f404804 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:40:18 +02:00
Michal Čihař
bfd6a76819 Merge branch 'QA_4_6' 2016-09-02 14:39:45 +02:00
Michal Čihař
eb3e3b73c3 Simplified handling of connection errors 
There is no need to retrigger errors, just let the handler know to
handle them without backtrace.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:35:36 +02:00
Michal Čihař
ae79ceb3a4 Do not error on unset server port 
Fixes #12339

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 08:53:06 +02:00
Michal Čihař
4054228e1b Always merge control user configuration 
Issue #12218

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 13:25:29 +02:00
Michal Čihař
9d0c745aa5 Add missing documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:48:57 +02:00
Michal Čihař
90498afe76 Allow to specify further parameters for control connection 
Fixes #12218

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:38:03 +02:00
Michal Čihař
a36367bafb Always provide default for ssl and compress settings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:27:06 +02:00
Michal Čihař
0fdc46eb55 Always set default connection params 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:24:39 +02:00
Michal Čihař
8a41fd3f63 Fix fallback value for MySQL port 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:24:28 +02:00
Michal Čihař
94ff41a97f Add safety check for invalid method call 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:22:01 +02:00
Michal Čihař
061c620723 Generate connection settings at one place 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:19:40 +02:00
Michal Čihař
9592f66bd5 Share socket/port/host sanitization in DatabaseInterface 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:09:26 +02:00
Michal Čihař
6fd55f968a Pass user link parameter in server array as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:04:25 +02:00
Michal Čihař
95064ed9fb Move control user connection calculation to DatabaseInterface 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:58:02 +02:00
Michal Čihař
2dce033943 Move configuration management in DBI to separate method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:57:51 +02:00
Michal Čihař
25a38b2067 Determine correct user/password for connect in DatabaseInterface 
The API only specifies what kind of link we want and we will get it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:51:09 +02:00
Michal Čihař
f30f65c67a Indentify connection type by one flag 
Use integer values rather than set of boolean flags. This makes it
easier to make decision and makes the code more readable. Also removes
confusion what should happen in case both boolean flags are set.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:36:07 +02:00
Michal Čihař
f46fd34081 Remove is_controluser flag from DBI backends 
They no longer need it (it was used only for empty password fallback).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:34:55 +02:00
Michal Čihař
bee2805b34 Remove auxiliary_connection flag from DBI backends 
They do not use it anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:23:29 +02:00
Michal Čihař
bb18c5e02f Merge branch 'QA_4_6' 2016-07-28 11:06:43 +02:00
Pavel Rochnyack
c310304712 Restore Overhead column in Server > Databases > Enable Statistics. 
(Was removed in 582b02262b)

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-07-27 19:56:43 +01:00
Michal Čihař
3847cee0a4 Merge branch 'QA_4_6' 2016-06-17 11:20:05 +02:00
Michal Čihař
f5e8953356 Share backtrace processing for debugging and error reporting 
We want to achieve same thing in both cases - backtrace which is
stripped from sensitive information, has reasonable size and can be
read. Sharing the code will make it easier to fix possible problems and
also will make both cases behave consistent.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 11:18:39 +02:00
Isaac Bennetch
e6db8e18ee Fix some CodeSniffer warnings and errors 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-12 23:12:23 -04:00
Michal Čihař
f3925a8b7c Merge branch 'QA_4_6' 2016-06-03 15:22:29 +02:00
Michal Čihař
2ae8b9248e Simplify server port handling 
The intval function does return 0 for empty string, so we really do not
have to special case here.

Issue #12279

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 15:21:48 +02:00
Michal Čihař
aaa707ab4d Merge branch 'QA_4_6' 2016-05-17 10:18:52 +02:00
Michal Čihař
11089cbe41 Use https for links to dev.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:16:44 +02:00
Michal Čihař
cc9550579c Merge branch 'QA_4_6' 2016-05-11 15:14:57 +02:00
Michal Čihař
6b8f56dffd Imporove simplification of backtrace for console 
Replace only objects, include regular items verbatim.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:14:12 +02:00
Michal Čihař
d57d4e6e5a Do not include call to _dbgQuery in backtrace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:11:37 +02:00
Michal Čihař
e52cf14ae7 Merge branch 'QA_4_6' 2016-05-11 15:03:25 +02:00
Michal Čihař
d67facb641 Avoid storing objects in session when debugging SQL 
When $cfg['DBG']['sql'] is enabled, we used to store full backtrace in
session. This includes DBI objects which then can cause problems on
session start.

Issue #12229

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:03:15 +02:00
Michal Čihař
56e59c19f4 Add option to log executed SQL queries to syslog 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 11:20:55 +02:00
Michal Čihař
57dce34085 Merge branch 'QA_4_6' 2016-04-18 16:30:01 +02:00