No need to require_once footer

It is the last thing executed anyway (ends with exit).
This commit is contained in:
Michal Čihař
2010-07-26 16:20:24 +02:00
parent ee767e2d3d
commit d291827444
49 changed files with 65 additions and 65 deletions

View File

@@ -21,5 +21,5 @@ $cfgRelation = PMA_getRelationsParam(TRUE);
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -320,5 +320,5 @@ function printPage()
<?php <?php
echo '<br /><br /><input type="button" id="print" value="' . __('Print') . '" onclick="printPage()" />'; echo '<br /><br /><input type="button" id="print" value="' . __('Print') . '" onclick="printPage()" />';
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -72,5 +72,5 @@ require_once './libraries/display_export.lib.php';
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -501,5 +501,5 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?>
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -264,5 +264,5 @@ function printPage()
id="print" value="<?php echo __('Print'); ?>" onclick="printPage()" /> id="print" value="<?php echo __('Print'); ?>" onclick="printPage()" />
<?php <?php
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -98,7 +98,7 @@ $tbl_result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';',
$tbl_result_cnt = PMA_DBI_num_rows($tbl_result); $tbl_result_cnt = PMA_DBI_num_rows($tbl_result);
if (0 == $tbl_result_cnt) { if (0 == $tbl_result_cnt) {
PMA_Message::error(__('No tables found in database.'))->display(); PMA_Message::error(__('No tables found in database.'))->display();
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
exit; exit;
} }
@@ -939,5 +939,5 @@ if (!empty($qry_orderby)) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -350,5 +350,5 @@ $alter_select =
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -41,5 +41,5 @@ PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimit
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -56,7 +56,7 @@ if ($num_tables == 0) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
exit; exit;
} }
@@ -599,5 +599,5 @@ if (empty($db_is_information_schema)) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -35,7 +35,7 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) {
} }
// Display the footer // Display the footer
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
exit; exit;
} }
@@ -199,5 +199,5 @@ if (count($data['ddlog']) > 0) {
/** /**
* Display the footer * Display the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -667,6 +667,6 @@ else {
//]]> //]]>
</script> </script>
<?php <?php
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} // end if } // end if
?> ?>

View File

@@ -131,7 +131,7 @@ function PMA_auth_fails()
echo '</tr>' . "\n"; echo '</tr>' . "\n";
} }
echo '</table>' . "\n"; echo '</table>' . "\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
return TRUE; return TRUE;
} // end of the 'PMA_auth_fails()' function } // end of the 'PMA_auth_fails()' function

View File

@@ -666,7 +666,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
* display footer and exit * display footer and exit
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} else { } else {
echo $error_msg_output; echo $error_msg_output;
} }

View File

@@ -261,7 +261,7 @@ if (!empty($submit_mult) && !empty($what)) {
<input type="submit" name="mult_btn" value="<?php echo __('No'); ?>" id="buttonNo" /> <input type="submit" name="mult_btn" value="<?php echo __('No'); ?>" id="buttonNo" />
</fieldset> </fieldset>
<?php <?php
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} // end if } // end if

View File

@@ -390,5 +390,5 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -38,24 +38,24 @@ $query_default_option = PMA_DBI_QUERY_STORE;
if (!$cfgRelation['relwork']) { if (!$cfgRelation['relwork']) {
echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'relation', 'config.inc.php') . '<br />' . "\n" echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'relation', 'config.inc.php') . '<br />' . "\n"
. PMA_showDocu('relation') . "\n"; . PMA_showDocu('relation') . "\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} }
if (!$cfgRelation['displaywork']) { if (!$cfgRelation['displaywork']) {
echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_info', 'config.inc.php') . '<br />' . "\n" 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"; . PMA_showDocu('table_info') . "\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} }
if (!isset($cfgRelation['table_coords'])){ 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" 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"; . PMA_showDocu('table_coords') . "\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} }
if (!isset($cfgRelation['pdf_pages'])) { 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" 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"; . PMA_showDocu('pdf_pages') . "\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} }
if ($cfgRelation['pdfwork']) { if ($cfgRelation['pdfwork']) {
@@ -555,5 +555,5 @@ ToggleDragDrop('pdflayout');
* Displays the footer * Displays the footer
*/ */
echo "\n"; echo "\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -239,7 +239,7 @@ class PMA_PDF extends TCPDF {
. '">' . __('Back') . '</a>'; . '">' . __('Back') . '</a>';
echo "\n"; echo "\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} // end of the "PMA_PDF_die()" function } // end of the "PMA_PDF_die()" function
/** /**
* Aliases the "Error()" function from the FPDF class to the * Aliases the "Error()" function from the FPDF class to the

View File

@@ -234,6 +234,6 @@ while ($value = PMA_DBI_fetch_assoc($result)) {
/** /**
* Sends the footer * Sends the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -95,6 +95,6 @@ unset($table_row_count);
echo '</table>' . "\n" echo '</table>' . "\n"
. '</div>' . "\n"; . '</div>' . "\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -382,6 +382,6 @@ if ($cfg['ShowCreateDb']) {
/** /**
* Sends the footer * Sends the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -159,6 +159,6 @@ if (empty($_REQUEST['engine'])
/** /**
* Sends the footer * Sends the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -47,5 +47,5 @@ require_once './libraries/display_export.lib.php';
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -110,7 +110,7 @@ if (!$is_superuser) {
. __('Privileges') . "\n" . __('Privileges') . "\n"
. '</h2>' . "\n"; . '</h2>' . "\n";
PMA_Message::error(__('No Privileges'))->display(); 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) { if ($user_does_not_exists) {
PMA_Message::warning(__('The selected user was not found in the privilege table.'))->display(); PMA_Message::warning(__('The selected user was not found in the privilege table.'))->display();
PMA_displayLoginInformationFields(); PMA_displayLoginInformationFields();
//require_once './libraries/footer.inc.php'; //require './libraries/footer.inc.php';
} }
echo '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n"; echo '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n";
@@ -2219,6 +2219,6 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
* Displays the footer * Displays the footer
*/ */
echo "\n\n"; echo "\n\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -88,5 +88,5 @@ while($process = PMA_DBI_fetch_assoc($result)) {
/** /**
* Sends the footer * Sends the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -31,7 +31,7 @@ if (! $is_superuser) {
. __('Replication') . "\n" . __('Replication') . "\n"
. '</h2>' . "\n"; . '</h2>' . "\n";
PMA_Message::error(__('No Privileges'))->display(); 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 ' </form>'; echo ' </form>';
echo '</fieldset>'; echo '</fieldset>';
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
exit; exit;
} }
@@ -358,5 +358,5 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
if (isset($GLOBALS['sl_configure'])) { if (isset($GLOBALS['sl_configure'])) {
PMA_replication_gui_changemaster("slave_changemaster"); PMA_replication_gui_changemaster("slave_changemaster");
} }
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -31,5 +31,5 @@ PMA_sqlQueryForm();
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -847,5 +847,5 @@ if ($server_master_status || $server_slave_status)
/** /**
* Sends the footer * Sends the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -1214,5 +1214,5 @@ if (isset($_REQUEST['synchronize_db'])) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -107,6 +107,6 @@ foreach ($serverVars as $name => $value) {
/** /**
* Sends the footer * Sends the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -198,7 +198,7 @@ if ($do_confirm) {
/** /**
* Displays the footer and exit * Displays the footer and exit
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} // end if $do_confirm } // end if $do_confirm
@@ -700,5 +700,5 @@ window.onload = function()
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -224,7 +224,7 @@ if ($abort == false) {
require_once './libraries/tbl_properties.inc.php'; require_once './libraries/tbl_properties.inc.php';
// Diplays the footer // Diplays the footer
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} }
?> ?>

View File

@@ -200,5 +200,5 @@ if ($abort == false) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -174,7 +174,7 @@ if (isset($where_clause)) {
unset($rows[$key_id], $where_clause_array[$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); PMA_showMessage(__('MySQL returned an empty result set (i.e. zero rows).'), $local_query);
echo "\n"; echo "\n";
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} else { // end if (no row returned) } else { // end if (no row returned)
$meta = PMA_DBI_get_fields_meta($result[$key_id]); $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); 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 * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -272,5 +272,5 @@ if (isset($_REQUEST['do_save_data'])) {
*/ */
require './libraries/tbl_properties.inc.php'; require './libraries/tbl_properties.inc.php';
// Displays the footer // Displays the footer
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -88,5 +88,5 @@ require_once './libraries/display_export.lib.php';
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -28,6 +28,6 @@ require_once './libraries/display_import.lib.php';
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -261,5 +261,5 @@ echo '<input type="submit" name="add_fields" value="' . __('Go') . '"'
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -743,7 +743,7 @@ if ($cfgRelation['relwork'] && ! $is_innodb) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
function PMA_set_global_variables_for_engine($tbl_type) function PMA_set_global_variables_for_engine($tbl_type)

View File

@@ -496,5 +496,5 @@ function printPage()
onclick="printPage()" /></p> onclick="printPage()" /></p>
<?php <?php
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -569,5 +569,5 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -28,7 +28,7 @@ if (! PMA_isValid($_REQUEST['rows_to_delete'], 'array')
$disp_message = __('No rows selected'); $disp_message = __('No rows selected');
$disp_query = ''; $disp_query = '';
require './sql.php'; require './sql.php';
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} }
if (isset($_REQUEST['submit_mult'])) { if (isset($_REQUEST['submit_mult'])) {
@@ -148,7 +148,7 @@ if (!empty($submit_mult)) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
break; break;
} }
} }

