Vergleich admin/modules/user/mass_mail.php - 1.8.21 - 1.8.30

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 58Zeile 58
	if($email['conditions'] != '')
{
$email['conditions'] = my_unserialize($email['conditions']);

	if($email['conditions'] != '')
{
$email['conditions'] = my_unserialize($email['conditions']);

 
	}
else
{
// Fill the conditions with default values
$email['conditions'] = array(
"username" => "",
"email" => "",
"postnum_dir" => "greater_than",
"postnum" => "",
"regdate_dir" => "more_than",
"regdate" => "",
"regdate_date" => "hours",
"lastactive_dir" => "more_than",
"lastactive" => "",
"lastactive_date" => "hours"
);

	}

$sub_tabs['edit_mass_mail'] = array(

	}

$sub_tabs['edit_mass_mail'] = array(

Zeile 83Zeile 99
	$text_personalisation = substr($text_personalisation, 0, -2)."');\n// --></script>\n";

$localized_time_offset = (float)$mybb->user['timezone']*3600 + $mybb->user['dst']*3600;

	$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 137Zeile 153
		}
else
{

		}
else
{

			if($mybb->input['format'] == 2 && $mybb->input['automatic_text'] == 0 && !$mybb->input['message'])

			if($mybb->input['format'] == 2 && $mybb->get_input('automatic_text') == 0 && !$mybb->input['message'])

			{
$errors[] = $lang->error_missing_plain_text;
}

			{
$errors[] = $lang->error_missing_plain_text;
}

Zeile 149Zeile 165
			else if($mybb->input['format'] == 0 && !$mybb->input['message'])
{
$errors[] = $lang->error_missing_plain_text;

			else if($mybb->input['format'] == 0 && !$mybb->input['message'])
{
$errors[] = $lang->error_missing_plain_text;

			}

			}

		}

if(!$errors)

		}

if(!$errors)

Zeile 164Zeile 180
			else
{
// Do we need to generate a text based version?

			else
{
// Do we need to generate a text based version?

				if($mybb->input['format'] == 2 && $mybb->input['automatic_text'])

				if($mybb->input['format'] == 2 && $mybb->get_input('automatic_text'))

				{
$mybb->input['message'] = create_text_message($mybb->input['htmlmessage']);
}

				{
$mybb->input['message'] = create_text_message($mybb->input['htmlmessage']);
}

Zeile 204Zeile 220
	$page->output_header($lang->edit_mass_mail);

$page->output_nav_tabs($sub_tabs, 'edit_mass_mail');

	$page->output_header($lang->edit_mass_mail);

$page->output_nav_tabs($sub_tabs, 'edit_mass_mail');

 

$delivery_type_checked = array(
"now" => "",
"future" => "",
);


// If we have any error messages, show them
if($errors)


// If we have any error messages, show them
if($errors)

Zeile 225Zeile 246
			else
{
// correct date by timezone and dst

			else
{
// correct date by timezone and dst

				$offset = 

				$offset =

				$input['delivery_type'] = "future";
$time = gmdate("d-n-Y", $email['senddate'] + $localized_time_offset);
$time = explode('-', $time);

				$input['delivery_type'] = "future";
$time = gmdate("d-n-Y", $email['senddate'] + $localized_time_offset);
$time = explode('-', $time);

Zeile 242Zeile 263
			$delivery_type_checked['now'] = " checked=\"checked\"";
}
}

			$delivery_type_checked['now'] = " checked=\"checked\"";
}
}

	
if(!$input['endtime_time'])


if(empty($input['endtime_time']))

	{
$input['endtime_time'] = gmdate($mybb->settings['timeformat'], TIME_NOW + $localized_time_offset);
}


	{
$input['endtime_time'] = gmdate($mybb->settings['timeformat'], TIME_NOW + $localized_time_offset);
}


	if(!$input['deliveryyear'])

	if(empty($input['deliveryyear']))

	{
$enddateyear = gmdate('Y', TIME_NOW + $localized_time_offset);
}

	{
$enddateyear = gmdate('Y', TIME_NOW + $localized_time_offset);
}

Zeile 257Zeile 278
		$enddateyear = (int)$input['deliveryyear'];
}


		$enddateyear = (int)$input['deliveryyear'];
}


	if(!$input['deliverymonth'])

	if(empty($input['deliverymonth']))

	{
$input['enddatemonth'] = gmdate('n', TIME_NOW + $localized_time_offset);
}

	{
$input['enddatemonth'] = gmdate('n', TIME_NOW + $localized_time_offset);
}

