gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,354 Commits 12 Branches 481 Tags 2.4 GiB
92aa487c54
Commit Graph

134 Commits

Author SHA1 Message Date
Michal Čihař
3a7eaf8538 Merge branch 'QA_4_6' 2016-12-19 15:28:25 +01:00
Michal Čihař
2557709949 Merge pull request #12807 from nijel/cookie-fatal 
Do not delete session on fatal error
 2016-12-19 15:28:07 +01:00
Michal Čihař
beea41fc96 Merge branch 'QA_4_6' 2016-12-14 15:31:29 +01:00
Michal Čihař
715bdf3a49 Fixed operation with lower_case_table_names=2 
The problem is that mysqli_fields_meta returns orgtable as lowercase
making phpMyAdmin treat it as alias later nad finding no fields for
original table.

Fixes issue #11816

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-14 15:29:43 +01:00
Michal Čihař
73499a5e56 Do not delete session on fatal error 
I see no reason why this should be done, the fatal error is used
in following cases:

* Very early when there is no session (eg. missing extension)
* Invalid value for parameters
* Invalid invocation like too big request

In neither case session removal will do any good.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 11:51:43 +01:00
Michal Čihař
c5b879c745 Merge branch 'QA_4_6' 2016-12-13 11:18:26 +01:00
Michal Čihař
2b134240b8 Share code for session cache key calculation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 11:17:58 +01:00
Michal Čihař
8ef66ace36 Merge branch 'QA_4_6' 2016-12-13 10:54:59 +01:00
Michal Čihař
8d5939348e Use current user in session cache key 
This makes it automatically valid only for current user.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:54:08 +01:00
Michal Čihař
b56f101039 Remove is_ajax_request global 
We already have the same information on Response object, so let's use it
from there.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 17:54:34 +01:00
Michal Čihař
bb9b46b149 Remove unused function flipstring 
Fixes #12754

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 12:45:35 +01:00
Michal Čihař
b746697397 Correctly handle HTTP status when doing requests 
When performing requests, we should not simply return content in case of
failure, the error should be propagated.

This could lead to invalid reporting of Git commit data as we would
tread GitHub rate limiting response as commit information.

Fixes #12713

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:27:22 +01:00
Michal Čihař
df0d8a06d3 Merge branch 'master' into master-security 2016-11-10 11:09:32 +01:00
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Michal Čihař
c9348b682e Merge remote-tracking branch 'origin/pull/12564' into QA_4_6 2016-11-10 10:59:33 +01:00
Michal Čihař
fb279cbd22 Merge branch 'QA_4_6' 2016-11-10 10:56:46 +01:00
Michal Čihař
08840559ba Adjust code to changes in #12372 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:55:59 +01:00
Roger Walt
32a381d0a5 Fixes #12322, no default function selected for foreignkey fields 
Signed-off-by: Roger Walt <roger.walt@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:52:51 +01:00
Deven Bansod
cb7abad0b5 Remove call to old methods, fix tests 
Remove definition of old method. Remove related tests

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-09 10:40:00 +05:30
Deven Bansod
f14cffdbe7 Properly escape strings in MySQL statement values 
Use *_real_escape string functions provided by connectors to escape strings while exporting

Fix #12453

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/server_privileges.lib.php
 2016-10-29 10:45:12 +05:30
Michal Čihař
2ed64c3c6a Merge branch 'master' into master-security 2016-10-24 13:55:39 +02:00
Michal Čihař
75a5fde46d Use secure.php.net for PHP documentation links 
This avoids unnecessary redirect on the way (I still think this website
setup is weird, but that's all I can do about it).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 11:13:24 +02:00
Michal Čihař
d753aaaa9b Merge branch 'master' into master-security 2016-10-04 17:25:00 +02:00
Michal Čihař
fc5bb4a278 Merge branch 'QA_4_6' 2016-10-03 19:38:40 +02:00
Deven Bansod
96eba72fa6 Fix #12327: Show as PHP No longer works 
Fix output of show_as_php. Don't show the links that are not required
or that may not work as expected

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-27 13:47:31 +05:30
Michal Čihař
f143245f62 Use builtin pow for calculations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 10:05:33 +02:00
Michal Čihař
0060c36ac9 Remove usage of Util::pow with forcing builtin pow 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 10:04:55 +02:00
Michal Čihař
41c4855575 Remove no longer used Util::pow and tests for it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 09:34:32 +02:00
Deven Bansod
7fe62ef22e Remove extra space 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-26 21:48:58 +05:30
Michal Čihař
6f8edef792 Merge branch 'master' into master-security 2016-09-26 13:47:05 +02:00
Michal Čihař
86128d63f6 Merge branch 'QA_4_6' 2016-09-26 13:41:05 +02:00
Michal Čihař
d956922a61 Remove duplicate code in SQL escaping 
Fixes #12508

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:40:04 +02:00
Michal Čihař
19c24a8c6c Merge branch 'master' into master-security 2016-09-16 10:30:28 +02:00
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty 
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:21 +02:00
Michal Čihař
809a75eb92 Merge branch 'master' into master-security 2016-09-16 09:49:28 +02:00
Volkan Ulukut
7ce0234a2c Using number_format parameters instead of Util::localizeNumber 
Signed-off-by: Volkan Ulukut <arthan@gmail.com>
 2016-09-07 11:42:09 +03:00
Michal Čihař
9ffbb90ec0 Merge branch 'master' into master-security 2016-09-02 16:25:40 +02:00
Michal Čihař
abbce3ad3d Merge branch 'QA_4_6' 2016-09-02 16:25:17 +02:00
Michal Čihař
e803caed71 Use single quotes in PHP code 
Fixes #12405

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 16:23:21 +02:00
Michal Čihař
c3328c743a Silent errors when getting remote file 
- both curl and fopen wrappers can emmit errors in cases where remote
  site is not accessible

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 13:47:08 +02:00
Michal Čihař
2148df85f1 Merge branch 'QA_4_6' 2016-08-30 15:53:06 +02:00
Michal Čihař
f3ca367efa Fix number formatting with different settings of precision in PHP 
- fixed Util::formatNumber to avoid rounding issues to mess up display
- force precision = 14 to ensure we get sane behavior

With precision set to higher value many things do not behave as expected
producing strange numbers in various places.

For example with precision=19 you get:

php > echo round(1.2, 2);
1.199999999999999956

Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 15:51:18 +02:00
Michal Čihař
3e90d32b72 Merge branch 'QA_4_6' 2016-08-30 14:09:07 +02:00
Michal Čihař
d24dd24b75 Ensure unlim_num_rows is numberic 
Fixes #12516

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:08:47 +02:00
Michal Čihař
4b1288a564 Correctly handle errors at client side 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 12:35:22 +02:00
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ř
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ř
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