Commit Graph

57 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
0811724040 Extract HTML from NavigationTree::renderPath()
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-04-24 15:10:26 -03:00
Maurício Meneghini Fauth
5254ec1b65 Refactor Navigation\NavigationTree
- Extract HTML from renderState() and renderDbSelect()
- Use DI for $dbi instead of global
- Fix tests

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-04-24 02:25:48 -03:00
Maurício Meneghini Fauth
6ae9cdf249 Extract HTML from Navigation\NavigationHeader
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-04-23 22:20:06 -03: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
1d0dad5cd6 Extract HTML from Navigation::getItemUnhideDialog()
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-04-23 16:24:55 -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
William Desportes
42e1a333a3
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-03-02 00:22:38 +01:00
William Desportes
6054f9eb4d
Fix: #14896 - Expanded DB, refresh, plus/minus icon
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-03-01 23:51:48 +01:00
Vincent Milum Jr
31b40f71bb Fix for SYSTEM VERSIONED tables #14514, #14515, and #14516 (#14536)
Fixes #14514
Fixes #14515
Possible fix for #14516

 #14514 Tables which enable the new MariaDB 10.3 versioning show up as "SYSTEM VERSIONED" instead of "BASE TABLE" inside of information schema. This patch now checks for both, so these new table types don't incorrectly display as views.

 #14515 MariaDB 10.3 also supports INVISIBLE columns, which is optionally paired with SYSTEM VERSIONED tabled (or implemented separately). This patch helps handle this new column attribute.

 #14516 This patch cannot be fully tested and verified with current MariaDB builds. Version 10.3.9 (currently unreleased) corrects an issue with column information for SYSTEM VERSIONED columns that this patch relies on. https://jira.mariadb.org/browse/MDEV-16804 - the reason for checking with preg_match instead of adding to the list is because there are now combined "extra" information for columns, such as INVISIBLE columns. Just matching entire strings also has a bug with these other "extra" parameters.

Signed-off-by: Vincent Milum Jr <git@darkain.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 3f6e360a4e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-02-15 17:27:55 -02:00
Vincent Milum Jr
3f6e360a4e Fix for SYSTEM VERSIONED tables #14514, #14515, and #14516 (#14536)
Fixes #14514
Fixes #14515
Possible fix for #14516

#14514 Tables which enable the new MariaDB 10.3 versioning show up as "SYSTEM VERSIONED" instead of "BASE TABLE" inside of information schema. This patch now checks for both, so these new table types don't incorrectly display as views.

#14515 MariaDB 10.3 also supports INVISIBLE columns, which is optionally paired with SYSTEM VERSIONED tabled (or implemented separately). This patch helps handle this new column attribute.

#14516 This patch cannot be fully tested and verified with current MariaDB builds. Version 10.3.9 (currently unreleased) corrects an issue with column information for SYSTEM VERSIONED columns that this patch relies on. https://jira.mariadb.org/browse/MDEV-16804 - the reason for checking with preg_match instead of adding to the list is because there are now combined "extra" information for columns, such as INVISIBLE columns. Just matching entire strings also has a bug with these other "extra" parameters.

