Qual: smtps is not really an external project but now a specific dolibarr class file, so i moved it into core/class
This commit is contained in:
Laurent Destailleur
parent
546f14417d
commit
2d94bbae85
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
/*
|
||||
/**
|
||||
* Class SMTPs
|
||||
*
|
||||
* Class to construct and send SMTP compliant email, even to a secure
|
||||
@ -33,59 +33,54 @@
|
||||
* @author Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* @author Regis Houssin
|
||||
*
|
||||
* @version $Revision: 1.2 $
|
||||
* @version $Revision: 1.1 $
|
||||
* @license GNU General Public Licence
|
||||
*
|
||||
* $Id: smtps.php,v 1.2 2011/08/26 23:40:48 eldy Exp $
|
||||
* $Id: smtps.php,v 1.1 2011/08/26 23:19:54 eldy Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* \file htdocs/core/class/smtps.class.php
|
||||
* \brief Class to manage SMTPS email sending
|
||||
*/
|
||||
|
||||
**/
|
||||
|
||||
// =============================================================
|
||||
// ** Class Constants
|
||||
|
||||
/**
|
||||
/**
|
||||
* Version number of Class
|
||||
* @const SMTPs_VER
|
||||
*
|
||||
*/
|
||||
define('SMTPs_VER', '1.15', false);
|
||||
define('SMTPs_VER', '1.15', false);
|
||||
|
||||
/**
|
||||
/**
|
||||
* SMTPs Success value
|
||||
* @const SMTPs_SUCCEED
|
||||
*
|
||||
*/
|
||||
define('SMTPs_SUCCEED', true, false);
|
||||
define('SMTPs_SUCCEED', true, false);
|
||||
|
||||
/**
|
||||
/**
|
||||
* SMTPs Fail value
|
||||
* @const SMTPs_FAIL
|
||||
*
|
||||
*/
|
||||
define('SMTPs_FAIL', false, false);
|
||||
define('SMTPs_FAIL', false, false);
|
||||
|
||||
|
||||
// =============================================================
|
||||
// ** Error codes and messages
|
||||
|
||||
/**
|
||||
/**
|
||||
* Improper parameters
|
||||
* @const SMTPs_INVALID_PARAMETERS
|
||||
*
|
||||
*/
|
||||
define('SMTPs_INVALID_PARAMETERS', 50, false);
|
||||
define('SMTPs_INVALID_PARAMETERS', 50, false);
|
||||
|
||||
|
||||
// =============================================================
|
||||
// =============================================================
|
||||
// ** Class
|
||||
|
||||
|
||||
/**
|
||||
/**
|
||||
* Class SMTPs
|
||||
*
|
||||
* Class to construct and send SMTP compliant email, even
|
||||
@ -96,8 +91,8 @@ define('SMTPs_INVALID_PARAMETERS', 50, false);
|
||||
**/
|
||||
class SMTPs
|
||||
{
|
||||
// =============================================================
|
||||
// ** Class Properties
|
||||
// =============================================================
|
||||
// ** Class Properties
|
||||
|
||||
/**
|
||||
* Property private string $_smtpsHost
|
||||
@ -564,13 +559,13 @@ class SMTPs
|
||||
|
||||
|
||||
|
||||
// =============================================================
|
||||
// =============================================================
|
||||
function setDebug ( $_vDebug = false )
|
||||
{
|
||||
$this->_debug = $_vDebug;
|
||||
}
|
||||
|
||||
// ** Class methods
|
||||
// ** Class methods
|
||||
|
||||
/**
|
||||
* Method public void buildRCPTlist( void )
|
||||
@ -817,10 +812,10 @@ class SMTPs
|
||||
return $_retVal;
|
||||
}
|
||||
|
||||
// =============================================================
|
||||
// ** Setter & Getter methods
|
||||
// =============================================================
|
||||
// ** Setter & Getter methods
|
||||
|
||||
// ** Basic System configuration
|
||||
// ** Basic System configuration
|
||||
|
||||
/**
|
||||
* Method public void setConfig( mixed )
|
||||
@ -1346,7 +1341,7 @@ class SMTPs
|
||||
}
|
||||
|
||||
|
||||
// ** Message Construction
|
||||
// ** Message Construction
|
||||
|
||||
/**
|
||||
* Method public void setFrom( string )
|
||||
@ -1881,8 +1876,8 @@ class SMTPs
|
||||
$_header .= 'Subject: ' . $this->getSubject() . "\r\n"
|
||||
. 'Date: ' . date("r") . "\r\n"
|
||||
. 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
|
||||
// . 'Read-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n"
|
||||
// . 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
|
||||
// . 'Read-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n"
|
||||
// . 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
|
||||
|
||||
if ( $this->getSensitivity() )
|
||||
$_header .= 'Sensitivity: ' . $this->getSensitivity() . "\r\n";
|
||||
@ -2008,9 +2003,9 @@ class SMTPs
|
||||
//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"' . "\r\n";
|
||||
$content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary() . '"' . "\r\n";
|
||||
|
||||
// TODO Restore
|
||||
// . "\r\n"
|
||||
// . 'This is a multi-part message in MIME format.' . "\r\n";
|
||||
// TODO Restore
|
||||
// . "\r\n"
|
||||
// . 'This is a multi-part message in MIME format.' . "\r\n";
|
||||
$content .= "Content-Transfer-Encoding: 8bit" . "\r\n";
|
||||
$content .= "\r\n";
|
||||
|
||||
@ -2064,17 +2059,17 @@ class SMTPs
|
||||
// TODO Restore "\r\n"
|
||||
$content .= "--" . $this->_getBoundary() . "\r\n"
|
||||
. 'Content-Type: ' . $_content['mimeType'] . '; '
|
||||
// . 'charset="' . $this->getCharSet() . '"';
|
||||
// . 'charset="' . $this->getCharSet() . '"';
|
||||
. 'charset=' . $this->getCharSet() . '';
|
||||
|
||||
// TODO Restore
|
||||
// $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
|
||||
// TODO Restore
|
||||
// $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
|
||||
$content .= "\r\n";
|
||||
// $content .= 'Content-Transfer-Encoding: ';
|
||||
// $content .= ( $type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
|
||||
// $content .= "\r\n"
|
||||
// . 'Content-Disposition: inline' . "\r\n"
|
||||
// . 'Content-Description: ' . $type . ' message' . "\r\n";
|
||||
// $content .= 'Content-Transfer-Encoding: ';
|
||||
// $content .= ( $type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
|
||||
// $content .= "\r\n"
|
||||
// . 'Content-Disposition: inline' . "\r\n"
|
||||
// . 'Content-Description: ' . $type . ' message' . "\r\n";
|
||||
|
||||
if ( $this->getMD5flag() )
|
||||
$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
|
||||
@ -2086,7 +2081,7 @@ class SMTPs
|
||||
}
|
||||
|
||||
// Close message boundries
|
||||
// $content .= "\r\n--" . $this->_getBoundary() . '--' . "\r\n" ;
|
||||
// $content .= "\r\n--" . $this->_getBoundary() . '--' . "\r\n" ;
|
||||
$content .= "--" . $this->_getBoundary() . '--' . "\r\n" ;
|
||||
}
|
||||
|
||||
@ -2460,8 +2455,8 @@ class SMTPs
|
||||
return $this->server_parse($this->socket, $_returnCode);
|
||||
}
|
||||
|
||||
// =============================================================
|
||||
// ** Error handling methods
|
||||
// =============================================================
|
||||
// ** Error handling methods
|
||||
|
||||
/**
|
||||
* Method private void _setErr( int code, string message )
|
||||
@ -2517,18 +2512,15 @@ class SMTPs
|
||||
}
|
||||
|
||||
|
||||
// =============================================================
|
||||
// =============================================================
|
||||
} // end of Class
|
||||
|
||||
// =============================================================
|
||||
// =============================================================
|
||||
// ** CSV Version Control Info
|
||||
|
||||
/**
|
||||
/**
|
||||
* $Log: smtps.php,v $
|
||||
* Revision 1.2 2011/08/26 23:40:48 eldy
|
||||
* Qual: vcard is not really an external project but now a specific dolibarr class file, so i moved it into core/class
|
||||
*
|
||||
* Revision 1.1 2011/08/26 23:19:54 eldy
|
||||
* Qual: smtps is not really an external project but now a specific dolibarr class file, so i moved it into core/class
|
||||
*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user