Version 4.1.2

This commit is contained in:
Neo committed 2025-12-19 05:32:19 -08:00
1 parent 3ba79295ee
commit 28bd025b35
1131 files changed
+63658 -20579

No files matched your search

@@ -218,6 +218,7 @@ class _messenger extends \IPS\Content\Controller
}
/* If we're searching, get the results */
$perPage = 25;
if ( \IPS\Request::i()->q )
{
$where[] = array( "( MATCH(core_message_topics.mt_title) AGAINST ('" . \IPS\Db::i()->escape_string( \IPS\Request::i()->q ) . "' IN BOOLEAN MODE) OR
@@ -248,7 +249,7 @@ class _messenger extends \IPS\Content\Controller
'core_message_posts',
$where,
( in_array( \IPS\Request::i()->sortBy, array( 'mt_last_post_time', 'mt_start_time', 'mt_replies' ) ) ? \IPS\Request::i()->sortBy : 'mt_last_post_time' ) . ' DESC',
array( ( intval( \IPS\Request::i()->listPage ?: 1 ) - 1 ) * 25, 25 ),
array( ( intval( \IPS\Request::i()->listPage ?: 1 ) - 1 ) * $perPage, $perPage ),
'msg_topic_id'
)->join(
'core_message_topics',
@@ -269,7 +270,7 @@ class _messenger extends \IPS\Content\Controller
'core_message_topic_user_map',
$where,
( in_array( \IPS\Request::i()->sortBy, array( 'mt_last_post_time', 'mt_start_time', 'mt_replies' ) ) ? \IPS\Request::i()->sortBy : 'mt_last_post_time' ) . ' DESC',
array( ( intval( \IPS\Request::i()->listPage ?: 1 ) - 1 ) * 25, 25 )
array( ( intval( \IPS\Request::i()->listPage ?: 1 ) - 1 ) * $perPage, $perPage )
)->join(
'core_message_topics',
'core_message_topic_user_map.map_topic_id=core_message_topics.mt_id'
@@ -278,18 +279,20 @@ class _messenger extends \IPS\Content\Controller
/* Build the message list */
$conversations = array();
foreach ( $iterator as $row )
{
$row['last_message'] = \IPS\core\Messenger\Conversation::load( $row['mt_id'] )->comments( 1, 0, 'date', 'desc' );
$row['participants'] = \IPS\core\Messenger\Conversation::load( $row['mt_id'] )->participantBlurb();
$conversations[ $row['mt_id'] ] = $row;
}
/* Note the last time we looked at the message list */
\IPS\Member::loggedIn()->msg_count_reset = time();
\IPS\core\Messenger\Conversation::rebuildMessageCounts( \IPS\Member::loggedIn() );
/* Display */
$pagination = \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->pagination( $baseUrl->setQueryString('_list', 1), ceil( $count / 25 ), ( \IPS\Request::i()->listPage ?: 1 ), 25, TRUE, 'listPage' );
$pagination = \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->pagination( $baseUrl->setQueryString('_list', 1), ceil( $count / $perPage ), ( \IPS\Request::i()->listPage ?: 1 ), $perPage, TRUE, 'listPage' );
if ( \IPS\Request::i()->isAjax() )
{
if( \IPS\Request::i()->id )
@@ -302,7 +305,7 @@ class _messenger extends \IPS\Content\Controller
}
else
{
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate('messaging')->messageListRows( $conversations, $pagination );
\IPS\Output::i()->sendOutput( \IPS\Theme::i()->getTemplate('messaging')->messageListRows( $conversations, $pagination, TRUE ), 200, 'text/html' );
}
}
else
@@ -664,10 +667,23 @@ class _messenger extends \IPS\Content\Controller
{
try
{
$conversation = \IPS\core\Messenger\Conversation::loadAndCheckPerms( \IPS\Request::i()->id );
$conversation->deauthorize( \IPS\Member::loggedIn() );
\IPS\core\Messenger\Conversation::rebuildMessageCounts( \IPS\Member::loggedIn() );
$ids = \IPS\Request::i()->id;
if ( !is_array( \IPS\Request::i()->id ) )
{
$ids = array( $ids );
}
foreach ( $ids as $id )
{
try
{
$conversation = \IPS\core\Messenger\Conversation::loadAndCheckPerms( $id );
$conversation->deauthorize( \IPS\Member::loggedIn() );
}
catch ( \Exception $e ) {}
}
if ( \IPS\Request::i()->isAjax() )
{
\IPS\Output::i()->json( array_merge( array( 'result' => 'success' ), $this->_getNewTotals() ) );