[Sciret-svn] SF.net SVN: sciret:[699] trunk

[<al...@us...>]

Revision: 699
          http://sciret.svn.sourceforge.net/sciret/?rev=699&view=rev
Author:   alpeb
Date:     2008-09-24 22:51:12 +0000 (Wed, 24 Sep 2008)

Log Message:
-----------
refactored mail functionality to its own class

Modified Paths:
--------------
    trunk/actions/MailArticle.php

Added Paths:
-----------
    trunk/models/EmailGateway.php

Modified: trunk/actions/MailArticle.php
===================================================================
--- trunk/actions/MailArticle.php	2008-09-24 22:35:17 UTC (rev 698)
+++ trunk/actions/MailArticle.php	2008-09-24 22:51:12 UTC (rev 699)
@@ -11,7 +11,6 @@
 
 require 'actions/Action.php';
 require 'models/Article.php';
-require 'models/class.phpmailer.inc.php';
 
 class MailArticle extends Action {
 
@@ -36,7 +35,7 @@
             Library::redirect(Library::getLink(array('view' => 'MailArticle', 'artId' => $articleId)));
         }
 
-        $mail = $this->setUpMailer();
+        $mail = new EmailGateway($this->configuration);
 
         if ($_POST['replyTo'] != '') {
             $mail->AddReplyTo($_POST['replyTo']);
@@ -60,30 +59,6 @@
         $_SESSION['message'] = $this->user->lang('E-mail has been successfuly sent');
         Library::redirect(Library::getLink(array('view' => 'ViewArticle', 'id' => $articleId)));
     }
-
-    function setUpMailer() {
-        $mail = new PHPMailer();
-
-        $config = $this->configuration;
-        $transport = $config->getConfigValue('mailTransport');
-
-        if ($transport == 'smtp') {
-            $mail->IsSMTP();
-            $mail->Host = $config->getConfigValue('smtpServer');
-            $mail->Username = $config->getConfigValue('smtpUser');
-            $mail->Password = $config->getConfigValue('smtpPassword');
-            $mail->Port = $config->getConfigValue('smtpPort');
-        } else if ($transport == 'sendmail') {
-            $mail->IsSendmail();
-        }
-
-        $mail->CharSet = "utf-8";
-        $mail->FromName = $config->getConfigValue('mailFromName');
-        $mail->From = $config->getConfigValue('mailFromMail');
-
-        return $mail;
-    }
-
 }
 
 ?>

Added: trunk/models/EmailGateway.php
===================================================================
--- trunk/models/EmailGateway.php	                        (rev 0)
+++ trunk/models/EmailGateway.php	2008-09-24 22:51:12 UTC (rev 699)
@@ -0,0 +1,29 @@
+<?php
+
+require 'models/class.phpmailer.inc.php';
+
+class EmailGateway extends PHPMailer
+{
+    private $_config;
+
+    function __construct($config)
+    {
+        $this->_config = $config;
+
+        $transport = $this->_config->getConfigValue('mailTransport');
+
+        if ($transport == 'smtp') {
+            $this->IsSMTP();
+            $this->Host = $this->_config->getConfigValue('smtpServer');
+            $this->Username = $this->_config->getConfigValue('smtpUser');
+            $this->Password = $this->_config->getConfigValue('smtpPassword');
+            $this->Port = $this->_config->getConfigValue('smtpPort');
+        } else if ($transport == 'sendmail') {
+            $this->IsSendmail();
+        }
+
+        $this->CharSet = "utf-8";
+        $this->FromName = $this->_config->getConfigValue('mailFromName');
+        $this->From = $this->_config->getConfigValue('mailFromMail');
+    }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.