gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename classes files.

Browse Source 
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2015-08-29 22:29:21 +02:00
parent 2606c5f72d
commit 0761fb1801
162 changed files with 469 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db_operations.php
View File

@ -11,7 +11,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
/**
* requirements
@ -37,7 +37,7 @@ $sql_query = '';
/**
* Rename/move or copy database
*/
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
if (/*overload*/mb_strlen($GLOBALS['db'])
&& (! empty($_REQUEST['db_rename']) || ! empty($_REQUEST['db_copy']))

10
db_qbe.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_SavedSearches;
use PMA\libraries\SavedSearches;
/**
* requirements
@ -23,13 +23,13 @@ $savedSearchList = array();
$savedSearch = null;
$currentSearchId = null;
if ($cfgRelation['savedsearcheswork']) {
include 'libraries/SavedSearches.class.php';
include 'libraries/SavedSearches.php';
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('db_qbe.js');
//Get saved search list.
$savedSearch = new PMA_SavedSearches($GLOBALS);
$savedSearch = new SavedSearches($GLOBALS);
$savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
->setDbname($_REQUEST['db']);
@ -50,14 +50,14 @@ if ($cfgRelation['savedsearcheswork']) {
} elseif ('delete' === $_REQUEST['action']) {
$deleteResult = $savedSearch->delete();
//After deletion, reset search.
$savedSearch = new PMA_SavedSearches($GLOBALS);
$savedSearch = new SavedSearches($GLOBALS);
$savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
->setDbname($_REQUEST['db']);
$_REQUEST = array();
} elseif ('load' === $_REQUEST['action']) {
if (empty($_REQUEST['searchId'])) {
//when not loading a search, reset the object.
$savedSearch = new PMA_SavedSearches($GLOBALS);
$savedSearch = new SavedSearches($GLOBALS);
$savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
->setDbname($_REQUEST['db']);
$_REQUEST = array();

2
db_structure.php
View File

@ -27,7 +27,7 @@ list(
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/DatabaseStructureController.class.php';
require_once 'libraries/Response.class.php';
require_once 'libraries/Response.php';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\DatabaseStructureController');

4
export.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
/**
* Get the variables sent or posted to this script and a core script
@ -250,7 +250,7 @@ if (!defined('TESTSUITE')) {
}
// Generate error url and check for needed variables
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
if ($export_type == 'server') {
$err_url = 'server_export.php' . PMA_URL_getCommon();

4
file_echo.php
View File

@ -7,7 +7,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
define('PMA_MINIMUM_COMMON', true);
require_once 'libraries/common.inc.php';
@ -43,7 +43,7 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
$filename = $_REQUEST['filename'];
}
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
/* Decode data */

4
gis_data_editor.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
/**
* Escapes special characters if the variable is set.
@ -40,7 +40,7 @@ $gis_types = array(
'GEOMETRYCOLLECTION'
);
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
// Extract type from the initial call and make sure that it's a valid one.

4
import.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
/**
* Get the variables sent or posted to this script and a core script
@ -233,7 +233,7 @@ PMA\libraries\Util::checkParameters(array('import_type', 'format'));
// We don't want anything special in format
$format = PMA_securePath($format);
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
// Create error and goto url

8
index.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
use PMA\libraries\RecentFavoriteTable;
/**
@ -17,7 +17,7 @@ require_once 'libraries/common.inc.php';
* display Git revision if requested
*/
require_once 'libraries/display_git_revision.lib.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
/**
* pass variables to child pages
@ -115,7 +115,7 @@ $mysql_cur_user_and_host = '';
// all MySQL-related information
if ($server > 0) {
include 'libraries/server_common.inc.php';
include 'libraries/StorageEngine.class.php';
include 'libraries/StorageEngine.php';
// Use the verbose name of the server instead of the hostname
// if a value is set
@ -605,7 +605,7 @@ if (isset($GLOBALS['dbi'])
&& !PMA_DRIZZLE
&& $cfg['ServerLibraryDifference_DisableWarning'] == false
) {
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
$_client_info = $GLOBALS['dbi']->getClientInfo();

4
js/common.js
View File

@ -8,7 +8,7 @@ $(function () {
* Holds common parameters such as server, db, table, etc
*
* The content for this is normally loaded from Header.php or
* Response.class.php and executed by ajax.js
* Response.php and executed by ajax.js
*/
var PMA_commonParams = (function () {
/**
@ -99,7 +99,7 @@ var PMA_commonParams = (function () {
* Holds common parameters such as server, db, table, etc
*
* The content for this is normally loaded from Header.php or
* Response.class.php and executed by ajax.js
* Response.php and executed by ajax.js
*/
var PMA_commonActions = {
/**

2
libraries/Console.php
View File

@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once 'libraries/Scripts.class.php';
require_once 'libraries/Scripts.php';
require_once 'libraries/bookmark.lib.php';
/**

12
libraries/DatabaseInterface.php
View File

@ -11,7 +11,7 @@ use PMA\SystemDatabase;
require_once './libraries/logging.lib.php';
require_once './libraries/Index.php';
require_once './libraries/SystemDatabase.class.php';
require_once './libraries/SystemDatabase.php';
require_once './libraries/util.lib.php';
/**
@ -152,7 +152,7 @@ class DatabaseInterface
}
/**
* Caches table data so PMA_Table does not require to issue
* Caches table data so Table does not require to issue
* SHOW TABLE STATUS again
*
* @param array $tables information for tables of some databases
@ -520,7 +520,7 @@ class DatabaseInterface
* @param string $sort_order direction to sort (ASC or DESC)
* @param string $table_type whether table or view
*
* @todo move into PMA_Table
* @todo move into Table
*
* @return array list of tables in given db(s)
*/
@ -801,7 +801,7 @@ class DatabaseInterface
}
// cache table data
// so PMA_Table does not require to issue SHOW TABLE STATUS again
// so Table does not require to issue SHOW TABLE STATUS again
$this->_cacheTableData($tables, $table);
if (is_array($database)) {
@ -3195,10 +3195,10 @@ class DatabaseInterface
* @param string $db_name DB name
* @param string $table_name Table name
*
* @return PMA_Table
* @return Table
*/
public function getTable($db_name, $table_name)
{
return new PMA_Table($table_name, $db_name, $this);
return new Table($table_name, $db_name, $this);
}
}

8
libraries/DbQbe.php
View File

@ -204,7 +204,7 @@ class DbQbe
* Current search
*
* @access private
* @var PMA_SavedSearches
* @var SavedSearches
*/
private $_currentSearch = null;
@ -230,7 +230,7 @@ class DbQbe
/**
* Getter for current search
*
* @return PMA_SavedSearches
* @return SavedSearches
*/
private function _getCurrentSearch()
{
@ -242,7 +242,7 @@ class DbQbe
*
* @param string $dbname Database name
* @param array $savedSearchList List of saved searches
* @param PMA_SavedSearches $currentSearch Current search id
* @param SavedSearches $currentSearch Current search id
*/
public function __construct(
$dbname, $savedSearchList = array(), $currentSearch = null
@ -1476,7 +1476,7 @@ class DbQbe
$csize = array();
foreach ($candidate_columns as $table) {
if ($checked_tables[$table] != 1) {
$_table = new PMA_Table($table, $this->_db);
$_table = new Table($table, $this->_db);
$tsize[$table] = $_table->countRecords();
$checked_tables[$table] = 1;
}

18
libraries/DisplayResults.php
View File

@ -644,7 +644,7 @@ class DisplayResults
// - For a VIEW we (probably) did not count the number of rows
// so don't test this number here, it would remove the possibility
// of sorting VIEW results.
$_table = new PMA_Table($table, $db);
$_table = new Table($table, $db);
if (isset($unlim_num_rows)
&& ($unlim_num_rows < 2)
&& ! $_table->isView()
@ -1658,15 +1658,15 @@ class DisplayResults
$data_html = '';
// generate the column order, if it is set
$pmatable = new PMA_Table($this->__get('table'), $this->__get('db'));
$col_order = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_ORDER);
$pmatable = new Table($this->__get('table'), $this->__get('db'));
$col_order = $pmatable->getUiProp(Table::PROP_COLUMN_ORDER);
if ($col_order) {
$data_html .= '<input class="col_order" type="hidden" value="'
. implode(',', $col_order) . '" />';
}
$col_visib = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_VISIB);
$col_visib = $pmatable->getUiProp(Table::PROP_COLUMN_VISIB);
if ($col_visib) {
$data_html .= '<input class="col_visib" type="hidden" value="'
@ -1674,7 +1674,7 @@ class DisplayResults
}
// generate table create time
$table = new PMA_Table($this->__get('table'), $this->__get('db'));
$table = new Table($this->__get('table'), $this->__get('db'));
if (! $table->isView()) {
$data_html .= '<input class="table_create_time" type="hidden" value="'
. $GLOBALS['dbi']->getTable(
@ -3382,9 +3382,9 @@ class DisplayResults
private function _getColumnParams($analyzed_sql_results)
{
if ($this->_isSelect($analyzed_sql_results)) {
$pmatable = new PMA_Table($this->__get('table'), $this->__get('db'));
$col_order = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_ORDER);
$col_visib = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_VISIB);
$pmatable = new Table($this->__get('table'), $this->__get('db'));
$col_order = $pmatable->getUiProp(Table::PROP_COLUMN_ORDER);
$col_visib = $pmatable->getUiProp(Table::PROP_COLUMN_VISIB);
} else {
$col_order = false;
$col_visib = false;
@ -4654,7 +4654,7 @@ class DisplayResults
}
$table = new PMA_Table($this->__get('table'), $this->__get('db'));
$table = new Table($this->__get('table'), $this->__get('db'));
if ($table->isView()
&& ($total == $GLOBALS['cfg']['MaxExactCountViews'])
) {

12
libraries/Footer.php
View File

@ -9,7 +9,7 @@ namespace PMA\libraries;
use Traversable;
require_once 'libraries/Scripts.class.php';
require_once 'libraries/Scripts.php';
/**
* Class used to output the footer
@ -19,10 +19,10 @@ require_once 'libraries/Scripts.class.php';
class Footer
{
/**
* PMA_Scripts instance
* Scripts instance
*
* @access private
* @var PMA_Scripts
* @var Scripts
*/
private $_scripts;
/**
@ -56,7 +56,7 @@ class Footer
public function __construct()
{
$this->_isEnabled = true;
$this->_scripts = new PMA_Scripts();
$this->_scripts = new Scripts();
$this->_isMinimal = false;
}
@ -287,9 +287,9 @@ class Footer
}
/**
* Returns the PMA_Scripts object
* Returns the Scripts object
*
* @return PMA_Scripts object
* @return Scripts object
*/
public function getScripts()
{

12
libraries/Header.php
View File

@ -9,7 +9,7 @@ namespace PMA\libraries;
use PMA_Navigation;
require_once 'libraries/Scripts.class.php';
require_once 'libraries/Scripts.php';
require_once 'libraries/navigation/Navigation.class.php';
require_once 'libraries/url_generating.lib.php';
@ -21,10 +21,10 @@ require_once 'libraries/url_generating.lib.php';
class Header
{
/**
* PMA_Scripts instance
* Scripts instance
*
* @access private
* @var PMA_Scripts
* @var Scripts
*/
private $_scripts;
/**
@ -128,7 +128,7 @@ class Header
$this->_menuEnabled = true;
$this->_warningsEnabled = true;
$this->_isPrintView = false;
$this->_scripts = new PMA_Scripts();
$this->_scripts = new Scripts();
$this->_addDefaultScripts();
$this->_headerIsSent = false;
// if database storage for user preferences is transient,
@ -304,9 +304,9 @@ class Header
}
/**
* Returns the PMA_Scripts object
* Returns the Scripts object
*
* @return PMA_Scripts object
* @return Scripts object
*/
public function getScripts()
{

0
libraries/Response.class.php → libraries/Response.php
View File

2
libraries/SavedSearches.class.php → libraries/SavedSearches.php
View File

@ -12,7 +12,7 @@ namespace PMA\libraries;
*
* @package PhpMyAdmin
*/
class PMA_SavedSearches
class SavedSearches
{
/**
* Global configuration

4
libraries/Scripts.class.php → libraries/Scripts.php
View File

@ -14,7 +14,7 @@ namespace PMA\libraries;
*
* @package PhpMyAdmin
*/
class PMA_Scripts
class Scripts
{
/**
* An array of SCRIPT tags
@ -94,7 +94,7 @@ class PMA_Scripts
}
/**
* Generates new PMA_Scripts objects
* Generates new Scripts objects
*
*/
public function __construct()

4
libraries/ServerStatusData.class.php → libraries/ServerStatusData.php
View File

@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* PMA_ServerStatusData class
* ServerStatusData class
* Used by server_status_*.php pages
*
* @package PhpMyAdmin
@ -19,7 +19,7 @@ namespace PMA\libraries;
*
* @package PhpMyAdmin
*/
class PMA_ServerStatusData
class ServerStatusData
{
public $status;
public $sections;

12
libraries/StorageEngine.class.php → libraries/StorageEngine.php
View File

@ -38,7 +38,7 @@ define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN', 3); // 'ON' or 'OFF'
*
* @package PhpMyAdmin
*/
class PMA_StorageEngine
class StorageEngine
{
/**
* @var string engine name
@ -68,7 +68,7 @@ class PMA_StorageEngine
*/
public function __construct($engine)
{
$storage_engines = PMA_StorageEngine::getStorageEngines();
$storage_engines = StorageEngine::getStorageEngines();
if (! empty($storage_engines[$engine])) {
$this->engine = $engine;
$this->title = $storage_engines[$engine]['Engine'];
@ -147,7 +147,7 @@ class PMA_StorageEngine
$output = '<select name="' . $name . '"'
. (empty($id) ? '' : ' id="' . $id . '"') . '>' . "\n";
foreach (PMA_StorageEngine::getStorageEngines() as $key => $details) {
foreach (StorageEngine::getStorageEngines() as $key => $details) {
// Don't show PERFORMANCE_SCHEMA engine (MySQL 5.5)
// Don't show MyISAM for Drizzle (allowed only for temporary tables)
if (! $offerUnavailableEngines
@ -178,7 +178,7 @@ class PMA_StorageEngine
*
* @param string $engine The engine ID
*
* @return PMA_StorageEngine|bool The engine plugin or false if not found
* @return StorageEngine|bool The engine plugin or false if not found
* @static
*/
static public function getEngine($engine)
@ -217,7 +217,7 @@ class PMA_StorageEngine
return false;
}
return new PMA_StorageEngine($engine);
return new StorageEngine($engine);
}
/**
@ -233,7 +233,7 @@ class PMA_StorageEngine
if ($engine == "PBMS") {
return true;
}
$storage_engines = PMA_StorageEngine::getStorageEngines();
$storage_engines = StorageEngine::getStorageEngines();
return isset($storage_engines[$engine]);
}

18
libraries/String.class.php → libraries/String.php
View File

@ -7,20 +7,20 @@
*/
namespace PMA\libraries;
use PMA_StringType;
use StringType;
require_once 'libraries/StringType.int.php';
require_once 'libraries/StringByte.int.php';
require_once 'libraries/StringType.php';
require_once 'libraries/StringByte.php';
/**
* Specialized string class for phpMyAdmin.
* The SQL Parser code relies heavily on these functions.
*
* @package PhpMyAdmin-String
*/
class PMA_String implements PMA_StringType
class String implements StringType
{
/**
* @var PMA_StringType
* @var StringType
*/
private $_type;
@ -30,11 +30,11 @@ class PMA_String implements PMA_StringType
public function __construct()
{
if (@extension_loaded('ctype')) {
include_once 'libraries/StringCType.class.php';
$this->_type = new PMA_StringCType();
include_once 'libraries/StringCType.php';
$this->_type = new StringCType();
} else {
include_once 'libraries/StringNativeType.class.php';
$this->_type = new PMA_StringNativeType();
include_once 'libraries/StringNativeType.php';
$this->_type = new StringNativeType();
}
}

10
libraries/StringAbstractType.class.php → libraries/StringAbstractType.php
View File

@ -1,22 +1,22 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Common functions for classes based on PMA_StringByte interface.
* Common functions for classes based on StringByte interface.
*
* @package PhpMyAdmin-String
*/
namespace PMA\libraries;
use PMA_StringType;
use StringType;
require_once 'libraries/StringType.int.php';
require_once 'libraries/StringType.php';
/**
* Implements PMA_StringByte interface using native PHP functions.
* Implements StringByte interface using native PHP functions.
*
* @package PhpMyAdmin-String
*/
abstract class PMA_StringAbstractType implements PMA_StringType
abstract class StringAbstractType implements StringType
{
/**
* Checks if a number is in a range

2
libraries/StringByte.int.php → libraries/StringByte.php
View File

@ -10,7 +10,7 @@
*
* @package PhpMyAdmin-String
*/
interface PMA_StringByte
interface StringByte
{
/**
* Returns length of string depending on current charset.

8
libraries/StringCType.class.php → libraries/StringCType.php
View File

@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Implements PMA_StringType interface using the "ctype" extension.
* Implements StringType interface using the "ctype" extension.
* Methods of the "ctype" extension are faster compared to PHP versions of them.
*
* @package PhpMyAdmin-String
@ -9,16 +9,16 @@
*/
namespace PMA\libraries;
require_once 'libraries/StringAbstractType.class.php';
require_once 'libraries/StringAbstractType.php';
/**
* Implements PMA_StringType interface using the "ctype" extension.
* Implements StringType interface using the "ctype" extension.
* Methods of the "ctype" extension are faster compared to PHP versions of them.
*
* @package PhpMyAdmin-String
* @subpackage CType
*/
class PMA_StringCType extends PMA_StringAbstractType
class StringCType extends StringAbstractType
{
/**
* Checks if a character is an alphanumeric one

8
libraries/StringNativeType.class.php → libraries/StringNativeType.php
View File

@ -1,23 +1,23 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Implements PMA_StringByte interface using native PHP functions.
* Implements StringByte interface using native PHP functions.
*
* @package PhpMyAdmin-String
* @subpackage Native
*/
namespace PMA\libraries;
require_once 'libraries/StringAbstractType.class.php';
require_once 'libraries/StringAbstractType.php';
/**
* Implements PMA_StringByte interface using native PHP functions.
* Implements StringByte interface using native PHP functions.
*
* @package PhpMyAdmin-String
* @subpackage Native
* @todo May be join this class with PMA_StringNative class
*/
class PMA_StringNativeType extends PMA_StringAbstractType
class StringNativeType extends StringAbstractType
{
/**
* Checks if a character is an alphanumeric one

2
libraries/StringType.int.php → libraries/StringType.php
View File

@ -10,7 +10,7 @@
*
* @package PhpMyAdmin-String
*/
interface PMA_StringType
interface StringType
{
/**
* Checks if a character is an alphanumeric one

0
libraries/SystemDatabase.class.php → libraries/SystemDatabase.php
View File

32
libraries/Table.class.php → libraries/Table.php
View File

@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Holds the PMA_Table class
* Holds the Table class
*
* @package PhpMyAdmin
*/
@ -21,7 +21,7 @@ use SqlParser\Utils\Table;
* @todo make use of Message and Error
* @package PhpMyAdmin
*/
class PMA_Table
class Table
{
/**
* UI preferences properties
@ -577,7 +577,7 @@ class PMA_Table
}
return $row_count;
} // end of the 'PMA_Table::countRecords()' function
} // end of the 'Table::countRecords()' function
/**
* Generates column specification for ALTER syntax
@ -608,7 +608,7 @@ class PMA_Table
$extra, $comment, $virtuality, $expression, $move_to
) {
return Util::backquote($oldcol) . ' '
. PMA_Table::generateFieldSpec(
. Table::generateFieldSpec(
$newcol, $type, $length, $attribute,
$collation, $null, $default_type, $default_value, $extra,
$comment, $virtuality, $expression, $move_to
@ -699,7 +699,7 @@ class PMA_Table
$GLOBALS['dbi']->freeResult($table_copy_rs);
return $last_id;
} // end of 'PMA_Table::duplicateInfo()' function
} // end of 'Table::duplicateInfo()' function
/**
* Copies or renames table
@ -722,7 +722,7 @@ class PMA_Table
// Try moving the tables directly, using native `RENAME` statement.
if ($move && $what == 'data') {
$tbl = new PMA_Table($source_table, $source_db);
$tbl = new Table($source_table, $source_db);
if ($tbl->rename($target_table, $target_db)) {
$GLOBALS['message'] = $tbl->getLastMessage();
return true;
@ -852,7 +852,7 @@ class PMA_Table
*/
$statement = new DropStatement();
$tbl = new PMA_Table($target_db, $target_table);
$tbl = new Table($target_db, $target_table);
$statement->options = new OptionsArray(
array(
@ -1011,7 +1011,7 @@ class PMA_Table
$GLOBALS['sql_query'] = '';
}
$_table = new PMA_Table($target_table, $target_db);
$_table = new Table($target_table, $target_db);
// Copy the data unless this is a VIEW
if (($what == 'data' || $what == 'dataonly')
&& ! $_table->isView()
@ -1037,7 +1037,7 @@ class PMA_Table
// moving table from replicated one to not replicated one
$GLOBALS['dbi']->selectDb($source_db);
$_source_table = new PMA_Table($source_table, $source_db);
$_source_table = new Table($source_table, $source_db);
if ($_source_table->isView()) {
$sql_drop_query = 'DROP VIEW';
} else {
@ -1132,7 +1132,7 @@ class PMA_Table
'db_name' => $target_db,
'table_name' => $target_table
);
PMA_Table::duplicateInfo(
Table::duplicateInfo(
'displaywork',
'table_info',
$get_fields,
@ -1157,7 +1157,7 @@ class PMA_Table
'foreign_db' => $target_db,
'master_table' => $target_table
);
PMA_Table::duplicateInfo(
Table::duplicateInfo(
'relwork',
'relation',
$get_fields,
@ -1179,7 +1179,7 @@ class PMA_Table
'foreign_db' => $target_db,
'foreign_table' => $target_table
);
PMA_Table::duplicateInfo(
Table::duplicateInfo(
'relwork',
'relation',
$get_fields,
@ -1197,7 +1197,7 @@ class PMA_Table
$get_fields = array('page_descr');
$where_fields = array('db_name' => $source_db);
$new_fields = array('db_name' => $target_db);
$last_id = PMA_Table::duplicateInfo(
$last_id = Table::duplicateInfo(
'pdfwork',
'pdf_pages',
$get_fields,
@ -1216,7 +1216,7 @@ class PMA_Table
'table_name' => $target_table,
'pdf_page_number' => $last_id
);
PMA_Table::duplicateInfo(
Table::duplicateInfo(
'pdfwork',
'table_coords',
$get_fields,
@ -1280,13 +1280,13 @@ class PMA_Table
$new_db = $this->getDbName();
}
$new_table = new PMA_Table($new_name, $new_db);
$new_table = new Table($new_name, $new_db);
if ($this->getFullName() === $new_table->getFullName()) {
return true;
}
if (! PMA_Table::isValidName($new_name)) {
if (! Table::isValidName($new_name)) {
$this->errors[] = __('Invalid table name:') . ' '
. $new_table->getFullName();
return false;

0
libraries/Template.class.php → libraries/Template.php
View File

8
libraries/Util.php
View File

@ -14,7 +14,7 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
/**
* Misc functions used all over the scripts.
@ -817,10 +817,10 @@ class Util
// and this would break the navigation panel;
// but we can check row count if this is a view or the
// information_schema database
// since PMA_Table::countRecords() returns a limited row count
// since Table::countRecords() returns a limited row count
// in this case.
// set this because PMA_Table::countRecords() can use it
// set this because Table::countRecords() can use it
$tbl_is_view = $table['TABLE_TYPE'] == 'VIEW';
if ($tbl_is_view || $GLOBALS['dbi']->isSystemSchema($db)) {
@ -2088,7 +2088,7 @@ class Util
* @param string $Separator The Separator (defaults to "<br />\n")
*
* @access public
* @todo add a multibyte safe function $GLOBALS['PMA_String']->split()
* @todo add a multibyte safe function $GLOBALS['String']->split()
*
* @return string The flipped string
*/

2
libraries/central_columns.lib.php
View File

@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once './libraries/Template.class.php';
require_once './libraries/Template.php';
/**
* Defines the central_columns parameters for the current user

12
libraries/common.inc.php
View File

@ -35,7 +35,7 @@ use PMA\libraries\DatabaseInterface;
use PMA\libraries\ErrorHandler;
use PMA\libraries\Message;
use PMA\libraries\PMA;
use PMA\libraries\PMA_String;
use PMA\libraries\String;
use PMA\libraries\PMA_Theme;
use PMA\libraries\PMA_Theme_Manager;
use PMA\libraries\PMA_Tracker;
@ -70,8 +70,8 @@ require_once './libraries/autoloader.php';
/**
* String handling (security)
*/
require_once './libraries/String.class.php';
$PMA_String = new PMA_String();
require_once './libraries/String.php';
$PMA_String = new String();
/**
* initialize the error handler
@ -127,9 +127,9 @@ require './libraries/relation.lib.php';
require './libraries/Tracker.class.php';
/**
* the PMA_Table class
* the Table class
*/
require './libraries/Table.class.php';
require './libraries/Table.php';
/**
* the PMA_Types class
@ -151,7 +151,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* Used to generate the page
*/
include_once 'libraries/Response.class.php';
include_once 'libraries/Response.php';
}
/******************************************************************************/

4
libraries/config/FormDisplay.tpl.php
View File

@ -60,7 +60,7 @@ function PMA_displayTabsTop($tabs)
);
}
include_once './libraries/Template.class.php';
include_once './libraries/Template.php';
$htmlOutput = PMA\libraries\Template::get('list/unordered')->render(
array(
'class' => 'tabs',
@ -494,7 +494,7 @@ function PMA_displayJavascript($js_array)
return null;
}
include_once './libraries/Template.class.php';
include_once './libraries/Template.php';
return PMA\libraries\Template::get('javascript/display')->render(
array('js_array' => $js_array,)

2
libraries/controllers/DatabaseStructureController.class.php
View File

@ -19,7 +19,7 @@ use PMA_PageSettings;
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/config/page_settings.class.php';
require_once 'libraries/display_create_table.lib.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
require_once 'libraries/controllers/DatabaseController.class.php';
/**

2
libraries/controllers/TableChartController.class.php
View File

@ -15,7 +15,7 @@ use PMA\libraries\Util;
require_once 'libraries/Util.php';
require_once 'libraries/Message.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
require_once 'libraries/controllers/TableController.class.php';
/**

2
libraries/controllers/TableIndexesController.class.php
View File

@ -20,7 +20,7 @@ require_once 'libraries/Message.php';
require_once 'libraries/Util.php';
require_once 'libraries/Index.php';
require_once 'libraries/controllers/TableController.class.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
/**
* Class TableIndexesController

8
libraries/controllers/TableRelationController.class.php
View File

@ -11,15 +11,15 @@ namespace PMA\Controllers\Table;
require_once 'libraries/DatabaseInterface.php';
require_once 'libraries/controllers/TableController.class.php';
require_once 'libraries/index.lib.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Table.class.php';
require_once 'libraries/Template.php';
require_once 'libraries/Table.php';
require_once 'libraries/Index.php';
require_once 'libraries/Util.php';
use PMA\Controllers\TableController;
use PMA\libraries\DatabaseInterface;
use PMA\libraries\Index;
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
use PMA\libraries\Template;
use PMA\libraries\Util;
@ -61,7 +61,7 @@ class TableRelationController extends TableController
protected $existrel_foreign;
/**
* @var PMA_Table $udp_query
* @var Table $udp_query
*/
protected $upd_query;

2
libraries/controllers/TableSearchController.class.php
View File

@ -13,7 +13,7 @@ use PMA\libraries\Template;
use PMA\Controllers\TableController;
use PMA\libraries\DatabaseInterface;
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/sql.lib.php';
require_once 'libraries/bookmark.lib.php';

16
libraries/controllers/TableStructureController.class.php
View File

@ -11,7 +11,7 @@ namespace PMA\Controllers;
use PMA\libraries\Index;
use PMA\libraries\Message;
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
use PMA\libraries\Template;
use PMA\libraries\Util;
use PMA\Util as Util_lib;
@ -25,7 +25,7 @@ require_once 'libraries/Partition.php';
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/config/page_settings.class.php';
require_once 'libraries/transformations.lib.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
require_once 'libraries/util.lib.php';
require_once 'libraries/controllers/TableController.class.php';
@ -37,7 +37,7 @@ require_once 'libraries/controllers/TableController.class.php';
class TableStructureController extends TableController
{
/**
* @var PMA_Table The table object
* @var Table The table object
*/
protected $_table_obj;
/**
@ -422,7 +422,7 @@ class TableStructureController extends TableController
$data['Expression'] = $expressions[$column];
}
$changes[] = 'CHANGE ' . PMA_Table::generateAlter(
$changes[] = 'CHANGE ' . Table::generateAlter(
$column,
$column,
/*overload*/mb_strtoupper($extracted_columnspec['type']),
@ -626,7 +626,7 @@ class TableStructureController extends TableController
continue;
}
$changes[] = 'CHANGE ' . PMA_Table::generateAlter(
$changes[] = 'CHANGE ' . Table::generateAlter(
Util_lib\get($_REQUEST, "field_orig.${i}", ''),
$_REQUEST['field_name'][$i],
$_REQUEST['field_type'][$i],
@ -645,7 +645,7 @@ class TableStructureController extends TableController
// find the remembered sort expression
$sorted_col = $this->table_obj->getUiProp(
PMA_Table::PROP_SORTED_COLUMN
Table::PROP_SORTED_COLUMN
);
// if the old column name is part of the remembered sort expression
if (/*overload*/mb_strpos(
@ -653,7 +653,7 @@ class TableStructureController extends TableController
Util::backquote($_REQUEST['field_orig'][$i])
) !== false) {
// delete the whole remembered sort expression
$this->table_obj->removeUiProp(PMA_Table::PROP_SORTED_COLUMN);
$this->table_obj->removeUiProp(Table::PROP_SORTED_COLUMN);
}
if (isset($_REQUEST['field_adjust_privileges'][$i])
@ -754,7 +754,7 @@ class TableStructureController extends TableController
// Change back to Orignal Collation and data type
for ($i = 0; $i < $field_cnt; $i++) {
if ($changedToBlob[$i]) {
$changes_revert[] = 'CHANGE ' . PMA_Table::generateAlter(
$changes_revert[] = 'CHANGE ' . Table::generateAlter(
Util_lib\get($_REQUEST, "field_orig.${i}", ''),
$_REQUEST['field_name'][$i],
$_REQUEST['field_type_orig'][$i],

8
libraries/core.lib.php
View File

@ -8,7 +8,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PMA\libraries\PMA_String;
use PMA\libraries\String;
if (! defined('PHPMYADMIN')) {
exit;
@ -18,8 +18,8 @@ if (! defined('PHPMYADMIN')) {
* String handling (security)
*/
require_once 'libraries/string.lib.php';
require_once 'libraries/String.class.php';
$PMA_String = new PMA_String();
require_once 'libraries/String.php';
$PMA_String = new String();
/**
* checks given $var and returns it if valid, or $default of not valid
@ -593,7 +593,7 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false)
include_once './libraries/js_escape.lib.php';
PMA\libraries\Response::getInstance()->disable();
include_once './libraries/Template.class.php';
include_once './libraries/Template.php';
echo PMA\libraries\Template::get('header_location')
->render(array('uri' => $uri));

4
libraries/create_addfield.lib.php
View File

@ -6,7 +6,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
if (! defined('PHPMYADMIN')) {
exit;
@ -56,7 +56,7 @@ function PMA_buildColumnCreationStatement(
}
$definition = PMA_getStatementPrefix($is_create_tbl) .
PMA_Table::generateFieldSpec(
Table::generateFieldSpec(
trim($_REQUEST['field_name'][$i]),
$_REQUEST['field_type'][$i],
$_REQUEST['field_length'][$i],

4
libraries/db_common.inc.php
View File

@ -7,7 +7,7 @@
*/
use PMA\libraries\Message;
use PMA\libraries\Response;
use PMA\libraries\PMA_String;
use PMA\libraries\String;
if (! defined('PHPMYADMIN')) {
exit;
@ -40,7 +40,7 @@ $err_url = PMA\libraries\Util::getScriptNameForOption(
)
. PMA_URL_getCommon(array('db' => $db));
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
/**

2
libraries/db_designer.lib.php
View File

@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) {
}
require_once 'libraries/relation.lib.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
/**
* Function to get html to display a page selector

4
libraries/db_table_exists.lib.php
View File

@ -7,13 +7,13 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PMA\libraries\PMA_String;
use PMA\libraries\String;
if (! defined('PHPMYADMIN')) {
exit;
}
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
if (empty($is_db)) {
if (/*overload*/mb_strlen($db)) {

2
libraries/display_create_table.lib.php
View File

@ -32,7 +32,7 @@ if (! defined('PHPMYADMIN')) {
*
*/
require_once './libraries/check_user_privileges.lib.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
/**
* Returns the html for create table.

6
libraries/display_export.lib.php
View File

@ -9,7 +9,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
if (! defined('PHPMYADMIN')) {
exit;
@ -441,7 +441,7 @@ function PMA_getHtmlForExportOptionsRows($db, $table, $unlim_num_rows)
} elseif (!empty($unlim_num_rows)) {
$html .= $unlim_num_rows;
} else {
$_table = new PMA_Table($table, $db);
$_table = new Table($table, $db);
$html .= $_table->countRecords();
}
$html .= '" onfocus="this.select()" />';
@ -872,7 +872,7 @@ function PMA_getHtmlForExportOptions(
$html .= PMA_getHtmlForExportOptionsSelection($export_type, $multi_values);
$tableLength = /*overload*/mb_strlen($table);
$_table = new PMA_Table($table, $db);
$_table = new Table($table, $db);
if ($tableLength && empty($num_tables) && ! $_table->isMerge()) {
$html .= PMA_getHtmlForExportOptionsRows($db, $table, $unlim_num_rows);
}

4
libraries/engines/bdb.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Engines
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Engines
*/
class PMA_StorageEngine_Bdb extends PMA_StorageEngine
class PMA_StorageEngine_Bdb extends StorageEngine
{
/**
* Returns array with variable names related to this storage engine

4
libraries/engines/binlog.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Engines
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Engines
*/
class PMA_StorageEngine_Binlog extends PMA_StorageEngine
class PMA_StorageEngine_Binlog extends StorageEngine
{
/**
* Returns string with filename for the MySQL helppage

4
libraries/engines/innodb.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Engines
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Engines
*/
class PMA_StorageEngine_Innodb extends PMA_StorageEngine
class PMA_StorageEngine_Innodb extends StorageEngine
{
/**
* Returns array with variable names related to InnoDB storage engine

4
libraries/engines/memory.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Engines
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Engines
*/
class PMA_StorageEngine_Memory extends PMA_StorageEngine
class PMA_StorageEngine_Memory extends StorageEngine
{
/**
* Returns array with variable names dedicated to MEMORY storage engine

4
libraries/engines/merge.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Engines
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Engines
*/
class PMA_StorageEngine_Merge extends PMA_StorageEngine
class PMA_StorageEngine_Merge extends StorageEngine
{
}

4
libraries/engines/myisam.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Engines
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Engines
*/
class PMA_StorageEngine_Myisam extends PMA_StorageEngine
class PMA_StorageEngine_Myisam extends StorageEngine
{
/**
* Returns array with variable names dedicated to MyISAM storage engine

4
libraries/engines/ndbcluster.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Engines
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Engines
*/
class PMA_StorageEngine_Ndbcluster extends PMA_StorageEngine
class PMA_StorageEngine_Ndbcluster extends StorageEngine
{
/**
* Returns array with variable names related to NDBCLUSTER storage engine

4
libraries/engines/pbxt.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Engines
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Engines
*/
class PMA_StorageEngine_Pbxt extends PMA_StorageEngine
class PMA_StorageEngine_Pbxt extends StorageEngine
{
/**
* Returns array with variable names dedicated to PBXT storage engine

4
libraries/engines/performance_schema.lib.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Engines
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Engines
*/
class PMA_StorageEngine_PerformanceSchema extends PMA_StorageEngine
class PMA_StorageEngine_PerformanceSchema extends StorageEngine
{
/**
* Returns string with filename for the MySQL helppage

2
libraries/error_report.lib.php
View File

@ -354,7 +354,7 @@ function PMA_getErrorReportForm()
$datas['hidden_fields'] = PMA_getHiddenFields($reportData);
}
include_once './libraries/Template.class.php';
include_once './libraries/Template.php';
return PMA\libraries\Template::get('error/report_form')
->render($datas);
}

6
libraries/export.lib.php
View File

@ -8,7 +8,7 @@
*/
use PMA\libraries\Message;
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
if (! defined('PHPMYADMIN')) {
exit;
@ -627,7 +627,7 @@ function PMA_exportDatabase(
$views = array();
foreach ($tables as $table) {
$_table = new PMA_Table($table, $db);
$_table = new Table($table, $db);
// if this is a view, collect it for later;
// views must be exported after the tables
$is_view = $_table->isView();
@ -822,7 +822,7 @@ function PMA_exportTable(
$add_query = '';
}
$_table = new PMA_Table($table, $db);
$_table = new Table($table, $db);
$is_view = $_table->isView();
if ($whatStrucOrData == 'structure'
|| $whatStrucOrData == 'structure_and_data'

4
libraries/import.lib.php
View File

@ -6,7 +6,7 @@
* @package PhpMyAdmin-Import
*/
use PMA\libraries\Message;
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
if (! defined('PHPMYADMIN')) {
exit;
@ -1297,7 +1297,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
unset($params);
$_table = new PMA_Table($tables[$i][TBL_NAME], $db_name);
$_table = new Table($tables[$i][TBL_NAME], $db_name);
if (! $_table->isView()) {
$message .= sprintf(
'<li><a href="%s" title="%s">%s</a> (<a href="%s" title="%s">' . __(

4
libraries/mult_submits.inc.php
View File

@ -7,7 +7,7 @@
*/
use PMA\libraries\Message;
use PMA\libraries\Response;
use PMA\libraries\PMA_String;
use PMA\libraries\String;
if (! defined('PHPMYADMIN')) {
exit;
@ -143,7 +143,7 @@ $views = $GLOBALS['dbi']->getVirtualTables($db);
if (!empty($submit_mult) && !empty($what)) {
unset($message);
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
if (/*overload*/mb_strlen($table)) {
include './libraries/tbl_common.inc.php';

2
libraries/navigation/NavigationHeader.class.php
View File

@ -9,7 +9,7 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
use PMA\libraries\Template;
/**

2
libraries/normalization.lib.php
View File

@ -14,7 +14,7 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
/**
* build the html for columns of $colTypeCategory category

18
libraries/operations.lib.php
View File

@ -10,8 +10,8 @@
use PMA\libraries\Message;
use PMA\libraries\Partition;
use PMA\libraries\Response;
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\PMA_Table;
use PMA\libraries\StorageEngine;
use PMA\libraries\Table;
if (! defined('PHPMYADMIN')) {
exit;
@ -400,7 +400,7 @@ function PMA_createDbBeforeCopy()
$GLOBALS['dbi']->query($sql_set_mode);
}
// rebuild the database list because PMA_Table::moveCopy
// rebuild the database list because Table::moveCopy
// checks in this list if the target db exists
$GLOBALS['pma']->databases->build();
}
@ -488,7 +488,7 @@ function PMA_copyTables($tables_full, $move, $db)
// for importing via the mysql client or our Import feature)
$triggers = $GLOBALS['dbi']->getTriggers($db, $each_table, '');
if (! PMA_Table::moveCopy(
if (! Table::moveCopy(
$db, $each_table, $_REQUEST['newname'], $each_table,
(isset($this_what) ? $this_what : 'data'),
$move, 'db_copy'
@ -566,7 +566,7 @@ function PMA_handleTheViews($views, $move, $db)
$_REQUEST['drop_if_exists'] = 'true';
foreach ($views as $view) {
$copying_succeeded = PMA_Table::moveCopy(
$copying_succeeded = Table::moveCopy(
$db, $view, $_REQUEST['newname'], $view, 'structure', $move, 'db_copy'
);
if (! $copying_succeeded) {
@ -772,7 +772,7 @@ function PMA_duplicateBookmarks($_error, $db)
$get_fields = array('user', 'label', 'query');
$where_fields = array('dbase' => $db);
$new_fields = array('dbase' => $_REQUEST['newname']);
PMA_Table::duplicateInfo(
Table::duplicateInfo(
'bookmarkwork', 'bookmark', $get_fields,
$where_fields, $new_fields
);
@ -1078,7 +1078,7 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation,
. '&nbsp;' . PMA\libraries\Util::showMySQLDocu('Storage_engines')
. '</td>'
. '<td>'
. PMA_StorageEngine::getHtmlSelect(
. StorageEngine::getHtmlSelect(
'new_tbl_storage_engine', null, $tbl_storage_engine
)
. '</td>'
@ -1232,7 +1232,7 @@ function PMA_getPossibleRowFormat()
);
/** @var PMA_StorageEngine_Innodb $innodbEnginePlugin */
$innodbEnginePlugin = PMA_StorageEngine::getEngine('innodb');
$innodbEnginePlugin = StorageEngine::getEngine('innodb');
$innodbPluginVersion = $innodbEnginePlugin->getInnodbPluginVersion();
if (!empty($innodbPluginVersion)) {
$innodb_file_format = $innodbEnginePlugin->getInnodbFileFormat();
@ -2117,7 +2117,7 @@ function PMA_moveOrCopyTable($db, $table)
$message = Message::error(__('Can\'t copy table to same one!'));
}
} else {
PMA_Table::moveCopy(
Table::moveCopy(
$db, $table, $_REQUEST['target_db'], $_REQUEST['new_name'],
$_REQUEST['what'], isset($_REQUEST['submit_move']), 'one_table'
);

4
libraries/pmd_common.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Designer
*/
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
/**
* Block attempts to directly run this script
@ -500,7 +500,7 @@ function PMA_saveDisplayField($db, $table, $field)
$field = '';
}
$upd_query = new PMA_Table($table, $db, $GLOBALS['dbi']);
$upd_query = new Table($table, $db, $GLOBALS['dbi']);
$upd_query->updateDisplayField($disp, $field, $cfgRelation);
return true;

6
libraries/relation.lib.php
View File

@ -6,7 +6,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
use PMA\libraries\RecentFavoriteTable;
use SqlParser\Statements\CreateStatement;
@ -370,7 +370,7 @@ function PMA_getRelationsParamDiagnostic($cfgRelation)
'Re-login to phpMyAdmin to load the updated configuration file.'
);
include_once './libraries/Template.class.php';
include_once './libraries/Template.php';
$retval .= PMA\libraries\Template::get('list/unordered')->render(
array('items' => $items,)
);
@ -739,7 +739,7 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
if (($source == 'both' || $source == 'foreign') && /*overload*/mb_strlen($table)
) {
$tableObj = new PMA_Table($table, $db);
$tableObj = new Table($table, $db);
$show_create_table = $tableObj->showCreate();
if ($show_create_table) {
$parser = new SqlParser\Parser($show_create_table);

2
libraries/rte/rte_routines.lib.php
View File

@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
/**
* Sets required globals

2
libraries/server_databases.lib.php
View File

@ -374,7 +374,7 @@ function PMA_getHtmlForNoticeEnableStatistics($url_query, $html)
),
);
include_once './libraries/Template.class.php';
include_once './libraries/Template.php';
$html .= PMA\libraries\Template::get('list/unordered')->render(
array('items' => $items,)
);

8
libraries/server_engines.lib.php
View File

@ -8,7 +8,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_StorageEngine;
use PMA\libraries\StorageEngine;
if (! defined('PHPMYADMIN')) {
exit;
@ -26,7 +26,7 @@ function PMA_getHtmlForServerEngines()
*/
$html = '';
if (empty($_REQUEST['engine'])
|| ! PMA_StorageEngine::isValid($_REQUEST['engine'])
|| ! StorageEngine::isValid($_REQUEST['engine'])
) {
$html .= PMA_getHtmlForAllServerEngines();
} else {
@ -58,7 +58,7 @@ function PMA_getHtmlForAllServerEngines()
* Listing the storage engines
*/
$odd_row = true;
foreach (PMA_StorageEngine::getStorageEngines() as $engine => $details) {
foreach (StorageEngine::getStorageEngines() as $engine => $details) {
$html .= '<tr class="'
. ($odd_row ? 'odd' : 'even')
. ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED'
@ -91,7 +91,7 @@ function PMA_getHtmlForSpecifiedServerEngines()
* Displays details about a given Storage Engine
*/
$html = '';
$engine_plugin = PMA_StorageEngine::getEngine($_REQUEST['engine']);
$engine_plugin = StorageEngine::getEngine($_REQUEST['engine']);
$html .= '<h2>' . "\n"
. PMA\libraries\Util::getImage('b_engine.png')
. ' ' . htmlspecialchars($engine_plugin->getTitle()) . "\n"

10
libraries/server_status.lib.php
View File

@ -8,7 +8,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\ServerStatusData;
if (! defined('PHPMYADMIN')) {
exit;
@ -17,7 +17,7 @@ if (! defined('PHPMYADMIN')) {
/**
* Prints server status information: processes, connections and traffic
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -45,7 +45,7 @@ function PMA_getHtmlForServerStatus($ServerStatusData)
/**
* Prints server state General information
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -131,7 +131,7 @@ function PMA_getHtmlForReplicationInfo()
/**
* Prints server state traffic information
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -224,7 +224,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
/**
* Prints server state connections information
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/

8
libraries/server_status_monitor.lib.php
View File

@ -8,7 +8,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\ServerStatusData;
if (! defined('PHPMYADMIN')) {
exit;
@ -17,7 +17,7 @@ if (! defined('PHPMYADMIN')) {
/**
* Prints html with monitor
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -288,7 +288,7 @@ function PMA_getHtmlForSettingsDialog()
$retval .= '<div class="clearfloat paddingtop"></div>';
$retval .= '<div class="floatleft">';
$retval .= __('Refresh rate') . '<br />';
$retval .= PMA_ServerStatusData::getHtmlForRefreshList(
$retval .= ServerStatusData::getHtmlForRefreshList(
'gridChartRefresh',
5,
Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)
@ -337,7 +337,7 @@ function PMA_getHtmlForSettingsDialog()
/**
* Define some data and links needed on the client side
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/

4
libraries/server_status_processes.lib.php
View File

@ -9,7 +9,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\ServerStatusData;
if (! defined('PHPMYADMIN')) {
exit;
@ -30,7 +30,7 @@ function PMA_getHtmlForProcessListAutoRefresh()
)->getDisplay();
$retval = $notice . '<div class="tabLinks">';
$retval .= '<label>' . __('Refresh rate') . ': ';
$retval .= PMA_ServerStatusData::getHtmlForRefreshList(
$retval .= ServerStatusData::getHtmlForRefreshList(
'refreshRate',
5,
Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)

6
libraries/server_status_queries.lib.php
View File

@ -8,7 +8,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\ServerStatusData;
if (! defined('PHPMYADMIN')) {
exit;
@ -17,7 +17,7 @@ if (! defined('PHPMYADMIN')) {
/**
* Returns the html content for the query statistics
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -70,7 +70,7 @@ function PMA_getHtmlForQueryStatistics($ServerStatusData)
/**
* Returns the html content for the query details
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/

10
libraries/server_status_variables.lib.php
View File

@ -8,7 +8,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\ServerStatusData;
if (! defined('PHPMYADMIN')) {
exit;
@ -17,7 +17,7 @@ if (! defined('PHPMYADMIN')) {
/**
* Returns the html for the list filter
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -89,7 +89,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
/**
* Prints the suggestion links
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -124,7 +124,7 @@ function PMA_getHtmlForLinkSuggestions($ServerStatusData)
/**
* Returns a table with variables information
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -204,7 +204,7 @@ function PMA_getHtmlForVariablesList($ServerStatusData)
/**
* Returns HTML for render variables list
*
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param ServerStatusData $ServerStatusData Server status data
* @param Array $alerts Alert Array
* @param Array $strShowStatus Status Array
*

20
libraries/sql.lib.php
View File

@ -6,7 +6,7 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
use PMA\libraries\Response;
if (!defined('PHPMYADMIN')) {
@ -44,12 +44,12 @@ function PMA_parseAndAnalyze($sql_query, $db = null)
function PMA_handleSortOrder(
$db, $table, &$analyzed_sql_results, &$full_sql_query
) {
$pmatable = new PMA_Table($table, $db);
$pmatable = new Table($table, $db);
if (empty($analyzed_sql_results['order'])) {
// Retrieving the name of the column we should sort after.
$sortCol = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN);
$sortCol = $pmatable->getUiProp(Table::PROP_SORTED_COLUMN);
if (empty($sortCol)) {
return;
}
@ -69,7 +69,7 @@ function PMA_handleSortOrder(
} else {
// Store the remembered table into session.
$pmatable->setUiProp(
PMA_Table::PROP_SORTED_COLUMN,
Table::PROP_SORTED_COLUMN,
SqlParser\Utils\Query::getClause(
$analyzed_sql_results['statement'],
$analyzed_sql_results['parser']->list,
@ -657,7 +657,7 @@ function PMA_hasNoRightsToDropDatabase($analyzed_sql_results,
/**
* Function to set a column property
*
* @param PMA_Table $pmatable PMA_Table instance
* @param Table $pmatable Table instance
* @param string $request_index col_order|col_visib
*
* @return boolean $retval
@ -667,10 +667,10 @@ function PMA_setColumnProperty($pmatable, $request_index)
$property_value = explode(',', $_REQUEST[$request_index]);
switch($request_index) {
case 'col_order':
$property_to_set = PMA_Table::PROP_COLUMN_ORDER;
$property_to_set = Table::PROP_COLUMN_ORDER;
break;
case 'col_visib':
$property_to_set = PMA_Table::PROP_COLUMN_VISIB;
$property_to_set = Table::PROP_COLUMN_VISIB;
break;
default:
$property_to_set = '';
@ -700,7 +700,7 @@ function PMA_setColumnProperty($pmatable, $request_index)
*/
function PMA_setColumnOrderOrVisibility($table, $db)
{
$pmatable = new PMA_Table($table, $db);
$pmatable = new Table($table, $db);
$retval = false;
// set column order
@ -1761,7 +1761,7 @@ function PMA_getQueryResponseForResultsReturned($result, $analyzed_sql_results,
if ($statement instanceof SqlParser\Statements\SelectStatement) {
if (!empty($statement->expr)) {
if ($statement->expr[0]->expr === '*') {
$_table = new PMA_Table($table, $db);
$_table = new Table($table, $db);
$updatableView = $_table->isUpdatableView();
}
}
@ -2109,7 +2109,7 @@ function PMA_calculatePosForLastPage($db, $table, $pos)
$pos = $_SESSION['tmpval']['pos'];
}
$_table = new PMA_Table($table, $db);
$_table = new Table($table, $db);
$unlim_num_rows = $_table->countRecords(true);
//If position is higher than number of rows
if ($unlim_num_rows <= $pos && 0 != $pos) {

12
libraries/tbl_columns_definition_form.inc.php
View File

@ -6,8 +6,8 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\PMA_Table;
use PMA\libraries\String;
use PMA\libraries\Table;
use PMA\Util;
if (!defined('PHPMYADMIN')) {
@ -18,7 +18,7 @@ if (!defined('PHPMYADMIN')) {
* Check parameters
*/
require_once 'libraries/di/Container.class.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Template.php';
require_once 'libraries/util.lib.php';
PMA\libraries\Util::checkParameters(array('server', 'db', 'table', 'action', 'num_fields'));
@ -42,14 +42,14 @@ if (!isset($columnMeta)) {
// Get available character sets and storage engines
require_once './libraries/mysql_charsets.inc.php';
require_once './libraries/StorageEngine.class.php';
require_once './libraries/StorageEngine.php';
/**
* Class for partition management
*/
require_once './libraries/Partition.php';
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
$length_values_input_size = 8;
@ -240,7 +240,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
'VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'
);
if (in_array($columnMeta['Extra'], $virtual)) {
$tableObj = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
$tableObj = new Table($GLOBALS['table'], $GLOBALS['db']);
$expressions = $tableObj->getColumnGenerationExpression(
$columnMeta['Field']
);

8
libraries/tbl_info.inc.php
View File

@ -8,7 +8,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
if (! defined('PHPMYADMIN')) {
exit;
@ -34,13 +34,13 @@ $GLOBALS['dbi']->selectDb($GLOBALS['db']);
/**
* Holds information about the current table
*
* @todo replace this by PMA_Table
* @todo replace this by Table
* @global array $GLOBALS['showtable']
* @name $showtable
*/
$GLOBALS['showtable'] = array();
// PMA_Table::getStatusInfo() does caching by default, but here
// Table::getStatusInfo() does caching by default, but here
// we force reading of the current table status
// if $reread_info is true (for example, coming from tbl_operations.php
// and we just changed the table's storage engine)
@ -57,7 +57,7 @@ $GLOBALS['showtable'] = $GLOBALS['dbi']->getTable(
// and we don't want to mess up the $tbl_storage_engine coming from the form
if ($showtable) {
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
if ($GLOBALS['dbi']->getTable($GLOBALS['db'], $GLOBALS['table'])->isView()) {

2
libraries/user_preferences.inc.php
View File

@ -25,7 +25,7 @@ $tabs_icons = array(
'Import' => 'b_import.png',
'Export' => 'b_export.png');
require_once './libraries/Template.class.php';
require_once './libraries/Template.php';
$content = PMA\libraries\Util::getHtmlTab(
array(
'link' => 'prefs_manage.php',

2
libraries/user_preferences.lib.php
View File

@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once './libraries/Template.class.php';
require_once './libraries/Template.php';
/**
* Common initialization for user preferences modification pages

4
prefs_manage.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
/**
* Gets some core libraries and displays a top message if required
@ -175,7 +175,7 @@ if (isset($_POST['submit_export'])
$query = explode('&', parse_url($return_url, PHP_URL_QUERY));
$return_url = parse_url($return_url, PHP_URL_PATH);
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
foreach ($query as $q) {

2
schema_export.php
View File

@ -10,7 +10,7 @@
* Gets some core libraries
*/
require_once 'libraries/common.inc.php';
require 'libraries/StorageEngine.class.php';
require 'libraries/StorageEngine.php';
/**
* get all variables needed for exporting relational schema

2
scripts/advisor2po
View File

@ -55,7 +55,7 @@ if (!file_exists('./libraries/Advisor.class.php')) {
}
include './libraries/String.class.php';
$GLOBALS['PMA_String'] = new PMA_String();
$GLOBALS['PMA_String'] = new String();
include './libraries/Advisor.class.php';

4
scripts/decode_bug.php
View File

@ -10,7 +10,7 @@
*
* @package PhpMyAdmin-debug
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
/**
* Displays the form
@ -83,7 +83,7 @@ if (!empty($bug_encoded) && is_string($bug_encoded)) {
$bug_encoded = stripslashes($bug_encoded);
}
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
$bug_encoded = preg_replace('/[[:space:]]/', '', $bug_encoded);

2
server_engines.php
View File

@ -15,7 +15,7 @@ require_once 'libraries/common.inc.php';
* Does the common work
*/
require 'libraries/server_common.inc.php';
require 'libraries/StorageEngine.class.php';
require 'libraries/StorageEngine.php';
require 'libraries/server_engines.lib.php';
/**

9
server_status.php
View File

@ -6,11 +6,12 @@
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\Message;
use PMA\libraries\ServerStatusData;
require_once 'libraries/common.inc.php';
require_once 'libraries/server_common.inc.php';
require_once 'libraries/ServerStatusData.class.php';
require_once 'libraries/ServerStatusData.php';
require_once 'libraries/server_status.lib.php';
/**
@ -31,13 +32,13 @@ if (PMA_DRIZZLE) {
$response = PMA\libraries\Response::getInstance();
$response->addHTML('<div>');
$serverStatusData = new PMA_ServerStatusData();
$serverStatusData = new ServerStatusData();
$response->addHTML($serverStatusData->getMenuHtml());
if ($serverStatusData->dataLoaded) {
$response->addHTML(PMA_getHtmlForServerStatus($serverStatusData));
} else {
$response->addHTML(
PMA_Message::error(
Message::error(
__('Not enough privilege to view server status.')
)->getDisplay()
);

9
server_status_advisor.php
View File

@ -6,10 +6,11 @@
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\Message;
use PMA\libraries\ServerStatusData;
require_once 'libraries/common.inc.php';
require_once 'libraries/ServerStatusData.class.php';
require_once 'libraries/ServerStatusData.php';
require_once 'libraries/server_status_advisor.lib.php';
if (PMA_DRIZZLE) {
@ -21,7 +22,7 @@ if (PMA_DRIZZLE) {
include_once 'libraries/replication_gui.lib.php';
}
$serverStatusData = new PMA_ServerStatusData();
$serverStatusData = new ServerStatusData();
$response = PMA\libraries\Response::getInstance();
$scripts = $response->getHeader()->getScripts();
@ -36,7 +37,7 @@ if ($serverStatusData->dataLoaded) {
$response->addHTML(PMA_getHtmlForAdvisor());
} else {
$response->addHTML(
PMA_Message::error(
Message::error(
__('Not enough privilege to view the advisor.')
)->getDisplay()
);

6
server_status_monitor.php
View File

@ -6,11 +6,11 @@
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\ServerStatusData;
require_once 'libraries/common.inc.php';
require_once 'libraries/server_common.inc.php';
require_once 'libraries/ServerStatusData.class.php';
require_once 'libraries/ServerStatusData.php';
require_once 'libraries/server_status_monitor.lib.php';
if (PMA_DRIZZLE) {
@ -100,7 +100,7 @@ $scripts->addFile('server_status_sorter.js');
/**
* start output
*/
$ServerStatusData = new PMA_ServerStatusData();
$ServerStatusData = new ServerStatusData();
/**
* Output

6
server_status_processes.php
View File

@ -6,11 +6,11 @@
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\ServerStatusData;
require_once 'libraries/common.inc.php';
require_once 'libraries/server_common.inc.php';
require_once 'libraries/ServerStatusData.class.php';
require_once 'libraries/ServerStatusData.php';
require_once 'libraries/server_status_processes.lib.php';
/**
@ -25,7 +25,7 @@ if (PMA_DRIZZLE) {
include_once 'libraries/replication_gui.lib.php';
}
$ServerStatusData = new PMA_ServerStatusData();
$ServerStatusData = new ServerStatusData();
$response = PMA\libraries\Response::getInstance();
/**

9
server_status_queries.php
View File

@ -7,11 +7,12 @@
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\Message;
use PMA\libraries\ServerStatusData;
require_once 'libraries/common.inc.php';
require_once 'libraries/server_common.inc.php';
require_once 'libraries/ServerStatusData.class.php';
require_once 'libraries/ServerStatusData.php';
require_once 'libraries/server_status_queries.lib.php';
if (PMA_DRIZZLE) {
@ -23,7 +24,7 @@ if (PMA_DRIZZLE) {
include_once 'libraries/replication_gui.lib.php';
}
$serverStatusData = new PMA_ServerStatusData();
$serverStatusData = new ServerStatusData();
$response = PMA\libraries\Response::getInstance();
$header = $response->getHeader();
@ -53,7 +54,7 @@ if ($serverStatusData->dataLoaded) {
$response->addHTML(PMA_getHtmlForQueryStatistics($serverStatusData));
} else {
$response->addHTML(
PMA_Message::error(
Message::error(
__('Not enough privilege to view query statistics.')
)->getDisplay()
);

9
server_status_variables.php
View File

@ -6,11 +6,12 @@
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_ServerStatusData;
use PMA\libraries\Message;
use PMA\libraries\ServerStatusData;
require_once 'libraries/common.inc.php';
require_once 'libraries/server_common.inc.php';
require_once 'libraries/ServerStatusData.class.php';
require_once 'libraries/ServerStatusData.php';
require_once 'libraries/server_status_variables.lib.php';
if (PMA_DRIZZLE) {
@ -38,7 +39,7 @@ if (isset($_REQUEST['flush'])) {
unset($_flush_commands);
}
$serverStatusData = new PMA_ServerStatusData();
$serverStatusData = new ServerStatusData();
$response = PMA\libraries\Response::getInstance();
$header = $response->getHeader();
@ -55,7 +56,7 @@ if ($serverStatusData->dataLoaded) {
$response->addHTML(PMA_getHtmlForVariablesList($serverStatusData));
} else {
$response->addHTML(
PMA_Message::error(
Message::error(
__('Not enough privilege to view status variables.')
)->getDisplay()
);

2
sql.php
View File

@ -12,7 +12,7 @@
* Gets some core libraries
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/Table.class.php';
require_once 'libraries/Table.php';
require_once 'libraries/Header.php';
require_once 'libraries/check_user_privileges.lib.php';
require_once 'libraries/bookmark.lib.php';

4
tbl_addfield.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
/**
* Get some core libraries
@ -69,7 +69,7 @@ if (isset($_REQUEST['do_save_data'])) {
&& is_array($_REQUEST['field_mimetype'])
&& $cfg['BrowseMIME']
) {
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
foreach ($_REQUEST['field_mimetype'] as $fieldindex => $mimetype) {
if (isset($_REQUEST['field_name'][$fieldindex])

2
tbl_chart.php
View File

@ -12,7 +12,7 @@ use PMA\libraries\Response;
require_once 'libraries/common.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/Response.class.php';
require_once 'libraries/Response.php';
require_once 'libraries/controllers/TableChartController.class.php';
$container = DI\Container::getDefaultContainer();

4
tbl_create.php
View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_String;
use PMA\libraries\String;
/**
* Get some core libraries
@ -16,7 +16,7 @@ require_once 'libraries/create_addfield.lib.php';
// Check parameters
PMA\libraries\Util::checkParameters(array('db'));
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
/* Check if database name is empty */

2
tbl_find_replace.php
View File

@ -15,7 +15,7 @@ require_once 'libraries/common.inc.php';
require_once 'libraries/tbl_common.inc.php';
require_once 'libraries/tbl_info.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/Response.class.php';
require_once 'libraries/Response.php';
require_once 'libraries/controllers/TableSearchController.class.php';
use PMA\DI;

2
tbl_gis_visualization.php
View File

@ -12,7 +12,7 @@ use PMA\libraries\Response;
use PMA\libraries\Util;
require_once 'libraries/di/Container.class.php';
require_once 'libraries/Response.class.php';
require_once 'libraries/Response.php';
require_once 'libraries/controllers/TableGisVisualizationController.class.php';
require_once 'libraries/Util.php';

2
tbl_indexes.php
View File

@ -14,7 +14,7 @@ use PMA\libraries\Response;
require_once 'libraries/common.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableIndexesController.class.php';
require_once 'libraries/Response.class.php';
require_once 'libraries/Response.php';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableIndexesController');

10
tbl_operations.php
View File

@ -6,8 +6,8 @@
* @package PhpMyAdmin
*/
use PMA\libraries\Partition;
use PMA\libraries\PMA_String;
use PMA\libraries\PMA_Table;
use PMA\libraries\String;
use PMA\libraries\Table;
/**
*
@ -20,7 +20,7 @@ require_once 'libraries/common.inc.php';
require_once 'libraries/check_user_privileges.lib.php';
require_once 'libraries/operations.lib.php';
$pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
$pma_table = new Table($GLOBALS['table'], $GLOBALS['db']);
/**
* Load JavaScript files
@ -47,7 +47,7 @@ $cfgRelation = PMA_getRelationsParam();
* Gets available MySQL charsets and storage engines
*/
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/StorageEngine.class.php';
require_once 'libraries/StorageEngine.php';
/**
* Class for partition management
@ -86,7 +86,7 @@ if ($is_aria) {
$reread_info = false;
$table_alters = array();
/** @var PMA_String $pmaString */
/** @var String $pmaString */
$pmaString = $GLOBALS['PMA_String'];
/**

8
tbl_relation.php
View File

@ -20,14 +20,14 @@
namespace PMA;
use PMA\libraries\Response;
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
use PMA\libraries\Util;
require_once 'libraries/common.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableRelationController.class.php';
require_once 'libraries/Response.class.php';
require_once 'libraries/Table.class.php';
require_once 'libraries/Response.php';
require_once 'libraries/Table.php';
require_once 'libraries/Util.php';
$container = DI\Container::getDefaultContainer();
@ -53,7 +53,7 @@ $tbl_storage_engine = /*overload*/
mb_strtoupper(
$GLOBALS['dbi']->getTable($db, $table)->getStatusInfo('Engine')
);
$upd_query = new PMA_Table($table, $db, $dbi);
$upd_query = new Table($table, $db, $dbi);
$dependency_definitions = array(
"options_array" => $options_array,

4
tbl_replace.php
View File

@ -11,7 +11,7 @@
*
* @package PhpMyAdmin
*/
use PMA\libraries\PMA_Table;
use PMA\libraries\Table;
/**
* Gets some core libraries
@ -422,7 +422,7 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
);
/**Get the total row count of the table*/
$_table = new PMA_Table($_REQUEST['table'], $_REQUEST['db']);
$_table = new Table($_REQUEST['table'], $_REQUEST['db']);
$extra_data['row_count'] = $_table->countRecords();
$extra_data['sql_query']

2
tbl_select.php
View File

@ -16,7 +16,7 @@ require_once 'libraries/common.inc.php';
require_once 'libraries/tbl_common.inc.php';
require_once 'libraries/tbl_info.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/Response.class.php';
require_once 'libraries/Response.php';
require_once 'libraries/controllers/TableSearchController.class.php';
use PMA\Controllers\Table\TableSearchController;

2
tbl_structure.php
View File

@ -18,7 +18,7 @@ require_once 'libraries/config/page_settings.class.php';
require_once 'libraries/bookmark.lib.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableStructureController.class.php';
require_once 'libraries/Response.class.php';
require_once 'libraries/Response.php';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\TableStructureController');

Some files were not shown because too many files have changed in this diff Show More