From a1a2bf93689e999ad91cc1d02e7bafb483a82edc Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@sourcefabric.org>
Date: Wed, 22 Jul 2015 11:19:37 -0400
Subject: [PATCH 1/2] Test out existing email functionality

---
 .../controllers/LoginController.php           | 64 +++++++++----------
 airtime_mvc/application/models/Email.php      | 59 +----------------
 .../views/scripts/form/login.phtml            | 12 ++--
 3 files changed, 39 insertions(+), 96 deletions(-)

diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index 920a258cc..e810d4246 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -140,43 +140,43 @@ class LoginController extends Zend_Controller_Action
         
         Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
 
-        if (!Application_Model_Preference::GetEnableSystemEmail()) {
-            $this->_redirect('login');
-        } else {
-            //uses separate layout without a navigation.
-            $this->_helper->layout->setLayout('login');
+//        if (!Application_Model_Preference::GetEnableSystemEmail()) {
+//            $this->_redirect('login');
+//        } else {
+        //uses separate layout without a navigation.
+        $this->_helper->layout->setLayout('login');
 
-            $form = new Application_Form_PasswordRestore();
+        $form = new Application_Form_PasswordRestore();
 
-            $request = $this->getRequest();
-            if ($request->isPost() && $form->isValid($request->getPost())) {
-                if (is_null($form->username->getValue()) || $form->username->getValue() == '') {
-                    $user = CcSubjsQuery::create()
-                        ->filterByDbEmail($form->email->getValue())
-                        ->findOne();
-                } else {
-                    $user = CcSubjsQuery::create()
-                        ->filterByDbEmail($form->email->getValue())
-                        ->filterByDbLogin($form->username->getValue())
-                        ->findOne();
-                }
-
-                if (!empty($user)) {
-                    $auth = new Application_Model_Auth();
-
-                    $success = $auth->sendPasswordRestoreLink($user, $this->view);
-                    if ($success) {
-                        $this->_helper->redirector('password-restore-after', 'login');
-                    } else {
-                        $form->email->addError($this->view->translate(_("Email could not be sent. Check your mail server settings and ensure it has been configured properly.")));
-                    }
-                } else {
-                    $form->email->addError($this->view->translate(_("Given email not found.")));
-                }
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
+            if (is_null($form->username->getValue()) || $form->username->getValue() == '') {
+                $user = CcSubjsQuery::create()
+                    ->filterByDbEmail($form->email->getValue())
+                    ->findOne();
+            } else {
+                $user = CcSubjsQuery::create()
+                    ->filterByDbEmail($form->email->getValue())
+                    ->filterByDbLogin($form->username->getValue())
+                    ->findOne();
             }
 
-            $this->view->form = $form;
+            if (!empty($user)) {
+                $auth = new Application_Model_Auth();
+
+                $success = $auth->sendPasswordRestoreLink($user, $this->view);
+                if ($success) {
+                    $this->_helper->redirector('password-restore-after', 'login');
+                } else {
+                    $form->email->addError($this->view->translate(_("Email could not be sent. Check your mail server settings and ensure it has been configured properly.")));
+                }
+            } else {
+                $form->email->addError($this->view->translate(_("Given email not found.")));
+            }
         }
+
+        $this->view->form = $form;
+//        }
     }
 
     public function passwordRestoreAfterAction()
diff --git a/airtime_mvc/application/models/Email.php b/airtime_mvc/application/models/Email.php
index 234f20397..774617c1e 100644
--- a/airtime_mvc/application/models/Email.php
+++ b/airtime_mvc/application/models/Email.php
@@ -12,65 +12,8 @@ class Application_Model_Email
      */
     public static function send($subject, $message, $tos, $from = null)
     {
-        $mailServerConfigured = Application_Model_Preference::GetMailServerConfigured() == true ? true : false;
-        $mailServerRequiresAuth = Application_Model_Preference::GetMailServerRequiresAuth() == true ? true : false;
-        $success = true;
 
-        if ($mailServerConfigured) {
-            $mailServer = Application_Model_Preference::GetMailServer();
-            $mailServerPort = Application_Model_Preference::GetMailServerPort();
-            if (!empty($mailServerPort)) {
-                $port = $mailServerPort;
-            }
-
-            if ($mailServerRequiresAuth) {
-                $username = Application_Model_Preference::GetMailServerEmailAddress();
-                $password = Application_Model_Preference::GetMailServerPassword();
-
-                $config = array(
-                    'auth' => 'login',
-                    'ssl' => 'ssl',
-                    'username' => $username,
-                    'password' => $password
-                );
-            } else {
-                $config = array(
-                    'ssl' => 'tls'
-                );
-            }
-
-            if (isset($port)) {
-                $config['port'] = $port;
-            }
-
-            $transport = new Zend_Mail_Transport_Smtp($mailServer, $config);
-        }
-
-        $mail = new Zend_Mail('utf-8');
-        $mail->setSubject($subject);
-        $mail->setBodyText($message);
-
-        foreach ((array) $tos as $to) {
-            $mail->addTo($to);
-        }
-
-        if ($mailServerConfigured) {
-            $mail->setFrom(isset($from) ? $from : Application_Model_Preference::GetMailServerEmailAddress());
-            try {
-                $mail->send($transport);
-            } catch (Exception $e) {
-                $success = false;
-            }
-        } else {
-            $mail->setFrom(isset($from) ? $from : Application_Model_Preference::GetSystemEmail());
-            try {
-                $mail->send();
-            } catch (Exception $e) {
-                $success = false;
-            }
-        }
-
-        return $success;
+        return mail($tos, $subject, $message);
 
     }
 }
