Remove unneeded closing tags

Closing tags at the end of file are not mandatory. It is often
suggested to omit to closing tags at the end of file to prevent
unwanted effects as PHP will start output buffering if there is
any character after closing tag.

Reference: http://php.net/manual/en/language.basic-syntax.phptags.php

Signed-off-by: Rahul Kadyan <hi@znck.me>

80 files changed, 0 insertions, 117 deletions

diff --git a/browse_foreigners.php b/browse_foreigners.php
index 444d01f5d0..793c00b7e5 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -58,4 +58,3 @@ $html = PMA_getHtmlForRelationalFieldSelection(
 );
 
 $response->addHtml($html);
-?>
diff --git a/chk_rel.php b/chk_rel.php
index 3a55d73399..fcf0c66756 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -23,5 +23,3 @@ $response = PMA_Response::getInstance();
 $response->addHTML(
     PMA_getRelationsParamDiagnostic($cfgRelation)
 );
-
-?>
diff --git a/db_central_columns.php b/db_central_columns.php
index 1aad6d6a30..772a71984e 100644
--- a/db_central_columns.php
+++ b/db_central_columns.php
@@ -142,4 +142,3 @@ $message = PMA_Message::success(
 if (isset($tmp_msg) && $tmp_msg !== true) {
     $message = $tmp_msg;
 }
-?>
diff --git a/db_create.php b/db_create.php
index 9bdcb0e303..21b7aae992 100644
--- a/db_create.php
+++ b/db_create.php
@@ -138,4 +138,3 @@ if (! $result) {
         include_once '' . $cfg['DefaultTabDatabase'];
     }
 }
-?>
diff --git a/db_datadict.php b/db_datadict.php
index 555063e7d3..4068cc7a92 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -204,5 +204,3 @@ foreach ($tables as $table) {
  * Displays the footer
  */
 echo PMA_Util::getButton();
-
-?>
diff --git a/db_designer.php b/db_designer.php
index 2582048285..93aa502495 100644
--- a/db_designer.php
+++ b/db_designer.php
@@ -170,4 +170,3 @@ if (isset($_REQUEST['query'])) {
 }
 
 $response->addHTML(PMA_getCacheImages());
-?>
diff --git a/db_events.php b/db_events.php
index 917778bc35..224f806dea 100644
--- a/db_events.php
+++ b/db_events.php
@@ -22,5 +22,3 @@ require_once 'libraries/rte/rte_events.lib.php';
  */
 $_PMA_RTE = 'EVN';
 require_once 'libraries/rte/rte_main.inc.php';
-
-?>
diff --git a/db_export.php b/db_export.php
index 5313e0e022..475e78cc74 100644
--- a/db_export.php
+++ b/db_export.php
@@ -90,5 +90,3 @@ $multi_values .= '</select></div>';
 
 $export_type = 'database';
 require_once 'libraries/display_export.inc.php';
-
-?>
diff --git a/db_import.php b/db_import.php
index 668be6773f..9fa69253c1 100644
--- a/db_import.php
+++ b/db_import.php
@@ -21,5 +21,3 @@ require 'libraries/db_info.inc.php';
 
 $import_type = 'database';
 require 'libraries/display_import.inc.php';
-
-?>
diff --git a/db_operations.php b/db_operations.php
index c2e2b4b3df..a08f5c8b8b 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -287,5 +287,3 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
         PMA_DatabaseInterface::QUERY_STORE
     );
 } // end if
