diff --git a/export_relation_schema.php b/export_relation_schema.php
index c3c985283..b8c2a4d17 100644
--- a/export_relation_schema.php
+++ b/export_relation_schema.php
@@ -20,20 +20,24 @@ $url_query .= '&goto=export_relation_schema.php';
 require_once './libraries/db_info.inc.php';
 
 /**
- * Settings for relation stuff
+ * Includ settings for relation stuff
+ * get all variables needed for exporting relational schema 
+ * in $cfgRelation
  */
 require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
-// This is to avoid "Command out of sync" errors. Before switching this to
-// a value of 0 (for MYSQLI_USE_RESULT), please check the logic
-// to free results wherever needed.
+/** 
+ * This is to avoid "Command out of sync" errors. Before switching this to
+ * a value of 0 (for MYSQLI_USE_RESULT), please check the logic
+ * to free results wherever needed.
+ */
 $query_default_option = PMA_DBI_QUERY_STORE;
 
 /**
  * Now in ./libraries/relation.lib.php we check for all tables
  * that we need, but if we don't find them we are quiet about it
- * so people can work without.
+ * so people can't work without relational variables.
  * This page is absolutely useless if you didn't set up your tables
  * correctly, so it is a good place to see which tables we can and
  * complain ;-)
@@ -63,46 +67,50 @@ if (!isset($cfgRelation['pdf_pages'])) {
 
 if ($cfgRelation['pdfwork']) {
 
-	/**
-	 * User Object Created for displaying the HTML options
-	 * so, user can play with it and perform export of relations schema
-	 */
+   /**
+    * User object created for presenting the HTML options
+    * so, user can interact with it and perform export of relations schema
+    */
 	
-	require_once './libraries/schema/user_schema.php';
-	$user_schema = new PMA_User_Schema();
+    require_once './libraries/schema/User_Schema.class.php';
+    $user_schema = new PMA_User_Schema();
 
-	/**
-	 * This function will process the user input
-	 * 
-	 */
-	$user_schema->userInputProcess($do);
-		
-	/**
-	 * Now first show some possibility to select a page for the export of relation schema
-	 */
-	$user_schema->selectPage();
-	
-	/**
-	 * Possibility to create a new page: 
-	 */
-	$user_schema->createPage();
-	
-	/**
-	 * After selection of page or creating a page 
-	 * It will show you the list of tables 
-	 * A dashboard will also be shown where you can position the tables
-	 */
-	$user_schema->showTableDashBoard();
+    /**
+     * This function will process the user input
+     */
+
+    $user_schema->processUserPreferences($do);
+
+    /**
+     * Now first show some possibility to select a page for the export of relation schema
+     */
+
+    $user_schema->selectPage();
+
+    /**
+     * Possibility to create a new page: 
+     */
+
+    $user_schema->createPage();
+
+    /**
+     * After selection of page or creating a page 
+     * It will show you the list of tables 
+     * A dashboard will also be shown where you can position the tables
+     */
+
+    $user_schema->showTableDashBoard();
 
     if (isset($do)
     && ($do == 'edcoord'
-       || ($do == 'selectpage' && isset($chpage))
-       || ($do == 'createpage' && isset($chpage)))) {
-	  /** 
-	   * show Export schema generation options
-	   */
+       || ($do == 'selectpage' && isset($chpage) && $chpage != 0)
+       || ($do == 'createpage' && isset($chpage) && $chpage != 0))) {
+
+      /** 
+       * show Export schema generation options
+       */
        $user_schema->displaySchemaGenerationOptions();
-		 
+
         if ((isset($showwysiwyg) && $showwysiwyg == '1')) {
 			?>
 			<script type="text/javascript">
@@ -110,8 +118,8 @@ if ($cfgRelation['pdfwork']) {
 			ToggleDragDrop('pdflayout');
 			//]]>
 			</script>
-			<?php
-		}
+            <?php
+      }
     } // end if
 } // end if ($cfgRelation['pdfwork'])
 
diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php
index 2b027e1aa..30982a308 100644
--- a/libraries/schema/Dia_Relation_Schema.class.php
+++ b/libraries/schema/Dia_Relation_Schema.class.php
@@ -1,5 +1,16 @@
 <?php
 include_once("Export_Relation_Schema.class.php");
+
+class PMA_DIA extends XMLWriter
+{
+    public $title;
+	public $author;
+	public $font;
+	public $fontSize;
+	
+	
+}
+
 class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
 {
 	
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index f94aa1a1d..3a4bc3724 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -325,7 +325,7 @@ class PMA_PDF extends TCPDF {
                     $this->_out('/First ' . ($this->n + 1) . ' 0 R');
                     $this->_out('/Last ' . ($this->n + $last - $i) . ' 0 R');
                     $this->_out('/Count -' . $kids);
-                }tur
+                }
                 $this->_out('>>');
                 $this->_out('endobj');
             }
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 723ce3d69..60c703a92 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -1,608 +1,588 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * This Class will interact with the user to gather the information
- * about their tables for which they want to export the relational schema
+ *
+ * @version $Id$
+ * @package phpMyAdmin
  */
-	 
+
+/**
+ * This Class interacts with the user to gather the information
+ * about their tables for which they want to export the relational schema
+ * export options are shown to user from they can choose
+ *
+ * @name
+ * @author Muhammad Adnan <hiddenpearls@gmail.com>
+ * @copyright
+ * @license
+ */
+
 class PMA_User_Schema
