Skip to content
Snippets Groups Projects
Commit bbeeeda7 authored by Demian Katz's avatar Demian Katz
Browse files

Style fix; reduced redundancy.

parent 5b9bedc8
No related merge requests found
...@@ -365,14 +365,15 @@ class AbstractRecord extends AbstractBase ...@@ -365,14 +365,15 @@ class AbstractRecord extends AbstractBase
if ($this->formWasSubmitted('submit', $view->useRecaptcha)) { if ($this->formWasSubmitted('submit', $view->useRecaptcha)) {
// Attempt to send the email and show an appropriate flash message: // Attempt to send the email and show an appropriate flash message:
try { try {
$this->getServiceLocator()->get('VuFind\Mailer')->sendRecord( $mailer = $this->getServiceLocator()->get('VuFind\Mailer');
$mailer->sendRecord(
$view->to, $view->from, $view->message, $driver, $view->to, $view->from, $view->message, $driver,
$this->getViewRenderer() $this->getViewRenderer()
); );
if ($this->params()->fromPost('ccself') if ($this->params()->fromPost('ccself')
&& $view->from != $view->to && $view->from != $view->to
) { ) {
$this->getServiceLocator()->get('VuFind\Mailer')->sendRecord( $mailer->sendRecord(
$view->from, $view->from, $view->message, $driver, $view->from, $view->from, $view->message, $driver,
$this->getViewRenderer() $this->getViewRenderer()
); );
......
...@@ -1032,14 +1032,15 @@ class AjaxController extends AbstractBase ...@@ -1032,14 +1032,15 @@ class AjaxController extends AbstractBase
$this->params()->fromPost('source', 'VuFind') $this->params()->fromPost('source', 'VuFind')
); );
$view = $this->createEmailViewModel(); $view = $this->createEmailViewModel();
$this->getServiceLocator()->get('VuFind\Mailer')->sendRecord( $mailer = $this->getServiceLocator()->get('VuFind\Mailer');
$mailer->sendRecord(
$view->to, $view->from, $view->message, $record, $view->to, $view->from, $view->message, $record,
$this->getViewRenderer() $this->getViewRenderer()
); );
if ($this->params()->fromPost('ccself') if ($this->params()->fromPost('ccself')
&& $view->from != $view->to && $view->from != $view->to
) { ) {
$this->getServiceLocator()->get('VuFind\Mailer')->sendRecord( $mailer->sendRecord(
$view->from, $view->from, $view->message, $record, $view->from, $view->from, $view->message, $record,
$this->getViewRenderer() $this->getViewRenderer()
); );
......
...@@ -216,14 +216,15 @@ class CartController extends AbstractBase ...@@ -216,14 +216,15 @@ class CartController extends AbstractBase
// Attempt to send the email and show an appropriate flash message: // Attempt to send the email and show an appropriate flash message:
try { try {
// If we got this far, we're ready to send the email: // If we got this far, we're ready to send the email:
$this->getServiceLocator()->get('VuFind\Mailer')->sendLink( $mailer = $this->getServiceLocator()->get('VuFind\Mailer');
$mailer->sendLink(
$view->to, $view->from, $view->message, $view->to, $view->from, $view->message,
$url, $this->getViewRenderer(), 'bulk_email_title' $url, $this->getViewRenderer(), 'bulk_email_title'
); );
if ($this->params()->fromPost('ccself') if ($this->params()->fromPost('ccself')
&& $view->from != $view->to && $view->from != $view->to
) { ) {
$this->getServiceLocator()->get('VuFind\Mailer')->sendLink( $mailer->sendLink(
$view->from, $view->from, $view->message, $view->from, $view->from, $view->message,
$url, $this->getViewRenderer(), 'bulk_email_title' $url, $this->getViewRenderer(), 'bulk_email_title'
); );
......
...@@ -113,16 +113,17 @@ class SearchController extends AbstractSearch ...@@ -113,16 +113,17 @@ class SearchController extends AbstractSearch
// Attempt to send the email and show an appropriate flash message: // Attempt to send the email and show an appropriate flash message:
try { try {
// If we got this far, we're ready to send the email: // If we got this far, we're ready to send the email:
$this->getServiceLocator()->get('VuFind\Mailer')->sendLink( $mailer = $this->getServiceLocator()->get('VuFind\Mailer');
$mailer->sendLink(
$view->to, $view->from, $view->message, $view->to, $view->from, $view->message,
$view->url, $this->getViewRenderer() $view->url, $this->getViewRenderer()
); );
if ($this->params()->fromPost('ccself') if ($this->params()->fromPost('ccself')
&& $view->from != $view->to && $view->from != $view->to
) { ) {
$this->getServiceLocator()->get('VuFind\Mailer')->sendLink( $mailer->sendLink(
$view->from, $view->from, $view->message, $view->from, $view->from, $view->message,
$view->url, $this->getViewRenderer() $view->url, $this->getViewRenderer()
); );
} }
$this->flashMessenger()->setNamespace('info') $this->flashMessenger()->setNamespace('info')
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment