Merge pull request #1547 from znck/master

Remove unneeded closing tags

browse_foreigners.php

@@ -58,4 +58,3 @@ $html = PMA_getHtmlForRelationalFieldSelection(
 );
 
 $response->addHtml($html);
-?>

chk_rel.php

@@ -23,5 +23,3 @@ $response = PMA_Response::getInstance();
 $response->addHTML(
     PMA_getRelationsParamDiagnostic($cfgRelation)
 );
-
-?>

db_central_columns.php

@@ -150,4 +150,3 @@ $message = PMA_Message::success(
 if (isset($tmp_msg) && $tmp_msg !== true) {
     $message = $tmp_msg;
 }
-?>

db_create.php

@@ -138,4 +138,3 @@ if (! $result) {
         include_once '' . $cfg['DefaultTabDatabase'];
     }
 }
-?>

db_datadict.php

@@ -204,5 +204,3 @@ foreach ($tables as $table) {
  * Displays the footer
  */
 echo PMA_Util::getButton();
-
-?>

db_designer.php

@@ -170,4 +170,3 @@ if (isset($_REQUEST['query'])) {
 }
 
 $response->addHTML(PMA_getCacheImages());
-?>

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';
-
-?>

db_export.php

@@ -90,5 +90,3 @@ $multi_values .= '</select></div>';
 
 $export_type = 'database';
 require_once 'libraries/display_export.inc.php';
-
-?>

db_import.php

@@ -21,5 +21,3 @@ require 'libraries/db_info.inc.php';
 
 $import_type = 'database';
 require 'libraries/display_import.inc.php';
-
-?>

db_operations.php

@@ -287,5 +287,3 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
         PMA_DatabaseInterface::QUERY_STORE
     );
 } // end if
-
-?>

db_printview.php

@@ -172,4 +172,3 @@ if ($num_tables == 0) {
 echo PMA_Util::getButton();
 
 echo "<div id='PMA_disable_floating_menubar'></div>\n";
-?>

db_qbe.php

@@ -130,4 +130,3 @@ if ($cfgRelation['pdfwork']) {
 }
 
 $response->addHTML($db_qbe->getSelectionForm());
-?>

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';
-
-?>

db_search.php

@@ -60,4 +60,3 @@ $response->addHTML(
 );
 $response->addHTML($db_search->getSelectionForm());
 $response->addHTML($db_search->getResultDivs());
-?>

db_sql.php

@@ -41,5 +41,3 @@ $response->addHTML(
         : ';'
     )
 );
-
-?>

db_structure.php

@@ -342,5 +342,3 @@ $response->addHTML(
 );
 
 PMA_possiblyShowCreateTableDialog($db, $db_is_system_schema, $response);
-
-?>

db_tracking.php

@@ -346,5 +346,3 @@ if (count($data['ddlog']) > 0) {
     }
     echo PMA_Util::getMessage(__('Database Log'), $log);
 }
-
-?>

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';
-
-?>

error_report.php

@@ -127,4 +127,3 @@ if (isset($_REQUEST['send_error_report'])
         $GLOBALS['error_handler']->savePreviousErrors();
     }
 }
-?>

export.php

@@ -510,4 +510,3 @@ if (!defined('TESTSUITE')) {
         echo PMA_getHtmlForDisplayedExportFooter($back_button);
     } // end if
 }
-?>

file_echo.php

@@ -78,4 +78,3 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
     }
     echo file_get_contents($_FILES['file']['tmp_name']);
 }
-?>

gis_data_editor.php

@@ -426,4 +426,3 @@ echo '</form>';
 
 PMA_Response::getInstance()->addJSON('gis_editor', ob_get_contents());
 ob_end_clean();
-?>

import.php

@@ -779,4 +779,3 @@ if ($go_sql) {
 if (isset($_REQUEST['rollback_query'])) {
     $GLOBALS['dbi']->query('ROLLBACK');
 }
-?>

import_status.php

@@ -100,4 +100,3 @@ if (isset($_GET["message"]) && $_GET["message"]) {
 } else {
     PMA_importAjaxStatus($_GET["id"]);
 }
-?>

index.php

@@ -698,4 +698,3 @@ function PMA_printListItem($name, $listId = null, $url = null,
     }
     echo '</li>';
 }
-?>

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);
 }
-
-?>

navigation.php

@@ -68,4 +68,3 @@ if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) {
 
 // Do the magic
 $response->addJSON('message', $navigation->getDisplay());
-?>

phpinfo.php

@@ -18,4 +18,3 @@ PMA_Response::getInstance()->disable();
 if ($GLOBALS['cfg']['ShowPhpInfo']) {
     phpinfo();
 }
-?>

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();
-?>

prefs_forms.php

@@ -89,4 +89,3 @@ if ($form_display->hasErrors()) {
     <?php
 }
 $form_display->display(true, true);
-?>

schema_export.php

@@ -74,4 +74,3 @@ function PMA_processExportSchema($export_type)
     $GLOBALS['dbi']->selectDb($GLOBALS['db']);
     $export_plugin->exportSchema($GLOBALS['db']);
 }
