makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include a link to the post by default when issuing a warning

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6203 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-07-23 20:59:08 +00:00
parent 5e7f9e1a0d
commit 4680dfce39
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,6 +188,7 @@ function mcp_warn_post_view($id, $mode, $action)
global $template, $db, $user, $auth;
$post_id = request_var('p', 0);
$forum_id = request_var('f', 0);
$notify = (isset($_REQUEST['notify_user'])) ? true : false;
$warning = request_var('warning', '', true);
@ -296,6 +297,8 @@ function mcp_warn_post_view($id, $mode, $action)
'AVATAR_IMG' => $avatar_img,
'RANK_IMG' => $rank_img,
'L_WARNING_POST_DEFAULT' => sprintf($user->lang['WARNING_POST_DEFAULT'], generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&p=$post_id"),
)
);
}

2
phpBB/install/install_install.php
View file

@ -54,7 +54,7 @@ class install_install extends module
'TITLE' => $lang['INSTALL_INTRO'],
'BODY' => $lang['INSTALL_INTRO_BODY'],
'L_SUBMIT' => $lang['NEXT'],
'S_LANG_SELECT' => '<select name="language">' . $this->p_master->inst_language_select() . '</select>',
'S_LANG_SELECT' => '<select name="language">' . $this->p_master->inst_language_select($language) . '</select>',
'U_ACTION' => $this->p_master->module_url . "?mode=$mode&amp;sub=requirements&amp;language=$language",
));

4
phpBB/install/install_main.php
View file

@ -43,7 +43,7 @@ class install_main extends module
function main($mode, $sub)
{
global $lang, $template;
global $lang, $template, $language;
switch ($sub)
{
@ -70,7 +70,7 @@ class install_main extends module
'TITLE' => $title,
'BODY' => $body,
'S_LANG_SELECT' => '<select name="language">' . $this->p_master->inst_language_select() . '</select>',
'S_LANG_SELECT' => '<select name="language">' . $this->p_master->inst_language_select($language) . '</select>',
));
}
}

1
phpBB/language/en/mcp.php
View file

@ -324,6 +324,7 @@ $lang = array_merge($lang, array(
'WARNED_USERS_EXPLAIN' => 'This is a list of users with unexpired warnings issued to them',
'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
'WARNING_PM_SUBJECT' => 'Board Warning Issued',
'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s',
'WARNINGS_ZERO_TOTAL' => 'No warnings exists',
'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s',

2
phpBB/styles/subSilver/template/mcp_warn_post.html
View file

@ -42,7 +42,7 @@
<tr>
<td class="row3" align="center"><span class="genmed">{L_ADD_WARNING_EXPLAIN}</span></td>
<tr>
<td class="row1" align="center"><textarea name="warning" rows="10" cols="76"></textarea></td>
<td class="row1" align="center"><textarea name="warning" rows="10" cols="76">{L_WARNING_POST_DEFAULT}</textarea></td>
</tr>
<tr>
<td class="row1" align="center"><input type="checkbox" class="radio" name="notify_user" checked="checked" /><span class="genmed">{L_NOTIFY_USER_WARN}</span></td>