Vergleich admin/modules/user/mass_mail.php - 1.8.7 - 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 81Zeile 97
	}
$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 93Zeile 111
		// 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 104Zeile 122
			$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 135Zeile 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 145Zeile 163
				$errors[] = $lang->error_missing_html;
}
else if($mybb->input['format'] == 0 && !$mybb->input['message'])

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

			{

			{

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

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

Zeile 162Zeile 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']);
}
else if($mybb->input['format'] == 1)

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

				{

				{

					$mybb->input['message'] = '';
}
else if($mybb->input['format'] == 0)

					$mybb->input['message'] = '';
}
else if($mybb->input['format'] == 0)

Zeile 202Zeile 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 222Zeile 245
			}
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\"";

			}
}
else

			}
}
else

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

		{
$input['delivery_type'] = "now";
$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(empty($input['endtime_time']))





	{

	{

		$input['endtime_time'] .= "am";

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

	}


	}


	if(!$input['deliveryyear'])

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

	{

	{

		$enddateyear = gmdate('Y', TIME_NOW);

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

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


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


	if(!$input['deliverymonth'])

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

	{

	{

		$input['enddatemonth'] = gmdate('n', TIME_NOW);

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

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


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


	if(!$input['deliveryday'])

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

	{

	{

		$input['enddateday'] = gmdate('j', TIME_NOW);

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

	}
else
{

	}
else
{

Zeile 403Zeile 404
			<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\" 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 424Zeile 425
	$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->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();

 

$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_display = 'display: none;';
}

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

	}

	}

	else if($input['format'] == 1 && $input['type'] != 1)

	else if($input['format'] == 1 && $input['type'] != 1)

	{

	{

		$text_display = 'display: none;';
}
else if($input['format'] == 0 || $input['type'] == 1)
{
$html_display = 'display: none';

		$text_display = 'display: none;';
}
else if($input['format'] == 0 || $input['type'] == 1)
{
$html_display = 'display: none';

	}

	}


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


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

Zeile 519Zeile 525
			if(v == true)
{
$('#message_text').hide();

			if(v == true)
{
$('#message_text').hide();

			}
else
{

			}
else
{

				$('#message_text').show();
}
}

				$('#message_text').show();
}
}

Zeile 536Zeile 542
			// Internet Explorer
if(document.selection)
{

			// Internet Explorer
if(document.selection)
{

				textarea.focus();

				textarea.trigger('focus');

				var selection = document.selection.createRange();
selection.text = value;
}

				var selection = document.selection.createRange();
selection.text = value;
}

Zeile 554Zeile 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}");


	$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 606Zeile 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 635Zeile 657

$plugins->run_hooks("admin_user_mass_email_send_start");



$plugins->run_hooks("admin_user_mass_email_send_start");


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



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

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

	{
// All done here
if($mybb->request_method == "post")
{
// Sending this message now
if($mybb->input['delivery_type'] == "now")

	{
// All done here
if($mybb->request_method == "post")
{
// Sending this message now
if($mybb->input['delivery_type'] == "now")

			{

			{

				$delivery_date = TIME_NOW;
}
// Delivering in the future
else
{

				$delivery_date = TIME_NOW;
}
// 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;

				}


				}


				$exploded = explode(':', $mybb->input['endtime_time']);
$mybb->input['deliveryhour'] = (int)$exploded[0];

$exploded = explode(' ', $exploded[1]);
$mybb->input['deliveryminute'] = (int)$exploded[0];


				$exploded = explode(':', $mybb->input['endtime_time']);
$mybb->input['deliveryhour'] = (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 687Zeile 711
		$page->output_header("{$lang->send_mass_mail}: {$lang->step_four}");

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

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

$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)


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

		{

		{

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

			$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
{
$input = array();
if($email['senddate'] != 0)

		}
else
{
$input = array();
if($email['senddate'] != 0)

			{

			{

				if($email['senddate'] <= TIME_NOW)
{
$input['delivery_type'] = "now";

				if($email['senddate'] <= TIME_NOW)
{
$input['delivery_type'] = "now";

Zeile 707Zeile 744
				else
{
$input['delivery_type'] = "future";

				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 763Zeile 798
		$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>");
$table->construct_row();

		$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>");
$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'])






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

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

		{

		{

			$input['endtime_time'] = (int)$input['deliveryhour'].":";

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

		}

		}

		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
{
$input['endtime_time'] .= "am";
}

if(!$input['deliveryyear'])
{
$enddateyear = gmdate('Y', TIME_NOW);
}
else
{
$enddateyear = (int)$input['deliveryyear'];

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




























		}


		}


		if(!$input['deliverymonth'])

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

		{

		{

			$input['enddatemonth'] = gmdate('n', TIME_NOW);

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

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

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

		}

		}





		if(!$input['deliveryday'])

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

		{

		{

			$input['enddateday'] = gmdate('j', TIME_NOW);

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

		}
else
{

		}
else
{

Zeile 848Zeile 861
			{
$enddatemonth .= "<option value=\"{$key}\" selected=\"selected\">{$month}</option>\n";
}

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

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

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


$enddateday = "";



$enddateday = "";


Zeile 868Zeile 881
				$enddateday .= "<option value=\"{$i}\">{$i}</option>\n";
}
}

				$enddateday .= "<option value=\"{$i}\">{$i}</option>\n";
}
}





		$form = new Form("index.php?module=user-mass_mail&amp;action=send&amp;step=4&amp;mid={$email['mid']}", "post");
$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_four} - {$lang->define_delivery_date}");


		$form = new Form("index.php?module=user-mass_mail&amp;action=send&amp;step=4&amp;mid={$email['mid']}", "post");
$form_container = new FormContainer("{$lang->send_mass_mail}: {$lang->step_four} - {$lang->define_delivery_date}");


Zeile 901Zeile 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 919Zeile 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 947Zeile 960

// Take the user to the next step
admin_redirect("index.php?module=user-mass_mail&action=send&step=4&mid={$email['mid']}");


// Take the user to the next step
admin_redirect("index.php?module=user-mass_mail&action=send&step=4&mid={$email['mid']}");

			}

			}

		}

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

		}

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

Zeile 993Zeile 1006

$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();

Zeile 1001Zeile 1014
		while($usergroup = $db->fetch_array($query))
{
$options[$usergroup['gid']] = $usergroup['title'];

		while($usergroup = $db->fetch_array($query))
{
$options[$usergroup['gid']] = $usergroup['title'];

		}

		}


$form_container->output_row($lang->members_of, $lang->additional_user_groups_desc, $form->generate_select_box('conditions[usergroup][]', $options, $input['conditions']['usergroup'], array('id' => 'usergroups', 'multiple' => true, 'size' => 5)), 'usergroups');



$form_container->output_row($lang->members_of, $lang->additional_user_groups_desc, $form->generate_select_box('conditions[usergroup][]', $options, $input['conditions']['usergroup'], array('id' => 'usergroups', 'multiple' => true, 'size' => 5)), 'usergroups');


Zeile 1037Zeile 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")
{
if(!trim($mybb->input['message']))

		// Update text based version
if($mybb->request_method == "post")
{
if(!trim($mybb->input['message']))

			{

			{

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

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

Zeile 1051Zeile 1064
				$updated_email = array(
"message" => $db->escape_string($mybb->input['message'])
);

				$updated_email = array(
"message" => $db->escape_string($mybb->input['message'])
);





				$plugins->run_hooks("admin_user_mass_email_send_review_commit");

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

				$plugins->run_hooks("admin_user_mass_email_send_review_commit");

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





				// Take the user to the next step
admin_redirect("index.php?module=user-mass_mail&action=send&step=3&mid={$email['mid']}");
}

				// Take the user to the next step
admin_redirect("index.php?module=user-mass_mail&action=send&step=3&mid={$email['mid']}");
}

Zeile 1082Zeile 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 1091Zeile 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 1100Zeile 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 1197Zeile 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 1211Zeile 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 1227Zeile 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 1245Zeile 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,
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}:", "", $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}:", "", $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->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';
}

		{
$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}");

		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 1296Zeile 1319
			if(v == 2)
{
$('#automatic_display').show();

			if(v == 2)
{
$('#automatic_display').show();

				$('#message_html').show();

				$('#message_html').show();

				if($('#automatic_text').checked)
{
$('#message_text').hide();

				if($('#automatic_text').checked)
{
$('#message_text').hide();

Zeile 1305Zeile 1328
				{
$('#message_text').show();
}

				{
$('#message_text').show();
}

			}

			}

			else if(v == 1)

			else if(v == 1)

			{

			{

				$('#message_text').hide();
$('#message_html').show();
$('#automatic_display').hide();

				$('#message_text').hide();
$('#message_html').show();
$('#automatic_display').hide();

			}
else
{
$('#message_text').show();
$('#message_html').hide();
}
}

			}
else
{
$('#message_text').show();
$('#message_html').hide();
}
}

		$(document).on('change', '#format', function() {
ToggleFormat();
});

		$(document).on('change', '#format', function() {
ToggleFormat();
});

Zeile 1369Zeile 1392
			// Internet Explorer
if(document.selection)
{

			// Internet Explorer
if(document.selection)
{

				textarea.focus();

				textarea.trigger('focus');

				var selection = document.selection.createRange();
selection.text = value;
}

				var selection = document.selection.createRange();
selection.text = value;
}

Zeile 1399Zeile 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 1424Zeile 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 1465Zeile 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 1538Zeile 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 1616Zeile 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 1699Zeile 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");