makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/avatars] Add phpbb prefix to new functions

Browse source 
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.

PHPBB3-10018
This commit is contained in:
Marc Alexander 2013-01-04 15:10:43 +01:00
parent 5d091e2d8f
commit 7256a2d944
10 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_groups.php
View file

@ -548,7 +548,7 @@ class acp_groups
} }
} }
$avatar = get_group_avatar($group_row, 'GROUP_AVATAR', true); $avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
/* /*
* Merge any avatar errors into the primary error array * Merge any avatar errors into the primary error array

2
phpBB/includes/acp/acp_users.php
View file

@ -1844,7 +1844,7 @@ class acp_users
} }
} }
$avatar = get_user_avatar($user_row, 'USER_AVATAR', true); $avatar = phpbb_get_user_avatar($user_row, 'USER_AVATAR', true);
$template->assign_vars(array( $template->assign_vars(array(
'S_AVATAR' => true, 'S_AVATAR' => true,

10
phpBB/includes/functions_display.php
View file

@ -1347,10 +1347,10 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
* *
* @return string Avatar html * @return string Avatar html
*/ */
function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false) function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
{ {
$row = phpbb_avatar_manager::clean_row($user_row); $row = phpbb_avatar_manager::clean_row($user_row);
return get_avatar($row, $alt, $ignore_config); return phpbb_get_avatar($row, $alt, $ignore_config);
} }
/** /**
@ -1362,10 +1362,10 @@ function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false
* *
* @return string Avatar html * @return string Avatar html
*/ */
function get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false) function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
{ {
$row = phpbb_avatar_manager::clean_row($user_row); $row = phpbb_avatar_manager::clean_row($user_row);
return get_avatar($row, $alt, $ignore_config); return phpbb_get_avatar($row, $alt, $ignore_config);
} }
/** /**
@ -1377,7 +1377,7 @@ function get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = fal
* *
* @return string Avatar html * @return string Avatar html
*/ */
function get_avatar($row, $alt, $ignore_config = false) function phpbb_get_avatar($row, $alt, $ignore_config = false)
{ {
global $user, $config, $cache, $phpbb_root_path, $phpEx; global $user, $config, $cache, $phpbb_root_path, $phpEx;
global $request; global $request;

4
phpBB/includes/mcp/mcp_notes.php
View file

@ -173,13 +173,13 @@ class mcp_notes
} }
// Generate the appropriate user information for the user we are looking at // Generate the appropriate user information for the user we are looking at
if (!function_exists('get_user_avatar')) if (!function_exists('phpbb_get_user_avatar'))
{ {
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
} }
$rank_title = $rank_img = ''; $rank_title = $rank_img = '';
$avatar_img = get_user_avatar($userrow); $avatar_img = phpbb_get_user_avatar($userrow);
$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']); $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_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_IP'], 'd' => $user->lang['SORT_ACTION']);

8
phpBB/includes/mcp/mcp_warn.php
View file

