mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

#2109

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6017 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-06-07 08:44:12 +00:00
parent c307c5021a
commit 5f34b5d150
5 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_privmsgs.php
View File

@ -1101,10 +1101,10 @@ function get_folder_status($folder_id, $folder)
'remaining' => $user->data['message_limit'] - $folder['num_messages'],
'max' => $user->data['message_limit'],
'percent' => ($user->data['message_limit'] > 0) ? round(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100,
'message' => sprintf($user->lang['FOLDER_STATUS_MSG'], $return['percent'], $return['cur'], $return['max']),
);
$return['message'] = sprintf($user->lang['FOLDER_STATUS_MSG'], $return['percent'], $return['cur'], $return['max']);
return $return;
}

5
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@ -201,14 +201,9 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'S_DISPLAY_NOTICE' => $display_notice && $message_row['message_attachment'],
'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=print" : '',
'U_EMAIL_PM' => ($config['email_pm'] && $config['email_enable'] && $auth->acl_get('u_pm_emailpm')) ? '' : '',
'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_pm_forward')) ? "$url&mode=compose&action=forward&f=$folder_id&p=" . $message_row['msg_id'] : '')
);
/**
* @todo U_EMAIL_PM add ability to send PM's by email
*/
// Display not already displayed Attachments for this post, we already parsed them. ;)
if (isset($attachments) && sizeof($attachments))
{

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

@ -98,7 +98,6 @@ $lang = array_merge($lang, array(
'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages',
'ALLOW_DOWNLOAD_PM' => 'Allow downloading of attachments in private messages',
'ALLOW_EMAIL_PM' => 'Allow emailing private messages',
'ALLOW_FLASH_PM' => 'Allow use of FLASH BBCode Tag',
'ALLOW_FORWARD_PM' => 'Allow forwarding of private messages',
'ALLOW_IMG_PM' => 'Allow use of IMG BBCode Tag',

1
phpBB/language/en/ucp.php
View File

@ -159,7 +159,6 @@ $lang = array_merge($lang, array(
'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft. Drafts do not contain attachment and poll informations.',
'EMAIL_INVALID_EMAIL' => 'The email address you entered is invalid.',
'EMAIL_REMIND' => 'This must be the email address you supplied when registering.',
'EMAIL_PM' => 'Email PM',
'EMAIL_TAKEN_EMAIL' => 'The entered email address is already in use',
'EMPTY_DRAFT' => 'You must enter a message to submit your changes',
'EMPTY_DRAFT_TITLE' => 'You must enter a draft title',

3
phpBB/styles/subSilver/template/ucp_pm_message_footer.html
View File

@ -10,8 +10,7 @@
<!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF -->
<!-- IF S_VIEW_MESSAGE -->
<span class="gensmall">
<!-- IF U_PRINT_PM --><a href="{U_PRINT_PM}" title="{L_PRINT_PM}">{L_PRINT_PM}</a><!-- IF U_EMAIL_PM or U_FORWARD_PM--> | <!-- ENDIF --><!-- ENDIF -->
<!-- IF U_EMAIL_PM --><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}">{L_EMAIL_PM}</a><!-- IF U_FORWARD_PM --> | <!-- ENDIF --><!-- ENDIF -->
<!-- IF U_PRINT_PM --><a href="{U_PRINT_PM}" title="{L_PRINT_PM}">{L_PRINT_PM}</a><!-- IF U_FORWARD_PM --> | <!-- ENDIF --><!-- ENDIF -->
<!-- IF U_FORWARD_PM --><a href="{U_FORWARD_PM}" title="{L_FORWARD_PM}">{L_FORWARD_PM}</a><!-- ENDIF -->
</span>
<!-- ENDIF -->