phpBB

Code Changes

File: includes/acp/acp_email.php

  Unmodified   Added   Modified   Removed
Line 25Line 25

function main($id, $mode)
{


function main($id, $mode)
{

		global $config, $db, $user, $auth, $template, $cache;
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $phpbb_dispatcher;

		global $config, $db, $user, $template, $phpbb_log, $request;
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_dispatcher;


$user->add_lang('acp/email');
$this->tpl_name = 'acp_email';


$user->add_lang('acp/email');
$this->tpl_name = 'acp_email';

Line 39Line 39
		$submit = (isset($_POST['submit'])) ? true : false;
$error = array();


		$submit = (isset($_POST['submit'])) ? true : false;
$error = array();


		$usernames	= request_var('usernames', '', true);

		$usernames	= $request->variable('usernames', '', true);

		$usernames	= (!empty($usernames)) ? explode("\n", $usernames) : array();

		$usernames	= (!empty($usernames)) ? explode("\n", $usernames) : array();

		$group_id	= request_var('g', 0);
$subject = utf8_normalize_nfc(request_var('subject', '', true));
$message = utf8_normalize_nfc(request_var('message', '', true));

		$group_id	= $request->variable('g', 0);
$subject = $request->variable('subject', '', true);
$message = $request->variable('message', '', true);


// Do the job ...
if ($submit)


// Do the job ...
if ($submit)

Line 51Line 51
			// Error checking needs to go here ... if no subject and/or no message then skip
// over the send and return to the form
$use_queue = (isset($_POST['send_immediately'])) ? false : true;

			// Error checking needs to go here ... if no subject and/or no message then skip
// over the send and return to the form
$use_queue = (isset($_POST['send_immediately'])) ? false : true;

			$priority		= request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY);

			$priority		= $request->variable('mail_priority_flag', MAIL_NORMAL_PRIORITY);


if (!check_form_key($form_key))
{


if (!check_form_key($form_key))
{

Line 189Line 189
				$db->sql_freeresult($result);

// Send the messages

				$db->sql_freeresult($result);

// Send the messages

				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);








				if (!class_exists('messenger'))
{
include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
}

if (!function_exists('get_group_name'))
{
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
}

				$messenger = new messenger($use_queue);

$errored = false;

				$messenger = new messenger($use_queue);

$errored = false;

Line 263Line 270
				{
if (!empty($usernames))
{

				{
if (!empty($usernames))
{

						add_log('admin', 'LOG_MASS_EMAIL', implode(', ', utf8_normalize_nfc($usernames)));

						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_MASS_EMAIL', false, array(implode(', ', utf8_normalize_nfc($usernames))));

					}
else
{

					}
else
{

Line 277Line 284
							$group_name = $user->lang['ALL_USERS'];
}


							$group_name = $user->lang['ALL_USERS'];
}


						add_log('admin', 'LOG_MASS_EMAIL', $group_name);

						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_MASS_EMAIL', false, array($group_name));

					}
}


					}
}


Line 314Line 321
		$s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . $user->lang['MAIL_NORMAL_PRIORITY'] . '</option>';
$s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . $user->lang['MAIL_HIGH_PRIORITY'] . '</option>';


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


		$template->assign_vars(array(

		$template_data = array(

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

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

Line 323Line 330
			'U_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_email&amp;field=usernames'),
'SUBJECT' => $subject,
'MESSAGE' => $message,

			'U_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_email&amp;field=usernames'),
'SUBJECT' => $subject,
'MESSAGE' => $message,

			'S_PRIORITY_OPTIONS'	=> $s_priority_options)

			'S_PRIORITY_OPTIONS'	=> $s_priority_options,

		);


		);


 
		/**
* Modify custom email template data before we display the form
*
* @event core.acp_email_display
* @var array template_data Array with template data assigned to email template
* @var array exclude Array with groups which are excluded from group selection
* @var array usernames Usernames which will be displayed in form
*
* @since 3.1.4-RC1
*/
$vars = array('template_data', 'exclude', 'usernames');
extract($phpbb_dispatcher->trigger_event('core.acp_email_display', compact($vars)));

$template->assign_vars($template_data);

	}
}


	}
}