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

134 Commits

Author SHA1 Message Date
Michal Čihař
14b6e3b10b Merge branch 'master' into master-security 2017-01-07 11:01:06 +01:00
Michal Čihař
8edc20b023 Merge branch 'QA_4_6' 2017-01-02 17:06:36 +01:00
Isaac Bennetch
63eaa362e9 Fix incorrect comma in message string 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-21 19:02:28 -05:00
Michal Čihař
6859521e62 Merge branch 'QA_4_6-security' into master-security 2016-12-21 11:11:33 +01:00
Michal Čihař
695a488c42 Do not allow arbitrary connection in replication setup without AllowArbitraryServer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 11:10:32 +01:00
Michal Čihař
308c9d7951 Simplify Response object handling 
- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 18:17:59 +01:00
Patric Gustafsson
d1aa527944 Remove unused CSS class 
Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-11-16 18:23:14 +02:00
Patric Gustafsson
1bd5fe709d Merge remote-tracking branch 'upstream/master' 2016-11-15 18:08:24 +02:00
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
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ř
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
Patric Gustafsson
b5ff07b22d Remove odd table row logic from PHP code 
The odd_row class is now obsolete as the
same effect is now achieved with pure CSS.

Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-08-19 13:42:32 +03:00
Michal Čihař
3434c70a51 Merge branch 'QA_4_6-security' into master-security 2016-07-12 10:38:08 +02:00
Madhura Jayaratne
cbba4f4fdb Fix XSS in server_replication.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-07-12 11:49:53 +10:00
Michal Čihař
8f93d41d64 Merge branch 'QA_4_6-security' into master-security 2016-07-11 08:33:45 +02:00
Michal Čihař
1ed4007689 Properly escape MySQL status variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-10 18:07:59 +02:00
Michal Čihař
dce94f229f More consistency for URL::getCommon 
Now URL::getCommon always returns HTML encoded string, if you want
unencded one, use URL::getCommonRaw. This makes it easier to review the
code if uses correct variant.

Also I've fixed several wrong uses of the HTML encoded variant in
Location header.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 12:44:29 +02:00
Michal Čihař
7b08da151e Merge branch 'QA_4_6' 2016-04-26 12:50:59 +02:00
Michal Čihař
54b38e2999 Share js code for hostname input and fix it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 12:50:42 +02:00
Michal Čihař
0cd7caee71 Share js code for username input and fix it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 12:50:42 +02:00
Michal Čihař
6fdb046f9b Move javascript code for password to functions.js 
- This allows to share the code
- Also fixed bad references to fields

Fixes #12217

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 12:50:42 +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ř
2a9fb73f92 Remove PmaAbsoluteUri from redirects 
This is no longer needed as per RFC 7231.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:32:14 +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
Marc Delisle
911f8274c7 Clarify class and variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-31 08:09:47 -05:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00
Hugues Peccatte
dffc8c34e9 Remove logic code in declaration files. 
Move declaration out of logic file.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-27 18:56:39 +01:00
Madhura Jayaratne
a72e65e31e Merge branch 'QA_4_5' 
Conflicts:
	js/messages.php
 2015-10-09 10:10:14 +11:00
Madhura Jayaratne
cc4c615720 Fix #11548 Confirm box on "Reset slave" option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-09 10:06:49 +11:00
Hugues Peccatte
92bb13c78c Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:05:39 +02:00
Hugues Peccatte
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Marc Delisle
3eea07d2ad Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-04 11:11:24 -04: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
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
Madhura Jayaratne
6eb6786506 Standardize to sentence case 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-26 16:57:42 +10:00
Hugues Peccatte
6bb56cf491 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 21:03:10 +02:00
Marc Delisle
3be360f062 Improve a message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 07:06:31 -04:00
Madhura Jayaratne
9b0b23cbfe Do not jump to the top of the page when clicking on these links to open a section 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 13:31:13 +05:30
Hugues Peccatte
56c07e6f35 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-25 22:51:02 +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
31d29835e9 Add select all to database selector in replication gui 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 10:53:55 +05:30
Madhura Jayaratne
b9ab876cdc Avoid fetching these data on file inclusion, rather fetch them when required 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 08:19:24 +05:30
Madhura Jayaratne
a22bb26d7e Remove extra space after doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:42:21 +05:30
Martin Riedl
fa4421ed38 Fix initial replication configuration 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-16 09:54:46 -05:00
Hugues Peccatte
026c31fab6 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:59:19 +01:00
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues. 
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-01 22:07:18 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances. 
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 17:40:09 +01:00
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:39 +02:00
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02: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