Vergleich admin/modules/user/mass_mail.php - 1.4.1 - 1.4.4

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 1334Zeile 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");
}
else
{
$page->output_confirm_action("index.php?module=user/mass_mail&action=delete&mid={$mass_email['mid']}", $lang->mass_mail_deletion_confirmation);
}
}
















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


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


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

	

	

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

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

Zeile 1367Zeile 1382
		<div class="popup_title"><a href="#" onClick="window.close();" class="close_link"><?php echo $lang->close_window; ?></a> Mass Email Preview</div>

<div id="content">

		<div class="popup_title"><a href="#" onClick="window.close();" class="close_link"><?php echo $lang->close_window; ?></a> Mass Email Preview</div>

<div id="content">

	<?php

	<?php

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

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

		exit;

 
	}
else
{
// Preview the HTML version
echo $mass_email['htmlmessage'];

	}
else
{
// Preview the HTML version
echo $mass_email['htmlmessage'];

		exit;

 
	}

?>

	}

?>

Zeile 1388Zeile 1401
	</body>
</html>
<?php

	</body>
</html>
<?php

 
	exit;

}

}

 


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

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

Zeile 1412Zeile 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 1489Zeile 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();
}