|
|
@@ -954,6 +954,7 @@ function prepareMessageContext($type = 'subject', $reset = false)
|
|
|
{
|
|
|
$memberContext[$message['id_member_from']]['name'] = $message['from_name'];
|
|
|
$memberContext[$message['id_member_from']]['id'] = 0;
|
|
|
+
|
|
|
// Sometimes the forum sends messages itself (Warnings are an example) - in this case don't label it from a guest.
|
|
|
$memberContext[$message['id_member_from']]['group'] = $message['from_name'] == $context['forum_name'] ? '' : $txt['guest_title'];
|
|
|
$memberContext[$message['id_member_from']]['link'] = $message['from_name'];
|
|
|
@@ -967,7 +968,7 @@ function prepareMessageContext($type = 'subject', $reset = false)
|
|
|
$memberContext[$message['id_member_from']]['can_see_warning'] = !isset($context['disabled_fields']['warning_status']) && $memberContext[$message['id_member_from']]['warning_status'] && ($context['user']['can_mod'] || (!empty($modSettings['warning_show']) && ($modSettings['warning_show'] > 1 || $message['id_member_from'] == $user_info['id'])));
|
|
|
}
|
|
|
|
|
|
- $memberContext[$message['id_member_from']]['show_profile_buttons'] = $settings['show_profile_buttons'] && (!empty($memberContext[$message['id_member_from']]['can_view_profile']) || (!empty($memberContext[$message['id_member_from']]['website']['url']) && !isset($context['disabled_fields']['website'])) || (in_array($memberContext[$message['id_member_from']]['show_email'], array('yes', 'yes_permission_override', 'no_through_forum'))) || $context['can_send_pm']);
|
|
|
+ $memberContext[$message['id_member_from']]['show_profile_buttons'] = $settings['show_profile_buttons'] && (!empty($memberContext[$message['id_member_from']]['can_view_profile']) || (!empty($memberContext[$message['id_member_from']]['website']['url']) && !isset($context['disabled_fields']['website'])) || (in_array($memberContext[$message['id_member_from']]['show_email'], array('yes', 'yes_permission_override', 'no_through_forum'))) || $context['can_send_pm']);
|
|
|
|
|
|
// Censor all the important text...
|
|
|
censorText($message['body']);
|
|
|
@@ -995,7 +996,7 @@ function prepareMessageContext($type = 'subject', $reset = false)
|
|
|
'is_selected' => !empty($temp_pm_selected) && in_array($message['id_pm'], $temp_pm_selected),
|
|
|
'is_message_author' => $message['id_member_from'] == $user_info['id'],
|
|
|
'can_report' => !empty($modSettings['enableReportPM']),
|
|
|
- 'can_see_ip' => allowedTo('moderate_forum') || ($message['id_member'] == $user_info['id'] && !empty($user_info['id'])),
|
|
|
+ 'can_see_ip' => allowedTo('moderate_forum') || ($message['id_member_from'] == $user_info['id'] && !empty($user_info['id'])),
|
|
|
);
|
|
|
|
|
|
$counter++;
|
|
|
@@ -1802,7 +1803,7 @@ function MessagePost()
|
|
|
$editorOptions = array(
|
|
|
'id' => 'message',
|
|
|
'value' => $context['message'],
|
|
|
- 'height' => '175px',
|
|
|
+ 'height' => '250px',
|
|
|
'width' => '100%',
|
|
|
'labels' => array(
|
|
|
'post_button' => $txt['send_message'],
|
|
|
@@ -1835,7 +1836,7 @@ function MessagePost()
|
|
|
*/
|
|
|
function MessageDrafts()
|
|
|
{
|
|
|
- global $context, $sourcedir, $user_info, $modSettings;
|
|
|
+ global $sourcedir, $user_info;
|
|
|
|
|
|
// validate with loadMemberData()
|
|
|
$memberResult = loadMemberData($user_info['id'], false);
|
|
|
@@ -1996,6 +1997,7 @@ function messagePostError($error_types, $named_recipients, $recipient_ids = arra
|
|
|
'id' => 'message',
|
|
|
'value' => $context['message'],
|
|
|
'width' => '90%',
|
|
|
+ 'height' => '250px',
|
|
|
'labels' => array(
|
|
|
'post_button' => $txt['send_message'],
|
|
|
),
|
|
|
@@ -3709,4 +3711,4 @@ function isAccessiblePM($pmID, $validFor = 'in_or_outbox')
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-?>
|
|
|
+?>
|
Spuds