Remove old relational schema edit/export page and related code

Signed-off-by: Bimal Yashodha <[email protected]>
karibu · Jul 1, 2014 · adf0d2e · adf0d2e
1 parent b092ad5
commit adf0d2e
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 1,389 deletions.
diff --git a/db_operations.php b/db_operations.php
@@ -290,11 +290,6 @@
         false,
         PMA_DatabaseInterface::QUERY_STORE
     );
-
-    /*
-     * Export Relational Schema View
-     */
-    $response->addHTML(PMA_getHtmlForExportRelationalSchemaView($url_query));
 } // end if
 
 ?>
diff --git a/libraries/designer.lib.php b/libraries/designer.lib.php
@@ -153,8 +153,7 @@ function PMA_getHtmlForSchemaExport($db, $page)
         . '</select>'
         . '<label>' . __('Select Export Relational Type') . '</label><br />';
 
-    $htmlString .= '<input type="hidden" name="do" value="process_export" />'
-        . '<input type="hidden" name="chpage" value="' . htmlspecialchars($page) . '" />'
+    $htmlString .= '<input type="hidden" name="chpage" value="' . htmlspecialchars($page) . '" />'
         . '<input type="checkbox" name="show_grid" id="show_grid_opt" />'
         . '<label for="show_grid_opt">' . __('Show grid') . '</label><br />'
         . '<input type="checkbox" name="show_color"'

diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
@@ -258,29 +258,6 @@ function PMA_getHtmlForChangeDatabaseCharset($db, $table)
     return $html_output;
 }
 
-/**
- * Get HTML snippet for export relational schema view
- *
- * @param string $url_query Query string for link
- *
- * @return string $html_output
- */
-function PMA_getHtmlForExportRelationalSchemaView($url_query)
-{
-    $html_output = '<div class="operations_full_width">'
-        . '<fieldset><a href="schema_edit.php?' . $url_query . '">';
-    if (PMA_Util::showIcons('ActionLinksMode')) {
-        $html_output .= PMA_Util::getImage(
-            'b_edit.png'
-        );
-    }
-    $html_output .= __('Edit or export relational schema')
-        . '</a></fieldset>'
-        . '</div>';
-
-    return $html_output;
-}
-
 /**
  * Run the Procedure definitions and function definitions
  *

diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
@@ -361,20 +361,20 @@ function PMA_getFirstPage($db)
  * Creates a new page and returns its auto-incrementing id
  *
  * @param string $pageName name of the page
+ * @param string $db       name of the database
  *
  * @return int|null
  */
-function PMA_createNewPage($pageName)
+function PMA_createNewPage($pageName, $db)
 {
     $cfgRelation = PMA_getRelationsParam();
     if ($cfgRelation['pdfwork']) {
-        $_POST['newpage'] = $pageName;
-        // temporarlily using schema code for creating a page
-        include_once 'libraries/schema/User_Schema.class.php';
-        $user_schema = new PMA_User_Schema();
-        $user_schema->setAction("createpage");
-        $user_schema->processUserChoice();
-        return $user_schema->pageNumber;
+        $pageNumber = PMA_REL_createPage(
+            $pageName,
+            $cfgRelation,
+            $db
+        );
+        return $pageNumber;
     }
     return null;
 }