From: <ex...@us...> - 2013-04-29 11:21:49
|
Revision: 5865 http://sourceforge.net/p/web-erp/reponame/5865 Author: exsonqu Date: 2013-04-29 11:21:45 +0000 (Mon, 29 Apr 2013) Log Message: ----------- 04/29/2013 Exson: Modify the PO_PDFPurchOrder.php to make it suitable for smtp setting. Modified Paths: -------------- trunk/PO_PDFPurchOrder.php Modified: trunk/PO_PDFPurchOrder.php =================================================================== --- trunk/PO_PDFPurchOrder.php 2013-04-29 10:43:45 UTC (rev 5864) +++ trunk/PO_PDFPurchOrder.php 2013-04-29 11:21:45 UTC (rev 5865) @@ -322,10 +322,30 @@ $mail->setText(_('Please find herewith our purchase order number') . ' ' . $OrderNo); $mail->setSubject(_('Purchase Order Number') . ' ' . $OrderNo); $mail->addAttachment($attachment, $PdfFileName, 'application/pdf'); - $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>'); - $Success = $mail->send(array( - $_POST['EmailTo'] - )); + //since sometime the mail server required to verify the users, so must set this information. + if($_SESSION['SmtpSetting'] == 0){//use the mail service provice by the server. + $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>'); + $MailMethod = 'mail'; + }else if($_SESSION['SmtpSetting'] == 1) { + if(strpos('@',$_SESSION['SMTPSettings']['username'])){//user has set the fully mail address as user name + $mail->setFrom($_SESSION['SMTPSettings']['username']); + }else{//user only set it's name instead of fully mail address + if(strpos('smtp',$_SESSION['SMTPSettings']['host'])){ + $HostDomain = substr($_SESSION['SMTPSettings']['host'],4); + } + if(!strpos('@',$_SESSION['SMTPSettings']['username'])){ + $SendFrom = $_SESSION['SMTPSettings']['username'].$HostDomain; + } + } + $mail->setFrom($SendFrom); + $MailMethod = 'smtp'; + }else{ + prnMsg(_('The SMTP settings are wrong, please ask administrator for help'),'error'); + exit; + include('includes/footer.inc'); + } + + $Success = $mail->send(array($_POST['EmailTo']),$MailMethod); if ($Success == 1) { $Title = _('Email a Purchase Order'); include('includes/header.inc'); @@ -435,4 +455,4 @@ include('includes/footer.inc'); } -?> \ No newline at end of file +?> |