change export url parameters

pdftitle => book_title
pdfns_title => book_title
pdfns_ns => book_ns
pdfns_order => book_order
pdfns_depth => book_nsdepth
pdfbook_title => book_title

Temporary an fallback is left for: pdftitle and pdfbook_title
NOT for the pdfns_* parameters

Author: Klap-in

_test/syntax_exportlink.test.php

@@ -23,7 +23,7 @@ function test_parser () {
             array(
                 'dw2pdf_exportlink',
                 array(
-                    'link' => '?do=export_pdfns&pdfns_ns=foo:bar&pdfns_title=Foo',
+                    'link' => '?do=export_pdfns&book_ns=foo:bar&book_title=Foo',
                     'title' => 'Export namespace "foo:bar:" to file Foo.pdf',
                     5,
                     1,
@@ -35,7 +35,7 @@ function test_parser () {
         );
         $this->assertEquals($expected_parser_response,$parser_response[2]);
         $renderer_response = p_render('xhtml',$parser_response,$info);
-        $expected_renderer_response = 'doku.php?id=foo:bar:start&amp;do=export_pdfns&amp;pdfns_ns=foo:bar&amp;pdfns_title=Foo" class="wikilink2" title="foo:bar:start" rel="nofollow">Export namespace &quot;foo:bar:&quot; to file Foo.pdf</a>';
+        $expected_renderer_response = 'doku.php?id=foo:bar:start&amp;do=export_pdfns&amp;book_ns=foo:bar&amp;book_title=Foo" class="wikilink2" title="foo:bar:start" rel="nofollow">Export namespace &quot;foo:bar:&quot; to file Foo.pdf</a>';
         $trimmed_renderer_response = substr($renderer_response,strpos($renderer_response,'doku.php'),-5);
         $trimmed_renderer_response = trim($trimmed_renderer_response);
         $this->assertEquals($expected_renderer_response,$trimmed_renderer_response);

action.php

@@ -35,6 +35,8 @@ public function __construct() {
 
     /**
      * Register the events
+     *
+     * @param Doku_Event_Handler $controller
      */
     public function register(Doku_Event_Handler $controller) {
         $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'convert', array());
@@ -142,32 +144,33 @@ protected function collectExportPages(Doku_Event $event) {
 
         if($ACT == 'export_pdf') {
             $list[0] = $ID;
-            $title = $INPUT->str('pdftitle');
-            if(!$title) {
+            $title = $INPUT->str('pdftitle'); //DEPRECATED
+            $title = $INPUT->str('book_title', $title, true);
+            if(empty($title)) {
                 $title = p_get_first_heading($ID);
             }
 
         } elseif($ACT == 'export_pdfns') {
             //check input for title and ns
-            if(!$title = $INPUT->str('pdfns_title')) {
+            if(!$title = $INPUT->str('book_title')) {
                 $this->showPageWithErrorMsg($event, 'needtitle');
                 return false;
             }
-            $pdfnamespace = cleanID($INPUT->str('pdfns_ns'));
+            $pdfnamespace = cleanID($INPUT->str('book_ns'));
             if(!@is_dir(dirname(wikiFN($pdfnamespace . ':dummy')))) {
                 $this->showPageWithErrorMsg($event, 'needns');
                 return false;
             }
 
             //sort order
-            $order = $INPUT->str('pdfns_order', 'natural', true);
+            $order = $INPUT->str('book_order', 'natural', true);
             $sortoptions = array('pagename', 'date', 'natural');
             if(!in_array($order, $sortoptions)) {
                 $order = 'natural';
             }
 
             //search depth
-            $depth = $INPUT->int('pdfns_depth', 0);
+            $depth = $INPUT->int('book_nsdepth', 0);
             if($depth < 0) {
                 $depth = 0;
             }
@@ -193,7 +196,9 @@ protected function collectExportPages(Doku_Event $event) {
 
         } elseif(isset($_COOKIE['list-pagelist']) && !empty($_COOKIE['list-pagelist'])) {
             //is in Bookmanager of bookcreator plugin a title given?
-            if(!$title = $INPUT->str('pdfbook_title')) {
+            $title = $INPUT->str('pdfbook_title'); //DEPRECATED
+            $title = $INPUT->str('book_title', $title, true);
+            if(empty($title)) {
                 $this->showPageWithErrorMsg($event, 'needtitle');
                 return false;
             } else {

syntax/exportlink.php

@@ -58,7 +58,7 @@ public function handle($match, $state, $pos, Doku_Handler $handler) {
         resolve_pageid(getNS($ID),$id,$exists);
         $ns = getNS($id);
         $title = substr($match,strpos($match,'|')+1,-2);
-        $link = '?do=export_pdfns&pdfns_ns=' . $ns . '&pdfns_title=' . $title;
+        $link = '?do=export_pdfns&book_ns=' . $ns . '&book_title=' . $title;
         return array('link' => $link, 'title' => sprintf($this->getLang('export_ns'),$ns,$title),$state, $pos);
     }