mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-06-02 00:45:03 +02:00
Code Issues Releases Wiki Activity

Corrected missing mail handlers preference. Added Debug-active warning. Enabling e_DEBUG in e107_config.php will now enable debug in the mailout class.

Browse Source
This commit is contained in:
Cameron 2014-11-15 13:29:37 -08:00
parent ca416467ba
commit 1734880bbb
5 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
e107_admin/mailout.php
View File

@ -848,6 +848,28 @@ class mailout_main_ui extends e_admin_ui
</td>
</tr>
<tr>
<td>".LAN_MAILOUT_77."</td>
<td> ";
$mail_enable = explode(',',vartrue($pref['mailout_enabled'],'core'));
$coreCheck = (in_array('core',$mail_enable)) ? "checked='checked'" : "";
$text .= $frm->checkbox('mail_mailer_enabled[]','core', $coreCheck, 'users');
if(!empty($pref['e_mailout_list']))
{
foreach ($pref['e_mailout_list'] as $mailer => $v)
{
$check = (in_array($mailer,$mail_enable)) ? "checked='checked'" : "";
$text .= $frm->checkbox('mail_mailer_enabled[]',$mailer,$check,$mailer);
// $text .= "&nbsp;<input type='checkbox' name='mail_mailer_enabled[]' value='{$mailer}' {$check} /> {$mailer}<br />";
}
}
$text .= "</td></tr>
<tr>
<td style='vertical-align:top'>".LAN_MAILOUT_115."<br /></td>
<td>
@ -965,29 +987,10 @@ class mailout_main_ui extends e_admin_ui
<td>".LAN_MAILOUT_156."</td>
<td>".$frm->number('mail_workpertick',varset($pref['mail_workpertick'],5))."<span class='field-help'>".LAN_MAILOUT_157."</span>
</td>
</tr>\n";
</tr>
if (isset($pref['e_mailout_list'])) // Allow selection of email address sources
{
$text .= "
<tr>
<td>".LAN_MAILOUT_77."</td>
<td> ";
$mail_enable = explode(',',$pref['mailout_enabled']);
$coreCheck = (in_array('core',$mail_enable)) ? "checked='checked'" : "";
$text .= $frm->checkbox('mail_mailer_enabled[]','core', $coreCheck, 'users');
foreach ($pref['e_mailout_list'] as $mailer => $v)
{
$check = (in_array($mailer,$mail_enable)) ? "checked='checked'" : "";
$text .= $frm->checkbox('mail_mailer_enabled[]',$mailer,$check,$mailer);
// $text .= "&nbsp;<input type='checkbox' name='mail_mailer_enabled[]' value='{$mailer}' {$check} /> {$mailer}<br />";
}
$text .= "</td></tr>\n";
}
";
list($mail_log_option,$mail_log_email) = explode(',',varset($pref['mail_log_options'],'0,0'));

2
e107_handlers/admin_ui.php
View File

@ -3822,7 +3822,7 @@ class e_admin_controller_ui extends e_admin_controller
}
// Debug Filter Query.
e107::getMessage()->addDebug('QRY='.$qry);
e107::getMessage()->addDebug('QRY='.str_replace('#', MPREFIX, $qry));
// echo $qry.'<br />';
// print_a($this->fields);
// print_a($_GET);

12
e107_handlers/mail_manager_class.php
View File

@ -218,6 +218,18 @@ class e107MailManager
{
$this->e107 = e107::getInstance();
$this->mailOverrides = $overrides;
if(deftrue('e_DEBUG'))
{
$this->debugMode = true;
}
if($this->debugMode === true)
{
e107::getMessage()->addWarning('Debug Mode is active. Emailing will only be simulated!');
}
}

6
e107_handlers/mailout_admin_class.php
View File

@ -556,6 +556,12 @@ class mailoutAdminClass extends e107MailManager
$ret++;
}
if(empty($pref['e_mailout_list']))
{
return $ret;
}
// Load additional configured handlers e_mailout.php from plugins.
foreach($pref['e_mailout_list'] as $mailer => $v)
{

2
e107_languages/English/admin/lan_mailout.php
View File

@ -87,7 +87,7 @@ define("LAN_MAILOUT_73", "No logging");
define("LAN_MAILOUT_74", "Logging only (no send)");
define("LAN_MAILOUT_75", "Log and send");
define("LAN_MAILOUT_76", "Include email info in log");
define("LAN_MAILOUT_77", "Supplementary email address sources");
define("LAN_MAILOUT_77", "Email address sources");
define("LAN_MAILOUT_78", "Mailshot Status");
define("LAN_MAILOUT_79", "No mailshots to display");
define("LAN_MAILOUT_80", "Date");