From 9b7f2180df40afd85ec3c5584217d4ef0f8d525e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 9 Feb 2013 07:36:10 -0500 Subject: [PATCH 1/2] Bug #3816 Missing server_processlist.php --- ChangeLog | 1 + Documentation.html | 3 +-- libraries/common.inc.php | 1 - libraries/config.default.php | 1 - libraries/config.values.php | 3 +-- libraries/server_links.inc.php | 4 ---- server_status.php | 2 -- test/theme.php | 5 ----- 8 files changed, 3 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4206bdfa3d..70aa5b90d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 3.5.7.0 (not yet released) - bug #3779 [core] Problem with backslash in enum fields +- bug #3816 Missing server_processlist.php 3.5.6.0 (2013-01-28) - bug #3593604 [status] Erroneous advisor rule diff --git a/Documentation.html b/Documentation.html index deedd14782..3262363073 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1776,8 +1776,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE
Defines the tab displayed by default on server view. Possible values: "main.php" (recommended for multi-user setups), "server_databases.php", "server_status.php", - "server_variables.php", "server_privileges.php" - or "server_processlist.php".
+ "server_variables.php" or "server_privileges.php".
$cfg['DefaultTabDatabase'] string
Defines the tab displayed by default on database view. Possible diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 5c25a7a9cf..9f07f76100 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -417,7 +417,6 @@ $goto_whitelist = array( 'server_export.php', 'server_import.php', 'server_privileges.php', - 'server_processlist.php', 'server_sql.php', 'server_status.php', 'server_variables.php', diff --git a/libraries/config.default.php b/libraries/config.default.php index 6bde9dd7a4..5d2ca2a63b 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1139,7 +1139,6 @@ $cfg['PropertiesNumColumns'] = 1; * 'server_status.php' = runtime information * 'server_variables.php' = MySQL server variables * 'server_privileges.php' = user management - * 'server_processlist.php' = process list * * @global string $cfg['DefaultTabServer'] */ diff --git a/libraries/config.values.php b/libraries/config.values.php index 6abe3bfee5..812eddf262 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -54,8 +54,7 @@ $cfg_db['DefaultTabServer'] = array( 'server_databases.php', // list of databases 'server_status.php', // runtime information 'server_variables.php', // MySQL server variables - 'server_privileges.php', // user management - 'server_processlist.php'); // process list + 'server_privileges.php'); // user management $cfg_db['DefaultTabDatabase'] = array( 'db_structure.php', // tables list 'db_sql.php', // SQL form diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 489f022b84..ea32952317 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -50,10 +50,6 @@ if (!$GLOBALS['is_ajax_request']) { $tabs['status']['link'] = 'server_status.php'; $tabs['status']['text'] = __('Status'); - /*$tabs['process']['icon'] = 's_process.png'; - $tabs['process']['link'] = 'server_processlist.php'; - $tabs['process']['text'] = __('Processes');*/ - if ($is_superuser && !PMA_DRIZZLE) { $tabs['rights']['icon'] = 's_rights.png'; $tabs['rights']['link'] = 'server_privileges.php'; diff --git a/server_status.php b/server_status.php index 24607eb0bd..282b6430b5 100644 --- a/server_status.php +++ b/server_status.php @@ -637,8 +637,6 @@ $links['qcache'][__('Flush query cache')] PMA_generate_common_url(); $links['qcache']['doc'] = 'query_cache'; -//$links['threads'][__('Show processes')] -// = 'server_processlist.php?' . PMA_generate_common_url(); $links['threads']['doc'] = 'mysql_threads'; $links['key']['doc'] = 'myisam_key_cache'; diff --git a/test/theme.php b/test/theme.php index 7dc63e0e2f..43bfbb6789 100644 --- a/test/theme.php +++ b/test/theme.php @@ -123,11 +123,6 @@ $tabs['binlog']['icon'] = 'ic_s_tbl'; $tabs['binlog']['link'] = 'server_binlog.php'; $tabs['binlog']['text'] = __('Binary log'); -$tabs['process']['icon'] = 'ic_s_process'; -$tabs['process']['link'] = 'server_processlist.php'; -$tabs['process']['text'] = 'caution'; -$tabs['process']['class'] = 'caution'; - $tabs['export']['icon'] = 'ic_b_export'; $tabs['export']['text'] = 'disabled'; From bcfba0d46c3996ea7d99c79c34b268d0e678d5c3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 9 Feb 2013 07:50:16 -0500 Subject: [PATCH 2/2] Fix merge conflicts --- ChangeLog | 1 + doc/config.rst | 1 - libraries/ServerStatusData.class.php | 2 -- libraries/common.inc.php | 1 - libraries/config.default.php | 1 - libraries/config.values.php | 3 +-- test/theme.php | 5 ----- 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fab40bbf8..e84ddc6fab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ VerboseMultiSubmit, ReplaceHelpImg 3.5.7.0 (not yet released) - bug #3779 [core] Problem with backslash in enum fields +- bug #3816 Missing server_processlist.php 3.5.6.0 (2013-01-28) - bug #3593604 [status] Erroneous advisor rule diff --git a/doc/config.rst b/doc/config.rst index 4c77ca2398..f46d0bf059 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1711,7 +1711,6 @@ Tabs display settings * ``server_status.php`` * ``server_variables.php`` * ``server_privileges.php`` - * ``server_processlist.php`` .. config:option:: $cfg['DefaultTabDatabase'] diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php index ddcc9d54dd..de23d47e87 100644 --- a/libraries/ServerStatusData.class.php +++ b/libraries/ServerStatusData.class.php @@ -228,8 +228,6 @@ class PMA_ServerStatusData PMA_generate_common_url(); $links['qcache']['doc'] = 'query_cache'; - //$links['threads'][__('Show processes')] - // = 'server_processlist.php?' . PMA_generate_common_url(); $links['threads']['doc'] = 'mysql_threads'; $links['key']['doc'] = 'myisam_key_cache'; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 34964fac7c..5e0976827d 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -388,7 +388,6 @@ $goto_whitelist = array( 'server_export.php', 'server_import.php', 'server_privileges.php', - 'server_processlist.php', 'server_sql.php', 'server_status.php', 'server_status_advisor.php', diff --git a/libraries/config.default.php b/libraries/config.default.php index 1019d27687..8b1ce032e9 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1171,7 +1171,6 @@ $cfg['PropertiesNumColumns'] = 1; * 'server_status.php' = runtime information * 'server_variables.php' = MySQL server variables * 'server_privileges.php' = user management - * 'server_processlist.php' = process list * * @global string $cfg['DefaultTabServer'] */ diff --git a/libraries/config.values.php b/libraries/config.values.php index a62bfb9a2f..b38526cf7c 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -75,8 +75,7 @@ $cfg_db['DefaultTabServer'] = array( 'server_databases.php', // list of databases 'server_status.php', // runtime information 'server_variables.php', // MySQL server variables - 'server_privileges.php', // user management - 'server_processlist.php' // process list + 'server_privileges.php' // user management ); $cfg_db['DefaultTabDatabase'] = array( 'db_structure.php', // tables list diff --git a/test/theme.php b/test/theme.php index f0309d6554..444c91de89 100644 --- a/test/theme.php +++ b/test/theme.php @@ -126,11 +126,6 @@ $tabs['binlog']['icon'] = 's_tbl.png'; $tabs['binlog']['link'] = 'server_binlog.php'; $tabs['binlog']['text'] = __('Binary log'); -$tabs['process']['icon'] = 's_process.png'; -$tabs['process']['link'] = 'server_processlist.php'; -$tabs['process']['text'] = 'caution'; -$tabs['process']['class'] = 'caution'; - $tabs['export']['icon'] = 'b_export.png'; $tabs['export']['text'] = 'disabled';