Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Qual: smtps is not really an external project but now a specific dolibarr class file, so i moved it into core/class

Browse Source
This commit is contained in:
Laurent Destailleur
2011-08-26 23:19:53 +00:00
parent 627402d645
commit eded00d761
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/includes/smtps/SMTPs.php → htdocs/core/class/smtps.php Normal file → Executable file
View File

@@ -18,8 +18,7 @@
* - attachments * - attachments
* - GPG access * - GPG access
* *
* This Class is based off of 'SMTP PHP MAIL' * This Class is based off of 'SMTP PHP MAIL' by Dirk Paehl, http://www.paehl.de
* by Dirk Paehl, http://www.paehl.de
* *
* @package SMTPs * @package SMTPs
* *
@@ -31,12 +30,13 @@
* @reference http://www.gordano.com/kb.htm?q=803 * @reference http://www.gordano.com/kb.htm?q=803
* *
* @author Walter Torres <walter@torres.ws> [with a *lot* of help!] * @author Walter Torres <walter@torres.ws> [with a *lot* of help!]
* @author Laurent Destailleur <eldy@users.sourceforge.net>
* @author Regis Houssin
* *
* @version $Revision: 1.15 $ * @version $Revision: 1.1 $
* @copyright copyright information
* @license GNU General Public Licence * @license GNU General Public Licence
* *
* $Id: SMTPs.php,v 1.15 2011/07/12 22:19:02 eldy Exp $ * $Id: smtps.php,v 1.1 2011/08/26 23:19:54 eldy Exp $
* *
**/ **/
@@ -2520,7 +2520,10 @@ class SMTPs
// ** CSV Version Control Info // ** CSV Version Control Info
/** /**
* $Log: SMTPs.php,v $ * $Log: smtps.php,v $
* 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
*
* Revision 1.15 2011/07/12 22:19:02 eldy * Revision 1.15 2011/07/12 22:19:02 eldy
* Fix: Attachment fails if content was empty * Fix: Attachment fails if content was empty
* *

7
htdocs/includes/smtps/README
View File

@@ -1,7 +0,0 @@
README (english)
----------------
This directory contains a PHP library for manipulating SMTPS.
Web: http://www.paehl.de/cms/php_scripts (Class from SMTP PHP Mail project)
Author: Dirk Paehl
Licence: GPL

4
htdocs/lib/CMailFile.class.php
View File

@@ -24,7 +24,7 @@
/** /**
* \file htdocs/lib/CMailFile.class.php * \file htdocs/lib/CMailFile.class.php
* \brief File of class to send emails (with attachments or not) * \brief File of class to send emails (with attachments or not)
* \version $Id: CMailFile.class.php,v 1.148 2011/07/31 23:25:43 eldy Exp $ * \version $Id: CMailFile.class.php,v 1.149 2011/08/26 23:19:53 eldy Exp $
* \author Dan Potter. * \author Dan Potter.
* \author Eric Seigne * \author Eric Seigne
* \author Laurent Destailleur. * \author Laurent Destailleur.
@@ -235,7 +235,7 @@ class CMailFile
// Use SMTPS library // Use SMTPS library
// ------------------------------------------ // ------------------------------------------
require_once(DOL_DOCUMENT_ROOT."/includes/smtps/SMTPs.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/smtps.php");
$smtps = new SMTPs(); $smtps = new SMTPs();
$smtps->setCharSet($conf->file->character_set_client); $smtps->setCharSet($conf->file->character_set_client);