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

316 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ř
6a84202981 Use existing filtering template for table filtering 
Issue #12838, #12069

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 10:22:35 +01:00
Scrutinizer Auto-Fixer
58b16e73c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-12-13 15:16:11 +00: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ř
fd2215c469 Merge branch 'QA_4_6' 2016-09-22 09:48:22 +02:00
Deven Bansod
2d69d40fa2 Fix error in adcaf7c 
Fix #12382

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-22 12:01:47 +05:30
Deven Bansod
fe05fdaa56 Merge branch 'QA_4_6' 2016-09-21 21:27:15 +05:30
Deven Bansod
adcaf7ca4b Use intval to prevent XSS instead, and use numeric to check valid datatype 
Fix #12382

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-21 21:24:00 +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
30262971c8 Remove odd CSS class logic from PHP and template 
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 14:14:01 +03: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ř
8f74b63430 Merge branch 'QA_4_6' 2016-08-17 11:39:06 +02:00
Pavel Rochnyack
5a5ae580f2 Partitions editor: Allow to edit partition names; Add 'COLUMNS Partitioning' support. 
+ Add 'COLUMNS Partitioning' support
+ Allow to edit partition names
* Do not show duplicate partition names in 'Partition maintenance' snippet on 'Operations' tab. Caused by subpartitions presence.
* Optimize Partition::getPartitionMethod() - need only one row, so use 'LIMIT 1' in query to avoid much data transfer from database.
* Change HTML-code of partition comment textarea to avoid extra spaces added to value.
* Added missing htmlspecialchars() on subpartitions comment.

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-14 12:26:01 +01:00
Deven Bansod
7f80d3f78a Remove trailing whitespace 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-08 18:33:32 +05:30
Deven Bansod
315f7b3596 Add optional column 'Charset' on Database structure page 
Fix #12162

Add an option to add a Column on Database structure page which shows the charset of each table/view

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-08 17:51:16 +05:30
Michal Čihař
3aa380a1e1 Merge branch 'QA_4_6' 2016-08-03 10:02:53 +02:00
Pavel Rochnyack
9d3da1b408 Fix replication status output in database tables list. 
Issue is second part to #12416

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-01 03:37:20 +01: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ř
1c08750785 Merge branch 'QA_4_6' 2016-06-24 12:58:45 +02:00
Michal Čihař
f204208540 Move count() call outside loop 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 12:58:35 +02:00
Michal Čihař
637d4eb4de Merge branch 'QA_4_6-security' into master-security 2016-06-20 17:35:46 +02:00
Michal Čihař
4bcc606225 Always use delimiter not present in search expression 
This avoids need to figure out correct escaping in case delimiter is
present in the expression.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:03:44 +02:00
Michal Čihař
25ede08182 Merge branch 'QA_4_6' 2016-06-14 08:30:03 +02:00
Michal Čihař
79a34ff94c Calculate table size as integer 
It should be big enough on 64-bit systems, so avoid rounding issues
which double calculations can bring.

Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-14 08:28:26 +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ř
b33d7f4bd5 Merge branch 'QA_4_6' 2016-04-26 16:37:36 +02:00
Michal Čihař
df08b53e43 Fixed editing of VIEW structure 
Fixes #12171

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 16:37:20 +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
Michal Čihař
fdd6d3105d Merge branch 'QA_4_6' 2016-04-06 10:39:17 +02:00
Michal Čihař
96a2e3e35a Avoid using globals for things we have as class attribute 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:39:10 +02:00
Michal Čihař
412af774ba Avoid using superglobal 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:36:20 +02:00
Michal Čihař
d99c4f357d Merge branch 'QA_4_6' 2016-04-06 10:32:36 +02:00