gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,550 Commits 12 Branches 481 Tags 2.4 GiB
7f43348e6b
Commit Graph

106550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
7f43348e6b Merge pull request #12415 from nijel/remove-token-get 
Remove token from GET requests
 2016-08-01 07:50:37 +10:00
Sevdimali İsa
dc41f51bf4 Translated using Weblate (Azerbaijani) 
Currently translated at 52.3% (1679 of 3208 strings)

[CI skip]
 2016-07-31 21:44:09 +02:00
Juha Remes
9a857ea45a Translated using Weblate (Finnish) 
Currently translated at 68.6% (2201 of 3208 strings)

[CI skip]
 2016-07-31 15:44:38 +02:00
Michal Čihař
a98a65d92e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-07-29 14:05:12 +02:00
Michal Čihař
108b71c3f6 Merge branch 'QA_4_6' 2016-07-29 14:04:46 +02:00
Michal Čihař
b27020f108 Avoid typecasting to float when not needed 
Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 14:03:13 +02:00
Weblate
513c6037e0 Merge remote-tracking branch 'origin/master' 2016-07-29 13:58:25 +02:00
Juha
7e6e4fdeff Translated using Weblate (Finnish) 
Currently translated at 67.5% (2166 of 3208 strings)

[CI skip]
 2016-07-29 13:58:22 +02:00
Michal Čihař
c328697e39 Do not use mb_strlen result for string indexes 
The string indexes are in bytes, while mb_strlen counts chars.

Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 13:54:04 +02:00
Michal Čihař
43cfaeeade Add tests for control user connection fallbacks 
Issue #12218

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 13:25:58 +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ř
6b6040acbf Adjust tests to new parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:40:45 +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ř
d6e85cc48d Remove wrong parts of the docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:29:47 +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ř
f2e179b750 Simplify DBI code as $server no longer can be null 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:21:06 +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ř
53f541af86 Removed MySQL connection retry without password 
This really does not make sense for any decent setup. It is useful only
with http authentication, but still no password is not something we
would want to automatically fall back to.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:30:32 +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ř
9588dbd4aa Add changelog entry 
Fixes #12378
Fixes #12389

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 10:51:34 +02:00
Michal Čihař
314ec0a1f9 Simplify IP address validation 
- check IPv4 and IPv6 in one call
- type strict checking of return value

See issue #12389

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 10:51:19 +02:00
Michal Čihař
25b4d840fb Merge remote-tracking branch 'origin/pull/12389' 2016-07-29 10:48:32 +02:00
Michal Čihař
29c0ddaaf1 Merge branch 'QA_4_6' 2016-07-29 10:48:19 +02:00
Michal Čihař
de1e473a9d Changelog entry for issue #12416 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 10:47:15 +02:00
Michal Čihař
74016bceea Merge pull request #12416 from rpv-tomsk/fix-replication-status 
Fix replication status output in Server > Databases
 2016-07-29 10:46:11 +02:00
Michal Čihař
489970f218 Fixed deleting users in non English locales 
Fixes #12413

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 10:44:58 +02:00
Michal Čihař
bcb9c7d16a Merge branch 'QA_4_6' 2016-07-29 10:42:50 +02:00
Michal Čihař
c63b11d2bb Fixed rendering of Original theme 
Fixes #12414

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 10:42:06 +02:00
Pavel Rochnyack
b705dc5f67 Fix replication status output in Server > Databases 
Broken by 829a84b46e refactoring.
Incorrectly fixed in c4710c3e1d

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-07-29 04:43:08 +01:00
Michal Čihař
ea73fded71 Adjust tests to token removal from GET 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 11:22:45 +02:00
Michal Čihař
bb18c5e02f Merge branch 'QA_4_6' 2016-07-28 11:06:43 +02:00
Michal Čihař
76f94e4228 Add changelog entry for issue #12409 
Re-enable overhead on server databases view

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 11:06:26 +02:00
Michal Čihař
263318850c Merge pull request #12409 from rpv-tomsk/restore-overhead-column 
Restore Overhead column in Server > Databases > Enable Statistics.
 2016-07-28 11:05:47 +02:00
Michal Čihař
dae3390a02 Remove token from GET requests 
The CSRF token really should be used only in POST requests. The reason
for that is that it's a bit harder to get to if it is in request body
(with POST) compared to GET request, where it is in the URL (being
easily available in server logs).

Also this will make the URLs look nicer ;-).

This change will definite break some functionality, but since #6297 most
of the code should be safe and remaining bugs can be fixed for upcoming
release.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 11:00:23 +02:00
Michal Čihař
a2e6c78fb7 Use https for outbound links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:41:52 +02:00
Michal Čihař
6d8e1d7935 Merge branch 'QA_4_6' 2016-07-28 09:38:08 +02:00
Michal Čihař
298f19b3be Use https links in docs where available 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:30:29 +02:00
Michal Čihař
257e65ba9f Use https for outbound links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:19:13 +02:00
Michal Čihař
4072c1d29a Use example.com for sample test urls 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:12:01 +02:00