diff --git a/core/modules/book/book.module b/core/modules/book/book.module index c316278..e537724 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -168,14 +168,6 @@ function book_menu() { 'type' => MENU_SUGGESTED_ITEM, 'file' => 'book.pages.inc', ); - $items['book/export/%/%node'] = array( - 'page callback' => 'book_export', - 'page arguments' => array(2, 3), - 'access callback' => 'book_export_access', - 'access arguments' => array(3), - 'type' => MENU_CALLBACK, - 'file' => 'book.pages.inc', - ); $items['node/%node/outline'] = array( 'title' => 'Outline', 'page callback' => 'book_outline', @@ -1373,3 +1365,39 @@ function book_library_info() { return $libraries; } + +/** + * Generates HTML for export when invoked by Drupal\book\Controller\BookController::export(). + * + * The given node is embedded to its absolute depth in a top level section. For + * example, a child node with depth 2 in the hierarchy is contained in + * (otherwise empty)
elements corresponding to depth 0 and depth 1. + * This is intended to support WYSIWYG output - e.g., level 3 sections always + * look like level 3 sections, no matter their depth relative to the node + * selected to be exported as printer-friendly HTML. + * + * @param \Drupal\node\Plugin\Core\Entity\Node + * The node to export. + * + * @return + * A string containing HTML representing the node and its children in + * the book hierarchy. + * + * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException + * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException + */ +function book_export_html(Node $node) { + if (user_access('access printer-friendly version')) { + if (isset($node->book)) { + $tree = book_menu_subtree_data($node->book); + $contents = book_export_traverse($tree, 'book_node_export'); + return theme('book_export_html', array('title' => $node->label(), 'contents' => $contents, 'depth' => $node->book['depth'])); + } + else { + throw new NotFoundHttpException(); + } + } + else { + throw new AccessDeniedHttpException(); + } +} \ No newline at end of file diff --git a/core/modules/book/book.pages.inc b/core/modules/book/book.pages.inc index a971aa6..2e8ed29 100644 --- a/core/modules/book/book.pages.inc +++ b/core/modules/book/book.pages.inc @@ -65,42 +65,6 @@ function book_export($type, Node $node) { } /** - * Generates HTML for export when invoked by book_export(). - * - * The given node is embedded to its absolute depth in a top level section. For - * example, a child node with depth 2 in the hierarchy is contained in - * (otherwise empty)
elements corresponding to depth 0 and depth 1. - * This is intended to support WYSIWYG output - e.g., level 3 sections always - * look like level 3 sections, no matter their depth relative to the node - * selected to be exported as printer-friendly HTML. - * - * @param \Drupal\node\Plugin\Core\Entity\Node - * The node to export. - * - * @return - * A string containing HTML representing the node and its children in - * the book hierarchy. - * - * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException - * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException - */ -function book_export_html(Node $node) { - if (user_access('access printer-friendly version')) { - if (isset($node->book)) { - $tree = book_menu_subtree_data($node->book); - $contents = book_export_traverse($tree, 'book_node_export'); - return theme('book_export_html', array('title' => $node->label(), 'contents' => $contents, 'depth' => $node->book['depth'])); - } - else { - throw new NotFoundHttpException(); - } - } - else { - throw new AccessDeniedHttpException(); - } -} - -/** * Page callback: Shows the outline form for a single node. * * @param Drupal\node\Node $node diff --git a/core/modules/book/book.routing.yml b/core/modules/book/book.routing.yml index e69de29..b3bb27e 100644 --- a/core/modules/book/book.routing.yml +++ b/core/modules/book/book.routing.yml @@ -0,0 +1,6 @@ +book_export: + pattern: '/book/export/{type}/{node}' + defaults: + _controller: '\Drupal\book\Controller\BookController::export' + requirements: + _permission: 'access printer-friendly version' diff --git a/core/modules/book/lib/Drupal/book/Controller/BookController.php b/core/modules/book/lib/Drupal/book/Controller/BookController.php index 84a5652..557b26c 100644 --- a/core/modules/book/lib/Drupal/book/Controller/BookController.php +++ b/core/modules/book/lib/Drupal/book/Controller/BookController.php @@ -1,28 +1,60 @@ get('database')); + return new static(); } - public function __construct(Connection $database) { - $this->database = $database; - } + /** + * Generates representations of a book page and its children. + * + * The function delegates the generation of output to helper functions. The + * function name is derived by prepending 'book_export_' to the given output + * type. So, e.g., a type of 'html' results in a call to the function + * book_export_html(). + * + * @param $type + * A string encoding the type of output requested. The following types are + * currently supported in book module: + * - html: Printer-friendly HTML. + * Other types may be supported in contributed modules. + * @param \Drupal\node\Plugin\Core\Entity\Node $node + * The node to export. + * + * @return + * A string representing the node and its children in the book hierarchy in a + * format determined by the $type parameter. + * + * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException + * + * @todo Change this to plugins or serilization. + */ + function export($type, Node $node) { + $type = drupal_strtolower($type); + + $export_function = 'book_export_' . $type; - public function export() { - return 'HALLO WELT'; - } + if (function_exists($export_function)) { + $output = call_user_func($export_function, $node); + return new Response($output); + } + else { + drupal_set_message(t('Unknown export format.')); + throw new NotFoundHttpException(); + } + } } \ No newline at end of file