mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

[ticket/15233] Standardize variable generation

Browse Source 
PHPBB3-15233
This commit is contained in:
mrgoldy
2020-05-10 14:58:57 +02:00
committed by Marc Alexander
parent 3796a4207f
commit d77415dbab
26 changed files with 163 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/acp/acp_groups.php
View File

@@ -721,8 +721,6 @@ class acp_groups
}
}
$group_avatar = $group_helper->get_avatar($group_row, 'GROUP_AVATAR', true);
if (isset($phpbb_avatar_manager) && !$update)
{
// Merge any avatar errors into the primary error array
@@ -742,6 +740,12 @@ class acp_groups
break;
}
/** @var \phpbb\avatar\helper $avatar_helper */
$avatar_helper = $phpbb_container->get('avatar.helper');
$group_avatar = $avatar_helper->get_group_avatar($group_row, 'GROUP_AVATAR', true);
$template->assign_vars($avatar_helper->get_template_vars($group_avatar));
$template->assign_vars(array(
'S_EDIT' => true,
'S_ADD_GROUP' => ($action == 'add') ? true : false,
@@ -771,13 +775,6 @@ class acp_groups
'S_RANK_OPTIONS' => $rank_options,
'S_GROUP_OPTIONS' => group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)),
'AVATAR' => empty($group_avatar['html']) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $group_avatar['html'],
'AVATAR_LAZY' => $group_avatar['lazy'],
'AVATAR_SRC' => $group_avatar['src'],
'AVATAR_TITLE' => $group_avatar['title'],
'AVATAR_TYPE' => $group_avatar['type'],
'AVATAR_WIDTH' => $group_avatar['width'],
'AVATAR_HEIGHT' => $group_avatar['height'],
'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'],
'GROUP_TYPE_FREE' => GROUP_FREE,

15
phpBB/includes/acp/acp_users.php
View File

