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

L10n of warning messages sent to the user

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5427 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-01-05 20:35:43 +00:00
parent 479f95661e
commit d864074bdd
3 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -342,14 +342,15 @@ function mcp_warn_user_view($id, $mode, $action)
$sql_where = ($user_id) ? "user_id = $user_id" : "username = '" . $db->sql_escape($username) . "'"; $sql_where = ($user_id) ? "user_id = $user_id" : "username = '" . $db->sql_escape($username) . "'";
$sql = 'SELECT * FROM ' . USERS_TABLE . " WHERE $sql_where"; /* $sql = 'SELECT * FROM ' . USERS_TABLE . " WHERE $sql_where";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!$userrow = $db->sql_fetchrow($result)) if (!$userrow = $db->sql_fetchrow($result))
{ {
trigger_error($user->lang['NO_USER']); trigger_error($user->lang['NO_USER']);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);*/
$userrow = get_userdata($user_id);
$user_id = $userrow['user_id']; $user_id = $userrow['user_id'];
@ -390,29 +391,38 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0)
if ($send_pm) if ($send_pm)
{ {
include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx); include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
include($phpbb_root_path . 'includes/message_parser.'.$phpEx);
$userrow['user_lang'] = (file_exists($phpbb_root_path . 'language/' . $userrow['user_lang'] . "/mcp.$phpEx")) ? $userrow['user_lang'] : $config['default_lang'];
include($phpbb_root_path . 'language/' . $userrow['user_lang'] . "/mcp.$phpEx");
$message_parser = new parse_message();
$message_parser->message = sprintf($lang['WARNING_PM_BODY'], $warning);
$message_md5 = md5($message_parser->message);
$message_parser->parse(false, true, true, true, false, false, true);
$pm_data = array( $pm_data = array(
'from_user_id' => $user->data['user_id'], 'from_user_id' => $user->data['user_id'],
'from_user_ip' => $user->data['user_ip'], 'from_user_ip' => $user->data['user_ip'],
'from_username' => $user->data['username'], 'from_username' => $user->data['username'],
'enable_sig' => false, 'enable_sig' => false,
'enable_bbcode' => false, 'enable_bbcode' => true,
'enable_html' => false, 'enable_html' => false,
'enable_smilies' => false, 'enable_smilies' => true,
'enable_urls' => false, 'enable_urls' => false,
'icon_id' => 0, 'icon_id' => 0,
'message_md5' => 0, 'message_md5' => (int) $message_md5,
'bbcode_bitfield' => 0, 'bbcode_bitfield' => (int) $message_parser->bbcode_bitfield,
'bbcode_uid' => '', 'bbcode_uid' => $message_parser->bbcode_uid,
'message' => $warning, // TODO: The message sent to the user should either be templated from the language pack or set in the board config 'message' => $message_parser->message,
'address_list' => array('u' => array($userrow['user_id'] => 'to')), 'address_list' => array('u' => array($userrow['user_id'] => 'to')),
); );
submit_pm('post', 'Warning Issued', $pm_data, false, false); // TODO: The topic should either be in the language of the recipient or set in the board config submit_pm('post', $lang['WARNING_PM_SUBJECT'], $pm_data, false, false);
} }
add_log('admin', 'LOG_USER_WARNING', $userrow['username']); add_log('admin', 'LOG_USER_WARNING', $userrow['username']);
add_log('user', $userrow['user_id'], 'LOG_USER_GENERAL', $warning); // TODO: Need a relevant language entry for this such that it is displayed as a warning in the notes add_log('user', $userrow['user_id'], 'LOG_USER_WARNING_BODY', $warning);
$sql_ary = array( $sql_ary = array(
'user_id' => $userrow['user_id'], 'user_id' => $userrow['user_id'],

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

@ -218,6 +218,7 @@ $lang = array_merge($lang, array(
'LOG_USER_FEEDBACK' => '<b>Added user feedback</b><br />&#187; %s', 'LOG_USER_FEEDBACK' => '<b>Added user feedback</b><br />&#187; %s',
'LOG_USER_GENERAL' => '%s', 'LOG_USER_GENERAL' => '%s',
'LOG_USER_WARNING' => '<b>Added user warning</b><br />&#187;%s', 'LOG_USER_WARNING' => '<b>Added user warning</b><br />&#187;%s',
'LOG_USER_WARNING_BODY' => '<b>The following warning was issued to this user</b><br />&#187;%s',
'MARK' => 'Mark', 'MARK' => 'Mark',
'MARK_ALL' => 'Mark all', 'MARK_ALL' => 'Mark all',

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

@ -279,6 +279,8 @@ $lang = array_merge($lang, array(
'VIEW_DETAILS' => 'View Details', 'VIEW_DETAILS' => 'View Details',
'WARNED_USERS' => 'Warned Users', 'WARNED_USERS' => 'Warned Users',
'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',
'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s', 'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s',