From 7c86aab8f98a857afc2b7e718a082b6ceb2a57de Mon Sep 17 00:00:00 2001 From: xmujay Date: Wed, 10 Apr 2013 22:31:18 +0800 Subject: [Refactor] server_databases.php refactor: 0.split long lines 1 render the HTML element at once 2 fix code indention 3 use $html for readability --- server_databases.php | 80 ++++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 37 deletions(-) (limited to 'server_databases.php') diff --git a/server_databases.php b/server_databases.php index 8072feb88c..1031be4934 100644 --- a/server_databases.php +++ b/server_databases.php @@ -164,8 +164,9 @@ if ($server > 0) { /** * Displays the page */ +$html = ""; if ($databases_count > 0) { - echo '
'; + $html .= '
'; reset($databases); $first_database = current($databases); // table col order @@ -178,7 +179,7 @@ if ($databases_count > 0) { 'sort_order' => $sort_order, ); - echo PMA_Util::getListNavigator( + $html .= PMA_Util::getListNavigator( $databases_count, $pos, $_url_params, 'server_databases.php', 'frame_content', $GLOBALS['cfg']['MaxDbList'] ); @@ -186,14 +187,14 @@ if ($databases_count > 0) { $_url_params['pos'] = $pos; $_url_params['drop_selected_dbs'] = 1; - echo '
' . "\n"; - echo PMA_generate_common_hidden_inputs($_url_params); + $html .= '' . "\n" + $html .= '' . "\n" . '' . "\n" . '' . "\n" . ($is_superuser || $cfg['AllowUserDropDatabase'] ? ' ' . "\n" : '') @@ -213,7 +214,7 @@ if ($databases_count > 0) { } $_url_params['sort_by'] = $stat_name; $_url_params['sort_order'] = ($sort_by == $stat_name && $sort_order == 'desc') ? 'asc' : 'desc'; - echo ' ' + $html .= ' ' . '' . "\n" . ' ' . $stat['disp_name'] . "\n" . ($sort_by == $stat_name ? ' ' . PMA_Util::getImage('s_' . $sort_order . '.png', ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : '') @@ -228,15 +229,15 @@ if ($databases_count > 0) { $name = __('Slave replication'); } if (${"server_{$type}_status"}) { - echo ' ' . "\n"; + $html .= ' ' . "\n"; } } if ($is_superuser && ! PMA_DRIZZLE) { - echo ' ' . "\n"; } - echo '' . "\n" + $html .= '' . "\n" . '' . "\n" . '' . "\n"; @@ -246,7 +247,7 @@ if ($databases_count > 0) { if (PMA_is_system_schema($current['SCHEMA_NAME'], true)) { $tr_class .= ' noclick'; } - echo '' . "\n"; + $html .= '' . "\n"; $odd_row = ! $odd_row; list($column_order, $generated_html) = PMA_buildHtmlForDb( @@ -258,17 +259,18 @@ if ($databases_count > 0) { $replication_info ); - echo $generated_html; + $html .= $generated_html; - echo '' . "\n"; + $html .= '' . "\n"; } // end foreach ($databases as $key => $current) unset($current, $odd_row); - echo '' . "\n"; + $html .= '' . "\n"; if ($is_superuser || $cfg['AllowUserDropDatabase']) { - echo ' ' . "\n"; + $html .= ' ' . "\n"; } - echo ' ' . "\n"; + $html .= ' ' . "\n"; foreach ($column_order as $stat_name => $stat) { if (array_key_exists($stat_name, $first_database)) { if ($stat['format'] === 'byte') { @@ -278,32 +280,33 @@ if ($databases_count > 0) { } else { $value = htmlentities($stat['footer'], 0); } - echo ' ' . "\n"; + $html .= '' . "\n"; if ($stat['format'] === 'byte') { - echo ' ' . "\n"; + $html .= ' ' . "\n"; } } } foreach ($replication_types as $type) { if (${"server_{$type}_status"}) { - echo ' ' . "\n"; + $html .= ' ' . "\n"; } } if ($is_superuser) { - echo ' ' . "\n"; + $html .= ' ' . "\n"; } - echo '' . "\n"; - echo '' . "\n" + $html .= '' . "\n"; + $html .= '' . "\n" .'
'. $name .''. $name .'' . ($cfg['PropertiesIconic'] ? '' : __('Action')) . "\n" + $html .= ' ' . ($cfg['PropertiesIconic'] ? '' : __('Action')) . "\n" . '
' . __('Total') . ': ' . $databases_count . '' . __('Total') . ': ' + . $databases_count . ''; + $html .= ' '; if (isset($stat['description_function'])) { - echo ''; + $html .= ''; } - echo $value; + $html .= $value; if (isset($stat['description_function'])) { - echo ''; + $html .= ''; } - echo '' . $unit . '' . $unit . '
' . "\n"; unset($column_order, $stat_name, $stat, $databases, $table_columns); @@ -315,12 +318,13 @@ if ($databases_count > 0) { 'dbstats' => $dbstats ) ); - echo '' . __('With selected:') . '' . "\n" . ' ' . ' ' . '' . __('With selected:') . '' . "\n"; - echo PMA_Util::getButtonOrImage( + $html .= PMA_Util::getButtonOrImage( '', 'mult_submit' . ' ajax', 'drop_selected_dbs', @@ -329,21 +333,23 @@ if ($databases_count > 0) { } if (empty($dbstats)) { - echo '' . "\n"; } - echo '
'; - echo '
'; + $html .= ''; + $html .= '
'; } else { - echo __('No databases'); + $html .= __('No databases'); } unset($databases_count); +echo $html; + ?> -- cgit v1.2.3 From 42fcc5f6f6ee85799ceada864a1342cd9b2350c8 Mon Sep 17 00:00:00 2001 From: xmujay Date: Wed, 10 Apr 2013 23:07:02 +0800 Subject: merge with $html="" with php statements below --- server_databases.php | 1 - 1 file changed, 1 deletion(-) (limited to 'server_databases.php') diff --git a/server_databases.php b/server_databases.php index 1031be4934..8faae0b54a 100644 --- a/server_databases.php +++ b/server_databases.php @@ -164,7 +164,6 @@ if ($server > 0) { /** * Displays the page */ -$html = ""; if ($databases_count > 0) { $html .= '
'; reset($databases); -- cgit v1.2.3 From c2685a8b332ac91d7dbf065cb4c66fbe96a6ad1d Mon Sep 17 00:00:00 2001 From: xmujay Date: Wed, 10 Apr 2013 23:32:46 +0800 Subject: fix some indention --- server_databases.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'server_databases.php') diff --git a/server_databases.php b/server_databases.php index 8faae0b54a..a992f1fc2a 100644 --- a/server_databases.php +++ b/server_databases.php @@ -194,13 +194,13 @@ if ($databases_count > 0) { $_url_params['sort_order'] = ($sort_by == 'SCHEMA_NAME' && $sort_order == 'asc') ? 'desc' : 'asc'; $html .= '' . "\n" - . '' . "\n" - . '' . "\n" - . ($is_superuser || $cfg['AllowUserDropDatabase'] ? ' ' . "\n" : '') - . ' ' . "\n"; + . '' . "\n" + . '' . "\n" + . ($is_superuser || $cfg['AllowUserDropDatabase'] ? ' ' . "\n" : '') + . ' ' . "\n"; $table_columns = 3; foreach ($column_order as $stat_name => $stat) { if (array_key_exists($stat_name, $first_database)) { @@ -234,11 +234,11 @@ if ($databases_count > 0) { if ($is_superuser && ! PMA_DRIZZLE) { $html .= ' ' . "\n"; + . ' ' . "\n"; } $html .= '' . "\n" - . '' . "\n" - . '' . "\n"; + . '' . "\n" + . '' . "\n"; $odd_row = true; foreach ($databases as $current) { @@ -319,10 +319,10 @@ if ($databases_count > 0) { ); $html .= '' . __('With selected:') . '' . "\n" - . ' ' - . ' ' - . '' . __('With selected:') . '' . "\n"; + . ' width="38" height="22" alt="' . __('With selected:') . '" />' . "\n" + . ' ' + . ' ' + . '' . __('With selected:') . '' . "\n"; $html .= PMA_Util::getButtonOrImage( '', 'mult_submit' . ' ajax', -- cgit v1.2.3 From 1871c9007218fd3f407bc44859a8bddb04b35194 Mon Sep 17 00:00:00 2001 From: xmujay Date: Thu, 11 Apr 2013 09:49:17 +0800 Subject: add $html definition --- server_databases.php | 1 + 1 file changed, 1 insertion(+) (limited to 'server_databases.php') diff --git a/server_databases.php b/server_databases.php index a992f1fc2a..e4d4766136 100644 --- a/server_databases.php +++ b/server_databases.php @@ -164,6 +164,7 @@ if ($server > 0) { /** * Displays the page */ +$html = ''; if ($databases_count > 0) { $html .= '
'; reset($databases); -- cgit v1.2.3
' . "\n" - . ' ' . __('Database') . "\n" - . ($sort_by == 'SCHEMA_NAME' ? ' ' . PMA_Util::getImage('s_' . $sort_order . '.png', ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : '') - . '
' . "\n" + . ' ' . __('Database') . "\n" + . ($sort_by == 'SCHEMA_NAME' ? ' ' . PMA_Util::getImage('s_' . $sort_order . '.png', ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : '') + . ' ' . ($cfg['PropertiesIconic'] ? '' : __('Action')) . "\n" - . '