webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity
109,918 Commits 12 Branches 481 Tags
QA_4_7
Commit Graph

17207 Commits

Author SHA1 Message Date
Alexander Kamp
dc75d407c0 Fixes for issue 14059: (#14075) 
Missing '=' after fk_checks (value was appended onto field name)
sql_query variable not set due to GET-POST method change in tbl_structure.php 'add_key' situation

Fix #14059

Signed-off-by: Alexander Kamp <git@akamp.nl>
 2018-03-12 19:16:57 -03:00
Isaac Bennetch
9c11715e75 Prepare for 4.7.10-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 13:14:46 -05:00
Isaac Bennetch
b3b170da62 Prepare for version 4.7.9 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 10:35:48 -05:00
Michal Čihař
3034a23fed Revert "Honor arg_separator in AJAX requests" 
This reverts commit 984c6a0054.

See #13940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-05 15:46:32 +01:00
Michal Čihař
984c6a0054 Honor arg_separator in AJAX requests 
Fixes #13940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-01 15:50:41 +01:00
Michal Čihař
fc378b0bd3 Adjust table operations to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 6b5d535da5)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-22 16:01:00 -03:00
Michal Čihař
8f9f8aa3b5 Adjust RTE oprations to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 2bc87216f0)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-22 15:19:54 -03:00
Michal Čihař
6f4740e17c Always use POST for links containing SQL query 
This way the SQL queries will not apper in the web server logs.

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 99e9854473)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-22 13:36:20 -03:00
Michal Čihař
be7d5ee738 Simplify handling of long URLs in Util::linkOrButton 
We no longer create form, but rather rather tag the link to be handled
as POST on the client side.

This way the code is way simpler without need on any special case
handling on server side.

Fixes #13649

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 3b9fb2b664)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-22 13:02:58 -03:00
Maurício Meneghini Fauth
c75166c3a9 Revert "Force using POST for SQL query in Util::linkOrButton" 
This reverts commit 44df4a3094.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-22 11:44:06 -03:00
Isaac Bennetch
1562d1c86b Prepare for 4.7.9-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-02-20 23:40:14 -05:00
Isaac Bennetch
4c8662f14a Prepare for release 4.7.8 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-02-20 08:06:36 -05:00
Michal Čihař
2f248be866 Fix variable name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-02-12 14:45:28 +01:00
Michal Čihař
0870b2b0ae Set system locales separately 
The motranslator no longer does this, see
https://github.com/phpmyadmin/motranslator/issues/24

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-02-12 14:17:43 +01:00
Michal Čihař
5efab27007 Avoid operating on unset array index 
Fixes #13939

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-16 16:07:46 +01:00
Michal Čihař
c77cfa7d13 Avoid operating on uset array index 
Fixes #13939

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-16 16:05:04 +01:00
Michal Čihař
4ef752efb3 Fixed error handling in PHP 7.2 
Fixes #13938

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-16 16:00:43 +01:00
Michal Čihař
6dede8e274 Add demo server information to login screen 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-08 17:00:30 +01:00
Michal Čihař
d2ea090c2e Fixed fallback value for collation connection. 
Fixes #13758

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-08 15:18:58 +01:00
Isaac Bennetch
8599e87ad3 Prepare for 4.7.8-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-12-23 09:41:20 -05:00
Isaac Bennetch
c178ff6911 Merge remote-tracking branch 'security/QA_4_7-security' into QA_4_7 2017-12-23 08:31:25 -05:00
Isaac Bennetch
203148dd48 Prepare for release 4.7.7 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-12-23 08:28:28 -05:00
Michal Čihař
5503abe53a Merge remote-tracking branch 'security/QA_4_7-security' into QA_4_7-security 2017-12-18 11:49:44 +01:00
Michal Čihař
44df4a3094 Force using POST for SQL query in Util::linkOrButton 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-18 11:46:57 +01:00
Michal Čihař
59d960c6bc Correctly invoke removeUiProp on Table class 
Fixes #13848

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 13:44:12 +01:00
Michal Čihař
39b8020857 Fixed displaying of formatted numeric values for some locales 
The code was wrongly assuming that . is always decimal separator, what
it is not and can be even thousands separator.

