From eded00d761448775db97f74012fff0bd516241f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 26 Aug 2011 23:19:53 +0000
Subject: [PATCH] Qual: smtps is not really an external project but now a
 specific dolibarr class file, so i moved it into core/class

---
 .../smtps/SMTPs.php => core/class/smtps.php}      | 15 +++++++++------
 htdocs/includes/smtps/README                      |  7 -------
 htdocs/lib/CMailFile.class.php                    |  4 ++--
 3 files changed, 11 insertions(+), 15 deletions(-)
 rename htdocs/{includes/smtps/SMTPs.php => core/class/smtps.php} (99%)
 mode change 100644 => 100755
 delete mode 100644 htdocs/includes/smtps/README

diff --git a/htdocs/includes/smtps/SMTPs.php b/htdocs/core/class/smtps.php
old mode 100644
new mode 100755
similarity index 99%
rename from htdocs/includes/smtps/SMTPs.php
rename to htdocs/core/class/smtps.php
index ba174acec0a..af6fea70b64
--- a/htdocs/includes/smtps/SMTPs.php
+++ b/htdocs/core/class/smtps.php
@@ -18,8 +18,7 @@
    *    - attachments
    *  - GPG access
    *
-   * This Class is based off of 'SMTP PHP MAIL'
-   *    by Dirk Paehl, http://www.paehl.de
+   * This Class is based off of 'SMTP PHP MAIL' by Dirk Paehl, http://www.paehl.de
    *
    * @package SMTPs
    *
@@ -31,12 +30,13 @@
    * @reference http://www.gordano.com/kb.htm?q=803
    *
    * @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 $
-   * @copyright copyright information
+   * @version $Revision: 1.1 $
    * @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
 
  /**
-  * $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
   * Fix: Attachment fails if content was empty
   *
diff --git a/htdocs/includes/smtps/README b/htdocs/includes/smtps/README
deleted file mode 100644
index 66eecc9a689..00000000000
--- a/htdocs/includes/smtps/README
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index eedf4ec7d87..5f8cfc90288 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -24,7 +24,7 @@
 /**
  *      \file       htdocs/lib/CMailFile.class.php
  *      \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	    Eric Seigne
  *      \author	    Laurent Destailleur.
@@ -235,7 +235,7 @@ class CMailFile
 			// 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->setCharSet($conf->file->character_set_client);