Version 4.7.0

applications/core/sources/Messenger/Conversation.php

@@ -44,6 +44,11 @@ class _Conversation extends \IPS\Content\Item
 	 */
 	public static $includeInSiteSearch = FALSE;
 
+	/**
+	 * @brief	[Content\Item]	Include these items in trending content
+	 */
+	public static $includeInTrending = FALSE;
+
 	/**
 	 * @brief	[Content\Comment]	Icon
 	 */
@@ -229,13 +234,13 @@ class _Conversation extends \IPS\Content\Item
  						}
  					}
 
-					$return['to'] = new \IPS\Helpers\Form\Member( 'messenger_to', $member, TRUE, array( 'multiple' => ( \IPS\Member::loggedIn()->group['g_max_mass_pm'] == -1 ) ? NULL : \IPS\Member::loggedIn()->group['g_max_mass_pm'] ), function ( $members )
+					$return['to'] = new \IPS\Helpers\Form\Member( 'messenger_to', $member, TRUE, array( 'disabled' => ( \IPS\Request::i()->alert ) ? TRUE : FALSE, 'multiple' => ( \IPS\Member::loggedIn()->group['g_max_mass_pm'] == -1 ) ? NULL : \IPS\Member::loggedIn()->group['g_max_mass_pm'] ), function ( $members )
 					{
 						if ( \is_array( $members ) )
 						{
 							foreach ( $members as $m )
 							{
-								if ( !$m instanceof \IPS\Member OR !static::memberCanReceiveNewMessage( $m, \IPS\Member::loggedIn() ) )
+								if ( !$m instanceof \IPS\Member OR !static::memberCanReceiveNewMessage( $m, \IPS\Member::loggedIn(), 'new' ) )
 								{
 									throw new \InvalidArgumentException( \IPS\Member::loggedIn()->language()->addToStack('meesnger_err_bad_recipient', FALSE, array( 'sprintf' => array( ( $m instanceof \IPS\Member ) ? $m->name : $m ) ) ) );
 								}
@@ -243,7 +248,7 @@ class _Conversation extends \IPS\Content\Item
 						}
 						else
 						{
-							if ( !$members instanceof \IPS\Member OR !$members->member_id OR !static::memberCanReceiveNewMessage( $members, \IPS\Member::loggedIn() ) )
+							if ( !$members instanceof \IPS\Member OR !$members->member_id OR !static::memberCanReceiveNewMessage( $members, \IPS\Member::loggedIn(), 'new' ) )
 							{
 								throw new \InvalidArgumentException( \IPS\Member::loggedIn()->language()->addToStack('meesnger_err_bad_recipient', FALSE, array( 'sprintf' => array( ( $members instanceof \IPS\Member ) ? $members->name : $members ) ) ) );
 							}
@@ -267,6 +272,11 @@ class _Conversation extends \IPS\Content\Item
 			$return[ $k ] = $v;
 		}
 
+		if( \IPS\Request::i()->alert )
+		{
+			unset( $return['title'] );
+		}
+
 		return $return;
 	}
 	
@@ -276,15 +286,22 @@ class _Conversation extends \IPS\Content\Item
 	 *
 	 * @param	\IPS\Member	$member	The member to check
 	 * @param	\IPS\Member	$sender	The member sending the new message
+	 * @param	string		$type	Type of message to check (new, reply)
+	 
 	 * @return	bool
 	 */
-	public static function memberCanReceiveNewMessage( \IPS\Member $member, \IPS\Member $sender )
+	public static function memberCanReceiveNewMessage( \IPS\Member $member, \IPS\Member $sender, $type='new' )
 	{
-		/* Messenger is disabled */
-		if ( $member->members_disable_pm )
+		/* Messenger is hard disabled */
+		if ( $member->members_disable_pm == 2 )
 		{
 			return FALSE;
 		}
+		else if ( $member->members_disable_pm == 1 )
+		{
+			/* We will allow moderators */
+			return $sender->modPermissions() !== FALSE;
+		}
 		
 		/* Group can not use messenger */
 		if ( !$member->canAccessModule( \IPS\Application\Module::get( 'core', 'messaging' ) ) )
@@ -357,6 +374,24 @@ class _Conversation extends \IPS\Content\Item
 		
 		/* Send the notification for the first message */
 		$comment->sendNotifications();
+
+		/* If this came from an alert dismiss the alert */
+		if( \IPS\Request::i()->alert )
+		{
+			try
+			{
+				$alert = \IPS\core\Alerts\Alert::load( \IPS\Request::i()->alert );
+
+				if( $alert->forMember( \IPS\Member::loggedIn() ) )
+				{
+					$alert->dismiss();
+
+					$this->alert = $alert->id;
+					$this->save();
+				}
+			}
+			catch ( \Exception $e ){}
+		}
 	}
 	
 	/**
@@ -853,4 +888,29 @@ class _Conversation extends \IPS\Content\Item
 		}
 	}
 
+	/**
+	 * Build form to create
+	 *
+	 * @param	\IPS\Node\Model|NULL	$container	Container (e.g. forum), if appropriate
+	 * @param	\IPS\Content\Item|NULL	$item		Content item, e.g. if editing
+	 * @return	\IPS\Helpers\Form
+	 */
+	protected static function buildCreateForm( \IPS\Node\Model $container=NULL, \IPS\Content\Item $item=NULL )
+	{
+		$form = parent::buildCreateForm( $container, $item );
+
+		try
+		{
+			$alert = \IPS\core\Alerts\Alert::load( \IPS\Request::i()->alert );
+
+			if( $alert->forMember( \IPS\Member::loggedIn() ) )
+			{
+				$form->hiddenValues['alert'] = $alert->id;
+				$form->hiddenValues['messenger_title'] = $alert->title;
+			}
+		}
+		catch ( \OutOfRangeException $e ) {}
+
+		return $form;
+	}
 }

applications/core/sources/Messenger/Message.php

@@ -138,16 +138,17 @@ class _Message extends \IPS\Content\Comment
 	 * @param	\IPS\DateTime|NULL		$time				The time
 	 * @param	string|NULL				$ipAddress			The IP address or NULL to detect automatically
 	 * @param	int|NULL				$hiddenStatus		NULL to set automatically or override: 0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator)
+	 * @param	int|NULL				$anonymous			NULL for no value, 0 or 1 for a value (0=no, 1=yes)
 	 * @return	static
 	 */
-	public static function create( $item, $comment, $first=FALSE, $guestName=NULL, $incrementPostCount=NULL, $member=NULL, \IPS\DateTime $time=NULL, $ipAddress=NULL, $hiddenStatus=NULL )
+	public static function create( $item, $comment, $first=FALSE, $guestName=NULL, $incrementPostCount=NULL, $member=NULL, \IPS\DateTime $time=NULL, $ipAddress=NULL, $hiddenStatus=NULL, $anonymous=NULL )
 	{
 		if ( $member === NULL )
 		{
 			$member = \IPS\Member::loggedIn();
 		}
 		
-		$comment = parent::create( $item, $comment, $first, $guestName, $incrementPostCount, $member, $time, $ipAddress, $hiddenStatus );
+		$comment = parent::create( $item, $comment, $first, $guestName, $incrementPostCount, $member, $time, $ipAddress, $hiddenStatus, $anonymous );
 		
 		/* Mark unread for this person */
 		\IPS\Db::i()->update( 'core_message_topic_user_map', array( 'map_has_unread' => FALSE, 'map_read_time' => time() ), array( 'map_user_id=? AND map_topic_id=?', $member->member_id, $item->id ) );
@@ -177,7 +178,7 @@ class _Message extends \IPS\Content\Comment
 			{
 				$member = \IPS\Member::load( $map['map_user_id'] );
 				/* skip this for members which can't or don't want to use the messenger or for deleted users */
-				if ( $member->members_disable_pm or !$member->canAccessModule( $messengerModule ) or !$member->member_id )
+				if ( $member->members_disable_pm == 2 or !$member->canAccessModule( $messengerModule ) or !$member->member_id )
 				{
 					continue;
 				}