Version 4.7.23

system/Notification/Notification.php

@@ -714,6 +714,7 @@ class _Notification
 				
 				$unsubscribeBlurb = NULL;
 				$unfollowLink = NULL;
+				$listUnsubscribeLink = null;
 				$okToEmail = TRUE;
 				
 				if ( $info )
@@ -750,6 +751,7 @@ class _Notification
 					
 					$guestKey = md5( $info['follow_app'] . ';' . $info['follow_area'] . ';' . $info['follow_rel_id'] . ';' . $info['follow_member_id'] . ';' . $info['follow_added'] ) . '-' . md5( $member->email . ';' . $member->ip_address . ';' . $member->joined->getTimestamp() );
 					$unfollowLink = \IPS\Http\Url::internal( "app=core&module=system&controller=notifications&do=unfollowFromEmail&follow_app={$info['follow_app']}&follow_area={$info['follow_area']}&follow_id={$info['follow_rel_id']}&gkey={$guestKey}", 'front' );
+					$listUnsubscribeLink = $unfollowLink->setQueryString( 'listunsubscribe', 1 );
 
 					/* If we are tracking email views/clicks, add the tracking info to this URL as the email handler won't be able to */
 					if( \IPS\Settings::i()->prune_log_emailstats != 0 )
@@ -770,7 +772,8 @@ class _Notification
 					$emailRecipients[ $language ][ $member->email ] = array(
 						'member_name'		=> $member->name,
 						'unsubscribe_blurb'	=> $unsubscribeBlurb,
-						'unfollow_link'		=> $unfollowLink
+						'unfollow_link'		=> $unfollowLink,
+						'list_unsubscribe_link' => $listUnsubscribeLink
 					);
 				}
 				
@@ -938,7 +941,10 @@ class _Notification
 		{
 			if ( !empty( $emailRecipients[ $languageId ] ) )
 			{
-				$email->mergeAndSend( $emailRecipients[ $languageId ], NULL, NULL, array(), \IPS\Lang::load( $languageId ) );
+				$email->mergeAndSend( $emailRecipients[ $languageId ], NULL, NULL, array(
+					'List-Unsubscribe' 		=> '<*|list_unsubscribe_link|*>',
+					'List-Unsubscribe-Post' => 'List-Unsubscribe=One-Click'
+				), \IPS\Lang::load( $languageId ) );
 			}
 		}
 	}