Commit Graph

234 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
2d58411bee Some coding style fixes
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-18 21:30:06 -03:00
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
b9c0463d96 Use short array syntax instead of long array syntax
Replaces array() with [].

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-30 01:42:21 -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
d98658187a Replace PhpMyAdmin\Relation static calls
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-03-25 19:32:13 -03:00
Maurício Meneghini Fauth
a862add418 Replace static methods with instance methods
Replace PhpMyAdmin\Operations static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-25 12:43:49 -03:00
Maurício Meneghini Fauth
15d8ee270f Refactor relation_cleanup functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-12 18:14:37 -03:00
Maurício Meneghini Fauth
a2b08bae7b Refactor check_user_privileges to static methods
Refactor check_user_privileges.lib.php functions to static methods and move logic to check_user_privileges.inc.php.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-11 22:09:05 -03:00
Maurício Meneghini Fauth
e2c83b954b Refactor relation functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-22 20:51:27 -03:00
Maurício Meneghini Fauth
0d11ecc728 Refactor operations functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-20 21:28:36 -03:00
Maurício Meneghini Fauth
ca910e8de8 Move classes to PhpMyAdmin namespace
- Move Table to PhpMyAdmin namespace
- Move Template to PhpMyAdmin namespace
- Move ThemeManager to PhpMyAdmin namespace
- Move Theme to PhpMyAdmin namespace
- Move Tracker to PhpMyAdmin namespace
- Move Transformations to PhpMyAdmin namespace
- Move TypesMySQL to PhpMyAdmin namespace
- Move Types to PhpMyAdmin namespace
- Move Util to PhpMyAdmin namespace
- Move VersionInformation to PhpMyAdmin namespace
- Move Url to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-08 10:54:21 -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
Maurício Meneghini Fauth
54a15dbd9c Move classes to PhpMyAdmin namespace
- Move Logging to PhpMyAdmin namespace
- Move Menu to PhpMyAdmin namespace
- Move Message to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 13:30:04 -03:00
Maurício Meneghini Fauth
13c0f7bc3c Move classes to PhpMyAdmin namespace
- Move Advisor to PhpMyAdmin namespace
- Move Bookmark to PhpMyAdmin namespace
- Move Charsets to PhpMyAdmin namespace
- Move Config class to PhpMyAdmin namespace
- Move Console class to PhpMyAdmin namespace
- Move Core to PhpMyAdmin namespace
- Move DatabaseInterface to PhpMyAdmin namespace
- Move DbList to PhpMyAdmin namespace
- Move DbQbe to PhpMyAdmin namespace
- Move DbSearch to PhpMyAdmin namespace
- Move DisplayResults to PhpMyAdmin namespace
- Move Encoding to PhpMyAdmin namespace
- Move Error to PhpMyAdmin namespace
- Move ErrorHandler to PhpMyAdmin namespace
- Move File to PhpMyAdmin namespace
- Move Font to PhpMyAdmin namespace
- Move Footer to PhpMyAdmin namespace
- Move Header to PhpMyAdmin namespace
- Move Index to PhpMyAdmin namespace
- Move IndexColumn to PhpMyAdmin namespace
- Move LanguageManager to PhpMyAdmin namespace
- Move Language to PhpMyAdmin namespace
- Move Linter to PhpMyAdmin namespace
- Move ListAbstract to PhpMyAdmin namespace
- Move ListDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-28 21:17:18 -03:00
Michal Čihař
edad6fc2d9 Remove custom layout for operations pages
Using plain layout looks better in most situations. Maybe we should
limit width as well, but I'm not sure about that.

