Version Notes
0.2.1 Modify for 1.5 and 1.6
0.2.0 Add External SMTP Server setting
0.1.6 Add Sender Name Encoding
0.1.5 Separate Text and HTML mail encode.
Add Return-Path
Add Reply-To
0.1.4 Fix system.xml
0.1.3 Fix bcc problem
Add Newsletter/Template.php
0.1.2 Fix Bug.
Download this release
Release Info
| Developer | Hirokazu Nishi |
| Extension | Rack_Jpmail |
| Version | 0.2.1 |
| Comparing to | |
| See all releases | |
Code changes from version 0.2.0 to 0.2.1
- app/code/community/Rack/Jpmail/Model/Email/Template.php +88 -70
- app/code/community/Rack/Jpmail/Model/Newsletter/Template.php +19 -6
- app/code/community/Rack/Jpmail/Model/Newsletter/php_errors.log +1 -0
- app/code/community/Rack/Jpmail/etc/config.xml +1 -15
- app/code/community/Rack/Jpmail/etc/system.xml +88 -159
- app/locale/en_US/Rack_Jpmail.csv +0 -8
- package.xml +18 -18
app/code/community/Rack/Jpmail/Model/Email/Template.php
CHANGED
|
@@ -1,73 +1,93 @@
|
|
| 1 |
<?php
|
| 2 |
-
|
| 3 |
-
{
|
| 4 |
-
|
| 5 |
-
{
|
| 6 |
-
if(!$this->isValidForSend()) {
|
|
|
|
| 7 |
return false;
|
| 8 |
}
|
| 9 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 10 |
$textencode = Mage::getStoreConfig('jpmail/jpmail/text_charset');
|
| 11 |
$htmlencode = Mage::getStoreConfig('jpmail/jpmail/html_charset');
|
| 12 |
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
| 23 |
-
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
}
|
| 30 |
-
}
|
| 31 |
-
} else {
|
| 32 |
-
if($this->isPlain()) {
|
| 33 |
-
$mail->addTo($email, mb_encode_mimeheader(mb_convert_encoding($name, $textencode, 'utf-8')));
|
| 34 |
-
} else {
|
| 35 |
-
$mail->addTo($email, mb_encode_mimeheader(mb_convert_encoding($name, $htmlencode, 'utf-8')));
|
| 36 |
-
}
|
| 37 |
-
}
|
| 38 |
-
|
| 39 |
-
$this->setUseAbsoluteLinks(true);
|
| 40 |
-
$text = $this->getProcessedTemplate($variables, true);
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
if($this->isPlain()) {
|
| 44 |
-
$mail->setBodyText(mb_convert_encoding($text, $textencode, 'utf-8'));
|
| 45 |
-
$subject = mb_convert_encoding($this->getProcessedTemplateSubject($variables), $textencode, 'utf-8');
|
| 46 |
-
$mail->setFrom($this->getSenderEmail(), mb_encode_mimeheader(mb_convert_encoding($this->getSenderName(), $textencode, 'utf-8')));
|
| 47 |
} else {
|
| 48 |
-
$mail->
|
| 49 |
-
$subject = mb_convert_encoding($this->getProcessedTemplateSubject($variables), $htmlencode, 'utf-8');
|
| 50 |
-
$mail->setFrom($this->getSenderEmail(), mb_encode_mimeheader(mb_convert_encoding($this->getSenderName(), $htmlencode, 'utf-8')));
|
| 51 |
}
|
|
|
|
| 52 |
|
| 53 |
-
|
| 54 |
-
|
| 55 |
-
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 62 |
}
|
| 63 |
-
|
| 64 |
-
public function getMail()
|
| 65 |
-
{
|
| 66 |
$textencode = Mage::getStoreConfig('jpmail/jpmail/text_charset');
|
| 67 |
$htmlencode = Mage::getStoreConfig('jpmail/jpmail/html_charset');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 68 |
|
| 69 |
-
if(Mage::getStoreConfig('extsmtp/extsmtp/use_external') == 0 &&
|
| 70 |
-
$tr = new Zend_Mail_Transport_Sendmail('-f'
|
| 71 |
Zend_Mail::setDefaultTransport($tr);
|
| 72 |
}
|
| 73 |
|
|
@@ -87,40 +107,38 @@ class Rack_Jpmail_Model_Email_Template extends Mage_Core_Model_Email_Template
|
|
| 87 |
}
|
| 88 |
|
| 89 |
if (is_null($this->_mail)) {
|
| 90 |
-
if($this->isPlain()) {
|
| 91 |
$this->_mail = new Zend_Mail($textencode);
|
| 92 |
} else {
|
| 93 |
$this->_mail = new Zend_Mail($htmlencode);
|
| 94 |
}
|
| 95 |
} else {
|
| 96 |
-
if($this->isPlain() && ($this->_mail->getCharset() !== $textencode)) {
|
| 97 |
$this->_mail = new Zend_Mail($textencode);
|
| 98 |
-
$this->addBcc($this->bcc);
|
| 99 |
} elseif (!$this->isPlain() && ($this->_mail->getCharset() !== $htmlencode)) {
|
| 100 |
$this->_mail = new Zend_Mail($htmlencode);
|
| 101 |
-
$this->addBcc($this->bcc);
|
| 102 |
}
|
| 103 |
}
|
| 104 |
-
|
| 105 |
-
|
| 106 |
-
|
|
|
|
|
|
|
| 107 |
}
|
| 108 |
|
| 109 |
return $this->_mail;
|
| 110 |
}
|
| 111 |
|
| 112 |
-
public function addBcc($bcc)
|
| 113 |
-
{
|
| 114 |
if (is_array($bcc)) {
|
| 115 |
foreach ($bcc as $email) {
|
| 116 |
-
|
| 117 |
-
$this->getMail()->addBcc($email);
|
| 118 |
-
}
|
| 119 |
}
|
| 120 |
-
} elseif ($bcc
|
| 121 |
$this->getMail()->addBcc($bcc);
|
| 122 |
}
|
| 123 |
-
|
| 124 |
$this->bcc = $bcc;
|
| 125 |
return $this;
|
| 126 |
}
|
| 1 |
<?php
|
| 2 |
+
|
| 3 |
+
class Rack_Jpmail_Model_Email_Template extends Mage_Core_Model_Email_Template {
|
| 4 |
+
|
| 5 |
+
public function send($email, $name=null, array $variables = array()) {
|
| 6 |
+
if (!$this->isValidForSend()) {
|
| 7 |
+
Mage::logException(new Exception('This letter cannot be sent.')); // translation is intentionally omitted
|
| 8 |
return false;
|
| 9 |
}
|
| 10 |
|
| 11 |
+
$emails = array_values((array) $email);
|
| 12 |
+
$names = is_array($name) ? $name : (array) $name;
|
| 13 |
+
$names = array_values($names);
|
| 14 |
+
foreach ($emails as $key => $email) {
|
| 15 |
+
if (!isset($names[$key])) {
|
| 16 |
+
$names[$key] = substr($email, 0, strpos($email, '@'));
|
| 17 |
+
}
|
| 18 |
+
}
|
| 19 |
+
|
| 20 |
$textencode = Mage::getStoreConfig('jpmail/jpmail/text_charset');
|
| 21 |
$htmlencode = Mage::getStoreConfig('jpmail/jpmail/html_charset');
|
| 22 |
|
| 23 |
+
$variables['email'] = reset($emails);
|
| 24 |
+
$variables['name'] = reset($names);
|
| 25 |
+
|
| 26 |
+
ini_set('SMTP', Mage::getStoreConfig('system/smtp/host'));
|
| 27 |
+
ini_set('smtp_port', Mage::getStoreConfig('system/smtp/port'));
|
| 28 |
+
$mail = $this->getMail();
|
| 29 |
+
|
| 30 |
+
//if ($returnPathEmail !== null) {
|
| 31 |
+
// $mailTransport = new Zend_Mail_Transport_Sendmail("-f".$returnPathEmail);
|
| 32 |
+
// Zend_Mail::setDefaultTransport($mailTransport);
|
| 33 |
+
//}
|
| 34 |
+
|
| 35 |
+
|
| 36 |
+
foreach ($emails as $key => $email) {
|
| 37 |
+
if ($this->isPlain()) {
|
| 38 |
+
$mail->addTo($email, mb_encode_mimeheader(mb_convert_encoding($names[$key], $textencode, 'utf-8')));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
} else {
|
| 40 |
+
$mail->addTo($email, mb_encode_mimeheader(mb_convert_encoding($names[$key], $htmlencode, 'utf-8')));
|
|
|
|
|
|
|
| 41 |
}
|
| 42 |
+
}
|
| 43 |
|
| 44 |
+
$this->setUseAbsoluteLinks(true);
|
| 45 |
+
$text = $this->getProcessedTemplate($variables, true);
|
| 46 |
+
|
| 47 |
+
|
| 48 |
+
if ($this->isPlain()) {
|
| 49 |
+
$mail->setBodyText(mb_convert_encoding($text, $textencode, 'utf-8'));
|
| 50 |
+
$subject = mb_convert_encoding($this->getProcessedTemplateSubject($variables), $textencode, 'utf-8');
|
| 51 |
+
$mail->setFrom($this->getSenderEmail(), mb_encode_mimeheader(mb_convert_encoding($this->getSenderName(), $textencode, 'utf-8')));
|
| 52 |
+
} else {
|
| 53 |
+
$mail->setBodyHTML(mb_convert_encoding($text, $htmlencode, 'utf-8'));
|
| 54 |
+
$subject = mb_convert_encoding($this->getProcessedTemplateSubject($variables), $htmlencode, 'utf-8');
|
| 55 |
+
$mail->setFrom($this->getSenderEmail(), mb_encode_mimeheader(mb_convert_encoding($this->getSenderName(), $htmlencode, 'utf-8')));
|
| 56 |
+
}
|
| 57 |
+
|
| 58 |
+
$mail->setSubject($subject);
|
| 59 |
+
|
| 60 |
+
try {
|
| 61 |
+
$mail->send(); // Zend_Mail warning..
|
| 62 |
+
$this->_mail = null;
|
| 63 |
+
} catch (Exception $e) {
|
| 64 |
+
$this->_mail = null;
|
| 65 |
+
Mage::logException($e);
|
| 66 |
+
return false;
|
| 67 |
+
}
|
| 68 |
+
return true;
|
| 69 |
}
|
| 70 |
+
|
| 71 |
+
public function getMail() {
|
|
|
|
| 72 |
$textencode = Mage::getStoreConfig('jpmail/jpmail/text_charset');
|
| 73 |
$htmlencode = Mage::getStoreConfig('jpmail/jpmail/html_charset');
|
| 74 |
+
|
| 75 |
+
$setReturnPath = Mage::getStoreConfig(Mage_Core_Model_Email_Template::XML_PATH_SENDING_SET_RETURN_PATH);
|
| 76 |
+
$returnPathEmail = '';
|
| 77 |
+
switch ($setReturnPath) {
|
| 78 |
+
case 1:
|
| 79 |
+
$returnPathEmail = $this->getSenderEmail();
|
| 80 |
+
break;
|
| 81 |
+
case 2:
|
| 82 |
+
$returnPathEmail = Mage::getStoreConfig(Mage_Core_Model_Email_Template::XML_PATH_SENDING_RETURN_PATH_EMAIL);
|
| 83 |
+
break;
|
| 84 |
+
default:
|
| 85 |
+
$returnPathEmail = '';
|
| 86 |
+
break;
|
| 87 |
+
}
|
| 88 |
|
| 89 |
+
if(Mage::getStoreConfig('extsmtp/extsmtp/use_external') == 0 && $returnPathEmail !== '') {
|
| 90 |
+
$tr = new Zend_Mail_Transport_Sendmail('-f'.$returnPathEmail);
|
| 91 |
Zend_Mail::setDefaultTransport($tr);
|
| 92 |
}
|
| 93 |
|
| 107 |
}
|
| 108 |
|
| 109 |
if (is_null($this->_mail)) {
|
| 110 |
+
if ($this->isPlain()) {
|
| 111 |
$this->_mail = new Zend_Mail($textencode);
|
| 112 |
} else {
|
| 113 |
$this->_mail = new Zend_Mail($htmlencode);
|
| 114 |
}
|
| 115 |
} else {
|
| 116 |
+
if ($this->isPlain() && ($this->_mail->getCharset() !== $textencode)) {
|
| 117 |
$this->_mail = new Zend_Mail($textencode);
|
| 118 |
+
$this->_mail->addBcc($this->bcc);
|
| 119 |
} elseif (!$this->isPlain() && ($this->_mail->getCharset() !== $htmlencode)) {
|
| 120 |
$this->_mail = new Zend_Mail($htmlencode);
|
| 121 |
+
$this->_mail->addBcc($this->bcc);
|
| 122 |
}
|
| 123 |
}
|
| 124 |
+
if($returnPathEmail !== '') {
|
| 125 |
+
$this->_mail->setReturnPath($returnPathEmail);
|
| 126 |
+
}
|
| 127 |
+
if (Mage::getStoreConfig('jpmail/jpmail/use_reply_to')) {
|
| 128 |
+
$this->_mail->setReplyTo(Mage::getStoreConfig('jpmail/jpmail/reply_to'));
|
| 129 |
}
|
| 130 |
|
| 131 |
return $this->_mail;
|
| 132 |
}
|
| 133 |
|
| 134 |
+
public function addBcc($bcc) {
|
|
|
|
| 135 |
if (is_array($bcc)) {
|
| 136 |
foreach ($bcc as $email) {
|
| 137 |
+
$this->getMail()->addBcc($email);
|
|
|
|
|
|
|
| 138 |
}
|
| 139 |
+
} elseif ($bcc) {
|
| 140 |
$this->getMail()->addBcc($bcc);
|
| 141 |
}
|
|
|
|
| 142 |
$this->bcc = $bcc;
|
| 143 |
return $this;
|
| 144 |
}
|
app/code/community/Rack/Jpmail/Model/Newsletter/Template.php
CHANGED
|
@@ -5,9 +5,22 @@ class Rack_Jpmail_Model_Newsletter_Template extends Mage_Newsletter_Model_Templa
|
|
| 5 |
{
|
| 6 |
$textencode = Mage::getStoreConfig('jpmail/jpmail/text_charset');
|
| 7 |
$htmlencode = Mage::getStoreConfig('jpmail/jpmail/html_charset');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 8 |
|
| 9 |
-
if(Mage::getStoreConfig('extsmtp/extsmtp/use_external') == 0 &&
|
| 10 |
-
$tr = new Zend_Mail_Transport_Sendmail('-f'
|
| 11 |
Zend_Mail::setDefaultTransport($tr);
|
| 12 |
}
|
| 13 |
|
|
@@ -41,12 +54,12 @@ class Rack_Jpmail_Model_Newsletter_Template extends Mage_Newsletter_Model_Templa
|
|
| 41 |
$this->_mail->addBcc($this->bcc);
|
| 42 |
}
|
| 43 |
}
|
| 44 |
-
|
| 45 |
-
if(Mage::getStoreConfig(
|
| 46 |
-
$this->_mail->setReturnPath(
|
| 47 |
}
|
| 48 |
if(Mage::getStoreConfig('jpmail/jpmail/use_reply_to')) {
|
| 49 |
-
|
| 50 |
}
|
| 51 |
|
| 52 |
return $this->_mail;
|
| 5 |
{
|
| 6 |
$textencode = Mage::getStoreConfig('jpmail/jpmail/text_charset');
|
| 7 |
$htmlencode = Mage::getStoreConfig('jpmail/jpmail/html_charset');
|
| 8 |
+
|
| 9 |
+
$setReturnPath = Mage::getStoreConfig(Mage_Core_Model_Email_Template::XML_PATH_SENDING_SET_RETURN_PATH);
|
| 10 |
+
switch ($setReturnPath) {
|
| 11 |
+
case 1:
|
| 12 |
+
$returnPathEmail = $this->getSenderEmail();
|
| 13 |
+
break;
|
| 14 |
+
case 2:
|
| 15 |
+
$returnPathEmail = Mage::getStoreConfig(Mage_Core_Model_Email_Template::XML_PATH_SENDING_RETURN_PATH_EMAIL);
|
| 16 |
+
break;
|
| 17 |
+
default:
|
| 18 |
+
$returnPathEmail = null;
|
| 19 |
+
break;
|
| 20 |
+
}
|
| 21 |
|
| 22 |
+
if(Mage::getStoreConfig('extsmtp/extsmtp/use_external') == 0 && $returnPathEmail !== null) {
|
| 23 |
+
$tr = new Zend_Mail_Transport_Sendmail('-f'.$returnPathEmail);
|
| 24 |
Zend_Mail::setDefaultTransport($tr);
|
| 25 |
}
|
| 26 |
|
| 54 |
$this->_mail->addBcc($this->bcc);
|
| 55 |
}
|
| 56 |
}
|
| 57 |
+
|
| 58 |
+
if(Mage::getStoreConfig(Mage_Core_Model_Email_Template::XML_PATH_SENDING_SET_RETURN_PATH)) {
|
| 59 |
+
$this->_mail->setReturnPath($returnPathEmail);
|
| 60 |
}
|
| 61 |
if(Mage::getStoreConfig('jpmail/jpmail/use_reply_to')) {
|
| 62 |
+
$this->_mail->setReplyTo(Mage::getStoreConfig('jpmail/jpmail/reply_to'));
|
| 63 |
}
|
| 64 |
|
| 65 |
return $this->_mail;
|
app/code/community/Rack/Jpmail/Model/Newsletter/php_errors.log
ADDED
|
@@ -0,0 +1 @@
|
|
|
|
| 1 |
+
[11-Nov-2011 16:01:15] PHP Parse error: syntax error, unexpected T_STRING in Template.php on line 58
|
app/code/community/Rack/Jpmail/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Rack_Jpmail>
|
| 5 |
-
<version>0.
|
| 6 |
</Rack_Jpmail>
|
| 7 |
</modules>
|
| 8 |
<global>
|
|
@@ -47,9 +47,6 @@
|
|
| 47 |
<jpmail>
|
| 48 |
<title>Multibyte email Setting</title>
|
| 49 |
</jpmail>
|
| 50 |
-
<extsmtp>
|
| 51 |
-
<title>External SMTP Setting</title>
|
| 52 |
-
</extsmtp>
|
| 53 |
</children>
|
| 54 |
</config>
|
| 55 |
</children>
|
|
@@ -65,9 +62,6 @@
|
|
| 65 |
<jpmail>
|
| 66 |
<title>Multibyte email Setting</title>
|
| 67 |
</jpmail>
|
| 68 |
-
<extsmtp>
|
| 69 |
-
<title>External SMTP Setting</title>
|
| 70 |
-
</extsmtp>
|
| 71 |
</children>
|
| 72 |
</config>
|
| 73 |
</children>
|
|
@@ -81,14 +75,6 @@
|
|
| 81 |
<use_return_path>0</use_return_path>
|
| 82 |
<use_reply_to>0</use_reply_to>
|
| 83 |
</jpmail>
|
| 84 |
-
<extsmtp>
|
| 85 |
-
<use_external>0</use_external>
|
| 86 |
-
<smtp_host></smtp_host>
|
| 87 |
-
<smtp_port></smtp_port>
|
| 88 |
-
<smtp_secure>0</smtp_secure>
|
| 89 |
-
<smtp_user></smtp_user>
|
| 90 |
-
<smtp_password></smtp_password>
|
| 91 |
-
</extsmtp>
|
| 92 |
</jpmail>
|
| 93 |
</default>
|
| 94 |
</config>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Rack_Jpmail>
|
| 5 |
+
<version>0.1.5</version>
|
| 6 |
</Rack_Jpmail>
|
| 7 |
</modules>
|
| 8 |
<global>
|
| 47 |
<jpmail>
|
| 48 |
<title>Multibyte email Setting</title>
|
| 49 |
</jpmail>
|
|
|
|
|
|
|
|
|
|
| 50 |
</children>
|
| 51 |
</config>
|
| 52 |
</children>
|
| 62 |
<jpmail>
|
| 63 |
<title>Multibyte email Setting</title>
|
| 64 |
</jpmail>
|
|
|
|
|
|
|
|
|
|
| 65 |
</children>
|
| 66 |
</config>
|
| 67 |
</children>
|
| 75 |
<use_return_path>0</use_return_path>
|
| 76 |
<use_reply_to>0</use_reply_to>
|
| 77 |
</jpmail>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 78 |
</jpmail>
|
| 79 |
</default>
|
| 80 |
</config>
|
app/code/community/Rack/Jpmail/etc/system.xml
CHANGED
|
@@ -1,159 +1,88 @@
|
|
| 1 |
-
<?xml version="1.0"?>
|
| 2 |
-
<config>
|
| 3 |
-
<tabs>
|
| 4 |
-
<jpmail translate="label" module="jpmail">
|
| 5 |
-
<label>multibyte email setting</label>
|
| 6 |
-
<sort_order>400</sort_order>
|
| 7 |
-
</jpmail>
|
| 8 |
-
</tabs>
|
| 9 |
-
<sections>
|
| 10 |
-
<jpmail translate="label" module="jpmail">
|
| 11 |
-
<label>Multibyte Email Settings</label>
|
| 12 |
-
<tab>jpmail</tab>
|
| 13 |
-
<frontend_type>text</frontend_type>
|
| 14 |
-
<sort_order>120</sort_order>
|
| 15 |
-
<show_in_default>1</show_in_default>
|
| 16 |
-
<show_in_website>1</show_in_website>
|
| 17 |
-
<show_in_store>1</show_in_store>
|
| 18 |
-
<groups>
|
| 19 |
-
<jpmail translate="label">
|
| 20 |
-
<label>Multibyte Email Settings</label>
|
| 21 |
-
<frontend_type>text</frontend_type>
|
| 22 |
-
<sort_order>10</sort_order>
|
| 23 |
-
<show_in_default>1</show_in_default>
|
| 24 |
-
<show_in_website>1</show_in_website>
|
| 25 |
-
<show_in_store>1</show_in_store>
|
| 26 |
-
<fields>
|
| 27 |
-
<text_charset translate="label">
|
| 28 |
-
<label>text mail character set</label>
|
| 29 |
-
<frontend_type>text</frontend_type>
|
| 30 |
-
<sort_order>10</sort_order>
|
| 31 |
-
<show_in_default>1</show_in_default>
|
| 32 |
-
<show_in_website>1</show_in_website>
|
| 33 |
-
<show_in_store>1</show_in_store>
|
| 34 |
-
</text_charset>
|
| 35 |
-
<html_charset translate="label">
|
| 36 |
-
<label>html mail character set</label>
|
| 37 |
-
<frontend_type>text</frontend_type>
|
| 38 |
-
<sort_order>10</sort_order>
|
| 39 |
-
<show_in_default>1</show_in_default>
|
| 40 |
-
<show_in_website>1</show_in_website>
|
| 41 |
-
<show_in_store>1</show_in_store>
|
| 42 |
-
</html_charset>
|
| 43 |
-
<use_return_path translate="label">
|
| 44 |
-
<label>use return path</label>
|
| 45 |
-
<frontend_type>select</frontend_type>
|
| 46 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 47 |
-
<sort_order>12</sort_order>
|
| 48 |
-
<show_in_default>1</show_in_default>
|
| 49 |
-
<show_in_website>1</show_in_website>
|
| 50 |
-
<show_in_store>1</show_in_store>
|
| 51 |
-
</use_return_path>
|
| 52 |
-
<return_path translate="label">
|
| 53 |
-
<label>return path</label>
|
| 54 |
-
<frontend_type>text</frontend_type>
|
| 55 |
-
<sort_order>13</sort_order>
|
| 56 |
-
<show_in_default>1</show_in_default>
|
| 57 |
-
<show_in_website>1</show_in_website>
|
| 58 |
-
<show_in_store>1</show_in_store>
|
| 59 |
-
<depends>
|
| 60 |
-
<use_return_path>1</use_return_path>
|
| 61 |
-
</depends>
|
| 62 |
-
</return_path>
|
| 63 |
-
<use_reply_to translate="label">
|
| 64 |
-
<label>use reply to</label>
|
| 65 |
-
<frontend_type>select</frontend_type>
|
| 66 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 67 |
-
<sort_order>14</sort_order>
|
| 68 |
-
<show_in_default>1</show_in_default>
|
| 69 |
-
<show_in_website>1</show_in_website>
|
| 70 |
-
<show_in_store>1</show_in_store>
|
| 71 |
-
</use_reply_to>
|
| 72 |
-
<reply_to translate="label">
|
| 73 |
-
<label>reply to</label>
|
| 74 |
-
<frontend_type>text</frontend_type>
|
| 75 |
-
<sort_order>15</sort_order>
|
| 76 |
-
<show_in_default>1</show_in_default>
|
| 77 |
-
<show_in_website>1</show_in_website>
|
| 78 |
-
<show_in_store>1</show_in_store>
|
| 79 |
-
<depends>
|
| 80 |
-
<use_reply_to>1</use_reply_to>
|
| 81 |
-
</depends>
|
| 82 |
-
</reply_to>
|
| 83 |
-
</fields>
|
| 84 |
-
</jpmail>
|
| 85 |
-
</groups>
|
| 86 |
-
</jpmail>
|
| 87 |
-
|
| 88 |
-
|
| 89 |
-
<tab>jpmail</tab>
|
| 90 |
-
<frontend_type>text</frontend_type>
|
| 91 |
-
<sort_order>130</sort_order>
|
| 92 |
-
<show_in_default>1</show_in_default>
|
| 93 |
-
<show_in_website>1</show_in_website>
|
| 94 |
-
<show_in_store>1</show_in_store>
|
| 95 |
-
<groups>
|
| 96 |
-
<extsmtp translate="label">
|
| 97 |
-
<label>External Smtp Settings</label>
|
| 98 |
-
<frontend_type>text</frontend_type>
|
| 99 |
-
<sort_order>10</sort_order>
|
| 100 |
-
<show_in_default>1</show_in_default>
|
| 101 |
-
<show_in_website>1</show_in_website>
|
| 102 |
-
<show_in_store>1</show_in_store>
|
| 103 |
-
<fields>
|
| 104 |
-
<use_external translate="label">
|
| 105 |
-
<label>Use External SMTP</label>
|
| 106 |
-
<frontend_type>select</frontend_type>
|
| 107 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 108 |
-
<sort_order>10</sort_order>
|
| 109 |
-
<show_in_default>1</show_in_default>
|
| 110 |
-
<show_in_website>1</show_in_website>
|
| 111 |
-
<show_in_store>1</show_in_store>
|
| 112 |
-
</use_external>
|
| 113 |
-
<smtp_host translate="label">
|
| 114 |
-
<label>SMTP Host</label>
|
| 115 |
-
<frontend_type>text</frontend_type>
|
| 116 |
-
<sort_order>11</sort_order>
|
| 117 |
-
<show_in_default>1</show_in_default>
|
| 118 |
-
<show_in_website>1</show_in_website>
|
| 119 |
-
<show_in_store>1</show_in_store>
|
| 120 |
-
</smtp_host>
|
| 121 |
-
<smtp_port translate="label">
|
| 122 |
-
<label>SMTP Port</label>
|
| 123 |
-
<frontend_type>text</frontend_type>
|
| 124 |
-
<sort_order>12</sort_order>
|
| 125 |
-
<show_in_default>1</show_in_default>
|
| 126 |
-
<show_in_website>1</show_in_website>
|
| 127 |
-
<show_in_store>1</show_in_store>
|
| 128 |
-
</smtp_port>
|
| 129 |
-
<smtp_secure translate="label">
|
| 130 |
-
<label>Use SSL</label>
|
| 131 |
-
<frontend_type>select</frontend_type>
|
| 132 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 133 |
-
<sort_order>13</sort_order>
|
| 134 |
-
<show_in_default>1</show_in_default>
|
| 135 |
-
<show_in_website>1</show_in_website>
|
| 136 |
-
<show_in_store>1</show_in_store>
|
| 137 |
-
</smtp_secure>
|
| 138 |
-
<smtp_user translate="label">
|
| 139 |
-
<label>SMTP User</label>
|
| 140 |
-
<frontend_type>text</frontend_type>
|
| 141 |
-
<sort_order>14</sort_order>
|
| 142 |
-
<show_in_default>1</show_in_default>
|
| 143 |
-
<show_in_website>1</show_in_website>
|
| 144 |
-
<show_in_store>1</show_in_store>
|
| 145 |
-
</smtp_user>
|
| 146 |
-
<smtp_password translate="label">
|
| 147 |
-
<label>SMTP Password</label>
|
| 148 |
-
<frontend_type>password</frontend_type>
|
| 149 |
-
<sort_order>15</sort_order>
|
| 150 |
-
<show_in_default>1</show_in_default>
|
| 151 |
-
<show_in_website>1</show_in_website>
|
| 152 |
-
<show_in_store>1</show_in_store>
|
| 153 |
-
</smtp_password>
|
| 154 |
-
</fields>
|
| 155 |
-
</extsmtp>
|
| 156 |
-
</groups>
|
| 157 |
-
</extsmtp>
|
| 158 |
-
</sections>
|
| 159 |
-
</config>
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<config>
|
| 3 |
+
<tabs>
|
| 4 |
+
<jpmail translate="label" module="jpmail">
|
| 5 |
+
<label>multibyte email setting</label>
|
| 6 |
+
<sort_order>400</sort_order>
|
| 7 |
+
</jpmail>
|
| 8 |
+
</tabs>
|
| 9 |
+
<sections>
|
| 10 |
+
<jpmail translate="label" module="jpmail">
|
| 11 |
+
<label>Multibyte Email Settings</label>
|
| 12 |
+
<tab>jpmail</tab>
|
| 13 |
+
<frontend_type>text</frontend_type>
|
| 14 |
+
<sort_order>120</sort_order>
|
| 15 |
+
<show_in_default>1</show_in_default>
|
| 16 |
+
<show_in_website>1</show_in_website>
|
| 17 |
+
<show_in_store>1</show_in_store>
|
| 18 |
+
<groups>
|
| 19 |
+
<jpmail translate="label">
|
| 20 |
+
<label>Multibyte Email Settings</label>
|
| 21 |
+
<frontend_type>text</frontend_type>
|
| 22 |
+
<sort_order>10</sort_order>
|
| 23 |
+
<show_in_default>1</show_in_default>
|
| 24 |
+
<show_in_website>1</show_in_website>
|
| 25 |
+
<show_in_store>1</show_in_store>
|
| 26 |
+
<fields>
|
| 27 |
+
<text_charset translate="label">
|
| 28 |
+
<label>text mail character set</label>
|
| 29 |
+
<frontend_type>text</frontend_type>
|
| 30 |
+
<sort_order>10</sort_order>
|
| 31 |
+
<show_in_default>1</show_in_default>
|
| 32 |
+
<show_in_website>1</show_in_website>
|
| 33 |
+
<show_in_store>1</show_in_store>
|
| 34 |
+
</text_charset>
|
| 35 |
+
<html_charset translate="label">
|
| 36 |
+
<label>html mail character set</label>
|
| 37 |
+
<frontend_type>text</frontend_type>
|
| 38 |
+
<sort_order>10</sort_order>
|
| 39 |
+
<show_in_default>1</show_in_default>
|
| 40 |
+
<show_in_website>1</show_in_website>
|
| 41 |
+
<show_in_store>1</show_in_store>
|
| 42 |
+
</html_charset>
|
| 43 |
+
<use_return_path translate="label">
|
| 44 |
+
<label>use return path</label>
|
| 45 |
+
<frontend_type>select</frontend_type>
|
| 46 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 47 |
+
<sort_order>12</sort_order>
|
| 48 |
+
<show_in_default>1</show_in_default>
|
| 49 |
+
<show_in_website>1</show_in_website>
|
| 50 |
+
<show_in_store>1</show_in_store>
|
| 51 |
+
</use_return_path>
|
| 52 |
+
<return_path translate="label">
|
| 53 |
+
<label>return path</label>
|
| 54 |
+
<frontend_type>text</frontend_type>
|
| 55 |
+
<sort_order>13</sort_order>
|
| 56 |
+
<show_in_default>1</show_in_default>
|
| 57 |
+
<show_in_website>1</show_in_website>
|
| 58 |
+
<show_in_store>1</show_in_store>
|
| 59 |
+
<depends>
|
| 60 |
+
<use_return_path>1</use_return_path>
|
| 61 |
+
</depends>
|
| 62 |
+
</return_path>
|
| 63 |
+
<use_reply_to translate="label">
|
| 64 |
+
<label>use reply to</label>
|
| 65 |
+
<frontend_type>select</frontend_type>
|
| 66 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 67 |
+
<sort_order>14</sort_order>
|
| 68 |
+
<show_in_default>1</show_in_default>
|
| 69 |
+
<show_in_website>1</show_in_website>
|
| 70 |
+
<show_in_store>1</show_in_store>
|
| 71 |
+
</use_reply_to>
|
| 72 |
+
<reply_to translate="label">
|
| 73 |
+
<label>reply to</label>
|
| 74 |
+
<frontend_type>text</frontend_type>
|
| 75 |
+
<sort_order>15</sort_order>
|
| 76 |
+
<show_in_default>1</show_in_default>
|
| 77 |
+
<show_in_website>1</show_in_website>
|
| 78 |
+
<show_in_store>1</show_in_store>
|
| 79 |
+
<depends>
|
| 80 |
+
<use_reply_to>1</use_reply_to>
|
| 81 |
+
</depends>
|
| 82 |
+
</reply_to>
|
| 83 |
+
</fields>
|
| 84 |
+
</jpmail>
|
| 85 |
+
</groups>
|
| 86 |
+
</jpmail>
|
| 87 |
+
</sections>
|
| 88 |
+
</config>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/locale/en_US/Rack_Jpmail.csv
DELETED
|
@@ -1,8 +0,0 @@
|
|
| 1 |
-
"Multibyte Email Settings","Multibyte Email Settings"
|
| 2 |
-
"multibyte email setting","multibyte email setting"
|
| 3 |
-
"text mail character set","text mail character set"
|
| 4 |
-
"html mail character set","html mail character set"
|
| 5 |
-
"use return path","use return path"
|
| 6 |
-
"return path","return path"
|
| 7 |
-
"use reply to","use reply to"
|
| 8 |
-
"reply to","reply to"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
package.xml
CHANGED
|
@@ -1,27 +1,27 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Rack_Jpmail</name>
|
| 4 |
-
<version>0.2.
|
| 5 |
<stability>stable</stability>
|
| 6 |
-
<license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
-
<summary>This module fix email encoding for multibyte environment
|
| 10 |
-
<description>This module
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
0.1.6 Add Sender Name Encoding
|
| 14 |
-
0.1.5 Separate Text and HTML mail encode
|
| 15 |
-
Add Return-Path
|
| 16 |
-
Add Reply-To
|
| 17 |
-
0.1.4 Fix system.xml
|
| 18 |
-
0.1.3 Fix bcc problem
|
| 19 |
-
Add Newsletter/Template.php
|
| 20 |
0.1.2 Fix Bug.</notes>
|
| 21 |
-
<authors><author><name>Hirokazu Nishi</name><user>
|
| 22 |
-
<date>
|
| 23 |
-
<time>
|
| 24 |
-
<contents><target name="magelocale"><dir name="
|
| 25 |
<compatible/>
|
| 26 |
-
<dependencies
|
| 27 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Rack_Jpmail</name>
|
| 4 |
+
<version>0.2.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
+
<license>Open Software Lisence v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
+
<summary>This module fix email encoding for multibyte environment</summary>
|
| 10 |
+
<description>This module fix email encoding for multibyte environment</description>
|
| 11 |
+
<notes>0.2.1 Modify for 1.5 and 1.6
|
| 12 |
+
0.2.0 Add External SMTP Server setting
|
| 13 |
+
0.1.6 Add Sender Name Encoding
|
| 14 |
+
0.1.5 Separate Text and HTML mail encode.
|
| 15 |
+
Add Return-Path
|
| 16 |
+
Add Reply-To
|
| 17 |
+
0.1.4 Fix system.xml
|
| 18 |
+
0.1.3 Fix bcc problem
|
| 19 |
+
Add Newsletter/Template.php
|
| 20 |
0.1.2 Fix Bug.</notes>
|
| 21 |
+
<authors><author><name>Hirokazu Nishi</name><user>hirokazu_n</user><email>nishi@principle-works.jp</email></author></authors>
|
| 22 |
+
<date>2011-11-11</date>
|
| 23 |
+
<time>07:19:44</time>
|
| 24 |
+
<contents><target name="magelocale"><dir name="ja_JP"><file name="Rack_Jpmail.csv" hash="6323d98df9db69ac9c1da46c9e122525"/></dir><dir name="en_US"><file name="Rack_Jpmail.csv" hash=""/></dir></target><target name="magecommunity"><dir name="Rack"><dir name="Jpmail"><dir name="Helper"><file name="Data.php" hash="184fbc5691c3478047810b827c919dc9"/></dir><dir name="Model"><dir name="Email"><file name="Template.php" hash="d9d1d3e72151a55f6093fc9a189d3945"/></dir><dir name="Newsletter"><file name="Template.php" hash="eea3a54c5d1355d498d9d66d68256c66"/><file name="php_errors.log" hash="5dcf2f9cea03963c4e5f0aad79725e13"/></dir></dir><dir name="etc"><file name="config.xml" hash="dceb5d36b874cbcb403f224fdae4e752"/><file name="system.xml" hash="aed912d9a95c44ecdde8e8ccdfb6c44d"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Rack_Jpmail.xml" hash="15330a682c67f43d2510c0e72991bc53"/></dir></target></contents>
|
| 25 |
<compatible/>
|
| 26 |
+
<dependencies><required><php><min>5.2.0</min><max>5.3.99</max></php><extension><name>mbstring</name><min></min><max></max></extension></required></dependencies>
|
| 27 |
</package>
|
