mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +02:00
Code Issues Releases Wiki Activity

#1304, #1335, #1336

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5738 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-03-27 21:42:47 +00:00
parent 056aa160f9
commit 3ad9c2f089
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -798,7 +798,7 @@ class acp_attachments
if (sizeof($delete_files)) if (sizeof($delete_files))
{ {
add_log('admin', sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode(', ', $delete_files))); add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode(', ', $delete_files));
$notify[] = sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode(', ', $delete_files)); $notify[] = sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode(', ', $delete_files));
} }
@ -1102,7 +1102,7 @@ class acp_attachments
$db->sql_transaction('commit'); $db->sql_transaction('commit');
add_log('admin', sprintf($user->lang['LOG_ATTACH_FILEUPLOAD'], $post_id, $filename)); add_log('admin', 'LOG_ATTACH_FILEUPLOAD', $post_id, $filename);
return true; return true;
} }

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

@ -155,7 +155,7 @@ class acp_jabber
$template->assign_vars(array( $template->assign_vars(array(
'U_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action,
'JAB_ENABLE' => $new['jab_enable'], 'JAB_ENABLE' => $new['jab_enable'],
'L_JAB_SERVER_EXPLAIN' => sprintf($user->lang['JAB_SERVER_EXPLAIN'], '<a href="http://www.jabber.org/user/publicservers.php" rel="external">', '</a>'), 'L_JAB_SERVER_EXPLAIN' => sprintf($user->lang['JAB_SERVER_EXPLAIN'], '<a href="http://www.xmpp.net/" rel="external">', '</a>'),
'JAB_HOST' => $new['jab_host'], 'JAB_HOST' => $new['jab_host'],
'JAB_PORT' => $new['jab_port'], 'JAB_PORT' => $new['jab_port'],
'JAB_USERNAME' => $new['jab_username'], 'JAB_USERNAME' => $new['jab_username'],

2
phpBB/language/en/acp/board.php
View File

@ -61,7 +61,7 @@ $lang = array_merge($lang, array(
'ACP_MESSAGE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for private messaging', 'ACP_MESSAGE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for private messaging',
'BOXES_MAX' => 'Max private message folders', 'BOXES_MAX' => 'Max private message folders',
'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages..', 'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages.',
'BOXES_LIMIT' => 'Max private messages per box', 'BOXES_LIMIT' => 'Max private messages per box',
'BOXES_LIMIT_EXPLAIN' => 'Users may receive no more than this many messages in each of their private message boxes or zero for unlimited messages.', 'BOXES_LIMIT_EXPLAIN' => 'Users may receive no more than this many messages in each of their private message boxes or zero for unlimited messages.',
'FULL_FOLDER_ACTION' => 'Full folder default action', 'FULL_FOLDER_ACTION' => 'Full folder default action',

2
phpBB/language/en/acp/common.php
View File

@ -343,7 +343,7 @@ $lang = array_merge($lang, array(
'LOG_ATTACH_EXTGROUP_ADD' => '<b>Added extension group</b><br />&#187; %s', 'LOG_ATTACH_EXTGROUP_ADD' => '<b>Added extension group</b><br />&#187; %s',
'LOG_ATTACH_EXTGROUP_EDIT' => '<b>Edited extension group</b><br />&#187; %s', 'LOG_ATTACH_EXTGROUP_EDIT' => '<b>Edited extension group</b><br />&#187; %s',
'LOG_ATTACH_EXTGROUP_DEL' => '<b>Removed extension group</b><br />&#187; %s', 'LOG_ATTACH_EXTGROUP_DEL' => '<b>Removed extension group</b><br />&#187; %s',
'LOG_ATTACH_FILEUPLOAD' => '<b>Orphan File uploaded to Post Number %1$d - %2$s</b>', 'LOG_ATTACH_FILEUPLOAD' => '<b>Orphan File uploaded to Post</b><br />&#187; ID %1$d - %2$s',
'LOG_ATTACH_ORPHAN_DEL' => '<b>Orphan Files deleted</b><br />&#187; %s', 'LOG_ATTACH_ORPHAN_DEL' => '<b>Orphan Files deleted</b><br />&#187; %s',
'LOG_BAN_EXCLUDE_USER' => '<b>Excluded user from ban</b> for reason "<i>%s</i>"<br />&#187; %s ', 'LOG_BAN_EXCLUDE_USER' => '<b>Excluded user from ban</b> for reason "<i>%s</i>"<br />&#187; %s ',