Fixes #13145
Obsoletes #13339
Obsoletes #13369

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-06-28 16:16:37 +02:00
Michal Čihař
7c35333e5d Fix method names
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:09 +01:00
Michal Čihař
159e748a2b Simplify getting table create options
- use saner method name (getCreateOptions)
- fix error case

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
a51ac4ef8b Simplify getting row format
- remove not needed word Table from method name
- fix code to handle errors
- convert existing users of getStatusInfo('ROW_FORMAT') to this method

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
ca9ea74d20 Simplify getting table rows
- simplify method name
- fix code handling error path

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
44d3cb3869 Simplify getting table collation
- remove not needed word Table from method name
- fix code to handle errors

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
b2bf9fba87 Simplify getting table comment
- remove not needed word Show from method name
- fix code to handle errors

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
56046cc7e2 Simplify getting storage engine
- remove not needed word Table from method name
- fix code to handle errors
- convert existing users of getStatusInfo('ENGINE') to this method

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Michal Čihař
9f2773c9c2 Simplify rereading of information
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:55:38 +01: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
Isaac Bennetch
8bfd773248 Merge and fix conflicts from 3b07b39
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2017-01-19 22:03:05 -05:00
Tim McLaughlin
3b07b39c35 Fix PHP Notice 'Undefined index: row_format' when altering table options.
Issue #12840
Signed-off-by: Tim McLaughlin <tim.j.mclaughlin@gmail.com>
2017-01-09 18:33:14 -08: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ř
6c939147b9 Rewrite PMA_getTableOptionDiv to use Table for engine flags
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-01 13:50:35 +01:00
Michal Čihař
58f6e843d0 Make PMA_getTableAltersArray accept table instead of flags
Issue #12703, #12719

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-01 13:16:54 +01:00
Michal Čihař
2f97016501 Simplified parameters for PMA_getHtmlForTableMaintenance
Issue #12703, #12719

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-01 13:01:42 +01:00
arimourao
791a338946 Implement generic logic for checking table engine
Fixes #12703

Signed-off-by: arimourao <amlima@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-01 12:33:45 +01:00
Deven Bansod
7aad858dfb Merge branch 'QA_4_6'
Conflicts:
	po/el.po
	po/ko.po
2016-10-19 15:28:08 +05:30
Deven Bansod
1eac9c5ec2 Proper initialization of $_message variable according to value of $result
While calling getDisplay, $_message should be an instance of PMA\libraries\Message.

Fix #12650

Also, spaces at the beginning of a table name are allowed if used inside backquotes.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-10-19 15:22:05 +05:30
Michal Čihař
ad87644941 Merge branch 'QA_4_6' 2016-09-19 11:36:54 +02:00
Michal Čihař
f7f03127f7 Store create options in serapate array instead of polluting global namespace
This is just a minor cleanup to avoid possible problems when MySQL
create table options would collide with our variable names.

See also issue #12567

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-19 11:34:43 +02:00
Michal Čihař
a7cd193554 Make it clear whether addMessages expects string or Message object
With this, it's way easier to anaylize code for potential problems with
escaping.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-16 14:56: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ř
ef7114d850 Merge branch 'QA_4_5' into QA_4_6 2016-02-09 16:53:06 +01:00
Michal Čihař
afe00d7c10 The storage engine needs to be upper case all the time
So far the current was uppercase, but the possibly new was lower case
leading to many weird effects.

Fixes #11930

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-09 16:51:20 +01:00
Marc Delisle
3c919fd63d Fix #11866 Direct calling of functions.js #11866
Signed-off-by: Marc Delisle <marc@infomarc.info>
2016-01-18 07:31:29 -05: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ř
cc07b737dc Remove unused PMA_String class
The class is no longer used:

- the ctype part is not needed by new SQL parser
- the utf-8 manipulation was replaced by direct usage of mbstring

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-21 12:09:06 +01:00
Michal Čihař
98d88ef134 Remove unused pmaString variable
It was used in past when we didn't rely on mbstring.

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-21 11:35:36 +01:00
Michal Čihař
47a5ece9c1 Merge branch 'QA_4_5' 2015-12-21 11:31:22 +01:00
Michal Čihař
6cbfe12122 Remove unused code
These variables are set on next row anyway.

Issue #11749

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-21 11:26:22 +01:00
Michal Čihař
b485166d08 Avoid not needed mb_strtoupper
The libraries/tbl_info.inc.php already does this.

Issue #11749

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-21 11:26:12 +01:00
Michal Čihař
2076b0203b Fixed displaying of SQL query on table operations
- do not show message about executed SQL when none was executed
- always show the SQL

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-16 09:44:27 +01:00
Michal Čihař
a2a321eaf7 No need to set type of message when we pass Message instance
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-16 09:44:27 +01:00
Michal Čihař
c217eaffc2 Use default messages, no need to duplicate them
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-16 09:44:27 +01:00