Zeile 266Zeile 287
		$input['enddatemonth'] = (int)$input['deliverymonth'];
}


		$input['enddatemonth'] = (int)$input['deliverymonth'];
}


	if(!$input['deliveryday'])

	if(empty($input['deliveryday']))

	{
$input['enddateday'] = gmdate('j', TIME_NOW + $localized_time_offset);
}

	{
$input['enddateday'] = gmdate('j', TIME_NOW + $localized_time_offset);
}

Zeile 282Zeile 303
	if($email['mid'])
{
$mid_add = "&amp;mid={$email['mid']}";

	if($email['mid'])
{
$mid_add = "&amp;mid={$email['mid']}";

	}


	}


	$form_container = new FormContainer("{$lang->edit_mass_mail}: {$lang->message_settings}");

$form_container->output_row("{$lang->subject}: <em>*</em>", $lang->subject_desc, $form->generate_text_box('subject', $input['subject'], array('id' => 'subject')), 'subject');

	$form_container = new FormContainer("{$lang->edit_mass_mail}: {$lang->message_settings}");

$form_container->output_row("{$lang->subject}: <em>*</em>", $lang->subject_desc, $form->generate_text_box('subject', $input['subject'], array('id' => 'subject')), 'subject');

Zeile 302Zeile 323
	$type_options = array(
$form->generate_radio_button("type", 0, $lang->send_via_email, array("id" => "type_email", "checked" => $type_email_checked)),
$form->generate_radio_button("type", 1, $lang->send_via_pm, array("id" => "type_pm", "checked" => $type_pm_checked))

	$type_options = array(
$form->generate_radio_button("type", 0, $lang->send_via_email, array("id" => "type_email", "checked" => $type_email_checked)),
$form->generate_radio_button("type", 1, $lang->send_via_pm, array("id" => "type_pm", "checked" => $type_pm_checked))

	);

	);

	$form_container->output_row("{$lang->message_type}: <em>*</em>", "", implode("<br />", $type_options));

$monthnames = array(

	$form_container->output_row("{$lang->message_type}: <em>*</em>", "", implode("<br />", $type_options));

$monthnames = array(

Zeile 336Zeile 357
		else
{
$enddatemonth .= "<option value=\"{$key}\">{$month}</option>\n";

		else
{
$enddatemonth .= "<option value=\"{$key}\">{$month}</option>\n";

		}
}

$enddateday = "";


		}
}

$enddateday = "";


	// Construct option list for days
