diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-25 14:47:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-25 14:47:57 +0000 |
| commit | 5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730 (patch) | |
| tree | a083f062a59bdacfe913d1cc84d96813037185ec /phpBB/modules/acp/acp_email.php | |
| parent | ddfef8d832e84eca694bc6d98f2d4ec3ca480142 (diff) | |
| download | forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.gz forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.bz2 forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.xz forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.zip | |
add nils' request and super globals class
rename request:: to phpbb_request::
git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/modules/acp/acp_email.php')
| -rw-r--r-- | phpBB/modules/acp/acp_email.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/modules/acp/acp_email.php b/phpBB/modules/acp/acp_email.php index 1e39049eca..25ce68c75a 100644 --- a/phpBB/modules/acp/acp_email.php +++ b/phpBB/modules/acp/acp_email.php @@ -35,7 +35,7 @@ class acp_email add_form_key($form_key); // Set some vars - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); $error = array(); $usernames = request_var('usernames', '', true); @@ -48,7 +48,7 @@ class acp_email { // 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 = request::is_set_post('send_immediately'); + $use_queue = phpbb_request::is_set_post('send_immediately'); $priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY); if (!check_form_key($form_key)) @@ -107,7 +107,7 @@ class acp_email $db->sql_freeresult($result); trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING); } - + $i = $j = 0; // Send with BCC, no more than 50 recipients for one mail (to not exceed the limit) @@ -172,7 +172,7 @@ class acp_email $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - + $messenger->subject(htmlspecialchars_decode($subject)); $messenger->set_mail_priority($priority); @@ -180,7 +180,7 @@ class acp_email 'CONTACT_EMAIL' => $config['board_contact'], 'MESSAGE' => htmlspecialchars_decode($message)) ); - + if (!($messenger->send($used_method))) { $errored = true; @@ -238,7 +238,7 @@ class acp_email $select_list = '<option value="0"' . ((!$group_id) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_USERS'] . '</option>'; $select_list .= group_select_options($group_id, $exclude); - + $s_priority_options = '<option value="' . MAIL_LOW_PRIORITY . '">' . $user->lang['MAIL_LOW_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>'; |