Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12717] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules
|
From: <be...@us...> - 2014-07-16 18:31:58
|
Revision: 12717
http://sourceforge.net/p/xoops/svn/12717
Author: beckmi
Date: 2014-07-16 18:31:49 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
improving makepdf with language options (rgriffith)
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/makepdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/news/makepdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/makepdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/makepdf.php 2014-07-16 17:11:20 UTC (rev 12716)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/makepdf.php 2014-07-16 18:31:49 UTC (rev 12717)
@@ -32,12 +32,12 @@
// a complete rewrite by irmtfan to enhance: 1- RTL 2- Multilanguage (EMLH and Xlanguage)
error_reporting(0);
-include_once dirname(__FILE__) . "/header.php";
+include_once __DIR__ . "/header.php";
$forum = isset($_GET['forum']) ? intval($_GET['forum']) : 0;
$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
-if (!is_file(XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php')) {
+if (!is_file(XOOPS_PATH.'/vendor/tcpdf/tcpdf.php')) {
redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$topic_id,3,'TCPF for Xoops not installed');
}
@@ -90,7 +90,7 @@
$pdf_data['cat_title']=$viewtopic_cat->getVar('cat_title');
$pdf_data['subject']=NEWBB_PDF_SUBJECT.': '.$pdf_data['topic_title'];
$pdf_data['keywords']=XOOPS_URL . ', '.'SIMPLE-XOOPS, '.$pdf_data['topic_title'];
-$pdf_data['HeadFirstLine']=$xoopsConfig['sitename'].' - '.$xoopsConfig['slogan'];
+$pdf_data['HeadFirstLine']= $xoopsConfig['sitename'].' - '.$xoopsConfig['slogan'];
$pdf_data['HeadSecondLine']=_MD_FORUMHOME.' - '.$pdf_data['cat_title'].' - '.$pdf_data['forum_title'].' - '.$pdf_data['topic_title'];
// START irmtfan to implement EMLH by GIJ
@@ -103,10 +103,16 @@
}
// END irmtfan to implement Xlanguage by phppp(DJ)
-require_once (XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php');
+require_once (XOOPS_PATH.'/vendor/tcpdf/tcpdf.php');
+$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+// load $localLanguageOptions array with language specific definitions and apply
+if (is_file(XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php')) {
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
+} else {
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/english.php');
+}
+$pdf->setLanguageArray($localLanguageOptions);
-//create the A4-PDF...
-$pdf=new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
// START irmtfan hack to add RTL-LTR local
// until _RTL added to core 2.6.0
if (!defined('_RTL')) {
@@ -122,10 +128,13 @@
$pdf->SetSubject($pdf_data['subject']);
$pdf->SetKeywords($pdf_data['keywords']);
-$pdf->SetHeaderData('', '5', $pdf_data['HeadFirstLine'], $pdf_data['HeadSecondLine']);
+//$pdf->SetHeaderData('', '5', $pdf_data['HeadFirstLine'], $pdf_data['HeadSecondLine']);
+$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, $pdf_data['HeadFirstLine'], $pdf_data['HeadSecondLine'], array(0,64,255), array(0,64,128));
+
//set margins
$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP , PDF_MARGIN_RIGHT);
+$pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
$pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
//set auto page breaks
$pdf->SetAutoPageBreak(true, 25);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/news/makepdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/news/makepdf.php 2014-07-16 17:11:20 UTC (rev 12716)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/news/makepdf.php 2014-07-16 18:31:49 UTC (rev 12717)
@@ -30,9 +30,9 @@
// ------------------------------------------------------------------------- //
error_reporting(0);
-
+
include_once 'header.php';
-if (!is_file(XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php')) {
+if (!is_file(XOOPS_PATH.'/vendor/tcpdf/tcpdf.php')) {
redirect_header(XOOPS_URL.'/modules/news/index.php',3,'tcpdf_for_xoops not installed');
}
$myts =& MyTextSanitizer::getInstance();
@@ -96,13 +96,16 @@
//create the A4-PDF...
$pdf_config['slogan'] = XOOPS_URL.' - '.$xoopsConfig['sitename'].' - '.$xoopsConfig['slogan'];
-require_once (XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php');
-if (is_file(XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/'.$xoopsConfig['language'].'.php')) {
- require_once( XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
+require_once (XOOPS_PATH.'/vendor/tcpdf/tcpdf.php');
+$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+// load $localLanguageOptions array with language specific definitions and apply
+if (is_file(XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php')) {
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
} else {
- require_once( XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/english.php');
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/english.php');
}
-$pdf=new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+$pdf->setLanguageArray($localLanguageOptions);
+
$pdf->SetCreator(PDF_CREATOR);
$pdf->SetTitle($pdf_data['title']);
@@ -116,15 +119,21 @@
$pdf->setHeaderFont(Array(PDF_FONT_NAME_SUB, '', PDF_FONT_SIZE_SUB));
$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
$pdf->setFooterData($tc=array(0,64,0), $lc=array(0,64,128));
-$pdf->SetHeaderData('','5',$pdf_config['slogan']);
+//$pdf->SetHeaderData('','5',$pdf_config['slogan']);
+$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, $pdf_config['slogan'], array(0,64,255), array(0,64,128));
+//set margins
+$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
+$pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
+$pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
+
$pdf->Open();
//First page
$pdf->AddPage();
-$pdf->SetXY(24,15);
+$pdf->SetXY(24,25);
$pdf->SetTextColor(10,60,160);
$pdf->SetFont(PDF_FONT_NAME_TITLE,PDF_FONT_STYLE_TITLE,PDF_FONT_SIZE_TITLE);
$pdf->WriteHTML($pdf_data['title'].' - '.$pdf_data['subtitle'],K_TITLE_MAGNIFICATION);
-$pdf->Line(25,20,190,20);
+//$pdf->Line(25,20,190,20);
if ($pdf_data['subsubtitle'] != '') {
$pdf->WriteHTML($puff,K_XSMALL_RATIO);
$pdf->SetFont(PDF_FONT_NAME_SUBSUB,PDF_FONT_STYLE_SUBSUB,PDF_FONT_SIZE_SUBSUB);
@@ -143,4 +152,3 @@
$pdf->WriteHTML($pdf_data['content'],$pdf_config['scale']);
$pdf->Output();
-?>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php 2014-07-16 17:11:20 UTC (rev 12716)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php 2014-07-16 18:31:49 UTC (rev 12717)
@@ -21,7 +21,7 @@
*/
error_reporting(0);
-include_once dirname(__FILE__) . '/header.php';
+include_once __DIR__ . '/header.php';
if (!is_file(XOOPS_PATH.'/vendor/tcpdf/tcpdf.php')) {
redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$topic_id,3,'TCPDF for Xoops not installed');
}
@@ -68,12 +68,15 @@
$content .= $itemObj->plain_maintext();
require_once (XOOPS_PATH.'/vendor/tcpdf/tcpdf.php');
+
+$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+// load $localLanguageOptions array with language specific definitions and apply
if (is_file(XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php')) {
- require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
} else {
- require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/english.php');
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/english.php');
}
-$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+$pdf->setLanguageArray($localLanguageOptions);
$doc_title = publisher_convertCharset($myts->undoHtmlSpecialChars($itemObj->title()));
$doc_keywords = 'XOOPS';
|
