diff options
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 11 |
3 files changed, 14 insertions, 11 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 4d254bb084..e5e10223f7 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -36,8 +36,8 @@ 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 - $subject = html_entity_decode(request_var('subject', '', true)); - $message = html_entity_decode(request_var('message', '', true)); + $subject = request_var('subject', '', true); + $message = request_var('message', '', true); $use_queue = (isset($_POST['send_immediatly'])) ? false : true; $priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY); @@ -150,14 +150,14 @@ class acp_email $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - $messenger->subject($subject); + $messenger->subject(html_entity_decode($subject)); $messenger->replyto($config['board_email']); $messenger->set_mail_priority($priority); $messenger->assign_vars(array( 'SITENAME' => $config['sitename'], 'CONTACT_EMAIL' => $config['board_contact'], - 'MESSAGE' => $message) + 'MESSAGE' => html_entity_decode($message)) ); if (!($messenger->send($used_method))) @@ -216,8 +216,8 @@ class acp_email 'S_GROUP_OPTIONS' => $select_list, 'USERNAMES' => $usernames, 'U_FIND_USERNAME' => $phpbb_root_path . "memberlist.$phpEx$SID&mode=searchuser&form=acp_email&field=usernames", - 'SUBJECT' => request_var('subject', '', true), - 'MESSAGE' => request_var('message', '', true), + 'SUBJECT' => $subject, + 'MESSAGE' => $message, 'S_PRIORITY_OPTIONS' => $s_priority_options) ); diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index acc1c50112..af48ea700c 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -127,7 +127,7 @@ class acp_main $messenger->assign_vars(array( 'EMAIL_SIG' => $sig, - 'USERNAME' => $row['username'], + 'USERNAME' => html_entity_decode($row['username']), 'SITENAME' => $config['sitename'], 'REGISTER_DATE' => $user->format_date($row['user_regdate']), diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 66fdf40701..1a079b8e0d 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -263,7 +263,7 @@ class acp_users $messenger->assign_vars(array( 'SITENAME' => $config['sitename'], 'WELCOME_MSG' => sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), - 'USERNAME' => $user_row['username'], + 'USERNAME' => html_entity_decode($user_row['username']), 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey") @@ -1277,7 +1277,7 @@ class acp_users { $data['user_id'] = $user_id; - if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload) + if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload && $config['allow_avatar_upload']) { list($type, $filename, $width, $height) = avatar_upload($data, $error); } @@ -1347,6 +1347,8 @@ class acp_users // Generate users avatar if ($user_row['user_avatar']) { + $avatar_img = ''; + switch ($user_row['user_avatar_type']) { case AVATAR_UPLOAD: @@ -1357,8 +1359,8 @@ class acp_users $avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/'; break; } - $avatar_img .= $user_row['user_avatar']; + $avatar_img .= $user_row['user_avatar']; $avatar_img = '<img src="' . $avatar_img . '" width="' . $user_row['user_avatar_width'] . '" height="' . $user_row['user_avatar_height'] . '" alt="" />'; } else @@ -1375,7 +1377,8 @@ class acp_users $template->assign_vars(array( 'S_AVATAR' => true, - 'S_CAN_UPLOAD' => $can_upload, + 'S_CAN_UPLOAD' => ($can_upload && $config['allow_avatar_upload']) ? true : false, + 'S_ALLOW_REMOTE' => ($config['allow_avatar_remote']) ? true : false, 'S_DISPLAY_GALLERY' => ($config['allow_avatar_local'] && !$display_gallery) ? true : false, 'S_IN_GALLERY' => ($config['allow_avatar_local'] && $display_gallery) ? true : false, |