Vergleich admin/modules/user/mass_mail.php - 1.8.7 - 1.8.8

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 82Zeile 82
	$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 = $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 95
		// 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 106
			$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 222Zeile 224
			}
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\"";
}
}

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

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























	{

	{

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

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

	}

if(!$input['deliveryyear'])
{

	}

if(!$input['deliveryyear'])
{

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

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

	}
else
{

	}
else
{

Zeile 279Zeile 259

if(!$input['deliverymonth'])
{


if(!$input['deliverymonth'])
{

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

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

	}
else
{

	}
else
{

Zeile 288Zeile 268

if(!$input['deliveryday'])
{


if(!$input['deliveryday'])
{

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

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

	}
else
{

	}
else
{

Zeile 557Zeile 537

$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 634Zeile 614
	$text_personalisation = substr($text_personalisation, 0, -2)."');\n// --></script>\n";

$plugins->run_hooks("admin_user_mass_email_send_start");

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

$plugins->run_hooks("admin_user_mass_email_send_start");

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


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


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

Zeile 648Zeile 630
			// 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 659Zeile 641
				$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 707Zeile 689
				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 766Zeile 746

$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'])
{
$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(!$input['endtime_time'])























		{

		{

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

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

		}

if(!$input['deliveryyear'])
{

		}

if(!$input['deliveryyear'])
{

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

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

		}
else
{

		}
else
{

Zeile 804Zeile 762

if(!$input['deliverymonth'])
{


if(!$input['deliverymonth'])
{

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

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

		}
else
{

		}
else
{

Zeile 813Zeile 771

if(!$input['deliveryday'])
{


if(!$input['deliveryday'])
{

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

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

		}
else
{

		}
else
{

Zeile 993Zeile 951

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