Revision: 20880
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20880
Author: sigurdne
Date: 2009-11-22 19:42:11 +0000 (Sun, 22 Nov 2009)
Log Message:
-----------
Change to use (newer) phpmailer included in api
Modified Paths:
--------------
modules/email/trunk/inc/class.bosend.inc.php
Removed Paths:
-------------
modules/email/trunk/inc/class.mail_smtp.inc.php
modules/email/trunk/inc/phpmailer/
Modified: modules/email/trunk/inc/class.bosend.inc.php
===================================================================
--- modules/email/trunk/inc/class.bosend.inc.php 2009-11-22 19:32:35 UTC
(rev 20879)
+++ modules/email/trunk/inc/class.bosend.inc.php 2009-11-22 19:42:11 UTC
(rev 20880)
@@ -331,9 +331,7 @@
*/
function send()
{
-
- $this->smtp = createObject('email.mail_smtp');
-
+ $this->smtp = createObject('phpgwapi.mailer_smtp');
$this->prepare_message();
$returnccode = $this->smtp->Send();
Deleted: modules/email/trunk/inc/class.mail_smtp.inc.php
===================================================================
--- modules/email/trunk/inc/class.mail_smtp.inc.php 2009-11-22 19:32:35 UTC
(rev 20879)
+++ modules/email/trunk/inc/class.mail_smtp.inc.php 2009-11-22 19:42:11 UTC
(rev 20880)
@@ -1,38 +0,0 @@
-<?php
- /**
- * EMail - phpmailer wrapper script
- *
- * @author Dave Hall <[email protected]>
- * @copyright Copyright (C) 2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package email
- * @version $Id$
- */
-
- /**
- * Include phpmailer
- * @see phpmailer
- */
- include_once(PHPGW_APP_INC . '/phpmailer/class.phpmailer.php');
-
- /**
- * class smtp
- *
- * bo class for assembling messages for sending via class send
- * @package email
- * @internal Server side attachment storage technique borrowed from
Squirrelmail
- */
- class mail_smtp extends PHPMailer
- {
- /**
- * Constructor
- */
- function mail_smtp()
- {
- $this->IsSMTP(true);
- $this->Host =
$GLOBALS['phpgw_info']['server']['smtp_server'];
- $this->Port =
(isset($GLOBALS['phpgw_info']['server']['smtp_port'])?$GLOBALS['phpgw_info']['server']['smtp_port']:'');
- $this->Version = 'custom - phpGroupWare 1.72';
- }
- }
-?>
_______________________________________________
phpGroupWare-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs
