Commit Graph

72 Commits

Author SHA1 Message Date
William Desportes
4ad49f5800
Fix JS common_query and refreshMain usages
Ref: 3a765576c5
Ref: #15678
Ref: #15663
2020-03-10 23:00:16 +01:00
Maurício Meneghini Fauth
81645baee2 Use early exit for Header::getDisplay
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-03-10 17:10:39 -03:00
Maurício Meneghini Fauth
206199105e Remove useless return type annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-23 13:03:29 -03:00
Maurício Meneghini Fauth
676f48349a Reference global funcs and consts via use statement
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-21 22:13:36 -03:00
Maurício Meneghini Fauth
f80d3e3bd4 Remove unnecessary annotations
@package, @subpackage and others.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 17:35:56 -03:00
Maurício Meneghini Fauth
6283caaabf Use one line for comments with a single line
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 16:04:09 -03:00
Maurício Meneghini Fauth
50bc4ab37f Remove useless PHP docs for functions
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 13:20:01 -03:00
William Desportes
bf2efcb084
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-01-15 13:51:13 +01:00
Maurício Meneghini Fauth
9d5da68a8b Fix uncaught TypeError
> chdir() expects parameter 1 to be a valid path, null given

Partially reverts c642c29aa4.

Sets $dbi even if Server config is empty.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-14 23:18:38 -03:00
William Desportes
9b15f10bc7
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-30 18:52:02 +01:00
Yunhao Tian
56be819ee4
Renders absolutely nothing when header is not enabled.
When downloading blob data from database, the header template will be rendered as `\n` which adds an extra 0x0A at the beginning of the blob data. This fixes the problem.

