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

Version 3.4.8

Browse Source
This commit is contained in:
Neo committed 2025-12-19 00:42:42 -08:00
1 parent b45ea0dffb
commit c603205a25
1398 files changed
+36675 -31023
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

upload/admin/applications/members/extensions/admin/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/admin/member_form.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Member form manipulation
* Last Updated: $Date: 2012-08-22 10:47:20 -0400 (Wed, 22 Aug 2012) $
* </pre>
upload/admin/applications/members/extensions/attachments/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/attachments/plugin_msg.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* IP.Board messenger attachments plugin
* Last Updated: $Date: 2013-04-25 15:26:40 -0400 (Thu, 25 Apr 2013) $
* </pre>
upload/admin/applications/members/extensions/content/feed_blocks/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/content/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/content/plugin_blocks/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/content/plugin_blocks/online_friends/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/content/plugin_blocks/status_updates/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/coreExtensions.php
+2 -2
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Core extensions
* Last Updated: $Date: 2012-05-21 09:09:36 -0400 (Mon, 21 May 2012) $
* </pre>
@@ -149,7 +149,7 @@ class publicSessions__members
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Item Marking
* Last Updated: $Date: 2012-05-21 09:09:36 -0400 (Mon, 21 May 2012) $
* </pre>
upload/admin/applications/members/extensions/coreVariables.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Core variables extension file
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/extensions/dashboardNotifications.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Dashboard Notifications
* Last Updated: $Date
*
upload/admin/applications/members/extensions/dataHookLocations.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Define data hook locations (Members)
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/extensions/editorSections.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* BBCode Management : Determines if bbcode can be used in this section
* Last Updated: $LastChangedDate: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/extensions/enhancements/mandrill.php
+2 -2
View File
@@ -7,7 +7,7 @@
* $Author: mark $
* @since 24 July 2012
* $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 10952 $
*/
@@ -102,7 +102,7 @@ class enhancements_members_mandrill
/* Fire that off to IPS so Mandrill knows it's one of ours */
$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
$file = new $classToLoad();
$json = $file->getFileContents( 'http://license.invisionpower.com/mandrill/?key='.urlencode( ipsRegistry::$request['api_key'] ) . '&username=' . urlencode( ipsRegistry::$request['username'] ) . '&lkey=' . urldecode( ipsRegistry::$settings['ipb_reg_number'] ) . '&version=' . IPB_LONG_VERSION );
$json = NULL;
/* If they want to use Mandrill for SMTP too, that call will contain the SMTP info,
so set it if we got it, or if the call failed, throw an error */
upload/admin/applications/members/extensions/enhancements/spammonitoring.php
+2 -2
View File
@@ -7,7 +7,7 @@
* $Author: mark $
* @since 24 July 2012
* $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 10952 $
*/
@@ -32,7 +32,7 @@ class enhancements_members_spammonitoring
{
$this->title = $registry->getClass('class_localization')->words['enhancements_spammonitoring'];
$this->description = $registry->getClass('class_localization')->words['enhancements_spammonitoring_desc'];
$this->message = "<a href='http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=spamserviceinfo' target='_blank'>{$registry->getClass('class_localization')->words['enhancements_spammonitoring_help']}</a>";
$this->message = "<a href='http://external.ipslink.com/ipboard30/landing/?p=spamserviceinfo' target='_blank'>{$registry->getClass('class_localization')->words['enhancements_spammonitoring_help']}</a>";
$this->enabled = ( ipsRegistry::$settings['spam_service_enabled'] and $this->check( TRUE ) );
}
upload/admin/applications/members/extensions/furlRedirect.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* RSS output plugin :: posts
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/extensions/furlTemplates.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Sets up SEO templates
* Last Updated: $Date: 2013-02-04 18:48:34 -0500 (Mon, 04 Feb 2013) $
* </pre>
upload/admin/applications/members/extensions/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/memberSync.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Forum permissions mappings
* Last Updated: $Date: 2012-08-22 10:11:25 -0400 (Wed, 22 Aug 2012) $
* </pre>
upload/admin/applications/members/extensions/modcp/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/modcp/plugin_banned.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: mmecham $
* @since 2/17/2011
* $LastChangedDate: 2012-01-24 11:56:40 -0500 (Tue, 24 Jan 2012) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 10180 $
*/
upload/admin/applications/members/extensions/modcp/plugin_iplookup.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: mark $
* @since 2/18/2011
* $LastChangedDate: 2012-03-23 08:34:13 -0400 (Fri, 23 Mar 2012) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 10474 $
*/
upload/admin/applications/members/extensions/modcp/plugin_modposts.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: mark $
* @since 2/17/2011
* $LastChangedDate: 2011-11-16 11:36:38 -0500 (Wed, 16 Nov 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 9829 $
*/
upload/admin/applications/members/extensions/modcp/plugin_restrictposts.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: mark $
* @since 2/17/2011
* $LastChangedDate: 2011-11-16 11:36:38 -0500 (Wed, 16 Nov 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 9829 $
*/
upload/admin/applications/members/extensions/modcp/plugin_suspended.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: mark $
* @since 2/17/2011
* $LastChangedDate: 2011-11-16 11:36:38 -0500 (Wed, 16 Nov 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 9829 $
*/
upload/admin/applications/members/extensions/modcp/plugin_warn.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 2/14/2011
* $LastChangedDate: 2011-12-14 12:27:41 -0500 (Wed, 14 Dec 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 10000 $
*/
upload/admin/applications/members/extensions/notifications/config.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Define the core notification types
* Last Updated: $Date: 2013-05-21 20:51:17 -0400 (Tue, 21 May 2013) $
* </pre>
upload/admin/applications/members/extensions/notifications/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com/">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/notifications/pm.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Fetches meta data for notifications
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/extensions/profileTabs/friends.conf.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Config for about me tab
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/extensions/profileTabs/friends.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Profile Plugin Library
* Last Updated: $Date: 2012-09-14 10:11:40 -0400 (Fri, 14 Sep 2012) $
* </pre>
upload/admin/applications/members/extensions/profileTabs/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/profileTabs/reputation.conf.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Config for reputation tab
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/extensions/profileTabs/reputation.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Reputation Profile Tab
* Last Updated: $Date: 2012-09-27 11:58:26 -0400 (Thu, 27 Sep 2012) $
* </pre>
upload/admin/applications/members/extensions/profileTabs/status.conf.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Config for about me tab
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/extensions/profileTabs/status.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Profile Plugin Library
* Last Updated: $Date: 2012-08-28 17:56:22 -0400 (Tue, 28 Aug 2012) $
* </pre>
upload/admin/applications/members/extensions/reportPlugins/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/reportPlugins/messages.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Report Center :: Private Messages plugin
* Last Updated: $LastChangedDate: 2013-05-08 17:43:20 -0400 (Wed, 08 May 2013) $
* </pre>
upload/admin/applications/members/extensions/reportPlugins/profiles.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Report Center :: Profiles plugin
* Last Updated: $LastChangedDate: 2013-04-12 20:11:40 -0400 (Fri, 12 Apr 2013) $
* </pre>
upload/admin/applications/members/extensions/search/config.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Config file
* Last Updated: $Date: 2013-04-15 17:26:30 -0400 (Mon, 15 Apr 2013) $
* </pre>
upload/admin/applications/members/extensions/search/engines/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/search/engines/sql.php
+27 -11
View File
@@ -2,18 +2,18 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Basic Forum Search
* Last Updated: $Date: 2013-02-25 18:03:27 -0500 (Mon, 25 Feb 2013) $
* Last Updated: $Date: 2014-11-11 15:53:26 -0500 (Tue, 11 Nov 2014) $
* </pre>
*
* @author $Author: AndyMillne $
* @author $Author: rashbrook $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/company/standards.php#license
* @package IP.Board
* @subpackage Forums
* @link http://www.invisionpower.com
* @version $Rev: 12024 $
* @version $Rev: 12568 $
*/
if ( ! defined( 'IN_IPB' ) )
@@ -225,13 +225,27 @@ class search_engine_members extends search_engine
break;
}
$joins = array();
$joins[] = array(
'from' => array( 'profile_portal' => 'p' ),
'where' => "p.pp_member_id=m.member_id",
'type' => 'left',
);
if ( ! $this->memberData['g_access_cp'] )
{
$joins[] = array(
'from' => array( 'groups' => 'g' ),
'where' => "g.g_id = m.member_group_id",
'type' => 'left',
);
}
/* Query the count */
$count = $this->DB->buildAndFetch( array('select' => 'COUNT(*) as total_results',
'from' => array( 'members' => 'm' ),
'where' => $this->_buildWhereStatement( $search_term ),
'add_join' => array( array( 'from' => array( 'profile_portal' => 'p' ),
'where' => "p.pp_member_id=m.member_id",
'type' => 'left' ) ) ) );
'add_join' => $joins ) );
@@ -241,10 +255,7 @@ class search_engine_members extends search_engine
'where' => $this->_buildWhereStatement( $search_term ),
'order' => $sortKey . ' ' . $sort_order,
'limit' => array( IPSSearchRegistry::get('in.start'), IPSSearchRegistry::get('opt.search_per_page') ),
'add_join' => array( array( 'select' => 'p.*',
'from' => array( 'profile_portal' => 'p' ),
'where' => "p.pp_member_id=m.member_id",
'type' => 'left' ) ) ) );
'add_join' => $joins ) );
$this->DB->execute();
/* Get results */
@@ -487,6 +498,11 @@ class search_engine_members extends search_engine
$where_clause[] = "m.joined < {$this->search_end_timestamp}";
}
}
if ( ! $this->memberData['g_access_cp'] )
{
$where_clause[] = "g.g_hide_from_list = 0";
}
/* Build and return the string */
return implode( " AND ", $where_clause );
upload/admin/applications/members/extensions/search/form.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Returns HTML for the form (optional class, not required)
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/extensions/search/format.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Formats forum search results
* Last Updated: $Date: 2012-05-25 13:17:47 -0400 (Fri, 25 May 2012) $
* </pre>
upload/admin/applications/members/extensions/search/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/extensions/sphinxTemplate.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Sphinx template file
* Last Updated: $Date: 2011-06-02 17:57:20 -0400 (Thu, 02 Jun 2011) $
* </pre>
upload/admin/applications/members/extensions/warnings.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $ (Original: Mark)
* @since -
* $LastChangedDate: 2010-10-14 13:11:17 -0400 (Thu, 14 Oct 2010) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 477 $
*/
upload/admin/applications/members/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/js/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/ajax/bulkmail.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Bulk Mail Recipients List Generator (AJAX)
* Last Updated: $Date: 2012-07-12 18:15:50 +0100 (Thu, 12 Jul 2012) $
* </pre>
upload/admin/applications/members/modules_admin/ajax/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 20th February 2002
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 8655 $
*/
upload/admin/applications/members/modules_admin/ajax/editform.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Member property updater (AJAX)
* Last Updated: $Date: 2012-07-12 13:15:50 -0400 (Thu, 12 Jul 2012) $
* </pre>
upload/admin/applications/members/modules_admin/ajax/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/ajax/members.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Member list AJAX handler
* Last Updated: $Date: 2012-10-26 11:50:52 -0400 (Fri, 26 Oct 2012) $
* </pre>
upload/admin/applications/members/modules_admin/bulkmail/bulkmail.php
+5 -5
View File
@@ -2,18 +2,18 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Bulk mail management
* Last Updated: $Date: 2013-10-16 12:57:41 -0400 (Wed, 16 Oct 2013) $
* Last Updated: $Date: 2015-01-06 07:55:43 -0500 (Tue, 06 Jan 2015) $
* </pre>
*
* @author $Author: AndyMillne $
* @author $Author: stuarts $
* @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
* @version $Revision: 12380 $
* @version $Revision: 12583 $
*/
if ( ! defined( 'IN_ACP' ) )
@@ -1008,7 +1008,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
*/
public function _buildMembersQuery( $args = array() )
{
$queryData = array( 'add_join' => array(), 'where' => array( "m.allow_admin_mails=1" ), 'group' => 'm.member_id' );
$queryData = array( 'add_join' => array(), 'where' => array( "m.allow_admin_mails=1", "m.member_banned=0" ), 'group' => 'm.member_id' );
foreach ( $args as $app => $filters )
{
upload/admin/applications/members/modules_admin/bulkmail/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 20th February 2002
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 8655 $
*/
upload/admin/applications/members/modules_admin/bulkmail/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/bulkmail/xml/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/cfields/customfields.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Custom field management
* Last Updated: $Date: 2012-08-28 17:56:22 -0400 (Tue, 28 Aug 2012) $
* </pre>
upload/admin/applications/members/modules_admin/cfields/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 20th February 2002
* $LastChangedDate: 2010-10-14 13:11:17 -0400 (Thu, 14 Oct 2010) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 477 $
*/
upload/admin/applications/members/modules_admin/cfields/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/cfields/xml/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/groups/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 20th February 2002
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 8655 $
*/
upload/admin/applications/members/modules_admin/groups/groups.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Group management
* Last Updated: $Date: 2013-04-03 17:54:22 -0400 (Wed, 03 Apr 2013) $
* </pre>
upload/admin/applications/members/modules_admin/groups/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/groups/permissions.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Permissions management
* Last Updated: $Date: 2012-12-21 13:31:16 -0500 (Fri, 21 Dec 2012) $
* </pre>
upload/admin/applications/members/modules_admin/groups/xml/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/members/banfilters.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since -
* $LastChangedDate: 2011-03-22 12:48:06 -0400 (Tue, 22 Mar 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 8149 $
*/
upload/admin/applications/members/modules_admin/members/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 20th February 2002
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 8655 $
*/
upload/admin/applications/members/modules_admin/members/editform.php
+6 -6
View File
@@ -2,18 +2,18 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Member property updater (AJAX)
* Last Updated: $Date: 2013-05-08 12:08:00 -0400 (Wed, 08 May 2013) $
* Last Updated: $Date: 2014-08-29 15:04:48 -0400 (Fri, 29 Aug 2014) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: rashbrook $
* @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
* @version $Revision: 12237 $
* @version $Revision: 12492 $
*/
if ( ! defined( 'IN_IPB' ) )
@@ -313,8 +313,8 @@ class admin_members_members_editform extends ipsCommand
$msg = str_replace( "{new_name}", $display_name , $msg );
$msg = str_replace( "<#BOARD_NAME#>", $this->settings['board_name'], $msg );
$msg = str_replace( "<#BOARD_ADDRESS#>", $this->settings['board_url'] . '/index.' . $this->settings['php_ext'], $msg );
IPSText::getTextClass('email')->message = stripslashes( IPSText::getTextClass('email')->cleanMessage($msg) );
IPSText::getTextClass('email')->setHtmlEmail( true );
IPSText::getTextClass('email')->message = stripslashes( $msg );
IPSText::getTextClass('email')->subject = $this->lang->words['m_changesubj'];
IPSText::getTextClass('email')->to = $member['email'];
IPSText::getTextClass('email')->sendMail();
upload/admin/applications/members/modules_admin/members/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/members/members.php
+31 -4
View File
@@ -4,11 +4,11 @@
*~TERABYTE_DOC_READY~
* $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
* $License: http://www.invisionpower.com/company/standards.php#license$
* $Author: bfarber $
* $Author: rashbrook $
* @since 1st March 2002
* $LastChangedDate: 2013-06-14 11:15:45 -0400 (Fri, 14 Jun 2013) $
* @version v3.4.6
* $Revision: 12310 $
* $LastChangedDate: 2015-01-27 23:17:46 -0500 (Tue, 27 Jan 2015) $
* @version v3.4.8
* $Revision: 12592 $
*/
if ( ! defined( 'IN_ACP' ) )
@@ -484,6 +484,21 @@ class admin_members_members_members extends ipsCommand
$member['custom_fields'][ $id ] = array( 'name' => $custom_fields->field_names[ $id ], 'data' => $data );
}
}
$member['access_report_center'] = false;
$member_group_ids = array( $member['member_group_id'] );
$member_group_ids = array_diff( array_merge( $member_group_ids, explode( ',', $member['mgroup_others'] ) ), array('') );
$report_center = array_diff( explode( ',', ipsRegistry::$settings['report_mod_group_access'] ), array('') );
foreach( $report_center as $groupId )
{
if( in_array( $groupId, $member_group_ids ) )
{
$member['access_report_center'] = true;
break;
}
}
//-----------------------------------------
// Notifications library
@@ -1834,6 +1849,18 @@ class admin_members_members_members extends ipsCommand
return;
}
//-----------------------------------------
// How about secondary groups?
//-----------------------------------------
$currentSecondaryGroups = !empty( $member['mgroup_others'] ) ? explode( ',', $member['mgroup_others'] ) : array();
$newSecondaryGroups = ( isset( $_POST['mgroup_others'] ) AND !empty( $_POST['mgroup_others'] ) ) ? $_POST['mgroup_others'] : array();
if ( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_move' ) AND count( array_diff( $newSecondaryGroups, $currentSecondaryGroups ) ) > 0 )
{
$this->registry->output->global_message = $this->lang->words['m_movemembers'];
$this->_memberView();
return;
}
//-----------------------------------------
// Restricted?
//-----------------------------------------
upload/admin/applications/members/modules_admin/members/notifications.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Configure default notification options
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/modules_admin/members/ranks.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Member management
* Last Updated: $Date: 2012-08-28 17:56:22 -0400 (Tue, 28 Aug 2012) $
* </pre>
upload/admin/applications/members/modules_admin/members/reputation.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Reputation System
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/modules_admin/members/tools.php
+7 -4
View File
@@ -2,19 +2,19 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Member validation, locked and banned queues
* Last Updated: $Date: 2013-02-14 19:17:38 -0500 (Thu, 14 Feb 2013) $
* Last Updated: $Date: 2013-11-15 13:16:48 -0500 (Fri, 15 Nov 2013) $
* </pre>
*
* @author $Author: AndyMillne $
* @author $Author: rashbrook $
* @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 1st march 2002
* @version $Revision: 11992 $
* @version $Revision: 12413 $
*/
if ( ! defined( 'IN_ACP' ) )
@@ -269,6 +269,9 @@ class admin_members_members_tools extends ipsCommand
}
else
{
// Set IPSMember flag that we are merging.
IPSMember::$_isMerging = true;
$member = IPSMember::load( $this->request['member_id'] );
$member2 = IPSMember::load( $this->request['member_id2'] );
upload/admin/applications/members/modules_admin/members/xml/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/restrictions/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 20th February 2002
* $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 8655 $
*/
upload/admin/applications/members/modules_admin/restrictions/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/restrictions/restrictions.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* ACP Restrictions
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/modules_admin/restrictions/xml/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/warnings/actions.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Warning Actions
* Last Updated: $Date: 2012-10-01 11:12:40 -0400 (Mon, 01 Oct 2012) $
* </pre>
upload/admin/applications/members/modules_admin/warnings/defaultSection.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: ips_terabyte $
* @since 07th May 2012
* $LastChangedDate: 2012-05-07 11:22:43 -0400 (Mon, 07 May 2012) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 10695 $
*/
upload/admin/applications/members/modules_admin/warnings/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com/">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_admin/warnings/reasons.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Warning Reasons
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/modules_admin/warnings/xml/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com/">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_public/ajax/card.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Profile AJAX hCard
* Last Updated: $Date: 2012-05-30 13:28:08 -0400 (Wed, 30 May 2012) $
* </pre>
upload/admin/applications/members/modules_public/ajax/dname.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Profile display name history
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/modules_public/ajax/dst.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Member AJAX DST switcher
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/modules_public/ajax/friends.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Profile AJAX Comment Handler
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/modules_public/ajax/ignore.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Profile AJAX Ignore User
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/modules_public/ajax/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/applications/members/modules_public/ajax/load.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Profile AJAX Tab Loader
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
* </pre>
upload/admin/applications/members/modules_public/ajax/messenger.php
+23 -32
View File
@@ -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...
upload/admin/applications/members/modules_public/ajax/photo.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: mmecham $
* @since 7th Feb 2011
* $LastChangedDate: 2012-05-11 11:17:52 -0400 (Fri, 11 May 2012) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 10727 $
*/
upload/admin/applications/members/modules_public/ajax/rate.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Profile AJAX Tab Loader
* Last Updated: $Date: 2013-03-19 10:12:37 -0400 (Tue, 19 Mar 2013) $
* </pre>
upload/admin/applications/members/modules_public/ajax/status.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Allow user to change their status
* Last Updated: $Date: 2012-11-05 09:03:19 -0500 (Mon, 05 Nov 2012) $
* </pre>
upload/admin/applications/members/modules_public/ajax/warnings.php
+1 -1
View File
@@ -7,7 +7,7 @@
* $Author: bfarber $ (Original: Mark)
* @since 9 Nov 2011
* $LastChangedDate: 2012-06-29 10:12:14 -0400 (Fri, 29 Jun 2012) $
* @version v3.4.6
* @version v3.4.8
* $Revision: 11007 $
*/
Loaded 100 of 1398 files, more files were not shown because too many files have changed in this diff. Show more