tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/newsletter_ent' into 'develop' 

Newsletter reminder settings ent

See merge request artica/pandorafms!2449
This commit is contained in:
fbsanchez 2019-05-23 19:25:43 +02:00
parent 0235b4f396 4400d9303f
commit 9d7d58f43e
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pandora_console/operation/users/user_edit.php
View File

@ -80,12 +80,34 @@ if (isset($_GET['modified']) && !$view_mode) {
$upd_info['id_skin'] = get_parameter('skin', $user_info['id_skin']); $upd_info['id_skin'] = get_parameter('skin', $user_info['id_skin']);
$upd_info['default_event_filter'] = get_parameter('event_filter', null); $upd_info['default_event_filter'] = get_parameter('event_filter', null);
$upd_info['block_size'] = get_parameter('block_size', $config['block_size']); $upd_info['block_size'] = get_parameter('block_size', $config['block_size']);
$upd_info['firstname'] = get_parameter('newsletter_reminder', $user_info['first_name']); $upd_info['middlename'] = get_parameter_switch('newsletter_reminder', $user_info['middlename']);
$default_block_size = get_parameter('default_block_size', 0); $default_block_size = get_parameter('default_block_size', 0);
if ($default_block_size) { if ($default_block_size) {
$upd_info['block_size'] = 0; $upd_info['block_size'] = 0;
} }
if ($upd_info['middlename'] == 1) {
// User wants to enable newsletter reminders.
if ($user_info['middlename'] > 0) {
// User has already registered!. No sense.
$upd_info['middlename'] = $user_info['middlename'];
} else {
// Force subscription reminder.
$upd_info['middlename'] = 0;
}
}
if ($upd_info['middlename'] == 0 || $upd_info['middlename'] == 0) {
// Switch is ON. user had not registered.
$newsletter_reminder_value = 1;
} else if ($upd_info['middlename'] < 1) {
// Switch is OFF. User do not want to register.
$newsletter_reminder_value = 0;
} else if ($upd_info['middlename'] > 0) {
// Switc is OFF. User is already registered!
$newsletter_reminder_value = 0;
}
$upd_info['section'] = get_parameter('section', $user_info['section']); $upd_info['section'] = get_parameter('section', $user_info['section']);
$upd_info['data_section'] = get_parameter('data_section', ''); $upd_info['data_section'] = get_parameter('data_section', '');
$dashboard = get_parameter('dashboard', ''); $dashboard = get_parameter('dashboard', '');
@ -396,23 +418,28 @@ if (check_acl($config['id_user'], 0, 'ER')) {
null, null,
true true
).'</div>'; ).'</div>';
} else if (license_free()) {
$newsletter = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Newsletter Subscribed').': </p>';
if ($user_info['middlename']) {
$newsletter .= '<span>'.__('Already subscribed to %s newsletter', get_product_name()).'</span></div>';
} else {
$newsletter .= '<span><a href="javascript: force_run_newsletter();">'.__('Subscribe to our newsletter').'</a></span></div>';
}
$newsletter_reminder = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Newsletter Reminder').': </p>';
if ($user_info['firstname'] != 0) {
$user_info['firstname'] = 1;
}
$newsletter_reminder .= html_print_checkbox_switch('newsletter_reminder', 1, $user_info['firstname'], true).'</div>';
} }
$newsletter = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Newsletter Subscribed').': </p>';
if ($user_info['middlename'] > 0) {
$newsletter .= '<span>'.__('Already subscribed to %s newsletter', get_product_name()).'</span>';
} else {
$newsletter .= '<span><a href="javascript: force_run_newsletter();">'.__('Subscribe to our newsletter').'</a></span></div>';
$newsletter_reminder = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Newsletter Reminder').': </p>';
$newsletter_reminder .= html_print_switch(
[
'name' => 'newsletter_reminder',
'value' => $newsletter_reminder_value,
'disabled' => false,
]
);
}
$newsletter_reminder .= '</div>';
$autorefresh_list_out = []; $autorefresh_list_out = [];
if (is_metaconsole()) { if (is_metaconsole()) {
$autorefresh_list_out['monitoring/tactical'] = 'Tactical view'; $autorefresh_list_out['monitoring/tactical'] = 'Tactical view';