-
-?>
diff --git a/db_printview.php b/db_printview.php
index 61676d686f..652cf3ffee 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -172,4 +172,3 @@ if ($num_tables == 0) {
 echo PMA_Util::getButton();
 
 echo "<div id='PMA_disable_floating_menubar'></div>\n";
-?>
diff --git a/db_qbe.php b/db_qbe.php
index 94a9625d12..3c72d3c208 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -130,4 +130,3 @@ if ($cfgRelation['pdfwork']) {
 }
 
 $response->addHTML($db_qbe->getSelectionForm());
-?>
diff --git a/db_routines.php b/db_routines.php
index a58d4c0a21..c273b7b291 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -23,5 +23,3 @@ require_once 'libraries/rte/rte_routines.lib.php';
  */
 $_PMA_RTE = 'RTN';
 require_once 'libraries/rte/rte_main.inc.php';
-
-?>
diff --git a/db_search.php b/db_search.php
index 349f720a3a..ef1709225c 100644
--- a/db_search.php
+++ b/db_search.php
@@ -60,4 +60,3 @@ $response->addHTML(
 );
 $response->addHTML($db_search->getSelectionForm());
 $response->addHTML($db_search->getResultDivs());
-?>
diff --git a/db_sql.php b/db_sql.php
index 987dbaff5f..93f095cacb 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -41,5 +41,3 @@ $response->addHTML(
         : ';'
     )
 );
-
-?>
diff --git a/db_structure.php b/db_structure.php
index 07eaa2d0fc..82ea593e91 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -341,5 +341,3 @@ $response->addHTML(
 );
 
 PMA_possiblyShowCreateTableDialog($db, $db_is_system_schema, $response);
-
-?>
diff --git a/db_tracking.php b/db_tracking.php
index 8a5028d7e4..258726a068 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -346,5 +346,3 @@ if (count($data['ddlog']) > 0) {
     }
     echo PMA_Util::getMessage(__('Database Log'), $log);
 }
-
-?>
diff --git a/db_triggers.php b/db_triggers.php
index d1a2a8c6b2..a415fb43d0 100644
--- a/db_triggers.php
+++ b/db_triggers.php
@@ -21,5 +21,3 @@ require_once 'libraries/rte/rte_triggers.lib.php';
  */
 $_PMA_RTE = 'TRI';
 require_once 'libraries/rte/rte_main.inc.php';
-
-?>
diff --git a/error_report.php b/error_report.php
index d86add56cc..4510f1ad51 100644
--- a/error_report.php
+++ b/error_report.php
@@ -127,4 +127,3 @@ if (isset($_REQUEST['send_error_report'])
         $GLOBALS['error_handler']->savePreviousErrors();
     }
 }
-?>
diff --git a/export.php b/export.php
index 5e9765990b..895c6e5606 100644
--- a/export.php
+++ b/export.php
@@ -477,4 +477,3 @@ if (!defined('TESTSUITE')) {
         echo PMA_getHtmlForDisplayedExportFooter($back_button);
     } // end if
 }
-?>
diff --git a/file_echo.php b/file_echo.php
index e4409779da..1f27bb019b 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -78,4 +78,3 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
     }
     echo file_get_contents($_FILES['file']['tmp_name']);
 }
-?>
diff --git a/gis_data_editor.php b/gis_data_editor.php
index f14e4662d2..cba75e58b0 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -426,4 +426,3 @@ echo '</form>';
 
 PMA_Response::getInstance()->addJSON('gis_editor', ob_get_contents());
 ob_end_clean();
-?>
diff --git a/import.php b/import.php
index 035e076dc0..550283d5d5 100644
--- a/import.php
+++ b/import.php
@@ -759,4 +759,3 @@ if ($go_sql) {
 if (isset($_REQUEST['rollback_query'])) {
     $GLOBALS['dbi']->query('ROLLBACK');
 }
-?>
diff --git a/import_status.php b/import_status.php
index a6c49f4b79..2a638eec10 100644
--- a/import_status.php
+++ b/import_status.php
@@ -100,4 +100,3 @@ if (isset($_GET["message"]) && $_GET["message"]) {
 } else {
     PMA_importAjaxStatus($_GET["id"]);
 }
-?>
diff --git a/index.php b/index.php
index ca264085d5..033037d077 100644
--- a/index.php
+++ b/index.php
@@ -698,4 +698,3 @@ function PMA_printListItem($name, $listId = null, $url = null,
     }
     echo '</li>';
 }
-?>
diff --git a/license.php b/license.php
index d076cae49f..c9a050fbcb 100644
--- a/license.php
+++ b/license.php
@@ -27,5 +27,3 @@ if (is_readable($filename)) {
 } else {
     printf(__('The %s file is not available on this system, please visit www.phpmyadmin.net for more information.'), $filename);
 }