for($i = 1; $i <= 31; ++$i)
{

	// Construct option list for days
for($i = 1; $i <= 31; ++$i)
{

Zeile 378Zeile 399
	</script>
<dl style=\"margin-top: 0; margin-bottom: 0; width: 100%;\">
<dt><label style=\"display: block;\"><input type=\"radio\" name=\"delivery_type\" value=\"now\" {$delivery_type_checked['now']} class=\"delivery_types_check\" onclick=\"checkAction('delivery_type');\" style=\"vertical-align: middle;\" /> <strong>{$lang->deliver_immediately}</strong></label></dt>

	</script>
<dl style=\"margin-top: 0; margin-bottom: 0; width: 100%;\">
<dt><label style=\"display: block;\"><input type=\"radio\" name=\"delivery_type\" value=\"now\" {$delivery_type_checked['now']} class=\"delivery_types_check\" onclick=\"checkAction('delivery_type');\" style=\"vertical-align: middle;\" /> <strong>{$lang->deliver_immediately}</strong></label></dt>





		<dt><label style=\"display: block;\"><input type=\"radio\" name=\"delivery_type\" value=\"future\" {$delivery_type_checked['future']} class=\"delivery_types_check\" onclick=\"checkAction('delivery_type');\" style=\"vertical-align: middle;\" /> <strong>{$lang->deliver_specific}</strong></label></dt>
<dd style=\"margin-top: 4px;\" id=\"delivery_type_future\" class=\"delivery_types\">
<table cellpadding=\"4\">
<tr>

		<dt><label style=\"display: block;\"><input type=\"radio\" name=\"delivery_type\" value=\"future\" {$delivery_type_checked['future']} class=\"delivery_types_check\" onclick=\"checkAction('delivery_type');\" style=\"vertical-align: middle;\" /> <strong>{$lang->deliver_specific}</strong></label></dt>
<dd style=\"margin-top: 4px;\" id=\"delivery_type_future\" class=\"delivery_types\">
<table cellpadding=\"4\">
<tr>

						<td><select name=\"endtime_day\">\n{$enddateday}</select>\n &nbsp; \n<select name=\"endtime_month\">\n{$enddatemonth}</select>\n &nbsp; \n<input type=\"text\" name=\"endtime_year\" value=\"{$enddateyear}\" class=\"text_input\" size=\"4\" maxlength=\"4\" />\n - {$lang->time} ".$form->generate_text_box('endtime_time', $input['endtime_time'], array('id' => 'endtime_time', 'style' => 'width: 60px;'))."</td>

						<td><select name=\"endtime_day\">\n{$enddateday}</select>\n &nbsp; \n<select name=\"endtime_month\">\n{$enddatemonth}</select>\n &nbsp; \n<input type=\"text\" name=\"endtime_year\" value=\"{$enddateyear}\" class=\"text_input\" size=\"4\" maxlength=\"4\" />\n - ".$form->generate_text_box('endtime_time', $input['endtime_time'], array('id' => 'endtime_time', 'style' => 'width: 60px;'))."</td>

					</tr>
</table>
</dd>

					</tr>
</table>
</dd>

Zeile 394Zeile 415
	$form_container->output_row("{$lang->delivery_date}: <em>*</em>", $lang->delivery_date_desc, $actions);

$form_container->output_row("{$lang->per_page}: <em>*</em>", $lang->per_page_desc, $form->generate_numeric_field('perpage', $input['perpage'], array('id' => 'perpage', 'min' => 1)), 'perpage');

	$form_container->output_row("{$lang->delivery_date}: <em>*</em>", $lang->delivery_date_desc, $actions);

$form_container->output_row("{$lang->per_page}: <em>*</em>", $lang->per_page_desc, $form->generate_numeric_field('perpage', $input['perpage'], array('id' => 'perpage', 'min' => 1)), 'perpage');





	$format_options = array(
0 => $lang->plain_text_only,
1 => $lang->html_only,
2 => $lang->html_and_plain_text

	$format_options = array(
0 => $lang->plain_text_only,
1 => $lang->html_only,
2 => $lang->html_and_plain_text

	);

$form_container->output_row("{$lang->message_format}: <em>*</em>", "", $form->generate_select_box('format', $format_options, $input['format'], array('id' => 'format')), 'format', null, array("id" => "format_container"));


	);

$form_container->output_row("{$lang->message_format}: <em>*</em>", "", $form->generate_select_box('format', $format_options, $input['format'], array('id' => 'format')), 'format', null, array("id" => "format_container"));


	$form_container->end();

	$form_container->end();

 

$automatic_text_check = '';
$text_display = '';
$automatic_display = '';
$html_display = '';


if($input['format'] == 2)
{


if($input['format'] == 2)
{

		if($input['automatic_text'] && !$email['mid'])

		if(!empty($input['automatic_text']) && empty($email['mid']))

		{
$automatic_text_check = true;
$text_display = 'display: none';

		{
$automatic_text_check = true;
$text_display = 'display: none';

Zeile 534Zeile 560
		}

</script>";

		}

</script>";

 

$options = array(
'username', 'email', 'postnum_dir', 'postnum', 'regdate', 'regdate_date', 'regdate_dir', 'lastactive', 'lastactive_date', 'lastactive_dir'
);

foreach($options as $option)
{
if(!isset($input['conditions'][$option]))
{
$input['conditions'][$option] = '';
}
}
if(!isset($input['conditions']['usergroup']) || !is_array($input['conditions']['usergroup']))
{
$input['conditions']['usergroup'] = array();
}


$form_container = new FormContainer("{$lang->edit_mass_mail}: {$lang->define_the_recipients}");



$form_container = new FormContainer("{$lang->edit_mass_mail}: {$lang->define_the_recipients}");


Zeile 568Zeile 610
		"weeks" => $lang->weeks,
"months" => $lang->months,
"years" => $lang->years

		"weeks" => $lang->weeks,
"months" => $lang->months,
"years" => $lang->years

	);

	);

	$form_container->output_row($lang->user_registered, "", $form->generate_select_box('conditions[regdate_dir]', $more_options, $input['conditions']['regdate_dir'], array('id' => 'regdate_dir'))." ".$form->generate_numeric_field('conditions[regdate]', $input['conditions']['regdate'], array('id' => 'regdate', 'min' => 0))." ".$form->generate_select_box('conditions[regdate_date]', $date_options, $input['conditions']['regdate_date'], array('id' => 'regdate_date'))." {$lang->ago}", 'regdate');

$form_container->output_row($lang->user_last_active, "", $form->generate_select_box('conditions[lastactive_dir]', $more_options, $input['conditions']['lastactive_dir'], array('id' => 'lastactive_dir'))." ".$form->generate_numeric_field('conditions[lastactive]', $input['conditions']['lastactive'], array('id' => 'lastactive', 'min' => 0))." ".$form->generate_select_box('conditions[lastactive_date]', $date_options, $input['conditions']['lastactive_date'], array('id' => 'lastactive_date'))." {$lang->ago}", 'lastactive');

$form_container->end();

	$form_container->output_row($lang->user_registered, "", $form->generate_select_box('conditions[regdate_dir]', $more_options, $input['conditions']['regdate_dir'], array('id' => 'regdate_dir'))." ".$form->generate_numeric_field('conditions[regdate]', $input['conditions']['regdate'], array('id' => 'regdate', 'min' => 0))." ".$form->generate_select_box('conditions[regdate_date]', $date_options, $input['conditions']['regdate_date'], array('id' => 'regdate_date'))." {$lang->ago}", 'regdate');

$form_container->output_row($lang->user_last_active, "", $form->generate_select_box('conditions[lastactive_dir]', $more_options, $input['conditions']['lastactive_dir'], array('id' => 'lastactive_dir'))." ".$form->generate_numeric_field('conditions[lastactive]', $input['conditions']['lastactive'], array('id' => 'lastactive', 'min' => 0))." ".$form->generate_select_box('conditions[lastactive_date]', $date_options, $input['conditions']['lastactive_date'], array('id' => 'lastactive_date'))." {$lang->ago}", 'lastactive');

$form_container->end();





	$buttons[] = $form->generate_submit_button($lang->save_mass_mail);
$form->output_submit_wrapper($buttons);


	$buttons[] = $form->generate_submit_button($lang->save_mass_mail);
$form->output_submit_wrapper($buttons);


Zeile 586Zeile 628
{
$page->add_breadcrumb_item($lang->send_mass_mail);


{
$page->add_breadcrumb_item($lang->send_mass_mail);


	if($mybb->input['step'])

	if(($mybb->get_input('step')))

	{
$query = $db->simple_select("massemails", "*", "status=0 and mid='".$mybb->get_input('mid', MyBB::INPUT_INT)."'");
$email = $db->fetch_array($query);

	{
$query = $db->simple_select("massemails", "*", "status=0 and mid='".$mybb->get_input('mid', MyBB::INPUT_INT)."'");
$email = $db->fetch_array($query);

		if(!$email['mid'] && $mybb->input['step'] != 1)
{

		if(empty($email['mid']) && $mybb->input['step'] != 1)
{

			flash_message($lang->error_invalid_mid, 'error');
admin_redirect("index.php?module=user-mass_mail");
}

			flash_message($lang->error_invalid_mid, 'error');
admin_redirect("index.php?module=user-mass_mail");
}

Zeile 612Zeile 654
	}
$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";





	$plugins->run_hooks("admin_user_mass_email_send_start");

	$plugins->run_hooks("admin_user_mass_email_send_start");

	



	$localized_time_offset = (float)$mybb->user['timezone']*3600 + $mybb->user['dst']*3600;


	$localized_time_offset = (float)$mybb->user['timezone']*3600 + $mybb->user['dst']*3600;


	if($mybb->input['step'] == 4)

	if($mybb->get_input('step') == 4)

	{
// All done here
if($mybb->request_method == "post")

	{
// All done here
if($mybb->request_method == "post")

Zeile 655Zeile 697
					"status" => 1,
"senddate" => $delivery_date
);

					"status" => 1,
"senddate" => $delivery_date
);





				$plugins->run_hooks("admin_user_mass_email_send_finalize_commit");

$db->update_query("massemails", $updated_email, "mid='{$email['mid']}'");

				$plugins->run_hooks("admin_user_mass_email_send_finalize_commit");

$db->update_query("massemails", $updated_email, "mid='{$email['mid']}'");

Zeile 667Zeile 709

// Show summary of the mass email we've just been creating and allow the user to specify the delivery date
$page->output_header("{$lang->send_mass_mail}: {$lang->step_four}");


// Show summary of the mass email we've just been creating and allow the user to specify the delivery date
$page->output_header("{$lang->send_mass_mail}: {$lang->step_four}");





		$page->output_nav_tabs($sub_tabs, 'send_mass_mail');

		$page->output_nav_tabs($sub_tabs, 'send_mass_mail');

 

$delivery_type_checked = array(
"now" => "",
"future" => "",
);


// If we have any error messages, show them
if($errors)
{
$page->output_inline_error($errors);
$input = $mybb->input;


// If we have any error messages, show them
if($errors)
{
$page->output_inline_error($errors);
$input = $mybb->input;

 

// Delivery type radio selection is to carry over in step 4 only
$input['delivery_type'] = $mybb->get_input('delivery_type');
if(empty($input['delivery_type']))
{
$input['delivery_type'] = "now";
}
$delivery_type_checked[$input['delivery_type']] = " checked=\"checked\"";

		}
else
{

		}
else
{

Zeile 697Zeile 752
					$input['endtime_time'] = gmdate($mybb->settings['timeformat'], $email['senddate'] + $localized_time_offset);
$delivery_type_checked['future'] = " checked=\"checked\"";
}

					$input['endtime_time'] = gmdate($mybb->settings['timeformat'], $email['senddate'] + $localized_time_offset);
$delivery_type_checked['future'] = " checked=\"checked\"";
}

			}

			}

			else
{
$input['delivery_type'] = "now";

			else
{
$input['delivery_type'] = "now";

Zeile 737Zeile 792
			$format_preview.= "{$lang->html_based} - <a href=\"#\" onclick=\"javascript:MyBB.popupWindow('index.php?module=user-mass_mail&amp;action=preview&amp;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&amp;action=preview&amp;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&amp;action=send&amp;step=3&amp;mid={$email['mid']}\">{$lang->change_recipient_conds}</a>");

		// 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&amp;action=send&amp;step=3&amp;mid={$email['mid']}\">{$lang->change_recipient_conds}</a>");

Zeile 746Zeile 801

$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['endtime_time'])

		if(empty($input['endtime_time']))

		{
$input['endtime_time'] = gmdate($mybb->settings['timeformat'], TIME_NOW + $localized_time_offset);
}


		{
$input['endtime_time'] = gmdate($mybb->settings['timeformat'], TIME_NOW + $localized_time_offset);
}


		if(!$input['deliveryyear'])

		if(empty($input['deliveryyear']))

		{
$enddateyear = gmdate('Y', TIME_NOW + $localized_time_offset);
}

		{
$enddateyear = gmdate('Y', TIME_NOW + $localized_time_offset);
}

Zeile 760Zeile 815
			$enddateyear = (int)$input['deliveryyear'];
}


			$enddateyear = (int)$input['deliveryyear'];
}


		if(!$input['deliverymonth'])

		if(empty($input['deliverymonth']))

		{
$input['enddatemonth'] = gmdate('n', TIME_NOW + $localized_time_offset);
}

		{
$input['enddatemonth'] = gmdate('n', TIME_NOW + $localized_time_offset);
}

Zeile 769Zeile 824
			$input['enddatemonth'] = (int)$input['deliverymonth'];
}


			$input['enddatemonth'] = (int)$input['deliverymonth'];
}


		if(!$input['deliveryday'])

		if(empty($input['deliveryday']))

		{
$input['enddateday'] = gmdate('j', TIME_NOW + $localized_time_offset);
}

		{
$input['enddateday'] = gmdate('j', TIME_NOW + $localized_time_offset);
}

