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

255 Commits

Author SHA1 Message Date
Michal Čihař
bd2a0ec307 Wrap file_exists calls with @ 
It can produce warnings in case open_basedir is enabled.

Fixes #13467

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-10 14:59:43 +02:00
Michal Čihař
75ad097c36 Replace Util::whichCrlf() with PHP_EOL 
It's available since PHP 5.0.2 so it's really time to use it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 15:59:52 +01:00
Michal Čihař
27fb0b58af Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:07:29 +01:00
Michal Čihař
e4bf536906 Update to SQL Parser 4.0.1 
It now follows PSR-4 and uses PhpMyAdmin namespace prefix.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 13:56:35 +01:00
Michal Čihař
b87362b7d2 Update to use shapefile 2.0 
It uses PSR-4 prefix for PhpMyAdmin namespace.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 12:56:24 +01: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ř
6cbcc319b1 Fix function name 
Fixes #12505

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:41:33 +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
Michal Čihař
52586bd949 Merge branch 'QA_4_6-security' into master-security 2016-07-22 11:53:23 +02:00
Michal Čihař
ddeab2a11f Sanitize filename on SHP import 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 11:52:49 +02:00
Michal Čihař
2adf1ca83e Merge branch 'QA_4_6-security' into master-security 2016-07-22 11:35:14 +02:00
Michal Čihař
48764f2260 Delete temporary file before reporting error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 11:31:56 +02:00
Michal Čihař
6f75f8a261 Merge branch 'QA_4_6-security' into master-security 2016-07-09 09:14:12 +02:00
Michal Čihař
c0b2d56ac0 Use https for wiki links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-09 09:12:43 +02:00
Michal Čihař
d85b701c9b Use ShapeFile library naming of shapes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 16:16:12 +02:00
Michal Čihař
7d650bd548 Use phpmyadmin/shapefile instead of embedded bfShapeFile 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 15:52:40 +02:00
Michal Čihař
9348d0cb16 Separate adding HTML markup to message from others 
We really want this to be explicit for easier review and hiding this in
second parameter of addParam doesn't make it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:41:35 +02:00
Michal Čihař
8ba932da58 Merge branch 'QA_4_6' 2016-05-23 17:38:00 +02:00
Michal Čihař
e1f8c36c79 Fix class namespace 
Fixes loading of APC based upload progress bar

Fixes #12248

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 17:37:38 +02:00
Michal Čihař
d4fdb95619 Adjust SHP file import to new code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:59:42 +02:00
Michal Čihař
2c9deb0b62 Check zip file processing for errors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:52:24 +02:00
Michal Čihař
bf2c76c1b1 Adjust tests to new import code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:40:56 +02:00
Madhura Jayaratne
ddf847a5eb Align docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 22:54:18 +11:00
Michal Čihař
f1379e2b26 Merge branch 'QA_4_6' 2016-02-17 11:33:02 +01:00
Michal Čihař
dd09116716 Correct fix for table import processing 
We need to consistently propagate the $sql_data array.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:12:08 +01:00
Michal Čihař
5563f3e137 Revert "Remove sql data parameter" 
This reverts commit 84c12c2fdd.
 2016-02-17 10:59:40 +01:00
Michal Čihař
2670a1499f Merge branch 'QA_4_6' 2016-02-17 10:52:55 +01:00
Michal Čihař
84c12c2fdd Remove sql data parameter 
This just makes the SQL import different from others leading to subtle
breakages.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:42:14 +01:00
Michal Čihař
7c249478dc Remove check for libxml_disable_entity_loader 
It's there since PHP 5.2.11 and we require 5.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 09:16:55 +01:00
Michal Čihař
9a590a0b76 Merge branch 'QA_4_5' into QA_4_6 2016-02-16 09:00:41 +01:00
Michal Čihař
310fd4b2c1 Fix PHP error on loading invalid XML or ODS file 
Fixes #11967

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 09:00:32 +01:00
Michal Čihař
0c34cb60a0 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 13:47:04 +01:00
Michal Čihař
53b1f9adcc Silent errors on checking for files and folders 
Fixes #11951
Fixes #11952

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 13:45:04 +01:00
Michal Čihař
ca59f5046c Use new contructor for Group() objects 
This safes us next calls to setName and setText.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:26:52 +01:00
Michal Čihař
4975ef2bc2 Use new constructor for Item() objects 
This allows to directly set name and text.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:04:02 +01:00
Michal Čihař
3c90f45020 Simplify shape record loading 
We can use foreach with reference to simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +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
Michal Čihař
4d74053e3f Remove not used controluser support from PMA_importRunQuery 
This code was never executed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:29:51 +01:00
Hugues Peccatte
154a942145 Remove side effects in declaration files. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-27 18:56:40 +01:00
Hugues Peccatte
e1dd0a9f97 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-18 22:51:01 +02:00
Hugues Peccatte
09f87f4770 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:09:55 +02:00
Hugues Peccatte
af7eaeb047 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 21:51:21 +02:00
Hugues Peccatte
c752c01309 Merge branch 'master' into useNamespaces_master 2015-09-27 20:50:19 +02:00
Hugues Peccatte
0f80756fe6 Use pre-increment when possible. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:12:09 +02:00
Hugues Peccatte
e23bbdf2a6 Set namespaces on GIS classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 22:33:15 +02:00
Hugues Peccatte
330c92ddf7 Set namespace on properties classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 22:16:23 +02:00
Hugues Peccatte
fa801c507f Set namespace on plugins classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 12:51:45 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
7fadb9e37f Remove Drizzle support from import and export 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:37 +10:00