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

92 Commits

Author SHA1 Message Date
William Desportes
49fae81505
Fix for #14171 - 2FA QR PHPGD 
Closes: #14171
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-29 21:21:59 +02:00
William Desportes
e816e45c18 phpstan level 0 (#14405) 
* Fix phpdoc @return

- Fixed @return typehint

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix incorrect case on function calls

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Type hint + typo fix

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fixes

- @return fix
- @var fix
- Class names
- Throws fix
- test/classes/Plugins/Export/ExportSqlTest.php any() invoked with 1 parameter, 0 required
-  libraries/classes/Controllers/Table/TableStructureController.php Array has 2 duplicate keys with value 'columns_list'
- Call parent constructor  libraries/classes/Error.php

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Update config

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Access to an undefined property

- Access to an undefined property PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema::$diagram_row
- Access to an undefined property PhpMyAdmin\Plugins\Schema\Pdf\Pdf::$cMargin
- Undefined properties

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Update config

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix bootstrap-phpstan

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix typos and phpstan config

Fixes: #14399
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-25 20:34:46 -03:00
Maurício Meneghini Fauth
2d58411bee Some coding style fixes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-18 21:30:06 -03:00
Maurício Meneghini Fauth
244d4e8e81 Replace Template::get calls in libraries/classes 
Uses Template::render() instead of Template::get().

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-18 18:18:24 -03:00
Maurício Meneghini Fauth
2005cca77f Fix methods and properties visibility issues 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-30 21:02:26 -03:00
Maurício Meneghini Fauth
285e38e931 Fix some PSR-2 coding standard errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-30 09:07:56 -03:00
Maurício Meneghini Fauth
b9c0463d96 Use short array syntax instead of long array syntax 
Replaces array() with [].

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-30 01:42:21 -03:00
Maurício Meneghini Fauth
4bff9256de Remove 'Undefined index' PHP notice 
- libraries/classes/Plugins/Export/ExportXml.php
- libraries/classes/Plugins/Import/ImportLdi.php

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-29 00:39:40 -03:00
Maurício Meneghini Fauth
baf0985e5f Fix phpcs errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-18 01:59:38 -03:00
Maurício Meneghini Fauth
3c12c9efb4
Merge pull request #14119 from meteorlxy/patch-tmp 
fix: AUTO_INCREMENT error when only exporting table structure in database-level exports; issue #14066
 2018-05-16 14:52:46 -03:00
Maurício Meneghini Fauth
0998a50e9e Enable strict mode in Plugins classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
ec3583944b Refactor Font methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-09 22:42:56 -03:00
Maurício Meneghini Fauth
2f824e5508
Merge pull request #14216 from Piyush3079/PMA_14212 
Fix XML Export fatal error and add Move columns preview SQL
 2018-05-04 02:40:54 -03:00
Maurício Meneghini Fauth
f65f59c8e8 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:45:57 -03:00
Maurício Meneghini Fauth
e7a6ff8a0e Remove duplicated input in application_configure.twig 
Some coding style fixes.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:40:33 -03:00
Raman Tehlan
3054999afe Display the secret for 2FA - #14128 (#14154) 
* 2FA Secret added
* 2FA Secret Displayed

Fix #14128

Signed-off-by: Raman Tehlan <ramantehlan@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 8dbae11f6f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:28:52 -03:00
Raman Tehlan
8dbae11f6f Display the secret for 2FA - #14128 (#14154) 
* 2FA Secret added
* 2FA Secret Displayed

Signed-off-by: Raman Tehlan <ramantehlan@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:24:06 -03:00
Gabriel Caruso
c1786eee96
Use array_key_exists instead of in_array + array_keys 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-04-22 22:39:55 -03:00
Piyush Vijay
5b35dba67d
XML Export from single table throws fatal error (PHP 7.2): #14212 issue fixed 
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
 2018-04-20 14:22:20 +05:30
Maurício Meneghini Fauth
65c5a13deb Remove hash_equals polyfill 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-13 02:33:10 -03:00
Maurício Meneghini Fauth
d15dbea63c Refactor PhpMyAdmin\IpAllowDeny::allowDeny() method 
Simplifies the method by separating it into two new methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-03 14:28:37 -03:00
Maurício Meneghini Fauth
d23ed47666 Refactor PhpMyAdmin\IpAllowDeny static methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-03 14:06:13 -03:00
Rijas Ahammed PK
d6ca2d249e Enable columns names by default for CSV in issue #14007 solved (#14076) 
* Enable columns names by default for CSV

* Improve formatting

Signed-off-by: “Rijas <“Rijas.Ahammed@icfoss.in”>

* Follow formatting standard

Enclosed body of if statement within braces
Add space between if keyword and paranthesis

Signed-off-by: Rijas Ahammed PK <Rijaspk5195@gmail.com>
 2018-04-04 22:28:38 -03:00
Maurício Meneghini Fauth
c73e72e7ca Refactor PhpMyAdmin\Transformations static methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-01 01:34:17 -03:00
Maurício Meneghini Fauth
1a82d6f0d2 Refactor PhpMyAdmin\Import static methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-31 21:32:18 -03:00
Maurício Meneghini Fauth
2638eb9207 Refactor PhpMyAdmin\Export static methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-31 19:28:25 -03: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
Xinyu Liu
f1fa924f5f fix: AUTO_INCREMENT error when only exporting table structure in database-level exports; issue #14066 
Signed-off-by: Xinyu Liu <meteor.lxy@foxmail.com>
 2018-03-24 09:19:57 +00:00
Maurício Meneghini Fauth
4cab74d22e Check for zip extension before instantiate ZipExtension 
Fix #14025

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-19 00:15:16 -03:00
Maurício Meneghini Fauth
bae0431dfb Refactor PhpMyAdmin\ZipExtension class 
Replace static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-14 01:58:58 -02:00
Anu4ruby
5efb29d500 Removed inline styles from AuthenticationConfig.php file-issue 12262 (#13979) 
* removed inline styles from AuthenticationConfig.php file-issue 12262

* removed inline styles from AuthenticationConfig.php- file-issue 12262-

Signed-off-by: Anupama V <sadicarnot@gmail.com>
 2018-02-09 19:34:32 -02:00
Gabriel Caruso
6ff73257e2 Simplify returns 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-16 10:16:56 -02:00
Michal Čihař
8885328bbe Merge branch 'QA_4_7' 2018-01-08 17:00:35 +01:00
Michal Čihař
0a1634a12b Warn user in case the failed login is result of failed setting of cookie 
This can easily happen when switching between HTTPS and HTTP - once you
login using HTTPS, the secure cookie is created and it can not be
overwritten by non secure one created on HTTP connection making the
browser stuck on wrong session ID.

Issue #13872

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-18 11:35:44 +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ř
6aeae463d1 Merge branch 'QA_4_7' 2017-11-29 09:44:46 +01:00
Michal Čihař
a8f358e2c6 Merge branch 'QA_4_7' 2017-11-29 09:21:53 +01:00
Michal Čihař
8f27080d72 Fix php5 compatibility 
Issue #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 07:53:22 +01:00
Michal Čihař
b8fb7f254b Fix referenceding twofactor attribute 
Fixes #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 22:24:06 +01:00
Michal Čihař
c7e0782201 Do not show verify button on invalid 2fa 
Fixes #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 16:17:12 +01:00
Michal Čihař
49a1b0e743 Move session cleanup to post login 
It was really misplaced in 951e8ac753
it did cleanup session with every request.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 13:14:58 +01:00
Michal Čihař
80db5c457a Merge branch 'QA_4_7' 2017-11-27 09:26:41 +01:00
Michal Čihař
951e8ac753 Consistent session handling across plugins 
We want all auth plugins to behave same, there is no reason to secure
session only in the cookie plugin.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 09:14:52 +01:00
Michal Čihař
5867fad0ba Deny login if two factor is configured, but not available 
Fixes #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-24 09:17:29 +01:00
Michal Čihař
486ae2fd54 Warn when U2F is about to be used without https 
All browsers refuse to authenticate with http.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-23 15:57:50 +01:00
Michal Čihař
49281037e3 Replace original Google u2f-api with u2f-api-polyfill 
This gracefully handles Firefox 57 native API as well.

Fixes #13830

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-23 15:56:18 +01:00
Isaac Bennetch
b81b03b376 Minor grammar fix and match existing styles 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-22 15:56:18 -05: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