[Beeframework-svn] SF.net SVN: beeframework:[207] branches/0.9-dev/framework/Bee

[<m_p...@us...>]

Revision: 207
          http://sourceforge.net/p/beeframework/code/207
Author:   m_plomer
Date:     2014-09-03 11:30:09 +0000 (Wed, 03 Sep 2014)
Log Message:
-----------
 - backports from 0.10 trunk

Modified Paths:
--------------
    branches/0.9-dev/framework/Bee/MVC/View/JsonService.php
    branches/0.9-dev/framework/Bee/Utils/SmartyMailer.php

Modified: branches/0.9-dev/framework/Bee/MVC/View/JsonService.php
===================================================================
--- branches/0.9-dev/framework/Bee/MVC/View/JsonService.php	2014-09-03 10:48:57 UTC (rev 206)
+++ branches/0.9-dev/framework/Bee/MVC/View/JsonService.php	2014-09-03 11:30:09 UTC (rev 207)
@@ -22,12 +22,8 @@
  */
 class Bee_MVC_View_JsonService extends Bee_MVC_View_Abstract {
 
-//	protected function prepareResponse() {
-//	}
-	
 	/**
-	 * @Return void
-	 * @Param model Array
+	 *
 	 */
 	protected function renderMergedOutputModel() {
 		echo json_encode(Bee_MVC_Model::getModelValues());

Modified: branches/0.9-dev/framework/Bee/Utils/SmartyMailer.php
===================================================================
--- branches/0.9-dev/framework/Bee/Utils/SmartyMailer.php	2014-09-03 10:48:57 UTC (rev 206)
+++ branches/0.9-dev/framework/Bee/Utils/SmartyMailer.php	2014-09-03 11:30:09 UTC (rev 207)
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2008-2010 the original author or authors.
+ * Copyright 2008-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,13 +30,21 @@
 	 */
 	private $smarty;
 
-    /**
-     * @param $subjectTemplate
-     * @param $bodyTemplate
-     * @param array $model
-     * @param mixed $recipient Either string ex...@ma... or array with keys "address" and optional "name"
-     * @param mixed $sender Either string ex...@ma... or array with keys "address" and optional "name"
-     */
+	/**
+	 * @var string
+	 */
+	private $messageLogFile;
+
+	/**
+	 * @param $subjectTemplate
+	 * @param $bodyTemplate
+	 * @param array $model
+	 * @param mixed $recipient Either string ex...@ma... or array with keys "address" and optional "name"
+	 * @param mixed $sender Either string ex...@ma... or array with keys "address" and optional "name"
+	 * @throws Exception
+	 * @throws phpmailerException
+	 * @return bool
+	 */
     public function sendMail($subjectTemplate, $bodyTemplate, array $model, $recipient=null, $sender=null) {
         $phpMailer = $this->instantiatePhpMailer($subjectTemplate, $bodyTemplate, $model, $recipient, $sender);
 
@@ -46,6 +54,20 @@
         return true;
 	}
 
+	/**
+	 * @param $subjectTemplate
+	 * @param $bodyTemplate
+	 * @param array $model
+	 * @param null $recipient
+	 * @param null $sender
+	 */
+	public function logMail($subjectTemplate, $bodyTemplate, array $model, $recipient=null, $sender=null) {
+		$phpMailer = $this->instantiatePhpMailer($subjectTemplate, $bodyTemplate, $model, $recipient, $sender);
+		if($this->messageLogFile && $phpMailer->preSend()) {
+			file_put_contents($this->messageLogFile, $phpMailer->getMailMIME());
+		}
+	}
+
     /**
      * @param $subjectTemplate
      * @param $bodyTemplate
@@ -136,4 +158,18 @@
 	public final function setSmarty(Smarty $smarty) {
 		$this->smarty = $smarty;
 	}
+
+	/**
+	 * @return string
+	 */
+	public function getMessageLogFile() {
+		return $this->messageLogFile;
+	}
+
+	/**
+	 * @param string $messageLogFile
+	 */
+	public function setMessageLogFile($messageLogFile) {
+		$this->messageLogFile = $messageLogFile;
+	}
 }
\ No newline at end of file

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