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

[feature/pagination-as-list] Updates for nils comments

Browse Source 
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.

PHPBB3-10968
This commit is contained in:
Drae
2012-07-08 21:07:28 +01:00
parent cf4d6e926d
commit 27d8aef528
25 changed files with 57 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_attachments.php
View File

@@ -1223,13 +1223,13 @@ class acp_attachments
$db->sql_freeresult($result);
$base_url = $this->u_action . "&$u_sort_param";
phpbb_generate_template_pagination($base_url, 'pagination', $num_files, $attachments_per_page, $start);
phpbb_generate_template_pagination($template, $base_url, 'pagination', $num_files, $attachments_per_page, $start);
$template->assign_vars(array(
'TOTAL_FILES' => $num_files,
'TOTAL_SIZE' => get_formatted_filesize($total_size),
'S_ON_PAGE' => on_page($base_url, $num_files, $attachments_per_page, $start),
'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $num_files, $attachments_per_page, $start),
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir)

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

@@ -683,14 +683,14 @@ class acp_groups
}
$base_url = $this->u_action . "&action=$action&g=$group_id";
phpbb_generate_template_pagination($base_url, 'pagination', $total_members, $config['topics_per_page'], $start);
phpbb_generate_template_pagination($template, $base_url, 'pagination', $total_members, $config['topics_per_page'], $start);
$template->assign_vars(array(
'S_LIST' => true,
'S_GROUP_SPECIAL' => ($group_row['group_type'] == GROUP_SPECIAL) ? true : false,
'S_ACTION_OPTIONS' => $s_action_options,
'S_ON_PAGE' => on_page($base_url, $total_members, $config['topics_per_page'], $start),
'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $total_members, $config['topics_per_page'], $start),
'GROUP_NAME' => ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'],
'U_ACTION' => $this->u_action . "&g=$group_id",

2
phpBB/includes/acp/acp_icons.php
View File

@@ -928,7 +928,7 @@ class acp_icons
}
$db->sql_freeresult($result);
phpbb_generate_template_pagination($this->u_action, 'pagination', $item_count, $config['smilies_per_page'], $pagination_start);
phpbb_generate_template_pagination($template, $this->u_action, 'pagination', $item_count, $config['smilies_per_page'], $pagination_start);
}
/**

4
phpBB/includes/acp/acp_inactive.php
View File

@@ -289,7 +289,7 @@ class acp_inactive
}
$base_url = $this->u_action . "&$u_sort_param&users_per_page=$per_page";
phpbb_generate_template_pagination($base_url, 'pagination', $inactive_count, $per_page, $start);
phpbb_generate_template_pagination($template, $base_url, 'pagination', $inactive_count, $per_page, $start);
$template->assign_vars(array(
'S_INACTIVE_USERS' => true,
@@ -298,7 +298,7 @@ class acp_inactive
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
'S_ON_PAGE' => on_page($base_url, $inactive_count, $per_page, $start),
'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $inactive_count, $per_page, $start),
'USERS_PER_PAGE' => $per_page,

4
phpBB/includes/acp/acp_logs.php
View File

@@ -130,14 +130,14 @@ class acp_logs
$start = view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $keywords);
$base_url = $this->u_action . "&$u_sort_param$keywords_param";
phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
phpbb_generate_template_pagination($template, $base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
$template->assign_vars(array(
'L_TITLE' => $l_title,
'L_EXPLAIN' => $l_title_explain,
'U_ACTION' => $this->u_action . "&$u_sort_param$keywords_param&start=$start",
'S_ON_PAGE' => on_page($base_url, $log_count, $config['topics_per_page'], $start),
'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $log_count, $config['topics_per_page'], $start),
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,

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

@@ -1121,11 +1121,11 @@ class acp_users
$start = view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort);
$base_url = $this->u_action . "&u=$user_id&$u_sort_param";
phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
phpbb_generate_template_pagination($template, $base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
$template->assign_vars(array(
'S_FEEDBACK' => true,
'S_ON_PAGE' => on_page($base_url, $log_count, $config['topics_per_page'], $start),
'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $log_count, $config['topics_per_page'], $start),
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
@@ -2038,11 +2038,11 @@ class acp_users
$db->sql_freeresult($result);
$base_url = $this->u_action . "&u=$user_id&sk=$sort_key&sd=$sort_dir";
phpbb_generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start);
phpbb_generate_template_pagination($template, $base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start);
$template->assign_vars(array(
'S_ATTACHMENTS' => true,
'S_ON_PAGE' => on_page($base_url, $num_attachments, $config['topics_per_page'], $start),
'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $num_attachments, $config['topics_per_page'], $start),
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
));