diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-22 15:27:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-22 15:27:40 +0000 |
| commit | 550f270a0027e67a0eb19d99fbe54d6045696a0b (patch) | |
| tree | c0a38cbb0715d7a17b7226c134568d9392e550da /phpBB/mcp.php | |
| parent | 782c536c703959c643dc77b846c9617326b2a98e (diff) | |
| download | forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.gz forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.bz2 forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.xz forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.zip | |
#10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995
MCP fixes for user notes/warnings - #9981
Preserving imageset values on save/edit
find a member link for Mass PM's - #9925
syndicate window.onload events where necessary - #9878
Duplicate topics in forums with announcements - #9840
Email template for forced re-activation - #9808
Topic pagination adjustment - #9763
Changed compose message layout in UCP - #9706, #9702
Fixed inline attachment font size (hopefully)
git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/mcp.php')
| -rw-r--r-- | phpBB/mcp.php | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php index ce87fd4ae0..1577c32de8 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -227,9 +227,9 @@ $module->assign_tpl_vars(append_sid("{$phpbb_root_path}mcp.$phpEx")); // Generate urls for letting the moderation control panel being accessed in different modes $template->assign_vars(array( 'U_MCP' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main'), - 'U_MCP_FORUM' => ($forum_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=forum_view&f=$forum_id") : '', - 'U_MCP_TOPIC' => ($forum_id && $topic_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&t=$topic_id") : '', - 'U_MCP_POST' => ($forum_id && $topic_id && $post_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&t=$topic_id&p=$post_id") : '', + 'U_MCP_FORUM' => ($forum_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=forum_view&f=$forum_id") : '', + 'U_MCP_TOPIC' => ($forum_id && $topic_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&t=$topic_id") : '', + 'U_MCP_POST' => ($forum_id && $topic_id && $post_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&t=$topic_id&p=$post_id") : '', )); // Generate the page, do not display/query online list @@ -243,6 +243,41 @@ function _module__url($mode, &$module_row) return extra_url(); } +function _module_notes_url($mode, &$module_row) +{ + if ($mode == 'front') + { + return ''; + } + + global $user_id; + return ($user_id) ? "&u=$user_id" : ''; +} + +function _module_warn_url($mode, &$module_row) +{ + if ($mode == 'front' || $mode == 'list') + { + return ''; + } + + if ($mode == 'warn_post') + { + global $forum_id, $post_id; + + $url_extra = ($forum_id) ? "&f=$forum_id" : ''; + $url_extra .= ($post_id) ? "&p=$post_id" : ''; + + return $url_extra; + } + else + { + global $user_id; + + return ($user_id) ? "&u=$user_id" : ''; + } +} + function _module_main_url($mode, &$module_row) { return extra_url(); |