-
-?>
diff --git a/navigation.php b/navigation.php
index 2b1b85a5d2..884db8b125 100644
--- a/navigation.php
+++ b/navigation.php
@@ -68,4 +68,3 @@ if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) {
 
 // Do the magic
 $response->addJSON('message', $navigation->getDisplay());
-?>
diff --git a/phpinfo.php b/phpinfo.php
index 5854ff4c9e..283f701aa6 100644
--- a/phpinfo.php
+++ b/phpinfo.php
@@ -18,4 +18,3 @@ PMA_Response::getInstance()->disable();
 if ($GLOBALS['cfg']['ShowPhpInfo']) {
     phpinfo();
 }
-?>
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index f7dcade2d2..6a157712fb 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -29,4 +29,3 @@ header('Content-Type: text/css; charset=UTF-8');
 header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
 
 $_SESSION['PMA_Theme_Manager']->printCss();
-?>
diff --git a/prefs_forms.php b/prefs_forms.php
index d0c09b0b61..1833d9dc27 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -89,4 +89,3 @@ if ($form_display->hasErrors()) {
     <?php
 }
 $form_display->display(true, true);
-?>
diff --git a/schema_export.php b/schema_export.php
index 9573b2ac7f..87eb060896 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -74,4 +74,3 @@ function PMA_processExportSchema($export_type)
     $GLOBALS['dbi']->selectDb($GLOBALS['db']);
     $export_plugin->exportSchema($GLOBALS['db']);
 }
-?>
diff --git a/server_binlog.php b/server_binlog.php
index 1ff1924267..4d07e7ace4 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -50,5 +50,3 @@ $response->addHTML(PMA_getLogSelector($binary_logs, $url_params));
 $response->addHTML(PMA_getLogInfo($url_params));
 
 exit;
-
-?>
diff --git a/server_collations.php b/server_collations.php
index b1b9c71a09..714319f51f 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -35,5 +35,3 @@ $response->addHTML(
         $mysql_collations_available
     )
 );