@ -304,13 +304,13 @@ class mcp_warn
$message = smiley_text($message); $message = smiley_text($message);
// Generate the appropriate user information for the user we are looking at // Generate the appropriate user information for the user we are looking at
if (!function_exists('get_user_avatar')) if (!function_exists('phpbb_get_user_avatar'))
{ {
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
} }
get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src); get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src);
$avatar_img = get_user_avatar($user_row); $avatar_img = phpbb_get_user_avatar($user_row);
$template->assign_vars(array( $template->assign_vars(array(
'U_POST_ACTION' => $this->u_action, 'U_POST_ACTION' => $this->u_action,
@ -409,13 +409,13 @@ class mcp_warn
} }
// Generate the appropriate user information for the user we are looking at // Generate the appropriate user information for the user we are looking at
if (!function_exists('get_user_avatar')) if (!function_exists('phpbb_get_user_avatar'))
{ {
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
} }
get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src); get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src);
$avatar_img = get_user_avatar($user_row); $avatar_img = phpbb_get_user_avatar($user_row);
// OK, they didn't submit a warning so lets build the page for them to do so // OK, they didn't submit a warning so lets build the page for them to do so
$template->assign_vars(array( $template->assign_vars(array(

2
phpBB/includes/ucp/ucp_groups.php
View file

@ -438,7 +438,7 @@ class ucp_groups
$group_name = $group_row['group_name']; $group_name = $group_row['group_name'];
$group_type = $group_row['group_type']; $group_type = $group_row['group_type'];
$avatar = get_group_avatar($group_row, 'GROUP_AVATAR', true); $avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
$template->assign_vars(array( $template->assign_vars(array(
'GROUP_NAME' => ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name, 'GROUP_NAME' => ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name,

4
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -371,12 +371,12 @@ function get_user_information($user_id, $user_row)
} }
} }
if (!function_exists('get_user_avatar')) if (!function_exists('phpbb_get_user_avatar'))
{ {
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
} }
$user_row['avatar'] = ($user->optionget('viewavatars')) ? get_user_avatar($user_row) : ''; $user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']); get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);

4
phpBB/includes/ucp/ucp_profile.php
View file

@ -550,7 +550,7 @@ class ucp_profile
break; break;
case 'avatar': case 'avatar':
if (!function_exists('get_user_avatar')) if (!function_exists('phpbb_get_user_avatar'))
{ {
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
} }
@ -672,7 +672,7 @@ class ucp_profile
} }
} }
$avatar = get_user_avatar($user->data, 'USER_AVATAR', true); $avatar = phpbb_get_user_avatar($user->data, 'USER_AVATAR', true);
$template->assign_vars(array( $template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',

6
phpBB/memberlist.php
View file

@ -549,7 +549,7 @@ switch ($mode)
$member['user_sig'] = smiley_text($member['user_sig']); $member['user_sig'] = smiley_text($member['user_sig']);
} }
$poster_avatar = get_user_avatar($member); $poster_avatar = phpbb_get_user_avatar($member);
// We need to check if the modules 'zebra' ('friends' & 'foes' mode), 'notes' ('user_notes' mode) and 'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links // We need to check if the modules 'zebra' ('friends' & 'foes' mode), 'notes' ('user_notes' mode) and 'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links
$zebra_enabled = $friends_enabled = $foes_enabled = $user_notes_enabled = $warn_user_enabled = false; $zebra_enabled = $friends_enabled = $foes_enabled = $user_notes_enabled = $warn_user_enabled = false;
@ -1234,7 +1234,7 @@ switch ($mode)
break; break;
} }
$avatar_img = get_group_avatar($group_row); $avatar_img = phpbb_get_group_avatar($group_row);
// ... same for group rank // ... same for group rank
$rank_title = $rank_img = $rank_img_src = ''; $rank_title = $rank_img = $rank_img_src = '';
@ -1727,7 +1727,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
'A_USERNAME' => addslashes(get_username_string('username', $user_id, $username, $data['user_colour'])), 'A_USERNAME' => addslashes(get_username_string('username', $user_id, $username, $data['user_colour'])),
'AVATAR_IMG' => get_user_avatar($data), 'AVATAR_IMG' => phpbb_get_user_avatar($data),
'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')), 'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
'S_ONLINE' => ($config['load_onlinetrack'] && $online) ? true : false, 'S_ONLINE' => ($config['load_onlinetrack'] && $online) ? true : false,
'RANK_IMG' => $rank_img, 'RANK_IMG' => $rank_img,

4
phpBB/viewtopic.php
View file

@ -1083,7 +1083,7 @@ while ($row = $db->sql_fetchrow($result))
'sig_bbcode_bitfield' => '', 'sig_bbcode_bitfield' => '',
'online' => false, 'online' => false,
'avatar' => ($user->optionget('viewavatars')) ? get_user_avatar($row) : '', 'avatar' => ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
'rank_title' => '', 'rank_title' => '',
'rank_image' => '', 'rank_image' => '',
'rank_image_src' => '', 'rank_image_src' => '',
@ -1149,7 +1149,7 @@ while ($row = $db->sql_fetchrow($result))
'viewonline' => $row['user_allow_viewonline'], 'viewonline' => $row['user_allow_viewonline'],
'allow_pm' => $row['user_allow_pm'], 'allow_pm' => $row['user_allow_pm'],
'avatar' => ($user->optionget('viewavatars')) ? get_user_avatar($row) : '', 'avatar' => ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
'age' => '', 'age' => '',
'rank_title' => '', 'rank_title' => '',