Signed-off-by: Vincent Milum Jr <git@darkain.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-02-15 14:16:13 -02:00
saurass
88bb10d329 reduce elseif(s)
Signed-off-by: saurass <saurabhsrivastava312@gmail.com>
2019-01-25 14:21:22 +05:30
saurass
25ca73de64 fixes #14896 - [QA_4_8] Expanded DB, refresh, plus/minus icon
Signed-off-by: saurass <saurabhsrivastava312@gmail.com>
2019-01-24 12:30:03 +05:30
Maurício Meneghini Fauth
7eb2bbc102 Remove libraries/check_user_privileges.inc.php
Replaces with CheckUserPrivileges::getPrivileges

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-22 18:18:21 -02: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
23c3579804 Format array declarations
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-07 14:31:39 -02: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
38e5b12c1c Define an absolute path to use for require statements
Fixes #6167

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-22 14:37:31 -02:00
Maurício Meneghini Fauth
9eba565bf4 Remove unnecessary HTML closing tags
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 00:12:54 -02:00
Maurício Meneghini Fauth
76d8bfdafa Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-12 21:04:19 -02:00
Madhura Jayaratne
752d544805
Merge pull request #262 from phpmyadmin/bug260
Fix #260 Stored Cross-Site Scripting (XSS) in navigation tree
2018-12-08 10:45:03 +11:00
Eddie Chang
b293ff5f23 Fix https://github.com/phpmyadmin/phpmyadmin-security/issues/260 Stored Cross-Site Scripting (XSS) in navigation tree
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2018-12-07 16:28:48 +11: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
b5c9c63789 Fix some uncaught type errors
Fixes #14394

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-12 23:14:05 -02:00
Maurício Meneghini Fauth
b4e1862740 Retrieve parameters from $_POST in navigation
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-10 20:48:58 -02:00
Maurício Meneghini Fauth
5707c9fa1c
Merge pull request #14690 from nakshatra1997/master
close dialog box after unhiding all tables
2018-11-05 17:17:44 -02:00
lkopo
764de6b600 Issue #12158: auto expand the single database (#14650)
* Navigation menu automatically expands database if there is only one record
* Added a new configuration for auto-expanding navigation tree for single database

Signed-off-by: Eduard Karpiel <eduard@karpiel.sk>
2018-10-31 19:21:39 -03:00
Nakshatra Pradhan
60bd512e0b Close dialog box after unhiding all tables
Signed-off-by: Nakshatra Pradhan <nakshatrapradhan2013@gmail.com>
2018-10-27 18:05:01 +05:30
Isaac Bennetch
fab796bda9 Fixing some Uncaught TypeErrors, related to #14608
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-09-06 13:43:47 -04:00
Isaac Bennetch
5130b3da1a Fixing some Uncaught TypeError, related to #14608
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-09-06 10:50:09 -04:00
Maurício Meneghini Fauth
d4b4124a5e Remove $GLOBALS['dbi'] from Relation class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-08-30 19:05:09 -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
William Desportes
863badfdc2 Patch - missed instance of 'Avoid passing extension to Util::getImage'
Patch for commit bed6fb4ebd

Fixes: #14390
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit ff4785cbf2)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-07-04 20:40:32 -03:00
Maurício Meneghini Fauth
b2e4f01dcc
Merge pull request #14414 from williamdes/issue-14390-db-show
Patch - missed instance of 'Avoid passing extension to Util::getImage' and GIS icon
2018-07-04 20:26:54 -03:00
William Desportes
ff4785cbf2
Patch - missed instance of 'Avoid passing extension to Util::getImage'
Patch for commit bed6fb4ebd

Fixes: #14390
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-06-29 00:17:08 +02: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
Lakshay arora
61163cd14b Add configuration setting to toggle drag drop file Import
This commit-
Adds a configuration directive to toggle drag drop Import feature as requested in #13155
TODO:
1. Test it on multiple servers.
2. Disable javascript handlers for drag drop
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
2018-06-24 14:21:24 +05:30
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
Isaac Bennetch
4baab5c7a3 Fix Uncaught TypeError when logging in
Fixes bug #14380

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-06-10 11:37:09 -04: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
9dbae0a9ed Enable strict mode in Navigation classes
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-16 01:09:16 -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
Gabriel Caruso
6ff73257e2 Simplify returns
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-01-16 10:16:56 -02:00
Gabriel Caruso
a8bd364e02 Clean elses
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2017-12-14 22:02:17 -02:00
Michal Čihař
bed6fb4ebd Avois passing extension to Util::getImage
We do not use it anyway for quite some time and this way it's less
processing to generate the img tag.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 14:24:42 +01:00
Michal Čihař
4fe87fb592 Remove usage of $GLOBALS['controllink']
This is now stored internally inside DatabaseInterface instance.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-25 10:21:18 +02:00
Maurício Meneghini Fauth
536caac21d Port navigation/logo template to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-18 12:34:02 -02:00