diff --git a/airtime_mvc/application/views/scripts/form/login.phtml b/airtime_mvc/application/views/scripts/form/login.phtml
index e8d80a84d..09893410d 100644
--- a/airtime_mvc/application/views/scripts/form/login.phtml
+++ b/airtime_mvc/application/views/scripts/form/login.phtml
@@ -30,12 +30,12 @@
 
     <?php echo $this->element->getElement('csrf') ?>
     
-    <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
-        <dt id="reset-label" class="hidden">&nbsp;</dt>
-        <dd id="reset-element" class="text-right">
-          <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset"><?php echo _("Reset password") ?></a>
-        </dd>
-    <?php endif; ?>
+<!--    --><?php //if (Application_Model_Preference::GetEnableSystemEmail()): ?>
+    <dt id="reset-label" class="hidden">&nbsp;</dt>
+    <dd id="reset-element" class="text-right">
+      <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset"><?php echo _("Reset password") ?></a>
+    </dd>
+<!--    --><?php //endif; ?>
     <?php echo $this->element->getElement('captcha') ?>
     <dt id="submit-label">&nbsp;</dt>
     <dd id="submit-element">

From ce0cc946abdd5683baf5c2b28cfabefa01ef01e4 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@sourcefabric.org>
Date: Thu, 23 Jul 2015 13:00:34 -0400
Subject: [PATCH 2/2] Disable password reset in saas-dev (moved to saas-email
 branch)

---
 .../controllers/LoginController.php           | 64 +++++++++----------
 .../views/scripts/form/login.phtml            | 12 ++--
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index e810d4246..920a258cc 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -140,43 +140,43 @@ class LoginController extends Zend_Controller_Action
         
         Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
 
-//        if (!Application_Model_Preference::GetEnableSystemEmail()) {
-//            $this->_redirect('login');
-//        } else {
-        //uses separate layout without a navigation.
-        $this->_helper->layout->setLayout('login');
+        if (!Application_Model_Preference::GetEnableSystemEmail()) {
+            $this->_redirect('login');
+        } else {
+            //uses separate layout without a navigation.
+            $this->_helper->layout->setLayout('login');
 
-        $form = new Application_Form_PasswordRestore();
+            $form = new Application_Form_PasswordRestore();
 
-        $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            if (is_null($form->username->getValue()) || $form->username->getValue() == '') {
-                $user = CcSubjsQuery::create()
-                    ->filterByDbEmail($form->email->getValue())
-                    ->findOne();
-            } else {
-                $user = CcSubjsQuery::create()
-                    ->filterByDbEmail($form->email->getValue())
-                    ->filterByDbLogin($form->username->getValue())
-                    ->findOne();
-            }
-
-            if (!empty($user)) {
-                $auth = new Application_Model_Auth();
-
-                $success = $auth->sendPasswordRestoreLink($user, $this->view);
-                if ($success) {
-                    $this->_helper->redirector('password-restore-after', 'login');
+            $request = $this->getRequest();
+            if ($request->isPost() && $form->isValid($request->getPost())) {
+                if (is_null($form->username->getValue()) || $form->username->getValue() == '') {
+                    $user = CcSubjsQuery::create()
+                        ->filterByDbEmail($form->email->getValue())
+                        ->findOne();
                 } else {
-                    $form->email->addError($this->view->translate(_("Email could not be sent. Check your mail server settings and ensure it has been configured properly.")));
+                    $user = CcSubjsQuery::create()
+                        ->filterByDbEmail($form->email->getValue())
+                        ->filterByDbLogin($form->username->getValue())
+                        ->findOne();
                 }
-            } else {
-                $form->email->addError($this->view->translate(_("Given email not found.")));
-            }
-        }
 
-        $this->view->form = $form;
-//        }
+                if (!empty($user)) {
+                    $auth = new Application_Model_Auth();
+
+                    $success = $auth->sendPasswordRestoreLink($user, $this->view);
+                    if ($success) {
+                        $this->_helper->redirector('password-restore-after', 'login');
+                    } else {
+                        $form->email->addError($this->view->translate(_("Email could not be sent. Check your mail server settings and ensure it has been configured properly.")));
+                    }
+                } else {
+                    $form->email->addError($this->view->translate(_("Given email not found.")));
+                }
+            }
+
+            $this->view->form = $form;
+        }
     }
 
     public function passwordRestoreAfterAction()
diff --git a/airtime_mvc/application/views/scripts/form/login.phtml b/airtime_mvc/application/views/scripts/form/login.phtml
index 09893410d..c286c45be 100644
--- a/airtime_mvc/application/views/scripts/form/login.phtml
+++ b/airtime_mvc/application/views/scripts/form/login.phtml
@@ -30,12 +30,12 @@
 
     <?php echo $this->element->getElement('csrf') ?>
     
-<!--    --><?php //if (Application_Model_Preference::GetEnableSystemEmail()): ?>
-    <dt id="reset-label" class="hidden">&nbsp;</dt>
-    <dd id="reset-element" class="text-right">
-      <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset"><?php echo _("Reset password") ?></a>
-    </dd>
-<!--    --><?php //endif; ?>
+    <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
+      <dt id="reset-label" class="hidden">&nbsp;</dt>
+      <dd id="reset-element" class="text-right">
+        <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset"><?php echo _("Reset password") ?></a>
+      </dd>
+    <?php endif; ?>
     <?php echo $this->element->getElement('captcha') ?>
     <dt id="submit-label">&nbsp;</dt>
     <dd id="submit-element">