From d291827444206eeaf25399020ad6a3d98a5e2766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 26 Jul 2010 16:20:24 +0200 Subject: [PATCH] No need to require_once footer It is the last thing executed anyway (ends with exit). --- chk_rel.php | 2 +- db_datadict.php | 2 +- db_export.php | 2 +- db_operations.php | 2 +- db_printview.php | 2 +- db_qbe.php | 4 ++-- db_search.php | 2 +- db_sql.php | 2 +- db_structure.php | 4 ++-- db_tracking.php | 4 ++-- export.php | 2 +- libraries/auth/config.auth.lib.php | 2 +- libraries/common.lib.php | 2 +- libraries/mult_submits.inc.php | 2 +- main.php | 2 +- pdf_pages.php | 10 +++++----- pdf_schema.php | 2 +- server_binlog.php | 2 +- server_collations.php | 2 +- server_databases.php | 2 +- server_engines.php | 2 +- server_export.php | 2 +- server_privileges.php | 6 +++--- server_processlist.php | 2 +- server_replication.php | 6 +++--- server_sql.php | 2 +- server_status.php | 2 +- server_synchronize.php | 2 +- server_variables.php | 2 +- sql.php | 4 ++-- tbl_addfield.php | 2 +- tbl_alter.php | 2 +- tbl_change.php | 4 ++-- tbl_create.php | 2 +- tbl_export.php | 2 +- tbl_import.php | 2 +- tbl_indexes.php | 2 +- tbl_operations.php | 2 +- tbl_printview.php | 2 +- tbl_relation.php | 2 +- tbl_row_action.php | 4 ++-- tbl_select.php | 2 +- tbl_sql.php | 2 +- tbl_structure.php | 2 +- tbl_tracking.php | 2 +- transformation_overview.php | 2 +- user_password.php | 6 +++--- view_create.php | 2 +- view_operations.php | 2 +- 49 files changed, 65 insertions(+), 65 deletions(-) diff --git a/chk_rel.php b/chk_rel.php index 0f965ac59..8955350b0 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -21,5 +21,5 @@ $cfgRelation = PMA_getRelationsParam(TRUE); /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_datadict.php b/db_datadict.php index b20011387..7666b567a 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -320,5 +320,5 @@ function printPage()
'; -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_export.php b/db_export.php index dce374a4b..a44469ef2 100644 --- a/db_export.php +++ b/db_export.php @@ -72,5 +72,5 @@ require_once './libraries/display_export.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_operations.php b/db_operations.php index f235de983..5d4844051 100644 --- a/db_operations.php +++ b/db_operations.php @@ -501,5 +501,5 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_printview.php b/db_printview.php index 97f8a77fd..36f297c99 100644 --- a/db_printview.php +++ b/db_printview.php @@ -264,5 +264,5 @@ function printPage() id="print" value="" onclick="printPage()" /> diff --git a/db_qbe.php b/db_qbe.php index 2156683a5..5599bad5d 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -98,7 +98,7 @@ $tbl_result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', $tbl_result_cnt = PMA_DBI_num_rows($tbl_result); if (0 == $tbl_result_cnt) { PMA_Message::error(__('No tables found in database.'))->display(); - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; exit; } @@ -939,5 +939,5 @@ if (!empty($qry_orderby)) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_search.php b/db_search.php index e57c16106..0b68ba3d4 100644 --- a/db_search.php +++ b/db_search.php @@ -350,5 +350,5 @@ $alter_select = /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_sql.php b/db_sql.php index 27194b08d..986fb3417 100644 --- a/db_sql.php +++ b/db_sql.php @@ -41,5 +41,5 @@ PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimit /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_structure.php b/db_structure.php index 077dcab45..899fa9515 100644 --- a/db_structure.php +++ b/db_structure.php @@ -56,7 +56,7 @@ if ($num_tables == 0) { /** * Displays the footer */ - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; exit; } @@ -599,5 +599,5 @@ if (empty($db_is_information_schema)) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_tracking.php b/db_tracking.php index aa0d9e457..2ff54f0ef 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -35,7 +35,7 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) { } // Display the footer - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; exit; } @@ -199,5 +199,5 @@ if (count($data['ddlog']) > 0) { /** * Display the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/export.php b/export.php index b1208bf77..00639e22a 100644 --- a/export.php +++ b/export.php @@ -667,6 +667,6 @@ else { //]]> diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index e16d1894f..3a9f82b8f 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -131,7 +131,7 @@ function PMA_auth_fails() echo '' . "\n"; } echo '' . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; return TRUE; } // end of the 'PMA_auth_fails()' function diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 86e49a901..c9a0f1153 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -666,7 +666,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', * display footer and exit */ - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } else { echo $error_msg_output; } diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 2fab680e5..fe614e7a6 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -261,7 +261,7 @@ if (!empty($submit_mult) && !empty($what)) { diff --git a/pdf_pages.php b/pdf_pages.php index f026ca651..75d4622fd 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -38,24 +38,24 @@ $query_default_option = PMA_DBI_QUERY_STORE; if (!$cfgRelation['relwork']) { echo sprintf(__('%s table not found or not set in %s'), 'relation', 'config.inc.php') . '
' . "\n" . PMA_showDocu('relation') . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if (!$cfgRelation['displaywork']) { echo sprintf(__('%s table not found or not set in %s'), 'table_info', 'config.inc.php') . '
' . "\n" . PMA_showDocu('table_info') . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if (!isset($cfgRelation['table_coords'])){ echo sprintf(__('%s table not found or not set in %s'), 'table_coords', 'config.inc.php') . '
' . "\n" . PMA_showDocu('table_coords') . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if (!isset($cfgRelation['pdf_pages'])) { echo sprintf(__('%s table not found or not set in %s'), 'pdf_page', 'config.inc.php') . '
' . "\n" . PMA_showDocu('pdf_pages') . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if ($cfgRelation['pdfwork']) { @@ -555,5 +555,5 @@ ToggleDragDrop('pdflayout'); * Displays the footer */ echo "\n"; -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/pdf_schema.php b/pdf_schema.php index 0142512b4..a1c16e6bb 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -239,7 +239,7 @@ class PMA_PDF extends TCPDF { . '">' . __('Back') . ''; echo "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } // end of the "PMA_PDF_die()" function /** * Aliases the "Error()" function from the FPDF class to the diff --git a/server_binlog.php b/server_binlog.php index bfa4e0701..60a5b57af 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -234,6 +234,6 @@ while ($value = PMA_DBI_fetch_assoc($result)) { /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_collations.php b/server_collations.php index b6482cd84..27fec06b4 100644 --- a/server_collations.php +++ b/server_collations.php @@ -95,6 +95,6 @@ unset($table_row_count); echo '' . "\n" . '' . "\n"; -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_databases.php b/server_databases.php index 16b2cdc33..7aeee672c 100644 --- a/server_databases.php +++ b/server_databases.php @@ -382,6 +382,6 @@ if ($cfg['ShowCreateDb']) { /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_engines.php b/server_engines.php index 5ef4e6fbe..7bdccc8a9 100644 --- a/server_engines.php +++ b/server_engines.php @@ -159,6 +159,6 @@ if (empty($_REQUEST['engine']) /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_export.php b/server_export.php index f9808d8e5..7b568fd49 100644 --- a/server_export.php +++ b/server_export.php @@ -47,5 +47,5 @@ require_once './libraries/display_export.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_privileges.php b/server_privileges.php index 9577d77c8..cd5afe75a 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -110,7 +110,7 @@ if (!$is_superuser) { . __('Privileges') . "\n" . '' . "\n"; PMA_Message::error(__('No Privileges'))->display(); - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } /** @@ -1679,7 +1679,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if ($user_does_not_exists) { PMA_Message::warning(__('The selected user was not found in the privilege table.'))->display(); PMA_displayLoginInformationFields(); - //require_once './libraries/footer.inc.php'; + //require './libraries/footer.inc.php'; } echo '
' . "\n"; @@ -2219,6 +2219,6 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs * Displays the footer */ echo "\n\n"; -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_processlist.php b/server_processlist.php index 58f4813fa..337d917d3 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -88,5 +88,5 @@ while($process = PMA_DBI_fetch_assoc($result)) { /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_replication.php b/server_replication.php index 9ac18164f..6c410fadf 100644 --- a/server_replication.php +++ b/server_replication.php @@ -31,7 +31,7 @@ if (! $is_superuser) { . __('Replication') . "\n" . '' . "\n"; PMA_Message::error(__('No Privileges'))->display(); - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } /** @@ -234,7 +234,7 @@ if (isset($GLOBALS['mr_configure'])) { echo '
'; echo ''; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; exit; } @@ -358,5 +358,5 @@ if (! isset($GLOBALS['repl_clear_scr'])) { if (isset($GLOBALS['sl_configure'])) { PMA_replication_gui_changemaster("slave_changemaster"); } -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_sql.php b/server_sql.php index 73c137975..6a4fc6832 100644 --- a/server_sql.php +++ b/server_sql.php @@ -31,5 +31,5 @@ PMA_sqlQueryForm(); /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_status.php b/server_status.php index 30edca2c8..bcbfe06d0 100644 --- a/server_status.php +++ b/server_status.php @@ -847,5 +847,5 @@ if ($server_master_status || $server_slave_status) /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_synchronize.php b/server_synchronize.php index 6f0941b28..32a6cb533 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1214,5 +1214,5 @@ if (isset($_REQUEST['synchronize_db'])) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_variables.php b/server_variables.php index db156a212..4616395ac 100644 --- a/server_variables.php +++ b/server_variables.php @@ -107,6 +107,6 @@ foreach ($serverVars as $name => $value) { /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/sql.php b/sql.php index 703cc291e..28c645810 100644 --- a/sql.php +++ b/sql.php @@ -198,7 +198,7 @@ if ($do_confirm) { /** * Displays the footer and exit */ - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } // end if $do_confirm @@ -700,5 +700,5 @@ window.onload = function() /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_addfield.php b/tbl_addfield.php index 40b9ab2d8..e32ba3085 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -224,7 +224,7 @@ if ($abort == false) { require_once './libraries/tbl_properties.inc.php'; // Diplays the footer - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } ?> diff --git a/tbl_alter.php b/tbl_alter.php index e4a12b53a..d990f0386 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -200,5 +200,5 @@ if ($abort == false) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_change.php b/tbl_change.php index 150e73bc4..8ec78f544 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -174,7 +174,7 @@ if (isset($where_clause)) { unset($rows[$key_id], $where_clause_array[$key_id]); PMA_showMessage(__('MySQL returned an empty result set (i.e. zero rows).'), $local_query); echo "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } else { // end if (no row returned) $meta = PMA_DBI_get_fields_meta($result[$key_id]); list($unique_condition, $tmp_clause_is_unique) = PMA_getUniqueCondition($result[$key_id], count($meta), $meta, $rows[$key_id], true); @@ -1111,5 +1111,5 @@ if ($insert_mode) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_create.php b/tbl_create.php index fc3fe655c..bffc93497 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -272,5 +272,5 @@ if (isset($_REQUEST['do_save_data'])) { */ require './libraries/tbl_properties.inc.php'; // Displays the footer -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_export.php b/tbl_export.php index eeaf24815..959a95dc9 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -88,5 +88,5 @@ require_once './libraries/display_export.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_import.php b/tbl_import.php index ead8ff0e7..6fb74cd2a 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -28,6 +28,6 @@ require_once './libraries/display_import.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_indexes.php b/tbl_indexes.php index eb6deb9bd..166c6aa6c 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -261,5 +261,5 @@ echo ' diff --git a/tbl_operations.php b/tbl_operations.php index 5e0e66b4a..829ed1316 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -743,7 +743,7 @@ if ($cfgRelation['relwork'] && ! $is_innodb) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; function PMA_set_global_variables_for_engine($tbl_type) diff --git a/tbl_printview.php b/tbl_printview.php index 4fd966d4c..74b6818e4 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -496,5 +496,5 @@ function printPage() onclick="printPage()" />

diff --git a/tbl_relation.php b/tbl_relation.php index c05787614..68288e11a 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -569,5 +569,5 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_row_action.php b/tbl_row_action.php index 62fc2044a..8a9db7a58 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -28,7 +28,7 @@ if (! PMA_isValid($_REQUEST['rows_to_delete'], 'array') $disp_message = __('No rows selected'); $disp_query = ''; require './sql.php'; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if (isset($_REQUEST['submit_mult'])) { @@ -148,7 +148,7 @@ if (!empty($submit_mult)) { /** * Displays the footer */ - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; break; } } diff --git a/tbl_select.php b/tbl_select.php index 31c25cb68..d47baf791 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -324,7 +324,7 @@ $(function() { diff --git a/tbl_structure.php b/tbl_structure.php index 82893ac87..e78fd85c5 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -842,5 +842,5 @@ echo '
' . "\n"; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_tracking.php b/tbl_tracking.php index f7765b1c8..6ba754310 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -691,5 +691,5 @@ if ($last_version > 0) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/transformation_overview.php b/transformation_overview.php index acf2ca489..81211d564 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -77,5 +77,5 @@ foreach ($types['transformation'] as $key => $transform) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/user_password.php b/user_password.php index 89bc1385f..cd84b790a 100644 --- a/user_password.php +++ b/user_password.php @@ -47,7 +47,7 @@ if (!$cfg['ShowChgPassword']) { if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) { require_once './libraries/header.inc.php'; PMA_Message::error(__('You don\'t have sufficient privileges to be here right now!'))->display(); - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } // end if @@ -109,7 +109,7 @@ if (isset($_REQUEST['nopass'])) { diff --git a/view_create.php b/view_create.php index a1de4cc5b..c7d63cef7 100644 --- a/view_create.php +++ b/view_create.php @@ -186,6 +186,6 @@ $url_params['reload'] = 1; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/view_operations.php b/view_operations.php index 08c26d6e1..aabb7d1aa 100644 --- a/view_operations.php +++ b/view_operations.php @@ -106,5 +106,5 @@ $url_params['back'] = 'view_operations.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?>