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

Fix saving of prefs in mailout (may be similar problem with save_prefs() elsewhere)

Browse Source 
LAN update in admin log
This commit is contained in:
SteveD
2013-03-20 22:31:32 +00:00
parent c3ad8ca496
commit 22c86fda7a
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_admin/admin_log.php
View File

@@ -539,11 +539,11 @@ if(isset($page_title[$action]))
'comments' => array(14, 7, 7, 7, 14, 3, 10, 12, 5, 17, 1, 1, 1), 'comments' => array(14, 7, 7, 7, 14, 3, 10, 12, 5, 17, 1, 1, 1),
'online' => array(18, 15, 7, 14, 32, 6, 4, 4)); 'online' => array(18, 15, 7, 14, 32, 6, 4, 4));
$col_titles = array( $col_titles = array(
'adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, RL_LAN_025, RL_LAN_033),
'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, RL_LAN_025, RL_LAN_033),
'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_024, RL_LAN_025, RL_LAN_033), 'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, RL_LAN_024, RL_LAN_025, RL_LAN_033),
'downlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_068, RL_LAN_069), 'downlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_068, RL_LAN_069),
'detailed' => array(LAN_TIME, RL_LAN_096, RL_LAN_098, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'detailed' => array(LAN_TIME, RL_LAN_096, RL_LAN_098, RL_LAN_032, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, RL_LAN_025, RL_LAN_033),
'online' => array(RL_LAN_019, RL_LAN_020, LAN_ID, LAN_USER, RL_LAN_116, RL_LAN_117, RL_LAN_118, RL_LAN_116)); 'online' => array(RL_LAN_019, RL_LAN_020, LAN_ID, LAN_USER, RL_LAN_116, RL_LAN_117, RL_LAN_118, RL_LAN_116));

14
e107_admin/mailout.php
View File

@@ -673,7 +673,7 @@ function sendProgress()
// Update Preferences. (security handled elsewhere) // Update Preferences. (security handled elsewhere)
function saveMailPrefs(&$mes) // $emessage to $mes, working? function saveMailPrefs(&$mes) // $emessage to $mes, working?
{ {
$pref = e107::getPref(); //$pref = e107::getPref();
$e107 = e107::getInstance(); $e107 = e107::getInstance();
$bounceOpts = array('none' => LAN_MAILOUT_232, 'auto' => LAN_MAILOUT_233, 'mail' => LAN_MAILOUT_234); $bounceOpts = array('none' => LAN_MAILOUT_232, 'auto' => LAN_MAILOUT_233, 'mail' => LAN_MAILOUT_234);
@@ -740,9 +740,15 @@ function saveMailPrefs(&$mes) // $emessage to $mes, working?
$temp['mailout_enabled'] = implode(',',varset($_POST['mail_mailer_enabled'], '')); $temp['mailout_enabled'] = implode(',',varset($_POST['mail_mailer_enabled'], ''));
$temp['mail_log_options'] = intval($_POST['mail_log_option']).','.intval($_POST['mail_log_email']); $temp['mail_log_options'] = intval($_POST['mail_log_option']).','.intval($_POST['mail_log_email']);
if ($e107->admin_log->logArrayDiffs($temp, $pref, 'MAIL_03')) foreach ($temp as &$t)
{ {
save_prefs(); // Only save if changes - generates its own message if ($t === NULL) $t = '';
}
$pref = e107::pref('core'); // Core Prefs Array.
if (e107::getAdminLog()->logArrayDiffs($temp, $pref, 'MAIL_03'))
{
e107::getConfig()->updatePref($temp);
e107::getConfig()->save(false); // Only save if changes - generates its own message
} }
else else
{ {
@@ -907,8 +913,6 @@ function show_prefs($mailAdmin)
</td> </td>
</tr>\n"; </tr>\n";
$mes->addDebug("@Steve : email address sources pref are not being saved");
if (isset($pref['e_mailout_list'])) // Allow selection of email address sources if (isset($pref['e_mailout_list'])) // Allow selection of email address sources
{ {
$text .= " $text .= "