Dropped footer.inc.php

Gemorroj · Jun 11, 2012 · eb98110 · eb98110
1 parent 4d83b7f
commit eb98110
Show file tree

Hide file tree

Showing 65 changed files with 30 additions and 314 deletions.
diff --git a/db_datadict.php b/db_datadict.php
@@ -283,5 +283,4 @@
  */
 PMA_printButton();
 
-require 'libraries/footer.inc.php';
 ?>
diff --git a/db_export.php b/db_export.php
@@ -31,7 +31,6 @@
 // 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 @@
 $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
@@ -24,9 +24,5 @@
 $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
@@ -636,8 +636,4 @@
     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
@@ -248,6 +248,4 @@
 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
@@ -102,7 +102,6 @@
 $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 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
     </fieldset>
 </div>
 </form>
-<?php
-/**
- * Displays the footer
- */
-require 'libraries/footer.inc.php';
-?>
diff --git a/db_search.php b/db_search.php
@@ -371,9 +371,3 @@ function PMA_getSearchSqls($table, $field, $search_str, $search_option)
 <!--  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
@@ -62,8 +62,4 @@
     isset($_REQUEST['delimiter']) ? htmlspecialchars($_REQUEST['delimiter']) : ';'
 );
 
-/**
- * Displays the footer
- */
-require 'libraries/footer.inc.php';
 ?>
diff --git a/db_structure.php b/db_structure.php
@@ -89,11 +89,6 @@
     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 @@ class="center">
     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
@@ -52,9 +52,6 @@
     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 @@
     echo PMA_getMessage(__('Database Log'), $log);
 }
 
-/**
- * Display the footer
- */
-require 'libraries/footer.inc.php';
 ?>
diff --git a/export.php b/export.php
@@ -765,7 +765,7 @@ function PMA_exportOutputHandler($line)
         }
     }
 
-    /* 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 @@ function PMA_exportOutputHandler($line)
         }
         exit();
     } else {
+        PMA_Response::getInstance()->disable();
         echo $dump_buffer;
     }
 } else {
@@ -834,6 +835,5 @@ function PMA_exportOutputHandler($line)
 //]]>
 </script>
 <?php
-    include 'libraries/footer.inc.php';
 } // end if
 ?>
diff --git a/import.php b/import.php
@@ -94,7 +94,7 @@
     $_SESSION['Import_message']['go_back_url'] = $goto;
 
     $message->display();
-    include 'libraries/footer.inc.php';
+    exit; // the footer is displayed automatically
 }
 
 /**
@@ -524,5 +524,4 @@
     $active_page = $goto;
     include '' . $goto;
 }
-exit();
 ?>
diff --git 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
@@ -88,7 +88,7 @@ function Error($error_message = '')
         $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
@@ -703,10 +703,7 @@ function PMA_mysqlDie(
         }
 
         echo $error_msg;
-        /**
+        exit;
-         * display footer and exit
-         */
-        include './libraries/footer.inc.php';
     } else {
         echo $error_msg;
     }

diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
@@ -38,7 +38,7 @@ function PMA_exportIsActive($what, $val)
 /* 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
@@ -21,7 +21,7 @@
 /* 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
diff --git 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";
+        exit;
-        include '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)

diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
@@ -324,7 +324,7 @@
         </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
@@ -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
@@ -87,11 +87,4 @@
     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
@@ -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
@@ -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
@@ -239,8 +239,7 @@ function dieSchema($pageNumber, $type = '', $error_message = '')
             . '&do=selectpage&chpage=' . $pageNumber . '&action_choose=0'
             . '">' . __('Back') . '</a>';
         echo "\n";
-        include_once './libraries/footer.inc.php';
+        exit;
-        exit();
     }
 }
 ?>
diff --git a/main.php b/main.php
@@ -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
@@ -89,9 +89,4 @@
     <?php
 }
 $form_display->display(true, true);
-
-/**
- * Displays the footer
- */
-require 'libraries/footer.inc.php';
 ?>
diff --git a/prefs_manage.php b/prefs_manage.php
@@ -133,8 +133,7 @@
                 <input type="submit" name="submit_ignore" value="<?php echo __('No') ?>" />
             </form>
             <?php
-            include 'libraries/footer.inc.php';
+            exit;
-            return;
         }
 
         // check for ThemeDefault and fontsize
@@ -339,9 +338,3 @@
     </div>
     <br class="clearfloat" />
 </div>
-<?php
-/**
- * Displays the footer
- */
-require 'libraries/footer.inc.php';
-?>