Commit Graph

56 Commits

Author SHA1 Message Date
Piyush Vijay
5f4db91d71
Resolve merge conflicts and add tbl import and export in modular code
Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>
2018-08-19 15:29:58 +05:30
Maurício Meneghini Fauth
285e38e931 Fix some PSR-2 coding standard errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-30 09:07:56 -03:00
Maurício Meneghini Fauth
af148ad92b Enable strict mode in PHP files
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-16 04:36:04 -03:00
Maurício Meneghini Fauth
1a82d6f0d2 Refactor PhpMyAdmin\Import static methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-03-31 21:32:18 -03:00
Maurício Meneghini Fauth
73e558337c Refactor PhpMyAdmin\Display\Import class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-26 15:38:25 -02:00
Maurício Meneghini Fauth
f0f8c3e68f Refactor display_import functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-06 10:59:18 -03:00
Michal Čihař
94bb2e31a1 Remove no longer needed page_settings.forms.php and user_preferences.forms.php
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:04:47 +02:00
Maurício Meneghini Fauth
5e7f6a1bab Move config classes to PhpMyAdmin namespace
- Move ConfigFile to PhpMyAdmin namespace
- Move FormDisplay to PhpMyAdmin namespace
- Move Form to PhpMyAdmin namespace
- Move PageSettings to PhpMyAdmin namespace
- Move ServerConfigChecks to PhpMyAdmin namespace
- Move Validator to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-09 15:16:37 -03:00
Maurício Meneghini Fauth
119563b7ea Move classes to PhpMyAdmin namespace
- Move OpenDocument to PhpMyAdmin namespace
- Move OutputBuffering to PhpMyAdmin namespace
- Move Partition to PhpMyAdmin namespace
- Move Pdf class to PhpMyAdmin namespace
- Move RecentFavoriteTable to PhpMyAdmin namespace
- Move Response to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 23:44:10 -03:00
Vishal Pandey
5da44ce1a6 Move the tbl_info.inc.php code to Table class
Fixes #12567

Signed-off-by: flash1452 <vishpandey2014@gmail.com>
2017-03-20 17:55:21 +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
Hugues Peccatte
e6c142bc56 Add missing require.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-06 12:44:03 +02:00
Hugues Peccatte
6f84933a00 Add missing require.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-06 01:20:11 +02:00
Hugues Peccatte
e5e447e937 Set namespace on config classes.
Update config classes.
Add @noinspection tag.
Update documentation and script.
Set ConfigGenerator in a namespace.
Rename ConfigGenerator filename.
Remove ConfigGenerator requires.
Fix namespaces of mock objects.
Remove useless require.
Add missing 'use'.
Add missing require.
Update PHPDoc.
Fix class test typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:23 +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
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
Hugues Peccatte
37f6b992da Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-06-14 13:50:57 +02:00
Nisarg Jhaveri
e115adb533 Page-related settings, rfe#1559
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-05-18 20:38:07 +05:30
Rahul Kadyan
4d308ba364 Remove unneeded closing tags
Closing tags at the end of file are not mandatory. It is often
suggested to omit to closing tags at the end of file to prevent
unwanted effects as PHP will start output buffering if there is
any character after closing tag.

Reference: http://php.net/manual/en/language.basic-syntax.phptags.php

Signed-off-by: Rahul Kadyan <hi@znck.me>
2015-03-06 23:37:35 +05:30
Michal Čihař
b485c6105c Remove blank lines from the end of PHP files (causing extra output)
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-24 10:57:21 +01:00
Michal Čihař
9c141ee607 Various coding style fixes 2013-08-06 15:56:32 +02:00
xmujay
b49988b4b1 1. rename display_import.lib.php to display_import.inc.php
2. split long code to functions
3. move function to display_import.lib.php
4. fix the included file: table, database, server
2013-07-27 19:06:39 +08:00
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +01:00
Rouslan Placella
a054562100 PMA_Footer and PMA_Header no longer need to be singletons 2012-06-11 14:06:03 +01:00
Rouslan Placella
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
Rouslan Placella
28923b496e Renamed tbl_common.php to tbl_common.inc.php for better consistency 2012-05-05 16:44:27 +01:00
Rouslan Placella
2c805ade8b Dropped tbl_links.inc.php 2012-05-05 16:44:27 +01:00
Jo Michael
b2fd866d87 Leading ./ paths for includes can be omitted, part 2 2012-03-16 23:11:57 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	server_export.php
2010-07-26 13:42:42 -07:00
Michal Čihař
d291827444 No need to require_once footer
It is the last thing executed anyway (ends with exit).
2010-07-26 16:20:24 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
2010-07-20 13:04:03 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
lorilee
d430bb21dd Included import.js 2010-06-11 01:26:34 -04:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Philip Frank
c77216d532 [interface] Convert upload progress bar to jQuery.
patch #2986073
2010-04-15 10:36:23 +02:00
Michal Čihař
201d0e892c Load mootools in every page. 2010-01-25 11:49:46 +00:00
Michal Čihař
78b00824eb [core] Updated mootools to fix some glitches with Safari.
Mootools are now in separate files as distributed upstream.
2010-01-04 15:35:23 +00:00
Marc Delisle
60536d78e1 patch #2798592 [import] Progress bar 2009-07-02 12:12:06 +00:00
Michal Čihař
84ae0420fe Adding @package, third part. 2008-11-24 11:22:44 +00:00
Sebastian Mendel
adb39168cc coding standard: no braces around include 2007-04-01 09:51:41 +00:00
Sebastian Mendel
d0facc3d4f splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php 2007-03-20 14:16:18 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Michal Čihař
ad06b4a991 Rename tbl_* files to drop useless _properties part. 2006-10-25 10:55:20 +00:00
Marc Delisle
7e93c28871 bug #1415465, undefined variable 2006-02-04 18:38:42 +00:00