Skip to content

Use STMP Pro Extension #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
igorppbr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use STMP Pro Extension #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/module/Model/Outbox/Email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
*
* @version {{version}}
* @version 0.4.10
* @category Mzax
* @package Mzax_Emarketing
* @author Jacob Siefer (jacob@mzax.de)
Expand Down Expand Up @@ -584,10 +584,13 @@ protected function _prepareTransporter()
$store = $this->getCampaign()->getStore();

$transporter = Mage::getStoreConfig('mzax_emarketing/email/transporter', $store);

$isSMTPpro = Mage::getStoreConfig('mzax_emarketing/email/use_smtppro', $store);
if($isSMTPpro==1)
$transporter = "smtpro";

$transporter = Mage::getSingleton('mzax_emarketing/outbox_transporter')->factory($transporter);
$transporter->setup($this);



$wrapper = new Varien_Object();
$wrapper->setTransporter($transporter);
Mage::dispatchEvent('mzax_emarketing_email_prepare_transport', array(
Expand Down
50 changes: 30 additions & 20 deletions src/module/Model/Outbox/Transporter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
*
* @version {{version}}
* @version 0.4.10
* @category Mzax
* @package Mzax_Emarketing
* @author Jacob Siefer (jacob@mzax.de)
Expand All @@ -33,27 +33,37 @@ class Mzax_Emarketing_Model_Outbox_Transporter
*/
public function factory($name)
{
$config = $this->getConfig();
if(!isset($config->$name)) {
throw new Exception("No such email transporter found ({$name})");
}
$config = $config->$name;


$transporterClass = $config->getClassName();

if(!class_exists($transporterClass)) {
throw new Exception("Email transporter config found, but model ($transporterClass) was not found");

//Se não for pra disparar pelo SMTP PRO
if($name!="smtpro") {

$config = $this->getConfig();

if (!isset($config->$name)) {
throw new Exception("No such email transporter found ({$name})");
}
$config = $config->$name;

$transporterClass = $config->getClassName();

if (!class_exists($transporterClass)) {
throw new Exception("Email transporter config found, but model ($transporterClass) was not found");
}

/* @var $transporter Mzax_Emarketing_Model_Outbox_Transporter_Interface */
$transporter = new $transporterClass;

if (!$transporter instanceof Mzax_Emarketing_Model_Outbox_Transporter_Interface) {
throw new Exception("Email transporter '{$name}' must implement 'Mzax_Emarketing_Model_Outbox_Email_Transporter_Interface'");
}

return $transporter;
}

/* @var $transporter Mzax_Emarketing_Model_Outbox_Transporter_Interface */
$transporter = new $transporterClass;

if(!$transporter instanceof Mzax_Emarketing_Model_Outbox_Transporter_Interface) {
throw new Exception("Email transporter '{$name}' must implement 'Mzax_Emarketing_Model_Outbox_Email_Transporter_Interface'");
else{
$helperSMTP = Mage::helper('smtppro/data');
$transporter = $helperSMTP->getTransport();
return $transporter;
}

return $transporter;
}


Expand Down
2 changes: 1 addition & 1 deletion src/module/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
*
* @version {{version}}
* @version 0.4.10
* @category Mzax
* @package Mzax_Emarketing
* @author Jacob Siefer (jacob@mzax.de)
Expand Down