Merge pull request #169 from cjsaylor/2.4.2

2.4.2

.gitignore

@@ -2,6 +2,8 @@
 .project
 
 app/Vendor/
+app/Plugin/DebugKit
+app/Plugin/GChart
 
 # config
 app/Config/environment.php

app/Config/bootstrap.php

@@ -58,6 +58,9 @@
 Configure::write('Feedback.github.auth_token', Configure::read('Env.Feedback.github.auth_token'));
 Configure::write('Feedback.github.labels', array('Feedback'));
 
+// Email Config
+Configure::write('Email.mailgun', Configure::read('Env.Email.mailgun'));
+
 // Message
 Configure::write('Message.message', Configure::read('Env.Message.message') ?: 'Some user message.');
 Configure::write('Message.cookie_suffix', Configure::read('Env.Message.cookie_suffix') ?: '001');

app/Config/environment.sample.php

@@ -14,6 +14,12 @@
 				'database' => 'boxmeup'
 			)
 		),
+		'Email' => array(
+			'mailgun' => array(
+				'domain' => '',
+				'api_key' => ''
+			)
+		),
 		'Feature' => array(
 			'api' => true,
 			'mobile' => true,

app/Controller/Component/CustomEmailComponent.php

@@ -0,0 +1,40 @@
+<?php
+
+use Mailgun\Mailgun;
+
+App::uses('Component', 'Controller');
+
+Class CustomEmailComponent extends Component {
+
+	const SEND_OK = 200;
+
+	public function getMailer() {
+		return new Mailgun(Configure::read('Email.mailgun.api_key'));
+	}
+
+	public function send($to, $subject, $template, $data, $type = 'text') {
+		$body = $this->evaluate(APP . "/View/Emails/$type/$template.ctp", $data);
+		$result = $this->getMailer()->sendMessage(Configure::read('Email.mailgun.domain'), array(
+			'from' => 'Boxmeup Team <[email protected]>',
+			'to' => $to,
+			'subject' => $subject,
+			'text' => $body
+		));
+		return $result->http_response_code === static::SEND_OK;
+	}
+
+	/**
+	 * Get the rendered output of a ctp file.
+	 * 
+	 * @param string $filePath
+	 * @param  array $data
+	 * @return string
+	 */
+	protected function evaluate($filePath, $data = array()) {
+		extract($data);
+		ob_start();
+		include $filePath;
+		return ob_get_clean();
+	}
+
+}

app/Controller/UsersController.php

@@ -5,7 +5,7 @@ class UsersController extends AppController {
 
 	public $name = 'Users';
 
-	public $components = array('Email');
+	public $components = array('CustomEmail');
 
 	protected $ssl = array(
 		'login', 'signup', 'account', 'reset_password', 'auth'
@@ -148,19 +148,21 @@ public function forgot_password() {
 					$secretKey = ClassRegistry::init('Api.ApiUser')->getSecretKey($apiKey);
 					$dynKey = base64_encode(date('c'));
 					$hash = sha1($dynKey . $secretKey);
-					$this->Email->to = $this->request->data['User']['email'];
-					$this->Email->subject = 'Boxmeup Password Recovery';
-					$this->Email->replyTo = '[email protected]';
-					$this->Email->from = 'Boxmeup App <[email protected]>';
-					$this->Email->template = 'forgot_password';
-					$this->Email->sendAs = 'text';
-					$this->set(array(
-						'password' => $new_password,
-						'api_key' => $apiKey,
-						'dynamic_key' => $dynKey,
-						'hash' => $hash
-					));
-					$this->Email->send();
+					$sent = $this->CustomEmail->send(
+						$this->request->data['User']['email'],
+						'Boxmeup Password Recovery',
+						'forgot_password',
+						array(
+							'password' => $new_password,
+							'api_key' => $apiKey,
+							'dynamic_key' => $dynKey,
+							'hash' => $hash
+						)
+					);
+					if (!$sent) {
+						$this->Session->setFlash(__('Failed to send recovery email.'), 'notification/error');
+						$this->redirect('/users/forgot_password');
+					}
 				}
 				$this->Session->setFlash(__('Successfully sent recovery request.'), 'notification/success');
 				$this->redirect('/login');

composer.json

@@ -22,7 +22,8 @@
         "composer/installers": "*",
         "pear-cakephp/cakephp": "2.3.10",
         "neutron/sphinxsearch-api": "2.0.8",
-        "cjsaylor/gchart": "2.0.2"
+        "cjsaylor/gchart": "2.0.2",
+        "mailgun/mailgun-php": "1.5"
     },
     "require-dev": {
         "cakephp/debug_kit": "2.2.*"