diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php index 70e41b2c5c..b0d52a0d0d 100644 --- a/libraries/classes/Common.php +++ b/libraries/classes/Common.php @@ -15,18 +15,13 @@ final class Common { public static function database(): void { - global $cfg, $db, $is_show_stats, $db_is_system_schema, $err_url; + global $cfg, $db, $db_is_system_schema, $err_url; global $message, $dbi, $errno, $is_db, $err_url_0; Util::checkParameters(['db']); $response = Response::getInstance(); - $is_show_stats = $cfg['ShowStats']; - $db_is_system_schema = Utilities::isSystemSchema($db); - if ($db_is_system_schema) { - $is_show_stats = false; - } /** * Defines the urls to return to in case of error in a sql statement diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index 70cd99ff06..d95099dc36 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -42,7 +42,7 @@ class DesignerController extends AbstractController { global $db, $script_display_field, $tab_column, $tables_all_keys, $tables_pk_or_unique_keys; global $success, $page, $message, $display_page, $selected_page, $tab_pos, $fullTableNames, $script_tables; - global $script_contr, $params, $tables, $num_tables, $total_num_tables, $sub_part, $is_show_stats; + global $script_contr, $params, $tables, $num_tables, $total_num_tables, $sub_part; global $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos, $classes_side_menu; if (isset($_POST['dialog'])) { @@ -218,8 +218,7 @@ class DesignerController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php index ee5806a250..5948a1914c 100644 --- a/libraries/classes/Controllers/Database/EventsController.php +++ b/libraries/classes/Controllers/Database/EventsController.php @@ -35,7 +35,7 @@ final class EventsController extends AbstractController public function index(): void { global $db, $tables, $num_tables, $total_num_tables, $sub_part, $errors, $text_dir, $PMA_Theme; - global $is_show_stats, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos; + global $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos; if (! $this->response->isAjax()) { Common::database(); @@ -44,8 +44,7 @@ final class EventsController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php index 3269cd3aa9..ea6bb047d8 100644 --- a/libraries/classes/Controllers/Database/ExportController.php +++ b/libraries/classes/Controllers/Database/ExportController.php @@ -39,7 +39,7 @@ final class ExportController extends AbstractController public function index(): void { global $db, $table, $sub_part, $url_params, $sql_query; - global $tables, $num_tables, $total_num_tables, $is_show_stats, $db_is_system_schema, $tooltip_truename; + global $tables, $num_tables, $total_num_tables, $db_is_system_schema, $tooltip_truename; global $tooltip_aliasname, $pos, $table_select, $unlim_num_rows; $pageSettings = new PageSettings('Export'); @@ -60,8 +60,7 @@ final class ExportController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index 5bcf90a575..b190834ac7 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -38,7 +38,7 @@ final class ImportController extends AbstractController public function index(): void { - global $db, $max_upload_size, $table, $tables, $num_tables, $total_num_tables, $is_show_stats, $cfg; + global $db, $max_upload_size, $table, $tables, $num_tables, $total_num_tables, $cfg; global $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos, $sub_part, $SESSION_KEY, $PMA_Theme; $pageSettings = new PageSettings('Import'); @@ -53,8 +53,7 @@ final class ImportController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index 8ffcd3aca5..821c8c06b5 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -71,7 +71,7 @@ class OperationsController extends AbstractController { global $cfg, $db, $server, $sql_query, $move, $message, $tables_full; global $export_sql_plugin, $views, $sqlConstratints, $local_query, $reload, $url_params, $tables; - global $total_num_tables, $sub_part, $is_show_stats, $db_is_system_schema, $tooltip_truename; + global $total_num_tables, $sub_part, $db_is_system_schema, $tooltip_truename; global $db_collation, $tooltip_aliasname, $pos, $is_information_schema, $single_table, $num_tables; $this->checkUserPrivileges->getPrivileges(); @@ -274,8 +274,7 @@ class OperationsController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Database/QueryByExampleController.php b/libraries/classes/Controllers/Database/QueryByExampleController.php index 17692f0ba6..c670bf9fb4 100644 --- a/libraries/classes/Controllers/Database/QueryByExampleController.php +++ b/libraries/classes/Controllers/Database/QueryByExampleController.php @@ -43,7 +43,7 @@ class QueryByExampleController extends AbstractController { global $db, $savedSearchList, $savedSearch, $currentSearchId, $PMA_Theme; global $sql_query, $goto, $sub_part, $tables, $num_tables, $total_num_tables; - global $is_show_stats, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos, $url_params; + global $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos, $url_params; // Gets the relation settings $cfgRelation = $this->relation->getRelationsParam(); @@ -146,8 +146,7 @@ class QueryByExampleController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php index cb2396caf2..0b1fa9870b 100644 --- a/libraries/classes/Controllers/Database/RoutinesController.php +++ b/libraries/classes/Controllers/Database/RoutinesController.php @@ -43,7 +43,7 @@ class RoutinesController extends AbstractController public function index(): void { - global $db, $table, $tables, $num_tables, $total_num_tables, $sub_part, $is_show_stats; + global $db, $table, $tables, $num_tables, $total_num_tables, $sub_part; global $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos; global $errors, $PMA_Theme, $text_dir, $err_url, $url_params, $cfg; @@ -72,8 +72,7 @@ class RoutinesController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php index 01acb0967a..53ac774937 100644 --- a/libraries/classes/Controllers/Database/SearchController.php +++ b/libraries/classes/Controllers/Database/SearchController.php @@ -32,7 +32,7 @@ class SearchController extends AbstractController public function index(): void { global $cfg, $db, $err_url, $url_params, $tables, $num_tables, $total_num_tables, $sub_part; - global $is_show_stats, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos; + global $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos; $this->addScriptFiles([ 'database/search.js', @@ -63,8 +63,7 @@ class SearchController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index 38c300a704..64e27ab5dc 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -573,7 +573,7 @@ class StructureController extends AbstractController 'db_is_system_schema' => $this->dbIsSystemSchema, 'replication' => $replicaInfo['status'], 'properties_num_columns' => $GLOBALS['cfg']['PropertiesNumColumns'], - 'is_show_stats' => $GLOBALS['is_show_stats'], + 'is_show_stats' => $this->isShowStats, 'show_charset' => $GLOBALS['cfg']['ShowDbStructureCharset'], 'show_comment' => $GLOBALS['cfg']['ShowDbStructureComment'], 'show_creation' => $GLOBALS['cfg']['ShowDbStructureCreation'], diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php index e1659fc767..eb9bb9378e 100644 --- a/libraries/classes/Controllers/Database/TrackingController.php +++ b/libraries/classes/Controllers/Database/TrackingController.php @@ -45,7 +45,7 @@ class TrackingController extends AbstractController public function index(): void { global $db, $text_dir, $url_params, $tables, $num_tables, $PMA_Theme; - global $total_num_tables, $sub_part, $is_show_stats, $pos, $data, $cfg; + global $total_num_tables, $sub_part, $pos, $data, $cfg; global $db_is_system_schema, $tooltip_truename, $tooltip_aliasname; $this->addScriptFiles(['vendor/jquery/jquery.tablesorter.js', 'database/tracking.js']); @@ -65,8 +65,7 @@ class TrackingController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php index 219de4cb99..0d90c40947 100644 --- a/libraries/classes/Controllers/Database/TriggersController.php +++ b/libraries/classes/Controllers/Database/TriggersController.php @@ -37,7 +37,7 @@ class TriggersController extends AbstractController public function index(): void { - global $db, $table, $tables, $num_tables, $total_num_tables, $sub_part, $is_show_stats; + global $db, $table, $tables, $num_tables, $total_num_tables, $sub_part; global $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos; global $errors, $url_params, $err_url, $cfg; @@ -62,8 +62,7 @@ class TriggersController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php index bae2948276..5f51bcdf6d 100644 --- a/libraries/classes/Controllers/Server/PrivilegesController.php +++ b/libraries/classes/Controllers/Server/PrivilegesController.php @@ -54,7 +54,7 @@ class PrivilegesController extends AbstractController global $db, $table, $err_url, $message, $text_dir, $post_patterns, $PMA_Theme; global $username, $hostname, $dbname, $tablename, $routinename, $db_and_table, $dbname_is_wildcard; global $queries, $password, $ret_message, $ret_queries, $queries_for_display, $sql_query, $_add_user_error; - global $itemType, $tables, $num_tables, $total_num_tables, $sub_part, $is_show_stats, $db_is_system_schema; + global $itemType, $tables, $num_tables, $total_num_tables, $sub_part, $db_is_system_schema; global $tooltip_truename, $tooltip_aliasname, $pos, $title, $export, $grants, $one_grant, $url_dbname; $checkUserPrivileges = new CheckUserPrivileges($this->dbi); @@ -355,8 +355,7 @@ class PrivilegesController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php index d0666c9e39..ee5d007810 100644 --- a/libraries/classes/Controllers/Table/TriggersController.php +++ b/libraries/classes/Controllers/Table/TriggersController.php @@ -38,7 +38,7 @@ class TriggersController extends AbstractController public function index(): void { - global $db, $table, $tables, $num_tables, $total_num_tables, $sub_part, $is_show_stats; + global $db, $table, $tables, $num_tables, $total_num_tables, $sub_part; global $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, $pos; global $errors, $url_params, $err_url, $cfg; @@ -63,8 +63,7 @@ class TriggersController extends AbstractController $tables, $num_tables, $total_num_tables, - $sub_part, - $is_show_stats, + $sub_part,, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index c96e91a2dc..d9780a5037 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -2664,7 +2664,7 @@ class Util /** * whether to display extended stats */ - $is_show_stats = $cfg['ShowStats']; + $isShowStats = $cfg['ShowStats']; /** * whether selected db is information_schema @@ -2672,7 +2672,7 @@ class Util $db_is_system_schema = false; if (Utilities::isSystemSchema($db)) { - $is_show_stats = false; + $isShowStats = false; $db_is_system_schema = true; } @@ -2801,7 +2801,7 @@ class Util $num_tables, $total_num_tables, $sub_part, - $is_show_stats, + $isShowStats, $db_is_system_schema, $tooltip_truename, $tooltip_aliasname, diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php index eabb03fa82..80f57250f7 100644 --- a/test/classes/Controllers/Database/StructureControllerTest.php +++ b/test/classes/Controllers/Database/StructureControllerTest.php @@ -166,8 +166,7 @@ class StructureControllerTest extends AbstractTestCase 16394, $sumSize ); - // Not showing statistics - $is_show_stats = false; + $controller = new StructureController( $this->response, $this->template,