-?>

server_binlog.php

@@ -50,5 +50,3 @@ $response->addHTML(PMA_getLogSelector($binary_logs, $url_params));
 $response->addHTML(PMA_getLogInfo($url_params));
 
 exit;
-
-?>

server_collations.php

@@ -35,5 +35,3 @@ $response->addHTML(
         $mysql_collations_available
     )
 );
-
-?>

server_databases.php

@@ -114,5 +114,3 @@ if ($databases_count > 0) {
 unset($databases_count);
 
 $response->addHTML($html);
-
-?>

server_engines.php

@@ -30,5 +30,3 @@ $response->addHTML(PMA_getHtmlForSubPageHeader('engines'));
 $response->addHTML(PMA_getHtmlForServerEngines());
 
 exit;
-
-?>

server_export.php

@@ -25,5 +25,3 @@ $multi_values  = PMA_getHtmlForExportSelectOptions($select_item);
 
 $export_type = 'server';
 require_once 'libraries/display_export.inc.php';
-
-?>

server_import.php

@@ -23,5 +23,3 @@ require 'libraries/server_common.inc.php';
 
 $import_type = 'server';
 require 'libraries/display_import.inc.php';
-
-?>

server_plugins.php

@@ -55,5 +55,3 @@ $response->addHTML(PMA_getHtmlForSubPageHeader('plugins'));
 $response->addHTML(PMA_getPluginAndModuleInfo($plugins, $modules));
 
 exit;
-
-?>

server_privileges.php

@@ -406,5 +406,3 @@ if ((isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'server')
 ) {
     $response->addHTML('</div>');
 }
-
-?>

server_replication.php

@@ -80,4 +80,3 @@ if (! isset($_REQUEST['repl_clear_scr'])) {
 if (isset($_REQUEST['sl_configure'])) {
     $response->addHTML(PMA_getHtmlForReplicationChangeMaster("slave_changemaster"));
 }
-?>

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());
-
-?>

server_status.php

@@ -35,4 +35,3 @@ $response->addHTML(PMA_getHtmlForServerStatus($ServerStatusData));
 $response->addHTML('</div>');
 
 exit;
-?>

server_status_advisor.php

@@ -35,5 +35,3 @@ $response->addHTML(PMA_getHtmlForAdvisor());
 $response->addHTML('</div>');
 
 exit;
-
-?>

server_status_monitor.php

@@ -109,5 +109,3 @@ $response->addHTML(PMA_getHtmlForMonitor($ServerStatusData));
 $response->addHTML(PMA_getHtmlForClientSideDataAndLinks($ServerStatusData));
 $response->addHTML('</div>');
 exit;
-
-?>

server_status_processes.php

@@ -61,4 +61,3 @@ if ($response->isAjax() && !empty($_REQUEST['kill'])) {
     $response->addHTML('</div>');
 }
 exit;
-?>

server_status_queries.php

@@ -50,5 +50,3 @@ $response->addHTML($ServerStatusData->getMenuHtml());
 $response->addHTML(PMA_getHtmlForQueryStatistics($ServerStatusData));
 $response->addHTML('</div>');
 exit;
-
-?>

server_status_variables.php

@@ -53,5 +53,3 @@ $response->addHTML(PMA_getHtmlForVariablesList($ServerStatusData));
 $response->addHTML('</div>');
 
 exit;
-
-?>

server_user_groups.php

@@ -69,4 +69,3 @@ if (isset($_REQUEST['addUserGroup'])) {
 }
 
 $response->addHTML('</div>');
-?>

server_variables.php

@@ -56,5 +56,3 @@ $response->addHtml(PMA_getHtmlForLinkTemplates());
 $response->addHtml(PMA_getHtmlForServerVariables($variable_doc_links));
 
 exit;
-
-?>

show_config_errors.php

@@ -37,4 +37,3 @@ error_reporting(E_ALL);
 if (is_readable(CONFIG_FILE)) {
     include CONFIG_FILE;
 }
-?>

sql.php

@@ -199,5 +199,3 @@ PMA_executeQueryAndSendQueryResponse(
     isset($selected) ? $selected : null,
     isset($complete_query) ? $complete_query : null
 );
-
-?>

tbl_addfield.php

@@ -121,4 +121,3 @@ if ($abort == false) {
     $action = 'tbl_addfield.php';
     include_once 'libraries/tbl_columns_definition_form.inc.php';
 }
-?>

tbl_change.php

@@ -229,4 +229,3 @@ if ($insert_mode) {
 }
 
 $response->addHTML($html_output);
-?>

tbl_chart.php

@@ -139,4 +139,3 @@ $htmlString = PMA_getHtmlForTableChartDisplay(
 );
 
 $response->addHTML($htmlString);
-?>

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';
-
-?>

tbl_export.php

@@ -104,4 +104,3 @@ if (! empty($sql_query)) {
 
 $export_type = 'table';
 require_once 'libraries/display_export.inc.php';
-?>

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);
-
-?>

tbl_get_field.php

@@ -52,4 +52,3 @@ PMA_downloadHeader(
     /*overload*/mb_strlen($result)
 );
 echo $result;
-?>

tbl_gis_visualization.php

@@ -121,5 +121,3 @@ $html = PMA_getHtmlForGisVisualization(
 );
 
 $response->addHTML($html);
-
-?>

tbl_import.php

@@ -26,5 +26,3 @@ require_once 'libraries/tbl_info.inc.php';
 
 $import_type = 'table';
 require_once 'libraries/display_import.inc.php';
-
-?>

tbl_indexes.php

@@ -57,4 +57,3 @@ $response->addHTML($html);
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('indexes.js');
-?>

tbl_operations.php

@@ -419,5 +419,3 @@ if ($cfgRelation['relwork'] && ! $is_innodb) {
 } // end  if (!empty($cfg['Server']['relation']))
 
 $response->addHTML('</div>');
-
-?>

tbl_printview.php

@@ -71,4 +71,3 @@ $response->addHTML(
 $response->addHTML(PMA_getHtmlForPrintViewFooter());
 
 exit;
-?>

tbl_recent_favorite.php

@@ -16,4 +16,3 @@ PMA_RecentFavoriteTable::getInstance('favorite')
     ->removeIfInvalid($_REQUEST['db'], $_REQUEST['table']);
 
 require 'sql.php';
-?>

tbl_relation.php

@@ -153,4 +153,3 @@ if (PMA_Util::isForeignKeySupported($tbl_storage_engine)) {
 $response->addHTML($html_output);
 
 $response->addHTML('</div>');
-?>

tbl_replace.php

@@ -464,5 +464,3 @@ if (isset($_REQUEST['after_insert']) && 'new_insert' == $_REQUEST['after_insert'
  */
 require '' . PMA_securePath($goto_include);
 exit;
-
-?>

tbl_row_action.php

@@ -143,4 +143,3 @@ if (!empty($submit_mult)) {
         );
     }
 }
-?>

tbl_select.php

@@ -78,4 +78,3 @@ if (! isset($_POST['columnsToDisplay']) && ! isset($_POST['displayAllColumns']))
         null, null, $sql_query, null, null
     );
 }
-?>

tbl_sql.php

@@ -48,5 +48,3 @@ $response->addHTML(
         : ';'
     )
 );
