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

494 Commits

Author SHA1 Message Date
Deven Bansod
e63635f456 Use IDENTIFIED BY 'auth_string' if password check plugin is active 
This applies to MariaDB only

Fix #12366

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 01:03:46 +05:30
Deven Bansod
900a12f870 Prevent undefined index errors while editing user privs 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 14:10:59 +05:30
Deven Bansod
26c7a58533 Merge pull request #12440 from rpv-tomsk/grant-option-description-12419 
Fix #12419 wrong description on GRANT option of table/routine privileges
 2016-10-04 10:54:21 +05:30
Deven Bansod
6a53b89cb7 Escape database name properly to be used in MySQL wildcard statements 
Fix #12602

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 14:14:11 +05:30
Deven Bansod
5145c8c323 Fix #12320 : Copying a user does not copy usergroup 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 13:09:34 +05:30
Pavel Rochnyack
d1e353f235 Fix #12419 wrong description on GRANT option of table/routine privileges. 
Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-14 20:13:27 +01:00
Michal Čihař
c868852ae4 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-26 16:06:29 +02:00
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ř
f0f8f2b65e Escape routine privileges listing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-23 09:38:44 +02:00
Michal Čihař
a32b3ceb6e Use single quotes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 10:38:19 +02:00
Michal Čihař
0fad7290c9 Escape database name in SQL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-19 09:20:15 +02:00
Michal Čihař
519e634a8d Merge branch 'QA_4_6' into QA_4_6-security 2016-06-22 13:10:55 +02:00
Michal Čihař
e50e37b51d Properly escape database name when listing privileges 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:35:04 +02:00
Michal Čihař
0b7416c5f4 Escape user group when displaying 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 10:53:46 +02:00
Michal Čihař
6c5d5ffc7f Merge branch 'QA_4_6' into QA_4_6-security 2016-06-17 09:02:13 +02:00
Michal Čihař
1b0fde1b59 Remove duplicated code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:05:20 +02:00
Michal Čihař
03f73d4836 Fix XSS on server privileges 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 12:50:20 +02:00
Madhura Jayaratne
1c77a4ef0d Fix #12281 Copying a user resets SSL to None 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-06-06 23:17:20 +10: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
Deven Bansod
b12b1ae08a ORDER BY clause should include Select subexpressions' names 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-04-24 20:50:23 +05:30
Michal Čihař
a29f154f37 Merge branch 'MAINT_4_5_5-security' into QA_4_6-security 2016-02-29 10:35:47 +01:00
Madhura Jayaratne
ab1283e836 Fix XSS in User accounts page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-29 11:08:38 +11:00
Andre Evertz
f825abc8a7 Fix for wrong mysql_upgrade message on Users tab with Percona Server >= 5.7 
Signed-off-by: Andre Evertz <andre.evertz@devil-coding.de>
 2016-02-26 13:26:35 +11:00
Michal Čihař
37004337ab Merge commit 'a478437e0ee4d74ec5036cb32e165da002303dd1' 2016-01-14 09:10:43 +01:00
Deven Bansod
3b8644318a Fix #11752 , analyse the grant strings to perform checks for privileges instead of running all the test queries on mysql db 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-08 16:48:57 +05:30
Michal Čihař
628b19283d Fix spacing of docstrings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:40:44 +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
6f713baa49 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-03 08:57:26 -05: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
Achilles-96
afc8aab04f Fixes #11743 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-22 11:29:34 +05:30
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00
Marc Delisle
eb167b3c75 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-30 13:24:40 -05:00
Marc Delisle
ab7942be89 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-29 07:29:32 -05:00
Marc Delisle
ce34b0ffa8 Merge branch 'QA_4_5' 2015-11-27 08:33:16 -05:00
Bert-Jan de Lange
bc89aabdf9 Fix for not being able to create users on Percona Server 
Inspired by the patch 9bf88cbd32.patch

Signed-off-by: Bert-Jan de Lange <info@bert-jan.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-27 08:30:58 -05:00
Marc Delisle
62d05510b9 Merge branch 'QA_4_5' 2015-11-26 11:55:25 -05:00
Marc Delisle
25bd0b56e2 Fixes #11695 PMA_getDataForDeleteUsers() warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-26 11:55:01 -05:00
Madhura Jayaratne
fd9194e7ac Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-26 19:56:01 +11:00
Deven Bansod
6640fe2877 Merge branch 'QA_4_5' 2015-11-26 19:43:32 +05:30
Deven Bansod
e8b8d670cd Fix an error in merge 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 14:45:34 +05:30
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
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
0a4fd5d87b Fixes issue 11691 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 15:13:29 +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
Marc Delisle
83e9ae54af Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-17 07:52:45 -05:00
Marc Delisle
ad0ac35ff8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-16 14:44:30 -05:00
Hugues Peccatte
08cdf6f2fd Merge branch 'master' into psr1_master 2015-11-08 16:16:05 +01:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:58:48 +01:00