Version 4.7.6

applications/core/modules/front/messaging/messenger.php

@@ -204,13 +204,13 @@ class _messenger extends \IPS\Content\Controller
 				try
 				{
 					$alert = \IPS\core\Alerts\Alert::load( $conversation->alert );
+
+					if( ! $alert->forMember( \IPS\Member::loggedIn() ) and $alert->author()->member_id != \IPS\Member::loggedIn()->member_id )
+					{
+						$alert = NULL;
+					}
 				}
 				catch ( \OutOfRangeException $e ) {}
-
-				if( !$alert->forMember( \IPS\Member::loggedIn() ) )
-				{
-					$alert = NULL;
-				}
 			}
 		}
 		
@@ -359,6 +359,11 @@ class _messenger extends \IPS\Content\Controller
 			/* Performance: if $count is 0, don't bother selecting ... it's a wasted query */
 			if( $count )
 			{
+				if ( $alert = \IPS\core\Alerts\Alert::getAlertCurrentlyFilteringMessages() )
+				{
+					$where[] = array( 'core_message_topics.mt_alert=?', $alert->id );
+				}
+
 				/* Get iterator */
 				$iterator	= \IPS\Db::i()->select(
 						'core_message_topic_user_map.*, core_message_topics.*',
@@ -496,6 +501,9 @@ class _messenger extends \IPS\Content\Controller
 				if( $alert->forMember( \IPS\Member::loggedIn() ) )
 				{
 					\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('alert_modal_title', FALSE, array( 'sprintf' => array( $alert->title ) ) );
+
+					$form->elements['']['messenger_content']->defaultValue = '<blockquote class="ipsQuote">' . $alert->content . "</blockquote><br>";
+					$form->elements['']['messenger_content']->setValue(TRUE , FALSE );
 				}
 			}
 			catch ( \OutOfRangeException $e ) {}
@@ -1014,4 +1022,16 @@ class _messenger extends \IPS\Content\Controller
 			'counts'		=> $counts
 		);
 	}
+
+	/**
+	 * Remove any messenger filters
+	 *
+	 * @return void
+	 */
+	protected function removeAlertFilter()
+	{
+		\IPS\core\Alerts\Alert::clearMessengerFilters();
+
+		\IPS\Output::i()->redirect( \IPS\Http\Url::internal('app=core&module=messaging&controller=messenger&overview=1') );
+	}
 }