Upgraded Swiftmailer and php-markdown.

Switched to smtp transport as mail transport is deprecated.

Author: mcneely

composer.json

@@ -9,10 +9,11 @@
         "irc" : "irc://freenet/#joindin",
         "source" : "https://github.com/joindin/joindin-api"
     },
-    "preferred-install": "dist",
     "require" : {
-        "swiftmailer/swiftmailer": "^v5.0",
-        "michelf/php-markdown": "1.4.0",
+        "ext-pdo": "*",
+        "ext-json": "*",
+        "swiftmailer/swiftmailer": "^v5.4.9",
+        "michelf/php-markdown": "^1.8.0",
         "guzzlehttp/guzzle": "^4.2.4",
         "guzzlehttp/oauth-subscriber": "0.1.*"
     },
@@ -51,6 +52,7 @@
         ]
     },
     "config" : {
+        "preferred-install": "dist",
         "platform" : {
             "php": "5.6.6"
         },

src/config.php.dist

@@ -1,45 +1,52 @@
 <?php
 
-$config =  array(
-    'mode' => 'development',
+$config = [
+    'mode'        => 'development',
 
     // the URL of web2 website is used in links within emails
     'website_url' => 'http://dev.joind.in',
 
-    'oauth' => array(
-        'expirable_client_ids' => array(
+    'oauth'            => [
+        'expirable_client_ids' => [
             // some clients, (e.g. web2) do not hold onto their token after the
             // user logs out of the client, so we can expire their old tokens.
             'web2',
-        ),
-    ),
-    'event_image_path' => __DIR__ . '/../../joindin-web2/web/inc/img/event_icons/',
-    'email' => array(
-        'contact' => '[email protected]',
-        'from' => '[email protected]',
-        'forward_all_to' => false
-    ),
-    'twitter' => array(
+        ],
+    ],
+    'event_image_path' => __DIR__.'/../../joindin-web2/web/inc/img/event_icons/',
+    'email'            => [
+        'contact'        => '[email protected]',
+        'from'           => '[email protected]',
+        'forward_all_to' => false,
+        'smtp'           => [
+            'host'     => 'localhost',
+            'port'     => 25,
+            'username' => 'username',
+            'password' => 'ChangeMeSeymourChangeMe',
+            'security' => 'ssl'
+        ],
+    ],
+    'twitter'          => [
         // set up the key at https://apps.twitter.com/
         // configure the callback url as /user/twitter-access on web2
-        'consumer_key' => '',
-        'consumer_secret' => ''
-    ),
-    'facebook' => array(
+        'consumer_key'    => '',
+        'consumer_secret' => '',
+    ],
+    'facebook'         => [
         // set up at https://developers.facebook.com/apps/
         // configure url in OAuth Settings as /user/facebook-access on web2
-        'app_id' => '',
+        'app_id'     => '',
         'app_secret' => '',
-    ),
-    'features' => array(
-        'allow_auto_verify_users' => false,
+    ],
+    'features'         => [
+        'allow_auto_verify_users'   => false,
         'allow_auto_approve_events' => false,
-    ),
-    'limits' => array(
-        'max_pending_events' => 3,
+    ],
+    'limits'           => [
+        'max_pending_events'       => 3,
         'max_comment_edit_minutes' => 15,
-    )
-);
+    ],
+];
 
 // uncomment and add your akismet key here if you want to do spam checking
 // $config['akismet'] = [

src/services/BaseEmailService.php

@@ -1,5 +1,7 @@
 <?php
 
+use Michelf\Markdown;
+
 /**
  * Base Email Class
  *
@@ -32,19 +34,33 @@ abstract class BaseEmailService
     /**
      * Make a message to be sent later
      *
-     * @param array $config The system config
+     * @param array $config     The system config
      * @param array $recipients An array of email addresses
+     * @throws \Exception
      */
     public function __construct(array $config, array $recipients)
     {
-        $transport     = \Swift_MailTransport::newInstance();
-        $this->mailer  = \Swift_Mailer::newInstance($transport);
-        $this->message = \Swift_Message::newInstance();
+        if (!isset($config['email']['smtp'])) {
+            throw new Exception("SMTP Server not properly set up.");
+        }
+
+        $transport = (Swift_SmtpTransport::newInstance(
+            $config['email']['smtp']['host'],
+            $config['email']['smtp']['port'],
+            $config['email']['smtp']['security']
+        ))
+            ->setUsername($config['email']['smtp']['username'])
+            ->setPassword($config['email']['smtp']['password'])
+        ;
+
+
+        $this->mailer  = Swift_Mailer::newInstance($transport);
+        $this->message = Swift_Message::newInstance();
 
         if (isset($config['email']['forward_all_to'])
-            && ! empty($config['email']['forward_all_to'])
+            && !empty($config['email']['forward_all_to'])
         ) {
-            $this->recipients = array($config['email']['forward_all_to']);
+            $this->recipients = [$config['email']['forward_all_to']];
         } else {
             $this->recipients = $recipients;
         }
@@ -57,18 +73,18 @@ public function __construct(array $config, array $recipients)
      * with the correct values in it
      *
      * @param string $templateName
-     * @param array $replacements
+     * @param array  $replacements
      *
      * @return string
      */
     public function parseEmail($templateName, array $replacements)
     {
-        $template = file_get_contents($this->templatePath . $templateName)
-                    . file_get_contents($this->templatePath . 'signature.md');
+        $template = file_get_contents($this->templatePath.$templateName)
+                    .file_get_contents($this->templatePath.'signature.md');
 
         $message = $template;
         foreach ($replacements as $field => $value) {
-            $message = str_replace('[' . $field . ']', $value, $message);
+            $message = str_replace('['.$field.']', $value, $message);
         }
 
         return $message;
@@ -154,7 +170,7 @@ public function getRecipients()
      */
     public function markdownToHtml($markdown)
     {
-        $messageHTML = Michelf\Markdown::defaultTransform($markdown);
+        $messageHTML = Markdown::defaultTransform($markdown);
 
         return $messageHTML;
     }