-{
-/*	private $_exportType;
-	public function __construct()
-	{
-		$this->_exportType='pdf'; // default export type
-	}
-	
-	public function setExportType($type)
-	{
-		$this->_exportType=$type;
-	}
-	
-	public function getExportType()
-	{
-		return $this->_exportType;
-	}*/
-	
-	/**
-	 * This function will process the user input
-	 * 
-	 */
-	public function userInputProcess($do)
-	{
-	global $action_choose,$chpage,$db,$cfgRelation,$cfg,$auto_layout_foreign,$auto_layout_internal,$newpage,$c_table_rows,$query_default_option;
-    // Now is the time to work on all changes
-		//echo $do;
+{	
+    /**
+     * This function will process the user defined pages
+     * and tables which will be exported as Relational schema
+     * you can set the table positions on the paper via scratchboard
+     * for table positions, put the x,y co-ordinates
+     * 
+     * @param string $do It is hidden value
+     * @access public
+     */
+
+    public function processUserPreferences($do)
+    {
+    global $action_choose,$chpage,$db,$cfgRelation,$cfg,$auto_layout_foreign,$auto_layout_internal,$newpage,$c_table_rows,$query_default_option;
+
     if (isset($do)) {
         switch ($do) {
-            case 'selectpage':
-                if ($action_choose=="1") {
-                    $ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
-                              .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
-                              .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
-                    PMA_query_as_controluser($ch_query, FALSE, $query_default_option);
+        case 'selectpage':
+            if ($action_choose=="1") {
+                $ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
+                           .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
+                           .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
+                PMA_query_as_controluser($ch_query, FALSE, $query_default_option);
 
-                    $ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
-                              .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
-                              .   ' AND   page_nr = \'' . PMA_sqlAddslashes($chpage) . '\'';
-                    PMA_query_as_controluser($ch_query, FALSE, $query_default_option);
+                $ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
+                           .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
+                           .   ' AND   page_nr = \'' . PMA_sqlAddslashes($chpage) . '\'';
+                PMA_query_as_controluser($ch_query, FALSE, $query_default_option);
 
-                    unset($chpage);
-                }
-                break;
-            case 'createpage':
-                
-				$pdf_page_number = PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option);
-				
-                // A u t o m a t i c    l a y o u t
-                // ================================
-                if (isset($auto_layout_internal) || isset($auto_layout_foreign)) {
-                    $all_tables = array();
-                }
+                unset($chpage);
+            }
+        break;
+        case 'createpage':
+            $pdf_page_number = PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option);
 
-                if (isset($auto_layout_foreign)) {
-                    // get the tables list
-                    $tables = PMA_DBI_get_tables_full($db);
-                    // find the ones who support FOREIGN KEY; it's not
-                    // important that we group together InnoDB tables
-                    // and PBXT tables, as this logic is just to put
-                    // the tables on the layout, not to determine relations
-                    $foreignkey_tables = array();
-                    foreach($tables as $table_name => $table_properties) {
+            /*
+			 * A u t o m a t i c    l a y o u t
+             *
+             * There are 2 kinds of relations in PMA
+             * 1) Internal Relations 2) Foreign Key Relations
+			 */
+            if (isset($auto_layout_internal) || isset($auto_layout_foreign)) {
+                $all_tables = array();
+            }
+
+            if (isset($auto_layout_foreign)) {
+                /*
+                 * get the tables list
+                 * who support FOREIGN KEY, it's not
+                 * important that we group together InnoDB tables
+                 * and PBXT tables, as this logic is just to put
+                 * the tables on the layout, not to determine relations
+                 */
+                $tables = PMA_DBI_get_tables_full($db);
+                $foreignkey_tables = array();
+                foreach($tables as $table_name => $table_properties) {
                         if (PMA_foreignkey_supported($table_properties['ENGINE'])) {
                             $foreignkey_tables[] = $table_name;
                         }
-                    }
-                    $all_tables = $foreignkey_tables;
+                }
+                $all_tables = $foreignkey_tables;
                     // could be improved by finding the tables which have the
                     // most references keys and placing them at the beginning
                     // of the array (so that they are all center of schema)
-                    unset($tables, $foreignkey_tables);
-                } // endif auto_layout_foreign
+                unset($tables, $foreignkey_tables);
+            }
 
-                if (isset($auto_layout_internal)) {
-                    // get the tables that have relations, by descending
-                    // number of links
-                    $master_tables = 'SELECT COUNT(master_table), master_table'
+            if (isset($auto_layout_internal)) {
+                /*
+                 * get the tables list who support Internal Relations;
+                 * This type of relations will be created when 
+                 * you setup the PMA tables correctly
+                 */
+                $master_tables = 'SELECT COUNT(master_table), master_table'
                                 . ' FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
                                 . ' WHERE master_db = \'' . $db . '\''
                                 . ' GROUP BY master_table'
                                 . ' ORDER BY ' . PMA_backquote('COUNT(master_table)') . ' DESC ';
-                    $master_tables_rs = PMA_query_as_controluser($master_tables, FALSE, $query_default_option);
-                    if ($master_tables_rs && PMA_DBI_num_rows($master_tables_rs) > 0) {
-                        // first put all the master tables at beginning
-                        // of the list, so they are near the center of
-                        // the schema
-                        while (list(, $master_table) = PMA_DBI_fetch_row($master_tables_rs)) {
-                            $all_tables[] = $master_table;
-                        }
+                $master_tables_rs = PMA_query_as_controluser($master_tables, FALSE, $query_default_option);
+                if ($master_tables_rs && PMA_DBI_num_rows($master_tables_rs) > 0) {
+                    /* first put all the master tables at beginning
+                     * of the list, so they are near the center of
+                     * the schema
+					 */
+                    while (list(, $master_table) = PMA_DBI_fetch_row($master_tables_rs)) {
+                        $all_tables[] = $master_table;
+                    }
 
-                        // then for each master, add its foreigns into an array
-                        // of foreign tables, if not already there
-                        // (a foreign might be foreign for more than
-                        // one table, and might be a master itself)
+                    /* Now for each master, add its foreigns into an array
+                     * of foreign tables, if not already there
+                     * (a foreign might be foreign for more than
+                     * one table, and might be a master itself)
+					 */	
 
-                        $foreign_tables = array();
-                        foreach ($all_tables as $master_table) {
+                    $foreign_tables = array();
+                    foreach ($all_tables as $master_table) {
                             $foreigners = PMA_getForeigners($db, $master_table);
                             foreach ($foreigners as $foreigner) {
                                 if (!in_array($foreigner['foreign_table'], $foreign_tables)) {
                                     $foreign_tables[] = $foreigner['foreign_table'];
                                 }
                             }
-                        }
+                    }
 
-                        // then merge the arrays
-                        foreach ($foreign_tables as $foreign_table) {
+                    /*
+					 * Now merge the master and foreign arrays/tables 
+					 */ 
+                    foreach ($foreign_tables as $foreign_table) {
                             if (!in_array($foreign_table, $all_tables)) {
                                 $all_tables[] = $foreign_table;
                             }
-                        }
-                    } // endif there are master tables
-                } // endif auto_layout_internal
+                    }
+                } // endif there are master tables
+            } // endif auto_layout_internal
 
-                if (isset($auto_layout_internal) || isset($auto_layout_foreign)) {
-                    // now generate the coordinates for the schema,
-                    // in a clockwise spiral
-
-                    $pos_x = 300;
-                    $pos_y = 300;
-                    $delta = 110;
-                    $delta_mult = 1.10;
-                    $direction = "right";
-                    foreach ($all_tables as $current_table) {
-
-                        // save current table's coordinates
+            if (isset($auto_layout_internal) || isset($auto_layout_foreign)) {
+                /*
+                 * Now generate the coordinates for the schema
+                 * in a clockwise spiral
+                 */
+                $pos_x = 300;
+                $pos_y = 300;
+                $delta = 110;
+                $delta_mult = 1.10;
+                $direction = "right";
+                foreach ($all_tables as $current_table) {
+                        /*
+                         * save current table's coordinates
+                         */
                         $insert_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
                                       . '(db_name, table_name, pdf_page_number, x, y) '
                                       . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($current_table) . '\',' . $pdf_page_number . ',' . $pos_x . ',' . $pos_y . ')';
                         PMA_query_as_controluser($insert_query, FALSE, $query_default_option);
 
-                        // compute for the next table
+                        /*
+                         * compute for the next table
+                         */
                         switch ($direction) {
-                            case 'right':
-                                $pos_x += $delta;
-                                $direction = "down";
-                                $delta *= $delta_mult;
-                                break;
-                            case 'down':
-                                $pos_y += $delta;
-                                $direction = "left";
-                                $delta *= $delta_mult;
-                                break;
-                            case 'left':
-                                $pos_x -= $delta;
-                                $direction = "up";
-                                $delta *= $delta_mult;
-                                break;
-                            case 'up':
-                                $pos_y -= $delta;
-                                $direction = "right";
-                                $delta *= $delta_mult;
-                                break;
+                        case 'right':
+                            $pos_x += $delta;
+                            $direction = "down";
+                            $delta *= $delta_mult;
+                            break;
+                        case 'down':
+                            $pos_y += $delta;
+                            $direction = "left";
+                            $delta *= $delta_mult;
+                            break;
+                        case 'left':
+                            $pos_x -= $delta;
+                            $direction = "up";
+                            $delta *= $delta_mult;
+                            break;
+                        case 'up':
+                            $pos_y -= $delta;
+                            $direction = "right";
+                            $delta *= $delta_mult;
+                            break;
                         } // end switch
-                    } // end foreach
-                } // end if some auto-layout to do
+                } // end foreach
+            } // end if some auto-layout to do
 
-                $chpage = $pdf_page_number;
+            $chpage = $pdf_page_number;
+            break;
 
-                break;
-
-            case 'edcoord':
-                for ($i = 0; $i < $c_table_rows; $i++) {
-                    $arrvalue = 'c_table_' . $i;
-					global $$arrvalue;
-                    $arrvalue = $$arrvalue;
-                    if (!isset($arrvalue['x']) || $arrvalue['x'] == '') {
-                        $arrvalue['x'] = 0;
-                    }
-                    if (!isset($arrvalue['y']) || $arrvalue['y'] == '') {
-                        $arrvalue['y'] = 0;
-                    }
-                    if (isset($arrvalue['name']) && $arrvalue['name'] != '--') {
-                        $test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
-                                    .   ' WHERE db_name = \'' .  PMA_sqlAddslashes($db) . '\''
-                                    .   ' AND   table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\''
-                                    .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
-                       // echo $test_query;
-						$test_rs    = PMA_query_as_controluser($test_query, FALSE, $query_default_option);
-                        if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) {
-                            if (isset($arrvalue['delete']) && $arrvalue['delete'] == 'y') {
-                                $ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
-                                          .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
-                                          .   ' AND   table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\''
-                                          .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
-                            } else {
-                                $ch_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
-                                          . 'SET x = ' . $arrvalue['x'] . ', y= ' . $arrvalue['y']
-                                          .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
-                                          .   ' AND   table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\''
-                                          .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
-                            }
-                        } else {
-                            $ch_query     = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
-                                          . '(db_name, table_name, pdf_page_number, x, y) '
-                                          . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($arrvalue['name']) . '\', \'' . PMA_sqlAddslashes($chpage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')';
-                        }
-												//echo $ch_query;
-                        PMA_query_as_controluser($ch_query, FALSE, $query_default_option);
-                    } // end if
-                } // end for
-                break;
-            case 'deleteCrap':
-                foreach ($delrow as $current_row) {
-                    $d_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . "\n"
-                             .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . "\n"
-                             .   ' AND   table_name = \'' . PMA_sqlAddslashes($current_row) . '\'' . "\n"
-                             .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
-                    PMA_query_as_controluser($d_query, FALSE, $query_default_option);
+        case 'edcoord':
+            for ($i = 0; $i < $c_table_rows; $i++) {
+                $arrvalue = 'c_table_' . $i;
+				global $$arrvalue;
+                $arrvalue = $$arrvalue;
+                if (!isset($arrvalue['x']) || $arrvalue['x'] == '') {
+                    $arrvalue['x'] = 0;
                 }
-                break;
+                if (!isset($arrvalue['y']) || $arrvalue['y'] == '') {
+                    $arrvalue['y'] = 0;
+                }
+                if (isset($arrvalue['name']) && $arrvalue['name'] != '--') {
+                    $test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
+                                .   ' WHERE db_name = \'' .  PMA_sqlAddslashes($db) . '\''
+                                .   ' AND   table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\''
+                                .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
+                    // echo $test_query;
+					$test_rs    = PMA_query_as_controluser($test_query, FALSE, $query_default_option);
+                    if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) {
+                        if (isset($arrvalue['delete']) && $arrvalue['delete'] == 'y') {
+                            $ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
+                                      .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
+                                      .   ' AND   table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\''
+                                      .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
+                        } else {                     
+					    $ch_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
+                                  . 'SET x = ' . $arrvalue['x'] . ', y= ' . $arrvalue['y']
+                                  .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
+                                  .   ' AND   table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\''
+                                  .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
+                        }
+                    } else {
+                    $ch_query     = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
+                                  . '(db_name, table_name, pdf_page_number, x, y) '
+                                  . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($arrvalue['name']) . '\', \'' . PMA_sqlAddslashes($chpage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')';
+                    }
+					//echo $ch_query;
+                PMA_query_as_controluser($ch_query, FALSE, $query_default_option);
+                } // end if
+            } // end for
+            break;
+
+        case 'deleteCrap':
+            $this->_deleteTableRows();
+            break;
+
+        case 'process_export':
+		    $this->_processExportSchema();
+			break;
+
         } // end switch
     } // end if (isset($do))
 
 	}
 	
-	/**
-	* This function shows/displays the HTML FORM to create the page 
-	*  
-	*/
+    /**
+     * shows/displays the HTML FORM to create the page 
+     *
+     * @access public
+     */
+
 	public function createPage()
 	{
-	global $db,$table;
-	?>
-	<form method="post" action="export_relation_schema.php" name="frm_create_page">
-		<fieldset>
-		<legend>
-		<?php echo __('Create a page !') . "\n"; ?>
-		</legend>
-		<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
-		<input type="hidden" name="do" value="createpage" />
-		<table>
-		<tr>
-		<td><label for="id_newpage"><?php echo __('Page name'); ?></label></td>
-		<td><input type="text" name="newpage" id="id_newpage" size="20" maxlength="50" /></td>
-		</tr>
-		<tr>
-		<td><?php echo __('Automatic layout based on'); ?></td>
-		<td>
-			<input type="checkbox" name="auto_layout_internal" id="id_auto_layout_internal" /><label for="id_auto_layout_internal">
-			<?php echo __('Internal relations'); ?></label><br />
-		<?php
-		/**
-		* Check to see whether INNODB and PBXT storage engines are Available in MYSQL PACKAGE
-		* If available, then provide AutoLayout for Foreign Keys in Schema View
-		*/ 
-		if (PMA_StorageEngine::isValid('InnoDB') || PMA_StorageEngine::isValid('PBXT')) {
-		    ?>
-			<input type="checkbox" name="auto_layout_foreign" id="id_auto_layout_foreign" /><label for="id_auto_layout_foreign">
-			<?php echo __('FOREIGN KEY'); ?></label><br />
-		    <?php
-		    }
+        global $db,$table;
+        ?>
+        <form method="post" action="export_relation_schema.php" name="frm_create_page">
+        <fieldset>
+        <legend>
+        <?php echo __('Create a page !') . "\n"; ?>
+        </legend>
+        <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
+        <input type="hidden" name="do" value="createpage" />
+        <table>
+        <tr>
+        <td><label for="id_newpage"><?php echo __('Page name'); ?></label></td>
+        <td><input type="text" name="newpage" id="id_newpage" size="20" maxlength="50" /></td>
+        </tr>
+        <tr>
+        <td><?php echo __('Automatic layout based on'); ?></td>
+        <td>
+        <input type="checkbox" name="auto_layout_internal" id="id_auto_layout_internal" /><label for="id_auto_layout_internal">
+        <?php echo __('Internal relations'); ?></label><br />
+        <?php
+        /*
+         * Check to see whether INNODB and PBXT storage engines are Available in MYSQL PACKAGE
+         * If available, then provide AutoLayout for Foreign Keys in Schema View
+         */ 
+
+        if (PMA_StorageEngine::isValid('InnoDB') || PMA_StorageEngine::isValid('PBXT')) {
+            ?>
+            <input type="checkbox" name="auto_layout_foreign" id="id_auto_layout_foreign" /><label for="id_auto_layout_foreign">
+            <?php echo __('FOREIGN KEY'); ?></label><br />
+            <?php
+        }
 		?>
-		</td></tr>
-		</table>
-		</fieldset>
-		<fieldset class="tblFooters">
-		<input type="submit" value="<?php echo __('Go'); ?>" />
-		</fieldset>
-	</form>
-    <?php
+        </td></tr>
+        </table>
+        </fieldset>
+        <fieldset class="tblFooters">
+        <input type="submit" value="<?php echo __('Go'); ?>" />
+        </fieldset>
+        </form>
+        <?php
 	}
 	
-	/**
-	 * This function shows/displays the created page names 
-	 * All page names in a list
-	 * User can select any page number and edit it using dashboard etc
-	 */
-	public function selectPage()
-	{
-	global $db,$table,$query_default_option,$cfgRelation;
-    $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
+    /**
+     * shows/displays the created page names in a drop down list
+     * User can select any page number and edit it using dashboard etc
+     *
+	 * @access public
+     */
+
+    public function selectPage()
+    {
+        global $db,$table,$query_default_option,$cfgRelation,$chpage;
+        $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
                 . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
-				//echo $page_query;
-    $page_rs    = PMA_query_as_controluser($page_query, FALSE, $query_default_option);
-			if ($page_rs && PMA_DBI_num_rows($page_rs) > 0) {
-				?>
-                <form method="get" action="export_relation_schema.php" name="frm_select_page">
-                <fieldset>
-                <legend>
-                <?php echo __('Please select a page to edit') . "\n"; ?>
-                </legend>
-                <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
-                <input type="hidden" name="do" value="selectpage" />
-                <select name="chpage" onchange="this.form.submit()">
-                    <?php
-                    while ($curr_page = PMA_DBI_fetch_assoc($page_rs)) {
-                     echo "\n" . '        '
-                             . '<option value="' . $curr_page['page_nr'] . '"';
-                        if (isset($chpage) && $chpage == $curr_page['page_nr']) {
-                            echo ' selected="selected"';
-                        }
-                        echo '>' . $curr_page['page_nr'] . ': ' . htmlspecialchars($curr_page['page_descr']) . '</option>';
-                    } // end while
-                    echo "\n";
-                    ?>
-                </select>
-                <?php
-                $choices = array(
-                    '0' => __('Edit'),
-                    '1' => __('Delete'));
-                    PMA_display_html_radio('action_choose', $choices, '0', false);
-                unset($choices);
-                ?>
-                </fieldset>
-                <fieldset class="tblFooters">
-                   <input type="submit" value="<?php echo __('Go'); ?>" /><br />
-                </fieldset>
-                </form>
-                <?php
-			} // end IF
-    echo "\n";
+        $page_rs    = PMA_query_as_controluser($page_query, FALSE, $query_default_option);
+	    if ($page_rs && PMA_DBI_num_rows($page_rs) > 0) {
+		    ?>
+            <form method="get" action="export_relation_schema.php" name="frm_select_page">
+            <fieldset>
+            <legend>
+            <?php echo __('Please select a page to edit') . "\n"; ?>
+            </legend>
+            <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
+            <input type="hidden" name="do" value="selectpage" />
+            <select name="chpage" onchange="this.form.submit()">
+			<option value='0'><?php echo __('Select page'); ?></option>
+            <?php
+            while ($curr_page = PMA_DBI_fetch_assoc($page_rs)) {
+                   echo "\n" . '        '
+                        . '<option value="' . $curr_page['page_nr'] . '"';
+                    if (isset($chpage) && $chpage == $curr_page['page_nr']) {
+                        echo ' selected="selected"';
+                    }
+                    echo '>' . $curr_page['page_nr'] . ': ' . htmlspecialchars($curr_page['page_descr']) . '</option>';
+            } // end while
+            echo "\n";
+            ?>
+            </select>
+            <?php
+            $choices = array(
+                 '0' => __('Edit'),
+                 '1' => __('Delete')
+		    );
+            PMA_display_html_radio('action_choose', $choices, '0', false);
+            unset($choices);
+            ?>
+            </fieldset>
+            <fieldset class="tblFooters">
+            <input type="submit" value="<?php echo __('Go'); ?>" /><br />
+            </fieldset>
+            </form>
+            <?php
+        } // end IF
+        echo "\n";
 	} // end function
-	
-	/** 
-	* A dashboard will also be shown where you can position the tables
-	*/	
-	public function showTableDashBoard()
-	{
-		global $db,$cfgRelation,$table,$cfg,$with_field_names,$with_field_names,$chpage;
-		// We will need an array of all tables in this db
-		$selectboxall = array('--');
-		$alltab_rs    = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
-		while ($val = @PMA_DBI_fetch_row($alltab_rs)) {
-			$selectboxall[] = $val[0];
-		}
-		
-		// Now if we already have chosen a page number then we should show the
-		// tables involved
-		if (isset($chpage) && $chpage > 0) {
-			echo "\n";
-			?>
-		<h2><?php echo __('Select Tables') ;?></h2>
-		
-		<?php
-		$page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
-					. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
-					. ' AND pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
-		$page_rs    = PMA_query_as_controluser($page_query, FALSE, $query_default_option);
-		$array_sh_page = array();
-		$draginit = '';
-		$reset_draginit = '';
-		$i = 0;
-		while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) {
-			$array_sh_page[] = $temp_sh_page;
-		}
-	
-	// Display WYSIWYG-PDF parts?
+
+    /** 
+     * A dashboard is displayed to AutoLayout the position of tables
+     * users can drag n drop the tables and change their positions
+     * 
+     */	
+
+    public function showTableDashBoard()
+    {
+        global $db,$cfgRelation,$table,$cfg,$with_field_names,$chpage;
+        /*
+         * We will need an array of all tables in this db
+         */
+        $selectboxall = array('--');
+        $alltab_rs    = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
+        while ($val = @PMA_DBI_fetch_row($alltab_rs)) {
+               $selectboxall[] = $val[0];
+        }
+
+        /*
+         * Now if we already have chosen a page number then we should 
+         * show the tables involved
+         */ 
+
+        if (isset($chpage) && $chpage > 0) {
+            echo "\n";
+            ?>
+		    <h2><?php echo __('Select Tables') ;?></h2>
+            <?php
+            $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
+                        . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
+                        . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
+            $page_rs    = PMA_query_as_controluser($page_query, FALSE, $query_default_option);
+            $array_sh_page = array();
+            $draginit = '';
+            $reset_draginit = '';
+            $i = 0;
+            while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) {
+                   $array_sh_page[] = $temp_sh_page;
+            }
+
+	/*
+     * Display WYSIWYG-PDF parts?
+     */
+
 	if ($cfg['WYSIWYG-PDF']) {
 		if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) {
 			$with_field_names = TRUE;
 		}
-	?>
-	<script type="text/javascript" src="./js/dom-drag.js"></script>
-	<form method="post" action="export_relation_schema.php" name="dragdrop">
-	<input type="button" name="dragdrop" value="<?php echo __('Toggle scratchboard'); ?>" onclick="ToggleDragDrop('pdflayout');" />
-	 <input type="button" name="dragdropreset" value="<?php echo __('Reset'); ?>" onclick="resetDrag();" />
-	</form>
-	<div id="pdflayout" class="pdflayout" style="visibility: hidden;">
-	<?php
-	foreach ($array_sh_page as $key => $temp_sh_page) {
-		$drag_x = $temp_sh_page['x'];
-		$drag_y = $temp_sh_page['y'];
-	
-		$draginit       .= '    Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n";
-		$draginit       .= '    getElement("table_' . $i . '").onDrag = function (x, y) { document.edcoord.elements["c_table_' . $i . '[x]"].value = parseInt(x); document.edcoord.elements["c_table_' . $i . '[y]"].value = parseInt(y) }' . "\n";
-		$draginit       .= '    getElement("table_' . $i . '").style.left = "' . $drag_x . 'px";' . "\n";
-		$draginit       .= '    getElement("table_' . $i . '").style.top  = "' . $drag_y . 'px";' . "\n";
-		$reset_draginit .= '    getElement("table_' . $i . '").style.left = "2px";' . "\n";
-		$reset_draginit .= '    getElement("table_' . $i . '").style.top  = "' . (15 * $i) . 'px";' . "\n";
-		$reset_draginit .= '    document.edcoord.elements["c_table_' . $i . '[x]"].value = "2"' . "\n";
-		$reset_draginit .= '    document.edcoord.elements["c_table_' . $i . '[y]"].value = "' . (15 * $i) . '"' . "\n";
-	
-		$local_query = 'SHOW FIELDS FROM '
-					 .  PMA_backquote($temp_sh_page['table_name'])
-					. ' FROM ' . PMA_backquote($db);
-		$fields_rs = PMA_DBI_query($local_query);
-		unset($local_query);
-		$fields_cnt = PMA_DBI_num_rows($fields_rs);
-	
-		echo '<div id="table_' . $i . '" class="pdflayout_table"><u>' . $temp_sh_page['table_name'] . '</u>';
-		if (isset($with_field_names)) {
-			while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
-				echo '<br />' . htmlspecialchars($row['Field']) . "\n";
-			}
+		$this->_displayScratchboardTables($array_sh_page,$draginit,$reset_draginit);
+    }
+    ?>
+
+    <form method="post" action="export_relation_schema.php" name="edcoord">
+        <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
+        <input type="hidden" name="chpage" value="<?php echo htmlspecialchars($chpage); ?>" />
+        <input type="hidden" name="do" value="edcoord" />
+        <table border="0">
+        <tr>
+            <th><?php echo __('Table'); ?></th>
+            <th><?php echo __('Delete'); ?></th>
+            <th>X</th>
+            <th>Y</th>
+        </tr>
+        <?php
+        if (isset($ctable)) {
+            unset($ctable);
 		}
-		echo '</div>' . "\n";
-		PMA_DBI_free_result($fields_rs);
-		unset($fields_rs);
-	
-		$i++;
-	}
-	?>
-	</div>
-	<script type="text/javascript">
-	//<![CDATA[
-	function PDFinit() {
-		refreshLayout();
-		myid = getElement('pdflayout');
-		<?php echo $draginit; ?>
-	}
-	
-	function resetDrag() {
-		<?php echo $reset_draginit; ?>
-	}
-	//]]>
-	</script>
-	<?php
-	} // end if WYSIWYG-PDF
-	?>
-	
-	<form method="post" action="export_relation_schema.php" name="edcoord">
-		<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
-		<input type="hidden" name="chpage" value="<?php echo htmlspecialchars($chpage); ?>" />
-		<input type="hidden" name="do" value="edcoord" />
-		<table border="0">
-		<tr>
-			<th><?php echo __('Table'); ?></th>
-			<th><?php echo __('Delete'); ?></th>
-			<th>X</th>
-			<th>Y</th>
-		</tr>
-			<?php
-			if (isset($ctable)) {
-				unset($ctable);
-			}
-	
-	
-			$i = 0;
-			$odd_row = true;
-			foreach ($array_sh_page as $dummy_sh_page => $sh_page) {
-				$_mtab       = $sh_page['table_name'];
-				$tabExist[$_mtab] = FALSE;
-				echo "\n" . '    <tr class="';
-				if ($odd_row) {
-					echo 'odd';
-				} else {
-					echo 'even';
-				}
-				echo '">';
-				$odd_row != $odd_row;
-				echo "\n" . '        <td>'
-					 . "\n" . '            <select name="c_table_' . $i . '[name]">';
-				foreach ($selectboxall as $key => $value) {
-					echo "\n" . '                <option value="' . htmlspecialchars($value) . '"';
-					if ($value == $sh_page['table_name']) {
-						echo ' selected="selected"';
-						$tabExist[$_mtab] = TRUE;
-					}
-					echo '>' . htmlspecialchars($value) . '</option>';
-				} // end while
-				echo "\n" . '            </select>'
-					 . "\n" . '        </td>';
-				echo "\n" . '        <td>'
-					 . "\n" . '            <input type="checkbox" name="c_table_' . $i . '[delete]" value="y" />' . __('Delete');
-				echo "\n" . '        </td>';
-				echo "\n" . '        <td>'
-					 . "\n" . '            <input type="text" ' . ($cfg['WYSIWYG-PDF'] ? 'onchange="dragPlace(' . $i . ', \'x\', this.value)"' : '') . ' name="c_table_' . $i . '[x]" value="' . $sh_page['x'] . '" />';
-				echo "\n" . '        </td>';
-				echo "\n" . '        <td>'
-					 . "\n" . '            <input type="text" ' . ($cfg['WYSIWYG-PDF'] ? 'onchange="dragPlace(' . $i . ', \'y\', this.value)"' : '') . ' name="c_table_' . $i . '[y]" value="' . $sh_page['y'] . '" />';
-				echo "\n" . '        </td>';
-				echo "\n" . '    </tr>';
-				$i++;
-			} // end while
-			// Do one more empty row
-			echo "\n" . '    <tr class="';
-			if ($odd_row) {
-				echo 'odd';
-			} else {
-				echo 'even';
-			}
-			$odd_row != $odd_row;
-			echo '">';
-			echo "\n" . '        <td>'
-				 . "\n" . '            <select name="c_table_' . $i . '[name]">';
-			foreach ($selectboxall as $key => $value) {
-				echo "\n" . '                <option value="' . htmlspecialchars($value) . '">' . htmlspecialchars($value) . '</option>';
-			}
-			echo "\n" . '            </select>'
-				 . "\n" . '        </td>';
-			echo "\n" . '        <td>'
-				 . "\n" . '            <input type="checkbox" name="c_table_' . $i . '[delete]" value="y" />' . __('Delete');
-			echo "\n" . '        </td>';
-			echo "\n" . '        <td>'
-				 . "\n" . '            <input type="text" name="c_table_' . $i . '[x]" value="' . (isset($sh_page['x'])?$sh_page['x']:'') . '" />';
-			echo "\n" . '        </td>';
-			echo "\n" . '        <td>'
-				 . "\n" . '            <input type="text" name="c_table_' . $i . '[y]" value="' . (isset($sh_page['y'])?$sh_page['y']:'') . '" />';
-			echo "\n" . '        </td>';
-			echo "\n" . '    </tr>';
-			echo "\n" . '    </table>' . "\n";
-	
-			echo "\n" . '    <input type="hidden" name="c_table_rows" value="' . ($i + 1) . '" />';
-			echo ($cfg['WYSIWYG-PDF'] ? "\n" . '    <input type="hidden" id="showwysiwyg" name="showwysiwyg" value="' . ((isset($showwysiwyg) && $showwysiwyg == '1') ? '1' : '0') . '" />' : '');
-			echo "\n" . '    <input type="checkbox" name="with_field_names" ' . (isset($with_field_names) ? 'checked="checked"' : ''). ' />' . __('Column names') . '<br />';
-			echo "\n" . '    <input type="submit" value="' . __('Save') . '" />';
-			echo "\n" . '</form>' . "\n\n";
+
+        $i = 0;
+        $odd_row = true;
+        foreach ($array_sh_page as $dummy_sh_page => $sh_page) {
+                $_mtab            =  $sh_page['table_name'];
+                $tabExist[$_mtab] =  FALSE;
+                echo "\n" . '    <tr class="';
+                if ($odd_row) {
+                    echo 'odd';
+                } else {
+                    echo 'even';
+                }
+                echo '">';
+                $odd_row != $odd_row;
+                echo "\n" . '        <td>'
+                     . "\n" . '            <select name="c_table_' . $i . '[name]">';
+                foreach ($selectboxall as $key => $value) {
+                        echo "\n" . '                <option value="' . htmlspecialchars($value) . '"';
+                        if ($value == $sh_page['table_name']) {
+						    echo ' selected="selected"';
+						    $tabExist[$_mtab] = TRUE;
+					    }
+                        echo '>' . htmlspecialchars($value) . '</option>';
+                }
+                echo "\n" . '            </select>'
+                     . "\n" . '        </td>';
+                echo "\n" . '        <td>'
+                     . "\n" . '            <input type="checkbox" name="c_table_' . $i . '[delete]" value="y" />' . __('Delete');
+                echo "\n" . '        </td>';
+                echo "\n" . '        <td>'
+                     . "\n" . '            <input type="text" ' . ($cfg['WYSIWYG-PDF'] ? 'onchange="dragPlace(' . $i . ', \'x\', this.value)"' : '') . ' name="c_table_' . $i . '[x]" value="' . $sh_page['x'] . '" />';
+                echo "\n" . '        </td>';
+                echo "\n" . '        <td>'
+                     . "\n" . '            <input type="text" ' . ($cfg['WYSIWYG-PDF'] ? 'onchange="dragPlace(' . $i . ', \'y\', this.value)"' : '') . ' name="c_table_' . $i . '[y]" value="' . $sh_page['y'] . '" />';
+                echo "\n" . '        </td>';
+                echo "\n" . '    </tr>';
+                $i++;
+            }
+            /*
+             * Add one more empty row
+             */
+            echo "\n" . '    <tr class="';
+            if ($odd_row) {
+                echo 'odd';
+            } else {
+                echo 'even';
+            }
+            $odd_row != $odd_row;
+            echo '">';
+            echo "\n" . '        <td>'
+                 . "\n" . '            <select name="c_table_' . $i . '[name]">';
+            foreach ($selectboxall as $key => $value) {
+                echo "\n" . '                <option value="' . htmlspecialchars($value) . '">' . htmlspecialchars($value) . '</option>';
+            }
+            echo "\n" . '            </select>'
+                 . "\n" . '        </td>';
+            echo "\n" . '        <td>'
+                 . "\n" . '            <input type="checkbox" name="c_table_' . $i . '[delete]" value="y" />' . __('Delete');
+            echo "\n" . '        </td>';
+            echo "\n" . '        <td>'
+                 . "\n" . '            <input type="text" name="c_table_' . $i . '[x]" value="' . (isset($sh_page['x'])?$sh_page['x']:'') . '" />';
+            echo "\n" . '        </td>';
+            echo "\n" . '        <td>'
+                 . "\n" . '            <input type="text" name="c_table_' . $i . '[y]" value="' . (isset($sh_page['y'])?$sh_page['y']:'') . '" />';
+            echo "\n" . '        </td>';
+            echo "\n" . '    </tr>';
+            echo "\n" . '    </table>' . "\n";
+
+            echo "\n" . '    <input type="hidden" name="c_table_rows" value="' . ($i + 1) . '" />';
+            echo ($cfg['WYSIWYG-PDF'] ? "\n" . '    <input type="hidden" id="showwysiwyg" name="showwysiwyg" value="' . ((isset($showwysiwyg) && $showwysiwyg == '1') ? '1' : '0') . '" />' : '');
+            echo "\n" . '    <input type="checkbox" name="with_field_names" ' . (isset($with_field_names) ? 'checked="checked"' : ''). ' />' . __('Column names') . '<br />';
+            echo "\n" . '    <input type="submit" value="' . __('Save') . '" />';
+            echo "\n" . '</form>' . "\n\n";
 		} // end if
 		
-		$this->deleteTables($chpage);
-		
-		}// end function
+        $this->_deleteTables($chpage);
+    }
 	
 	/** 
 	 * show Export relational schema generation options
-	 */	
-	public function displaySchemaGenerationOptions()
-	{
-		global $cfg,$pmaThemeImage,$db,$test_rs,$chpage;
-		?>
-		<!-- Export relational schema -->
-		<form method="post" action="process_relation_schema.php">
-		<fieldset>
-		<legend>
-		<?php
-		echo PMA_generate_common_hidden_inputs($db);
-		if ($cfg['PropertiesIconic']) {
-			echo '<img class="icon" src="' . $pmaThemeImage . 'b_view.png"'
+     * user can select export type of his own choice
+     * and the attributes related to it
+	 */
+	 
+    public function displaySchemaGenerationOptions()
+    {
+        global $cfg,$pmaThemeImage,$db,$test_rs,$chpage;
+        ?>
+        <form method="post" action="export_relation_schema.php">
+            <fieldset>
+            <legend>
+		    <?php
+		    echo PMA_generate_common_hidden_inputs($db);
+		    if ($cfg['PropertiesIconic']) {
+			    echo '<img class="icon" src="' . $pmaThemeImage . 'b_view.png"'
 				.' alt="" width="16" height="16" />';
-		}
-		echo __('Display Relational Schema');
-		?>:
-		</legend>
-			
-		<select name="export_type" id="export_type">
-			<option value="pdf" selected="selected"><?php echo __('PDF');?></option>
-			<option value="svg"><?php echo __('SVG');?></option>
-			<option value="dia"><?php echo __('DIA');?></option>
-			<option value="visio"><?php echo __('VISIO');?></option>
-			<option value="eps"><?php echo __('EPS');?></option>
-		</select>
-		  <label><?php echo __('Select Export Relational Type');?></label><br />
-		<?php
-		if (isset($test_rs)) {
-		?>
-		<label for="pdf_page_number_opt"><?php echo __('Page number:'); ?></label>
-		<select name="pdf_page_number" id="pdf_page_number_opt">
-		<?php
-		while ($pages = @PMA_DBI_fetch_assoc($test_rs)) {
-			echo '                <option value="' . $pages['page_nr'] . '">'
-				. $pages['page_nr'] . ': ' . htmlspecialchars($pages['page_descr']) . '</option>' . "\n";
-		} // end while
-		PMA_DBI_free_result($test_rs);
-		unset($test_rs);
-		?>
-		</select><br />
-		<?php } else { ?>
-		<input type="hidden" name="pdf_page_number" value="<?php echo htmlspecialchars($chpage); ?>" />
-		<?php } ?>
-	
-		<input type="checkbox" name="show_grid" id="show_grid_opt" />
-		<label for="show_grid_opt"><?php echo __('Show grid'); ?></label><br />
-		<input type="checkbox" name="show_color" id="show_color_opt"
-			checked="checked" />
-		<label for="show_color_opt"><?php echo __('Show color'); ?></label><br />
-		<input type="checkbox" name="show_table_dimension" id="show_table_dim_opt" />
-		<label for="show_table_dim_opt"><?php echo __('Show dimension of tables'); ?>
-			</label><br />
-		<input type="checkbox" name="all_tab_same_wide" id="all_tab_same_wide" />
-		<label for="all_tab_same_wide"><?php echo __('Display all tables with the same width'); ?>
-			</label><br />
-		<input type="checkbox" name="with_doc" id="with_doc" checked="checked" />
-		<label for="with_doc"><?php echo __('Data Dictionary'); ?></label><br />
-		<input type="checkbox" name="show_keys" id="show_keys" />
-		<label for="show_keys"><?php echo __('Only show keys'); ?></label><br />
-	
-		<label for="orientation_opt"><?php echo __('Data Dictionary Format'); ?></label>
-		<select name="orientation" id="orientation_opt">
-			<option value="L"><?php echo __('Landscape');?></option>
-			<option value="P"><?php echo __('Portrait');?></option>
-		</select><br />
-	
-		<label for="paper_opt"><?php echo __('Paper size'); ?></label>
-		<select name="paper" id="paper_opt">
-		<?php
-			foreach ($cfg['PDFPageSizes'] as $key => $val) {
-				echo '<option value="' . $val . '"';
-				if ($val == $cfg['PDFDefaultPageSize']) {
-					echo ' selected="selected"';
-				}
-				echo ' >' . $val . '</option>' . "\n";
-			}
-		?>
-		</select>
-		</fieldset>
-		<fieldset class="tblFooters">
-			<input type="submit" value="<?php echo __('Go'); ?>" />
-		</fieldset>
-		</form>
-		<?php
-	}// end function
+		    }
+		    echo __('Display Relational Schema');
+		    ?>:
+		    </legend>
+            <select name="export_type" id="export_type">
+                <option value="pdf" selected="selected"><?php echo __('PDF');?></option>
+                <option value="svg"><?php echo __('SVG');?></option>
+                <option value="dia"><?php echo __('DIA');?></option>
+                <option value="visio"><?php echo __('VISIO');?></option>
+                <option value="eps"><?php echo __('EPS');?></option>
+            </select>
+            <label><?php echo __('Select Export Relational Type');?></label><br />
+            <?php
+            if (isset($test_rs)) {
+            ?>
+            <label for="pdf_page_number_opt"><?php echo __('Page number:'); ?></label>
+            <select name="pdf_page_number" id="pdf_page_number_opt">
+                   <?php
+                   while ($pages = @PMA_DBI_fetch_assoc($test_rs)) {
+                          echo '                <option value="' . $pages['page_nr'] . '">'
+                                . $pages['page_nr'] . ': ' . htmlspecialchars($pages['page_descr']) . '</option>' . "\n";
+                    } // end while
+                    PMA_DBI_free_result($test_rs);
+                    unset($test_rs);
+                    ?>
+            </select><br />
+            <?php } else { ?>
+            <input type="hidden" name="pdf_page_number" value="<?php echo htmlspecialchars($chpage); ?>" />
+            <?php } ?>
+            <input type="hidden" name="do" value="process_export" />
+            <input type="checkbox" name="show_grid" id="show_grid_opt" />
+            <label for="show_grid_opt"><?php echo __('Show grid'); ?></label><br />
+            <input type="checkbox" name="show_color" id="show_color_opt" checked="checked" />
+            <label for="show_color_opt"><?php echo __('Show color'); ?></label><br />
+            <input type="checkbox" name="show_table_dimension" id="show_table_dim_opt" />
+            <label for="show_table_dim_opt"><?php echo __('Show dimension of tables'); ?>
+            </label><br />
+            <input type="checkbox" name="all_tab_same_wide" id="all_tab_same_wide" />
+            <label for="all_tab_same_wide"><?php echo __('Display all tables with the same width'); ?>
+            </label><br />
+            <input type="checkbox" name="with_doc" id="with_doc" checked="checked" />
+            <label for="with_doc"><?php echo __('Data Dictionary'); ?></label><br />
+            <input type="checkbox" name="show_keys" id="show_keys" />
+            <label for="show_keys"><?php echo __('Only show keys'); ?></label><br />
+            <label for="orientation_opt"><?php echo __('Data Dictionary Format'); ?></label>
+            <select name="orientation" id="orientation_opt">
+                <option value="L"><?php echo __('Landscape');?></option>
+                <option value="P"><?php echo __('Portrait');?></option>
+            </select>
+            <br />
+
+            <label for="paper_opt"><?php echo __('Paper size'); ?></label>
+            <select name="paper" id="paper_opt">
+                <?php
+                foreach ($cfg['PDFPageSizes'] as $key => $val) {
+                        echo '<option value="' . $val . '"';
+                        if ($val == $cfg['PDFDefaultPageSize']) {
+                            echo ' selected="selected"';
+                        }
+                        echo ' >' . $val . '</option>' . "\n";
+                }
+                ?>
+            </select>
+            </fieldset>
+            <fieldset class="tblFooters">
+            <input type="submit" value="<?php echo __('Go'); ?>" />
+            </fieldset>
+        </form>
+        <?php
+    }// end function
 
 	/**
 	* Check if there are tables that need to be deleted in dashboard,
 	* if there are, ask the user for allowance
+	* @param string $chpage selected page
+	* @access private
 	*/
