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

105494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ř
e50e37b51d Properly escape database name when listing privileges 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:35:04 +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ř
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
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ř
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ř
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ř
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
Michal Čihař
ee0955b30b Use same condition for link start as for link end 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 11:04:28 +02:00
Michal Čihař
c00fe2cbfd Fix listing routines for non privileged user 
We first need to check if we can read the definition before parsing it.

Fixes #12310

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 08:55:04 +02:00
Michal Čihař
80c7b8a561 Add missing escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 16:17:36 +02:00
Michal Čihař
1b0fde1b59 Remove duplicated code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:05:20 +02:00
Michal Čihař
69cfcc6abd Ensure width and height are integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:51:22 +02:00
Michal Čihař
9d6157fda7 Ensure we use escaped version of type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:47:15 +02:00
Michal Čihař
a1f69b4c80 Fix syntax error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:17:36 +02:00
Michal Čihař
5b05665ff0 Ensure kill ID is integer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:07:13 +02:00
Michal Čihař
53cc34b374 Fix handing of GIS data 
* Force geometry count to be integer
* Ensure proper escaping of GIS data

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:02:48 +02:00
Jocelyn Flament
35b2624296 Translated using Weblate (French) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-06-16 13:02:27 +02:00
Michal Čihař
73d067a540 Fix test for new redirect code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 13:02:59 +02:00
Michal Čihař
8a142aba73 Adjust tests to new behavior 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 11:45:16 +02:00
Michal Čihař
9e0a321551 Canonicalize redirect URL 
We provide absolute path now to avoid problems with URLs like
/phpmyadmin/index.php/.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 11:42:45 +02:00
Michal Čihař
47f918f3fe Use standard redirect function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 11:38:00 +02:00
Michal Čihař
ef6c66dca1 Properly escape database name in central column queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 11:29:31 +02:00
Michal Čihař
79a34ff94c Calculate table size as integer 
It should be big enough on 64-bit systems, so avoid rounding issues
which double calculations can bring.

Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-14 08:28:26 +02:00
Michal Čihař
b5faeb3c27 Fixed editing of server variable 
We now store verbatim variable name in HTML to avoid need to do some
magical transformations when parsing it.

Fixes #12317

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-13 12:53:34 +02:00
Michal Čihař
0caecf5fc8 Correct error handling when editing variable fails 
Issue #12317

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-13 12:46:29 +02:00
Bruno Henrique
2d7d2d2e8b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2996 of 3209 strings)

[CI skip]
 2016-06-13 00:45:21 +02:00
Xavier Navarro
c8823e24e7 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-06-13 00:44:14 +02:00
Jocelyn Flament
baaa6c63be Translated using Weblate (French) 
Currently translated at 99.8% (3203 of 3209 strings)

[CI skip]
 2016-06-12 18:44:35 +02:00
Michal Čihař
3c6675b3f9 Fix division by zero in case of misconfigured MySQL server 
Fixes #12308

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:49:13 +02:00
Michal Čihař
763683b4fe Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:40:16 +02:00
Michal Čihař
b261ecae25 Add test for possible rounding issues 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Michal Čihař
43fdcb67ee Include phpMyAdmin version in JSON dump 
This provides useful information, the 0.1 string was not really helpful.

Issue #12304

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Gergő Felföldi
99f17c107e Translated using Weblate (Hungarian) 
Currently translated at 95.8% (3075 of 3209 strings)

[CI skip]
 2016-06-09 09:19:47 +02:00
Michal Čihař
d7fcbab1cd Ensure we parse query for views as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-08 14:00:04 +02:00
Satnam S Virdi
f801914944 Translated using Weblate (Punjabi) 
Currently translated at 3.1% (101 of 3209 strings)

[CI skip]
 2016-06-08 13:02:32 +02:00
Madhura Jayaratne
c2322a637d Merge pull request #12296 from madhuracj/bug12281 
Fix #12281 Copying a user resets SSL to None
 2016-06-06 23:55:19 +10:00
Madhura Jayaratne
c4e7447a96 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into bug12281 
Conflicts:
	ChangeLog
 2016-06-06 23:23:07 +10:00
Madhura Jayaratne
1c77a4ef0d Fix #12281 Copying a user resets SSL to None 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-06-06 23:17:20 +10:00