Vergleich admin/modules/user/mass_mail.php - 1.4.0 - 1.4.3

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 73Zeile 73
	$html_personalisation = $text_personalisation = "<script type=\"text/javascript\">\n<!--\ndocument.write('{$lang->personalize_message} ";
foreach($replacement_fields as $value => $name)
{

	$html_personalisation = $text_personalisation = "<script type=\"text/javascript\">\n<!--\ndocument.write('{$lang->personalize_message} ";
foreach($replacement_fields as $value => $name)
{

		$html_personalisation .= " [<a href=\"#\" onclick=\"$(\'htmlmessage\').value += \'{$value}\'; return false;\">{$name}</a>], ";
$text_personalisation .= " [<a href=\"#\" onclick=\"$(\'message\').value += \'{$value}\'; return false;\">{$name}</a>], ";

		$html_personalisation .= " [<a href=\"#\" onclick=\"insertText(\'{$value}\', \$(\'htmlmessage\')); return false;\">{$name}</a>], ";
$text_personalisation .= " [<a href=\"#\" onclick=\"insertText(\'{$value}\', \$(\'message\')); return false;\">{$name}</a>], ";

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

Zeile 515Zeile 515
	}

Event.observe($('automatic_text'), 'click', ToggleAutomatic);

	}

Event.observe($('automatic_text'), 'click', ToggleAutomatic);

 
	
function insertText(value, textarea)
{
// Internet Explorer
if(document.selection)
{
textarea.focus();
var selection = document.selection.createRange();
selection.text = value;
}
// Firefox
else if(textarea.selectionStart || textarea.selectionStart == '0')
{
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
textarea.value = textarea.value.substring(0, start) + value + textarea.value.substring(end, textarea.value.length);
}
else
{
textarea.value += value;
}
}

	
</script>";


	
</script>";


	$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->email_addr_contains, "", $form->generate_text_box('conditions[email]', $input['conditions']['email'], array('id' => 'email')), 'email');


	$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->email_addr_contains, "", $form->generate_text_box('conditions[email]', $input['conditions']['email'], array('id' => 'email')), 'email');


Zeile 527Zeile 549
	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');