-	public function deleteTables($chpage)
+	private function _deleteTables($chpage)
 	{
 	global $db, $table,$tabExist;
 
@@ -632,5 +612,112 @@ class PMA_User_Schema
 				}
 			}
 	} // end function
+
+    /**
+     * Check if there are tables that need to be deleted in dashboard,
+     * if there are, ask the user for allowance
+     */
+
+    private function _displayScratchboardTables($array_sh_page,$draginit,$reset_draginit)
+    {
+        global $with_field_names,$cfg,$db;
+        ?>
+        <script type="text/javascript" src="./js/dom-drag.js"></script>
+        <form method="post" action="export_relation_schema.php" name="dragdrop">
+        <input type="button" name="dragdrop" value="<?php echo __('Toggle scratchboard'); ?>" onclick="ToggleDragDrop('pdflayout');" />
+        <input type="button" name="dragdropreset" value="<?php echo __('Reset'); ?>" onclick="resetDrag();" />
+        </form>
+        <div id="pdflayout" class="pdflayout" style="visibility: hidden;">
+        <?php
+        foreach ($array_sh_page as $key => $temp_sh_page) {
+                $drag_x = $temp_sh_page['x'];
+                $drag_y = $temp_sh_page['y'];
+
+                $draginit       .= '    Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n";
+                $draginit       .= '    getElement("table_' . $i . '").onDrag = function (x, y) { document.edcoord.elements["c_table_' . $i . '[x]"].value = parseInt(x); document.edcoord.elements["c_table_' . $i . '[y]"].value = parseInt(y) }' . "\n";
+                $draginit       .= '    getElement("table_' . $i . '").style.left = "' . $drag_x . 'px";' . "\n";
+                $draginit       .= '    getElement("table_' . $i . '").style.top  = "' . $drag_y . 'px";' . "\n";
+                $reset_draginit .= '    getElement("table_' . $i . '").style.left = "2px";' . "\n";
+                $reset_draginit .= '    getElement("table_' . $i . '").style.top  = "' . (15 * $i) . 'px";' . "\n";
+                $reset_draginit .= '    document.edcoord.elements["c_table_' . $i . '[x]"].value = "2"' . "\n";
+                $reset_draginit .= '    document.edcoord.elements["c_table_' . $i . '[y]"].value = "' . (15 * $i) . '"' . "\n";
+	
+                $local_query = 'SHOW FIELDS FROM '
+                             .  PMA_backquote($temp_sh_page['table_name'])
+                             . ' FROM ' . PMA_backquote($db);
+                $fields_rs = PMA_DBI_query($local_query);
+                unset($local_query);
+                $fields_cnt = PMA_DBI_num_rows($fields_rs);
+	
+                echo '<div id="table_' . $i . '" class="pdflayout_table"><u>' . $temp_sh_page['table_name'] . '</u>';
+                if (isset($with_field_names)) {
+                    while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
+                           echo '<br />' . htmlspecialchars($row['Field']) . "\n";
+                    }
+                }
+                echo '</div>' . "\n";
+                PMA_DBI_free_result($fields_rs);
+                unset($fields_rs);
+                $i++;
+        }
+        ?>
+        </div>
+        <script type="text/javascript">
+        //<![CDATA[
+        function PDFinit() {
+            refreshLayout();
+            myid = getElement('pdflayout');
+            <?php echo $draginit; ?>
+        }
+
+        function resetDrag() {
+            <?php echo $reset_draginit; ?>
+        }
+        //]]>
+        </script>
+        <?php
+    }
+
+    /**
+     * delete the table rows with table co-ordinates
+     *  
+     * @access private
+     */
+
+    private function _deleteTableRows()
+    {
+        foreach ($delrow as $current_row) {
+                $del_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . "\n"
+                         .   ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . "\n"
+                         .   ' AND   table_name = \'' . PMA_sqlAddslashes($current_row) . '\'' . "\n"
+                         .   ' AND   pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
+                PMA_query_as_controluser($del_query, FALSE, $query_default_option);
+        }
+    }
+
+    /**
+     * get all the export options and verify
+     * call and include the appropriate Schema Class depending on $export_type
+     *  
+     * @access private
+     */
+
+    private function _processExportSchema()
+	{
+        $pdf_page_number        = isset($pdf_page_number) ? $pdf_page_number : 1;
+        $show_grid              = (isset($show_grid) && $show_grid == 'on') ? 1 : 0;
+        $show_color             = (isset($show_color) && $show_color == 'on') ? 1 : 0;
+        $show_table_dimension   = (isset($show_table_dimension) && $show_table_dimension == 'on') ? 1 : 0;
+        $all_table_same_wide    = (isset($all_table_same_wide) && $all_table_same_wide == 'on') ? 1 : 0;
+        $with_doc               = (isset($with_doc) && $with_doc == 'on') ? 1 : 0;
+        $orientation            = (isset($orientation) && $orientation == 'P') ? 'P' : 'L';
+        $paper                  = isset($paper) ? $paper : 'A4';
+        $show_keys              = (isset($show_keys) && $show_keys == 'on') ? 1 : 0;
+        $export_type            = isset($export_type) ? $export_type : 'pdf';  // default is PDF
+        PMA_DBI_select_db($db);
+
+        include("./libraries/schema/".ucfirst($export_type)."_Relation_Schema.class.php");
+        $obj_schema = eval("new PMA_".ucfirst($export_type)."_Relation_Schema();");
+	}
 }
 ?>
