| Zeile 82 | Zeile 82 |
|---|
$html_personalisation = substr($html_personalisation, 0, -2)."');\n// --></script>\n";
$text_personalisation = substr($text_personalisation, 0, -2)."');\n// --></script>\n";
|
$html_personalisation = substr($html_personalisation, 0, -2)."');\n// --></script>\n";
$text_personalisation = substr($text_personalisation, 0, -2)."');\n// --></script>\n";
|
| | $localized_time_offset = (float)$mybb->user['timezone']*3600 + $mybb->user['dst']*3600;
|
// All done here
if($mybb->request_method == "post")
{
| // All done here
if($mybb->request_method == "post")
{
|
| Zeile 93 | Zeile 95 |
|---|
// Delivering in the future
else
{
|
// Delivering in the future
else
{
|
if(strstr($mybb->input['deliverytime_time'], "pm"))
| if(stristr($mybb->input['deliverytime_time'], "pm"))
|
{
$mybb->input['deliveryhour'] += 12;
}
| {
$mybb->input['deliveryhour'] += 12;
}
|
| Zeile 104 | Zeile 106 |
|---|
$exploded = explode(' ', $exploded[1]);
$mybb->input['deliveryminute'] = (int)$exploded[0];
|
$exploded = explode(' ', $exploded[1]);
$mybb->input['deliveryminute'] = (int)$exploded[0];
|
$delivery_date = gmmktime($mybb->input['deliveryhour'], $mybb->input['deliveryminute'], 0, $mybb->input['endtime_month'], $mybb->input['endtime_day'], $mybb->input['endtime_year']) + $mybb->user['timezone']*3600;
| $delivery_date = gmmktime($mybb->input['deliveryhour'], $mybb->input['deliveryminute'], 0, $mybb->input['endtime_month'], $mybb->input['endtime_day'], $mybb->input['endtime_year']) - $localized_time_offset;
|
if($delivery_date <= TIME_NOW)
{
$errors[] = $lang->error_only_in_future;
| if($delivery_date <= TIME_NOW)
{
$errors[] = $lang->error_only_in_future;
|
| Zeile 222 | Zeile 224 |
|---|
}
else
{
|
}
else
{
|
| | // correct date by timezone and dst
$offset =
|
$input['delivery_type'] = "future";
|
$input['delivery_type'] = "future";
|
$time = date("d-n-Y-h-i-a", $email['senddate']);
| $time = gmdate("d-n-Y", $email['senddate'] + $localized_time_offset);
|
$time = explode('-', $time);
|
$time = explode('-', $time);
|
$input['deliveryhour'] = (int)$time[3];
$input['deliveryminute'] = (int)$time[4];
| |
$input['deliverymonth'] = (int)$time[1];
$input['deliveryday'] = (int)$time[0];
$input['deliveryyear'] = (int)$time[2];
|
$input['deliverymonth'] = (int)$time[1];
$input['deliveryday'] = (int)$time[0];
$input['deliveryyear'] = (int)$time[2];
|
$input['deliverymeridiem'] = $time[5];
| $input['endtime_time'] = gmdate($mybb->settings['timeformat'], $email['senddate'] + $localized_time_offset);
|
$delivery_type_checked['future'] = " checked=\"checked\"";
}
}
| $delivery_type_checked['future'] = " checked=\"checked\"";
}
}
|
| Zeile 240 | Zeile 242 |
|---|
$delivery_type_checked['now'] = " checked=\"checked\"";
}
}
|
$delivery_type_checked['now'] = " checked=\"checked\"";
}
}
|
if($input['deliveryhour'])
{
$input['endtime_time'] = (int)$input['deliveryhour'].":";
}
else
{
$input['endtime_time'] = "12:";
}
if($input['deliveryminute'])
{
$input['endtime_time'] .= (int)$input['deliveryminute']." ";
}
else
{
$input['endtime_time'] .= "00 ";
}
if($input['deliverymeridiem'])
{
$input['endtime_time'] .= $input['deliverymeridiem'];
}
else
|
if(!$input['endtime_time'])
|
{
|
{
|
$input['endtime_time'] .= "am";
| $input['endtime_time'] = gmdate($mybb->settings['timeformat'], TIME_NOW + $localized_time_offset);
|
}
if(!$input['deliveryyear'])
{
|
}
if(!$input['deliveryyear'])
{
|
$enddateyear = gmdate('Y', TIME_NOW);
| $enddateyear = gmdate('Y', TIME_NOW + $localized_time_offset);
|
}
else
{
| }
else
{
|
| Zeile 279 | Zeile 259 |
|---|
if(!$input['deliverymonth'])
{
|
if(!$input['deliverymonth'])
{
|
$input['enddatemonth'] = gmdate('n', TIME_NOW);
| $input['enddatemonth'] = gmdate('n', TIME_NOW + $localized_time_offset);
|
}
else
{
| }
else
{
|
| Zeile 288 | Zeile 268 |
|---|
if(!$input['deliveryday'])
{
|
if(!$input['deliveryday'])
{
|
$input['enddateday'] = gmdate('j', TIME_NOW);
| $input['enddateday'] = gmdate('j', TIME_NOW + $localized_time_offset);
|
}
else
{
| }
else
{
|
| Zeile 452 | Zeile 432 |
|---|
echo "<div id=\"message_text\" style=\"{$text_display}\">";
$form_container = new FormContainer("{$lang->edit_mass_mail}: {$lang->define_text_version}");
$form_container->output_row("{$lang->define_text_version_desc}:", $text_personalisation, $form->generate_text_area('message', $input['message'], array('id' => 'message', 'rows' => 15, 'cols '=> 70, 'style' => 'width: 95%')));
|
echo "<div id=\"message_text\" style=\"{$text_display}\">";
$form_container = new FormContainer("{$lang->edit_mass_mail}: {$lang->define_text_version}");
$form_container->output_row("{$lang->define_text_version_desc}:", $text_personalisation, $form->generate_text_area('message', $input['message'], array('id' => 'message', 'rows' => 15, 'cols '=> 70, 'style' => 'width: 95%')));
|
$form_container->end();
| $form_container->end();
|
echo "</div>";
echo "
| echo "</div>";
echo "
|
| Zeile 557 | Zeile 537 |
|---|
$form_container = new FormContainer("{$lang->edit_mass_mail}: {$lang->define_the_recipients}");
|
$form_container = new FormContainer("{$lang->edit_mass_mail}: {$lang->define_the_recipients}");
|
$form_container->output_row($lang->username_contains, "", $form->generate_text_box('conditions[username]', $input['conditions']['username'], array('id' => 'username')), 'username');
| $form_container->output_row($lang->username_contains, "", $form->generate_text_box('conditions[username]', htmlspecialchars_uni($input['conditions']['username']), array('id' => 'username')), 'username');
|
$form_container->output_row($lang->email_addr_contains, "", $form->generate_text_box('conditions[email]', $input['conditions']['email'], array('id' => 'email')), 'email');
$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
| $form_container->output_row($lang->email_addr_contains, "", $form->generate_text_box('conditions[email]', $input['conditions']['email'], array('id' => 'email')), 'email');
$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
|
| Zeile 634 | Zeile 614 |
|---|
$text_personalisation = substr($text_personalisation, 0, -2)."');\n// --></script>\n";
$plugins->run_hooks("admin_user_mass_email_send_start");
|
$text_personalisation = substr($text_personalisation, 0, -2)."');\n// --></script>\n";
$plugins->run_hooks("admin_user_mass_email_send_start");
|
| |
$localized_time_offset = (float)$mybb->user['timezone']*3600 + $mybb->user['dst']*3600;
|
if($mybb->input['step'] == 4)
{
|
if($mybb->input['step'] == 4)
{
|
| Zeile 648 | Zeile 630 |
|---|
// Delivering in the future
else
{
|
// Delivering in the future
else
{
|
if(strstr($mybb->input['deliverytime_time'], "pm"))
| if(stristr($mybb->input['deliverytime_time'], "pm"))
|
{
$mybb->input['deliveryhour'] += 12;
}
| {
$mybb->input['deliveryhour'] += 12;
}
|
| Zeile 659 | Zeile 641 |
|---|
$exploded = explode(' ', $exploded[1]);
$mybb->input['deliveryminute'] = (int)$exploded[0];
|
$exploded = explode(' ', $exploded[1]);
$mybb->input['deliveryminute'] = (int)$exploded[0];
|
$delivery_date = gmmktime($mybb->input['deliveryhour'], $mybb->input['deliveryminute'], 0, $mybb->input['endtime_month'], $mybb->input['endtime_day'], $mybb->input['endtime_year']) + $mybb->user['timezone']*3600;
| $delivery_date = gmmktime($mybb->input['deliveryhour'], $mybb->input['deliveryminute'], 0, $mybb->input['endtime_month'], $mybb->input['endtime_day'], $mybb->input['endtime_year'])- $localized_time_offset;
|
if($delivery_date <= TIME_NOW)
{
$errors[] = $lang->error_only_in_future;
| if($delivery_date <= TIME_NOW)
{
$errors[] = $lang->error_only_in_future;
|
| Zeile 700 | Zeile 682 |
|---|
if($email['senddate'] != 0)
{
if($email['senddate'] <= TIME_NOW)
|
if($email['senddate'] != 0)
{
if($email['senddate'] <= TIME_NOW)
|
{
| {
|
$input['delivery_type'] = "now";
$delivery_type_checked['now'] = " checked=\"checked\"";
}
else
{
$input['delivery_type'] = "future";
|
$input['delivery_type'] = "now";
$delivery_type_checked['now'] = " checked=\"checked\"";
}
else
{
$input['delivery_type'] = "future";
|
$time = date("d-n-Y-h-i-a", $email['senddate']);
| $time = gmdate("d-n-Y", $email['senddate'] + $localized_time_offset);
|
$time = explode('-', $time);
|
$time = explode('-', $time);
|
$input['deliveryhour'] = (int)$time[3];
$input['deliveryminute'] = (int)$time[4];
| |
$input['deliverymonth'] = (int)$time[1];
$input['deliveryday'] = (int)$time[0];
$input['deliveryyear'] = (int)$time[2];
|
$input['deliverymonth'] = (int)$time[1];
$input['deliveryday'] = (int)$time[0];
$input['deliveryyear'] = (int)$time[2];
|
$input['deliverymeridiem'] = $time[5];
| $input['endtime_time'] = gmdate($mybb->settings['timeformat'], $email['senddate'] + $localized_time_offset);
|
$delivery_type_checked['future'] = " checked=\"checked\"";
}
}
| $delivery_type_checked['future'] = " checked=\"checked\"";
}
}
|
| Zeile 757 | Zeile 737 |
|---|
$format_preview.= "{$lang->html_based} - <a href=\"#\" onclick=\"javascript:MyBB.popupWindow('index.php?module=user-mass_mail&action=preview&mid={$email['mid']}', null, true);\">{$lang->preview}</a>";
}
$table->construct_cell($format_preview);
|
$format_preview.= "{$lang->html_based} - <a href=\"#\" onclick=\"javascript:MyBB.popupWindow('index.php?module=user-mass_mail&action=preview&mid={$email['mid']}', null, true);\">{$lang->preview}</a>";
}
$table->construct_cell($format_preview);
|
$table->construct_row();
| $table->construct_row();
|
// Recipient counts & details
$table->construct_cell("<strong>{$lang->total_recipients}:</strong>");
$table->construct_cell(my_number_format($email['totalcount'])." - <a href=\"index.php?module=user-mass_mail&action=send&step=3&mid={$email['mid']}\">{$lang->change_recipient_conds}</a>");
$table->construct_row();
|
// Recipient counts & details
$table->construct_cell("<strong>{$lang->total_recipients}:</strong>");
$table->construct_cell(my_number_format($email['totalcount'])." - <a href=\"index.php?module=user-mass_mail&action=send&step=3&mid={$email['mid']}\">{$lang->change_recipient_conds}</a>");
$table->construct_row();
|
|
|
$table->output("{$lang->send_mass_mail}: {$lang->step_four} - {$lang->review_message}");
|
$table->output("{$lang->send_mass_mail}: {$lang->step_four} - {$lang->review_message}");
|
if($input['deliveryhour'])
{
$input['endtime_time'] = (int)$input['deliveryhour'].":";
}
else
{
$input['endtime_time'] = "12:";
}
if($input['deliveryminute'])
{
$input['endtime_time'] .= (int)$input['deliveryminute']." ";
}
else
{
$input['endtime_time'] .= "00 ";
}
if($input['deliverymeridiem'])
{
$input['endtime_time'] .= $input['deliverymeridiem'];
}
else
| if(!$input['endtime_time'])
|
{
|
{
|
$input['endtime_time'] .= "am";
| $input['endtime_time'] = gmdate($mybb->settings['timeformat'], TIME_NOW + $localized_time_offset);
|
}
if(!$input['deliveryyear'])
{
|
}
if(!$input['deliveryyear'])
{
|
$enddateyear = gmdate('Y', TIME_NOW);
| $enddateyear = gmdate('Y', TIME_NOW + $localized_time_offset);
|
}
else
{
| }
else
{
|
| Zeile 804 | Zeile 762 |
|---|
if(!$input['deliverymonth'])
{
|
if(!$input['deliverymonth'])
{
|
$input['enddatemonth'] = gmdate('n', TIME_NOW);
| $input['enddatemonth'] = gmdate('n', TIME_NOW + $localized_time_offset);
|
}
else
{
| }
else
{
|
| Zeile 813 | Zeile 771 |
|---|
if(!$input['deliveryday'])
{
|
if(!$input['deliveryday'])
{
|
$input['enddateday'] = gmdate('j', TIME_NOW);
| $input['enddateday'] = gmdate('j', TIME_NOW + $localized_time_offset);
|
}
else
{
| }
else
{
|
| Zeile 993 | Zeile 951 |
|---|
$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_three} - {$lang->define_the_recipients}");
|
$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_three} - {$lang->define_the_recipients}");
|
$form_container->output_row($lang->username_contains, "", $form->generate_text_box('conditions[username]', $input['conditions']['username'], array('id' => 'username')), 'username');
| $form_container->output_row($lang->username_contains, "", $form->generate_text_box('conditions[username]', htmlspecialchars_uni($input['conditions']['username']), array('id' => 'username')), 'username');
|
$form_container->output_row($lang->email_addr_contains, "", $form->generate_text_box('conditions[email]', $input['conditions']['email'], array('id' => 'email')), 'email');
$options = array();
| $form_container->output_row($lang->email_addr_contains, "", $form->generate_text_box('conditions[email]', $input['conditions']['email'], array('id' => 'email')), 'email');
$options = array();
|