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

105539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Chen
cfb38bbcbf Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-06-24 02:59:46 +02:00
Isaac Bennetch
58534ce2fc Prepare for 4.6.4-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 02:40:42 -04:00
Isaac Bennetch
f2db92434b Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 00:28:35 -04:00
Isaac Bennetch
4f57305eab Release 4.6.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 00:27:15 -04:00
Isaac Bennetch
f7d1c1f463 Changelog entries for security release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-22 23:53:56 -04:00
Michal Čihař
615212a14d Do not allow javascript: links in transformation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 13:28:07 +02:00
Michal Čihař
519e634a8d Merge branch 'QA_4_6' into QA_4_6-security 2016-06-22 13:10:55 +02:00
Michal Čihař
4d21b5c077 Fixed rendering of chart of columns with HTML inside 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 13:07:32 +02:00
Michal Čihař
301e1b0f7d Fix adjusting privileges for tables/databases with quote in name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:58:05 +02:00
Michal Čihař
e50e37b51d Properly escape database name when listing privileges 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:35:04 +02:00
Michal Čihař
57ae483bad Escape database name when showing dialog 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:14:57 +02:00
Michal Čihař
960fd1fd52 Properly escape zoom search column type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:10:14 +02:00
Michal Čihař
36df83a97a Escape saved search name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:00:14 +02:00
Michal Čihař
d95a4a2f96 Avoid undefined index in case of incomplete bookmark 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 10:57:11 +02:00
Michal Čihař
0b7416c5f4 Escape user group when displaying 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 10:53:46 +02:00
Michal Čihař
792cd1262f Escape partition comment when displaying 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 10:26:50 +02:00
Weblate
6c8c8de097 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-06-20 12:22:06 +02:00
uncle_cat
0459089406 Translated using Weblate (Chinese (China)) 
Currently translated at 88.0% (2824 of 3209 strings)

[CI skip]
 2016-06-20 12:22:04 +02:00
Michal Čihař
1cc7466db3 Quote delimiter before using preg_replace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:16:03 +02:00
Michal Čihař
2674e503f2 Assign helperFunctions before doing extract 
This way we avoid possiblity of rewriting it from within the context.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:07:13 +02:00
Michal Čihař
4bcc606225 Always use delimiter not present in search expression 
This avoids need to figure out correct escaping in case delimiter is
present in the expression.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:03:44 +02:00
Michal Čihař
2f4950828e Update referrer <meta> to match current standards 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 10:47:30 +02:00
Michal Čihař
80cd2f448c Merge branch 'QA_4_6' into QA_4_6-security 2016-06-20 10:42:29 +02:00
Michal Čihař
364732e309 Escape error message from server 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 10:11:25 +02:00
Michal Čihař
895a131d2e Escape HTML when rendering AJAX error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 10:07:52 +02:00
Michal Čihař
79661610f6 Escape attributes when showing images in javascript 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 10:04:16 +02:00
Michal Čihař
1e5716cb96 Add referrer CSP and <meta> tag 
This avoids leaking Referer header in modern browsers.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 09:41:06 +02:00
Madhura Jayaratne
040822fe5a ChangeLog entry for e7003792d9 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-06-18 09:19:00 +10:00
Madhura Jayaratne
e7003792d9 Escape generated query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-06-18 09:13:02 +10:00
Michal Čihař
1a558a4190 Ensure id is numeric 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 17:12:41 +02:00
Michal Čihař
be3ecbb4cc Simplify and cleanup transformation plugins 
Remove PMA_transformation_global_html_replace which makes the code only
more confusing.

Also add escaping to browse transformations.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 16:18:13 +02:00
Michal Čihař
d648ade18d Escape binary log name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:51:15 +02:00
Michal Čihař
8716855b30 Properly escape translated string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:45:29 +02:00
Michal Čihař
0815af37f4 Add missing escaping to partition listing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:37:37 +02:00
Michal Čihař
418aeea3d8 Add error handling to constructing openid message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:34:50 +02:00
Michal Čihař
94cf386425 Escape error messages from OpenID 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:30:36 +02:00
Michal Čihař
1363ce5749 Merge branch 'QA_4_6' into QA_4_6-security 2016-06-17 14:27:02 +02:00
Michal Čihař
27664605b9 Improve error handling in OpenID example 
- properly check parameter types
- catch all exceptions (eg. network error)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:26:59 +02:00
Michal Čihař
61b4e28faf Sanitize page and formset before using 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:21:53 +02:00
Michal Čihař
07216c9b8e Ensure that connection collation contains no HTML 
There is currently no MySQL collation which would do that, but just to
be safe.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:58:26 +02:00
Michal Čihař
04a72687f8 Add missing escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:54:26 +02:00
Michal Čihař
58da975117 Add missing URL encoding 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:22:01 +02:00
Michal Čihař
a5950f9ecd Fix link to mariadb explain analyzer 
- avoid double urlencoding of the query
- properly escape html entities

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:05:11 +02:00
Michal Čihař
d1ec59f05f Ensure we have integer as offset 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:01:56 +02:00
Michal Čihař
aef5df7e13 Ensure we have integer as position 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:00:45 +02:00
Michal Čihař
009148075f PMA_jsFormat accepts only strings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 11:43:51 +02:00
Michal Čihař
00b9be9c4a Merge branch 'QA_4_6' into QA_4_6-security 2016-06-17 11:23:36 +02:00
Michal Čihař
4a9da1df40 Adjust tests to new error reporting handling of objects 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 11:23:20 +02:00
Michal Čihař
1d2e2be925 Merge branch 'QA_4_6' into QA_4_6-security 2016-06-17 11:20:18 +02:00
Michal Čihař
f5e8953356 Share backtrace processing for debugging and error reporting 
We want to achieve same thing in both cases - backtrace which is
stripped from sensitive information, has reasonable size and can be
read. Sharing the code will make it easier to fix possible problems and
also will make both cases behave consistent.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 11:18:39 +02:00