Commit Graph

96 Commits

Author SHA1 Message Date
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
Maurício Meneghini Fauth
2e88ed0888 Fix issue when copying a table row
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-23 19:23:59 -03:00
William Desportes
803d07d868
Merge branch 'QA_5_0' into 'master'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-23 14:19:56 +02:00
William Desportes
027f39057a
Merge branch 'QA_4_9' into QA_5_0
- Fixed css img urls for designer

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-23 12:22:37 +02:00
Maurício Meneghini Fauth
fc6b6c872c Merge branch 'QA_5_0' 2019-08-21 14:00:12 -03:00
Maurício Meneghini Fauth
601fbf9fef Fix type errors with stripcslashes function
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-21 13:57:47 -03:00
Maurício Meneghini Fauth
632a774de2 Use the router for transformation_wrapper.php
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-21 00:11:04 -03:00
William Desportes
10745bb392
#15363 - substr can return false
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-20 16:43:31 +02:00
William Desportes
40ed155775
Merge branch 'QA_5_0' into 'master'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-20 11:09:55 +02:00
William Desportes
f428277bad
Merge branch 'QA_4_9' into 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-20 11:08:28 +02:00
Maurício Meneghini Fauth
69d279d68c Use the router for the table replace page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-15 20:30:43 -03:00
William Desportes
b4d3b07476
Fix #15363 - Remove unexpected quotes on text fields
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-15 22:13:17 +02:00
Hugues Peccatte
c36a2cef02
Fix #15363 Remove unexpected quotes on text fields
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-08-15 20:53:36 +02:00
Maurício Meneghini Fauth
00eb35b2be Use the router the for the browse foreigners page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-05 23:27:47 -03:00
Maurício Meneghini Fauth
71a5c660df Move sql entry points to libraries/entry_points
- sql.php -> libraries/entry_points/sql.php
- server_sql.php -> libraries/entry_points/server/sql.php
- db_sql.php -> libraries/entry_points/database/sql.php
- tbl_sql.php -> libraries/entry_points/table/sql.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-05 15:34:50 -03:00
Maurício Meneghini Fauth
208b0e25e1 Use the router for the sql pages
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-03 21:25:27 -03:00
Maurício Meneghini Fauth
e4982d677d Use the router for the table change page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-07-26 02:13:37 -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
William Desportes
6cc352ac12
phpstan level 3 fixes
21 errors left

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-06-22 14:37:38 +02:00
Maurício Meneghini Fauth
6316967e01 Merge branch 'QA_4_9'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-19 13:11:41 -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
c9129e9bd8 Remove unnecessary string concatenation
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-12 17:47:33 -03:00
Maurício Meneghini Fauth
c8f84fc748 Replace is_null with identical comparison with null
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-12 13:28:22 -03:00
William Desportes
64dc20460e
Fix #15315 - Cannot edit or export TIMESTAMP column with default CURRENT_TIMESTAMP in MySQL >= 8.0.13
Fixes: #15315

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-06-09 16:43:45 +02:00
Maurício Meneghini Fauth
efe77cdf06 Rename js/tbl_*.js to js/table/*.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-07 04:09:05 -03:00
Hugues Peccatte
d4699ac8a5 Remove unused private method
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-14 21:59:57 +02:00
Hugues Peccatte
91e9acb263 Update PHPDoc
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-14 21:59:57 +02:00
Hugues Peccatte
158a13828f Remove useless unset
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-14 21:59:57 +02:00
Hugues Peccatte
69895e4bb1 Use "strpos" instead of "strstr" to improve performances
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-07 23:58:05 +02:00
Maurício Meneghini Fauth
8261661258 Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-04 17:02:46 -03:00
Maurício Meneghini Fauth
b30555f887
Merge pull request #14993 from bahl24/fix-#14934
removed readonly cond as its redundant
2019-05-04 16:57:15 -03:00
William Desportes
76cbe9f961
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-03-26 21:05:09 +01:00
Saurabh Srivastava
47fe92099b Fix #14853 - Insert page should not allow entering things into virtual columns
Fixes: #14853
Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
2019-03-26 20:55:09 +01:00
Nitish Bahl
d994ee14b9 removed readonly cond as its redundant
Signed-off-by: Nitish Bahl <nitishbahl24@gmail.com>
2019-03-02 18:50:53 +05:30
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
Maurício Meneghini Fauth
fedad552cc
Merge pull request #14849 from Tithugues/feature/replace-regexp-when-simple
Replace regular expressions when simple
2019-01-16 02:14:51 -03:00
Hugues Peccatte
9406e922cc Update PHPDoc
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-13 09:52:46 +01:00
Hugues Peccatte
6358cd49dc Fix wrong case in function names
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-12 13:36:27 +01:00
Hugues Peccatte
746fd8b417 Replace regular expressions when simple
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-12 02:06:28 +01:00
Maurício Meneghini Fauth
ae20364830 Upgrade phpmyadmin/coding-standard to v1.0
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-08 01:26:26 -02: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
999b4d14f0 Fix some coding standard errors
- Fixes array identation
- Removes empty statements

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-05 21:25:08 -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
ef5d7dd66b Use Bootstrap buttons component
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 01:01:12 -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
d4ed31339a
Merge pull request #257 from phpmyadmin/bug-245
Fix #245 Remove transformation plugin includes
2018-12-04 19:55:29 +11:00
Maurício Meneghini Fauth
6a1ba61e29 Remove transformation plugin includes
Tranformation plugins should be loaded by the autoloader.

Fixes https://github.com/phpmyadmin/phpmyadmin-security/issues/245

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-27 18:44:30 -02:00