\ No newline at end of file
diff --git a/process_relation_schema.php b/process_relation_schema.php
deleted file mode 100644
index b8188f28c..000000000
--- a/process_relation_schema.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-error_reporting(E_ALL | E_WARNING);
-/**
- * Gets some core scripts
- */
-require_once './libraries/common.inc.php';
-
-/**
- * Settings for relation stuff
- */
-require_once './libraries/relation.lib.php';
-require_once './libraries/transformations.lib.php';
-require_once './libraries/Index.class.php';
-
-$cfgRelation = PMA_getRelationsParam();
-
-/**
- * Now in ./libraries/relation.lib.php we check for all tables
- * that we need, but if we don't find them we are quiet about it
- * so people can work without.
- * This page is absolutely useless if you didn't set up your tables
- * correctly, so it is a good place to see which tables we can and
- * complain ;-)
- */
-if (!$cfgRelation['pdfwork']) {
-    echo '<font color="red">' . __('Error') . '</font><br />' . "\n";
-    $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">';
-    echo sprintf(__('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.'), $url_to_goto, '</a>') . "\n";
-}
-
-/**
- * Main logic
- */
-try
-	{
-	$pdf_page_number        = isset($pdf_page_number) ? $pdf_page_number : 1;
-	$show_grid              = (isset($show_grid) && $show_grid == 'on') ? 1 : 0;
-	$show_color             = (isset($show_color) && $show_color == 'on') ? 1 : 0;
-	$show_table_dimension   = (isset($show_table_dimension) && $show_table_dimension == 'on') ? 1 : 0;
-	$all_table_same_wide    = (isset($all_table_same_wide) && $all_table_same_wide == 'on') ? 1 : 0;
-	$with_doc               = (isset($with_doc) && $with_doc == 'on') ? 1 : 0;
-	$orientation            = (isset($orientation) && $orientation == 'P') ? 'P' : 'L';
-	$paper                  = isset($paper) ? $paper : 'A4';
-	$show_keys              = (isset($show_keys) && $show_keys == 'on') ? 1 : 0;
-	$export_type            = isset($export_type) ? $export_type : 'pdf';  // default is PDF
-	PMA_DBI_select_db($db);
-	
-	switch($export_type)
-		{
-			case 'pdf';
-				include_once("./libraries/schema/Pdf_Relation_Schema.class.php");
-				$obj_schema=new PMA_Pdf_Relation_Schema($pdf_page_number, $show_table_dimension, $show_color,
-													   $show_grid, $all_table_same_wide, $orientation, $paper,
-														$show_keys
-														);
-				break;
-			case 'svg';
-				include_once("./libraries/schema/Svg_Relation_Schema.class.php");
-				$obj_schema=new PMA_Svg_Relation_Schema($pdf_page_number, $show_table_dimension, $show_color,
-													   $all_table_same_wide,$show_keys);
-				break;
-			case 'dia';
-				include_once("./libraries/schema/Dia_Relation_Schema.class.php");
-				$obj_schema=new diaSchema();
-				break;
-			case 'visio';
-				include_once("./libraries/schema/Visio_Relation_Schema.class.php");
-				$obj_schema=new visioSchema();
-				break;
-			case 'eps';
-				include_once("./libraries/schema/Eps_Relation_Schema.class.php");
-				$obj_schema=new epsSchema();
-				break;
-		} 
-}
-catch (Exception $e)
-{
-	print('<pre>');
-	print_r($e);
-	print('</pre>');	
-}
-?>
\ No newline at end of file