diff --git a/ChangeLog b/ChangeLog index e8f2af982..99d492a11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ danbarry + [auth] support SweKey hardware authentication see http://store.swekey.com/index.php?promo=pma (todo: Documentation.html, improve code formatting) ++ rfe #1962383 [designer] Option to create a PDF page 2.11.8.0 (not yet released) - patch #1987593 [interface] Table list pagination in navi, diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index b2678db1e..8e20a698c 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1133,4 +1133,30 @@ function PMA_REL_renameField($db, $table, $field, $new_name) } // end if relwork } +/** + * Create a PDF page + * + * @uses $GLOBALS['strNoDescription'] + * @uses PMA_backquote() + * @uses $GLOBALS['cfgRelation']['db'] + * @uses PMA_sqlAddslashes() + * @uses PMA_query_as_cu() + * @uses PMA_DBI_insert_id() + * @uses $GLOBALS['controllink'] + * @param string $newpage + * @param array $cfgRelation + * @param string $db + * @param string $query_default_option + * @return string $pdf_page_number + */ +function PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option) { + if (! isset($newpage) || $newpage == '') { + $newpage = $GLOBALS['strNoDescription']; + } + $ins_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) + . ' (db_name, page_descr)' + . ' VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($newpage) . '\')'; + PMA_query_as_cu($ins_query, FALSE, $query_default_option); + return PMA_DBI_insert_id(isset($GLOBALS['controllink']) ? $GLOBALS['controllink'] : ''); +} ?> diff --git a/pdf_pages.php b/pdf_pages.php index 4d7376ac3..2db0c72c4 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -74,14 +74,7 @@ if ($cfgRelation['pdfwork']) { } break; case 'createpage': - if (!isset($newpage) || $newpage == '') { - $newpage = $strNoDescription; - } - $ins_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' (db_name, page_descr)' - . ' VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($newpage) . '\')'; - PMA_query_as_cu($ins_query, FALSE, $query_default_option); - $pdf_page_number = PMA_DBI_insert_id(isset($controllink) ? $controllink : ''); + $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 // ================================ diff --git a/pmd_pdf.php b/pmd_pdf.php index f96081039..7176a0945 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -16,7 +16,7 @@ if (! isset($scale)) { } require_once './libraries/relation.lib.php'; -if (isset($scale)) { +if (isset($scale) && ! isset($createpage)) { if (empty($pdf_page_number)) { die(""); } @@ -46,21 +46,24 @@ if (isset($scale)) { die(""); } +if (isset($createpage)) { + /* + * @see pdf_pages.php + */ + $query_default_option = PMA_DBI_QUERY_STORE; + + $pdf_page_number = PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option); +} +// no need to use pmd/styles +require_once './libraries/header_meta_style.inc.php'; ?> - - - - - - - - -Designer
-
+
+
+

: -
-
-

+
+
+
+
+ + +
+