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

272 Commits

Author SHA1 Message Date
Michal Čihař
1bddcff0d5 Remove accidental comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:22:49 +01:00
Michal Čihař
c2b41b829a Wrap header() and headers_sent() in response 
This allows us to test the code without using runkit. Currenly only
AuthenticationHttp is migrated to new code, but others will follow.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Michal Čihař
431450a237 Make test run even without runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Michal Čihař
1e9e14d23b Remove ForceSSL configuration directive 
In most setups we simply do not have enough information to decide
whether user has come through HTTPS or not leading to infinite
redirects.

Anyway this is better to handle at web server side together with setting
HSTS headers.

Issue #11412, #11883

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:20:11 +01:00
Michal Čihař
ed96969ff9 Merge branch 'QA_4_5' 2016-01-28 09:23:27 +01:00
Isaac Bennetch
1d6efadaea Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-01-28 00:42:03 -05:00
Michal Čihař
7ffd8d69a1 Merge pull request #5 from phpmyadmin/hash_equals 
Use hash_equals for comparing token
 2016-01-26 09:55:05 +01:00
Michal Čihař
0a24f92d08 Set correct content type for JSON responses 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:32:34 +01:00
Michal Čihař
ec0e88e37e Use hash_equals for comparing token 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:32:07 +01:00
Marc Delisle
2f3360993f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-16 08:30:37 -05:00
Marc Delisle
7d4c570b76 Undefined index: is_ajax_request 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-16 08:27:11 -05:00
Michal Čihař
39771f44c0 Simplify code 
For ages we set $GLOBALS['lang'] to language code, so it's safe to use
it here.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:50:13 +01:00
Michal Čihař
eb37c77e97 PMA_sendHeaderLocation does not return anything 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 17:01: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
Michal Čihař
cc07b737dc Remove unused PMA_String class 
The class is no longer used:

- the ctype part is not needed by new SQL parser
- the utf-8 manipulation was replaced by direct usage of mbstring

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 12:09:06 +01:00
Hugues Peccatte
9f97786e9b Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:22:21 +01:00
Michal Čihař
1deac94062 Move PHP extensions check to separate function 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:24:41 +01:00
Michal Čihař
c4cdd16342 Move PATH_INFO cleanup to function 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:22:03 +01:00
Michal Čihař
3565e4db79 Remove PMA_arrayMergeRecursive 
It can be replaced with array_replace_recursive as of PHP 5.3, we
require PHP 5.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:06:00 +01:00
Michal Čihař
06bb1e67f2 Remove PMA_arrayWalkRecursive 
For the single remaining use case native array_walk_recursive is good
enoug.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:42:13 +01:00
Hugues Peccatte
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04:00
Hugues Peccatte
a5d35d41b6 Revert PMA_String rename. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-14 22:39:03 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:58 +10: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
Hugues Peccatte
7ae011d1a5 Merge pull request #1794 from Tithugues/templatingHeaderLocation 
Templating header location
 2015-07-19 21:53:34 +02:00
Hugues Peccatte
ad59cb9c20 Templating header location. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 17:36:06 +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
Madhura Jayaratne
cf3375ba58 Merge branch 'QA_4_4' 2015-06-04 21:49:32 +05:30
Madhura Jayaratne
a39a5ce265 bug #4942 Export to gzip saves plain text under Chrome 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 21:44:40 +05:30
Madhura Jayaratne
ae4e5db376 rfe #1413 Explain analyzer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 17:40:33 +05:30
Madhura Jayaratne
46250db714 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-04 10:25:45 +05:30
Madhura Jayaratne
332f369c57 bug #4886 Clicking on external links in advisor rules give JS error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-04 10:20:44 +05:30
Madhura Jayaratne
23518f3e1a bug #4886 Clicking on external links in advisor rules give JS error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-04 10:17:59 +05:30
Madhura Jayaratne
cdc6a584aa Spaces around - operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:17:09 +05:30
Marc Delisle
2a7f1ed42e Remove code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-14 06:12:53 -05:00
Rohit Mulange
f508e9312a fix bug #4720 (problem with missing php-mbstring warning) 
Signed-off-by: Rohit Mulange <rohit@rohit.codes>
 2015-01-21 23:45:02 +05:30
Madhura Jayaratne
dfae4d2f08 Bug #4676 - Auto configuration issues 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 09:49:03 +05:30
Marc Delisle
e30d15d3b8 Bug in Auto-configuration: tables were not created automatically 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-30 11:46:48 -05:00
Madhura Jayaratne
7c0b1bafed Fix coding style error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 11:52:42 +05:30
Hugues Peccatte
037a034b43 Minor coding style modifications. 
Fix typos.
PHPDoc and JSDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:04:35 +01:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 18:37:49 +01:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Marc Delisle
0f58673cee Merge pull request #1383 from smita786/master 
moving out inline js from db_designer.lib.php plus minor bug fixes
 2014-10-23 07:46:22 -04:00
Ann + J.M
5b5d50e471 Fix phpdoc errors 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 21:11:50 +02:00
Marc Delisle
5df7783e97 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-22 12:41:06 -04:00
Smita Kumari
b4906839e4 remove trailing white spaces 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-21 23:45:32 +05:30