Vergleich admin/modules/user/mass_mail.php - 1.6.9 - 1.6.13

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 184Zeile 184
				"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']),

 
				"perpage" => intval($mybb->input['perpage'])

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


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


Zeile 661Zeile 662
		}
else
{

		}
else
{

 
			$input = array();

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

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

				$input = array();

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

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

Zeile 730Zeile 731
		$table->construct_row();

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

		$table->construct_row();

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

		

		

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

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

Zeile 739Zeile 740
		{
$input['endtime_time'] = "12:";
}

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

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

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

		{
$input['endtime_time'] .= "00 ";

		{
$input['endtime_time'] .= "00 ";

		}

if($input['deliverymeridiem'])

		}

if($input['deliverymeridiem'])

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

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

		}
else

		}
else

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

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

Zeile 761Zeile 762
		if(!$input['deliveryyear'])
{
$enddateyear = gmdate('Y', TIME_NOW);

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

		}
else
{

		}
else
{

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


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


Zeile 831Zeile 832
			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 898Zeile 899
			if($num == 0)
{
$errors[] = $lang->error_no_users;

			if($num == 0)
{
$errors[] = $lang->error_no_users;

			}

			}

			// Got one or more results
else
{

			// Got one or more results
else
{

Zeile 907Zeile 908
					"conditions" => $db->escape_string(serialize($mybb->input['conditions']))
);
$db->update_query("massemails", $updated_email, "mid='{$email['mid']}'");

					"conditions" => $db->escape_string(serialize($mybb->input['conditions']))
);
$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=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 923Zeile 924
		{
$page->output_inline_error($errors);
$input = $mybb->input;

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

		}

		}

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

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

			{

			{

				$input = array(
"conditions" => unserialize($email['conditions'])
);
}

				$input = array(
"conditions" => unserialize($email['conditions'])
);
}

 
			else
{
$input = array();
}
}

$options = array(
'username', 'email', 'postnum_dir', 'numposts'
);

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

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


 
		$options = array();

		$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{

		$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{