mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/8616] Direct links in pm notification emails

Browse Source 
Import the "Direct links in pm notification emails" modification,
version 1.0.1.

PHPBB3-8616
This commit is contained in:
Alan
2011-10-13 19:17:56 +02:00
committed by Igor Wiedler
parent b957639abb
commit f7c1341402
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/functions_privmsgs.php
View File

@@ -1607,7 +1607,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
// Send Notifications // Send Notifications
if ($mode != 'edit') if ($mode != 'edit')
{ {
pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message']); pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message'], $data['msg_id']);
} }
return $data['msg_id']; return $data['msg_id'];
@@ -1616,7 +1616,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
/** /**
* PM Notification * PM Notification
*/ */
function pm_notification($mode, $author, $recipients, $subject, $message) function pm_notification($mode, $author, $recipients, $subject, $message, $msg_id)
{ {
global $db, $user, $config, $phpbb_root_path, $phpEx, $auth; global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;
@@ -1688,7 +1688,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message)
'AUTHOR_NAME' => htmlspecialchars_decode($author), 'AUTHOR_NAME' => htmlspecialchars_decode($author),
'USERNAME' => htmlspecialchars_decode($addr['name']), 'USERNAME' => htmlspecialchars_decode($addr['name']),
'U_INBOX' => generate_board_url() . "/ucp.$phpEx?i=pm&folder=inbox") 'U_INBOX' => generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id")
); );
$messenger->send($addr['method']); $messenger->send($addr['method']);

2
phpBB/includes/ucp/ucp_pm.php
View File

@@ -243,7 +243,7 @@ class ucp_pm
$num_not_moved = $num_removed = 0; $num_not_moved = $num_removed = 0;
$release = request_var('release', 0); $release = request_var('release', 0);
if ($user->data['user_new_privmsg'] && $action == 'view_folder') if ($user->data['user_new_privmsg'] && ($action == 'view_folder' || $action == 'view_message'))
{ {
$return = place_pm_into_folder($global_privmsgs_rules, $release); $return = place_pm_into_folder($global_privmsgs_rules, $release);
$num_not_moved = $return['not_moved']; $num_not_moved = $return['not_moved'];

6
phpBB/ucp.php
View File

@@ -254,6 +254,12 @@ if (!$user->data['is_registered'])
redirect(append_sid("{$phpbb_root_path}index.$phpEx")); redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
} }
if ($id == 'pm' && $mode == 'view' && isset($_GET['p']))
{
$redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx?i=pm&p=" . request_var('p', 0));
login_box($redirect_url, $user->lang['LOGIN_EXPLAIN_UCP']);
}
login_box('', $user->lang['LOGIN_EXPLAIN_UCP']); login_box('', $user->lang['LOGIN_EXPLAIN_UCP']);
} }