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

#10163

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7411 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-04-27 15:04:54 +00:00
parent 9ee570aebd
commit 266797fddf
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,11 @@ class mcp_notes
// Populate user id to the currently active module (this module)
// The following method is another way of adjusting module urls. It is the easy variant if we want
// to directly adjust the current module url based on data retrieved within the same module.
$this->p_master->adjust_url('&u=' . $user_id);
if (strpos($this->u_action, "&u=$user_id") === false)
{
$this->p_master->adjust_url('&u=' . $user_id);
$this->u_action .= "&u=$user_id";
}
$deletemark = ($action == 'del_marked') ? true : false;
$deleteall = ($action == 'del_all') ? true : false;
@ -140,8 +144,9 @@ class mcp_notes
add_log('user', $user_id, 'LOG_USER_GENERAL', $usernote);
$redirect = $this->u_action . '&u=' . $user_id;
$redirect = $this->u_action;
meta_refresh(3, $redirect);
trigger_error($user->lang['USER_FEEDBACK_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
}
@ -186,7 +191,7 @@ class mcp_notes
}
$template->assign_vars(array(
'U_POST_ACTION' => $this->u_action . '&amp;u=' . $user_id,
'U_POST_ACTION' => $this->u_action,
'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false,
'S_SELECT_SORT_DIR' => $s_sort_dir,
'S_SELECT_SORT_KEY' => $s_sort_key,
@ -195,7 +200,7 @@ class mcp_notes
'L_TITLE' => $user->lang['MCP_NOTES_USER'],
'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start),
'PAGINATION' => generate_pagination($this->u_action . "&amp;u=$user_id&amp;st=$st&amp;sk=$sk&amp;sd=$sd", $log_count, $config['posts_per_page'], $start),
'PAGINATION' => generate_pagination($this->u_action . "&amp;st=$st&amp;sk=$sk&amp;sd=$sd", $log_count, $config['posts_per_page'], $start),
'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count),
'USERNAME' => $userrow['username'],

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

@ -234,7 +234,11 @@ class mcp_warn
$user_id = $user_row['user_id'];
$this->p_master->adjust_url('&amp;f=' . $forum_id . '&amp;p=' . $post_id);
if (strpos($this->u_action, "&amp;f=$forum_id&amp;p=$post_id") === false)
{
$this->p_master->adjust_url("&amp;f=$forum_id&amp;p=$post_id");
$this->u_action .= "&amp;f=$forum_id&amp;p=$post_id";
}
if ($warning && $action == 'add_warning')
{
@ -274,7 +278,7 @@ class mcp_warn
$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' => $this->u_action . "p=$post_id",
'U_POST_ACTION' => $this->u_action,
'POST' => $message,
'USERNAME' => $user_row['username'],
@ -326,7 +330,11 @@ class mcp_warn
$user_id = $user_row['user_id'];
$this->p_master->adjust_url('&amp;u=' . $user_id);
if (strpos($this->u_action, "&amp;u=$user_id") === false)
{
$this->p_master->adjust_url('&amp;u=' . $user_id);
$this->u_action .= "&amp;u=$user_id";
}
if ($warning && $action == 'add_warning')
{
@ -348,7 +356,7 @@ class mcp_warn
// OK, they didn't submit a warning so lets build the page for them to do so
$template->assign_vars(array(
'U_POST_ACTION' => $this->u_action . "u=$user_id",
'U_POST_ACTION' => $this->u_action,
'USERNAME' => $user_row['username'],
'USER_COLOR' => (!empty($user_row['user_colour'])) ? $user_row['user_colour'] : '',

2
phpBB/styles/prosilver/template/mcp_notes_user.html
View File

@ -74,7 +74,7 @@
<td style="text-align: center">{usernotes.REPORT_AT}</td>
<td>{usernotes.ACTION}</td>
<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}"value="{usernotes.ID}" /></td><!-- ENDIF -->
<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
</tr>
<!-- BEGINELSE -->
<tr>