@@ -1972,24 +1972,17 @@ class acp_users
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar = $avatar_helper->get_user_avatar($user_row, 'USER_AVATAR', true);
$template->assign_vars($avatar_helper->get_template_vars($avatar));
$template->assign_vars(array(
'S_AVATAR' => true,
'ERROR' => (!empty($error)) ? implode('<br />', $error) : '',
'AVATAR' => empty($avatar['html']) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar['html'],
'AVATAR_LAZY' => $avatar['lazy'],
'AVATAR_SOURCE' => $avatar['src'],
'AVATAR_TITLE' => $avatar['title'],
'AVATAR_TYPE' => $avatar['type'],
'AVATAR_WIDTH' => $avatar['width'],
'AVATAR_HEIGHT' => $avatar['height'],
'S_AVATAR' => true,
'ERROR' => !empty($error) ? implode('<br />', $error) : '',
'S_FORM_ENCTYPE' => ' enctype="multipart/form-data"',
'L_AVATAR_EXPLAIN' => $user->lang(($config['avatar_filesize'] == 0) ? 'AVATAR_EXPLAIN_NO_FILESIZE' : 'AVATAR_EXPLAIN', $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
'S_AVATARS_ENABLED' => ($config['allow_avatar'] && $avatars_enabled),
'S_AVATARS_ENABLED' => ($config['allow_avatar'] && $avatars_enabled),
));
break;

9
phpBB/includes/functions.php
View File

@@ -3872,6 +3872,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar = $avatar_helper->get_user_avatar($user->data);
$template->assign_vars($avatar_helper->get_template_vars($avatar, 'CURRENT_USER_'));
// The following assigns all _common_ variables that may be used at any point in a template.
$template->assign_vars(array(
@@ -3886,14 +3887,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'LOGGED_IN_USER_LIST' => $online_userlist,
'RECORD_USERS' => $l_online_record,
'NO_AVATAR_SOURCE' => $avatar_helper->get_no_avatar_source(),
'PRIVATE_MESSAGE_COUNT' => (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0,
'CURRENT_USER_AVATAR' => $avatar['html'],
'CURRENT_USER_AVATAR_LAZY' => $avatar['lazy'],
'CURRENT_USER_AVATAR_SOURCE' => $avatar['src'],
'CURRENT_USER_AVATAR_TITLE' => $avatar['title'],
'CURRENT_USER_AVATAR_TYPE' => $avatar['type'],
'CURRENT_USER_AVATAR_WIDTH' => $avatar['width'],
'CURRENT_USER_AVATAR_HEIGHT' => $avatar['height'],
'CURRENT_USERNAME_SIMPLE' => get_username_string('no_profile', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
'CURRENT_USERNAME_FULL' => get_username_string('full', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
'CURRENT_USER_GROUP_COLOR' => $user->data['user_colour'],

13
phpBB/includes/functions_display.php
View File

@@ -1657,9 +1657,10 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar = $avatar_helper->get_user_avatar($data);
$avatar_vars = $avatar_helper->get_template_vars($avatar);
// Dump it out to the template
$template_data = array(
$template_data = array_merge($avatar_vars, [
'AGE' => $age,
'RANK_TITLE' => $user_rank_data['title'],
'JOINED' => $user->format_date($data['user_regdate']),
@@ -1674,14 +1675,6 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
'A_USERNAME' => addslashes(get_username_string('username', $user_id, $username, $data['user_colour'])),
'AVATAR_IMG' => $avatar['html'],
'AVATAR_LAZY' => $avatar['lazy'],
'AVATAR_SOURCE' => $avatar['src'],
'AVATAR_TITLE' => $avatar['title'],
'AVATAR_TYPE' => $avatar['type'],
'AVATAR_WIDTH' => $avatar['width'],
'AVATAR_HEIGHT' => $avatar['height'],
'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,
'RANK_IMG' => $user_rank_data['img'],
@@ -1703,7 +1696,7 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
'L_SEND_EMAIL_USER' => $user->lang('SEND_EMAIL_USER', $username),
'L_CONTACT_USER' => $user->lang('CONTACT_USER', $username),
'L_VIEWING_PROFILE' => $user->lang('VIEWING_PROFILE', $username),
);
]);
/**
* Preparing a user's data before displaying it in profile and memberlist

34
phpBB/includes/mcp/mcp_notes.php
View File

@@ -185,19 +185,6 @@ class mcp_notes
trigger_error($msg . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
}
if (!function_exists('phpbb_get_user_rank'))
{
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
}
// Generate the appropriate user information for the user we are looking at
$rank_data = phpbb_get_user_rank($userrow, $userrow['user_posts']);
/** @var \phpbb\avatar\helper $avatar_helper */
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar = $avatar_helper->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']);
$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');
@@ -235,6 +222,20 @@ class mcp_notes
$base_url = $this->u_action . "&amp;$u_sort_param$keywords_param";
$pagination->generate_template_pagination($base_url, 'pagination', 'start', $log_count, $config['topics_per_page'], $start);
if (!function_exists('phpbb_get_user_rank'))
{
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
}
// Generate the appropriate user information for the user we are looking at
$rank_data = phpbb_get_user_rank($userrow, $userrow['user_posts']);
/** @var \phpbb\avatar\helper $avatar_helper */
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar = $avatar_helper->get_user_avatar($userrow);
$template->assign_vars($avatar_helper->get_template_vars($avatar));
$template->assign_vars(array(
'U_POST_ACTION' => $this->u_action,
'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false,
@@ -256,13 +257,6 @@ class mcp_notes
'USERNAME' => get_username_string('username', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
'U_PROFILE' => get_username_string('profile', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
'AVATAR_IMG' => $avatar['html'],
'AVATAR_LAZY' => $avatar['lazy'],
'AVATAR_SOURCE' => $avatar['src'],
'AVATAR_TITLE' => $avatar['title'],
'AVATAR_TYPE' => $avatar['type'],
'AVATAR_WIDTH' => $avatar['width'],
'AVATAR_HEIGHT' => $avatar['height'],
'RANK_IMG' => $rank_data['img'],
'RANK_TITLE' => $rank_data['title'],
));

16
phpBB/includes/mcp/mcp_warn.php
View File

@@ -347,6 +347,7 @@ class mcp_warn
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar = $avatar_helper->get_user_avatar($user_row);
$template->assign_vars($avatar_helper->get_template_vars($avatar));
$template->assign_vars(array(
'U_POST_ACTION' => $this->u_action,
@@ -359,13 +360,6 @@ class mcp_warn
'POSTS' => ($user_row['user_posts']) ? $user_row['user_posts'] : 0,
'WARNINGS' => ($user_row['user_warnings']) ? $user_row['user_warnings'] : 0,
'AVATAR_IMG' => $avatar['html'],
'AVATAR_LAZY' => $avatar['lazy'],
'AVATAR_SOURCE' => $avatar['src'],
'AVATAR_TITLE' => $avatar['title'],
'AVATAR_TYPE' => $avatar['type'],
'AVATAR_WIDTH' => $avatar['width'],
'AVATAR_HEIGHT' => $avatar['height'],
'RANK_IMG' => $user_rank_data['img'],
'L_WARNING_POST_DEFAULT' => sprintf($user->lang['WARNING_POST_DEFAULT'], generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&amp;p=$post_id#p$post_id"),
@@ -506,6 +500,7 @@ class mcp_warn
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar = $avatar_helper->get_user_avatar($user_row);
$template->assign_vars($avatar_helper->get_template_vars($avatar));
// OK, they didn't submit a warning so lets build the page for them to do so
$template->assign_vars(array(
@@ -521,13 +516,6 @@ class mcp_warn
'USERNAME' => get_username_string('username', $user_row['user_id'], $user_row['username'], $user_row['user_colour']),
'U_PROFILE' => get_username_string('profile', $user_row['user_id'], $user_row['username'], $user_row['user_colour']),
'AVATAR_IMG' => $avatar['html'],
'AVATAR_LAZY' => $avatar['lazy'],
'AVATAR_SOURCE' => $avatar['src'],
'AVATAR_TITLE' => $avatar['title'],
'AVATAR_TYPE' => $avatar['type'],
'AVATAR_WIDTH' => $avatar['width'],
'AVATAR_HEIGHT' => $avatar['height'],
'RANK_IMG' => $user_rank_data['img'],
'S_CAN_NOTIFY' => $s_can_notify,

15
phpBB/includes/ucp/ucp_groups.php
View File

@@ -431,7 +431,11 @@ class ucp_groups
$group_name = $group_row['group_name'];
$group_type = $group_row['group_type'];
$group_avatar = $group_helper->get_avatar($group_row, 'GROUP_AVATAR', true);
/** @var \phpbb\avatar\helper $avatar_helper */
$avatar_helper = $phpbb_container->get('avatar.helper');
$group_avatar = $avatar_helper->get_group_avatar($group_row, 'GROUP_AVATAR', true);
$template->assign_vars($avatar_helper->get_template_vars($group_avatar));
$template->assign_vars(array(
'GROUP_NAME' => $group_helper->get_name($group_name),
@@ -439,15 +443,6 @@ class ucp_groups
'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '',
'GROUP_DESC_DISP' => generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']),
'GROUP_TYPE' => $group_row['group_type'],
'AVATAR' => empty($group_avatar['html']) ? '<img class="avatar" src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $group_avatar['html'],
'AVATAR_IMAGE' => empty($group_avatar['html']) ? '<img class="avatar" src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $group_avatar['html'],
'AVATAR_LAZY' => $group_avatar['lazy'],
'AVATAR_SRC' => $group_avatar['src'],
'AVATAR_TITLE' => $group_avatar['title'],
'AVATAR_TYPE' => $group_avatar['type'],
'AVATAR_WIDTH' => $group_avatar['width'],
'AVATAR_HEIGHT' => $group_avatar['height'],
));
}

16
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -221,13 +221,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'RANK_TITLE' => $user_info['rank_title'],
'RANK_IMG' => $user_info['rank_image'],
'AUTHOR_AVATAR' => !empty($user_info['avatar']) ? $user_info['avatar']['html'] : '',
'AUTHOR_AVATAR_LAZY' => !empty($user_info['avatar']) ? $user_info['avatar']['lazy'] : false,
'AUTHOR_AVATAR_SOURCE' => !empty($user_info['avatar']) ? $user_info['avatar']['src'] : '',
'AUTHOR_AVATAR_TITLE' => !empty($user_info['avatar']) ? $user_info['avatar']['title'] : '',
'AUTHOR_AVATAR_TYPE' => !empty($user_info['avatar']) ? $user_info['avatar']['type'] : '',
'AUTHOR_AVATAR_WIDTH' => !empty($user_info['avatar']) ? $user_info['avatar']['width'] : 0,
'AUTHOR_AVATAR_HEIGHT' => !empty($user_info['avatar']) ? $user_info['avatar']['height'] : 0,
'AUTHOR_JOINED' => $user->format_date($user_info['user_regdate']),
'AUTHOR_POSTS' => (int) $user_info['user_posts'],
'U_AUTHOR_POSTS' => ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$author_id&amp;sr=posts") : '',
@@ -279,6 +272,15 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_sendpm') && $auth->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
);
if (!empty($user_info['avatar']))
{
/** @var \phpbb\avatar\helper $avatar_helper */
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar_data = $avatar_helper->get_template_vars($user_info['avatar'], 'AUTHOR_');
$msg_data = array_merge($msg_data, $avatar_data);
}
/**
* Modify pm and sender data before it is assigned to the template
*

10
phpBB/includes/ucp/ucp_profile.php
View File

@@ -761,16 +761,10 @@ class ucp_profile
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar = $avatar_helper->get_user_avatar($user->data, 'USER_AVATAR', true);
$template->assign_vars($avatar_helper->get_template_vars($avatar));
$template->assign_vars(array(
'ERROR' => (count($error)) ? implode('<br />', $error) : '',
'AVATAR' => $avatar['html'],
'AVATAR_LAZY' => $avatar['lazy'],
'AVATAR_SOURCE' => $avatar['src'],
'AVATAR_TITLE' => $avatar['title'],
'AVATAR_TYPE' => $avatar['type'],
'AVATAR_WIDTH' => $avatar['width'],
'AVATAR_HEIGHT' => $avatar['height'],
'ERROR' => !empty($error) ? implode('<br />', $error) : '',
'S_FORM_ENCTYPE' => ' enctype="multipart/form-data"',