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

Mailout interface cleanup. @Steve - bug remains in prefs area.

Browse Source
This commit is contained in:
Cameron
2013-03-20 04:13:18 -07:00
parent f3481ebcc6
commit 4d9d6f1cc2
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_admin/mailout.php
View File

@@ -907,22 +907,30 @@ function show_prefs($mailAdmin)
</td> </td>
</tr>\n"; </tr>\n";
if (isset($pref['e_mailout_list'])) $mes->addDebug("@Steve : email address sources pref are not being saved");
{ // Allow selection of email address sources
$text .= "<tr> if (isset($pref['e_mailout_list'])) // Allow selection of email address sources
{
$text .= "
<tr>
<td>".LAN_MAILOUT_77."</td> <td>".LAN_MAILOUT_77."</td>
<td> <td> ";
";
$mail_enable = explode(',',$pref['mailout_enabled']); $mail_enable = explode(',',$pref['mailout_enabled']);
foreach ($pref['e_mailout_list'] as $mailer => $v) {
foreach ($pref['e_mailout_list'] as $mailer => $v)
{
$check = (in_array($mailer,$mail_enable)) ? "checked='checked'" : ""; $check = (in_array($mailer,$mail_enable)) ? "checked='checked'" : "";
$text .= "&nbsp;<input type='checkbox' name='mail_mailer_enabled[]' value='{$mailer}' {$check} /> {$mailer}<br />"; $text .= "&nbsp;<input type='checkbox' name='mail_mailer_enabled[]' value='{$mailer}' {$check} /> {$mailer}<br />";
} }
$text .= "</td></tr>\n"; $text .= "</td></tr>\n";
} }
list($mail_log_option,$mail_log_email) = explode(',',varset($pref['mail_log_options'],'0,0')); list($mail_log_option,$mail_log_email) = explode(',',varset($pref['mail_log_options'],'0,0'));
$check = ($mail_log_email == 1) ? " checked='checked'" : ""; $check = ($mail_log_email == 1) ? " checked='checked'" : "";
$text .= "<tr> $text .= "<tr>
<td>".LAN_MAILOUT_72."</td> <td>".LAN_MAILOUT_72."</td>
<td> <td>

11
e107_handlers/mailout_admin_class.php
View File

@@ -484,14 +484,16 @@ class mailoutAdminClass extends e107MailManager
$tab = ''; $tab = '';
$tabc = ''; $tabc = '';
$ret .= "<div class='admintabs' id='tab-container'>\n";
foreach ($this->mailHandlers as $key => $m) foreach ($this->mailHandlers as $key => $m)
{ {
if ($m->mailerEnabled) if ($m->mailerEnabled)
{ {
$tab .= "<li id='tab-main_".$key."'><a href='#main-mail-".$key."'>".$m->mailerName."</a></li>"; $lactive = ($key == 'core') ? " class='active'" : '';
$tabc .= "<div id='main-mail-".$key."' style='padding:0px;border-collapse:collapse;'>"; $tab .= "<li".$lactive."><a data-toggle='tab' href='#main-mail-".$key."'>".$m->mailerName."</a></li>";
$pactive = ($key == 'core') ? 'active' : '';
$tabc .= "<div id='main-mail-".$key."' class='tab-pane ".$pactive."'>";
$content = $m->showSelect(TRUE, varset($selectorInfo[$key], FALSE)); $content = $m->showSelect(TRUE, varset($selectorInfo[$key], FALSE));
@@ -520,7 +522,8 @@ class mailoutAdminClass extends e107MailManager
} }
// $ret .= "<ul class='e-tabs e-hideme' id='core-mail-tabs'>".$tab."</ul>"; // This hides tabs! // $ret .= "<ul class='e-tabs e-hideme' id='core-mail-tabs'>".$tab."</ul>"; // This hides tabs!
$ret .= "<ul class='e-tabs' id='core-mail-tabs'>".$tab."</ul>"; $ret .= "<ul class='nav nav-tabs'>".$tab."</ul>";
$ret .= "<div class='tab-content'>\n";
$ret .= $tabc; $ret .= $tabc;
$ret .= "</div>"; $ret .= "</div>";