diff options
89 files changed, 66 insertions, 363 deletions
diff --git a/db_operations.php b/db_operations.php index cfd4d5b14a..c2223b4ee8 100644 --- a/db_operations.php +++ b/db_operations.php @@ -28,7 +28,6 @@ $response = PMA_Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('db_operations.js'); -$common_functions = PMA_CommonFunctions::getInstance(); /** * Rename/move or copy database diff --git a/db_printview.php b/db_printview.php index c67a3bab3d..ded495c1a1 100644 --- a/db_printview.php +++ b/db_printview.php @@ -13,7 +13,6 @@ require_once 'libraries/common.inc.php'; $response = PMA_Response::getInstance(); $header = $response->getHeader(); $header->enablePrintView(); -$common_functions = PMA_CommonFunctions::getInstance(); $common_functions->checkParameters(array('db')); diff --git a/db_structure.php b/db_structure.php index 95af33d04b..3cfaabaafe 100644 --- a/db_structure.php +++ b/db_structure.php @@ -21,7 +21,6 @@ $scripts = $header->getScripts(); $scripts->addFile('db_structure.js'); $scripts->addFile('tbl_change.js'); $scripts->addFile('jquery/timepicker.js'); -$common_functions = PMA_CommonFunctions::getInstance(); $post_params = array( 'error', diff --git a/db_tables_search.php b/db_tables_search.php index 8e8d1af88a..d61442791c 100644 --- a/db_tables_search.php +++ b/db_tables_search.php @@ -11,7 +11,6 @@ require_once 'libraries/Util.class.php'; $db = $_GET['db']; $table_term = $_GET['table']; -$common_functions = PMA_CommonFunctions::getInstance(); $common_url_query = PMA_generate_common_url($GLOBALS['db']); $tables_full = $common_functions->getTableList($db); $tables_response = array(); diff --git a/db_tracking.php b/db_tracking.php index cdd86dc440..bab140f115 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -14,7 +14,6 @@ $response = PMA_Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('db_structure.js'); -$common_functions = PMA_CommonFunctions::getInstance(); /** * If we are not in an Ajax request, then do the common work and show the links etc. diff --git a/export.php b/export.php index 6aabeb2ac5..4d23427c4c 100644 --- a/export.php +++ b/export.php @@ -13,8 +13,6 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/zip.lib.php'; require_once 'libraries/plugin_interface.lib.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - /** * Sets globals from all $_POST (in export.php only) * Would it not be tiresome to list all export-plugin options here? diff --git a/import.php b/import.php index 585ebb4cc3..c426801c83 100644 --- a/import.php +++ b/import.php @@ -16,8 +16,6 @@ if (isset($_REQUEST['show_as_php'])) { $GLOBALS['show_as_php'] = $_REQUEST['show_as_php']; } -$common_functions = PMA_CommonFunctions::getInstance(); - /** * Sets globals from $_POST */ diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 078c7c5edd..19361d8b7b 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -525,7 +525,6 @@ class PMA_Index static public function getView($table, $schema, $print_mode = false) { - $common_functions = PMA_CommonFunctions::getInstance(); $indexes = PMA_Index::getFromTable($table, $schema); $no_indexes_class = count($indexes) > 0 ? ' hide' : ''; diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index a5befa098b..a6fc7dbfc4 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -445,8 +445,6 @@ class PMA_List_Database extends PMA_List protected function checkAgainstPrivTables() { - $common_functions = PMA_CommonFunctions::getInstance(); - // 1. get allowed dbs from the "mysql.db" table // User can be blank (anonymous user) $local_query = " diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 7cb09a5c64..cd699db751 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -202,8 +202,6 @@ class PMA_Table static public function isView($db = null, $table = null) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (empty($db) || empty($table)) { return false; } @@ -383,7 +381,6 @@ class PMA_Table $comment = '', &$field_primary = null, $move_to = '' ) { - $common_functions = PMA_CommonFunctions::getInstance(); $is_timestamp = strpos(strtoupper($type), 'TIMESTAMP') !== false; $query = $common_functions->backquote($name) . ' ' . $type; @@ -519,8 +516,6 @@ class PMA_Table $is_view = null ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (isset(PMA_Table::$cache[$db][$table]['ExactRows'])) { $row_count = PMA_Table::$cache[$db][$table]['ExactRows']; } else { @@ -649,7 +644,6 @@ class PMA_Table $where_fields, $new_fields ) { - $common_functions = PMA_CommonFunctions::getInstance(); $last_id = -1; if (isset($GLOBALS['cfgRelation']) && $GLOBALS['cfgRelation'][$work]) { @@ -732,8 +726,6 @@ class PMA_Table ) { global $err_url; - $common_functions = PMA_CommonFunctions::getInstance(); - /* Try moving table directly */ if ($move && $what == 'data') { $tbl = new PMA_Table($source_table, $source_db); diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php index 3f9e17d4e9..8f36f53500 100644 --- a/libraries/TableSearch.class.php +++ b/libraries/TableSearch.class.php @@ -445,7 +445,7 @@ EOT; */ private function _getEnumWhereClause($criteriaValues, $func_type) { - $common_functions = PMA_CommonFunctions::getInstance(); + if (! is_array($criteriaValues)) { $criteriaValues = explode(',', $criteriaValues); } @@ -545,8 +545,6 @@ EOT; $func_type, $unaryFlag, $geom_func = null ) { - $common_functions = PMA_CommonFunctions::getInstance(); - // If geometry function is set if ($geom_func != null && trim($geom_func) != '') { return $this->_getGeomWhereClause( diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 052804f10e..fd4c19cd34 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -94,8 +94,6 @@ class PMA_Tracker static protected function init() { - $common_functions = PMA_CommonFunctions::getInstance(); - self::$pma_table = $common_functions->backquote($GLOBALS['cfg']['Server']['pmadb']) .".". $common_functions->backquote($GLOBALS['cfg']['Server']['tracking']); @@ -199,8 +197,6 @@ class PMA_Tracker static public function isTracked($dbname, $tablename) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (! self::$enabled) { return false; } @@ -260,8 +256,6 @@ class PMA_Tracker ) { global $sql_backquotes, $export_type; - $common_functions = PMA_CommonFunctions::getInstance(); - if ($tracking_set == '') { $tracking_set = self::$default_tracking_set; } @@ -364,7 +358,7 @@ class PMA_Tracker */ static public function deleteTracking($dbname, $tablename) { - $common_functions = PMA_CommonFunctions::getInstance(); + $sql_query = "/*NOTRACK*/\n" . "DELETE FROM " . self::$pma_table . " WHERE `db_name` = '" @@ -393,7 +387,6 @@ class PMA_Tracker $tracking_set = 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE' ) { - $common_functions = PMA_CommonFunctions::getInstance(); $date = date('Y-m-d H:i:s'); if ($tracking_set == '') { @@ -486,8 +479,6 @@ class PMA_Tracker $version, $type, $new_data ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if ($type == 'DDL') { $save_to = 'schema_sql'; } elseif ($type == 'DML') { @@ -567,8 +558,6 @@ class PMA_Tracker static public function getVersion($dbname, $tablename, $statement = null) { - $common_functions = PMA_CommonFunctions::getInstance(); - $sql_query = " SELECT MAX(version) FROM " . self::$pma_table . " WHERE `db_name` = '" . $common_functions->sqlAddSlashes($dbname) . "' " . " AND `table_name` = '" . $common_functions->sqlAddSlashes($tablename) . "' "; @@ -599,8 +588,6 @@ class PMA_Tracker static public function getTrackedData($dbname, $tablename, $version) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (! isset(self::$pma_table)) { self::init(); } @@ -945,8 +932,6 @@ class PMA_Tracker static public function handleQuery($query) { - $common_functions = PMA_CommonFunctions::getInstance(); - // If query is marked as untouchable, leave if (strstr($query, "/*NOTRACK*/")) { return; diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index de5d6e0015..9d69d3a256 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -54,7 +54,6 @@ function PMA_Bookmark_getList($db) { global $controllink; - $common_functions = PMA_CommonFunctions::getInstance(); $cfgBookmark = PMA_Bookmark_getParams(); if (empty($cfgBookmark)) { @@ -113,7 +112,6 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = fal ) { global $controllink; - $common_functions = PMA_CommonFunctions::getInstance(); $cfgBookmark = PMA_Bookmark_getParams(); if (empty($cfgBookmark)) { @@ -154,7 +152,6 @@ function PMA_Bookmark_save($fields, $all_users = false) { global $controllink; - $common_functions = PMA_CommonFunctions::getInstance(); $cfgBookmark = PMA_Bookmark_getParams(); if (empty($cfgBookmark)) { @@ -188,7 +185,6 @@ function PMA_Bookmark_delete($db, $id) { global $controllink; - $common_functions = PMA_CommonFunctions::getInstance(); $cfgBookmark = PMA_Bookmark_getParams(); if (empty($cfgBookmark)) { diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php index 39a90860a5..df685b0936 100644 --- a/libraries/build_html_for_db.lib.php +++ b/libraries/build_html_for_db.lib.php @@ -76,7 +76,6 @@ function PMA_buildHtmlForDb( $column_order, $replication_types, $replication_info ) { - $common_functions = PMA_CommonFunctions::getInstance(); $out = ''; if ($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) { $out .= '<td class="tool">'; diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index e7a7e37fdb..74137e5a16 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -35,8 +35,6 @@ $GLOBALS['is_superuser'] = PMA_isSuperuser(); function PMA_analyseShowGrant() { - $common_functions = PMA_CommonFunctions::getInstance(); - if ($common_functions->cacheExists('is_create_db_priv', true)) { $GLOBALS['is_create_db_priv'] = $common_functions->cacheGet('is_create_db_priv', true); $GLOBALS['is_process_priv'] = $common_functions->cacheGet('is_process_priv', true); diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 5096f883c2..2a745709c3 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -387,8 +387,6 @@ function PMA_DBI_get_tables_full($database, $table = false, $limit_count = false, $sort_by = 'Name', $sort_order = 'ASC' ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (true === $limit_count) { $limit_count = $GLOBALS['cfg']['MaxTableList']; } @@ -791,7 +789,6 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, $limit_offset = 0, $limit_count = false ) { - $common_functions = PMA_CommonFunctions::getInstance(); $sort_order = strtoupper($sort_order); if (true === $limit_count) { @@ -998,7 +995,6 @@ function PMA_DBI_get_columns_full($database = null, $table = null, $column = null, $link = null ) { - $common_functions = PMA_CommonFunctions::getInstance(); $columns = array(); if (! $GLOBALS['cfg']['Server']['DisableIS']) { @@ -1173,8 +1169,6 @@ function PMA_DBI_get_columns_full($database = null, $table = null, function PMA_DBI_get_columns_sql($database, $table, $column = null, $full = false) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (PMA_DRIZZLE) { // `Key` column: // * used in primary key => PRI @@ -1241,7 +1235,6 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $link = null ) { - $common_functions = PMA_CommonFunctions::getInstance(); $sql = PMA_DBI_get_columns_sql($database, $table, $column, $full); $fields = PMA_DBI_fetch_result($sql, 'Field', null, $link); if (! is_array($fields) || count($fields) == 0) { @@ -1317,8 +1310,6 @@ function PMA_DBI_get_column_names($database, $table, $link = null) function PMA_DBI_get_table_indexes_sql($database, $table, $where = null) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (PMA_DRIZZLE) { $sql = "SELECT ip.table_name AS `Table`, @@ -1419,8 +1410,6 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null function PMA_DBI_postConnect($link, $is_controluser = false) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (! defined('PMA_MYSQL_INT_VERSION')) { if ($common_functions->cacheExists('PMA_MYSQL_INT_VERSION', true)) { define( @@ -1822,8 +1811,6 @@ function PMA_DBI_get_warnings($link = null) function PMA_isSuperuser() { - $common_functions = PMA_CommonFunctions::getInstance(); - if ($common_functions->cacheExists('is_superuser', true)) { return $common_functions->cacheGet('is_superuser', true); } @@ -1890,7 +1877,6 @@ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null) */ function PMA_DBI_get_definition($db, $which, $name, $link = null) { - $common_functions = PMA_CommonFunctions::getInstance(); $returned_field = array( 'PROCEDURE' => 'Create Procedure', 'FUNCTION' => 'Create Function', @@ -1915,8 +1901,6 @@ function PMA_DBI_get_definition($db, $which, $name, $link = null) function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') { - $common_functions = PMA_CommonFunctions::getInstance(); - if (PMA_DRIZZLE) { // Drizzle doesn't support triggers return array(); diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index c4a362bb51..2474078213 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -15,8 +15,6 @@ if (! defined('PHPMYADMIN')) { exit; } -$common_functions = PMA_CommonFunctions::getInstance(); - /** * limits for table list */ @@ -43,8 +41,6 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset']; function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (strstr($table['Comment'], '; InnoDB free') === false) { if (!strstr($table['Comment'], 'InnoDB free') === false) { // here we have just InnoDB generated part diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ce2cb4458e..cf41a8d985 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -9,7 +9,6 @@ if (! defined('PHPMYADMIN')) { exit; } -$common_functions = PMA_CommonFunctions::getInstance(); // Get relations & co. status $cfgRelation = PMA_getRelationsParam(); diff --git a/libraries/display_git_revision.lib.php b/libraries/display_git_revision.lib.php index b3fb445e2d..a0e50b1b0c 100644 --- a/libraries/display_git_revision.lib.php +++ b/libraries/display_git_revision.lib.php @@ -17,8 +17,6 @@ if (! defined('PHPMYADMIN')) { function PMA_printGitRevision() { - $common_functions = PMA_CommonFunctions::getInstance(); - if (! $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT')) { $response = PMA_Response::getInstance(); $response->isSuccess(false); diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 1e1e3244d4..5e8a43c352 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -15,7 +15,6 @@ require_once './libraries/file_listing.php'; require_once './libraries/plugin_interface.lib.php'; require_once './libraries/display_import_ajax.lib.php'; -$common_functions = PMA_CommonFunctions::getInstance(); /* Scan for plugins */ $import_list = PMA_getPlugins( "import", diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index c9f46611ad..5b0ef20dd1 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -153,8 +153,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine function getPageBufferpool() { - $common_functions = PMA_CommonFunctions::getInstance(); - // The following query is only possible because we know // that we are on MySQL 5 here (checked above)! // side note: I love MySQL 5 for this. :-) diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php index 38a95ad5b2..4d37a43b7b 100644 --- a/libraries/engines/pbxt.lib.php +++ b/libraries/engines/pbxt.lib.php @@ -97,7 +97,7 @@ class PMA_StorageEngine_pbxt extends PMA_StorageEngine */ function resolveTypeSize($formatted_size) { - $common_functions = PMA_CommonFunctions::getInstance(); + if (preg_match('/^[0-9]+[a-zA-Z]+$/', $formatted_size)) { $value = $common_functions ->extractValueFromFormattedSize($formatted_size); diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php index e090392524..0a15a6e880 100644 --- a/libraries/gis/pma_gis_polygon.php +++ b/libraries/gis/pma_gis_polygon.php @@ -452,8 +452,6 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry public static function getPointOnSurface($ring) { - $common_functions = PMA_CommonFunctions::getInstance(); - // Find two consecutive distinct points. for ($i = 0; $i < count($ring) - 1; $i++) { if ($ring[$i]['y'] != $ring[$i + 1]['y']) { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 1c8d7b1d20..c4d9f7b216 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -918,8 +918,6 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = null, $options = null ) { - $common_functions = PMA_CommonFunctions::getInstance(); - /* Take care of the options */ if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) { $collation = $options['db_collation']; diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 909b723615..041b6379eb 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1374,7 +1374,6 @@ function PMA_getColumnSize($column, $extracted_columnspec) */ function PMA_getHTMLforGisDataTypes() { - $common_functions = PMA_CommonFunctions::getInstance(); $edit_str = $common_functions->getIcon('b_edit.png', __('Edit/Insert')); return '<span class="open_gis_editor">' . $common_functions->linkOrButton( @@ -1631,7 +1630,6 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow( $real_null_value, $gis_data_types, $column_name_appendix ) { - $common_functions = PMA_CommonFunctions::getInstance(); $special_chars_encoded = ''; // (we are editing) if (is_null($current_row[$column['Field']])) { @@ -1810,7 +1808,6 @@ function PMA_isInsertRow() function PMA_setSessionForEditNext($one_where_clause) { - $common_functions = PMA_CommonFunctions::getInstance(); $local_query = 'SELECT * FROM ' . $common_functions->backquote($GLOBALS['db']) . '.' . $common_functions->backquote($GLOBALS['table']) . ' WHERE ' . str_replace('` =', '` >', $one_where_clause) . ' LIMIT 1;'; @@ -2011,8 +2008,6 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison, $relation_field_value, $map, $relation_field ) { - $common_functions = PMA_CommonFunctions::getInstance(); - $display_field = PMA_getDisplayField( $map[$relation_field]['foreign_db'], $map[$relation_field]['foreign_table'] @@ -2050,8 +2045,6 @@ function PMA_getLinkForRelationalDisplayField($map, $relation_field, $where_comparison, $dispval, $relation_field_value ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if ('K' == $_SESSION['tmp_user_values']['relational_display']) { // user chose "relational key" in the display options, so // the title contains the display field @@ -2207,8 +2200,6 @@ function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_ $current_value_as_an_array, $value_sets, $key, $multi_edit_columns_null_prev ) { - $common_functions = PMA_CommonFunctions::getInstance(); - // i n s e r t if ($is_insert) { // no need to add column into the valuelist @@ -2277,8 +2268,6 @@ function PMA_getCurrentValueForDifferentTypes($possibly_uploaded_val, $key, $multi_edit_columns_null_prev, $is_insert, $using_key, $where_clause, $table ) { - $common_functions = PMA_CommonFunctions::getInstance(); - // Fetch the current values of a row to use in case we have a protected field if ($is_insert && $using_key && isset($multi_edit_columns_type) diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 4fc5c747ee..971a1ac8c6 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -10,8 +10,6 @@ if (! defined('PHPMYADMIN')) { require_once 'libraries/transformations.lib.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - $request_params = array( 'clause_is_unique', 'goto', diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index a9deba02d3..fd4d971fec 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -8,11 +8,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * - */ -$common_functions = PMA_CommonFunctions::getInstance(); - if (! $common_functions->cacheExists('mysql_charsets', true)) { $sql = PMA_DRIZZLE ? 'SELECT * FROM data_dictionary.CHARACTER_SETS' @@ -170,8 +165,6 @@ function PMA_generateCharsetQueryPart($collation) function PMA_getDbCollation($db) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (PMA_is_system_schema($db)) { // We don't have to check the collation of the virtual // information_schema database: We know it! diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index a4188b2d79..2aa92427a5 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -9,11 +9,6 @@ if (! defined('PHPMYADMIN')) { exit; } -$common_functions = PMA_CommonFunctions::getInstance(); - -/** - * - */ if (empty($query_url)) { // avoid putting here $db because it could display a db name // to which the next user does not have access diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 2a3462ef41..02a220891d 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -96,8 +96,7 @@ function PMA_getHtmlForRenameDatabase($db) */ function PMA_getHtmlForDropDatabaseLink($db) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $this_sql_query = 'DROP DATABASE ' . $common_functions->backquote($db); $this_url_params = array( 'sql_query' => $this_sql_query, @@ -142,7 +141,7 @@ function PMA_getHtmlForDropDatabaseLink($db) */ function PMA_getHtmlForCopyDatabase($db) { - $common_functions = PMA_CommonFunctions::getInstance(); + $drop_clause = 'DROP TABLE / DROP VIEW'; $choices = array( 'structure' => __('Structure only'), @@ -1075,8 +1074,7 @@ function PMA_getHtmlForCopytable() function PMA_getHtmlForTableMaintenance( $is_myisam_or_aria, $is_innodb, $is_berkeleydb, $url_params ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<div class="operations_half_width">'; $html_output .= '<fieldset>' . '<legend>' . __('Table maintenance') . '</legend>'; @@ -1108,7 +1106,7 @@ function PMA_getHtmlForTableMaintenance( function PMA_getListofMaintainActionLink($is_myisam_or_aria, $is_innodb, $url_params, $is_berkeleydb ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $html_output = ''; if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) { @@ -1300,8 +1298,7 @@ function PMA_getDeleteDataOrTablelink($url_params, $syntax, $link, $id) */ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $choices = array( 'ANALYZE' => __('Analyze'), 'CHECK' => __('Check'), @@ -1366,8 +1363,7 @@ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params) */ function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<div class="operations_half_width">' . '<fieldset>' . '<legend>' . __('Check referential integrity:') . '</legend>'; @@ -1417,8 +1413,7 @@ function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params) function PMA_getQueryAndResultForReorderingTable() { - $common_functions = PMA_CommonFunctions::getInstance(); - + $sql_query = 'ALTER TABLE ' . $common_functions->backquote($GLOBALS['table']) . ' ORDER BY ' @@ -1457,7 +1452,7 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys, $checksum, $is_aria, $page_checksum, $delay_key_write, $is_innodb, $is_pbxt, $row_format, $tbl_storage_engine, $transactional, $tbl_collation ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $table_alters = array(); if (isset($_REQUEST['comment']) diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php index 01ca6da1db..c9876c3915 100644 --- a/libraries/plugins/auth/AuthenticationCookie.class.php +++ b/libraries/plugins/auth/AuthenticationCookie.class.php @@ -305,8 +305,6 @@ class AuthenticationCookie extends AuthenticationPlugin $GLOBALS['PHP_AUTH_USER'] = $GLOBALS['PHP_AUTH_PW'] = ''; $GLOBALS['from_cookie'] = false; - $common_functions = PMA_CommonFunctions::getInstance(); - // BEGIN Swekey Integration if (! Swekey_auth_check()) { return false; diff --git a/libraries/plugins/export/ExportCodegen.class.php b/libraries/plugins/export/ExportCodegen.class.php index 67b1cb48da..d4c40003a6 100644 --- a/libraries/plugins/export/ExportCodegen.class.php +++ b/libraries/plugins/export/ExportCodegen.class.php @@ -242,7 +242,7 @@ class ExportCodegen extends ExportPlugin private function _handleNHibernateCSBody($db, $table, $crlf) { $lines = array(); - $common_functions = PMA_CommonFunctions::getInstance(); + $result = PMA_DBI_query( sprintf( 'DESC %s.%s', $common_functions->backquote($db), @@ -328,7 +328,6 @@ class ExportCodegen extends ExportPlugin private function _handleNHibernateXMLBody($db, $table, $crlf) { $lines = array(); - $common_functions = PMA_CommonFunctions::getInstance(); $lines[] = '<?xml version="1.0" encoding="utf-8" ?' . '>'; $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" ' . 'namespace="' . ExportCodegen::cgMakeIdentifier($db) . '" ' diff --git a/libraries/plugins/export/ExportLatex.class.php b/libraries/plugins/export/ExportLatex.class.php index da299eb47e..eea28b0bad 100644 --- a/libraries/plugins/export/ExportLatex.class.php +++ b/libraries/plugins/export/ExportLatex.class.php @@ -289,7 +289,6 @@ class ExportLatex extends ExportPlugin */ public function exportData($db, $table, $crlf, $error_url, $sql_query) { - $common_functions = PMA_CommonFunctions::getInstance(); $result = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); $columns_cnt = PMA_DBI_num_fields($result); @@ -442,8 +441,7 @@ class ExportLatex extends ExportPlugin $dates = false ) { global $cfgRelation; - $common_functions = PMA_CommonFunctions::getInstance(); - + /** * Get the unique keys in the table */ diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index db25a61f91..299ee9890a 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -441,7 +441,6 @@ class ExportSql extends ExportPlugin { global $crlf; - $common_functions = PMA_CommonFunctions::getInstance(); $text = ''; $delimiter = '$$'; @@ -692,7 +691,6 @@ class ExportSql extends ExportPlugin { global $crlf; - $common_functions = PMA_CommonFunctions::getInstance(); if (isset($GLOBALS['sql_compatibility'])) { $compat = $GLOBALS['sql_compatibility']; } else { @@ -779,7 +777,6 @@ class ExportSql extends ExportPlugin { global $crlf; - $common_functions = PMA_CommonFunctions::getInstance(); $result = true; if (isset($GLOBALS['sql_constraints'])) { $result = PMA_exportOutputHandler($GLOBALS['sql_constraints']); @@ -845,7 +842,6 @@ class ExportSql extends ExportPlugin public function getTableDefStandIn($db, $view, $crlf) { - $common_functions = PMA_CommonFunctions::getInstance(); $create_query = ''; if (! empty($GLOBALS['sql_drop_table'])) { $create_query .= 'DROP VIEW IF EXISTS ' @@ -898,7 +894,6 @@ class ExportSql extends ExportPlugin global $sql_drop_table, $sql_backquotes, $sql_constraints, $sql_constraints_query, $sql_drop_foreign_keys; - $common_functions = PMA_CommonFunctions::getInstance(); $schema_create = ''; $auto_increment = ''; $new_crlf = $crlf; @@ -1325,7 +1320,6 @@ class ExportSql extends ExportPlugin ) { global $cfgRelation, $sql_backquotes; - $common_functions = PMA_CommonFunctions::getInstance(); $schema_create = ''; // Check if we can use Relations @@ -1443,7 +1437,6 @@ class ExportSql extends ExportPlugin $dates = false ) { - $common_functions = PMA_CommonFunctions::getInstance(); if (isset($GLOBALS['sql_compatibility'])) { $compat = $GLOBALS['sql_compatibility']; } else { @@ -1541,7 +1534,6 @@ class ExportSql extends ExportPlugin $compat = 'NONE'; } - $common_functions = PMA_CommonFunctions::getInstance(); $formatted_table_name = (isset($GLOBALS['sql_backquotes'])) ? $common_functions->backquoteCompat($table, $compat) : '\'' . $table . '\''; diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php index 7681d3fe2d..bfbe6bb677 100644 --- a/libraries/plugins/export/ExportXml.class.php +++ b/libraries/plugins/export/ExportXml.class.php @@ -167,7 +167,6 @@ class ExportXml extends ExportPlugin $table = $this->_getTable(); $tables = $this->_getTables(); - $common_functions = PMA_CommonFunctions::getInstance(); $export_struct = isset($GLOBALS['xml_export_functions']) || isset($GLOBALS['xml_export_procedures']) || isset($GLOBALS['xml_export_tables']) diff --git a/libraries/plugins/import/ImportCsv.class.php b/libraries/plugins/import/ImportCsv.class.php index 2817409508..16f5c7529b 100644 --- a/libraries/plugins/import/ImportCsv.class.php +++ b/libraries/plugins/import/ImportCsv.class.php @@ -160,7 +160,6 @@ class ImportCsv extends ImportPlugin global $db, $csv_terminated, $csv_enclosed, $csv_escaped, $csv_new_line; global $error, $timeout_passed, $finished; - $common_functions = PMA_CommonFunctions::getInstance(); $replacements = array( '\\n' => "\n", '\\t' => "\t", diff --git a/libraries/plugins/import/ImportDocsql.class.php b/libraries/plugins/import/ImportDocsql.class.php index e0f440653b..6498b97bab 100644 --- a/libraries/plugins/import/ImportDocsql.class.php +++ b/libraries/plugins/import/ImportDocsql.class.php @@ -113,9 +113,8 @@ class ImportDocsql extends ImportPlugin public function doImport() { global $error, $timeout_passed, $finished; + $cfgRelation = $this->_getCfgRelation(); - $common_functions = PMA_CommonFunctions::getInstance(); - $tab = $_POST['docsql_table']; $buffer = ''; diff --git a/libraries/plugins/import/ImportLdi.class.php b/libraries/plugins/import/ImportLdi.class.php index 689cc5e53a..35e941e076 100644 --- a/libraries/plugins/import/ImportLdi.class.php +++ b/libraries/plugins/import/ImportLdi.class.php @@ -115,8 +115,6 @@ class ImportLdi extends ImportPlugin global $ldi_local_option, $ldi_replace, $ldi_terminated, $ldi_enclosed, $ldi_escaped, $ldi_new_line, $skip_queries, $ldi_columns; - $common_functions = PMA_CommonFunctions::getInstance(); - if ($import_file == 'none' || $compression != 'none' || $charset_conversion diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 1fd2eae399..9e302895ed 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -80,7 +80,6 @@ function PMA_getRelationsParam() function PMA_getRelationsParamDiagnostic($cfgRelation) { - $common_functions = PMA_CommonFunctions::getInstance(); $retval = ''; $messages['error'] = '<font color="red"><strong>' @@ -498,7 +497,6 @@ function PMA__getRelationsParam() function PMA_getForeigners($db, $table, $column = '', $source = 'both') { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); $foreign = array(); @@ -604,7 +602,6 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') function PMA_getDisplayField($db, $table) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); /** @@ -685,7 +682,6 @@ function PMA_getComments($db, $table = '') function PMA_getDbComment($db) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); $comment = ''; @@ -719,7 +715,6 @@ function PMA_getDbComment($db) function PMA_getDbComments() { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); $comments = array(); @@ -755,7 +750,6 @@ function PMA_getDbComments() function PMA_setDbComment($db, $comment = '') { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); if (! $cfgRelation['commwork']) { @@ -805,8 +799,6 @@ function PMA_setDbComment($db, $comment = '') function PMA_setHistory($db, $table, $username, $sqlquery) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (strlen($sqlquery) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { return; } @@ -867,7 +859,6 @@ function PMA_setHistory($db, $table, $username, $sqlquery) function PMA_getHistory($username) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); if (! $cfgRelation['historywork']) { @@ -900,7 +891,6 @@ function PMA_getHistory($username) function PMA_purgeHistory($username) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); if (! $GLOBALS['cfg']['QueryHistoryDB'] || ! $cfgRelation['historywork']) { return; @@ -1088,8 +1078,6 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filter, $foreign_limit) { - $common_functions = PMA_CommonFunctions::getInstance(); - // we always show the foreign field in the drop-down; if a display // field is defined, we show it besides the foreign field $foreign_link = false; @@ -1172,7 +1160,7 @@ function PMA_getRelatives($all_tables, $master) { $fromclause = ''; $emerg = ''; - $common_functions = PMA_CommonFunctions::getInstance(); + // The list of tables that we still couldn't connect $remaining_tables = $all_tables; unset($remaining_tables[$master]); @@ -1239,7 +1227,6 @@ function PMA_getRelatives($all_tables, $master) function PMA_REL_renameField($db, $table, $field, $new_name) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['displaywork']) { @@ -1295,8 +1282,6 @@ function PMA_REL_renameSingleTable($table, $db_field, $table_field ) { - $common_functions = PMA_CommonFunctions::getInstance(); - $query = 'UPDATE ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($GLOBALS['cfgRelation'][$table]) @@ -1400,8 +1385,6 @@ function PMA_REL_renameTable($source_db, $target_db, $source_table, $target_tabl function PMA_REL_createPage($newpage, $cfgRelation, $db) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (! isset($newpage) || $newpage == '') { $newpage = __('no description'); } diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index 7333a6fd75..a2493de99d 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -19,7 +19,6 @@ if (! defined('PHPMYADMIN')) { function PMA_relationsCleanupColumn($db, $table, $column) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['commwork']) { @@ -62,7 +61,6 @@ function PMA_relationsCleanupColumn($db, $table, $column) function PMA_relationsCleanupTable($db, $table) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['commwork']) { @@ -114,7 +112,6 @@ function PMA_relationsCleanupTable($db, $table) function PMA_relationsCleanupDatabase($db) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['commwork']) { diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index bec3f25ad7..0ba80296f9 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -80,8 +80,6 @@ function PMA_EVN_handleEditor() { global $_REQUEST, $_POST, $errors, $db; - $common_functions = PMA_CommonFunctions::getInstance(); - if (! empty($_REQUEST['editor_process_add']) || ! empty($_REQUEST['editor_process_edit']) ) { @@ -275,8 +273,6 @@ function PMA_EVN_getDataFromName($name) { global $db; - $common_functions = PMA_CommonFunctions::getInstance(); - $retval = array(); $columns = "`EVENT_NAME`, `STATUS`, `EVENT_TYPE`, `EXECUTE_AT`, " . "`INTERVAL_VALUE`, `INTERVAL_FIELD`, `STARTS`, `ENDS`, " @@ -516,8 +512,6 @@ function PMA_EVN_getQueryFromRequest() { global $_REQUEST, $errors, $event_status, $event_type, $event_interval; - $common_functions = PMA_CommonFunctions::getInstance(); - $query = 'CREATE '; if (! empty($_REQUEST['item_definer'])) { if (strpos($_REQUEST['item_definer'], '@') !== false) { diff --git a/libraries/rte/rte_footer.lib.php b/libraries/rte/rte_footer.lib.php index e75bce381b..af64632ad8 100644 --- a/libraries/rte/rte_footer.lib.php +++ b/libraries/rte/rte_footer.lib.php @@ -22,8 +22,6 @@ function PMA_RTE_getFooterLinks($docu, $priv, $name) { global $db, $url_query, $ajax_class; - $common_functions = PMA_CommonFunctions::getInstance(); - $icon = 'b_' . strtolower($name) . '_add.png'; $retval = ""; $retval .= "<!-- ADD " . $name . " FORM START -->\n"; diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index c04c2728f9..85877ab99f 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -130,8 +130,6 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') { global $ajax_class, $url_query, $db, $titles; - $common_functions = PMA_CommonFunctions::getInstance(); - $sql_drop = sprintf( 'DROP %s IF EXISTS %s', $routine['ROUTINE_TYPE'], @@ -241,8 +239,6 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '') { global $ajax_class, $url_query, $db, $table, $titles; - $common_functions = PMA_CommonFunctions::getInstance(); - $retval = " <tr class='noclick $rowclass'>\n"; $retval .= " <td>\n"; $retval .= " <span class='drop_sql hide'>{$trigger['drop']}</span>\n"; @@ -312,8 +308,6 @@ function PMA_EVN_getRowForList($event, $rowclass = '') { global $ajax_class, $url_query, $db, $titles; - $common_functions = PMA_CommonFunctions::getInstance(); - $sql_drop = sprintf( 'DROP EVENT IF EXISTS %s', PMA_CommonFunctions::getInstance()->backquote($event['EVENT_NAME']) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 978141e91a..a042f80390 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -265,8 +265,6 @@ function PMA_RTN_handleEditor() { global $_GET, $_POST, $_REQUEST, $GLOBALS, $db, $errors; - $common_functions = PMA_CommonFunctions::getInstance(); - if (! empty($_REQUEST['editor_process_add']) || ! empty($_REQUEST['editor_process_edit']) ) { @@ -444,8 +442,6 @@ function PMA_RTN_getDataFromRequest() { global $_REQUEST, $param_directions, $param_sqldataaccess; - $common_functions = PMA_CommonFunctions::getInstance(); - $retval = array(); $indices = array('item_name', 'item_original_name', @@ -562,7 +558,6 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) { global $db; - $common_functions = PMA_CommonFunctions::getInstance(); $retval = array(); // Build and execute the query @@ -690,8 +685,6 @@ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '') { global $param_directions, $param_opts_num, $titles; - $common_functions = PMA_CommonFunctions::getInstance(); - if ($index === null) { // template row for AJAX request $i = 0; @@ -1045,7 +1038,6 @@ function PMA_RTN_getQueryFromRequest() { global $_REQUEST, $errors, $param_sqldataaccess, $param_directions; - $common_functions = PMA_CommonFunctions::getInstance(); $_REQUEST['item_type'] = isset($_REQUEST['item_type']) ? $_REQUEST['item_type'] : ''; @@ -1203,8 +1195,6 @@ function PMA_RTN_handleExecute() { global $_GET, $_POST, $_REQUEST, $GLOBALS, $db; - $common_functions = PMA_CommonFunctions::getInstance(); - /** * Handle all user requests other than the default of listing routines */ @@ -1450,8 +1440,6 @@ function PMA_RTN_getExecuteForm($routine) { global $db, $cfg; - $common_functions = PMA_CommonFunctions::getInstance(); - // Escape special characters $routine['item_name'] = htmlentities($routine['item_name'], ENT_QUOTES); for ($i=0; $i<$routine['item_num_params']; $i++) { diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 29290a67f8..077c2ef598 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -402,7 +402,6 @@ function PMA_TRI_getQueryFromRequest() { global $_REQUEST, $db, $errors, $action_timings, $event_manipulations; - $common_functions = PMA_CommonFunctions::getInstance(); $query = 'CREATE '; if (! empty($_REQUEST['item_definer'])) { if (strpos($_REQUEST['item_definer'], '@') !== false) { diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index 8a7f237243..c95c31713e 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -227,7 +227,6 @@ class Table_Stats { global $dia, $cfgRelation, $db; - $common_functions = PMA_CommonFunctions::getInstance(); $this->tableName = $tableName; $sql = 'DESCRIBE ' . $common_functions->backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index 153ae419a0..17682f6972 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -416,7 +416,6 @@ class Table_Stats ) { global $eps, $cfgRelation, $db; - $common_functions = PMA_CommonFunctions::getInstance(); $this->_tableName = $tableName; $sql = 'DESCRIBE ' . $common_functions->backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index 42692340a5..b603a6cfaa 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -192,9 +192,7 @@ class PMA_Export_Relation_Schema { global $cfgRelation; - $common_functions = PMA_CommonFunctions::getInstance(); - - // Get All tables + // Get All tables $tab_sql = 'SELECT table_name FROM ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($cfgRelation['table_coords']) diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 5b8fe59535..aa7c667f17 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -382,7 +382,6 @@ class Table_Stats ) { global $svg, $cfgRelation, $db; - $common_functions = PMA_CommonFunctions::getInstance(); $this->_tableName = $tableName; $sql = 'DESCRIBE ' . $common_functions->backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index 5e7d06701f..86b987a198 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -213,7 +213,6 @@ class Table_Stats { global $visio, $cfgRelation, $db; - $common_functions = PMA_CommonFunctions::getInstance(); $this->_tableName = $tableName; $sql = 'DESCRIBE ' . $common_functions->backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 11070db2b9..a010c231d1 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -26,7 +26,7 @@ if (! defined('PHPMYADMIN')) { */ function PMA_wildcardEscapeForGrant($dbname, $tablename) { - $common_functions = PMA_CommonFunctions::getInstance(); + if (! strlen($dbname)) { $db_and_table = '*.*'; } else { @@ -51,7 +51,7 @@ function PMA_wildcardEscapeForGrant($dbname, $tablename) */ function PMA_rangeOfUsers($initial = '') { - $common_functions = PMA_CommonFunctions::getInstance(); + // strtolower() is used because the User field // might be BINARY, so LIKE would be case sensitive if (! empty($initial)) { @@ -346,7 +346,7 @@ function PMA_getHtmlForDisplayColumnPrivileges($columns, $row, $name_for_select, */ function PMA_getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname) { - $common_functions = PMA_CommonFunctions::getInstance(); + if ($db == '*') { return "SELECT * FROM `mysql`.`user`" ." WHERE `User` = '" . $common_functions->sqlAddSlashes($username) . "'" @@ -577,7 +577,7 @@ function PMA_getHtmlForDisplayResourceLimits($row) function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db , $table, $columns,$row ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $res = PMA_DBI_query( 'SELECT `Column_name`, `Column_priv`' .' FROM `mysql`.`columns_priv`' @@ -1326,8 +1326,7 @@ function PMA_getMessageForUpdatePassword($err_url, $username, $hostname) // here $nopass could be == 1 if (empty($message)) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $hashing_function = (! empty($_REQUEST['pw_hash']) && $_REQUEST['pw_hash'] == 'old' ? 'OLD_' @@ -1379,8 +1378,7 @@ function PMA_getMessageForUpdatePassword($err_url, $username, $hostname) function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname, $tablename, $username, $hostname ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename); $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table @@ -1449,7 +1447,7 @@ function PMA_getWithClauseForAddUserAndUpdatePrivs() */ function PMA_getHtmlForAddUser($random_n, $dbname) { - $common_functions = PMA_CommonFunctions::getInstance(); + $GLOBALS['url_query'] .= '&adduser=1'; $html_output = '<h2>' . "\n" @@ -1569,7 +1567,7 @@ function PMA_getListOfPrivilegesAndComparedPrivileges() */ function PMA_getHtmlForSpecificDbPrivileges($link_edit, $conditional_class) { - $common_functions = PMA_CommonFunctions::getInstance(); + // check the privileges for a particular database. $html_output = '<form id="usersForm" action="server_privileges.php">' . '<fieldset>' . "\n"; @@ -1780,8 +1778,7 @@ function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row, */ function PMA_getStandardLinks($conditional_class) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $link_edit = '<a class="edit_user_anchor ' . $conditional_class . '"' . ' href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query']) @@ -2029,8 +2026,7 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename) */ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname) { - $common_functions = PMA_CommonFunctions::getInstance(); - + if (! strlen($dbname)) { $tables_to_search_for_users = array( 'tables_priv', 'columns_priv', @@ -2220,8 +2216,7 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit, $dbname, function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname , $link_edit, $link_revoke, $dbname ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + // table header $html_output = PMA_generate_common_hidden_inputs('', '') . '<input type="hidden" name="username" ' @@ -2293,8 +2288,7 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname */ function PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $pred_db_array =PMA_DBI_fetch_result('SHOW DATABASES;'); $html_output = '<label for="text_dbname">' @@ -2333,8 +2327,7 @@ function PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows) */ function PMA_displayTablesInEditPrivs($dbname, $found_rows) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<input type="hidden" name="dbname" '. 'value="' . htmlspecialchars($dbname) . '"/>' . "\n"; $html_output .= '<label for="text_tablename">' @@ -2394,8 +2387,7 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows) function PMA_getUsersOverview($result, $db_rights, $link_edit, $pmaThemeImage, $text_dir, $conditional_class, $link_export ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + while ($row = PMA_DBI_fetch_assoc($result)) { $row['privs'] = PMA_extractPrivInfo($row, true); $db_rights[$row['User']][$row['Host']] = $row; @@ -2547,8 +2539,7 @@ function PMA_getTableBodyForUserRightsTable($db_rights, $link_edit, $link_export */ function PMA_getFieldsetForAddDeleteUser($conditional_class) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<fieldset id="fieldset_add_user">' . "\n"; $html_output .= '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1"' @@ -2743,8 +2734,7 @@ function PMA_deleteUser($queries) */ function PMA_updatePrivileges($username, $hostname, $tablename, $dbname) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename); $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table @@ -3037,8 +3027,7 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage, function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname, $random_n, $username, $hostname, $link_edit, $link_revoke, $dbname, $tablename ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = PMA_getHtmlHeaderForDisplayUserProperties( $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, $tablename ); @@ -3137,7 +3126,7 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname, function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition, $queries, $username, $hostname ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $res = PMA_DBI_query( 'SELECT `Db`, `Table_name`, `Table_priv` FROM `mysql`.`tables_priv`' . $user_host_condition, $GLOBALS['userlink'], @@ -3219,8 +3208,7 @@ function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition, function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser( $queries, $username, $hostname ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $user_host_condition = ' WHERE `User`' .' = \'' . $common_functions->sqlAddSlashes($_REQUEST['old_username']) . "'" .' AND `Host`' @@ -3259,8 +3247,7 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser( function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $username, $hostname ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + if ($_error || ! PMA_DBI_try_query($real_sql_query)) { $_REQUEST['createdb-1'] = $_REQUEST['createdb-2'] = $_REQUEST['createdb-3'] = false; @@ -3345,7 +3332,7 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, */ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password) { - $common_functions = PMA_CommonFunctions::getInstance(); + $sql_query = ''; $create_user_real = 'CREATE USER \'' . $common_functions->sqlAddSlashes($username) . '\'@\'' diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index db06dd8a92..2b0cce458a 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -110,8 +110,6 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$delete_array, &$fields_num, $matching_table_index, &$matching_tables_keys ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (isset($matching_table[$matching_table_index])) { $fld = array(); $fld_results = PMA_DBI_get_columns( @@ -457,8 +455,6 @@ function PMA_updateTargetTables( $trg_link, $matching_table_index, $matching_table_keys, $display ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (isset($update_array[$matching_table_index])) { if (count($update_array[$matching_table_index])) { @@ -555,8 +551,6 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, &$alter_indexes_array, &$delete_array, &$update_array, $display ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (isset($array_insert[$matching_table_index])) { if (count($array_insert[$matching_table_index])) { for ($insert_row = 0; $insert_row< count($array_insert[$matching_table_index]); $insert_row++) { @@ -725,8 +719,6 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (isset($uncommon_tables[$table_index])) { $fields_result = PMA_DBI_get_columns( $src_db, @@ -800,8 +792,6 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display ) { - $common_functions = PMA_CommonFunctions::getInstance(); - // @todo: maybe display some of the queries if they are not too numerous $display = false; $unbuffered_result = PMA_DBI_try_query( @@ -850,8 +840,6 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display ) { - $common_functions = PMA_CommonFunctions::getInstance(); - for ($i = 0; $i < count($delete_array[$table_index]); $i++) { if (isset($target_tables_keys[$table_index])) { $delete_query = 'DELETE FROM ' . $common_functions->backquote($trg_db) . '.' .$common_functions->backquote($matching_tables[$table_index]) . ' WHERE '; @@ -1026,8 +1014,6 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables_fields, $table_counter, $uncommon_cols, $display ) { - $common_functions = PMA_CommonFunctions::getInstance(); - for ($i = 0; $i < count($matching_tables_fields[$table_counter]); $i++) { if (isset($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]])) { $query = "ALTER TABLE " . $common_functions->backquote($trg_db) . '.' . $common_functions->backquote($matching_tables[$table_counter]). " ADD COLUMN " . @@ -1165,7 +1151,6 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$matching_tables_keys, &$target_tables_keys, $matching_table_index, $display ) { - $common_functions = PMA_CommonFunctions::getInstance(); $check = true; $sql_query = ''; $found = false; @@ -1302,8 +1287,6 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (isset($uncommon_columns[$table_counter])) { $drop_query = "ALTER TABLE " . $common_functions->backquote($trg_db) . "." . $common_functions->backquote($matching_tables[$table_counter]); @@ -1441,8 +1424,6 @@ function PMA_applyIndexesDiff($trg_db, $trg_link, $matching_tables, $source_inde $remove_indexes_array, $table_counter, $display ) { - $common_functions = PMA_CommonFunctions::getInstance(); - //Adds indexes on target table if (isset($add_indexes_array[$table_counter])) { $sql = "ALTER TABLE " . $common_functions->backquote($trg_db) . "." . $common_functions->backquote($matching_tables[$table_counter]) . " ADD" ; @@ -1624,7 +1605,6 @@ function PMA_syncDisplayDataCompare($rows) function PMA_getColumnValues($database, $table, $column, $link = null) { - $common_functions = PMA_CommonFunctions::getInstance(); $query = 'SELECT '; for ($i = 0; $i < count($column); $i++) { $query.= $common_functions->backquote($column[$i]); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index bf50f07267..7de1d425f2 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -172,8 +172,6 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false, $delimiter = ';' ) { - $common_functions = PMA_CommonFunctions::getInstance(); - // enable auto select text in textarea if ($GLOBALS['cfg']['TextareaAutoSelect']) { $auto_sel = ' onclick="selectContent(this, sql_box_locked, true)"'; @@ -450,7 +448,6 @@ function PMA_sqlQueryFormBookmark() function PMA_sqlQueryFormUpload() { - $common_functions = PMA_CommonFunctions::getInstance(); $errors = array (); // we allow only SQL here diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 89103da138..1f7fc7e5ed 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -853,8 +853,6 @@ function PMA_SQP_typeCheck($toCheck, $whatWeWant) function PMA_SQP_analyze($arr) { - $common_functions = PMA_CommonFunctions::getInstance(); - if ($arr == array() || ! isset($arr['len'])) { return array(); } @@ -2149,8 +2147,6 @@ function PMA_SQP_formatHtml( ) { global $PMA_SQPdata_operators_docs, $PMA_SQPdata_functions_docs; - $common_functions = PMA_CommonFunctions::getInstance(); - //DEBUG echo 'in Format<pre>'; print_r($arr); echo '</pre>'; // then check for an array if (! is_array($arr)) { diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index c2b3fd7e19..24a3c03e60 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -28,7 +28,7 @@ if (!defined('PHPMYADMIN')) { function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_query, $titles, $truename, $db_is_information_schema, $url_query ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $empty_table = ''; if ($current_table['TABLE_ROWS'] > 0 || $table_is_view) { @@ -164,8 +164,7 @@ function PMA_getHtmlBodyForTableSummary($num_tables, $server_slave_status, $sum_size, $overhead_size, $create_time_all, $update_time_all, $check_time_all, $sum_row_count_pre ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + if ($is_show_stats) { list($sum_formatted, $unit) = $common_functions->formatByteDown( $sum_size, 3, 1 @@ -455,8 +454,7 @@ function PMA_getHtmlForStructureTableRow($curr, $odd_row, $table_is_view, $curre $collation, $formatted_size, $unit, $overhead, $create_time, $update_time, $check_time,$is_show_stats, $ignored, $do, $colspan_for_structure ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<tr class="' . ($odd_row ? 'odd' : 'even'); $odd_row = ! $odd_row; $html_output .= ($table_is_view ? ' is_view' : '') @@ -600,7 +598,7 @@ function PMA_getHtmlForShowStats($tbl_url_query, $formatted_size, */ function PMA_getHtmlForStructureTimes($create_time, $update_time, $check_time) { - $common_functions = PMA_CommonFunctions::getInstance(); + $html_output = ''; if ($GLOBALS['cfg']['ShowDbStructureCreation']) { $html_output .= '<td class="value tbl_creation">' @@ -647,7 +645,7 @@ function PMA_getHtmlForNotNullEngineViewTable($table_is_view, $current_table, $collation, $is_show_stats, $tbl_url_query, $formatted_size, $unit, $overhead, $create_time, $update_time, $check_time ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $html_output = ''; $row_count_pre = ''; $show_superscript = ''; @@ -844,7 +842,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false */ function PMA_sortableTableHeader($title, $sort, $initial_sort_order = 'ASC') { - $common_functions = PMA_CommonFunctions::getInstance(); + // Set some defaults $requested_sort = 'table'; $requested_sort_order = $future_sort_order = $initial_sort_order; @@ -1015,7 +1013,7 @@ function PMA_getServerSlaveStatus($server_slave_status, $truename) function PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schema, $is_show_stats, $table_is_view, $sum_size, $overhead_size ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $formatted_size = '-'; $unit = ''; $formatted_overhead = ''; @@ -1105,7 +1103,7 @@ function PMA_getValuesForAriaTable($db_is_information_schema, $current_table, $is_show_stats, $sum_size, $overhead_size, $formatted_size, $unit, $formatted_overhead, $overhead_unit ) { - $common_functions = PMA_CommonFunctions::getInstance(); + if ($db_is_information_schema) { $current_table['Rows'] = PMA_Table::countRecords( $GLOBALS['db'], $current_table['Name'] @@ -1145,7 +1143,7 @@ function PMA_getValuesForAriaTable($db_is_information_schema, $current_table, */ function PMA_getValuesForPbmsTable($current_table, $is_show_stats, $sum_size) { - $common_functions = PMA_CommonFunctions::getInstance(); + if (($current_table['ENGINE'] == 'InnoDB' && $current_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount']) || !isset($current_table['TABLE_ROWS']) @@ -1248,8 +1246,7 @@ function PMA_getHtmlTableStructureRow($row, $rownum, $checked, $field_charset, $attribute, $tbl_is_view, $db_is_information_schema, $url_query, $field_encoded, $titles, $table ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<td class="center">' . '<input type="checkbox" class="checkall" name="selected_fld[]" ' . 'value="' . htmlspecialchars($row['Field']) . '" ' @@ -1323,7 +1320,7 @@ function PMA_getHtmlTableStructureRow($row, $rownum, $checked, function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_information_schema, $url_query, $field_encoded, $titles, $table, $row ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $html_output = ''; if (! $tbl_is_view && ! $db_is_information_schema) { @@ -1366,8 +1363,7 @@ function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_information_schema, function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir, $tbl_is_view, $db_is_information_schema, $tbl_storage_engine ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<img class="selectallarrow" ' . 'src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png' . '"' . 'width="38" height="22" alt="' . __('With selected:') . '" />'; @@ -1461,8 +1457,7 @@ function PMA_getHtmlDivForMoveColumnsDialog() */ function PMA_getHtmlForEditView($url_params) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $create_view = PMA_DBI_get_definition($GLOBALS['db'], 'VIEW', $GLOBALS['table']); $create_view = preg_replace('@^CREATE@', 'ALTER', $create_view); $html_output = $common_functions->linkOrButton( @@ -1493,8 +1488,7 @@ function PMA_getHtmlForEditView($url_params) function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view, $db_is_information_schema, $tbl_storage_engine, $cfgRelation ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<a href="tbl_printview.php?' . $url_query . '">' . $common_functions->getIcon('b_print.png', __('Print view'), true) . '</a>'; @@ -1550,8 +1544,7 @@ function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view, */ function PMA_getHtmlForAddColumn($columns_list) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<form method="post" action="tbl_addfield.php" ' . 'id="addColumns" name="addColumns" ' . ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '') @@ -1667,8 +1660,7 @@ function PMA_getHtmlForSpaceUsageTableRow($odd_row, $name, $value, $unit) */ function PMA_getHtmlForOptimizeLink($url_query) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<tr class="tblFooters">'; $html_output .= '<td colspan="3" class="center">'; $html_output .= '<a href="sql.php?' . $url_query @@ -1695,8 +1687,7 @@ function PMA_getHtmlForOptimizeLink($url_query) */ function PMA_getHtmlForRowStatsTableRow($odd_row, $name, $value) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<tr class="' . (($odd_row = !$odd_row) ? 'odd' : 'even') . '">'; $html_output .= '<th class="name">' . $name . '</th>'; $html_output .= '<td class="value">' . $value . '</td>'; @@ -1720,8 +1711,7 @@ function PMA_getHtmlForRowStatsTableRow($odd_row, $name, $value) function getHtmlForRowStatsTable($showtable, $tbl_collation, $is_innodb, $mergetable, $avg_size, $avg_unit ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $odd_row = false; $html_output = '<table id="tablerowstats" class="data">'; $html_output .= '<caption class="tblHeaders">' @@ -1848,8 +1838,7 @@ function PMA_getHtmlDivsForStructureActionsDropdown($class, $isActionEnabled, $url_query, $row, $hidden_titles, $hidden_titles_no, $primary, $syntax, $message, $isPrimary ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<div class="' . $class . '">'; if ($isActionEnabled) { $html_output .= '<a href="sql.php?' . $url_query @@ -1898,8 +1887,7 @@ function PMA_getHtmlForMoreOptionInTableStructure($rownum, $primary_enabled, $url_query, $row, $hidden_titles, $unique_enabled, $index_enabled, $fulltext_enabled, $spatial_enabled, $primary ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<td class="more_opts" id="more_opts' . $rownum . '">'; $html_output .= $common_functions->getImage( 'more.png', __('Show more actions') @@ -1987,8 +1975,7 @@ function PMA_getHtmlForActionRowInStructureTable($type, $tbl_storage_engine, $class, $hasField, $hasLinkClass, $url_query, $primary, $syntax, $message, $action, $titles, $row, $isPrimary ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<td class="'. $class .'">'; if ($type == 'text' @@ -2039,7 +2026,7 @@ function PMA_getHtmlForActionRowInStructureTable($type, $tbl_storage_engine, function PMA_getHtmlForFullTextAction($tbl_storage_engine, $type, $url_query, $row, $titles ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $html_output = '<td class="fulltext replaced_by_more center nowrap">'; if (! empty($tbl_storage_engine) && ($tbl_storage_engine == 'MYISAM' @@ -2087,7 +2074,7 @@ function PMA_getHtmlForFullTextAction($tbl_storage_engine, $type, $url_query, */ function PMA_getHtmlForDistinctValueAction($url_query, $row, $titles) { - $common_functions = PMA_CommonFunctions::getInstance(); + $html_output = '<td class="browse replaced_by_more center">'; $html_output .= '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode( @@ -2201,8 +2188,7 @@ function PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine, */ function PMA_getHiddenTitlesArray() { - $common_functions = PMA_CommonFunctions::getInstance(); - + $hidden_titles = array(); $hidden_titles['DistinctValues'] = $common_functions->getIcon( 'b_browse.png', __('Distinct values'), true @@ -2248,8 +2234,7 @@ function PMA_getHiddenTitlesArray() */ function PMA_getActionTitlesArray() { - $common_functions = PMA_CommonFunctions::getInstance(); - + $titles = array(); $titles['Change'] = $common_functions->getIcon('b_edit.png', __('Change')); @@ -2300,8 +2285,7 @@ function PMA_getHtmlForDisplayTableStats($showtable, $table_info_num_rows, $tbl_is_view, $db_is_information_schema, $tbl_storage_engine, $url_query, $tbl_collation ) { - $common_functions = PMA_CommonFunctions::getInstance(); - + $html_output = '<div id="tablestatistics">'; if (empty($showtable)) { $showtable = PMA_Table::sGetStatusInfo( diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 536eee4100..af05a9edfb 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -15,7 +15,6 @@ if (! defined('PHPMYADMIN')) { */ require_once './libraries/Util.class.php'; -$common_functions = PMA_CommonFunctions::getInstance(); $common_functions->checkParameters(array('db', 'table', 'action', 'num_fields')); diff --git a/libraries/tbl_views.lib.php b/libraries/tbl_views.lib.php index 4b94439e2e..d90252d74c 100644 --- a/libraries/tbl_views.lib.php +++ b/libraries/tbl_views.lib.php @@ -66,7 +66,6 @@ function PMA_getColumnMap($sql_query, $view_columns) function PMA_getExistingTranformationData($db) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); // Get the existing transformation details of the same database @@ -96,7 +95,6 @@ function PMA_getNewTransformationDataSql( $pma_tranformation_data, $column_map, $view_name, $db ) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); // Need to store new transformation details for VIEW diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 1eaddb5a69..d3a3bacd9b 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -163,7 +163,7 @@ function PMA_getTransformationDescription($file, $html_formatted = true) */ function PMA_getMIME($db, $table, $strict = false) { - $common_functions = PMA_CommonFunctions::getInstance(); + $cfgRelation = PMA_getRelationsParam(); if (! $cfgRelation['commwork']) { @@ -250,7 +250,6 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, $transformation_options, $forcedelete = false ) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); if (! $cfgRelation['commwork']) { @@ -380,7 +379,6 @@ function PMA_transformation_global_html_replace($buffer, $options = array()) function PMA_clearTransformations($db, $table = '', $column = '') { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); $delete_sql = 'DELETE FROM ' diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 12c7ae3fc3..a5e818166d 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -42,7 +42,6 @@ function PMA_userprefs_pageinit() function PMA_load_userprefs() { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); if (! $cfgRelation['userconfigwork']) { // no pmadb table, use session storage @@ -81,7 +80,6 @@ function PMA_load_userprefs() function PMA_save_userprefs(array $config_array) { - $common_functions = PMA_CommonFunctions::getInstance(); $cfgRelation = PMA_getRelationsParam(); $server = isset($GLOBALS['server']) ? $GLOBALS['server'] @@ -15,8 +15,6 @@ require_once 'libraries/common.inc.php'; */ require_once 'libraries/display_git_revision.lib.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - if ($GLOBALS['PMA_Config']->isGitRevision()) { if (isset($_REQUEST['git_revision']) && $GLOBALS['is_ajax_request'] == true) { PMA_printGitRevision(); diff --git a/navigation.php b/navigation.php index 37cc04257d..232f125528 100644 --- a/navigation.php +++ b/navigation.php @@ -27,8 +27,6 @@ function PMA_exitNavigationFrame() require_once 'libraries/Util.class.php'; require_once 'libraries/RecentTable.class.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - /** * Check if it is an ajax request to reload the recent tables list. */ @@ -342,8 +340,6 @@ function PMA_displayDbList($ext_dblist, $offset, $count) global $element_counter, $img_minus, $img_plus, $href_left, $db_start, $common_url_query; - $common_functions = PMA_CommonFunctions::getInstance(); - // get table list, for all databases // doing this in one step takes advantage of // a single query with information_schema! @@ -533,8 +529,6 @@ function PMA_displayTableList( $tab_group_full = '', $table_db = '' ) { - $common_functions = PMA_CommonFunctions::getInstance(); - if (! is_array($tables) || count($tables) === 0) { return; } diff --git a/pmd_display_field.php b/pmd_display_field.php index 4979d47059..55cc1d3a21 100644 --- a/pmd_display_field.php +++ b/pmd_display_field.php @@ -13,8 +13,6 @@ PMA_Response::getInstance()->disable(); require_once 'libraries/pmd_common.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - $table = $T; $display_field = $F; diff --git a/pmd_pdf.php b/pmd_pdf.php index 69ca11a3c5..b357fb5ec8 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -8,8 +8,6 @@ require_once './libraries/common.inc.php'; require_once 'libraries/pmd_common.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - /** * Sets globals from $_POST */ diff --git a/pmd_relation_new.php b/pmd_relation_new.php index c93fa448a2..d2fba79604 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -11,7 +11,6 @@ require_once './libraries/common.inc.php'; PMA_Response::getInstance()->disable(); -$common_functions = PMA_CommonFunctions::getInstance(); require_once 'libraries/pmd_common.php'; $die_save_pos = 0; diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 9e1fd18a6a..72412bab82 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -11,7 +11,6 @@ require_once './libraries/common.inc.php'; PMA_Response::getInstance()->disable(); -$common_functions = PMA_CommonFunctions::getInstance(); require_once 'libraries/pmd_common.php'; extract($_POST, EXTR_SKIP); diff --git a/pmd_save_pos.php b/pmd_save_pos.php index 92af5ee1dc..085183fdc8 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -12,7 +12,6 @@ require_once './libraries/common.inc.php'; require_once 'libraries/pmd_common.php'; $cfgRelation = PMA_getRelationsParam(); -$common_functions = PMA_CommonFunctions::getInstance(); if (! $cfgRelation['designerwork']) { PMD_err_sav(); diff --git a/querywindow.php b/querywindow.php index 0f872994d7..fdc1bdd535 100644 --- a/querywindow.php +++ b/querywindow.php @@ -29,8 +29,6 @@ $cfgRelation = PMA_getRelationsParam(); */ require_once 'libraries/bookmark.lib.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - $querydisplay_tabs = array( 'sql', 'files', diff --git a/schema_edit.php b/schema_edit.php index bdaf25bcb7..e51bdc1c9b 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -24,8 +24,6 @@ require_once 'libraries/db_info.inc.php'; */ $cfgRelation = PMA_getRelationsParam(); -$common_functions = PMA_CommonFunctions::getInstance(); - /** * Now in ./libraries/relation.lib.php we check for all tables * that we need, but if we don't find them we are quiet about it diff --git a/server_binlog.php b/server_binlog.php index 058227f336..e523a7ea13 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -16,7 +16,6 @@ require_once 'libraries/common.inc.php'; */ require_once 'libraries/server_common.inc.php'; -$common_functions = PMA_CommonFunctions::getInstance(); $url_params = array(); /** diff --git a/server_databases.php b/server_databases.php index 1cfbee94d0..d951a09278 100644 --- a/server_databases.php +++ b/server_databases.php @@ -13,7 +13,6 @@ $response = PMA_Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_databases.js'); -$common_functions = PMA_CommonFunctions::getInstance(); require 'libraries/server_common.inc.php'; if (! PMA_DRIZZLE) { diff --git a/server_engines.php b/server_engines.php index a49c5945c4..0f4d9b8050 100644 --- a/server_engines.php +++ b/server_engines.php @@ -17,8 +17,6 @@ require_once 'libraries/common.inc.php'; require 'libraries/server_common.inc.php'; require 'libraries/StorageEngine.class.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - /** * Did the user request information about a certain storage engine? */ diff --git a/server_privileges.php b/server_privileges.php index 05e0dfeb7a..848cc51626 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -22,7 +22,6 @@ $response = PMA_Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_privileges.js'); -$common_functions = PMA_CommonFunctions::getInstance(); $_add_user_error = false; diff --git a/server_replication.php b/server_replication.php index 5d258ab653..8bcde314e9 100644 --- a/server_replication.php +++ b/server_replication.php @@ -18,7 +18,6 @@ $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_privileges.js'); $scripts->addFile('replication.js'); -$common_functions = PMA_CommonFunctions::getInstance(); require 'libraries/server_common.inc.php'; require 'libraries/replication.inc.php'; diff --git a/server_status.php b/server_status.php index f654a62d0c..748bba9a93 100644 --- a/server_status.php +++ b/server_status.php @@ -9,8 +9,6 @@ require_once 'libraries/common.inc.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - /** * Ajax request */ @@ -994,7 +992,6 @@ function printQueryStatistics() { global $server_status, $used_queries, $url_query, $PMA_PHP_SELF; - $common_functions = PMA_CommonFunctions::getInstance(); $hour_factor = 3600 / $server_status['Uptime']; $total_queries = array_sum($used_queries); @@ -1103,7 +1100,6 @@ function printServerTraffic() global $server_status, $PMA_PHP_SELF; global $server_master_status, $server_slave_status, $replication_types; - $common_functions = PMA_CommonFunctions::getInstance(); $hour_factor = 3600 / $server_status['Uptime']; /** @@ -1492,8 +1488,6 @@ function printVariablesTable() { global $server_status, $server_variables, $allocationMap, $links; - $common_functions = PMA_CommonFunctions::getInstance(); - /** * Messages are built using the message name */ @@ -1759,9 +1753,7 @@ function printVariablesTable() function printMonitor() { global $server_status, $server_db_isLocal; - - $common_functions = PMA_CommonFunctions::getInstance(); - + ?> <div class="tabLinks" style="display:none;"> <a href="#pauseCharts"> diff --git a/server_variables.php b/server_variables.php index 1d39e0116e..88c85da2da 100644 --- a/server_variables.php +++ b/server_variables.php @@ -12,7 +12,6 @@ $response = PMA_Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_variables.js'); -$common_functions = PMA_CommonFunctions::getInstance(); PMA_addJSVar('pma_token', $_SESSION[' PMA_token ']); PMA_addJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); @@ -210,8 +209,6 @@ function formatVariable($name, $value) { global $VARIABLE_DOC_LINKS; - $common_functions = PMA_CommonFunctions::getInstance(); - if (is_numeric($value)) { if (isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte' @@ -25,9 +25,6 @@ $scripts->addFile('tbl_structure.js'); $scripts->addFile('indexes.js'); $scripts->addFile('gis_data_editor.js'); -// Get instance of PMA_CommonFunctions -$common_functions = PMA_CommonFunctions::getInstance(); - /** * Sets globals from $_POST */ diff --git a/tbl_addfield.php b/tbl_addfield.php index 81ff57da34..ffeadee1ef 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -10,8 +10,6 @@ */ require_once 'libraries/common.inc.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - // Check parameters $common_functions->checkParameters(array('db', 'table')); diff --git a/tbl_alter.php b/tbl_alter.php index e2fadf6c80..fff7fcc57d 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -14,8 +14,6 @@ */ require_once 'libraries/common.inc.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - if (isset($_REQUEST['field'])) { $GLOBALS['field'] = $_REQUEST['field']; } diff --git a/tbl_change.php b/tbl_change.php index 034722f2c3..1498347216 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -23,8 +23,6 @@ require_once 'libraries/db_table_exists.lib.php'; */ require_once 'libraries/insert_edit.lib.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - /** * Sets global variables. * Here it's better to use a if, instead of the '?' operator diff --git a/tbl_create.php b/tbl_create.php index a5f5d5811f..a8002cacb0 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -10,7 +10,6 @@ require_once 'libraries/common.inc.php'; $action = 'tbl_create.php'; -$common_functions = PMA_CommonFunctions::getInstance(); $titles = $common_functions->buildActionTitles(); diff --git a/tbl_get_field.php b/tbl_get_field.php index 9269064a99..b358b399e6 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -12,8 +12,6 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/mime.lib.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - /* Check parameters */ $common_functions->checkParameters( array('db', 'table', 'where_clause', 'transform_key') diff --git a/tbl_indexes.php b/tbl_indexes.php index 5c3fb12d13..fd0258b9e9 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -13,8 +13,6 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/Index.class.php'; require_once 'libraries/tbl_common.inc.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - // Get fields and stores their name/type $fields = array(); foreach (PMA_DBI_get_columns_full($db, $table) as $row) { diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 1947144bf8..53aa048c39 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -10,8 +10,6 @@ */ require_once 'libraries/common.inc.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - // Check parameters $common_functions->checkParameters(array('db', 'table')); diff --git a/tbl_operations.php b/tbl_operations.php index d071721563..014d4c5feb 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -17,7 +17,6 @@ require_once 'libraries/operations.lib.php'; $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']); $response = PMA_Response::getInstance(); -$common_functions = PMA_CommonFunctions::getInstance(); /** * Runs common work diff --git a/tbl_printview.php b/tbl_printview.php index dc23fee7d9..a6bb9aeff8 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -13,7 +13,6 @@ require_once 'libraries/common.inc.php'; $response = PMA_Response::getInstance(); $response->getHeader()->enablePrintView(); -$common_functions = PMA_CommonFunctions::getInstance(); require 'libraries/tbl_common.inc.php'; diff --git a/tbl_relation.php b/tbl_relation.php index 21106a297a..39f358c784 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -24,7 +24,6 @@ $response = PMA_Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('tbl_relation.js'); -$common_functions = PMA_CommonFunctions::getInstance(); require_once 'libraries/tbl_common.inc.php'; $url_query .= '&goto=tbl_sql.php'; diff --git a/tbl_replace.php b/tbl_replace.php index 556de7237f..5f483d9972 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -22,8 +22,6 @@ require_once 'libraries/common.inc.php'; */ require_once 'libraries/insert_edit.lib.php'; -$common_functions = PMA_CommonFunctions::getInstance(); - // Check parameters $common_functions->checkParameters(array('db', 'table', 'goto')); diff --git a/tbl_structure.php b/tbl_structure.php index fad9c5c114..021c87f156 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -23,7 +23,6 @@ $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('tbl_structure.js'); $scripts->addFile('indexes.js'); -$common_functions = PMA_CommonFunctions::getInstance(); /** * handle multiple field commands if required diff --git a/tbl_tracking.php b/tbl_tracking.php index 634b2dce7b..e39fc7c99c 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -13,7 +13,6 @@ require './libraries/tbl_common.inc.php'; $url_query .= '&goto=tbl_tracking.php&back=tbl_tracking.php'; $url_params['goto'] = 'tbl_tracking.php';; $url_params['back'] = 'tbl_tracking.php'; -$common_functions = PMA_CommonFunctions::getInstance(); // Init vars for tracking report if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { diff --git a/user_password.php b/user_password.php index 8eb9946e5a..bcf29f14be 100644 --- a/user_password.php +++ b/user_password.php @@ -169,7 +169,7 @@ function PMA_changePassHashingFunction() function PMA_ChangePassUrlParamsAndSubmitQuery( $password, $_url_params, $sql_query, $hashing_function ) { - $common_functions = PMA_CommonFunctions::getInstance(); + $err_url = 'user_password.php' . PMA_generate_common_url($_url_params); $local_query = 'SET password = ' . (($password == '') ? '\'\'' |