Zeile 859Zeile 914
				<dd style=\"margin-top: 4px;\" id=\"delivery_type_future\" class=\"delivery_types\">
<table cellpadding=\"4\">
<tr>

				<dd style=\"margin-top: 4px;\" id=\"delivery_type_future\" class=\"delivery_types\">
<table cellpadding=\"4\">
<tr>

							<td><select name=\"endtime_day\">\n{$enddateday}</select>\n &nbsp; \n<select name=\"endtime_month\">\n{$enddatemonth}</select>\n &nbsp; \n<input type=\"text\" name=\"endtime_year\" class=\"text_input\" value=\"{$enddateyear}\" size=\"4\" maxlength=\"4\" />\n - {$lang->time} ".$form->generate_text_box('endtime_time', $input['endtime_time'], array('id' => 'endtime_time', 'style' => 'width: 60px;'))."</td>

							<td><select name=\"endtime_day\">\n{$enddateday}</select>\n &nbsp; \n<select name=\"endtime_month\">\n{$enddatemonth}</select>\n &nbsp; \n<input type=\"text\" name=\"endtime_year\" class=\"text_input\" value=\"{$enddateyear}\" size=\"4\" maxlength=\"4\" />\n - ".$form->generate_text_box('endtime_time', $input['endtime_time'], array('id' => 'endtime_time', 'style' => 'width: 60px;'))."</td>

						</tr>
