webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity
109,918 Commits 12 Branches 481 Tags
QA_4_7
Commit Graph

145 Commits

Author SHA1 Message Date
Michal Čihař
d10cf08393 Avoid duplicating $response 
We need to get it just once, see
https://github.com/phpmyadmin/phpmyadmin/issues/13154#issuecomment-300301726

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 23:43:39 +02:00
Fenn-CS
a661c06fd6 Added a locale reference for $response in PMA_getChangePassMessage() of user_password.php 
Fixes #13154

Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-07 15:23:26 +02: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
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ř
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Michal Čihař
ac2cfef6c8 Move scripts loading to correct location 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 09:59:48 +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ř
23e01d306a Merge branch 'QA_4_6' 2016-08-17 15:38:22 +02:00
Michal Čihař
76a471a790 Avoid problems with PHP comparison 
- allow password where empty returns true
- compare using ===

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 13:18:45 +02:00
Michal Čihař
1cd7b757bf Merge branch 'master' into master-security 2016-08-02 08:45:23 +02:00
Michal Čihař
afcec9d9d7 Merge branch 'QA_4_6' 2016-08-02 08:34:42 +02:00
Michal Čihař
ef9bd20e7a Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 08:33:39 +02:00
Michal Čihař
cdcf74ab0b Fixed password change on MariaDB without auth plugin 
Fixes #12424

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 08:32:59 +02:00
Michal Čihař
b6df1bd1e3 Merge branch 'QA_4_6-security' into master-security 2016-07-26 17:04:39 +02:00
Michal Čihař
c90967071a Do not allow to set too long password 
We do not accept password longer than 256 chars, so do not accept it on
password change as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-26 17:04:26 +02:00
Michal Čihař
f5015c2ea3 Merge branch 'QA_4_6-security' into master-security 2016-07-26 16:31:21 +02:00
Deven Bansod
68903ae7a7 Merge branch 'QA_4_6' 2016-07-26 01:05:17 +05:30
Deven Bansod
25182fb6c3 Fix #12391 : Message with 'Change password successfully' displayed, but does not take effect 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-07-26 00:25:08 +05:30
Michal Čihař
c136a74705 Cache current user information for DBI lifetime 
We query this information quite often, so it makes sense to fetch it
only once from the MySQL server.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 09:45:53 +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ř
f141cb1463 Merge branch 'QA_4_5' 2016-01-17 18:44:09 +01:00
Michal Čihař
bfaa77ef21 Fix password change on MariaDB 10.1 and newer 
Use SET PASSWORD which seems again do the correct thing there.

Fixes #11855

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-17 18:43:32 +01:00
Michal Čihař
20a508358b Fix comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-17 18:35:42 +01:00
Marc Delisle
1daeb372db Remove unneeded code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-20 18:33:43 -05:00
Deven Bansod
996a6b6636 Move the variable assignment inside the else-if block 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-19 16:37:33 -05:00
Deven Bansod
c7b40c9717 Add a base case for MySQL versions 5.5.0 - 5.5.7 - Might give an error on these versions otherwise 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-19 22:59:15 +05:30
Deven Bansod
dc64071185 Add a base case for MySQL versions 5.5.0 - 5.5.7 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-19 22:00:39 +05:30
Deven Bansod
7c0a25c937 Move the variable assignment inside the else-if block 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-19 21:56:57 +05:30
Marc Delisle
a93160128f Fix indenting 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-19 10:53:31 -05:00
Marc Delisle
74a867fd45 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-19 10:46:56 -05:00
Marc Delisle
357b1b4757 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-04 09:05:42 -05:00
Madhura Jayaratne
1cffd63940 More coding style fixes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-26 19:54:39 +11:00
Deven Bansod
107f054ed6 Merge branch 'QA_4_5' 
Conflicts:
	libraries/server_privileges.lib.php
	po/pt_BR.po
	user_password.php
 2015-11-26 14:40:25 +05:30
Deven Bansod
d55abcd5ff Fix issue 11684 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-24 15:46:50 +05:30
Hugues Peccatte
ffc4422db7 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-19 20:33:21 +02:00
Marc Delisle
da5e605ba7 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-15 12:26:17 -04:00
Deven Bansod
19f1536a1c Fixed error in PR : 11569 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-16 02:55:07 +05:30
Marc Delisle
7ddbfefb9d Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-13 11:32:21 -04:00
Deven Bansod
8a82a04ff9 Refactor code for generation of available auth plugins HTML 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-14 00:33:15 +05:30
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
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
6434fbfa80 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-27 21:13:58 +02:00
Isaac Bennetch
7b1765f1fd Merge pull request #1792 from devenbansod/rfe1396 
RFE #1396 : Add support for MySQL 5.6.6+ SHA256 Auth plugin
 2015-07-27 14:04:51 -04:00
Deven Bansod
56b4352719 RFE#1396 : Support MySQL 5.6.6+ SHA256 Auth Plugin 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-23 21:49:05 +05:30
Hugues Peccatte
a1cf9a24e3 Coding style modification. 
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-22 22:08:24 +02:00
Marc Delisle
4eccae5290 Merge pull request #1547 from znck/master 
Remove unneeded closing tags
 2015-03-26 07:56:45 -04:00
harish095
dbba36e0b8 MySQL 5.7 Syntax for password change 
Signed-off-by: Harish Kandala <kandalaharish95@gmail.com>

Updated the If condition

Signed-off-by: Harish Kandala <kandalaharish95@gmail.com>
 2015-03-19 12:37:35 -04:00
Rahul Kadyan
4d308ba364 Remove unneeded closing tags 
Closing tags at the end of file are not mandatory. It is often
suggested to omit to closing tags at the end of file to prevent
unwanted effects as PHP will start output buffering if there is
any character after closing tag.

Reference: http://php.net/manual/en/language.basic-syntax.phptags.php

Signed-off-by: Rahul Kadyan <hi@znck.me>
 2015-03-06 23:37:35 +05:30
Marc Delisle
be03cb3f27 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-02 06:25:37 +01:00