[TWiki-Dev] [SVN] RickMach r15468 - twiki/branches/MAIN/twikiplugins/GenPDFAddOn/lib/TWiki/Contrib

[<de...@de...>]

Author: RickMach
Date: 2007-11-02 15:34:25 -0500 (Fri, 02 Nov 2007)
New Revision: 15468

Modified:
   twiki/branches/MAIN/twikiplugins/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm
Log:
Item4916: added header footer controls


Modified: twiki/branches/MAIN/twikiplugins/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm	2007-11-02 18:54:01 UTC (rev 15467)
+++ twiki/branches/MAIN/twikiplugins/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm	2007-11-02 20:34:25 UTC (rev 15468)
@@ -420,7 +420,10 @@
   use constant SUBJECT => '%FORMFIELD{"TopicHeadline"}%';
   use constant TOCHEADER => "...";
   use constant TOCFOOTER => "..i";
+  use constant HEADER => undef;
+  use constant FOOTER => undef;
   use constant HEADFOOTFONT => "";
+  use constant HEADFOOTSIZE => undef;
   use constant BODYIMAGE => "";
   use constant LOGOIMAGE => "";
   use constant NUMBEREDTOC => undef;
@@ -470,6 +473,15 @@
    $prefs{'orientation'} = $query->param('pdforientation') || TWiki::Func::getPreferencesValue("GENPDFADDON_ORIENTATION") || '';
    $prefs{'orientation'} = ORIENTATION unless ($prefs{'orientation'} =~ /^(landscape|portrait)$/);
 
+   $prefs{'headfootsize'} = $query->param('pdfheadfootsize') || TWiki::Func::getPreferencesValue("GENPDFADDON_HEADFOOTSIZE") || '';
+   $prefs{'headfootsize'} = HEADFOOTSIZE unless ($prefs{'headfootsize'} =~ /^\d+$/);
+
+   $prefs{'header'} = $query->param('pdfheader') || TWiki::Func::getPreferencesValue("GENPDFADDON_HEADER") || '';
+   $prefs{'header'} = HEADER unless ($prefs{'header'} =~ /^[\.\/:1aAcCdDhiIltT]{3}$/);
+
+   $prefs{'footer'} = $query->param('pdffooter') || TWiki::Func::getPreferencesValue("GENPDFADDON_FOOTER") || '';
+   $prefs{'footer'} = FOOTER unless ($prefs{'footer'} =~ /^[\.\/:1aAcCdDhiIltT]{3}$/);
+
    $prefs{'headfootfont'} = $query->param('pdfheadfootfont') || TWiki::Func::getPreferencesValue("GENPDFADDON_HEADFOOTFONT") || '';
    $prefs{'headfootfont'} = HEADFOOTFONT unless ($prefs{'headfootfont'} =~
       /^(times(-roman|-bold|-italic|bolditalic)?|(courier|helvetica)(-bold|-oblique|-boldoblique)?)$/);
@@ -695,6 +707,9 @@
    push @htmldocArgs, "--bodyimage", "$prefs{'bodyimage'}" if $prefs{'bodyimage'};
    push @htmldocArgs, "--logoimage", "$prefs{'logoimage'}" if $prefs{'logoimage'};
    push @htmldocArgs, "--headfootfont", "$prefs{'headfootfont'}" if $prefs{'headfootfont'};
+   push @htmldocArgs, "--headfootsize", "$prefs{'headfootsize'}" if $prefs{'headfootsize'};
+   push @htmldocArgs, "--header", "$prefs{'header'}" if $prefs{'header'};
+   push @htmldocArgs, "--footer", "$prefs{'footer'}" if $prefs{'footer'};
    push @htmldocArgs, "--permissions", "$prefs{'permissions'}" if $prefs{'permissions'};
    push @htmldocArgs, "--bodycolor", "$prefs{'bodycolor'}" if $prefs{'bodycolor'};
    push @htmldocArgs, "--top", "$prefs{'top'}" if $prefs{'top'};