Fixes #13865

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 11:05:54 +01:00
Michal Čihař
edd929216a Bring back token validation to GET requests 
This is necessary to avoid CSRF on SQL queries. This is really more a
short term fix, proper fix (to be implemented in master) is to avoid
accepting SQL queries from GET requests.

This reverts commits:

* dae3390a02
* ea73fded71
* 90433788d6
* f797a8d87d
* 9c1cfc8553

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-14 17:27:22 +01:00
Isaac Bennetch
ead6561693 Prepare for 4.7.7-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-30 22:24:25 -05:00
Isaac Bennetch
b58d0b5ae9 Prepare for 4.7.6 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-30 22:23:11 -05:00
Michal Čihař
8bc91e9b58 Revert "Compatibility with phpseclib 2.0.8" 
This reverts commit a450935e53.

We really need to stick on 2.0.7 for 4.7 branch to keep PHP 5.5 support.

Issue #13846
 2017-11-29 09:34:44 +01:00
Michal Čihař
a450935e53 Compatibility with phpseclib 2.0.8 
Apparently upgrade from 2.0.7 to 2.0.8 changed API in several ways.

See https://github.com/phpseclib/phpseclib/issues/1218

Fixes #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 09:13:23 +01:00
Michal Čihař
9ebd88061c Set $sql_query as well when changing password 
Issue #13737

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 10:55:41 +01:00
Michal Čihař
b8428ea70f Fix coding style for #13737 2017-11-28 10:54:42 +01:00
Michal Čihař
562d0065b0 Merge remote-tracking branch 'origin/pull/13737' into QA_4_7 2017-11-28 10:53:54 +01:00
Michal Čihař
0262542254 Prefer iconv for encoding conversions 
The mb extension is usually present, however it does not support that
wide range of charsers.

Basically this reverts d846b2e5d5.

Fixes #13842

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 10:28:55 +01:00
Michal Čihař
e51a653a1c Fixed constructing ALTER query with AFTER 
We have to include only non empty fields in this case.

Fixes #13824

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 18:23:21 +01:00
Michal Čihař
88aa6a8333 Avoid using empty and workarounding its match to zero 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 18:20:54 +01:00
Michal Čihař
e22399bebe Add support for JSON field in MariaDB 
Fixs #13038

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:51:48 +01:00
Michal Čihař
fd7a4db3b7 Correctly unset session on logout 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 09:25:46 +01:00
Michal Čihař
f7e6366d01 Use correct name for motranslator call 
We're not using php gettext, so using _ is mistake.

Issue #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 08:59:36 +01:00
Michal Čihař
facc536689 Detect another way MySQL server needs SSL 
Fixes #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-18 13:43:53 +01:00
Michal Čihař
1fccdb4da0 Fix typo in transformation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-14 10:47:21 +01:00
Michal Čihař
9f3449275e Add SJIS-win to default list of allowed charsets 
Fixes #13803

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-13 12:37:24 +01: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
Isaac Bennetch
113ccfc8a5 Prepare for 4.7.6-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-10-21 05:24:23 -04:00
Isaac Bennetch
4a60cbd442 Prepare for release 4.7.5 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-10-21 04:00:49 -04:00
Michal Čihař
3a625bcd1f Fixed listing of bookmarks for a database 
Fixes #13761

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 11:04:45 +02:00
Tadas Ustinavičius
2242a24094 Fix for password change issues on Galera cluster 
Signed-off-by: Tadas Ustinavičius <tadas@ring.lt>
 2017-10-12 18:19:29 +03:00
Madhura Jayaratne
b000c394f7 Fix #13686 Clicking on column name to trigger sort with an active search leads to logout 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-10-09 23:16:57 +11:00
Michal Čihař
d0d24ce20b Fixed IPv4/IPv6 To Binary input transformation 
We really can't just output binary value, it can not be safely used in
the result utf-8 query string.

Fixes #13552

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-03 15:55:11 +02:00