diff options
Diffstat (limited to 'phpBB/includes/mcp')
| -rwxr-xr-x | phpBB/includes/mcp/mcp_notes.php | 24 | ||||
| -rwxr-xr-x | phpBB/includes/mcp/mcp_warn.php | 48 |
2 files changed, 15 insertions, 57 deletions
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php index 1b3c36ac22..9d4b522fe4 100755 --- a/phpBB/includes/mcp/mcp_notes.php +++ b/phpBB/includes/mcp/mcp_notes.php @@ -141,28 +141,14 @@ class mcp_notes } // Generate the appropriate user information for the user we are looking at - $rank_title = $rank_img = ''; -// get_user_rank($userrow['user_rank'], $userrow['user_posts'], $rank_title, $rank_img); - - $avatar_img = ''; - - if (!empty($userrow['user_avatar'])) + if (!function_exists('get_user_avatar')) { - switch ($userrow['user_avatar_type']) - { - case AVATAR_UPLOAD: - $avatar_img = $config['avatar_path'] . '/'; - break; - - case AVATAR_GALLERY: - $avatar_img = $config['avatar_gallery_path'] . '/'; - break; - } - - $avatar_img .= $userrow['user_avatar']; - $avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" alt="" />'; + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } + $rank_title = $rank_img = ''; + $avatar_img = get_user_avatar($userrow['user_avatar'], $userrow['user_avatar_type'], $userrow['user_avatar_width'], $userrow['user_avatar_height']); + $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); $sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_IP'], 'd' => $user->lang['SORT_ACTION']); $sort_by_sql = array('a' => 'u.username_clean', 'b' => 'l.log_time', 'c' => 'l.log_ip', 'd' => 'l.log_operation'); diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index ea414d2bfd..6d3961de2f 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -272,28 +272,14 @@ function mcp_warn_post_view($id, $mode, $action) $message = smiley_text($message); // Generate the appropriate user information for the user we are looking at - $rank_title = $rank_img = ''; -// get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img); - - $avatar_img = ''; - - if (!empty($user_row['user_avatar'])) + if (!function_exists('get_user_avatar')) { - switch ($user_row['user_avatar_type']) - { - case AVATAR_UPLOAD: - $avatar_img = $config['avatar_path'] . '/'; - break; - - case AVATAR_GALLERY: - $avatar_img = $config['avatar_gallery_path'] . '/'; - break; - } - - $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="" />'; + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } + $rank_title = $rank_img = ''; + $avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']); + $template->assign_vars(array( 'U_POST_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&p=$post_id"), @@ -357,28 +343,14 @@ function mcp_warn_user_view($id, $mode, $action) } // Generate the appropriate user information for the user we are looking at - $rank_title = $rank_img = ''; -// get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img); - - $avatar_img = ''; - - if (!empty($user_row['user_avatar'])) + if (!function_exists('get_user_avatar')) { - switch ($user_row['user_avatar_type']) - { - case AVATAR_UPLOAD: - $avatar_img = $config['avatar_path'] . '/'; - break; - - case AVATAR_GALLERY: - $avatar_img = $config['avatar_gallery_path'] . '/'; - break; - } - - $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="" />'; + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } + $rank_title = $rank_img = ''; + $avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']); + // OK, they didn't submit a warning so lets build the page for them to do so $template->assign_vars(array( 'U_POST_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&u=$user_id"), |