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

402 Commits

Author SHA1 Message Date
Michal Čihař
360b8e8a11 Merge branch 'master' into master-security 2016-07-28 09:44:08 +02:00
Michal Čihař
6d8e1d7935 Merge branch 'QA_4_6' 2016-07-28 09:38:08 +02:00
Michal Čihař
257e65ba9f Use https for outbound links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:19:13 +02:00
Michal Čihař
d15490088c Merge branch 'QA_4_6' 2016-07-27 16:30:47 +02:00
Michal Čihař
af337d2054 Use https to access phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 16:29:08 +02:00
Michal Čihař
3f98ad5414 Merge branch 'QA_4_6-security' into master-security 2016-07-18 16:24:12 +02:00
Michal Čihař
1543be7138 Use https to access phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-18 16:22:33 +02:00
Michal Čihař
205694982b Fix exporting multiline comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 12:16:50 +02:00
Michal Čihař
7b3dc673d2 Fix exporting multiline comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 12:12:26 +02:00
Michal Čihař
f0ad030460 Merge branch 'QA_4_6-security' into master-security 2016-07-13 10:34:31 +02:00
Michal Čihař
dc52930bba Properly handle newlines in SQL comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 09:59:39 +02:00
Michal Čihař
c2ca1c8c22 Merge branch 'QA_4_6-security' into master-security 2016-07-12 16:58:46 +02:00
Michal Čihař
80b03a4f16 Ensure page number is integer 
Even if somebody decides to change configuration storage structure.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 16:57:35 +02:00
Michal Čihař
303ace23b5 Merge branch 'QA_4_6-security' into master-security 2016-07-12 12:31:12 +02:00
Michal Čihař
6da13e2a1c Escape HTML in Mediawiki comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 12:30:58 +02:00
Michal Čihař
6f75f8a261 Merge branch 'QA_4_6-security' into master-security 2016-07-09 09:14:12 +02:00
Michal Čihař
7de139b90c Properly escape generated XML export 
Many fields could contain XML markup, so we need to ensure the generated
XML is valid.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:54:05 +02:00
Michal Čihař
2b5915ce7b Use phpMyAdmin version in PHP export header 
Using fixed 0.2b really makes no sense.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:27:26 +02:00
Michal Čihař
a82835cf09 Generate valid PHP code even when table/database name contains PHP markup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:22:39 +02:00
Michal Čihař
637d4eb4de Merge branch 'QA_4_6-security' into master-security 2016-06-20 17:35:46 +02:00
Michal Čihař
1cc7466db3 Quote delimiter before using preg_replace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:16:03 +02:00
Michal Čihař
136b85fc97 Produce valid JSON on export 
The JSON export now generates valid JSON data, but this means that the
resulting JSON format has changed.

Fixes #12307

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-14 09:16:58 +02:00
Michal Čihař
62d417db9b Merge branch 'QA_4_6' 2016-06-09 09:20:26 +02:00
Michal Čihař
43fdcb67ee Include phpMyAdmin version in JSON dump 
This provides useful information, the 0.1 string was not really helpful.

Issue #12304

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Michal Čihař
0b2b23f2ce Merge branch 'QA_4_6' 2016-06-08 14:00:26 +02:00
Michal Čihař
d7fcbab1cd Ensure we parse query for views as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-08 14:00:04 +02:00
Michal Čihař
8a494f26d2 Merge branch 'QA_4_6' 2016-06-03 14:42:07 +02:00
Michal Čihař
b49030528f Fixed export of tables without explicitly set engine 
Fixes #12290

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 14:41:55 +02:00
Michal Čihař
9d5c5f0c86 Adjust tests to new error messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 21:27:41 +02:00
Michal Čihař
4cd8ab8a95 Better report errors while generating SQL exports 
The errors will include table and database name in the dump and the
error is also shown in the UI on next page.

Fixes #5555

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 17:21:58 +02:00
Michal Čihař
1d1e269144 Merge branch 'QA_4_6' 2016-05-23 15:54:33 +02:00
Michal Čihař
3b374237d6 Fixed export of ARCHIVE tables with keys 
We can not rewrite the ARCHIVE table as it can not be altered.

Fixes #12082

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 15:54:26 +02:00
Michal Čihař
a2b8bfc308 Merge branch 'QA_4_6' 2016-05-17 10:50:16 +02:00
Michal Čihař
b0f8511e60 Use https for links to www.phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:49:21 +02:00
Michal Čihař
aaa707ab4d Merge branch 'QA_4_6' 2016-05-17 10:18:52 +02:00
Michal Čihař
11089cbe41 Use https for links to dev.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:16:44 +02:00
Michal Čihař
44a6ae9b50 Use https when linking to php.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:13:16 +02:00
Michal Čihař
daf5b0d329 Use php.net to link to their website 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 17:11:15 +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ř
cd4008b3d7 Move MySQL charset maps to separate class 
This allows us to load it only when needed

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:33:40 +02:00
Michal Čihař
fb5b681925 Remove checks for older PHP versions 
We require 5.5, so there is no need to check for >= 5.4 or similar.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:10:25 +02:00
Michal Čihař
c3afee6235 Merge branch 'QA_4_6' 2016-04-05 10:05:46 +02:00
Michal Čihař
1580d2fa4d Fixed SQL quoting in SQL export 
The fix for 4.5 branch was wrongly merged here.

Fixes #12029

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 10:05:22 +02:00
Michal Čihař
8a5bf72775 Merge branch 'QA_4_6' 2016-03-18 10:35:43 +01:00
Michal Čihař
1b43606a48 Fixed possible invalid SQL export 
We should emit the charset restoration only if we have emitted its
setting in the header. As the condition was slightly different in both
cases it was possible that only one part of these two was emitted in
past.

Fixes #12074

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-18 10:34:17 +01:00
Michal Čihař
0d3cac9e04 Merge branch 'QA_4_6' 2016-02-25 12:31:13 +01:00
Michal Čihař
33f0b947db Merge branch 'QA_4_5' into QA_4_6 2016-02-25 12:30:42 +01:00
Michal Čihař
1297747a65 Fixed incorrect usage of SQL parser context in SQL export 
Fixes #12029

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:29:34 +01:00
Michal Čihař
f5d0da0f31 The class_exists uses autoloading no need to do it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
5a58f81776 Use autloading for checking TCPDF existance 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:03:19 +01:00