-
-?>
diff --git a/server_databases.php b/server_databases.php
index 8e9cffdc4b..ea83ad3784 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -114,5 +114,3 @@ if ($databases_count > 0) {
 unset($databases_count);
 
 $response->addHTML($html);
-
-?>
diff --git a/server_engines.php b/server_engines.php
index 12320498a5..2dff2dfa25 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -30,5 +30,3 @@ $response->addHTML(PMA_getHtmlForSubPageHeader('engines'));
 $response->addHTML(PMA_getHtmlForServerEngines());
 
 exit;
-
-?>
diff --git a/server_export.php b/server_export.php
index c0bffdb3e1..6e8603e321 100644
--- a/server_export.php
+++ b/server_export.php
@@ -25,5 +25,3 @@ $multi_values  = PMA_getHtmlForExportSelectOptions($select_item);
 
 $export_type = 'server';
 require_once 'libraries/display_export.inc.php';
-
-?>
diff --git a/server_import.php b/server_import.php
index 83d27cf7c1..6e59d1d1df 100644
--- a/server_import.php
+++ b/server_import.php
@@ -23,5 +23,3 @@ require 'libraries/server_common.inc.php';
 
 $import_type = 'server';
 require 'libraries/display_import.inc.php';
-
-?>
diff --git a/server_plugins.php b/server_plugins.php
index 089bfd1d7f..480ddeec2d 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -55,5 +55,3 @@ $response->addHTML(PMA_getHtmlForSubPageHeader('plugins'));
 $response->addHTML(PMA_getPluginAndModuleInfo($plugins, $modules));
 
 exit;
-
-?>
diff --git a/server_privileges.php b/server_privileges.php
index 2db8f91ce7..33785fbace 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -406,5 +406,3 @@ if ((isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'server')
 ) {
     $response->addHTML('</div>');
 }
-
-?>
diff --git a/server_replication.php b/server_replication.php
index 3197cbd0bf..93e4100d19 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -80,4 +80,3 @@ if (! isset($_REQUEST['repl_clear_scr'])) {
 if (isset($_REQUEST['sl_configure'])) {
     $response->addHTML(PMA_getHtmlForReplicationChangeMaster("slave_changemaster"));
 }
-?>
diff --git a/server_sql.php b/server_sql.php
index 953e17587d..38a039c2d1 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -28,5 +28,3 @@ require_once 'libraries/sql_query_form.lib.php';
  * Query box, bookmark, insert data from textfile
  */
 $response->addHTML(PMA_getHtmlForSqlQueryForm());
-
-?>
diff --git a/server_status.php b/server_status.php
index 9eb4d52e84..8b0b34d940 100644
--- a/server_status.php
+++ b/server_status.php
@@ -35,4 +35,3 @@ $response->addHTML(PMA_getHtmlForServerStatus($ServerStatusData));
 $response->addHTML('</div>');
 
 exit;
-?>
diff --git a/server_status_advisor.php b/server_status_advisor.php
index 4ab2ed60bc..24da2c81f6 100644
--- a/server_status_advisor.php
+++ b/server_status_advisor.php
@@ -35,5 +35,3 @@ $response->addHTML(PMA_getHtmlForAdvisor());
 $response->addHTML('</div>');
 
 exit;
-
-?>
diff --git a/server_status_monitor.php b/server_status_monitor.php
index 82010f3cc7..9af3f71e43 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -109,5 +109,3 @@ $response->addHTML(PMA_getHtmlForMonitor($ServerStatusData));
 $response->addHTML(PMA_getHtmlForClientSideDataAndLinks($ServerStatusData));
 $response->addHTML('</div>');
 exit;
-
-?>
diff --git a/server_status_processes.php b/server_status_processes.php
index f5dfb3c266..cbc7e03623 100644
--- a/server_status_processes.php
+++ b/server_status_processes.php
@@ -61,4 +61,3 @@ if ($response->isAjax() && !empty($_REQUEST['kill'])) {
     $response->addHTML('</div>');
 }
 exit;
-?>
diff --git a/server_status_queries.php b/server_status_queries.php
index 644774cfaa..acea8cfacb 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -50,5 +50,3 @@ $response->addHTML($ServerStatusData->getMenuHtml());
 $response->addHTML(PMA_getHtmlForQueryStatistics($ServerStatusData));
 $response->addHTML('</div>');
 exit;
-
-?>
diff --git a/server_status_variables.php b/server_status_variables.php
index cfa108ab3d..2038dc5c42 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -53,5 +53,3 @@ $response->addHTML(PMA_getHtmlForVariablesList($ServerStatusData));
 $response->addHTML('</div>');
 
 exit;
-
-?>
diff --git a/server_user_groups.php b/server_user_groups.php
index c9e9589527..94fc0f9bf8 100644
--- a/server_user_groups.php
+++ b/server_user_groups.php
@@ -69,4 +69,3 @@ if (isset($_REQUEST['addUserGroup'])) {
 }
 
 $response->addHTML('</div>');
-?>
diff --git a/server_variables.php b/server_variables.php
index b287777206..ac2bf5e0a2 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -56,5 +56,3 @@ $response->addHtml(PMA_getHtmlForLinkTemplates());
 $response->addHtml(PMA_getHtmlForServerVariables($variable_doc_links));
 
 exit;
-
-?>
diff --git a/show_config_errors.php b/show_config_errors.php
index 0d0cdf4456..8cd1de5efa 100644
--- a/show_config_errors.php
+++ b/show_config_errors.php
@@ -37,4 +37,3 @@ error_reporting(E_ALL);
 if (is_readable(CONFIG_FILE)) {
     include CONFIG_FILE;
 }
-?>
diff --git a/sql.php b/sql.php
index 425b8359c4..b638275088 100644
--- a/sql.php
+++ b/sql.php
@@ -199,5 +199,3 @@ PMA_executeQueryAndSendQueryResponse(
     isset($selected) ? $selected : null,
     isset($complete_query) ? $complete_query : null
 );
-
-?>
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 0c7aa1da2f..df7c75d0ac 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -121,4 +121,3 @@ if ($abort == false) {
     $action = 'tbl_addfield.php';
     include_once 'libraries/tbl_columns_definition_form.inc.php';
 }
-?>
diff --git a/tbl_change.php b/tbl_change.php
index 7b8c3e9ad0..d5947d8627 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -229,4 +229,3 @@ if ($insert_mode) {
 }
 
 $response->addHTML($html_output);
-?>
diff --git a/tbl_chart.php b/tbl_chart.php
index 283aaceba8..aedeea0b82 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -139,4 +139,3 @@ $htmlString = PMA_getHtmlForTableChartDisplay(
 );
 
 $response->addHTML($htmlString);
-?>
diff --git a/tbl_create.php b/tbl_create.php
index ebbef95151..3993baeaa4 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -104,5 +104,3 @@ $GLOBAL['table'] = '';
  * Displays the form used to define the structure of the table
  */
 require 'libraries/tbl_columns_definition_form.inc.php';
-
-?>
diff --git a/tbl_export.php b/tbl_export.php
index a8a1178936..0c7d0b5b43 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -104,4 +104,3 @@ if (! empty($sql_query)) {
 
 $export_type = 'table';
 require_once 'libraries/display_export.inc.php';
-?>
diff --git a/tbl_find_replace.php b/tbl_find_replace.php
index 3b19ebf1fb..39eefa48bb 100644
--- a/tbl_find_replace.php
+++ b/tbl_find_replace.php
@@ -62,5 +62,3 @@ $err_url = $goto . '?' . PMA_URL_getCommon($params);
 // Displays the find and replace form
 $htmlOutput .= $table_search->getSelectionForm($goto);
 $response->addHTML($htmlOutput);
-
-?>
diff --git a/tbl_get_field.php b/tbl_get_field.php
index 1ec3c5a8f9..c0d6dd3d71 100644
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -52,4 +52,3 @@ PMA_downloadHeader(
     /*overload*/mb_strlen($result)
 );
 echo $result;
-?>
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index 3448ba103c..90d7094a61 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -111,5 +111,3 @@ $html = PMA_getHtmlForGisVisualization(
 );
 
 $response->addHTML($html);
-
-?>
diff --git a/tbl_import.php b/tbl_import.php
index fc642d86ea..dc3e6ec3c5 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -26,5 +26,3 @@ require_once 'libraries/tbl_info.inc.php';
 
 $import_type = 'table';
 require_once 'libraries/display_import.inc.php';
-
-?>
diff --git a/tbl_indexes.php b/tbl_indexes.php
index f083edad71..12e1ee7bc8 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -57,4 +57,3 @@ $response->addHTML($html);
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('indexes.js');
-?>
diff --git a/tbl_operations.php b/tbl_operations.php
index 803abbd1b9..d0e3a1dc02 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -419,5 +419,3 @@ if ($cfgRelation['relwork'] && ! $is_innodb) {
 } // end  if (!empty($cfg['Server']['relation']))
 
 $response->addHTML('</div>');
-
-?>
diff --git a/tbl_printview.php b/tbl_printview.php
index f8ca99d908..ba8c14d68e 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -71,4 +71,3 @@ $response->addHTML(
 $response->addHTML(PMA_getHtmlForPrintViewFooter());
 
 exit;
-?>
diff --git a/tbl_recent_favorite.php b/tbl_recent_favorite.php
index 1d647e03a6..9e64121573 100644
--- a/tbl_recent_favorite.php
+++ b/tbl_recent_favorite.php
@@ -16,4 +16,3 @@ PMA_RecentFavoriteTable::getInstance('favorite')
     ->removeIfInvalid($_REQUEST['db'], $_REQUEST['table']);
 
 require 'sql.php';
-?>
\ No newline at end of file
diff --git a/tbl_relation.php b/tbl_relation.php
index 974105d153..6b8172b9f2 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -153,4 +153,3 @@ if (PMA_Util::isForeignKeySupported($tbl_storage_engine)) {
 $response->addHTML($html_output);
 
 $response->addHTML('</div>');
-?>
diff --git a/tbl_replace.php b/tbl_replace.php
index 874991724b..102c4bcb9b 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -464,5 +464,3 @@ if (isset($_REQUEST['after_insert']) && 'new_insert' == $_REQUEST['after_insert'
  */
 require '' . PMA_securePath($goto_include);
 exit;
-
-?>
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 2eeaa53471..00df3e7f88 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -143,4 +143,3 @@ if (!empty($submit_mult)) {
         );
     }
 }
-?>
diff --git a/tbl_select.php b/tbl_select.php
index 93ed5789a4..5366250331 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -78,4 +78,3 @@ if (! isset($_POST['columnsToDisplay']) && ! isset($_POST['displayAllColumns']))
         null, null, $sql_query, null, null
     );
 }
-?>
diff --git a/tbl_sql.php b/tbl_sql.php
index 92c980d4d8..be0cb0a93a 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -48,5 +48,3 @@ $response->addHTML(
         : ';'
     )
 );
-
-?>
diff --git a/tbl_structure.php b/tbl_structure.php
index b812bb60b2..5c77f484aa 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -207,4 +207,3 @@ $hidden_titles = PMA_getHiddenTitlesArray();
 require_once 'libraries/display_structure.inc.php';
 
 $response->addHTML('</div>');
-?>
diff --git a/tbl_tracking.php b/tbl_tracking.php
index e82e6198e1..e5d2b5bbed 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -205,5 +205,3 @@ $html .= '<br class="clearfloat"/>';
 
 $response = PMA_Response::getInstance();
 $response->addHTML($html);
-
-?>
diff --git a/tbl_triggers.php b/tbl_triggers.php
index 9c87e676dd..d96c922b15 100644
--- a/tbl_triggers.php
+++ b/tbl_triggers.php
@@ -7,4 +7,3 @@
  */
 
 require_once './db_triggers.php';
-?>
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 881ebeff41..14382336db 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -161,4 +161,3 @@ if (isset($_POST['zoom_submit'])
     //Displays form for point data and scatter plot
     $response->addHTML($table_search->getZoomResultsForm($goto, $data));
 }
-?>
diff --git a/themes.php b/themes.php
index f0d1be6f09..d5b863361d 100644
--- a/themes.php
+++ b/themes.php
@@ -28,5 +28,3 @@ $output .= '</p>';
 $output .= $_SESSION['PMA_Theme_Manager']->getPrintPreviews();
 
 $response->addHTML($output);
-
-?>
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index ac0b04973d..69b9f3ed5f 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -145,4 +145,3 @@ if (! isset($_REQUEST['resize'])) {
     ImageDestroy($srcImage);
     ImageDestroy($destImage);
 }
-?>
diff --git a/url.php b/url.php
index 82b224311b..f8646aa783 100644
--- a/url.php
+++ b/url.php
@@ -35,4 +35,3 @@ if (! PMA_isValid($_GET['url'])
     printf(__('Taking you to %s.'), htmlspecialchars($_GET['url']));
 }
 die();
-?>
diff --git a/user_password.php b/user_password.php
index c9313fc500..216d18e8ed 100644
--- a/user_password.php
+++ b/user_password.php
@@ -197,4 +197,3 @@ function PMA_changePassDisplayPage($message, $sql_query)
         . '<strong>' . __('Back') . '</strong></a>';
     exit;
 }
-?>
diff --git a/version_check.php b/version_check.php
index 0f2e8bab7f..ae097e88df 100644
--- a/version_check.php
+++ b/version_check.php
@@ -26,5 +26,3 @@ if (empty($version)) {
         )
     );
 }
-
-?>
diff --git a/view_create.php b/view_create.php
index 0cf2c3047b..fc28ac3edb 100644
--- a/view_create.php
+++ b/view_create.php
@@ -288,4 +288,3 @@ $htmlString .= '</form>'
     . '</div>';
 
 echo $htmlString;
-?>
diff --git a/webapp.php b/webapp.php
index 9e8ac85f5e..4aa8005309 100644
--- a/webapp.php
+++ b/webapp.php
@@ -52,4 +52,3 @@ $zip->setDoWrite();
 $zip->addFile($ini_file, 'webapp.ini');
 $zip->addFile(file_get_contents($icon), 'phpMyAdmin.ico');
 $zip->file();
-?>