Merge branch 'master' into patch-1

Author: Klap-in

DokuPDF.class.php

@@ -19,7 +19,7 @@
  */
 class DokuPDF extends mpdf {
 
-    function __construct($pagesize='A4', $orientation='portrait'){
+    function __construct($pagesize='A4', $orientation='portrait', $fontsize){
         global $conf;
 
         io_mkdir_p(_MPDF_TTFONTDATAPATH);
@@ -43,7 +43,7 @@ function __construct($pagesize='A4', $orientation='portrait'){
         }
 
         // we're always UTF-8
-        parent::__construct($mode, $format);
+        parent::__construct($mode, $format, $fontsize);
         $this->autoScriptToLang = true;
         $this->baseScript = 1;
         $this->autoVietnamese = true;

action.php

@@ -73,7 +73,7 @@ public function convert(Doku_Event $event) {
         $cache = $this->prepareCache($title, $depends);
 
         // hard work only when no cache available
-        if(!$this->getConf('usecache') || !$cache->useCache($depends)) {
+        if(!$this->getConf('usecache') || $this->getExportConfig('isDebug') || !$cache->useCache($depends)) {
             // generating the pdf may take a long time for larger wikis / namespaces with many pages
             set_time_limit(0);
 
@@ -204,6 +204,30 @@ protected function collectExportPages(Doku_Event $event) {
         }
 
         $list = array_map('cleanID', $list);
+
+        $skippedpages = array();
+        foreach($list as $index => $pageid) {
+            if(auth_quickaclcheck($pageid) < AUTH_READ) {
+                $skippedpages[] = $pageid;
+                unset($list[$index]);
+            }
+        }
+        $list = array_filter($list); //removes also pages mentioned '0'
+
+        //if selection contains forbidden pages throw (overridable) warning
+        if(!$INPUT->bool('book_skipforbiddenpages') && !empty($skippedpages)) {
+            $msg = hsc(join(', ', $skippedpages));
+            if($INPUT->has('selection')) {
+                http_status(400);
+                print sprintf($this->getLang('forbidden'), $msg);
+                exit();
+            } else {
+                $this->showPageWithErrorMsg($event, 'forbidden', $msg);
+                return false;
+            }
+
+        }
+
         return array($title, $list);
     }
 
@@ -222,6 +246,7 @@ protected function prepareCache($title, &$depends) {
             . $this->getExportConfig('template')
             . $this->getExportConfig('pagesize')
             . $this->getExportConfig('orientation')
+            . $this->getExportConfig('font-size')
             . $this->getExportConfig('doublesided')
             . ($this->getExportConfig('hasToC') ? join('-', $this->getExportConfig('levels')) : '0')
             . $title;
@@ -268,10 +293,16 @@ protected function prepareCache($title, &$depends) {
      * Set error notification and reload page again
      *
      * @param Doku_Event $event
-     * @param string     $msglangkey key of translation key
+     * @param string $msglangkey key of translation key
+     * @param string $replacement
      */
-    private function showPageWithErrorMsg(Doku_Event $event, $msglangkey) {
-        msg($this->getLang($msglangkey), -1);
+    private function showPageWithErrorMsg(Doku_Event $event, $msglangkey, $replacement=null) {
+        if(empty($replacement)) {
+            $msg = $this->getLang($msglangkey);
+        } else {
+            $msg = sprintf($this->getLang($msglangkey), $replacement);
+        }
+        msg($msg, -1);
 
         $event->data = 'show';
         $_SERVER['REQUEST_METHOD'] = 'POST'; //clears url
@@ -296,7 +327,9 @@ protected function generatePDF($cachefile, $title) {
         // initialize PDF library
         require_once(dirname(__FILE__) . "/DokuPDF.class.php");
 
-        $mpdf = new DokuPDF($this->getExportConfig('pagesize'), $this->getExportConfig('orientation'));
+        $mpdf = new DokuPDF($this->getExportConfig('pagesize'),
+                            $this->getExportConfig('orientation'),
+                            $this->getExportConfig('font-size'));
 
         // let mpdf fix local links
         $self = parse_url(DOKU_URL);
@@ -380,9 +413,10 @@ protected function generatePDF($cachefile, $title) {
         $keep = $ID;
 
         // loop over all pages
-        $cnt = count($this->list);
-        for($n = 0; $n < $cnt; $n++) {
-            $page = $this->list[$n];
+        $counter = 0;
+        $no_pages = count($this->list);
+        foreach($this->list as $page) {
+            $counter++;
             $filename = wikiFN($page, $REV);
 
             if(!file_exists($filename)) {
@@ -394,7 +428,7 @@ protected function generatePDF($cachefile, $title) {
 
             $pagehtml = p_cached_output($filename, 'dw2pdf', $page);
             $pagehtml .= $this->page_depend_replacements($template['cite'], $page);
-            if($n < ($cnt - 1)) {
+            if($counter < $no_pages) {
                 $pagehtml .= '<pagebreak />';
             }
 
@@ -734,6 +768,9 @@ protected function loadExportConfig() {
         $this->exportConfig['pagesize'] = $INPUT->str('pagesize', $this->getConf('pagesize'), true);
         $this->exportConfig['orientation'] = $INPUT->str('orientation', $this->getConf('orientation'), true);
 
+        // decide on the font-size from param or config
+        $this->exportConfig['font-size'] = $INPUT->str('font-size', $this->getConf('font-size'), true);
+
         $doublesided = $INPUT->bool('doublesided', (bool) $this->getConf('doublesided'));
         $this->exportConfig['doublesided'] = $doublesided ? '1' : '0';
 

conf/default.php

@@ -1,6 +1,7 @@
 <?php
 $conf['pagesize']         = 'A4';
 $conf['orientation']      = 'portrait';
+$conf['font-size']        = 11;
 $conf['doublesided']      = 1;
 $conf['toc']              = 0;
 $conf['toclevels']        = '';

conf/metadata.php

@@ -1,6 +1,7 @@
 <?php
 $meta['pagesize']         = array('string');
 $meta['orientation']      = array('multichoice', '_choices' => array('portrait', 'landscape'));
+$meta['font-size']        = array('numeric');
 $meta['doublesided']      = array('onoff');
 $meta['toc']              = array('onoff');
 $meta['toclevels']        = array('string', '_pattern' => '/^(|[1-5]-[1-5])$/');

lang/de/settings.php

@@ -10,6 +10,7 @@
 $lang['orientation']           = 'Die Seiten-Ausrichtung';
 $lang['orientation_o_portrait'] = 'Hochformat';
 $lang['orientation_o_landscape'] = 'Querformat';
+$lang['font-size']             = 'Die Schriftgröße für normalen Text in Punkten.';
 $lang['doublesided']           = 'Doppelseitige Dokumente beginnen mit einer ungeraden Seite und werden fortgeführt mit Paaren von geraden und ungeraden Seiten. Einseitige Dokumente haben nur ungerade Seiten.';
 $lang['toc']                   = 'Hinzufügen eines automatisch generierten Inhaltsverzeichnisses am Anfand der PDF-Datei (Anmerkungen: kann dazu führen, dass eine leere Seite eingefügt wird, damit der Text bei einer ungeraden Seitenzahl beginnt; das Inhaltsverzeichnis selbst wird bei der Seitennummerierung nicht mitgezählt)';
 $lang['toclevels']             = 'Oberste Ebene und maximale Tiefe des Inhaltsverzeichnisses. Standardmäßig werden die Werte aus der Wiki-Konfiguration <a href="#config___toptoclevel">toptoclevel</a> und <a href="#config___maxtoclevel">maxtoclevel</a> benutzt. Format: <code><i>&lt;top&gt;</i>-<i>&lt;max&gt;</i></code>';

lang/en/lang.php

@@ -6,3 +6,4 @@
 $lang['empty']             = "You don't have pages selected yet.";
 $lang['tocheader']         = "Table of Contents";
 $lang['export_ns']         = 'Export namespace "%s:" to file %s.pdf';
+$lang['forbidden']         = "You have no access to these pages: %s.<br/><br/>Use option 'Skip Forbidden Pages' to create your book with the available pages.";

lang/en/settings.php

@@ -10,6 +10,7 @@
 $lang['orientation']             = 'The page orientation.';
 $lang['orientation_o_portrait']  = 'Portrait';
 $lang['orientation_o_landscape'] = 'Landscape';
+$lang['font-size']               = 'The font-size for normal text in points.';
 $lang['doublesided']             = 'Double-sided document starts add odd page, and has pairs of even and odd pages. Single-side document has only odd pages.';
 $lang['toc']                     = 'Add an autogenerated Table of Content in PDF (note: Can add blank pages due to start at an odd page and ToC always include on even number of pages, ToC pages itself has no pagenumbers)';
 $lang['toclevels']               = 'Define top level and maximum level depth which are added to ToC. Default wiki ToC levels <a href="#config___toptoclevel">toptoclevel</a> and <a href="#config___maxtoclevel">maxtoclevel</a> are used. Format: <code><i>&lt;top&gt;</i>-<i>&lt;max&gt;</i></code>';