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

107027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
f3869cefd1 Split backends for URL request for easier testing 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:38:58 +02:00
Michal Čihař
47a0b7edd5 Hardcode connection timeout settings 
We anyway used almost same value in all places.

While doing this change, I've also increased the timeout.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:35:52 +02:00
Michal Čihař
506ba670ee Test posting to URL not allowing post 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:33:03 +02:00
Michal Čihař
d343315245 Set User-Agent directly 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:29:50 +02:00
Michal Čihař
5ecc194ebf Fix headers handling 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:27:12 +02:00
Michal Čihař
f8de425d22 Changelog entry for #12465 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:24:33 +02:00
Michal Čihař
5a8666c36a Fix allow_url_fopen request handling 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:22:45 +02:00
Michal Čihař
438244650e Consistent coding style 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:22:43 +02:00
Michal Čihař
d52e2cfbbf Move Util::httpRequest tests to UtilTest.php 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:22:25 +02:00
Michal Čihař
a7755dbb64 Merge pull request #12465 from Seldar/master 
Fixes #12380 Refactored http requests into one function "httpRequest" in Util.php
 2016-08-29 11:08:12 +02:00
Weblate
fc67d0d67e Merge remote-tracking branch 'origin/master' 2016-08-29 10:15:56 +02:00
Diego Bemquerer Castro
4ce3430810 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.6% (2981 of 3219 strings)

[CI skip]
 2016-08-29 10:15:55 +02:00
Michal Čihař
001aff0e8c Remove no longer valid options 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:15:41 +02:00
Michal Čihař
d239d6cc49 Add link to related configuration directives 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:15:24 +02:00
Michal Čihař
5087fc727a Revert "Remove documentation for Docker PMA_ABSOLUTE_URI" 
This reverts commit c00cc4a15a.
 2016-08-29 10:14:02 +02:00
Volkan Ulukut
be6944d0eb
Fixes #12380 Refactored http requests into one function "httpRequest" in Util.php 
Signed-off-by: Volkan Ulukut <arthan@gmail.com>
 2016-08-29 00:20:38 +03:00
Michal Čihař
44f5b605ae Merge branch 'QA_4_6' 2016-08-28 10:31:28 +02:00
Michal Čihař
38ce0c9d44 Remove unused paramenter when connecting to MySQLi 
Fixes #12502

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:30:32 +02:00
Isaac Bennetch
63600798fd Merge branch 'QA_4_6' 2016-08-27 11:52:13 -04:00
Isaac Bennetch
efe97b1500 Unable to edit transformations, issue 12292 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-27 11:51:37 -04:00
Michal Čihař
b4807f74e8 Merge branch 'QA_4_6' 2016-08-27 09:16:08 +02:00
Michal Čihař
ad5187383d Automatically save SQL query in browser local storage 
..when available rather than in cookie as we do not want to send huge
cookies with SQL query there and back.

Issue #12251
Issue phpmyadmin/docker#32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-27 09:15:28 +02:00
Deven Bansod
dd34ca8512 Merge branch 'QA_4_6' 2016-08-26 00:08:02 +05:30
Deven Bansod
d7181d1b5a ChangeLog entries for #12476 and #12477 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-26 00:04:19 +05:30
Deven Bansod
b3e7f10f2e Check if the indices are present and map to a string value 
Fix #12477

The indices may not be present in the json_decode result, or might not be strings

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-26 00:02:21 +05:30
Deven Bansod
96f5f101cc Add error checking in reading the advisory_rules file 
If the file does not exist or if it is not readable by PHP, it can return FALSE.
In such cases, we should print a user-friendly message and return from parsing the rules file.

Fix #12476

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-26 00:01:15 +05:30
Deven Bansod
d5c3302fb4 Merge branch 'QA_4_6' 2016-08-25 19:42:25 +05:30
Deven Bansod
d0b8281e84 ChangeLog entry for #12497 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-25 19:42:18 +05:30
Deven Bansod
27d0483192 Merge branch 'QA_4_6' 2016-08-25 19:41:20 +05:30
Deven Bansod
df29d8ae41 Add appr. escaping for $cfg options 'hide_db' and 'only_db' 
These can lead to SQL injection.

Fix #12497

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-25 19:36:35 +05:30
Michal Čihař
87f4e954d1 Merge branch 'QA_4_6' 2016-08-25 14:57:30 +02:00
Michal Čihař
26cc80324e Validate git commit hash before using 
Just to ensure we've parsed correct data.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:56:41 +02:00
Michal Čihař
71336fb6cd Merge branch 'QA_4_6' 2016-08-25 14:33:57 +02:00
Michal Čihař
9882dcba3a Fixed editing of ENUM/SET/DECIMAL fields structure 
Fixes #12480

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:33:21 +02:00
Michal Čihař
33348c5ed5 Allow to specify length of 0 
Issue #12480

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:32:48 +02:00
Weblate
2cd4a51dbc Merge remote-tracking branch 'origin/master' 2016-08-25 09:41:22 +02:00
Renan Souza do Nascimento
3d582a3fe8 Translated using Weblate (Portuguese) 
Currently translated at 53.4% (1722 of 3219 strings)

[CI skip]
 2016-08-25 09:41:21 +02:00
Michal Čihař
c95a2c35eb Merge branch 'QA_4_6' 2016-08-25 09:40:59 +02:00
Michal Čihař
2e4c6b3c4a Merge remote-tracking branch 'origin/QA_4_6' 2016-08-25 09:39:50 +02:00
Michal Čihař
fb3b722da1 Fixed random logouts due to wrong cookie path 
Some script did not properly configure their relative path and this
could lead to wrong cookie path being set. This doesn't happen in all
cases as the PHP session engine doesn't seem to set the cookie session
in every request.

Fixes #12251
Fixes phpmyadmin/docker#32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 09:38:17 +02:00
Renan Souza do Nascimento
54a0594493 Translated using Weblate (Portuguese) 
Currently translated at 53.7% (1724 of 3206 strings)

[CI skip]
 2016-08-25 09:38:10 +02:00
Michal Čihař
8d46edc4b6 Merge branch 'QA_4_6' 2016-08-24 12:03:37 +02:00
Michal Čihař
6879923acc Do not show warning about short blowfish_secret if none is set 
With empty blowfish_secret user would always get both warnings...

Fixes #12485

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 12:03:22 +02:00
Michal Čihař
31f6d76405 Merge branch 'QA_4_6' 2016-08-24 11:55:10 +02:00
Michal Čihař
c8c0341d68 Merge remote-tracking branch 'origin/QA_4_6' 2016-08-24 11:50:38 +02:00
Michal Čihař
cbd6137c03 Avoid double escaping of built in transformation URLs 
We do already escape them in the tranformation, so avoid doing that
before.

Issue #12483

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:48:48 +02:00
Michal Čihař
ed6188d2c8 Whitelist relative URLs from built in transformatons 
Fixes #12483

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:46:46 +02:00
Michal Čihař
38cf234707 Force relative paths in links 
This way we avoid potential problem if script name resolves to a domain.

Issue #12483

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:45:40 +02:00
Michal Čihař
48b6dd58d8 Use one code to check external links 
There is no good reason to duplicate the check in several places.

Fixes #12479

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:38:03 +02:00
Michal Čihař
265efb046f Extend PMA_checkLink to cover more use cases 
- allow to support mailto, ftp or http links on request
- do not use multibyte functions as we're interested in first chars
  anyway and we're comparing against ascii ones

Issue #12479

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:33:52 +02:00