$greater_options = array(

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

$greater_options = array(

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

	}


	}


	$replacement_fields = array(
"{username}" => $lang->username,
"{email}" => $lang->email_addr,

	$replacement_fields = array(
"{username}" => $lang->username,
"{email}" => $lang->email_addr,

Zeile 575Zeile 597
	$html_personalisation = $text_personalisation = "<script type=\"text/javascript\">\n<!--\ndocument.write('{$lang->personalize_message}: ";
foreach($replacement_fields as $value => $name)
{

	$html_personalisation = $text_personalisation = "<script type=\"text/javascript\">\n<!--\ndocument.write('{$lang->personalize_message}: ";
foreach($replacement_fields as $value => $name)
{

		$html_personalisation .= " [<a href=\"#\" onclick=\"$(\'htmlmessage\').value += \'{$value}\'; return false;\">{$name}</a>], ";
$text_personalisation .= " [<a href=\"#\" onclick=\"$(\'message\').value += \'{$value}\'; return false;\">{$name}</a>], ";

		$html_personalisation .= " [<a href=\"#\" onclick=\"insertText(\'{$value}\', \$(\'htmlmessage\')); return false;\">{$name}</a>], ";
$text_personalisation .= " [<a href=\"#\" onclick=\"insertText(\'{$value}\', \$(\'message\')); return false;\">{$name}</a>], ";

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

Zeile 615Zeile 637
			if(!$errors)
{
// Mark as queued for delivery

			if(!$errors)
{
// Mark as queued for delivery

				$updated_email = array(

				$updated_email = array(

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

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

Zeile 640Zeile 662
		else
{
if($email['senddate'] != 0)

		else
{
if($email['senddate'] != 0)

			{

			{

				$input = array();
if($email['senddate'] <= TIME_NOW)
{

				$input = array();
if($email['senddate'] <= TIME_NOW)
{

Zeile 688Zeile 710
		$table->construct_cell("<strong>{$lang->message}:</strong>");
$format_preview = '';
if($email['format'] == 0 || $email['format'] == 2)

		$table->construct_cell("<strong>{$lang->message}:</strong>");
$format_preview = '';
if($email['format'] == 0 || $email['format'] == 2)

		{

		{

			$format_preview .= "{$lang->text_based} - <a href=\"#\" onclick=\"javascript:MyBB.popupWindow('index.php?module=user/mass_mail&amp;action=preview&amp;mid={$email['mid']}&amp;format=text', 'preview', 450, 450);\">{$lang->preview}</a>";

			$format_preview .= "{$lang->text_based} - <a href=\"#\" onclick=\"javascript:MyBB.popupWindow('index.php?module=user/mass_mail&amp;action=preview&amp;mid={$email['mid']}&amp;format=text', 'preview', 450, 450);\">{$lang->preview}</a>";

		}

		}

		if($email['format'] == 2)
{
$format_preview .= " {$lang->and} <br />";

		if($email['format'] == 2)
{
$format_preview .= " {$lang->and} <br />";

		}

		}

		if($email['format'] == 1 || $email['format'] == 2)
{
$format_preview.= "{$lang->html_based} - <a href=\"#\" onclick=\"javascript:MyBB.popupWindow('index.php?module=user/mass_mail&amp;action=preview&amp;mid={$email['mid']}', 'preview', 450, 450);\">{$lang->preview}</a>";
}
$table->construct_cell($format_preview);

		if($email['format'] == 1 || $email['format'] == 2)
{
$format_preview.= "{$lang->html_based} - <a href=\"#\" onclick=\"javascript:MyBB.popupWindow('index.php?module=user/mass_mail&amp;action=preview&amp;mid={$email['mid']}', 'preview', 450, 450);\">{$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>");
$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>");
$table->construct_row();

		

		

		$table->output("{$lang->send_mass_mail}: {$lang->step_four} - {$lang->review_message}");

if($input['deliveryhour'])
{
$input['endtime_time'] = intval($input['deliveryhour']).":";
}

		$table->output("{$lang->send_mass_mail}: {$lang->step_four} - {$lang->review_message}");

if($input['deliveryhour'])
{
$input['endtime_time'] = intval($input['deliveryhour']).":";
}

		else
{
$input['endtime_time'] = "12:";
}

		else
{
$input['endtime_time'] = "12:";
}

		
if($input['deliveryminute'])

		
if($input['deliveryminute'])

		{

		{

			$input['endtime_time'] .= intval($input['deliveryminute'])." ";
}
else
{
$input['endtime_time'] .= "00 ";

			$input['endtime_time'] .= intval($input['deliveryminute'])." ";
}
else
{
$input['endtime_time'] .= "00 ";

		}

		}

		
if($input['deliverymeridiem'])

		
if($input['deliverymeridiem'])

		{

		{

			$input['endtime_time'] .= $input['deliverymeridiem'];

			$input['endtime_time'] .= $input['deliverymeridiem'];

		}

		}

		else
{
$input['endtime_time'] .= "am";
}

if(!$input['deliveryyear'])

		else
{
$input['endtime_time'] .= "am";
}

if(!$input['deliveryyear'])

		{

		{

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

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

		}
else
{

		}
else
{

			$enddateyear = intval($input['deliveryyear']);

			$enddateyear = intval($input['deliveryyear']);

		}

		}

		
if(!$input['deliverymonth'])
{
$input['enddatemonth'] = gmdate('n', TIME_NOW);

		
if(!$input['deliverymonth'])
{
$input['enddatemonth'] = gmdate('n', TIME_NOW);

		}
else

		}
else

		{
$input['enddatemonth'] = intval($input['deliverymonth']);

		{
$input['enddatemonth'] = intval($input['deliverymonth']);

		}

		}

		
if(!$input['deliveryday'])

		
if(!$input['deliveryday'])

		{

		{

			$input['enddateday'] = gmdate('j', TIME_NOW);
}
else
{
$input['enddateday'] = intval($input['deliveryday']);

			$input['enddateday'] = gmdate('j', TIME_NOW);
}
else
{
$input['enddateday'] = intval($input['deliveryday']);

		}

		}

		
$monthnames = array(
"offset",

		
$monthnames = array(
"offset",

Zeile 785Zeile 807
			if($month == "offset")
{
continue;

			if($month == "offset")
{
continue;

			}

			}

			
if($key == $input['enddatemonth'])
{

			
if($key == $input['enddatemonth'])
{

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

			else
{
$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 = new Form("index.php?module=user/mass_mail&amp;action=send&amp;step=4&amp;mid={$email['mid']}", "post");

Zeile 1001Zeile 1023
				if(!$mybb->input['message'])
{
$errors[] = $lang->error_missing_message;

				if(!$mybb->input['message'])
{
$errors[] = $lang->error_missing_message;

				}
}
else

				}
}
else

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

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

Zeile 1040Zeile 1062
							$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'] = '';

							$mybb->input['message'] = '';

						}

						}

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

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

Zeile 1051Zeile 1073

$new_email = array(
"uid" => $mybb->user['uid'],


$new_email = array(
"uid" => $mybb->user['uid'],

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

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

						"htmlmessage" => $db->escape_string($mybb->input['htmlmessage']),
"format" => intval($mybb->input['format']),
"type" => intval($mybb->input['type']),

						"htmlmessage" => $db->escape_string($mybb->input['htmlmessage']),
"format" => intval($mybb->input['format']),
"type" => intval($mybb->input['type']),

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

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

		}


		}


		$form = new Form("index.php?module=user/mass_mail&amp;action=send{$mid_add}", "post");
$page->output_nav_tabs($sub_tabs, 'send_mass_mail');


		$form = new Form("index.php?module=user/mass_mail&amp;action=send{$mid_add}", "post");
$page->output_nav_tabs($sub_tabs, 'send_mass_mail');


Zeile 1254Zeile 1276
		}

Event.observe($('automatic_text'), 'click', ToggleAutomatic);

		}

Event.observe($('automatic_text'), 'click', ToggleAutomatic);

 
		
function insertText(value, textarea)
{
// Internet Explorer
if(document.selection)
{
textarea.focus();
var selection = document.selection.createRange();
selection.text = value;
}
// Firefox
else if(textarea.selectionStart || textarea.selectionStart == '0')
{
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
textarea.value = textarea.value.substring(0, start) + value + textarea.value.substring(end, textarea.value.length);
}
else
{
textarea.value += value;
}
}

		
</script>";

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

		
</script>";

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





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

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





if($mybb->input['action'] == "delete")
{
$query = $db->simple_select("massemails", "*", "mid='".intval($mybb->input['mid'])."'");

if($mybb->input['action'] == "delete")
{
$query = $db->simple_select("massemails", "*", "mid='".intval($mybb->input['mid'])."'");

Zeile 1273Zeile 1317
	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
if($mybb->input['no'])


// User clicked no
if($mybb->input['no'])

Zeile 1290Zeile 1334

// Log admin action
log_admin_action($mass_email['mid'], $mass_email['subject']);


// Log admin action
log_admin_action($mass_email['mid'], $mass_email['subject']);


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









		
if($mybb->input['archive'] == 1)
{
flash_message($lang->success_mass_mail_deleted, 'success');
admin_redirect("index.php?module=user/mass_mail&action=archive");
}
else
{
flash_message($lang->success_mass_mail_deleted, 'success');
admin_redirect("index.php?module=user/mass_mail");
}

	}
else
{

	}
else
{

		$page->output_confirm_action("index.php?module=user/mass_mail&amp;action=delete&amp;mid={$mass_email['mid']}", $lang->mass_mail_deletion_confirmation);








		if($mybb->input['archive'] == 1)
{
$page->output_confirm_action("index.php?module=user/mass_mail&amp;action=delete&amp;mid={$mass_email['mid']}&amp;archive=1", $lang->mass_mail_deletion_confirmation);
}
else
{
$page->output_confirm_action("index.php?module=user/mass_mail&amp;action=delete&amp;mid={$mass_email['mid']}", $lang->mass_mail_deletion_confirmation);
}

	}
}


	}
}


Zeile 1368Zeile 1427
		"subject" => $db->escape_string($mass_email['subject']),
"message" => $db->escape_string($mass_email['message']),
"htmlmessage" => $db->escape_string($mass_email['htmlmessage']),

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

 
		"type" => $db->escape_string($mass_email['type']),

		"format" => $db->escape_string($mass_email['format']),
"dateline" => TIME_NOW,
"senddate" => '0',

		"format" => $db->escape_string($mass_email['format']),
"dateline" => TIME_NOW,
"senddate" => '0',

Zeile 1445Zeile 1505
		$table->construct_cell(my_number_format($email['totalcount']), array("class" => "align_center"));

$table->construct_cell("<a href=\"index.php?module=user/mass_mail&amp;action=resend&amp;mid={$email['mid']}\">{$lang->resend}</a>", array("width" => 100, "class" => "align_center"));

		$table->construct_cell(my_number_format($email['totalcount']), array("class" => "align_center"));

$table->construct_cell("<a href=\"index.php?module=user/mass_mail&amp;action=resend&amp;mid={$email['mid']}\">{$lang->resend}</a>", array("width" => 100, "class" => "align_center"));

		$table->construct_cell("<a href=\"index.php?module=user/mass_mail&amp;action=delete&amp;mid={$email['mid']}&amp;my_post_key={$mybb->post_code}\" onclick=\"return AdminCP.deleteConfirmation(this, '{$lang->mass_mail_deletion_confirmation}')\">{$lang->delete}</a>", array("width" => 100, "class" => "align_center"));

		$table->construct_cell("<a href=\"index.php?module=user/mass_mail&amp;action=delete&amp;mid={$email['mid']}&amp;my_post_key={$mybb->post_code}&amp;archive=1\" onclick=\"return AdminCP.deleteConfirmation(this, '{$lang->mass_mail_deletion_confirmation}')\">{$lang->delete}</a>", array("width" => 100, "class" => "align_center"));


$table->construct_row();
}


$table->construct_row();
}