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

92 Commits

Author SHA1 Message Date
Michal Čihař
1d08dd281b Pass correct headers to httpRequest 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-22 09:22:04 +01:00
Michal Čihař
0f1f046488 Wrap long line 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-22 09:22:04 +01: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
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ř
52f23338a8 Merge branch 'master-security' 2016-08-17 08:50:51 +02:00
Michal Čihař
c9e5f6ff1b Merge branch 'QA_4_6' 2016-08-04 08:16:43 +02:00
Michal Čihař
208480237d Remove unused function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-04 08:15:48 +02:00
Michal Čihař
360b8e8a11 Merge branch 'master' into master-security 2016-07-28 09:44:08 +02:00
Michal Čihař
6d8e1d7935 Merge branch 'QA_4_6' 2016-07-28 09:38:08 +02:00
Michal Čihař
257e65ba9f Use https for outbound links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:19:13 +02:00
Michal Čihař
3d628c7fa5 Merge branch 'QA_4_6-security' into master-security 2016-07-12 14:41:02 +02:00
Michal Čihař
e749214b16 Prefer curl over file_get_contents 
Curl is better in SSL certificate verification.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 14:39:03 +02:00
Michal Čihař
5231649343 Merge commit 'cda4290749f10ed686bfb466b415e5e3a1c04fea' 2016-05-09 20:09:36 +02:00
Michal Čihař
d2dc9481d2 Fix possible path existence disclossure 
On non released versions (where line counts are not precalculated) it
was possible to check for file existence due to limited checks for
supplied path.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 15:28:32 +02:00
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
Michal Čihař
bfe0e8814e Merge branch 'QA_4_5' into QA_4_6 2016-02-12 10:08:07 +01:00
Michal Čihař
6566e94914 Correct content type for uploaded error reports 
Fixes #11939

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 10:06:54 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00
Michal Čihař
95d10b8c1f Remove PMA_prettyPrint 
It is no longer needed as JSON_PRETTY_PRINT is there since PHP 5.4 (and
we require 5.5).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:54:36 +01:00
Hugues Peccatte
7f8f34e89d Remove classes require_once. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02:00
Hugues Peccatte
0761fb1801 Rename classes files. 
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:21 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes. 
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:22:52 +02:00
Michal Čihař
4b41406009 Use HTTPS to submit error reports 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-19 07:49:45 +02:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Hugues Peccatte
ef16b1e358 Templating error report form. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-17 23:36:23 +02:00
Madhura Jayaratne
c64ed4ddcc Mark variable types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-15 20:54:48 +05:30
Marc Delisle
75d9fd93a1 Merge branch 'QA_4_4' 2015-05-12 11:56:34 -04:00
Tom Sommer
50616659e1 Don't throw errors in case reports.phpmyadmin.net is down 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:54:21 -04:00
Madhura Jayaratne
3d85296d79 Spaces around assignments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:06:36 +05:30
Hugues Peccatte
763707a72e Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-04 15:19:09 +01:00
Tekin Birdüzen
bf486ccd1f Fixed typo in variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-10 09:02:55 -05:00
Michal Čihař
61fcf215e5 Detect failure of curl_init 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:20:13 +01:00
Madhura Jayaratne
93366c8c24 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:44:53 +05:30
Madhura Jayaratne
b99b6b6672 bug #4595 [security] Path traversal can lead to leakage of line count 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:24:34 +05:30
Madhura Jayaratne
9364e2eee5 bug #4596 [security] XSS through exception stack 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:20:49 +05:30
Hugues Peccatte
fd7f02f929 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:33:41 +01:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Hugues Peccatte
5985894160 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 00:31:45 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
chanaka
237b00cc00 Fixed some codesniffer errors 
Signed-off-by: chanaka <chanaka@oneit.com.au>
 2014-07-28 21:49:11 +05:30
Marc Delisle
864a80209a Handle possible execution path 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-23 06:49:38 -07:00
Michal Čihař
a01e065d55 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-24 09:30:55 +02:00
Michal Čihař
c04f7e86c6 Query string does not have to be present 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-24 09:06:06 +02:00
Michal Čihař
2cc58f0847 Handle error on top page 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-24 09:05:00 +02:00
Michal Čihař
60211dd027 Document problem in a code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-24 09:03:49 +02:00
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02:00
Dhananjay Nakrani
8b09aa7f76 Make Syntax compatible with php-5.3 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
c00d1d5ef6 Change hardcoded indexing to dynamic one. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
b2e3164441 Make return values of PMA_getReportData() consistent. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30