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

188 Commits

Author SHA1 Message Date
Michal Čihař
84507dfeb6 Merge branch 'QA_4_6' 2016-06-17 13:10:28 +02:00
Michal Čihař
d1ec59f05f Ensure we have integer as offset 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:01:56 +02:00
Michal Čihař
dce94f229f More consistency for URL::getCommon 
Now URL::getCommon always returns HTML encoded string, if you want
unencded one, use URL::getCommonRaw. This makes it easier to review the
code if uses correct variant.

Also I've fixed several wrong uses of the HTML encoded variant in
Location header.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 12:44:29 +02:00
Michal Čihař
b311780d76 Separate methods for charset and collation dropdowns 
They do not share much code in the end and this way the code is more
readable.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 13:04:41 +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ř
02aa073a81 Add missing use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 09:03:44 +01:00
Michal Čihař
3bda9a03b9 Move Kanji encoding handling to Encoding class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:55:41 +01:00
Michal Čihař
28d15ebb8c Add method for checking if encoding conversion is supported 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:26:49 +01:00
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:45:19 +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
Michal Čihař
f4eb1a9b4f There is no need to reset() before foreach() 
The code is there since past when PHP 4 was still supported reset was
necessary.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 11:26:34 +01:00
Madhura Jayaratne
1c7282b859 Merge branch 'QA_4_5' 
Conflicts:
	test/classes/plugin/export/ExportSqlTest.php
 2015-12-11 19:26:26 +11:00
Madhura Jayaratne
ceeec424d7 #11728 CSV import skip row count after 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:00:38 +11:00
Marc Delisle
cc6e4f560b Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 15:08:40 -05:00
Marc Delisle
c7ec8d7240 Move code to a function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 12:15:33 -05:00
Hugues Peccatte
dffc8c34e9 Remove logic code in declaration files. 
Move declaration out of logic file.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-27 18:56:39 +01:00
Hugues Peccatte
8ac9634c7a Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-24 13:30:22 +02:00
Hugues Peccatte
178a6edd38 Add namespace on part of plugins classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 00:33:42 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes. 
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:22:52 +02:00
Madhura Jayaratne
6eb6786506 Standardize to sentence case 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-26 16:57:42 +10:00
Marc Delisle
0fba126a72 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-15 07:16:43 -04:00
Marc Delisle
873d1eb8bd Code cleanup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-14 13:45:34 -04:00
Marc Delisle
0becd67f44 File is being conditionally included; use "include_once" instead 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-14 11:17:25 -04:00
Marc Delisle
75da81b1bd Refactor to remove display_import.inc.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-13 13:52:22 -04:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Madhura Jayaratne
c88da15e88 Update doc blocks with proper types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 21:24:16 +05:30
Nisarg Jhaveri
34720c2365 Disable foreign key checks in SQL query box and config option 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-31 12:28:41 +05:30
Madhura Jayaratne
04f989269c Coding style fix - multi line if statements 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 17:50:30 +05:30
Madhura Jayaratne
6f307e5db1 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-01 12:35:16 +05:30
Madhura Jayaratne
720565ef22 Select local file import option in subsequent submissions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-31 19:38:09 +05:30
Madhura Jayaratne
df38a76b9f rfe #1306 Add lock tables, disable keys options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 10:48:59 +05:30
Madhura Jayaratne
3c69273829 Wrap long js lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 17:57:52 +05:30
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:39 +02:00
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02:00
Atul Pratap Singh
c70e109bd6 Feature#1546 Replace js sprintf library with a better one 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-03 17:08:25 +05:30
Hugues Peccatte
5985894160 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 00:31:45 +02:00
Marc Delisle
fb17840088 Add hint about drag and drop for import 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-02 08:16:38 -04:00
Michal Čihař
64e000d71c Fix function name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-24 14:45:01 +02:00
Michal Čihař
dec715e5d8 Replace tabs with spaces 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 18:59:36 +01:00
Ashutosh Dhundhara
2943a514b9 Feature request: #1512 Import doesn't do anything with no file name provided. 
https://sourceforge.net/p/phpmyadmin/feature-requests/1512/

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-14 23:21:21 +05:30
Madhura Jayaratne
84e9ce4946 Spaces around . operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 17:26:27 +05:30
Marc Delisle
9951278eb3 Merge branch 'QA_4_1' 2013-12-27 10:05:37 -05:00
Marc Delisle
8782c1c5b8 bug #4131 Import: "number of rows to skip" is ambiguous 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-27 10:04:55 -05:00
Hugues Peccatte
d68b901132 Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 23:19:26 +01:00
J.M
a5995a5022 Add HTML5 min= attribute for number inputs 2013-08-18 15:44:09 +02:00
J.M
ac05fec3fa Use input type=number 2013-08-18 15:39:51 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
1ada322bac Reintroduce ellipsis 2013-07-31 08:38:00 +02:00
xmujay
776ba8c0f8 fix code style 2013-07-29 23:31:35 +08:00
xmujay
96c1546b3d refresh navigation panel when upload finished 2013-07-29 20:20:11 +08:00