Vergleich admin/modules/user/mass_mail.php - 1.8.0 - 1.8.6

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 45Zeile 45
{
$page->add_breadcrumb_item($lang->edit_mass_mail);


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


	$query = $db->simple_select("massemails", "*", "mid='".$mybb->get_input('mid', 1)."'");

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

	$email = $db->fetch_array($query);
if(!$email['mid'])
{

	$email = $db->fetch_array($query);
if(!$email['mid'])
{

Zeile 181Zeile 181
				"status" => 1,
"senddate" => $delivery_date,
"totalcount" => $num,

				"status" => 1,
"senddate" => $delivery_date,
"totalcount" => $num,

				"conditions" => $db->escape_string(serialize($mybb->input['conditions'])),

				"conditions" => $db->escape_string(my_serialize($mybb->input['conditions'])),

				"message" => $db->escape_string($mybb->input['message']),
"subject" => $db->escape_string($mybb->input['subject']),
"htmlmessage" => $db->escape_string($mybb->input['htmlmessage']),

				"message" => $db->escape_string($mybb->input['message']),
"subject" => $db->escape_string($mybb->input['subject']),
"htmlmessage" => $db->escape_string($mybb->input['htmlmessage']),

				"format" => (int)$mybb->input['format'],
"type" => $mybb->get_input('type', 1),
"perpage" => $mybb->get_input('perpage', 1)

				"format" => $mybb->get_input('format', MyBB::INPUT_INT),
"type" => $mybb->get_input('type', MyBB::INPUT_INT),
"perpage" => $mybb->get_input('perpage', MyBB::INPUT_INT)

			);

$plugins->run_hooks("admin_user_mass_email_edit_commit");

			);

$plugins->run_hooks("admin_user_mass_email_edit_commit");

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


		</script>";
$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_text_box('perpage', $input['perpage'], array('id' => 'perpage')), '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');


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


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

Zeile 575Zeile 575
		"is_exactly" => $lang->is_exactly,
"less_than" => $lang->less_than
);

		"is_exactly" => $lang->is_exactly,
"less_than" => $lang->less_than
);

	$form_container->output_row($lang->post_count_is, "", $form->generate_select_box('conditions[postnum_dir]', $greater_options, $input['conditions']['postnum_dir'], array('id' => 'postnum_dir'))." ".$form->generate_text_box('conditions[postnum]', $input['conditions']['postnum'], array('id' => 'postnum')), 'postnum');

	$form_container->output_row($lang->post_count_is, "", $form->generate_select_box('conditions[postnum_dir]', $greater_options, $input['conditions']['postnum_dir'], array('id' => 'postnum_dir'))." ".$form->generate_numeric_field('conditions[postnum]', $input['conditions']['postnum'], array('id' => 'postnum', 'min' => 0)), 'postnum');


$more_options = array(
"more_than" => $lang->more_than,


$more_options = array(
"more_than" => $lang->more_than,

Zeile 589Zeile 589
		"months" => $lang->months,
"years" => $lang->years
);

		"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_text_box('conditions[regdate]', $input['conditions']['regdate'], array('id' => 'regdate'))." ".$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_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_text_box('conditions[lastactive]', $input['conditions']['lastactive'], array('id' => 'lastactive'))." ".$form->generate_select_box('conditions[lastactive_date]', $date_options, $input['conditions']['lastactive_date'], array('id' => 'lastactive_date'))." {$lang->ago}", 'lastactive');

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


Zeile 608Zeile 608

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


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

		$query = $db->simple_select("massemails", "*", "status=0 and mid='".$mybb->get_input('mid', 1)."'");

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

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

Zeile 938Zeile 938
			{
$updated_email = array(
"totalcount" => $num,

			{
$updated_email = array(
"totalcount" => $num,

					"conditions" => $db->escape_string(serialize($mybb->input['conditions']))

					"conditions" => $db->escape_string(my_serialize($mybb->input['conditions']))

				);

$plugins->run_hooks("admin_user_mass_email_send_define_commit");

				);

$plugins->run_hooks("admin_user_mass_email_send_define_commit");

Zeile 1010Zeile 1010
			"is_exactly" => $lang->is_exactly,
"less_than" => $lang->less_than
);

			"is_exactly" => $lang->is_exactly,
"less_than" => $lang->less_than
);

		$form_container->output_row($lang->post_count_is, "", $form->generate_select_box('conditions[postnum_dir]', $greater_options, $input['conditions']['postnum_dir'], array('id' => 'postnum_dir'))." ".$form->generate_text_box('conditions[postnum]', $input['conditions']['postnum'], array('id' => 'postnum')), 'postnum');

		$form_container->output_row($lang->post_count_is, "", $form->generate_select_box('conditions[postnum_dir]', $greater_options, $input['conditions']['postnum_dir'], array('id' => 'postnum_dir'))." ".$form->generate_numeric_field('conditions[postnum]', $input['conditions']['postnum'], array('id' => 'postnum', 'min' => 0)), 'postnum');


$more_options = array(
"more_than" => $lang->more_than,


$more_options = array(
"more_than" => $lang->more_than,

Zeile 1024Zeile 1024
			"months" => $lang->months,
"years" => $lang->years
);

			"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_text_box('conditions[regdate]', $input['conditions']['regdate'], array('id' => 'regdate'))." ".$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_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_text_box('conditions[lastactive]', $input['conditions']['lastactive'], array('id' => 'lastactive'))." ".$form->generate_select_box('conditions[lastactive_date]', $date_options, $input['conditions']['lastactive_date'], array('id' => 'lastactive_date'))." {$lang->ago}", 'lastactive');

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


Zeile 1149Zeile 1149
						"subject" => $db->escape_string($mybb->input['subject']),
"message" => $db->escape_string($mybb->input['message']),
"htmlmessage" => $db->escape_string($mybb->input['htmlmessage']),

						"subject" => $db->escape_string($mybb->input['subject']),
"message" => $db->escape_string($mybb->input['message']),
"htmlmessage" => $db->escape_string($mybb->input['htmlmessage']),

						"format" => (int)$mybb->input['format'],
"type" => $mybb->get_input('type', 1),

						"format" => $mybb->get_input('format', MyBB::INPUT_INT),
"type" => $mybb->get_input('type', MyBB::INPUT_INT),

						"dateline" => TIME_NOW,
"senddate" => 0,
"status" => 0,
"sentcount" => 0,
"totalcount" => 0,
"conditions" => "",

						"dateline" => TIME_NOW,
"senddate" => 0,
"status" => 0,
"sentcount" => 0,
"totalcount" => 0,
"conditions" => "",

						"perpage" => $mybb->get_input('perpage', 1)

						"perpage" => $mybb->get_input('perpage', MyBB::INPUT_INT)

					);

$mid = $db->insert_query("massemails", $new_email);

					);

