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

106343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
fe394c90a8 Merge branch 'QA_4_6' into QA_4_6-security 2016-12-08 11:42:50 +01:00
Michal Čihař
f2bfa7d745 Avoid running shell scripts as CGI 
There is really no reason for that besides misconfigured servers.

This is followup for PMASA-2016-54

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:41:42 +01:00
Michal Čihař
3a6247674e Do not provide fallback to cookie for font size 
* This should be already handled by Config class
* Injecting cookie value to CSS could be security risk

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:28:03 +01:00
Michal Čihař
a134a01177 Avoid infinite recursion on goto 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:20:10 +01:00
Michal Čihař
ec6c55c1df Add missing ; 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:06:10 +01:00
Michal Čihař
e37bf40f44 Avoid using REQUEST_URI for redirection 
* Stick with PMA_sendHeaderLocation to handle server weirdness
* Use already calculated URL

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 10:59:53 +01:00
Michal Čihař
9d712359d0 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 10:56:42 +01:00
Michal Čihař
4c84070ad6 Avoid using REQUEST_URI in form action 
It's really not necessary here and might cause redirection issues.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 10:49:06 +01:00
Michal Čihař
96b4f13e54 Quote table name for use in regexp 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 10:23:57 +01:00
Michal Čihař
3c9d440990 Merge remote-tracking branch 'security/pull/217' into QA_4_6-security 2016-12-08 10:18:11 +01:00
Michal Čihař
62517b08e2 Merge remote-tracking branch 'security/pull/218' into QA_4_6-security 2016-12-08 10:16:06 +01:00
Michal Čihař
5f558b0a1d Add openssl to sugest 
Issue #12785

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 15:56:39 +01:00
Michal Čihař
d7e7a06535 Add pcre to deps 
Issue #12785

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 15:55:02 +01:00
Michal Čihař
4df65209a1 Add information about required and suggested extensions to composer.json 
Fixes #12785

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 15:52:55 +01:00
Michal Čihař
14a1a69a78 Fixed javascript error on new version link 
Fixes #12792

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 10:44:42 +01:00
Weblate
108b52f599 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-07 09:43:46 +01:00
Jörn Gorres
afb5051fc4 Translated using Weblate (German) 
Currently translated at 99.4% (3205 of 3222 strings)

[CI skip]
 2016-12-07 09:43:44 +01:00
Michal Čihař
1ae6275be7 Fix wrong parameter to escapeString 
These come from f14cffd

Fixes #12786

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 09:38:57 +01:00
Michal Čihař
5273729cf5 Fix path to example configuration 
Fixes #12787

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 11:16:42 +01:00
Michal Čihař
9b1e8fb074 Add docker label 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 11:02:55 +01:00
Michal Čihař
ec9139edef Do not try to run gd based tests if gd extension is not there 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:44:06 +01:00
Michal Čihař
18a96f0178 Fix path to tcpdf include 
Otherwise we do not honor vendor configuration.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:32:56 +01:00
Michal Čihař
e3641a386b Avoid using hardcoded tcpdf path 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:31:50 +01:00
Michal Čihař
e182ba9907 Revert to auto for further tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:31:50 +01:00
Michal Čihař
15bac5f512 Flag tests needing network access 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:31:50 +01:00
Michal Čihař
79d33084f3 Add validation prior to using object 
Otherwise the test failure is really not obvious.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:04:44 +01:00
Michal Čihař
e627cf197c Remove not needed includes 
We already include this on bootstrap.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 09:54:54 +01:00
Michal Čihař
ce714410ec Use vendor specific path when loading gettext in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 09:48:02 +01:00
Isaac Bennetch
cf6129df64 ChangeLog updated for 4.6.5.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-05 18:47:59 -05:00
Madhura Jayaratne
fe802e1d6a Fix #12780 Format button replaces all text with blank spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-12-05 21:49:23 +11:00
Madhura Jayaratne
028998f829 Fix #12784 Remove ctype installation suggestion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-12-05 20:16:55 +11:00
Michal Čihař
4f29bbd76a Changelog entry for #12757 and #12777 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-03 13:44:37 +01:00
Michael Zarubin
eeb016bf4d Fix #12757 SQL syntax errror on MariaDB < 10.0.2 in check for mysql password check plugin 
Signed-off-by: Michael Zarubin <mzarubin@gmail.com>
 2016-12-03 13:43:58 +01:00
Deven Bansod
82c369334d Use user-link instead of control-link to query INFORMATION_SCHEMA.* 
This virtual database is automatically populated based on the privileges of the user.

Issue #12769

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-03 09:37:45 +05:30
Deven Bansod
43d1b53d76 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-12-03 08:59:55 +05:30
Deven Bansod
8b4b64050a ChangeLog for #12778 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-03 08:58:06 +05:30
Deven Bansod
fd231056ac $length can be blank, also precision in DEFAULT NULL is not required 
Fix #12778

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-03 08:54:19 +05:30
Michal Čihař
b875cf13c5 Merge pull request #12770 from devenbansod/fix_12769 
Fix #12769 : Current user might vary from the actual defined user
 2016-12-02 11:10:05 +01:00
Deven Bansod
7d4f188c72 Current user might vary from the actual defined user 
Use CURRENT_USER instead, which would give the actual user defined in User accounts table

Fix #12769

ChangeLog entry for #12769

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-02 01:07:48 +05:30
Michal Čihař
a11a6858d1 Merge remote-tracking branch 'origin/pull/12768' into QA_4_6 2016-12-01 11:49:31 +01:00
Michal Čihař
89dd577d2f Show no local storage warning only on settings tab 
It really makes no sense to show it on every page when we're checking
whether there are settings to import.

Fixes #12699

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 11:35:44 +01:00
Michal Čihař
e61b2135da Fixed SQL export with newlines 
Remove manual escaping where we do proper escaping through MySQL
extension.

Fixes #12765

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 11:02:04 +01:00
Michal Čihař
bb9a762a96 Remove wrong changelog entry 
This was not yet fixed.

Issue #12481

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 10:55:49 +01:00
Deven Bansod
27bddd66f7 Add ChangeLog entries under appropriate future release 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-30 18:44:01 +05:30
Michal Čihař
05a258778f ReCaptcha now works without allow_url_fopen 
Fixes #12588

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 13:37:46 +01:00
Michal Čihař
2346b8495a Update tracekit 
This should fix occasional permission problems as this is better handled
in newer version.

Not tested though as I can not reproduce the original issue.

Fixes #12739

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 13:08:40 +01:00
Michal Čihař
00f29c7460 Escape URL chars in version as well 
Not that this happens, but just to be sure.

Fixes #12761

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 12:47:53 +01:00
Michal Čihař
08b176dc58 Update SQL parser to 3.4.14 
- issue #12762 Fixed parsing of SQL with BINARY function

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 11:53:23 +01:00
pralin
3152c1e4c2 Translated using Weblate (Japanese) 
Currently translated at 70.7% (2280 of 3222 strings)

[CI skip]
 2016-11-29 09:27:34 +01:00
Weblate
3990a6c311 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-29 04:36:00 +01:00