phpBB

Code Changes

File: includes/acp/acp_email.php

  Unmodified   Added   Modified   Removed
Line 68Line 68
				$error[] = $user->lang['NO_EMAIL_MESSAGE'];
}


				$error[] = $user->lang['NO_EMAIL_MESSAGE'];
}


			if (!sizeof($error))

			if (!count($error))

			{
if (!empty($usernames))
{

			{
if (!empty($usernames))
{

Line 168Line 168
						{
$i = 0;


						{
$i = 0;


							if (sizeof($email_list))

							if (count($email_list))

							{
$j++;
}

							{
$j++;
}

Line 235Line 235
				);
extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars)));


				);
extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars)));


				for ($i = 0, $size = sizeof($email_list); $i < $size; $i++)

				for ($i = 0, $size = count($email_list); $i < $size; $i++)

				{
$used_lang = $email_list[$i][0]['lang'];
$used_method = $email_list[$i][0]['method'];


				{
$used_lang = $email_list[$i][0]['lang'];
$used_method = $email_list[$i][0]['method'];


					for ($j = 0, $list_size = sizeof($email_list[$i]); $j < $list_size; $j++)

					for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++)

					{
$email_row = $email_list[$i][$j];


					{
$email_row = $email_list[$i][$j];


						$messenger->{((sizeof($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']);

						$messenger->{((count($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']);

						$messenger->im($email_row['jabber'], $email_row['name']);
}


						$messenger->im($email_row['jabber'], $email_row['name']);
}


Line 322Line 322
		$s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . $user->lang['MAIL_HIGH_PRIORITY'] . '</option>';

$template_data = array(

		$s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . $user->lang['MAIL_HIGH_PRIORITY'] . '</option>';

$template_data = array(

			'S_WARNING'				=> (sizeof($error)) ? true : false,
'WARNING_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',

			'S_WARNING'				=> (count($error)) ? true : false,
'WARNING_MSG' => (count($error)) ? implode('<br />', $error) : '',

			'U_ACTION'				=> $this->u_action,
'S_GROUP_OPTIONS' => $select_list,
'USERNAMES' => implode("\n", $usernames),

			'U_ACTION'				=> $this->u_action,
'S_GROUP_OPTIONS' => $select_list,
'USERNAMES' => implode("\n", $usernames),