-
-?>

tbl_structure.php

@@ -207,4 +207,3 @@ $hidden_titles = PMA_getHiddenTitlesArray();
 require_once 'libraries/display_structure.inc.php';
 
 $response->addHTML('</div>');
-?>

tbl_tracking.php

@@ -205,5 +205,3 @@ $html .= '<br class="clearfloat"/>';
 
 $response = PMA_Response::getInstance();
 $response->addHTML($html);
-
-?>

tbl_triggers.php

@@ -7,4 +7,3 @@
  */
 
 require_once './db_triggers.php';
-?>

tbl_zoom_select.php

@@ -162,4 +162,3 @@ if (isset($_POST['zoom_submit'])
     //Displays form for point data and scatter plot
     $response->addHTML($table_search->getZoomResultsForm($goto, $data));
 }
-?>

themes.php

@@ -28,5 +28,3 @@ $output .= '</p>';
 $output .= $_SESSION['PMA_Theme_Manager']->getPrintPreviews();
 
 $response->addHTML($output);
-
-?>

transformation_wrapper.php

@@ -145,4 +145,3 @@ if (! isset($_REQUEST['resize'])) {
     ImageDestroy($srcImage);
     ImageDestroy($destImage);
 }
-?>

url.php

@@ -35,4 +35,3 @@ if (! PMA_isValid($_GET['url'])
     printf(__('Taking you to %s.'), htmlspecialchars($_GET['url']));
 }
 die();
-?>

user_password.php

@@ -208,4 +208,3 @@ function PMA_changePassDisplayPage($message, $sql_query)
         . '<strong>' . __('Back') . '</strong></a>';
     exit;
 }
-?>

version_check.php

@@ -26,5 +26,3 @@ if (empty($version)) {
         )
     );
 }
-
-?>

view_create.php

@@ -288,4 +288,3 @@ $htmlString .= '</form>'
     . '</div>';
 
 echo $htmlString;
-?>

webapp.php

@@ -52,4 +52,3 @@ $zip->setDoWrite();
 $zip->addFile($ini_file, 'webapp.ini');
 $zip->addFile(file_get_contents($icon), 'phpMyAdmin.ico');
 $zip->file();
-?>