</table>
</dd>

						</tr>
</table>
</dd>

Zeile 877Zeile 932
		$form->end();
$page->output_footer();
}

		$form->end();
$page->output_footer();
}

	elseif($mybb->input['step'] == 3)

	elseif($mybb->get_input('step') == 3)

	{
// Define the recipients/conditions
if($mybb->request_method == "post")

	{
// Define the recipients/conditions
if($mybb->request_method == "post")

Zeile 995Zeile 1050
		$page->output_footer();
}
// Reviewing the automatic text based version of the message.

		$page->output_footer();
}
// Reviewing the automatic text based version of the message.

	elseif($mybb->input['step'] == 2)

	elseif($mybb->get_input('step') == 2)

	{
// Update text based version
if($mybb->request_method == "post")

	{
// Update text based version
if($mybb->request_method == "post")

Zeile 1040Zeile 1095
		$form->end();
$page->output_footer();
}

		$form->end();
$page->output_footer();
}

	elseif(!$mybb->input['step'] || $mybb->input['step'] == 1)

	elseif(!$mybb->get_input('step') || $mybb->get_input('step') == 1)

	{
if($mybb->request_method == "post")
{

	{
if($mybb->request_method == "post")
{

Zeile 1049Zeile 1104
				$errors[] = $lang->error_missing_subject;
}


				$errors[] = $lang->error_missing_subject;
}


			if($mybb->input['type'] == 1)

			if($mybb->get_input('type') == 1)

			{
if(!$mybb->input['message'])
{

			{
if(!$mybb->input['message'])
{

Zeile 1058Zeile 1113
			}
else
{

			}
else
{

				if($mybb->input['format'] == 2 && $mybb->input['automatic_text'] == 0 && !$mybb->input['message'])

				if($mybb->input['format'] == 2 && $mybb->get_input('automatic_text') == 0 && !$mybb->input['message'])

				{
$errors[] = $lang->error_missing_plain_text;
}

				{
$errors[] = $lang->error_missing_plain_text;
}

Zeile 1155Zeile 1210
		$page->output_header("{$lang->send_mass_mail}: {$lang->step_one}");

$mid_add = '';

		$page->output_header("{$lang->send_mass_mail}: {$lang->step_one}");

$mid_add = '';

		if($email['mid'])

		if(!empty($email['mid']))

		{
$mid_add = "&amp;mid={$email['mid']}";
}

		{
$mid_add = "&amp;mid={$email['mid']}";
}

Zeile 1169Zeile 1224
			$page->output_inline_error($errors);
$input = $mybb->input;
}

			$page->output_inline_error($errors);
$input = $mybb->input;
}

		else if(!$email)

		else if(empty($email))

		{
$input = array(
"type" => 0,

		{
$input = array(
"type" => 0,

Zeile 1185Zeile 1240

$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_one} - {$lang->message_settings}");



$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_one} - {$lang->message_settings}");


		$form_container->output_row("{$lang->subject}: <em>*</em>", $lang->subject_desc, $form->generate_text_box('subject', $input['subject'], array('id' => 'subject')), 'subject');

		$form_container->output_row("{$lang->subject}: <em>*</em>", $lang->subject_desc, $form->generate_text_box('subject', !empty($input['subject']) ? $input['subject'] : null, array('id' => 'subject')), 'subject');





		if($mybb->input['type'] == 0)

		if($mybb->get_input('type') == 0)

		{
$type_email_checked = true;
$type_pm_checked = false;
}

		{
$type_email_checked = true;
$type_pm_checked = false;
}

		else if($mybb->input['type'] == 1)

		else if($mybb->get_input('type') == 1)

		{
$type_email_checked = false;
$type_pm_checked = true;

		{
$type_email_checked = false;
$type_pm_checked = true;

 
		}
else
{
$type_email_checked = false;
$type_pm_checked = false;

		}

$type_options = array(

		}

$type_options = array(

Zeile 1203Zeile 1263
			$form->generate_radio_button("type", 1, $lang->send_via_pm, array("id" => "type_pm", "checked" => $type_pm_checked))
);
$form_container->output_row("{$lang->message_type}:", "", implode("<br />", $type_options));

			$form->generate_radio_button("type", 1, $lang->send_via_pm, array("id" => "type_pm", "checked" => $type_pm_checked))
);
$form_container->output_row("{$lang->message_type}:", "", implode("<br />", $type_options));





		$format_options = array(
0 => $lang->plain_text_only,
1 => $lang->html_only,

		$format_options = array(
0 => $lang->plain_text_only,
1 => $lang->html_only,

Zeile 1213Zeile 1273
		$form_container->output_row("{$lang->message_format}:", "", $form->generate_select_box('format', $format_options, $input['format'], array('id' => 'format')), 'format', null, array("id" => "format_container"));

$form_container->output_row("{$lang->per_page}: <em>*</em>", $lang->per_page_desc, $form->generate_numeric_field('perpage', $input['perpage'], array('id' => 'perpage', 'min' => 1)), 'perpage');

		$form_container->output_row("{$lang->message_format}:", "", $form->generate_select_box('format', $format_options, $input['format'], array('id' => 'format')), 'format', null, array("id" => "format_container"));

$form_container->output_row("{$lang->per_page}: <em>*</em>", $lang->per_page_desc, $form->generate_numeric_field('perpage', $input['perpage'], array('id' => 'perpage', 'min' => 1)), 'perpage');


$form_container->end();

if($mybb->input['format'] == 2)
{
if($mybb->input['automatic_text'] && !$email['mid'])
{







$form_container->end();

$automatic_text_check = false;
$text_display = null;
$automatic_display = null;
$html_display = null;

if($mybb->get_input('format') == 2)
{
if($mybb->get_input('automatic_text') && !$email['mid'])
{

				$automatic_text_check = true;
$text_display = 'display: none';
$automatic_display = 'display: none;';
}

				$automatic_text_check = true;
$text_display = 'display: none';
$automatic_display = 'display: none;';
}

		}
else if($mybb->input['format'] == 1 && $mybb->input['type'] != 1)
{

		}
else if($mybb->get_input('format') == 1 && $mybb->get_input('type') != 1)
{

			$text_display = 'display: none;';
}

			$text_display = 'display: none;';
}

		else if($mybb->input['format'] == 0 || $mybb->input['type'] == 1)

		else if($mybb->get_input('format') == 0 || $mybb->get_input('type') == 1)

		{
$html_display = 'display: none';
}

echo "<div id=\"message_html\" style=\"{$html_display}\">";
$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_one} - {$lang->define_html_message}");

		{
$html_display = 'display: none';
}

echo "<div id=\"message_html\" style=\"{$html_display}\">";
$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_one} - {$lang->define_html_message}");

		$form_container->output_row("{$lang->define_html_message_desc}:", $html_personalisation, $form->generate_text_area('htmlmessage', $input['htmlmessage'], array('id' => 'htmlmessage', 'rows' => 15, 'cols '=> 70, 'style' => 'width: 95%'))."<div id=\"automatic_display\" style=\"{$automatic_display}\">".$form->generate_check_box('automatic_text', 1, $lang->auto_gen_plain_text, array('checked' => $automatic_text_check, "id" => "automatic_text"))."</div>");

		$form_container->output_row("{$lang->define_html_message_desc}:", $html_personalisation, $form->generate_text_area('htmlmessage', !empty($input['htmlmessage']) ? $input['htmlmessage'] : null, array('id' => 'htmlmessage', 'rows' => 15, 'cols '=> 70, 'style' => 'width: 95%'))."<div id=\"automatic_display\" style=\"{$automatic_display}\">".$form->generate_check_box('automatic_text', 1, $lang->auto_gen_plain_text, array('checked' => $automatic_text_check, "id" => "automatic_text"))."</div>");

		$form_container->end();
echo "</div>";

echo "<div id=\"message_text\" style=\"{$text_display}\">";
$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_one} - {$lang->define_text_version}");

		$form_container->end();
echo "</div>";

echo "<div id=\"message_text\" style=\"{$text_display}\">";
$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_one} - {$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->output_row("{$lang->define_text_version_desc}:", $text_personalisation, $form->generate_text_area('message', !empty($input['message']) ? $input['message'] : null, array('id' => 'message', 'rows' => 15, 'cols '=> 70, 'style' => 'width: 95%')));

		$form_container->end();
echo "</div>";


		$form_container->end();
echo "</div>";


Zeile 1256Zeile 1321
				$('#automatic_display').show();
$('#message_html').show();
if($('#automatic_text').checked)

				$('#automatic_display').show();
$('#message_html').show();
if($('#automatic_text').checked)

				{

				{

					$('#message_text').hide();
}
else

					$('#message_text').hide();
}
else

Zeile 1297Zeile 1362
			}
}
$('#type_pm').on('click', function() {

			}
}
$('#type_pm').on('click', function() {

			ToggleType();
});

			ToggleType();
});

		$('#type_email').on('click', function() {
ToggleType();
});

		$('#type_email').on('click', function() {
ToggleType();
});

Zeile 1319Zeile 1384

$('#automatic_text').on('click', function() {
ToggleAutomatic();


$('#automatic_text').on('click', function() {
ToggleAutomatic();

		});

		});


function insertText(value, textarea)
{


function insertText(value, textarea)
{

Zeile 1357Zeile 1422
}

if($mybb->input['action'] == "delete")

}

if($mybb->input['action'] == "delete")

{
$query = $db->simple_select("massemails", "*", "mid='".$mybb->get_input('mid', MyBB::INPUT_INT)."'");
$mass_email = $db->fetch_array($query);


{
$query = $db->simple_select("massemails", "*", "mid='".$mybb->get_input('mid', MyBB::INPUT_INT)."'");
$mass_email = $db->fetch_array($query);


	if(!$mass_email['mid'])
{
flash_message($lang->error_delete_invalid_mid, 'error');

	if(!$mass_email['mid'])
{
flash_message($lang->error_delete_invalid_mid, 'error');

		admin_redirect("index.php?module=user-mass_mail");
}


		admin_redirect("index.php?module=user-mass_mail");
}


	// User clicked no

	// User clicked no

	if($mybb->input['no'])
{

	if($mybb->get_input('no'))
{

		admin_redirect("index.php?module=user-mass_mail");
}

		admin_redirect("index.php?module=user-mass_mail");
}





	$plugins->run_hooks("admin_user_mass_email_delete_start");

if($mybb->request_method == "post")

	$plugins->run_hooks("admin_user_mass_email_delete_start");

if($mybb->request_method == "post")

Zeile 1382Zeile 1447
		$plugins->run_hooks("admin_user_mass_email_delete_commit");

// Log admin action

		$plugins->run_hooks("admin_user_mass_email_delete_commit");

// Log admin action

		log_admin_action($mass_email['mid'], $mass_email['subject']);

		log_admin_action($mass_email['mid'], $mass_email['subject']);





		if($mybb->input['archive'] == 1)

		if($mybb->get_input('archive') == 1)

		{
flash_message($lang->success_mass_mail_deleted, 'success');
admin_redirect("index.php?module=user-mass_mail&action=archive");

		{
flash_message($lang->success_mass_mail_deleted, 'success');
admin_redirect("index.php?module=user-mass_mail&action=archive");

Zeile 1423Zeile 1488

echo '<div class="modal">
<div style="overflow-y: auto; max-height: 400px;">';


echo '<div class="modal">
<div style="overflow-y: auto; max-height: 400px;">';

	



	$table = new Table();

	$table = new Table();

	



	if($mybb->input['format'] == 'text' || !$mass_email['htmlmessage'])
{
// Show preview of the text version

	if($mybb->input['format'] == 'text' || !$mass_email['htmlmessage'])
{
// Show preview of the text version

Zeile 1496Zeile 1561

if($mybb->input['action'] == "cancel")
{


if($mybb->input['action'] == "cancel")
{

	if(!verify_post_check($mybb->input['my_post_key']))

	if(!verify_post_check($mybb->get_input('my_post_key')))

	{
flash_message($lang->invalid_post_verify_key2, 'error');
admin_redirect("index.php?module=user-users");

	{
flash_message($lang->invalid_post_verify_key2, 'error');
admin_redirect("index.php?module=user-users");

Zeile 1574Zeile 1639
	{
$table->construct_cell($lang->no_archived_messages, array('colspan' => 6));
$table->construct_row();

	{
$table->construct_cell($lang->no_archived_messages, array('colspan' => 6));
$table->construct_row();

		$no_results = true;

 
	}

$plugins->run_hooks("admin_user_mass_email_archive_end");

	}

$plugins->run_hooks("admin_user_mass_email_archive_end");

Zeile 1657Zeile 1721
	{
$table->construct_cell($lang->no_unsent_messages, array('colspan' => 6));
$table->construct_row();

	{
$table->construct_cell($lang->no_unsent_messages, array('colspan' => 6));
$table->construct_row();

		$no_results = true;

 
	}

$plugins->run_hooks("admin_user_mass_email_end");

	}

$plugins->run_hooks("admin_user_mass_email_end");