Signed-off-by: Yunhao Tian <18373444@buaa.edu.cn>
2019-12-30 18:42:05 +01:00
Maurício Meneghini Fauth
3f522e8ae2 Fix some tests when running them in isolation
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-26 21:16:30 -03:00
Maurício Meneghini Fauth
f126e14599 Extract js variables from js/messages.php
Moves JavaScript variables to templates/javascript/variables.twig.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-18 16:48:41 -03:00
Maurício Meneghini Fauth
4a79e27e10 Remove js/whitelist.js
Removes the GotoWhitelist global.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-17 21:09:54 -03:00
Maurício Meneghini Fauth
f6a17433a2 Use null coalesce operator when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-11 20:16:58 -03:00
Maurício Meneghini Fauth
dd06cd38f8 Defines rules for double quote usage
Makes sure that any use of double quotes strings are warranted.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-01 14:10:07 -03:00
Hugues Peccatte
3255e4ad7b Split Util class regarding the responsabilities (#15567)
PhpMyAdmin\Util is a very huge class with a lot of responsabilities.

There is a lot of work to split it, but this may be just a small start, waiting for a more normalized code.

* Split Util class regarding the responsabilities
* Split the buttonOrImage function

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-11-21 20:20:05 -03:00
Maurício Meneghini Fauth
1a14b3e4d3 Remove vim modelines
These settings are no longer required as they are guaranteed through
other coding standard tools.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-02 09:43:21 -03:00
Hugues Peccatte
0d8f6a3a93 Merge isset and unset calls
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-07-16 23:21:25 -03:00
Maurício Meneghini Fauth
e1f9ae00cd Add a trailing comma in multi-line arrays
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-14 14:09:26 -03:00
Maurício Meneghini Fauth
61f3a93019 Rename js/menu-resizer.js to js/menu_resizer.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-27 01:42:19 -03:00
Maurício Meneghini Fauth
562b5a48f0 Remove PMA_ from PMA_commonParams and PMA_commonActions names
PMA_commonParams => CommonParams
PMA_commonActions => CommonActions

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-21 00:18:44 -03:00
Hugues Peccatte
ff3325870f Remove unused variables
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-14 21:59:57 +02:00
Hugues Peccatte
50bcfc8ed6 Remove useless attribute
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-14 21:59:57 +02:00
Maurício Meneghini Fauth
7d199a7bc2 Fetch dbi from DI instead of global in Navigation class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-04-23 16:43:16 -03:00
Maurício Meneghini Fauth
c642c29aa4 Extract HTML from Navigation::getDisplay()
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-04-22 15:57:16 -03:00
Maurício Meneghini Fauth
47fa0d8bdb Extract HTML from Header::getDisplay()
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-04-19 15:37:33 -03:00
Hugues Peccatte
f06883d2a7 Remove useless parenthesis
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-20 01:23:53 +01:00
Maurício Meneghini Fauth
4cee0cbc12 Adds space after not (!) and type cast
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-05 21:56:34 -02:00
Maurício Meneghini Fauth
5bce6d9fa6 Add Bootstrap javascript file
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-20 22:34:12 -02:00
Tomas Votruba
637fe6de06 [cs] remove unused brackets, clean unused property assign
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
2018-11-26 17:54:40 +01:00
Tomas Votruba
bf720bad29 remove unused and fix @param, @var and @return annotation values
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
2018-11-24 21:47:26 +01:00
Maurício Meneghini Fauth
222bf67795 Fix uncaught TypeError in Header class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-10-25 01:27:24 -03:00
Tazo Todua
17b85ab50c Improve AllowThirdPartyFraming configuration (#14688)
The only correct way to check the frame-options. The existing version was incorrect. Even setting to value to "blabla", it bypassed the ! check in php. So, at first, it should be checked if the "sameorigin" is value, and after that, everything other than true should DENY the frame.

Signed-off-by: Tazo Todua <tazotodua@gmail.com>
2018-10-24 14:03:12 -03:00
Maurício Meneghini Fauth
a686ff8360 Refactor Header class to use templates
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-09-23 03:20:55 -03:00
William Desportes
3dce65d913 phpstan level 1 (#14472)
* level +1
* Install sami/sami globaly to avoid dependency clash

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-08-18 14:37:41 -03:00
Maurício Meneghini Fauth
5e2e27dfeb
Merge pull request #14233 from nulll-pointer/recent_table_issue
Fixes issue with recent table list, #14229
2018-07-03 20:46:44 -03:00
Lakshay arora
9d08a1dcaf Puts PMA import handler in a separate javascript file.
Makes 'enable_drag_drop_import' as a separate configuration directive, removes it from group of $cfg['IMPORT'] directives.
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
2018-06-25 12:37:43 +05:30
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
6cf8ee0831 Enable strict mode in some classes
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-15 01:03:57 -03:00
Maurício Meneghini Fauth
e524d63908
Merge pull request #14265 from aswaniprakash/PMA_14019
Issue #14019 fix: Allow parameter in AllowThirdPartyFraming
2018-05-13 16:43:40 -03:00
Maurício Meneghini Fauth
df2bbf5a4c Add type declarations to Header
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-10 01:23:03 -03:00
Aswani Prakash
6d3d6afa3e Issue 14019 fix: Allow parameter in AllowThirdPartyFraming
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
2018-05-08 10:38:31 +05:30
Lakshay arora
727b40e00c Fixes issue with recent table list, #14229
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
2018-04-25 22:58:35 +05:30
Maurício Meneghini Fauth
38767030ef Remove @ operator from ini_get()
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-03-01 22:36:35 -03:00
Michal Čihař
f4026f60a4 Merge branch 'QA_4_7' 2018-03-01 16:02:57 +01:00
Maurício Meneghini Fauth
17bf8b7309 Replace static methods with instance methods
Replaces PhpMyAdmin\UserPreferences static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-23 15:26:02 -03:00
Michal Čihař
c162a75b9b Improve javascript loading
- jquery-ui-timepicker-addon.js is loaded in Header, no need to load it
  elsewhere
- jquery.validate.js is needed on way to many pages to benefit of
  loading only on some of them

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-12-15 08:36:23 +01: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