$mid = $db->insert_query("massemails", $new_email);

Zeile 1171Zeile 1171
						"subject" => $db->escape_string($mybb->input['subject']),
"message" => $db->escape_string($mybb->input['message']),
"htmlmessage" => $db->escape_string($mybb->input['htmlmessage']),

						"subject" => $db->escape_string($mybb->input['subject']),
"message" => $db->escape_string($mybb->input['message']),
"htmlmessage" => $db->escape_string($mybb->input['htmlmessage']),

						"format" => (int)$mybb->input['format'],
"type" => $mybb->get_input('type', 1),
"perpage" => $mybb->get_input('perpage', 1)

						"format" => $mybb->get_input('format', MyBB::INPUT_INT),
"type" => $mybb->get_input('type', MyBB::INPUT_INT),
"perpage" => $mybb->get_input('perpage', MyBB::INPUT_INT)

					);

$plugins->run_hooks("admin_user_mass_email_send_update_commit");

					);

$plugins->run_hooks("admin_user_mass_email_send_update_commit");

Zeile 1254Zeile 1254

$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_text_box('perpage', $input['perpage'], array('id' => 'perpage')), '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();



$form_container->end();


Zeile 1400Zeile 1400

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


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

	$query = $db->simple_select("massemails", "*", "mid='".$mybb->get_input('mid', 1)."'");

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

	$mass_email = $db->fetch_array($query);

if(!$mass_email['mid'])

	$mass_email = $db->fetch_array($query);

if(!$mass_email['mid'])

Zeile 1452Zeile 1452

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


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

	$query = $db->simple_select("massemails", "*", "mid='".$mybb->get_input('mid', 1)."'");

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

	$mass_email = $db->fetch_array($query);

if(!$mass_email['mid'])

	$mass_email = $db->fetch_array($query);

if(!$mass_email['mid'])

Zeile 1493Zeile 1493
if($mybb->input['action'] == "resend")
{
// Copy and resend an email

if($mybb->input['action'] == "resend")
{
// Copy and resend an email

	$query = $db->simple_select("massemails", "*", "mid='".$mybb->get_input('mid', 1)."'");

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

	$mass_email = $db->fetch_array($query);

if(!$mass_email['mid'])

	$mass_email = $db->fetch_array($query);

if(!$mass_email['mid'])

Zeile 1538Zeile 1538

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


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

 
	if(!verify_post_check($mybb->input['my_post_key']))
{
flash_message($lang->invalid_post_verify_key2, 'error');
admin_redirect("index.php?module=user-users");
}


	// Cancel the delivery of a mass-email.

	// Cancel the delivery of a mass-email.

	$query = $db->simple_select("massemails", "*", "mid='".$mybb->get_input('mid', 1)."'");

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

	$mass_email = $db->fetch_array($query);

if(!$mass_email['mid'])

	$mass_email = $db->fetch_array($query);

if(!$mass_email['mid'])