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

Merged core mailout routine into e107_plugins/user/e_mailout.php. Fixed pop3 error messages from phpmailer. Corrected email preview when no template selected. Corrected mailout Email source names.

Browse Source
This commit is contained in:
Cameron
2016-04-11 18:39:19 -07:00
parent b762c10ecc
commit 84d7271d10
8 changed files with 359 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_handlers/mailout_admin_class.php
View File

@@ -544,16 +544,18 @@ class mailoutAdminClass extends e107MailManager
{
$pref = e107::getPref();
$pref['mailout_enabled'] = str_replace('core','user',$pref['mailout_enabled']); // BC fix.
$ret = 0;
$toLoad = explode(',', $options);
$active_mailers = explode(',', varset($pref['mailout_enabled'], 'core'));
$active_mailers = explode(',', varset($pref['mailout_enabled'], 'user'));
if((in_array('core', $toLoad) || ($options == 'all')) && in_array('core', $active_mailers))
{
require_once (e_HANDLER . 'mailout_class.php');
$this->mailHandlers['core'] = new core_mailout; // Start by loading the core mailout class
$ret++;
// require_once (e_HANDLER . 'mailout_class.php');
// $this->mailHandlers['core'] = new core_mailout; // Start by loading the core mailout class
// $ret++;
}
if(empty($pref['e_mailout_list']))
@@ -627,7 +629,7 @@ class mailoutAdminClass extends e107MailManager
if(is_array($content))
{
$text = "<table class='table ' style='width:100%;margin-left:0px'>
$text = "<table class='table table-bordered table-striped ' style='margin-bottom:0;margin-left:0; margin-top:10px'>
<colgroup span='2'>
<col class='col-label' />
<col class='col-control' />
@@ -638,7 +640,7 @@ class mailoutAdminClass extends e107MailManager
{
$text .= "
<tr>
<td style='padding-left:0px'>" . $var['caption'] . "</td>
<td>" . $var['caption'] . "</td>
<td class='form-inline'>" . $var['html'] . "</td>
</tr>";
}