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

17821 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
b041c13a0c Fix CreateAddField methods visibility 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 09:06:41 -02:00
Maurício Meneghini Fauth
42cc8ece2c Replace globals with DI in CentralColumns class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-09 11:53:28 -02:00
Maurício Meneghini Fauth
7ea547c0d2 Hoist global variables to the top of methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-09 11:53:28 -02:00
Maurício Meneghini Fauth
cc2c4fc36d Replace globals with DI in Charsets class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-09 11:31:42 -02:00
Maurício Meneghini Fauth
5a70c1d895 Replace globals with DI in CentralColumns class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-05 22:21:58 -02:00
Madhura Jayaratne
ac64e36131 Merge branch 'QA_4_7' 2017-11-05 11:04:58 +11:00
Madhura Jayaratne
92d747e141 Fix #13800 Database lost when renaming to similar name and lower_case_table_names=1 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-11-05 10:59:49 +11:00
Maurício Meneghini Fauth
1fdc2aafc4 Replace globals with DI in PhpMyAdmin\BrowseForeigners 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-04 18:55:20 -02:00
Maurício Meneghini Fauth
e631affbf3 Remove unnecessary include_once 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-04 16:10:22 -02:00
Maurício Meneghini Fauth
7f137aa587 Replace globals with DI in PhpMyAdmin\Bookmark 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-04 15:14:56 -02:00
Maurício Meneghini Fauth
452b624dc4 Move dependencies to outside of abstract controllers 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-04 12:41:57 -02:00
Maurício Meneghini Fauth
2ae2b8b54e Use template for server databases table 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-03 11:31:01 -02:00
Maurício Meneghini Fauth
ff38d5c5eb Move sub page header to index template 
Move server/sub_page_header template from ServerDatabasesController
to server/databases/index template

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-02 22:26:47 -02:00
Maurício Meneghini Fauth
79f6f88bff Use template for server sub page header 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-02 22:26:47 -02:00
Maurício Meneghini Fauth
6672d4f2ea Use template for server databases index 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-02 22:26:47 -02:00
Michal Čihař
95b8235d4a Move sprites data caching to Theme class 
The data is constant for theme, so we don't have to deal with cache
invalidation in testsuite and in corner cases.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:53:20 +01:00
Michal Čihař
cca4146ef6 Simplify code generating doc URL 
The testsuite case can be same as default.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:53:20 +01:00
Maurício Meneghini Fauth
f388a41b04 Fix undefined index notices 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-02 11:37:33 -02:00
Michal Čihař
1adf9a493f Revert "Cache already loaded templates" 
This reverts commit 56ff2afb74.

The caching is already done in Twig, no need to duplicate it.
 2017-11-02 14:29:53 +01:00
Michal Čihař
369b0edb42 Remove test for no longer used PMA_TEST_THEME 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:25:40 +01:00
Michal Čihař
56ff2afb74 Cache already loaded templates 
This should improve performance when loading many small templates.

Issue #13711

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:11:16 +01:00
Michal Čihař
cae0ac8947 Use static property rather than static variable for caching twig environment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:09:41 +01:00
Michal Čihař
12dbfff7e9 Generate consistent translator comments in twig code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 09:17:22 +01:00
Michal Čihař
5acd64f84d Use two-factor authentication instead fo second authentication factor 
This is probably more widely used naming.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 09:05:18 +01:00
Maurício Meneghini Fauth
96ba136b44
Merge pull request #13785 from mauriciofauth/templates 
Port templates to Twig and remove PHP templates support
 2017-11-02 00:04:02 -02:00
Michal Čihař
947c1ace03 Share code for getting server URL and use it in 2FA as well 
This way multiple phpMyAdmin installations can be identified.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:55:48 +01:00
Michal Čihař
2af38a3de8 Improved FIDO U2F error reporting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
e67ea08eae Properly update FIDO U2F counter on login 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
c64e52c3c0 Test registration and authentication for FIDO U2F 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
d6d84a7607 Share code for error report in second factor 
...and test it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
0d14ba065c Share and test code for listing backends 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
b5e5f4e8c8 Simplify second factor auth API 
We now only pass SecondFactor object to plugins, not individual
parameters.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
540b78dc2e Add support for FIDO U2F authentication 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:31 +01:00
Michal Čihař
8c9abb9888 Add configuration for second authentication factor 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:31 +01:00
Michal Čihař
869131f59c Add support for HOTP and TOTP authentication 
This supports Google Authenticator and similar applications.

Issue #6197

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:18 +01:00
Michal Čihař
a646d4314e Add generic interface for second authentication factor 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:14 +01:00
Maurício Meneghini Fauth
569ee91f2a Merge branch 'master' into templates 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-01 12:06:09 -02:00
Michal Čihař
a513a7550a Propagate possible failure from saving prefs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-31 16:13:02 +01:00
Michal Čihař
6b8a9b7aec Decode user preferences as array 
We really want an array here, not an object. Type casting to array helps
only for top level element.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-31 13:32:51 +01:00
Michal Čihař
28ade643cf Add Util_showDocu Twig tag 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-31 13:32:51 +01:00
Michal Čihař
0ccaf0ac91 Use templates for rendering header and footer of login page 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-30 14:40:44 +01:00
Michal Čihař
aebe2069ce Add support for providing fallback images in Theme class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-30 14:24:13 +01:00
Michal Čihař
579b1275cf Move login page response logic to the Response class 
It really more belongs there and might be easier reused.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-30 14:24:07 +01:00
Michal Čihař
e19f3599a4 Remove not needed plugin manager for authentication 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-30 14:03:51 +01:00
Michal Čihař
f859a9701d Rewrite selection of tables with overhead 
Avoid using inline generated javascript, use CSS selectors instead.

Issue #12782

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-30 12:19:38 +01:00
Michal Čihař
8fa32adb4e Fix handling of initial letter in privileges 
Fixes #13783

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-30 09:36:11 +01:00
Michal Čihař
aa9da566a6 Define specific_db/specific_table outsite is_grant scope 
Fixes #13784

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-30 09:34:05 +01:00
Maurício Meneghini Fauth
f3faca7fd7 Remove support for PHP templates 
Fix #13297

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-29 18:34:31 -02:00
Maurício Meneghini Fauth
9b653cbba3 Port table/relation/common_form template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-29 16:46:52 -02:00
Maurício Meneghini Fauth
01bd6d1455 Port table/relation/foreign_key_row template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-29 12:18:28 -02:00