sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 4.2.0

Browse Source
This commit is contained in:
Neo committed 2025-12-19 05:44:59 -08:00
1 parent 0dc2aee5ed
commit 96997ddd8e
2074 files changed
+125454 -55780
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/core/modules/front/messaging/messenger.php
+14 -13
View File
@@ -1,12 +1,11 @@
<?php
/**
* @brief Messenger
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
* @license http://www.invisionpower.com/legal/standards/
* @package IPS Community Suite
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @package Invision Community
* @since 5 Jul 2013
* @version SVN_VERSION_NUMBER
*/
namespace IPS\core\modules\front\messaging;
@@ -233,9 +232,9 @@ class _messenger extends \IPS\Content\Controller
{
$where[] = array( 'core_message_topic_user_map.map_has_unread=1' );
}
/* Add a folder filter */
if ( !isset( \IPS\Request::i()->overview ) )
if ( isset( \IPS\Request::i()->folder ) or !is_null( $folder ) )
{
if ( !is_null( $folder ) AND isset( $folders[ $folder ] ) )
{
@@ -248,11 +247,13 @@ class _messenger extends \IPS\Content\Controller
}
/* If we're searching, get the results */
$perPage = 25;
$iterator = array();
$perPage = 25;
$iterator = array();
if ( \IPS\Request::i()->q )
{
$subQuery = \IPS\Db::i()->select( 'map_topic_id', array( 'core_message_topic_user_map', 'core_message_topic_user_map' ), $where );
$where = array( array( 'core_message_posts.msg_topic_id IN (?)', $subQuery ) );
$query = array();
if ( isset( \IPS\Request::i()->search ) and $searchValues = \IPS\Request::i()->valueFromArray('search') )
{
@@ -275,7 +276,7 @@ class _messenger extends \IPS\Content\Controller
if ( count( $query ) )
{
$where[] = '(' . implode( ' OR ', $query ) . ')';
$where[] = array( '(' . implode( ' OR ', $query ) . ')' );
}
}
@@ -477,7 +478,7 @@ class _messenger extends \IPS\Content\Controller
}
}
\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=messaging&controller=messenger&folder=' . \IPS\Request::i()->move_message_to, 'front', 'messenger' ) );
\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=messaging&controller=messenger&folder=' . \IPS\Request::i()->move_message_to, 'front', 'messaging' ) );
}
\IPS\Output::i()->title = 'messenger_move';
@@ -690,7 +691,7 @@ class _messenger extends \IPS\Content\Controller
if ( isset( \IPS\Request::i()->member_names ) )
{
foreach ( explode( ',', \IPS\Request::i()->member_names ) as $name )
foreach ( explode( "\n", \IPS\Request::i()->member_names ) as $name )
{
/* We have to html_entity_decode because the javascript code sends the encoded name here */
$memberToAdd = \IPS\Member::load( html_entity_decode( $name, ENT_QUOTES, 'UTF-8' ), 'name' );