View File

@@ -324,7 +324,7 @@ $(function() {
</fieldset> </fieldset>
</form> </form>
<?php <?php
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} }

View File

@@ -42,5 +42,5 @@ PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimit
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -842,5 +842,5 @@ echo '<div class="clearfloat"></div>' . "\n";
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -691,5 +691,5 @@ if ($last_version > 0) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -77,5 +77,5 @@ foreach ($types['transformation'] as $key => $transform) {
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -47,7 +47,7 @@ if (!$cfg['ShowChgPassword']) {
if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) { if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) {
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
PMA_Message::error(__('You don\'t have sufficient privileges to be here right now!'))->display(); 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 } // end if
@@ -109,7 +109,7 @@ if (isset($_REQUEST['nopass'])) {
<a href="index.php<?php echo PMA_generate_common_url($_url_params); ?>" target="_parent"> <a href="index.php<?php echo PMA_generate_common_url($_url_params); ?>" target="_parent">
<strong><?php echo __('Back'); ?></strong></a> <strong><?php echo __('Back'); ?></strong></a>
<?php <?php
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} // end if } // end if
} // end if } // end if
@@ -133,5 +133,5 @@ require_once './libraries/display_change_password.lib.php';
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -186,6 +186,6 @@ $url_params['reload'] = 1;
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>

View File

@@ -106,5 +106,5 @@ $url_params['back'] = 'view_operations.php';
/** /**
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require './libraries/footer.inc.php';
?> ?>