mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 18:14:26 +02:00
Code Issues Releases Wiki Activity

Mailout bounce handling fixes.

Browse Source
This commit is contained in:
Cameron
2014-10-22 17:58:20 -07:00
parent be970117ff
commit a3bb284031
9 changed files with 243 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
e107_handlers/mailout_admin_class.php
View File

@@ -944,7 +944,6 @@ class mailoutAdminClass extends e107MailManager
* @param $name name of item
* @return text for display
*/
//FIXME use $frm->select() instead.
public function sendStyleSelect($curval = '', $name = 'email_send_style', $incTemplates = TRUE)
{
@@ -954,24 +953,24 @@ class mailoutAdminClass extends e107MailManager
'texttheme' => LAN_MAILOUT_127
);
$text = "<select class='tbox' name='{$name}' required>\n";
foreach($emFormat as $key => $val)
{
$selected = ($key == $curval)? " selected='selected'": '';
$text .= "<option value='" . $key . "'{$selected}>" . $val . "</option>\n";
}
if($incTemplates)
{
$tList = self::getEmailTemplateNames('user');
foreach($tList as $key => $val)
{
$selected = ($key == $curval)? " selected='selected'": '';
$text .= "<option value='" . $key . "'{$selected}>" . LAN_MAILOUT_258 . $val . "</option>\n";
}
$emFormat[$key] = LAN_MAILOUT_258 . $val;
}
}
$text .= "</select>\n";
return $text;
if(empty($curval))
{
$curval = e107::getConfig()->get('mail_sendstyle');
}
return e107::getForm()->select($name,$emFormat, $curval, 'required=1&size=xxlarge');
}
/**