[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11441] property: pdf preview
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11441] property: pdf preview |
|
Date: |
Fri, 08 Nov 2013 15:09:22 +0000 |
Revision: 11441
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11441
Author: sigurdne
Date: 2013-11-08 15:09:21 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
property: pdf preview
Modified Paths:
--------------
trunk/phpgwapi/inc/class.pdf.inc.php
trunk/property/inc/class.uitts.inc.php
Modified: trunk/phpgwapi/inc/class.pdf.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.pdf.inc.php 2013-11-08 14:18:40 UTC (rev
11440)
+++ trunk/phpgwapi/inc/class.pdf.inc.php 2013-11-08 15:09:21 UTC (rev
11441)
@@ -55,7 +55,7 @@
if(true)
{
$size = strlen($document);
- $browser->content_header($document_name
.'.pdf','application/pdf', $size);
+ $browser->content_header($document_name
.'.pdf','application/x-pdf', $size);
echo $document;
}
else
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2013-11-08 14:18:40 UTC (rev
11440)
+++ trunk/property/inc/class.uitts.inc.php 2013-11-08 15:09:21 UTC (rev
11441)
@@ -2802,7 +2802,7 @@
$user_name = $ticket['assignedto_name'];
$GLOBALS['phpgw']->preferences->set_account_id($ticket['assignedto'], true);
$GLOBALS['phpgw_info']['user']['preferences'] =
$GLOBALS['phpgw']->preferences->data;
- if(!$preview_html)
+ if(!$preview_html && !$preview_pdf)
{
$_behalf_alert = lang('this
order is sent by %1 on behalf of
%2',$GLOBALS['phpgw_info']['user']['fullname'], $user_name);
$historylog->add('C',$id,$_behalf_alert);
@@ -2901,6 +2901,34 @@
$attachments =
$bofiles->get_attachments("/fmticket/{$id}/", $values['file_attach']);
$attachment_log = ' ' .
lang('attachments') . ' : ' . implode(', ',$values['file_attach']);
}
+
+ if(isset($values['send_order_format']) &&
$values['send_order_format'] == 'pdf')
+ {
+ $pdfcode = $this->_pdf_order($id);
+ if($pdfcode)
+ {
+ $dir =
"{$GLOBALS['phpgw_info']['server']['temp_dir']}/pdf_files";
+
+ //save the file
+ if (!file_exists($dir))
+ {
+ mkdir ($dir,0777);
+ }
+ $fname =
tempnam($dir.'/','PDF_').'.pdf';
+ $fp = fopen($fname,'w');
+ fwrite($fp,$pdfcode);
+ fclose($fp);
+
+ $attachments[] = array
+ (
+ 'file' =>
$fname,
+ 'name' =>
"order_{$id}.pdf",
+ 'type' =>
'application/pdf'
+ );
+ }
+ $body = lang('order') . '.</br></br>' .
lang('see attachment');
+ }
+
if
(isset($GLOBALS['phpgw_info']['server']['smtp_server']) &&
$GLOBALS['phpgw_info']['server']['smtp_server'])
{
if (!is_object($GLOBALS['phpgw']->send))
@@ -3712,10 +3740,9 @@
$pdf->addText(50,28,6,$this->bo->config->config_data['org_name']);
$pdf->addText(300,28,6,$date);
- // if($preview)
+ if($preview)
{
$pdf->setColor(1,0,0);
- // $pdf->setColor(66,66,99);
$pdf->addText(200,400,40,lang('DRAFT'),-10);
$pdf->setColor(1,0,0);
}
@@ -3774,13 +3801,6 @@
$from_name = $ticket['assignedto_name'];
$GLOBALS['phpgw']->preferences->set_account_id($ticket['assignedto'], true);
$GLOBALS['phpgw_info']['user']['preferences'] =
$GLOBALS['phpgw']->preferences->data;
- if(!$preview_pdf)
- {
- $_behalf_alert = lang('this order is
sent by %1 on behalf of %2',$GLOBALS['phpgw_info']['user']['fullname'],
$from_name);
- $historylog =
CreateObject('property.historylog','tts');
-
$historylog->add('C',$id,$_behalf_alert);
- unset($_behalf_alert);
- }
}
else
{
@@ -3847,57 +3867,19 @@
'type' => 'form'));
- if(isset($contact_data['value_contact_name'])
&& $contact_data['value_contact_name'])
- {
- $contact_name =
ltrim($contact_data['value_contact_name']);
- }
- if(isset($contact_data['value_contact_email'])
&& $contact_data['value_contact_email'])
- {
- $contact_email
=$contact_data['value_contact_email'];
- }
- if(isset($contact_data['value_contact_tel']) &&
$contact_data['value_contact_tel'])
- {
- $contact_phone =
$contact_data['value_contact_tel'];
- }
+ if(isset($contact_data['value_contact_name']) &&
$contact_data['value_contact_name'])
+ {
+ $contact_name =
ltrim($contact_data['value_contact_name']);
+ }
+ if(isset($contact_data['value_contact_email']) &&
$contact_data['value_contact_email'])
+ {
+ $contact_email
=$contact_data['value_contact_email'];
+ }
+ if(isset($contact_data['value_contact_tel']) &&
$contact_data['value_contact_tel'])
+ {
+ $contact_phone =
$contact_data['value_contact_tel'];
+ }
- $order_email_template =
$GLOBALS['phpgw_info']['user']['preferences']['property']['order_email_template'];
-
-/*
- $descr = str_replace(array
- (
- '__vendor_name__',
- '__organisation__',
- '__user_name__',
- '__user_phone__',
- '__user_email__',
- '__ressursnr__',
- '__location__',
- '__order_description__',
- '__contact_name__',
- '__contact_email__',
- '__contact_phone__',
- '__order_id__',
- '[b]',
- '[/b]'
- ),array
- (
-
$vendor_data['value_vendor_name'],
- $organisation,
- $user_name,
- $user_phone,
- $user_email,
- $ressursnr,
- $location,
- $order_description,
- $contact_name,
- $contact_email,
- $contact_phone,
- $order_id,
- '<b>',
- '</b>'
- ),$order_email_template);
-*/
-
$pdf->ezText($ticket['order_descr'],14);
$pdf->ezSetDy(-20);
$pdf->selectFont(PHPGW_API_INC .
'/pdf/fonts/Helvetica-Bold.afm');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11441] property: pdf preview,
Sigurd Nes <=