diff options
65 files changed, 30 insertions, 314 deletions
diff --git a/db_datadict.php b/db_datadict.php index cf77a38904..506a1ba09a 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -283,5 +283,4 @@ foreach ($tables as $table) { */ PMA_printButton(); -require 'libraries/footer.inc.php'; ?> diff --git a/db_export.php b/db_export.php index a7d2bb162c..00f518f22c 100644 --- a/db_export.php +++ b/db_export.php @@ -31,7 +31,6 @@ $export_page_title = __('View dump (schema) of database'); // exit if no tables in db found if ($num_tables < 1) { PMA_Message::error(__('No tables found in database.'))->display(); - include 'libraries/footer.inc.php'; exit; } // end if @@ -84,8 +83,4 @@ $multi_values .= '</select></div>'; $export_type = 'database'; require_once 'libraries/display_export.lib.php'; -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/db_import.php b/db_import.php index 39ec68004d..f8ea8097ac 100644 --- a/db_import.php +++ b/db_import.php @@ -24,9 +24,5 @@ require 'libraries/db_info.inc.php'; $import_type = 'database'; require 'libraries/display_import.lib.php'; -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/db_operations.php b/db_operations.php index b2d29a1ee5..4e77fe8822 100644 --- a/db_operations.php +++ b/db_operations.php @@ -636,8 +636,4 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> echo __('Edit or export relational schema') . '</a></fieldset></div>'; } // end if -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/db_printview.php b/db_printview.php index a32de036d4..d3433ea918 100644 --- a/db_printview.php +++ b/db_printview.php @@ -248,6 +248,4 @@ if ($num_tables == 0) { PMA_printButton(); echo "<div id='PMA_disable_floating_menubar'></div>\n"; - -require 'libraries/footer.inc.php'; ?> diff --git a/db_qbe.php b/db_qbe.php index 27ba771966..df022b4873 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -102,7 +102,6 @@ $tbl_result = PMA_DBI_query( $tbl_result_cnt = PMA_DBI_num_rows($tbl_result); if (0 == $tbl_result_cnt) { PMA_Message::error(__('No tables found in database.'))->display(); - include 'libraries/footer.inc.php'; exit; } @@ -949,9 +948,3 @@ if (! empty($qry_orderby)) { </fieldset> </div> </form> -<?php -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; -?> diff --git a/db_search.php b/db_search.php index 4d12e8fe3a..1222e42d41 100644 --- a/db_search.php +++ b/db_search.php @@ -371,9 +371,3 @@ $alter_select <!-- toggle query box link--> <a id="togglequerybox"></a> -<?php -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; -?> diff --git a/db_sql.php b/db_sql.php index aa82ef946b..baced44072 100644 --- a/db_sql.php +++ b/db_sql.php @@ -62,8 +62,4 @@ PMA_sqlQueryForm( isset($_REQUEST['delimiter']) ? htmlspecialchars($_REQUEST['delimiter']) : ';' ); -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/db_structure.php b/db_structure.php index cb5a765fa7..d711e0e75a 100644 --- a/db_structure.php +++ b/db_structure.php @@ -89,11 +89,6 @@ if ($num_tables == 0) { if (empty($db_is_information_schema)) { include 'libraries/display_create_table.lib.php'; } // end if (Create Table dialog) - - /** - * Displays the footer - */ - include_once 'libraries/footer.inc.php'; exit; } @@ -759,8 +754,4 @@ if (empty($db_is_information_schema)) { include 'libraries/display_create_table.lib.php'; } // end if (Create Table dialog) -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/db_tracking.php b/db_tracking.php index 5cc0b90e30..91b33147a3 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -52,9 +52,6 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) { if (empty($db_is_information_schema)) { include 'libraries/display_create_table.lib.php'; } - - // Display the footer - include 'libraries/footer.inc.php'; exit; } @@ -231,8 +228,4 @@ if (count($data['ddlog']) > 0) { echo PMA_getMessage(__('Database Log'), $log); } -/** - * Display the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/export.php b/export.php index c79ebe9e4e..48dbb58a56 100644 --- a/export.php +++ b/export.php @@ -765,7 +765,7 @@ if (! empty($asfile)) { } } - /* If ve saved on server, we have to close file now */ + /* If we saved on server, we have to close file now */ if ($save_on_server) { $write_result = @fwrite($file_handle, $dump_buffer); fclose($file_handle); @@ -797,6 +797,7 @@ if (! empty($asfile)) { } exit(); } else { + PMA_Response::getInstance()->disable(); echo $dump_buffer; } } else { @@ -834,6 +835,5 @@ if (! empty($asfile)) { //]]> </script> <?php - include 'libraries/footer.inc.php'; } // end if ?> diff --git a/import.php b/import.php index 7dcf9966c6..cc8cd5f811 100644 --- a/import.php +++ b/import.php @@ -94,7 +94,7 @@ if ($_POST == array() && $_GET == array()) { $_SESSION['Import_message']['go_back_url'] = $goto; $message->display(); - include 'libraries/footer.inc.php'; + exit; // the footer is displayed automatically } /** @@ -524,5 +524,4 @@ if ($go_sql) { $active_page = $goto; include '' . $goto; } -exit(); ?> diff --git a/js/common.js b/js/common.js index 79453153cb..449f35ff94 100644 --- a/js/common.js +++ b/js/common.js @@ -159,7 +159,7 @@ function markDbTable(db, table) } /** - * sets current selected server, table and db (called from libraries/footer.inc.php) + * sets current selected server, table and db (called from the footer) */ function setAll( new_lang, new_collation_connection, new_server, new_db, new_table, new_token ) { diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php index 013c0f0235..e11a2f49c6 100644 --- a/libraries/PDF.class.php +++ b/libraries/PDF.class.php @@ -88,7 +88,7 @@ class PMA_PDF extends TCPDF $response = PMA_Response::getInstance(); $response->getHeader()->display(); PMA_Message::error(__('Error while creating PDF:') . ' ' . $error_message)->display(); - include './libraries/footer.inc.php'; + exit; } /** diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 01a32d4cc3..a6ed1e640d 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -703,10 +703,7 @@ function PMA_mysqlDie( } echo $error_msg; - /** - * display footer and exit - */ - include './libraries/footer.inc.php'; + exit; } else { echo $error_msg; } diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index f21a71bc9d..37cc81b4c3 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -38,7 +38,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp /* Fail if we didn't find any plugin */ if (empty($export_list)) { PMA_Message::error(__('Could not load export plugins, please check your installation!'))->display(); - include './libraries/footer.inc.php'; + exit; } ?> diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index b25a679525..7d5d5fb950 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -21,7 +21,7 @@ $import_list = PMA_getPlugins('./libraries/import/', $import_type); /* Fail if we didn't find any plugin */ if (empty($import_list)) { PMA_Message::error(__('Could not load import plugins, please check your installation!'))->display(); - include './libraries/footer.inc.php'; + exit; } ?> diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php deleted file mode 100644 index 1f5e448c87..0000000000 --- a/libraries/footer.inc.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * finishes HTML output - * - * updates javascript variables in index.php for correct working with querywindow - * and navigation frame refreshing - * - * send buffered data if buffered - * - * WARNING: This script has to be included at the very end of your code because - * it will stop the script execution! - * - * always use $GLOBALS, as this script is also included by functions - * - * @package PhpMyAdmin - */ -if (! defined('PHPMYADMIN')) { - exit; -} - -//$footer = PMA_Response::getInstance()->getFooter(); -//$footer->display(); - -exit; - -?> diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 4500c393e2..007c1a3eb1 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -126,8 +126,7 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id, if (! $rows[$key_id]) { 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"; - include 'libraries/footer.inc.php'; + exit; } else {// end if (no row returned) $meta = PMA_DBI_get_fields_meta($result[$key_id]); list($unique_condition, $tmp_clause_is_unique) diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 5b7dd44ea8..856742a021 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -324,7 +324,7 @@ if (!empty($submit_mult) && !empty($what)) { </fieldset> <?php } - include './libraries/footer.inc.php'; + exit; } elseif ($mult_btn == __('Yes')) { /** diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index de8bbf5e03..55d7b9c02e 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -205,9 +205,8 @@ function PMA_EVN_handleEditor() } else { echo "\n\n<h2>$title</h2>\n\n$editor"; unset($_POST); - include './libraries/footer.inc.php'; } - // exit; + exit; } else { $message = __('Error in processing request') . ' : '; $message .= sprintf( diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index fa5226bda9..b9a559ac8b 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -87,11 +87,4 @@ case 'EVN': break; } -/** - * Display the footer, if necessary - */ -if ($GLOBALS['is_ajax_request'] != true) { - include './libraries/footer.inc.php'; -} - ?> diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 69cda0d833..da85edd8ee 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -366,8 +366,7 @@ function PMA_RTN_handleEditor() PMA_ajaxResponse($editor, true, $extra_data); } echo "\n\n<h2>$title</h2>\n\n$editor"; - include './libraries/footer.inc.php'; - // exit; + exit; } else { $message = __('Error in processing request') . ' : '; $message .= sprintf( @@ -1317,8 +1316,7 @@ function PMA_RTN_handleExecute() } else { echo "\n\n<h2>" . __("Execute routine") . "</h2>\n\n"; echo $form; - include './libraries/footer.inc.php'; - // exit; + exit; } } else if (($GLOBALS['is_ajax_request'] == true)) { $message = __('Error in processing request') . ' : '; diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 11a4592bb5..25414eadd3 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -180,9 +180,8 @@ function PMA_TRI_handleEditor() } else { echo "\n\n<h2>$title</h2>\n\n$editor"; unset($_POST); - include './libraries/footer.inc.php'; } - // exit; + exit; } else { $message = __('Error in processing request') . ' : '; $message .= sprintf( diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index 26bc8f19cd..3c61e8e07e 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -239,8 +239,7 @@ class PMA_Export_Relation_Schema . '&do=selectpage&chpage=' . $pageNumber . '&action_choose=0' . '">' . __('Back') . '</a>'; echo "\n"; - include_once './libraries/footer.inc.php'; - exit(); + exit; } } ?> @@ -453,9 +453,4 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu } echo '</li>'; } - -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/prefs_forms.php b/prefs_forms.php index 5b7c435667..b0ae664978 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -89,9 +89,4 @@ if ($form_display->hasErrors()) { <?php } $form_display->display(true, true); - -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/prefs_manage.php b/prefs_manage.php index 94977aa6de..ff639e082b 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -133,8 +133,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == <input type="submit" name="submit_ignore" value="<?php echo __('No') ?>" /> </form> <?php - include 'libraries/footer.inc.php'; - return; + exit; } // check for ThemeDefault and fontsize @@ -339,9 +338,3 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@')); </div> <br class="clearfloat" /> </div> -<?php -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; -?> diff --git a/schema_edit.php b/schema_edit.php index e472ab5f6e..6067cb42b7 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -35,24 +35,24 @@ $cfgRelation = PMA_getRelationsParam(); if (! $cfgRelation['relwork']) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'relation', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('relation') . "\n"; - include_once 'libraries/footer.inc.php'; + exit; } if (! $cfgRelation['displaywork']) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_info', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('table_info') . "\n"; - include_once 'libraries/footer.inc.php'; + exit; } if (! isset($cfgRelation['table_coords'])) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_coords', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('table_coords') . "\n"; - include_once 'libraries/footer.inc.php'; + exit; } if (! isset($cfgRelation['pdf_pages'])) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'pdf_page', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('pdf_pages') . "\n"; - include_once 'libraries/footer.inc.php'; + exit; } if ($cfgRelation['pdfwork']) { @@ -123,9 +123,4 @@ if ($cfgRelation['pdfwork']) { } // end if } // end if ($cfgRelation['pdfwork']) -/** - * Displays the footer - */ -echo "\n"; -require_once 'libraries/footer.inc.php'; ?> diff --git a/server_binlog.php b/server_binlog.php index 679674bc57..81fa58c8e3 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -202,12 +202,3 @@ while ($value = PMA_DBI_fetch_assoc($result)) { ?> </tbody> </table> -<?php - - -/** - * Sends the footer - */ -require 'libraries/footer.inc.php'; - -?> diff --git a/server_collations.php b/server_collations.php index 5e7844345b..b3872fc253 100644 --- a/server_collations.php +++ b/server_collations.php @@ -81,6 +81,4 @@ unset($table_row_count); echo '</table>' . "\n" . '</div>' . "\n"; -require 'libraries/footer.inc.php'; - ?> diff --git a/server_databases.php b/server_databases.php index cacf35c9be..f267fb9d7d 100644 --- a/server_databases.php +++ b/server_databases.php @@ -313,9 +313,4 @@ if ($databases_count > 0) { } unset($databases_count); -/** - * Sends the footer - */ -require 'libraries/footer.inc.php'; - ?> diff --git a/server_engines.php b/server_engines.php index c50723ce78..1a8a0cadf6 100644 --- a/server_engines.php +++ b/server_engines.php @@ -126,9 +126,4 @@ if (empty($_REQUEST['engine']) } } -/** - * Sends the footer - */ -require 'libraries/footer.inc.php'; - ?> diff --git a/server_export.php b/server_export.php index 910d574730..a080fd0946 100644 --- a/server_export.php +++ b/server_export.php @@ -60,9 +60,4 @@ $multi_values .= '</select></div>'; $export_type = 'server'; require_once 'libraries/display_export.lib.php'; - -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/server_import.php b/server_import.php index 13c93df45b..2a7d38f7df 100644 --- a/server_import.php +++ b/server_import.php @@ -22,9 +22,6 @@ require 'libraries/server_common.inc.php'; $import_type = 'server'; require 'libraries/display_import.lib.php'; -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; + ?> diff --git a/server_plugins.php b/server_plugins.php index 16fb6d5799..5c4c6ffdda 100644 --- a/server_plugins.php +++ b/server_plugins.php @@ -183,10 +183,3 @@ pma_theme_image = '<?php echo $GLOBALS['pmaThemeImage']; ?>'; </table> </div> </div> -<?php -/** - * Sends the footer - */ -require 'libraries/footer.inc.php'; - -?> diff --git a/server_privileges.php b/server_privileges.php index 673d3fd47c..0bf3955079 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -182,7 +182,7 @@ if (! $is_superuser) { . __('Privileges') . "\n" . '</h2>' . "\n"; PMA_Message::error(__('No Privileges'))->display(); - include 'libraries/footer.inc.php'; + exit; } // a random number that will be appended to the id of the user forms @@ -2034,7 +2034,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if ($user_does_not_exists) { PMA_Message::error(__('The selected user was not found in the privilege table.'))->display(); PMA_displayLoginInformationFields(); - //require 'libraries/footer.inc.php'; + //exit; } echo '<form name="usersForm" id="addUsersForm_' . $random_n . '" action="server_privileges.php" method="post">' . "\n"; @@ -2584,11 +2584,4 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs } // end if (empty($_REQUEST['adduser']) && empty($checkprivs)) ... elseif ... else ... - -/** - * Displays the footer - */ -echo "\n\n"; -require 'libraries/footer.inc.php'; - ?> diff --git a/server_replication.php b/server_replication.php index bdace06135..dcecc0e422 100644 --- a/server_replication.php +++ b/server_replication.php @@ -33,7 +33,7 @@ if (! $is_superuser) { . __('Replication') . "\n" . '</h2>' . "\n"; PMA_Message::error(__('No Privileges'))->display(); - include 'libraries/footer.inc.php'; + exit; } /** @@ -265,7 +265,6 @@ if (isset($GLOBALS['mr_configure'])) { echo ' </form>'; echo '</fieldset>'; - include 'libraries/footer.inc.php'; exit; } @@ -398,5 +397,4 @@ if (! isset($GLOBALS['repl_clear_scr'])) { if (isset($GLOBALS['sl_configure'])) { PMA_replication_gui_changemaster("slave_changemaster"); } -require 'libraries/footer.inc.php'; ?> diff --git a/server_sql.php b/server_sql.php index fbaf554556..408d2b2858 100644 --- a/server_sql.php +++ b/server_sql.php @@ -27,8 +27,4 @@ require_once 'libraries/sql_query_form.lib.php'; */ PMA_sqlQueryForm(); -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/server_status.php b/server_status.php index 737b861178..93d0157042 100644 --- a/server_status.php +++ b/server_status.php @@ -1839,8 +1839,4 @@ function cleanDeprecated(&$server_status) } } -/** - * Sends the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/server_synchronize.php b/server_synchronize.php index cceb1ec2d1..51fc214044 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1487,8 +1487,4 @@ if (! isset($_REQUEST['submit_connect']) <div class="notice">' . __('Target database will be completely synchronized with source database. Source database will remain unchanged.') . '</div>'; } - /** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/server_variables.php b/server_variables.php index 41f01b62fb..7a5e1c49fe 100644 --- a/server_variables.php +++ b/server_variables.php @@ -184,9 +184,4 @@ function formatVariable($name, $value) return htmlspecialchars($value); } -/** - * Sends the footer - */ -require 'libraries/footer.inc.php'; - ?> @@ -418,10 +418,7 @@ if ($do_confirm) { echo '</fieldset>' . "\n" . '</form>' . "\n"; - /** - * Displays the footer and exit - */ - include 'libraries/footer.inc.php'; + exit; } // end if $do_confirm @@ -1127,6 +1124,6 @@ $(makeProfilingChart); * Displays the footer */ if (! isset($_REQUEST['table_maintenance'])) { - include 'libraries/footer.inc.php'; + exit; } ?> diff --git a/tbl_addfield.php b/tbl_addfield.php index 74664c55ec..015c235bd9 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -230,9 +230,6 @@ if ($abort == false) { */ $action = 'tbl_addfield.php'; include_once 'libraries/tbl_properties.inc.php'; - - // Diplays the footer - include 'libraries/footer.inc.php'; } ?> diff --git a/tbl_alter.php b/tbl_alter.php index 4da743c6cc..8c41860fa0 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -317,10 +317,4 @@ if ($abort == false) { */ include 'libraries/tbl_properties.inc.php'; } - - -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/tbl_change.php b/tbl_change.php index ea89f7b500..db2a667826 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -387,9 +387,5 @@ if ($insert_mode) { $html_output .= PMA_getContinueInsertionForm($table, $db, $where_clause_array, $err_url); } echo $html_output; -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/tbl_chart.php b/tbl_chart.php index ce35a8ce18..66f7419b10 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -158,10 +158,3 @@ url_query = '<?php echo $url_query;?>'; chart_data = <?php echo strtr(json_encode($data), array('<' => '<', '>' => '>')); ?>; //]]> </script> -<?php -/** - * Displays the footer - */ -require_once 'libraries/footer.inc.php'; - -?> diff --git a/tbl_create.php b/tbl_create.php index 6051751c4e..b4945a93b2 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -367,8 +367,6 @@ if ($GLOBALS['is_ajax_request'] != true) { } require 'libraries/tbl_properties.inc.php'; -// Displays the footer -require 'libraries/footer.inc.php'; if ($GLOBALS['is_ajax_request'] != true) { echo('</div>'); diff --git a/tbl_export.php b/tbl_export.php index 7d261f8d39..042fd9a001 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -84,10 +84,4 @@ if (! empty($sql_query)) { $export_type = 'table'; require_once 'libraries/display_export.lib.php'; - - -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php index 98baeaf8ee..73ea8210ab 100644 --- a/tbl_gis_visualization.php +++ b/tbl_gis_visualization.php @@ -192,10 +192,3 @@ $visualization = PMA_GIS_visualizationResults($data, $visualizationSettings, $fo </fieldset> </form> </div> -<?php -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; - -?> diff --git a/tbl_import.php b/tbl_import.php index fb864b2fe1..9c399e0bd6 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -26,9 +26,5 @@ require_once 'libraries/tbl_info.inc.php'; $import_type = 'table'; require_once 'libraries/display_import.lib.php'; -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/tbl_indexes.php b/tbl_indexes.php index 2eca4f94e9..dc07c9c925 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -320,10 +320,3 @@ echo '<input type="submit" name="add_fields" value="' . __('Go') . '" />' . "\n" ?> </fieldset> </form> -<?php - -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; -?> diff --git a/tbl_operations.php b/tbl_operations.php index 9baa8c5d2a..3d44a7e684 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -860,13 +860,6 @@ if ($cfgRelation['relwork'] && ! $is_innodb) { } // end if (!empty($cfg['Server']['relation'])) - -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; - - function PMA_set_global_variables_for_engine($tbl_storage_engine) { global $is_myisam_or_aria, $is_innodb, $is_isam, $is_berkeleydb, $is_aria, $is_pbxt; diff --git a/tbl_printview.php b/tbl_printview.php index 4da57090aa..4c7ec509dc 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -472,6 +472,4 @@ foreach ($the_tables as $key => $table) { PMA_printButton(); echo "<div id='PMA_disable_floating_menubar'></div>\n"; - -require 'libraries/footer.inc.php'; ?> diff --git a/tbl_relation.php b/tbl_relation.php index cbe36ceee6..0bf1941393 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -575,8 +575,4 @@ if (count($columns) > 0) { <?php } // end if (we have columns in this table) -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/tbl_row_action.php b/tbl_row_action.php index f4414a1a85..d55e5e0b03 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -21,7 +21,7 @@ if (! PMA_isValid($_REQUEST['rows_to_delete'], 'array') $disp_message = __('No rows selected'); $disp_query = ''; include 'sql.php'; - include 'libraries/footer.inc.php'; + exit; } if (isset($_REQUEST['submit_mult'])) { @@ -137,11 +137,6 @@ if (!empty($submit_mult)) { $active_page = 'sql.php'; include 'sql.php'; - - /** - * Displays the footer - */ - include 'libraries/footer.inc.php'; break; } } diff --git a/tbl_select.php b/tbl_select.php index 81762f60cf..d956d5009c 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -71,8 +71,6 @@ if (! isset($_POST['columnsToDisplay']) || $_POST['columnsToDisplay'][0] == '') $goto, $db, $table, $columnNames, $columnTypes, $columnCollations, $columnNullFlags, $geomColumnFlag, $foreigners, "normal" ); - - include 'libraries/footer.inc.php'; } else { /** * Selection criteria have been submitted -> do the work diff --git a/tbl_sql.php b/tbl_sql.php index 3ec346bb7f..b06be2760c 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -43,8 +43,4 @@ PMA_sqlQueryForm( isset($_REQUEST['delimiter']) ? htmlspecialchars($_REQUEST['delimiter']) : ';' ); -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/tbl_structure.php b/tbl_structure.php index 2bf35b1906..8ccc21782d 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -1001,8 +1001,4 @@ if ($cfg['ShowStats']) { echo '<div class="clearfloat"></div>' . "\n"; -/** - * Displays the footer - */ -require 'libraries/footer.inc.php'; ?> diff --git a/tbl_tracking.php b/tbl_tracking.php index eb9d760bd8..17ab096eaf 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -816,9 +816,3 @@ if ($last_version > 0) { <br class="clearfloat"/> -<?php -/** - * Displays the footer - */ -require './libraries/footer.inc.php'; -?> diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 27a16633ed..cdb37b5b38 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -264,5 +264,4 @@ if (isset($zoom_submit) </form> <?php } -require './libraries/footer.inc.php'; ?> diff --git a/transformation_overview.php b/transformation_overview.php index cfe0d809b2..6caea6a4d1 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -62,9 +62,3 @@ foreach ($types['transformation'] as $key => $transform) { </tbody> </table> -<?php -/** - * Displays the footer - */ -require './libraries/footer.inc.php'; -?> diff --git a/user_password.php b/user_password.php index 2be7b839c6..575cc575e0 100644 --- a/user_password.php +++ b/user_password.php @@ -27,7 +27,7 @@ if (! $cfg['ShowChgPassword']) { if ($cfg['Server']['auth_type'] == 'config' || ! $cfg['ShowChgPassword']) { $header->display(); PMA_Message::error(__('You don\'t have sufficient privileges to be here right now!'))->display(); - include './libraries/footer.inc.php'; + exit; } // end if /** @@ -61,11 +61,7 @@ if (isset($message)) { } require_once './libraries/display_change_password.lib.php'; - -/** - * Displays the footer - */ -require './libraries/footer.inc.php'; +exit; /** * Send the message as an ajax request @@ -211,6 +207,6 @@ function PMA_changePassDisplayPage($message, $sql_query, $_url_params) echo PMA_getMessage($message, $sql_query, 'success'); echo '<a href="index.php'.PMA_generate_common_url($_url_params).' target="_parent">'. "\n" .'<strong>'.__('Back').'</strong></a>'; - include './libraries/footer.inc.php'; + exit; } ?> diff --git a/view_create.php b/view_create.php index 2808144638..b0cf55764b 100644 --- a/view_create.php +++ b/view_create.php @@ -186,10 +186,3 @@ $url_params['reload'] = 1; ?> </form> </div> -<?php -/** - * Displays the footer - */ -require './libraries/footer.inc.php'; - -?> diff --git a/view_operations.php b/view_operations.php index 700610fe56..7205668cbc 100644 --- a/view_operations.php +++ b/view_operations.php @@ -96,9 +96,3 @@ $url_params['back'] = 'view_operations.php'; </form> </div> -<?php -/** - * Displays the footer - */ -require './libraries/footer.inc.php'; -?> |