Version 3.4.8

2025-12-19 00:42:42 -08:00
1 parent b45ea0dffb
commit c603205a25
@@ -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>
@@ -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 $
 */

@@ -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>
@@ -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>
@@ -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>
@@ -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 )
 		{
@@ -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 $
 */

@@ -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>
@@ -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>
@@ -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>
@@ -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 $
 */

@@ -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>
@@ -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>
@@ -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 $
 */

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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 $
 */

@@ -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 $
 */

@@ -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();
@@ -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>
@@ -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?
 		//-----------------------------------------
@@ -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>
@@ -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>
@@ -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>
@@ -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'] );

@@ -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>
@@ -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 $
 */

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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 $
 */

@@ -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>
@@ -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>
@@ -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>