Version 3.4.8
This commit is contained in:
1 parent
b45ea0dffb
commit
c603205a25
1398 files changed
+36675
-31023
No files matched your search
@@ -3,19 +3,19 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Profile AJAX Ignored User methods
|
||||
* Last Updated: $Date: 2013-01-29 18:38:34 -0500 (Tue, 29 Jan 2013) $
|
||||
* Last Updated: $Date: 2015-04-24 13:07:02 -0400 (Fri, 24 Apr 2015) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: AndyMillne $
|
||||
* @author $Author: bfarber $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/company/standards.php#license
|
||||
* @package IP.Board
|
||||
* @subpackage Members
|
||||
* @link http://www.invisionpower.com
|
||||
* @since Thursday 26th June 2008
|
||||
* @version $Revision: 11914 $
|
||||
* @version $Revision: 12626 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -480,8 +480,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
//-----------------------------------------
|
||||
|
||||
$folderID = IPSText::alphanumericalClean( $this->request['folderID'] );
|
||||
$memberID = intval( $this->request['memberID'] );
|
||||
$memberData = IPSMember::load( $memberID, 'extendedProfile' );
|
||||
$status = 'ok';
|
||||
$mtids = array();
|
||||
|
||||
@@ -489,7 +487,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// Check
|
||||
//-----------------------------------------
|
||||
|
||||
if ( ! $memberData['member_id'] OR ! $folderID )
|
||||
if ( !$this->memberData['member_id'] OR ! $folderID )
|
||||
{
|
||||
$this->returnJsonError( 'noSuchFolder' );
|
||||
}
|
||||
@@ -498,7 +496,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// First off, get dir data
|
||||
//-----------------------------------------
|
||||
|
||||
$folders = $this->messengerFunctions->explodeFolderData( $memberData['pconversation_filters'] );
|
||||
$folders = $this->messengerFunctions->explodeFolderData( $this->memberData['pconversation_filters'] );
|
||||
|
||||
//-----------------------------------------
|
||||
// "New" folder?
|
||||
@@ -507,12 +505,12 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
if ( $folderID == 'new' )
|
||||
{
|
||||
/* Just mark them as read */
|
||||
$this->DB->update( 'message_topic_user_map', array( 'map_has_unread' => 0 ), 'map_user_id=' . $memberID . " AND map_user_banned=0 AND map_user_active=1" );
|
||||
$this->DB->update( 'message_topic_user_map', array( 'map_has_unread' => 0 ), 'map_user_id=' . $this->memberData['member_id'] . " AND map_user_banned=0 AND map_user_active=1" );
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Delete all PMs -you- sent regardless of which folder they're in */
|
||||
$messages = $this->messengerFunctions->getPersonalTopicsList( $memberID, $folderID, array( 'offsetStart' => 0, 'offsetEnd' => 100000 ) );
|
||||
$messages = $this->messengerFunctions->getPersonalTopicsList( $this->memberData['member_id'], $folderID, array( 'offsetStart' => 0, 'offsetEnd' => 100000 ) );
|
||||
|
||||
/* Just grab IDs */
|
||||
$mtids = array_keys( $messages );
|
||||
@@ -532,7 +530,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
|
||||
try
|
||||
{
|
||||
$this->messengerFunctions->deleteTopics( $memberData['member_id'], $mtids );
|
||||
$this->messengerFunctions->deleteTopics( $this->memberData['member_id'], $mtids );
|
||||
}
|
||||
catch( Exception $error )
|
||||
{
|
||||
@@ -544,14 +542,14 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// Reset total message count
|
||||
//-----------------------------------------
|
||||
|
||||
$totalMsgs = $this->messengerFunctions->resetMembersTotalTopicCount( $memberData['member_id'] );
|
||||
$this->messengerFunctions->resetMembersNewTopicCount( $memberData['member_id'] );
|
||||
$totalMsgs = $this->messengerFunctions->resetMembersTotalTopicCount( $this->memberData['member_id'] );
|
||||
$this->messengerFunctions->resetMembersNewTopicCount( $this->memberData['member_id'] );
|
||||
|
||||
//-----------------------------------------
|
||||
// Update directory counts
|
||||
//-----------------------------------------
|
||||
|
||||
$newDirs = $this->messengerFunctions->resetMembersFolderCounts( $memberData['member_id'] );
|
||||
$newDirs = $this->messengerFunctions->resetMembersFolderCounts( $this->memberData['member_id'] );
|
||||
$folders = $this->messengerFunctions->explodeFolderData( $newDirs );
|
||||
|
||||
$this->returnJsonArray( array( 'status' => $status, 'totalMsgs' => $totalMsgs, 'newDirs' => $newDirs, 'affectedDirCount' => $folders[ $folderID ]['count'] ) );
|
||||
@@ -570,8 +568,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
//-----------------------------------------
|
||||
|
||||
$folderID = IPSText::alphanumericalClean( $this->request['folderID'] );
|
||||
$memberID = intval( $this->request['memberID'] );
|
||||
$memberData = IPSMember::load( $memberID, 'extendedProfile' );
|
||||
|
||||
// If we run through alpha clean, chars in other langs don't work properly of course
|
||||
$name = IPSText::truncate( $this->convertAndMakeSafe($_POST['name']), 50 ); //IPSText::alphanumericalClean( $this->request['name'], ' ' );
|
||||
@@ -581,13 +577,13 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// First off, get dir data
|
||||
//-----------------------------------------
|
||||
|
||||
$folders = $this->messengerFunctions->explodeFolderData( $memberData['pconversation_filters'] );
|
||||
$folders = $this->messengerFunctions->explodeFolderData( $this->memberData['pconversation_filters'] );
|
||||
|
||||
//-----------------------------------------
|
||||
// Check
|
||||
//-----------------------------------------
|
||||
|
||||
if ( ! $memberData['member_id'] OR ! $folderID )
|
||||
if ( !$this->memberData['member_id'] OR ! $folderID )
|
||||
{
|
||||
$this->returnJsonError( 'noSuchFolder' );
|
||||
}
|
||||
@@ -629,7 +625,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// Save...
|
||||
//-----------------------------------------
|
||||
|
||||
IPSMember::save( $memberID, array( 'extendedProfile' => array( 'pconversation_filters' => $newDirs ) ) );
|
||||
IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'pconversation_filters' => $newDirs ) ) );
|
||||
|
||||
//-----------------------------------------
|
||||
// Return...
|
||||
@@ -651,24 +647,21 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
//-----------------------------------------
|
||||
|
||||
$folderID = IPSText::alphanumericalClean( $this->request['folderID'] );
|
||||
$memberID = intval( $this->request['memberID'] );
|
||||
$memberData = IPSMember::load( $memberID, 'extendedProfile' );
|
||||
$status = 'ok';
|
||||
|
||||
IPSDebug::fireBug( 'info', array( 'Received folder id:' . $folderID ) );
|
||||
IPSDebug::fireBug( 'info', array( 'Received member id:' . $memberID ) );
|
||||
|
||||
//-----------------------------------------
|
||||
// First off, get dir data
|
||||
//-----------------------------------------
|
||||
|
||||
$folders = $this->messengerFunctions->explodeFolderData( $memberData['pconversation_filters'] );
|
||||
$folders = $this->messengerFunctions->explodeFolderData( $this->memberData['pconversation_filters'] );
|
||||
|
||||
//-----------------------------------------
|
||||
// Check
|
||||
//-----------------------------------------
|
||||
|
||||
if ( ! $memberData['member_id'] OR ! $folderID )
|
||||
if ( ! $this->memberData['member_id'] OR ! $folderID )
|
||||
{
|
||||
IPSDebug::fireBug( 'error', array( 'Missing member id or folder id' ) );
|
||||
|
||||
@@ -708,14 +701,14 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// $this->returnJsonError( 'cannotDeleteHasMessages' );
|
||||
//}
|
||||
|
||||
$messages = $this->messengerFunctions->getPersonalTopicsList( $memberID, $folderID, array( 'offsetStart' => 0, 'offsetEnd' => 100000 ) );
|
||||
$messages = $this->messengerFunctions->getPersonalTopicsList( $this->memberData['member_id'], $folderID, array( 'offsetStart' => 0, 'offsetEnd' => 100000 ) );
|
||||
|
||||
/* Just grab IDs */
|
||||
$mtids = array_keys( $messages );
|
||||
|
||||
try
|
||||
{
|
||||
$this->messengerFunctions->deleteTopics( $memberData['member_id'], $mtids );
|
||||
$this->messengerFunctions->deleteTopics( $this->memberData['member_id'], $mtids );
|
||||
}
|
||||
catch( Exception $error )
|
||||
{
|
||||
@@ -741,7 +734,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// Save...
|
||||
//-----------------------------------------
|
||||
|
||||
IPSMember::save( $memberID, array( 'extendedProfile' => array( 'pconversation_filters' => $newDirs ) ) );
|
||||
IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'pconversation_filters' => $newDirs ) ) );
|
||||
|
||||
//-----------------------------------------
|
||||
// Return...
|
||||
@@ -763,8 +756,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
//-----------------------------------------
|
||||
|
||||
$name = IPSText::truncate( $this->convertAndMakeSafe($_POST['name']), 50 );
|
||||
$memberID = intval( $this->request['memberID'] );
|
||||
$memberData = IPSMember::load( $memberID, 'extendedProfile' );
|
||||
$status = 'ok';
|
||||
$maxID = 0;
|
||||
|
||||
@@ -772,7 +763,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// Check
|
||||
//-----------------------------------------
|
||||
|
||||
if ( ! $memberData['member_id'] OR ! $name )
|
||||
if ( ! $this->memberData['member_id'] OR ! $name )
|
||||
{
|
||||
$this->returnJsonError( 'invalidName' );
|
||||
}
|
||||
@@ -781,7 +772,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// Get vdir information
|
||||
//-----------------------------------------
|
||||
|
||||
$folders = $this->messengerFunctions->explodeFolderData( $memberData['pconversation_filters'] );
|
||||
$folders = $this->messengerFunctions->explodeFolderData( $this->memberData['pconversation_filters'] );
|
||||
|
||||
foreach( $folders as $id => $folder )
|
||||
{
|
||||
@@ -819,7 +810,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
// Save...
|
||||
//-----------------------------------------
|
||||
|
||||
IPSMember::save( $memberID, array( 'extendedProfile' => array( 'pconversation_filters' => $newDirs ) ) );
|
||||
IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'pconversation_filters' => $newDirs ) ) );
|
||||
|
||||
//-----------------------------------------
|
||||
// Return...
|
||||
|
||||
Reference in new issue
Block a user