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

83 Commits

Author SHA1 Message Date
Michal Čihař
4befa5c4fc Fix object name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 19:01:01 +01:00
Michal Čihař
616d216fd1 Simplify checks for Ajax request 
Use isAjax method instead of doing the check separately.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 18:23:52 +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
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
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ř
1997cbc77b Using built in pow is good enough for up to exponent up to 3 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 09:34:32 +02:00
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
cdbc1fa1c3 Remove odd CSS class logic from PHP and template 
Odd CSS class is no longer needed, background coloring
is done with CSS pseudo-class.

Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-08-24 13:31:51 +03:00
Patric Gustafsson
aa764e1ea3 Remove odd CSS class logic from JS and PHP files 
Odd CSS class is no longer needed, background coloring
now done with CSS pseudo-class.

Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-08-24 12:48:52 +03:00
Patric Gustafsson
93bb4c39a3 Remove odd CSS class logic from PHP and JS file 
Odd CSS class is no longer needed, background coloring
is now done with CSS pseudo-class.

Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-08-24 12:37:13 +03:00
Michal Čihař
29c0ddaaf1 Merge branch 'QA_4_6' 2016-07-29 10:48:19 +02:00
Michal Čihař
74016bceea Merge pull request #12416 from rpv-tomsk/fix-replication-status 
Fix replication status output in Server > Databases
 2016-07-29 10:46:11 +02:00
Pavel Rochnyack
b705dc5f67 Fix replication status output in Server > Databases 
Broken by 829a84b46e refactoring.
Incorrectly fixed in c4710c3e1d

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-07-29 04:43:08 +01:00
Michal Čihař
bb18c5e02f Merge branch 'QA_4_6' 2016-07-28 11:06:43 +02:00
Pavel Rochnyack
c310304712 Restore Overhead column in Server > Databases > Enable Statistics. 
(Was removed in 582b02262b)

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-07-27 19:56:43 +01:00
Michal Čihař
e14c334d7a Merge branch 'QA_4_6' 2016-07-26 16:47:33 +02:00
Michal Čihař
16c4ca0daa Properly escape configuration parameters when rendering 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-26 16:47:01 +02:00
Michal Čihař
1132e53f28 Use https for links to dev.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:19:21 +02:00
Michal Čihař
a7a44c28c5 All charsets/collation we get from the MySQL server are available 
There is no need for explicit checking for availability later in the
code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 15:17:32 +02:00
Michal Čihař
3e2029e750 Move MySQL charsets handling to the Charsets class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:55:42 +02:00
Michal Čihař
0758b601e7 Move charset query generation to to the Util class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:07:27 +02:00
Michal Čihař
e2deac4b22 Move getting collation to the DBI layer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:42:29 +02:00
Michal Čihař
cfc2f1cb05 Move charsets obtaining to the Charsets class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:49:09 +02:00
Deven Bansod
c47a275e22 Added newly introduced variables 
Changed appropriate variables to have byte-formatting

Fixed tests

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-03-23 16:19:53 +05:30
Durgesh
d798809215 Filtering databases on databases listing, Issue #12047 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-03-03 16:21:15 +05:30
Durgesh
307f7069e5 Templating getWithSelected() and getCheckbox(), Issue #12004 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-23 18:10:24 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
Piyush
1d3f8ed037 remove_msie9 (fix_11987) 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2016-02-20 12:26:54 +05:30
Madhura Jayaratne
f4989760c0 More templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 20:31:56 +11:00
Madhura Jayaratne
4085ccd275 Use templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 19:55:02 +11:00
Madhura Jayaratne
fbed4c09bc Fix undefined error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:50:42 +11:00
Madhura Jayaratne
4d7597bd9b Make binary_logs an instance variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:21:26 +11:00
Madhura Jayaratne
04fd884d2a Use own dbi 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:13:39 +11:00
Madhura Jayaratne
51f3902f28 Use own response object 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:12:34 +11:00
Madhura Jayaratne
23d8a60da8 Introduce a controller for binary logs page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 17:40:35 +11:00
Michal Čihař
20c74d2124 Consistent parameter type docs (number -> integer) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 17:13:53 +01:00
Michal Čihař
a74efb0c30 Simplify getting first element of an array 
Calling current() after reset() is duplicate as reset() already returns
current index value.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:37:50 +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
Madhura Jayaratne
a624f09e24 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:49:23 +11:00
Madhura Jayaratne
e199708ff2 Simplify 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:38:31 +11:00
Madhura Jayaratne
ca44bbd93b Template plugins page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:36:51 +11:00
Madhura Jayaratne
ff647fd63b Set the variable directly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:12:27 +11:00
Madhura Jayaratne
07c9d21162 Plugin list of centralized to this controller. Make it an instance variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:10:32 +11:00
Madhura Jayaratne
25c7812120 It does not really require a separate method to get the SQL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:04:19 +11:00
Madhura Jayaratne
3d1a52c1b0 Use own dbi 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:02:16 +11:00
Madhura Jayaratne
e23827f67f Create a controller class for server plugins page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:01:12 +11:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00