From cd80db48c2f4011b30b0d39a47cc72a34dda7861 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 28 Apr 2002 10:50:38 +0000
Subject: [PATCH] common

---
 ChangeLog                  |  4 +++
 tbl_properties.php3        | 60 ++------------------------------
 tbl_properties_common.php3 | 71 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 58 deletions(-)
 create mode 100755 tbl_properties_common.php3

diff --git a/ChangeLog b/ChangeLog
index deea0c701..25e9f0b03 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-04-28 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties.php3, new tbl_properties_common.php3:
+      start the split
+
 2002-04-28 Alexander M. Turek  <rabus@users.sourceforge.net>
 	* header.inc.php3, lines 162-170: Improved patch #548696.
 
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 487918f3d..848831b06 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -2,66 +2,10 @@
 /* $Id$ */
 
 
-/**
- * Gets some core libraries
- */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
-require('./libraries/bookmark.lib.php3');
-
+require('./tbl_properties_common.php3');
 
 /**
- * Defines the urls to return to in case of error in a sql statement
- */
-$err_url_0 = 'db_details.php3'
-           . '?lang=' . $lang
-           . '&amp;server=' . $server
-           . '&amp;db=' . urlencode($db);
-$err_url   = 'tbl_properties.php3'
-           . '?lang=' . $lang
-           . '&amp;server=' . $server
-           . '&amp;db=' . urlencode($db)
-           . '&amp;table=' . urlencode($table);
-
-
-/**
- * Ensures the database and the table exist (else move to the "parent" script)
- * and displays headers
- */
-if (!isset($is_db) || !$is_db) {
-    // Not a valid db name -> back to the welcome page
-    if (!empty($db)) {
-        $is_db = @mysql_select_db($db);
-    }
-    if (empty($db) || !$is_db) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?lang=' . $lang . '&server=' . $server . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
-        exit();
-    }
-} // end if (ensures db exists)
-if (!isset($is_table) || !$is_table) {
-    // Not a valid table name -> back to the db_details.php3
-    if (!empty($table)) {
-        $is_table = @mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'');
-    }
-    if (empty($table) || !@mysql_numrows($is_table)) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'db_details.php3?lang=' . $lang . '&server=' . $server . '&db=' . urlencode($db) . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
-        exit();
-    } else if (isset($is_table)) {
-        mysql_free_result($is_table);
-    }
-} // end if (ensures table exists)
-
-// Displays headers
-if (!isset($message)) {
-    $js_to_run = 'functions.js';
-    include('./header.inc.php3');
-} else {
-    PMA_showMessage($message);
-}
-
-
-/**
- * Drop/delete mutliple tables if required
+ * Drop multiple fields if required
  */
 if ((!empty($submit_mult) && isset($selected_fld))
     || isset($mult_btn)) {
diff --git a/tbl_properties_common.php3 b/tbl_properties_common.php3
new file mode 100755
index 000000000..f458e9a2a
--- /dev/null
+++ b/tbl_properties_common.php3
@@ -0,0 +1,71 @@
+<?php
+/* $Id$ */
+
+
+/**
+ * Gets some core libraries
+ */
+require('./libraries/grab_globals.lib.php3');
+require('./libraries/common.lib.php3');
+require('./libraries/bookmark.lib.php3');
+
+
+/**
+ * Defines the urls to return to in case of error in a sql statement
+ */
+$err_url_0 = 'db_details.php3'
+           . '?lang=' . $lang
+           . '&amp;server=' . $server
+           . '&amp;db=' . urlencode($db);
+$err_url   = 'tbl_properties.php3'
+           . '?lang=' . $lang
+           . '&amp;server=' . $server
+           . '&amp;db=' . urlencode($db)
+           . '&amp;table=' . urlencode($table);
+
+
+/**
+ * Ensures the database and the table exist (else move to the "parent" script)
+ * and displays headers
+ */
+if (!isset($is_db) || !$is_db) {
+    // Not a valid db name -> back to the welcome page
+    if (!empty($db)) {
+        $is_db = @mysql_select_db($db);
+    }
+    if (empty($db) || !$is_db) {
+        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?lang=' . $lang . '&server=' . $server . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        exit();
+    }
+} // end if (ensures db exists)
+if (!isset($is_table) || !$is_table) {
+    // Not a valid table name -> back to the db_details.php3
+    if (!empty($table)) {
+        $is_table = @mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'');
+    }
+    if (empty($table) || !@mysql_numrows($is_table)) {
+        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'db_details.php3?lang=' . $lang . '&server=' . $server . '&db=' . urlencode($db) . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        exit();
+    } else if (isset($is_table)) {
+        mysql_free_result($is_table);
+    }
+} // end if (ensures table exists)
+
+// Displays headers
+if (!isset($message)) {
+    $js_to_run = 'functions.js';
+    include('./header.inc.php3');
+} else {
+    PMA_showMessage($message);
+}
+
+/**
+ * Set parameters for links
+ */
+$url_query = 'lang=' . $lang
+           . '&amp;server=' . $server
+           . '&amp;db=' . urlencode($db)
+           . '&amp;table=' . urlencode($table)
+           . '&amp;goto=tbl_properties.php3';
+
+?>