Replaced Zend with PHPMailer #158

jpearce185 · 2017-06-13T14:25:25Z

Description

Removed Zend framework from xdmod and replaced it with PHPMailer. All functions and methods relating to Zend were reconfigured to the corresponding PHPMailer methods/functions.

Motivation and Context

To replace Zend with a more robust framework, i.e. PHPMailer.

Tests performed

To start I continuously signed up to xdmod using a test email I created (test2) and I had a user created (test1) for me which had Manager, User, Principal Investigator, and Developer privileges. Using this test1 account, I started out by completing the "Send Message" and "Request Feature" forms under the "Contact Us" tab (updating code as needed), and repeated this process until both the user and xdmod received the proper emails (I knew xdmod would receive these emails because I set my test1 email to the debug email, so all emails that xdmod would normally receive, my test1 received). Next, to test creating a user, I went into the dashboard and created a test user with only User privileges using the test2 email account. I then sent a password reset email to this account to test the password reset feature (from an admin's account) which was successful. I then logged in as this new user and generated a report via the report manager. I sent an email with an attachment to the user successfully. To test again the "Send Message" and "Request Feature" forms (from a different account than previously) I completed them and it was successful. To then test the user password reset functionality, I logged out completely, proceeded to the "Sign In" link and next to "Trouble logging in?" clicked on "Click Here" which in turn sent a password reset email to the user's email, which is what should happen. To then test the SAML Authentication (logging in via federated credentials) I went back into the "Sign In" link and clicked on the federation login banner.
I then had another colleague sign up with another email to ensure it worked and it did.

Checklist:

My code follows the code style of this project as found in the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

jpwhite4 · 2017-06-13T14:27:39Z

classes/MailWrapper.php

+    {
+	$mail = new PHPMailer();
+	$mail->isSendMail();
+	$mail->Sender = 'fxdmod-bounces@ccr.buffalo.edu';


This address does not appear to be correct you have an extra f prepended.

jpwhite4 · 2017-06-13T14:30:11Z

composer.lock

@@ -2688,6 +2750,28 @@
            "description": "Symfony Yaml Component",
            "homepage": "https://symfony.com",
            "time": "2015-07-26T08:59:42+00:00"
+        },


This should not have been added to the lock file. Please regenerate the lock file.

jpwhite4 · 2017-06-13T14:32:30Z

html/internal_dashboard/controllers/mailer.php

        $mail->setFrom($contact, $title);

        $bcc_emails = explode(',', $target_addresses);

        foreach ($bcc_emails as $b) {
-            $mail->addBcc($b);
+            $mail->AddBCC($b);


s/AddBCC/addBCC/

jpwhite4 · 2017-06-13T14:35:27Z

classes/MailWrapper.php

+
+    public static function init()
+    {
+	$mail = new PHPMailer();


Please change the indentation to use spaces rather than tabs.

smgallo · 2017-06-13T14:37:18Z

classes/Authentication/SAML/XDSamlAuthentication.php

        } else {
-            $mail->setSubject("[xdmod] New ". ($linked ? "linked": "unlinked") ." federated user created");
+            $mail->Subject = "[xdmod] New ". ($linked ? "linked": "unlinked") ." federated user created";


Please add spaces before/after concatenation operators.

smgallo · 2017-06-13T14:41:25Z

classes/Authentication/SAML/XDSamlAuthentication.php

        try {
            $mail->send();
            return true;
        } catch (Exception $e) {
-            return $e->getMessage();
+            return $e->getMessage() . "\n" . $mail->ErrorInfo;


You should prefix the error reporting by the module that it occurred in. For example: "Error sending mail to '%s': %s", $email, $errorMessage.

smgallo · 2017-06-13T14:42:28Z

classes/Authentication/SAML/XDSamlAuthentication.php

        try {
            $mail->send();
            return true;
        } catch (Exception $e) {
-            return $e->getMessage();
+            return $e->getMessage() . "\n" . $mail->ErrorInfo;


Rather than return true in one case and a string in another case, you should re-throw the exception and catch it in the calling routine. This makes error handling easier.

smgallo · 2017-06-13T14:43:46Z

classes/Authentication/SAML/XDSamlAuthentication.php

@@ -164,12 +164,12 @@ private function notifyAdminOfNewUser($user, $samlAttributes, $linked, $error =
        "Additional SAML Attributes ----------------------------------\n\n" .


Only add SAML attributes if $samlAttributes is not empty.

smgallo · 2017-06-13T14:43:57Z

classes/MailWrapper.php

+
+    public static function init()
+    {
+	$mail = new PHPMailer();


Fix indentation.

smgallo · 2017-06-13T14:47:08Z

classes/MailWrapper.php

+    {
+	$mail = new PHPMailer();
+	$mail->isSendMail();
+	$mail->Sender = 'fxdmod-bounces@ccr.buffalo.edu';


This should be a configurable email address. And it appears to have an extra "f".

jpwhite4 · 2017-06-15T15:18:50Z

crontabs/xdmod

@@ -0,0 +1,35 @@
+MAILTO=ccr-xdmod-cron@buffalo.edu


This file should not be added. Please remove it and rebase your commits.

jpwhite4 · 2017-06-15T15:19:01Z

crontabs/xdtas

@@ -0,0 +1,28 @@
+# Edit this file to introduce tasks to be run by cron.


This file should not be added.

smgallo

We still have a bit of work to do...

smgallo · 2017-06-15T15:19:23Z

classes/MailWrapper.php

@@ -1,15 +0,0 @@
-<?php


I thought we were going to keep MailWrapper.php but change init() to initPhpMailer($sender)?

smgallo · 2017-06-15T15:20:05Z

crontabs/xdtas

@@ -0,0 +1,28 @@
+# Edit this file to introduce tasks to be run by cron.


Why is this file here?

smgallo · 2017-06-15T15:20:11Z

crontabs/xdmod

@@ -0,0 +1,35 @@
+MAILTO=ccr-xdmod-cron@buffalo.edu


Why is this file here?

smgallo · 2017-06-15T15:21:19Z

html/controllers/mailer/contact.php

@@ -72,7 +72,9 @@
  ? xd_utilities\getConfiguration('general', 'debug_recipient')
  : xd_utilities\getConfiguration('general', 'contact_page_recipient');

-$mail = MailWrapper::init();
+$mail = new PHPMailer();


See my comment above about MailWrapper.php

smgallo · 2017-06-15T15:21:48Z

html/controllers/mailer/contact.php

-$mail = MailWrapper::init();
+$mail = new PHPMailer();
+$mail->isSendMail();
+$mail->Sender = strtolower(\xd_utilities\getConfiguration('mailer', 'sender_email'));


Rather than call \xd_utilities\getConfiguration('mailer', 'sender_email') multiple times, consider calling it once and setting a variable.

smgallo · 2017-06-15T15:24:15Z

classes/Authentication/SAML/XDSamlAuthentication.php

-        print_r($samlAttributes, true);
+        "\nE-Mail:                   " . $userEmail ;
+
+        if(!empty($samlAttributes)){


Is $samlAttributes an array? If so, using if( 0 == count($samlAttributes) ) would be a better choice.

smgallo · 2017-06-15T15:25:33Z

classes/Authentication/SAML/XDSamlAuthentication.php

-            return true;
+            if(!$mail->send()){
+                error_log("Mail failed to send to: " . $userEmail . "\n" . $mail->ErrorInfo);
+            }


This logs the error, but still returns true. Is that your intention?

Looking at the source code for phpmailer it can be configured whether or not to throw exceptions and it defaults to false. This means that the way we are currenlty using this the mailer class will not throw. We should either:

Enable exceptions in phpmailer and change the code to catch them (and don't bother checking the return code.

Leave the phpmailer config at default and don't bother trying to catch exceptions that can never be thrown.

Also can we try to find a way of testing these error cases? Perhaps deliberately switch off postfix on a test system.

If it supports exceptions I say we configure it that way, since that is consistent with what we do normally.

smgallo · 2017-06-15T15:26:50Z

classes/Authentication/SAML/XDSamlAuthentication.php


        $mail->Body = $body;
        try {
-            $mail->send();
-            return true;
+            if(!$mail->send()){


Spaces are your friend - they make code far more readable, especially when looking at it in a non-colorized context. This would read better as if( ! $mail->send() ) {

smgallo · 2017-06-15T15:29:30Z

classes/Authentication/SAML/XDSamlAuthentication.php

        } catch (Exception $e) {
-            return $e->getMessage() . "\n" . $mail->ErrorInfo;
+            error_log("Mail failed to send." . $mail->ErrorInfo);


Why not log the same message being thrown by the exception? It has far more information in it.

smgallo · 2017-06-15T15:30:45Z

classes/Authentication/SAML/XDSamlAuthentication.php

                self::notifyAdminOfNewUser($newUser, $samlAttrs, ($personId != -2));
                return $newUser;
            } catch (Exception $e) {
-                self::notifyAdminOfNewUser($newUser, $samlAttrs, ($personId != -2), true);


If you're not going to do anything with the exception that is thrown, you should return false instead and check the return value.

it is being used https://github.com/ubccr/xdmod/blob/xdmod7.0/html/gui/general/login.php#L14 but looks like it should be able to be pretty easily converted to a false in there.

smgallo · 2017-06-20T14:01:18Z

The most recent changes look good, but you will need to add MailWrapper into a namespace in order for it to pass the automated tests/style checks.

smgallo · 2017-06-20T14:28:55Z

classes/MailWrapper.php

@@ -1,5 +1,7 @@
 <?php

+use CCR;


Please review the PHP namespace documentation on how to fix this.

jpwhite4 · 2017-06-20T14:34:26Z

html/controllers/mailer/contact.php

-$mail->setSubject($subject);
-$mail->addTo($recipient);
+$mail->Subject = $subject;
+$mail->addAddress($recipient);

 //$mail->setFrom($mailer_sender, 'XDMoD');

 //Original sender's e-mail must be in the 'From' field for the XDMoD Request Tracker to function
 $mail->setFrom($_POST['email']);


This is a change to the behaviour of the code. the old version of the code would set the from address and the envelope address to the contents of the $_POST['email'] and the new code sets the envelope to the default sender and the from address to $_POST['email'].

Is this change intended? If so then please document the motivation (i.e. what bug was fixed). If not then please revert to the original behaviour.

The from address and envelope address are still the same ($_POST['email']), however, what changed was how the Sender value was set. Sender, in the old code, was hard coded. Now, the Sender value has been stored in a variable ($sender) that gets the value stored in the config file, thus allowing Sender to now be a configurable address. When Sender and setFrom have different values, Sender appends itself to setFrom's value (i.e. some.email@yahoo.com via buffalo.edu, for example). If Sender has no value, setFrom sets Sender to its own value (the same).

jpwhite4 · 2017-06-20T14:36:19Z

html/controllers/mailer/sign_up.php


 $recipient
    = (xd_utilities\getConfiguration('general', 'debug_mode') == 'on')
    ? xd_utilities\getConfiguration('general', 'debug_recipient')
    : xd_utilities\getConfiguration('general', 'contact_page_recipient');
-$mail->addTo($recipient);
+$mail->addAddress($recipient);

 // Original sender's e-mail must be in the "From" field for the XDMoD
 // Request Tracker to function
 $mail->setFrom($_POST['email']);


Same question as above:

This is a change to the behaviour of the code. the old version of the code would set the from address and the envelope address to the contents of the $_POST['email'] and the new code sets the envelope to the default sender and the from address to $_POST['email'].

Is this change intended? If so then please document the motivation (i.e. what bug was fixed). If not then please revert to the original behaviour.

jpwhite4 · 2017-06-20T17:53:36Z

html/controllers/user_admin/create_user.php

@@ -105,22 +105,21 @@

    $page_title = xd_utilities\getConfiguration('general', 'title');
    $site_address = xd_utilities\getConfigurationUrlBase('general', 'site_address');
-    $mailer_sender = xd_utilities\getConfiguration('mailer', 'sender_email');
+    $sender = xd_utilities\getConfiguration('mailer', 'sender_email');


In other parts of this pull request you call strtolower() on the sender email string. It is not done here. Why do you call tolower at all? Why is it different here?

plessbd · 2017-06-20T18:42:22Z

Do we maybe want to have a helper function (or two) of something like

MailWrapper::sendSystemEmail($subject, $body)

It seems most of our emails are all sent as the "XDMoD" User and the only difference is the subject and body. Might clean up the code a bit more.

Another one might just return the mail object with some of the stuff already set up like the from / to / reply based on whatever email is being sent.

plessbd · 2017-06-20T18:33:12Z

classes/Authentication/SAML/XDSamlAuthentication.php

-        $mail->Sender = strtolower(\xd_utilities\getConfiguration('mailer', 'sender_email'));
+        $sender = strtolower(\xd_utilities\getConfiguration('mailer', 'sender_email'));
+
+        $mail = MailWrapper::initPHPMailer($sender);


is $sender used anywhere else, if not why bother putting it into a variable

Putting $sender in a variable and passing it into the MailWrapper class allows $sender to be set to a configurable email address, rather than be hardcoded

Understood, but why assign it to a variable outside of the wrapper instead of just sending it in like this:

$mail = MailWrapper::initPHPMailer(strtolower(\xd_utilities\getConfiguration('mailer', 'sender_email')));

plessbd · 2017-06-20T18:37:42Z

classes/XDReportManager.php

-        $mail->setFrom($mailer_sender, 'XDMoD');
+        $mail = MailWrapper::initPHPMailer($sender);
+
+        $mail->setFrom($sender, 'XDMoD');


this uses setFrom instead of sender like the other file, should we make these the same

It looks like https://github.com/PHPMailer/PHPMailer/blob/master/class.phpmailer.php#L1011 setFrom internally also sets the sender

setFrom only sets sender if sender has no value assigned to it. An email is sent from the setFrom address on behalf of the sender address. No, they shouldn't be the same.

plessbd · 2017-06-20T18:38:12Z

html/controllers/mailer/contact.php

-$mail = new PHPMailer();
-$mail->isSendMail();
-$mail->Sender = strtolower(\xd_utilities\getConfiguration('mailer', 'sender_email'));
+$mail = MailWrapper::initPHPMailer($sender);


same as others, do we need to store $sender

yes because storing that value allows for a configurable email address

Storing it doesnt allow for the passing it in as a variable to the function does that.

plessbd · 2017-06-20T18:40:04Z

html/controllers/user_auth/pass_reset.php

-$mail->isSendMail();
-$mail->Sender = strtolower(\xd_utilities\getConfiguration('mailer', 'sender_email'));
-$mail->setFrom($mailer_sender, 'XDMoD');
+$sender = strtolower(\xd_utilities\getConfiguration('mailer', 'sender_email'));


see previous comments

plessbd · 2017-06-20T18:40:36Z

html/internal_dashboard/controllers/mailer.php

-        $mail->Sender = strtolower(\xd_utilities\getConfiguration('mailer', 'sender_email'));
+        $sender = strtolower(\xd_utilities\getConfiguration('mailer', 'sender_email'));
+
+        $mail = MailWrapper::initPHPMailer($sender);


see previous comments

plessbd · 2017-06-20T18:43:47Z

classes/Authentication/SAML/XDSamlAuthentication.php

        if ($error) {
-            $mail->setSubject("[xdmod] Error Creating federated user");
+            $mail->Subject = "[xdmod] Error Creating federated user";


In some places we use the xd_utilities\getConfiguration('general', 'title'); should we be using that here instead of [xdmod]

No, because that is unrelated to the creation of federated users.

I agree, it is unrelated to that, it is only related to how emails are sent out. However if you mean it is unrelated to the change from ZendMail to PHPMailer, I can agree to that.

plessbd · 2017-06-20T18:44:31Z

classes/XDReportManager.php


-        $mail->setFrom($mailer_sender, 'XDMoD');
+        $mail->setFrom($sender, 'XDMoD');


In some places we use the xd_utilities\getConfiguration('general', 'title'); should we be using that here instead of [xdmod]

plessbd · 2017-06-20T18:45:20Z

html/controllers/mailer/contact.php

-$mail->setSubject("Thank you for your $message_type.");
-$mail->addTo($_POST['email']);
+$mail = MailWrapper::initPHPMailer($sender);
+$mail->setFrom($sender, 'XDMoD');


In some places we use the xd_utilities\getConfiguration('general', 'title'); should we be using that here instead of [xdmod]

In some cases, that would be better to use because it specifies which XDMoD the email is from.

plessbd · 2017-06-20T18:46:54Z

in the places where we use xd_utilities\getConfiguration('general', 'title'); we should be consistent on if we put it in [] or not

plessbd · 2017-06-21T12:18:36Z

classes/MailWrapper.php

+    {
+        $mail = new PHPMailer(true);
+        $mail->isSendMail();
+        $mail->Sender = $sender;


since we always want the sender to be \xd_utilities\getConfiguration('mailer', 'sender_email')
but we want the from to be configurable from the caller maybe something like this would be more appropriate

public static function initPHPMailer($fromEmail = null, $fromName = '') { $mail = new PHPMailer(true); $mail->isSendMail(); $address = \xd_utilities\getConfiguration('mailer', 'sender_email'); $name = \xd_utilities\getConfiguration('general', 'title'); $mail->Sender = $address; if($fromEmail !== null) { $address = $fromEmail; $name = $fromName; } try { $mail->setFrom($address, $name); } catch(phpmailerException $e){ /* Handle invalid sender address here */ } return $mail; }

this should reduce code duplication and set up the email to send properly.

Edits to @plessbd example for clarity

public static function initPHPMailer($fromEmail = null, $fromName = null); { $mail = new PHPMailer(true); $mail->isSendMail(); $mail->Sender = \xd_utilities\getConfiguration('mailer', 'sender_email'); $address = ( null !== $fromEmail ? $fromEmail : $mail->Sender ); $name = ( null !== $fromName ? $fromName : \xd_utilities\getConfiguration('general', 'title') ); try { $mail->setFrom($address, $name); } catch (phpmailerException $e) { /* Handle invalid sender address here */ } return $mail; }

Comments on @smgallo edits:
Doing this could end up with it coming from \xd_utilities\getConfiguration('general', 'title') user@someDomain.tld

plessbd · 2017-06-21T17:08:55Z

classes/Authentication/SAML/XDSamlAuthentication.php


-        $mail = MailWrapper::initPHPMailer($sender);
+        $mail = MailWrapper::initPHPMailer($userEmail, \xd_utilities\getConfiguration('general', 'title'));


new mailwrapper defaults to \xd_utilities\getConfiguration('mailer', 'sender_email') and xd_utilities\getConfiguration('general', 'title') no need to pass them in

Also why the change from $sender to $userEmail where is $userEmail defined?

plessbd · 2017-06-21T17:09:56Z

classes/CCR/MailWrapper.php

+        $name = \xd_utilities\getConfiguration('general', 'title');
+        $mail->Sender = $address;
+
+        if($fromEmail !== null) {


Look at steves example and wrok to find the best of both worlds

plessbd · 2017-06-21T17:10:10Z

classes/XDReportManager.php

-        $mail = MailWrapper::initPHPMailer($sender);
-
-        $mail->setFrom($sender, 'XDMoD');
+        $mail = MailWrapper::initPHPMailer(xd_utilities\getConfiguration('mailer', 'sender_email'), 'XDMoD');


new mailwrapper defaults to \xd_utilities\getConfiguration('mailer', 'sender_email') and xd_utilities\getConfiguration('general', 'title') no need to pass them in

plessbd · 2017-06-21T17:10:33Z

html/controllers/mailer/contact.php

@@ -116,8 +115,7 @@

 // =====================================================

-$mail = MailWrapper::initPHPMailer($sender);
-$mail->setFrom($sender, 'XDMoD');
+$mail = MailWrapper::initPHPMailer(\xd_utilities\getConfiguration('mailer', 'sender_email'), 'XDMoD');


new mailwrapper defaults to \xd_utilities\getConfiguration('mailer', 'sender_email') and xd_utilities\getConfiguration('general', 'title') no need to pass them in

plessbd · 2017-06-21T17:10:43Z

html/controllers/user_admin/create_user.php


    // -------------------

-    $mail = MailWrapper::initPHPMailer($sender);
-    $mail->setFrom($sender, 'XDMoD');
+    $mail = MailWrapper::initPHPMailer(\xd_utilities\getConfiguration('mailer', 'sender_email'), 'XDMoD');


new mailwrapper defaults to \xd_utilities\getConfiguration('mailer', 'sender_email') and xd_utilities\getConfiguration('general', 'title') no need to pass them in

plessbd · 2017-06-21T17:10:49Z

html/controllers/user_admin/pass_reset.php

-
-$mail = MailWrapper::initPHPMailer($sender);
-$mail->setFrom($sender, 'XDMoD');
+$mail = MailWrapper::initPHPMailer(\xd_utilities\getConfiguration('mailer', 'sender_email'), 'XDMoD');


new mailwrapper defaults to \xd_utilities\getConfiguration('mailer', 'sender_email') and xd_utilities\getConfiguration('general', 'title') no need to pass them in

plessbd · 2017-06-21T17:10:54Z

html/controllers/user_auth/pass_reset.php

-
-$mail = MailWrapper::initPHPMailer($sender);
-$mail->setFrom($sender, 'XDMoD');
+$mail = MailWrapper::initPHPMailer(\xd_utilities\getConfiguration('mailer', 'sender_email'), 'XDMoD');


new mailwrapper defaults to \xd_utilities\getConfiguration('mailer', 'sender_email') and xd_utilities\getConfiguration('general', 'title') no need to pass them in

plessbd · 2017-06-22T14:29:15Z

classes/Authentication/SAML/XDSamlAuthentication.php

@@ -142,8 +142,9 @@ public function getLoginLink()
    }
    private function notifyAdminOfNewUser($user, $samlAttributes, $linked, $error = false)
    {
+        $userEmail = $user->getEmailAddress();



could we getFormalName here as well to be able to add it to the from?

plessbd · 2017-06-22T15:26:47Z

classes/XDReportManager.php

-            "Your$frequency " . $templateConfig['subject'] . " $subject_suffix";
-        $mail->Body = $templateConfig['message'];
+        try {
+            $mail = MailWrapper::initPHPMailer(null, 'XDMoD');


no need to send this stuff in, it will default to what it needs to

plessbd · 2017-06-22T15:27:40Z

html/controllers/mailer/contact.php

 try {
+    $mail = MailWrapper::initPHPMailer($_POST['email']);


Does the post have a name we can attach to the email?

plessbd · 2017-06-22T15:27:56Z

html/controllers/mailer/contact.php

 // -------------------

 try {
+    $mail = MailWrapper::initPHPMailer(null, 'XDMoD');


no need to pass anything in the defaults will take care of this.

plessbd · 2017-06-22T15:28:33Z

html/controllers/mailer/sign_up.php


 $response = array();

 try {
+    $mail = MailWrapper::initPHPMailer($_POST['email']);


does the post have a name we can pass in? Same with the Replyto

plessbd · 2017-06-22T15:28:46Z

html/controllers/user_admin/create_user.php

@@ -110,7 +110,7 @@

    // -------------------

-    $mail = MailWrapper::initPHPMailer(\xd_utilities\getConfiguration('mailer', 'sender_email'), 'XDMoD');
+    $mail = MailWrapper::initPHPMailer(null, 'XDMoD');


No need to pass anything in defaults should be fine here.

plessbd · 2017-06-22T15:29:00Z

html/controllers/user_admin/pass_reset.php

-$mail->Subject = "$page_title: Password Reset";
-$mail->addAddress($recipient);
+try {
+    $mail = MailWrapper::initPHPMailer(null, 'XDMoD');


no need to pass anything in, defaults should be fine

plessbd · 2017-06-22T15:29:30Z

html/controllers/user_admin/pass_reset.php


-$message = MailTemplates::passwordReset($user_to_email);
+    $message = MailTemplates::passwordReset($user_to_email);


For a future update, we should probably make this MailTemplates part of the mailwrapper class

On another branch, yes

plessbd · 2017-06-22T15:29:44Z

html/controllers/user_auth/pass_reset.php

-$mail->Subject = "$page_title: Password Reset";
-$mail->addAddress($recipient);
+try {
+    $mail = MailWrapper::initPHPMailer(null, 'XDMoD');


no need to pass anything in the defaults should be fine.

jpwhite4 · 2017-06-27T14:00:46Z

html/controllers/mailer/contact.php

+    $mail->Subject = $subject;
+    $mail->addAddress($recipient);
+
+    //$mail->setFrom($mailer_sender, 'XDMoD');


Please do not add commented out code. See e.g. https://softwareengineering.stackexchange.com/questions/190096/can-commented-out-code-be-valuable-documentation

jpwhite4 requested changes Jun 13, 2017

View reviewed changes

smgallo suggested changes Jun 13, 2017

View reviewed changes

jpwhite4 requested changes Jun 15, 2017

View reviewed changes

smgallo suggested changes Jun 15, 2017

View reviewed changes

smgallo approved these changes Jun 20, 2017

View reviewed changes

smgallo suggested changes Jun 20, 2017

View reviewed changes

jpwhite4 requested changes Jun 20, 2017

View reviewed changes

jpwhite4 reviewed Jun 20, 2017

View reviewed changes

plessbd suggested changes Jun 20, 2017

View reviewed changes

plessbd reviewed Jun 21, 2017

View reviewed changes

jpearce185 added 7 commits June 21, 2017 11:31

Replaced Zend with PHPMailer

73af634

Some changes

9ec3bd1

removed crontabs

0318ac6

additional changes

905eb0c

namespace addition

2611a21

namespace re-done

8525aa9

simplifying code

da4888e

jpearce185 force-pushed the remove-zend branch from 5e7a9b0 to da4888e Compare June 21, 2017 15:32

plessbd suggested changes Jun 21, 2017

View reviewed changes

error handling

b5b7763

plessbd suggested changes Jun 22, 2017

View reviewed changes

jpearce185 added 2 commits June 26, 2017 08:37

Fixes

ac25303

bug fix

ab500d9

jpwhite4 reviewed Jun 27, 2017

View reviewed changes

smgallo approved these changes Jun 27, 2017

View reviewed changes

removed commented code

eb7adfd

jpwhite4 approved these changes Jun 29, 2017

View reviewed changes

plessbd approved these changes Jun 29, 2017

View reviewed changes

plessbd merged commit ba7f68f into ubccr:xdmod7.0 Jun 29, 2017

tyearke added qa enhancement Enhancement of the functionality of an existing feature labels Aug 14, 2017

tyearke added this to the v7.0.0 milestone Aug 14, 2017

plessbd added the qa / testing Updates/additions to tests label Mar 26, 2019

		@@ -164,12 +164,12 @@ private function notifyAdminOfNewUser($user, $samlAttributes, $linked, $error =
		"Additional SAML Attributes ----------------------------------\n\n" .

		@@ -0,0 +1,28 @@
		# Edit this file to introduce tasks to be run by cron.


		$mail->setFrom($mailer_sender, 'XDMoD');
		$mail->setFrom($sender, 'XDMoD');


		$mail = MailWrapper::initPHPMailer($sender);
		$mail = MailWrapper::initPHPMailer($userEmail, \xd_utilities\getConfiguration('general', 'title'));


		$message = MailTemplates::passwordReset($user_to_email);
		$message = MailTemplates::passwordReset($user_to_email);

Replaced Zend with PHPMailer #158

Replaced Zend with PHPMailer #158

Conversation

jpearce185 commented Jun 13, 2017

Description

Motivation and Context

Tests performed

Checklist:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smgallo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smgallo commented Jun 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

plessbd commented Jun 20, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

plessbd commented Jun 20, 2017

plessbd Jun 21, 2017 • edited Loading

Choose a reason for hiding this comment

smgallo Jun 21, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

plessbd commented Jun 20, 2017 •

edited

Loading

plessbd Jun 21, 2017 •

edited

Loading

smgallo Jun 21, 2017 •

edited

Loading