Version 3.4.5

upload/admin/applications/members/extensions/admin/member_form.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Member form manipulation
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-08-22 10:47:20 -0400 (Wed, 22 Aug 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @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: 10914 $
+ * @version		$Revision: 11250 $
  *
  */
 
@@ -97,6 +97,12 @@ class admin_member_form__members implements admin_member_form
 							  'url'   => 'section=tools&amp;module=members&amp;do=merge',
 							  'title' => ipsRegistry::getClass('class_localization')->words['form_mergemember'] );
 		}
+		
+		$array[] = array( 'img'   => '', 
+						  'url'   => "<a href='" . ipsRegistry::getClass('output')->buildSeoUrl( "showuser={$member['member_id']}", 'public', $member['members_seo_name'], 'showuser' ) . "' target='_blank'>" . ipsRegistry::getClass('class_localization')->words['form_profilemember'] . '</a>',
+						  'title' => '' );
+							  
+		
 
 		return $array;
 	}

upload/admin/applications/members/extensions/attachments/plugin_msg.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * IP.Board messenger attachments plugin
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2013-04-25 15:26:40 -0400 (Thu, 25 Apr 2013) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Core
  * @link		http://www.invisionpower.com
  * @since		6/24/2008
- * @version		$Revision: 10914 $
+ * @version		$Revision: 12198 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -382,7 +382,7 @@ class plugin_msg extends class_attach
 	 */
 	public function getSpaceAllowance( $post_key='', $member_id='' )
 	{
-		$max_php_size      = intval( IPSLib::getMaxPostSize() );
+		$max_php_size      = IPSLib::getMaxPostSize();
 		$member_id         = intval( $member_id ? $member_id : $this->memberData['member_id'] );
 		$space_left        = 0;
 		$space_used        = 0;

upload/admin/applications/members/extensions/bulkMailFilters.php

@@ -0,0 +1,286 @@
+<?php
+/**
+ * @file		bulkMailFilters.php		Bulk Mail Filters - Members App
+ *
+ * $Copyright: $
+ * $License: $
+ * $Author: mark $
+ * $LastChangedDate: 2012-02-13 05:07:16 -0500 (Mon, 13 Feb 2012) $
+ * $Revision: 10290 $
+ * @since 		23rd August 2012
+ */
+
+/**
+ *
+ * @class	bulkMailFilters_members
+ * @brief	Says what criteria is available for this application
+ *
+ */
+class bulkMailFilters_members
+{
+	public $filters = array( 'group', 'joined', 'last_visit' );
+}
+
+/**
+ *
+ * @class	bulkMailFilter_members_group
+ * @brief	Filter: Group
+ *
+ */
+class bulkMailFilter_members_group extends bulkMailFilter
+{
+	/** 
+	 * Get Setting Field
+	 *
+	 * @param	mixed	Value as returned by the save method
+	 * @return	string	HTML to show in ACP when adding a reminder that will allow admins to set up a reminder
+	 */
+	public function getSettingField( $criteria )
+	{	
+		$groups = array();
+		foreach ( $this->caches['group_cache'] as $gid => $group )
+		{
+			$groups[] = array( $gid, $group['g_title'] );
+		}
+	
+		$selectBox = ipsRegistry::getClass('output')->formMultiDropdown( 'bmf_members_groups[]', $groups, isset( $criteria['groups'] ) ? explode( ',', $criteria['groups'] ) : $_POST['bmf_members_groups'] );
+		$secondaryCheck = ipsRegistry::getClass('output')->formCheckbox( 'bmf_members_groups_secondary', isset( $criteria['secondary'] ) ? $criteria['secondary'] : $_POST['bmf_members_groups_secondary'] );
+		
+		return "{$selectBox}<br /><span class='desctext'>{$this->lang->words['bulkMailFilter_members_group_desc']}</span><br /><br />{$secondaryCheck} {$this->lang->words['bulkMailFilter_members_group_secondary']}";
+	}
+	
+	/**
+	 * Save Setting Field
+	 *
+	 * @param	array		POST data from the form using the form elements provided in the getSettingField method
+	 * @return	mixed		If this criteria should be ignored, return FALSE. Otherwise, return whatever data you will need in your
+	 *						getMembers method to fetch members that match the chosen criteria
+	 * @throws	Exception	You can throw an Exception with the message being the error to display if the user has provided invalid data
+	 */
+	public function save( $post )
+	{	
+		if ( !$post['bmf_members_groups'] )
+		{
+			return false;
+		}
+		else
+		{
+			return array( 'groups' => implode( ',', $post['bmf_members_groups'] ), 'secondary' => (bool) $post['bmf_members_groups_secondary'] );
+		}
+	}
+	
+	/**
+	 * Get Members
+	 *
+	 * @param	mixed	Whatever data was returned by save method
+	 * @return	array	Array with two elements:
+	 *						'joins' should be an array of any additional tables to join (as per ipsRegistry::DB()->build)
+	 *						'where' should be an array of where clauses
+	 *					The table 'members' is already available with the prefix 'm'
+	 */
+	public function getMembers( $data )
+	{
+		if ( $data['groups'] )
+		{
+			$return = $this->DB->buildWherePermission( explode( ',', $data['groups'] ), 'member_group_id', FALSE );
+			
+			if ( $data['secondary'] )
+			{
+				$return = "( {$return} OR " . $this->DB->buildWherePermission( explode( ',', $data['groups'] ), 'mgroup_others', FALSE ) . ' )';
+			}
+			
+			return array( 'where' => array( $return ) );
+		}
+	}
+}
+
+
+/**
+ *
+ * @class	bulkMailFilters_members
+ * @brief	Filter: Joined Date
+ *
+ */
+class bulkMailFilter_members_joined extends bulkMailFilter
+{
+	/** 
+	 * Get Setting Field
+	 *
+	 * @param	mixed	Value as returned by the save method
+	 * @return	string	HTML to show in ACP when adding a reminder that will allow admins to set up a reminder
+	 */
+	public function getSettingField( $criteria )
+	{	
+		$selectBox = ipsRegistry::getClass('output')->formDropdown( 'bmf_members_joined_type', array(
+			array( '', $this->lang->words['bmf_ignore'] ),
+			array( 'b', $this->lang->words['bmf_before'] ),
+			array( 'a', $this->lang->words['bmf_after'] )
+			), isset( $criteria['type'] ) ? $criteria['type'] : $_POST['bmf_members_joined_type'] );
+		
+		$selectedDate = isset( $criteria['date'] ) ? $criteria['date'] : time();
+		
+		$dates = array();
+		foreach ( range( 1, 31 ) as $d )
+		{
+			$dates[] = array( $d, $d );
+		}
+		$dateBox = ipsRegistry::getClass('output')->formDropdown( 'bmf_members_joined_d', $dates, isset( $_POST['bmf_members_joined_d'] ) ? $_POST['bmf_members_joined_d'] : date( 'j', $selectedDate ) );
+		
+		$months = array();
+		foreach( range( 1, 12 ) as $m )
+		{
+			$months[] = array( $m, date( 'F', mktime( 0, 0, 0, $m, 1, 2000 ) ) );
+		}
+		$monthBox = ipsRegistry::getClass('output')->formDropdown( 'bmf_members_joined_m', $months, isset( $_POST['bmf_members_joined_m'] ) ? $_POST['bmf_members_joined_m'] : date( 'n', $selectedDate ) );
+		
+		$yearBox = ipsRegistry::getClass('output')->formSimpleInput( 'bmf_members_joined_y', isset( $_POST['bmf_members_joined_y'] ) ? $_POST['bmf_members_joined_y'] : date( 'Y', $selectedDate ) );
+		
+		return "{$selectBox} {$dateBox} {$monthBox} {$yearBox}";
+	}
+	
+	/**
+	 * Save Setting Field
+	 *
+	 * @param	array		POST data from the form using the form elements provided in the getSettingField method
+	 * @return	mixed		If this criteria should be ignored, return FALSE. Otherwise, return whatever data you will need in your
+	 *						getMembers method to fetch members that match the chosen criteria
+	 * @throws	Exception	You can throw an Exception with the message being the error to display if the user has provided invalid data
+	 */
+	public function save( $post )
+	{
+		if ( !$post['bmf_members_joined_type'] )
+		{
+			return false;
+		}
+		else
+		{
+			$date = mktime( 0, 0, 0, $post['bmf_members_joined_m'], $post['bmf_members_joined_d'], $post['bmf_members_joined_y'] );
+			
+			if ( !checkdate( $post['bmf_members_joined_m'], $post['bmf_members_joined_d'], $post['bmf_members_joined_y'] ) or $date === FALSE or $date === -1 )
+			{
+				throw new Exception( $this->lang->words['bulkMailFilter_members_joined_error'] );
+			}
+		
+			return array( 'type' => $post['bmf_members_joined_type'], 'date' => $date );
+		}
+	}
+	
+	/**
+	 * Get Members
+	 *
+	 * @param	mixed	Whatever data was returned by save method
+	 * @return	array	Array with two elements:
+	 *						'joins' should be an array of any additional tables to join (as per ipsRegistry::DB()->build)
+	 *						'where' should be an array of where clauses
+	 *					The table 'members' is already available with the prefix 'm'
+	 */
+	public function getMembers( $data )
+	{
+		switch ( $data['type'] )
+		{
+			case 'a':
+				return array( 'where' => array( "(m.joined>{$data['date']})" ) );
+				break;
+				
+			case 'b':
+				return array( 'where' => array( "(m.joined<{$data['date']})" ) );
+				break;
+		}
+	}
+}
+
+
+/**
+ *
+ * @class	bulkMailFilters_members
+ * @brief	Filter: Last Visit Date
+ *
+ */
+class bulkMailFilter_members_last_visit extends bulkMailFilter
+{
+	/** 
+	 * Get Setting Field
+	 *
+	 * @param	array
+	 * @return	string	HTML to show in ACP when adding a reminder that will allow admins to set up a reminder
+	 */
+	public function getSettingField( $criteria )
+	{	
+		$selectBox = ipsRegistry::getClass('output')->formDropdown( 'bmf_members_last_visit_type', array(
+			array( '', $this->lang->words['bmf_ignore'] ),
+			array( 'b', $this->lang->words['bmf_before'] ),
+			array( 'a', $this->lang->words['bmf_after'] )
+			), isset( $criteria['type'] ) ? $criteria['type'] : $_POST['bmf_members_last_visit_type'] );
+			
+		$selectedDate = isset( $criteria['date'] ) ? $criteria['date'] : time();
+		
+		$dates = array();
+		foreach ( range( 1, 31 ) as $d )
+		{
+			$dates[] = array( $d, $d );
+		}
+		$dateBox = ipsRegistry::getClass('output')->formDropdown( 'bmf_members_last_visit_d', $dates, isset( $_POST['bmf_members_last_visit_d'] ) ? $_POST['bmf_members_last_visit_d'] : date( 'j', $selectedDate ) );
+		
+		$months = array();
+		foreach( range( 1, 12 ) as $m )
+		{
+			$months[] = array( $m, date( 'F', mktime( 0, 0, 0, $m, 1, 2000 ) ) );
+		}
+		$monthBox = ipsRegistry::getClass('output')->formDropdown( 'bmf_members_last_visit_m', $months, isset( $_POST['bmf_members_last_visit_m'] ) ? $_POST['bmf_members_last_visit_m'] : date( 'n', $selectedDate ) );
+		
+		$yearBox = ipsRegistry::getClass('output')->formSimpleInput( 'bmf_members_last_visit_y', isset( $_POST['bmf_members_last_visit_y'] ) ? $_POST['bmf_members_last_visit_y'] : date( 'Y', $selectedDate ) );
+		
+		return "{$selectBox} {$dateBox} {$monthBox} {$yearBox}";
+		
+	}
+	
+	/**
+	 * Save Setting Field
+	 *
+	 * @param	array		POST data from the form using the form elements provided in the getSettingField method
+	 * @return	mixed		If this criteria should be ignored, return FALSE. Otherwise, return whatever data you will need in your
+	 *						getMembers method to fetch members that match the chosen criteria
+	 * @throws	Exception	You can throw an Exception with the message being the error to display if the user has provided invalid data
+	 */
+	public function save( $post )
+	{
+		if ( !$post['bmf_members_last_visit_type'] )
+		{
+			return false;
+		}
+		else
+		{
+			$date = mktime( 0, 0, 0, $post['bmf_members_last_visit_m'], $post['bmf_members_last_visit_d'], $post['bmf_members_last_visit_y'] );
+			
+			if ( !checkdate( $post['bmf_members_last_visit_m'], $post['bmf_members_last_visit_d'], $post['bmf_members_last_visit_y'] ) or $date === FALSE or $date === -1 )
+			{
+				throw new Exception( $this->lang->words['bulkMailFilter_members_last_visit_error'] );
+			}
+		
+			return array( 'type' => $post['bmf_members_last_visit_type'], 'date' => $date );
+		}
+	}
+	
+	/**
+	 * Get Members
+	 *
+	 * @param	mixed	Whatever data was returned by save method
+	 * @return	array	Array with two elements:
+	 *						'joins' should be an array of any additional tables to join (as per ipsRegistry::DB()->build)
+	 *						'where' should be an array of where clauses
+	 *					The table 'members' is already available with the prefix 'm'
+	 */
+	public function getMembers( $data )
+	{
+		switch ( $data['type'] )
+		{
+			case 'a':
+				return array( 'where' => array( "(m.last_visit>{$data['date']})" ) );
+				break;
+				
+			case 'b':
+				return array( 'where' => array( "(m.last_visit<{$data['date']})" ) );
+				break;
+		}
+	}
+}

upload/admin/applications/members/extensions/coreExtensions.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Core extensions
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-21 09:09:36 -0400 (Mon, 21 May 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @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		20th February 2002
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10771 $
  *
  */
 
@@ -149,18 +149,18 @@ class publicSessions__members
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Item Marking
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-21 09:09:36 -0400 (Mon, 21 May 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @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: 10914 $
+ * @version		$Rev: 10771 $
  */
 
 class itemMarking__members

upload/admin/applications/members/extensions/coreVariables.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Core variables extension file
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		1st march 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  *
  */
 

upload/admin/applications/members/extensions/dashboardNotifications.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Dashboard Notifications
  * Last Updated: $Date
  *
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  *
  */
 

upload/admin/applications/members/extensions/dataHookLocations.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Define data hook locations (Members)
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Core
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  */
 
 $dataHookLocations = array(

upload/admin/applications/members/extensions/editorSections.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * BBCode Management : Determines if bbcode can be used in this section
- * Last Updated: $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $LastChangedDate: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		27th January 2004
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  *
  */
 

upload/admin/applications/members/extensions/emailLists.php

@@ -0,0 +1,117 @@
+<?php
+/**
+ * @file		emailLists.php		Members Email Lists Extension
+ *
+ * $Copyright: $
+ * $License: $
+ * $Author: mark $
+ * $LastChangedDate: 2012-06-20 05:50:23 -0400 (Wed, 20 Jun 2012) $
+ * $Revision: 10952 $
+ * @since 		11th June 2012
+ */
+
+/**
+ *
+ * @class	emailLists_members
+ * @brief	Members Email Lists Extension
+ *
+ */
+class emailLists_members
+{
+	/**
+	 * Get Form Data
+	 *
+	 * @return	array
+	 */
+	public function getFormData( $current )
+	{
+		/* Get groups */
+		$groups = array();
+		foreach ( ipsRegistry::cache()->getCache('group_cache') as $g )
+		{
+			$groups[] = array( $g['g_id'], $g['g_title'] );
+		}
+			
+		/* Return */
+		return array(
+			'group' => array(
+				"Is in group",
+				ipsRegistry::getClass('output')->formMultiDropdown( 'members-group[]', $groups, ( empty( $current ) ) ? array() : $current['group'] )
+				),
+				
+			'last_visit' => array(
+				"Last Visit Was",
+				ipsRegistry::getClass('output')->formDropdown( 'members-last_visit_1', array( array( 'l', "Less Than" ), array( 'e', "Equal to" ), array( 'g', "Greater Than" ) ), ( empty( $current ) ) ? 'l' : $current['last_visit_1'] ) .
+				ipsRegistry::getClass('output')->formSimpleInput( 'members-last_visit_2', ( empty( $current ) ) ? '' : $current['last_visit_2'] ) . 
+				" days ago"
+				),
+				
+			'joined' => array(
+				"Joined",
+				ipsRegistry::getClass('output')->formDropdown( 'members-joined_1', array( array( 'l', "Less Than" ), array( 'e', "Equal to" ), array( 'g', "Greater Than" ) ), ( empty( $current ) ) ? 'l' : $current['joined_1'] ) .
+				ipsRegistry::getClass('output')->formSimpleInput( 'members-joined_2', ( empty( $current ) ) ? '' : $current['joined_2'] ) . 
+				" days ago"
+				),
+
+			
+			);
+	}
+	
+	/**
+	 * Get Query Data
+	 *
+	 * @param	array	Rules
+	 * @return	array	Query Data
+	 */
+	public function getQueryData( $rules )
+	{
+		$return = array();
+		
+		/* Member Group */
+		if ( !empty( $rules['group'] ) )
+		{
+			$return['where'][] = ipsRegistry::DB()->buildWherePermission( $rules['group'], 'members.member_group_id', FALSE );
+		}
+		
+		/* Last Visit */
+		if ( $rules['last_visit_2'] !== '' )
+		{
+			switch ( $rules['last_visit_1'] )
+			{
+				case 'l':
+					$return['where'][] = "( members.last_visit<{$rules['last_visit_2']} )";
+					break;
+					
+				case 'g':
+					$return['where'][] = "( members.last_visit>{$rules['last_visit_2']} )";
+					break;
+					
+				case 'w':
+					$return['where'][] = "( members.last_visit={$rules['last_visit_2']} )";
+					break;
+			}
+		}
+		
+		/* Join Date */
+		if ( $rules['joined_2'] !== '' )
+		{
+			switch ( $rules['joined_1'] )
+			{
+				case 'l':
+					$return['where'][] = "( members.joined<{$rules['joined_2']} )";
+					break;
+					
+				case 'g':
+					$return['where'][] = "( members.joined>{$rules['joined_2']} )";
+					break;
+					
+				case 'w':
+					$return['where'][] = "( members.joined={$rules['joined_2']} )";
+					break;
+			}
+		}
+
+		
+		return $return;
+	}
+}

upload/admin/applications/members/extensions/enhancements/mandrill.php

@@ -0,0 +1,130 @@
+<?php
+/**
+ * @file		mandrill.php 	Community Enhancements - Mandrill
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: http://www.invisionpower.com/company/standards.php#license$
+ * $Author: mark $
+ * @since		24 July 2012
+ * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
+ * @version		v3.4.5
+ * $Revision: 10952 $
+ */
+
+/**
+ *
+ * @class		enhancements_members_mandrill
+ * @brief		Community Enhancements - Mandrill
+ */
+class enhancements_members_mandrill
+{
+	/**
+	 * Constructor
+	 *
+	 * @param	ipsRegistry
+	 */
+	public function __construct( $registry )
+	{
+		$this->title = $registry->getClass('class_localization')->words['enhancements_mandrill'];
+		$this->description = $registry->getClass('class_localization')->words['enhancements_mandrill_desc'];
+		$this->enabled = ( ipsRegistry::$settings['mandrill_api_key'] );
+	}
+	
+	/**
+	 * Edit Settings
+	 *
+	 * @param	string	Error
+	 * @return	string	Output
+	 */
+	public function editSettings( $error='' )
+	{
+		ipsRegistry::getClass('class_localization')->loadLanguageFile( 'admin_bulkmail', 'members' );
+	
+		if ( $this->enabled )
+		{
+			return ipsRegistry::getClass('output')->loadTemplate( 'cp_skin_bulkmail', 'members' )->mandrillManage( $error );
+		}
+		else
+		{
+			return ipsRegistry::getClass('output')->loadTemplate( 'cp_skin_bulkmail', 'members' )->mandrillSignup( $error );
+		}
+	}
+	
+	/**
+	 * Save Settings
+	 */
+	public function saveSettings()
+	{
+		/* Are we turning off? */
+		if ( ipsRegistry::$request['off'] )
+		{
+			IPSLib::updateSettings( array( 'mandrill_username' => '', 'mandrill_api_key' => '' ) );
+			ipsRegistry::getClass('output')->silentRedirect( ipsRegistry::$settings['_base_url'] . "app=core&amp;module=applications&amp;section=enhancements&amp;do=edit&amp;service=enhancements_members_mandrill" );
+			return;
+		}
+			
+		/* Load language files so we have error messages if we need em */
+		ipsRegistry::getClass('class_localization')->loadLanguageFile( 'admin_bulkmail', 'members' );
+		
+		/* Are we adding new values or just enabling SMTP? */
+		if ( ipsRegistry::$request['smtp_on'] )
+		{
+			ipsRegistry::$request['username'] = ipsRegistry::$settings['mandrill_username'];
+			ipsRegistry::$request['api_key'] = ipsRegistry::$settings['mandrill_api_key'];
+			ipsRegistry::$request['smtp'] = 1;
+			$update = array();
+		}
+		else
+		{		
+			/* Trim (like a haircut, but with strings) */
+			ipsRegistry::$request['username'] = trim( ipsRegistry::$request['username'] );
+			ipsRegistry::$request['api_key'] = trim( ipsRegistry::$request['api_key'] );
+			
+			/* If we don't have anything, tell them off */
+			if ( !ipsRegistry::$request['username'] or !ipsRegistry::$request['username'] )
+			{
+				return $this->editSettings( 'mandrill_setup_noinfo' );
+			}
+			
+			/* Now shoot that over to Mandrill to make sure they're cool with it */
+			require_once IPSLib::getAppDir('members') . '/sources/classes/mandrill.php';
+			$mandrill = new Mandrill( ipsRegistry::$request['api_key'] );
+			$info = $mandrill->users_info();
+			if ( $info === NULL or $info->username != ipsRegistry::$request['username'] )
+			{
+				return $this->editSettings( 'mandrill_bad_credentials' );
+			}
+			
+			/* So we're saving at least the API key and the username */
+			$update = array( 'mandrill_username' => ipsRegistry::$request['username'], 'mandrill_api_key' => ipsRegistry::$request['api_key'] );
+		}
+		
+		/* 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 = 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 */
+		if ( ipsRegistry::$request['smtp'] )
+		{
+			if ( $json )
+			{
+				$json = json_decode( $json, TRUE );
+				$update = array_merge( $update, $json );
+			}
+			else
+			{
+				return $this->editSettings( 'mandrill_error' );
+			}
+		}
+		
+		/* Update the settings */
+		IPSLib::updateSettings( $update );
+				
+		/* And boink the hell out of it */
+		ipsRegistry::getClass('output')->silentRedirect( ipsRegistry::$settings['_base_url'] . "app=core&amp;module=applications&amp;section=enhancements&amp;do=edit&amp;service=enhancements_members_mandrill" );
+		return;
+	}
+
+}

upload/admin/applications/members/extensions/enhancements/spammonitoring.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * @file		facebook.php 	Community Enhancements - IPS Spam Monitoring
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: http://www.invisionpower.com/company/standards.php#license$
+ * $Author: mark $
+ * @since		24 July 2012
+ * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
+ * @version		v3.4.5
+ * $Revision: 10952 $
+ */
+
+/**
+ *
+ * @class		enhancements_members_spammonitoring
+ * @brief		Community Enhancements - IPS Spam Monitoring
+ */
+class enhancements_members_spammonitoring
+{
+	/**
+	 * Applicable Settings
+	 */
+	public $settings = array( 'spam_service_enabled', 'spam_service_send_to_ips', 'spam_service_timeout', 'spam_service_action_timeout', 'spam_service_action_0', 'spam_service_action_1', 'spam_service_action_2', 'spam_service_action_3', 'spam_service_action_4' );
+
+	/**
+	 * Constructor
+	 *
+	 * @param	ipsRegistry
+	 */
+	public function __construct( $registry )
+	{
+		$this->title = $registry->getClass('class_localization')->words['enhancements_spammonitoring'];
+		$this->description = $registry->getClass('class_localization')->words['enhancements_spammonitoring_desc'];
+		$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 ) );
+	}
+	
+	/**
+	 * Check service is available
+	 */
+	public function check( $return=FALSE )
+	{
+		$ok = FALSE;
+	
+		$licenseData = ipsRegistry::cache()->getCache('licenseData');
+		if ( isset( $licenseData['ipbMain'] ) )
+		{
+			foreach ( $licenseData['ipbMain'] as $service )
+			{
+				if ( $service['name'] == 'Spam Monitoring Service' and $service['status'] == 'Ok' )
+				{
+					$ok = TRUE;
+					break;
+				}
+			}
+		}
+		
+		if ( $return )
+		{
+			return $ok;
+		}
+		
+		if ( !$ok )
+		{
+			ipsRegistry::getClass('output')->showError( ipsRegistry::getClass('class_localization')->words['enhancements_spammonitoring_error'] );
+		}
+	}
+}

upload/admin/applications/members/extensions/furlRedirect.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * RSS output plugin :: posts
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Forums
  * @link		http://www.invisionpower.com
  * @since		6/24/2008
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/extensions/furlTemplates.php

@@ -1,106 +1,124 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.3.4
- * Sets up SEO templates
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
- * </pre>
- *
- * @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		20th February 2002
- * @version		$Rev: 10914 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
- * SEO templates
- *
- * 'allowRedirect' is a flag to tell IP.Board whether to check the incoming link and if not formatted correctly, redirect the correct one
- *
- * OUT FORMAT REGEX:
- * First array element is a regex to run to see if we've a match for the URL
- * The second array element is the template to use the results of the parenthesis capture
- *
- * Special variable #{__title__} is replaced with the $title data passed to output->formatUrl( $url, $title)
- *
- * IMPORTANT: Remember that when these regex are used, the output has not been fully parsed so you will get:
- * showuser={$data['member_id']} NOT showuser=1 so do not try and match numerics only!
- *
- * IN FORMAT REGEX
- *
- * This allows the registry to piece back together a URL based on the template regex
- * So, for example: "/user/(\d+?)/", 'matches' => array(  array( 'showuser' => '$1' ) )tells IP.Board to populate 'showuser' with the result
- * of the parenthesis capture #1
- */
-$_SEOTEMPLATES = array(
-	
-	'showuser'	=> array( 'app'		      => 'members',
-						  'allowRedirect' => 1,
-						  'out'           => array( '#showuser=(.+?)((?:&|&amp;)f=(.+?))?(&|$)#i', 'user/$1-#{__title__}/$2$4' ),
-						  'in'            => array( 'regex'   => "#^/user/(\d+?)-#i",
-												    'matches' => array( array( 'showuser', '$1' ) ) ) ),
-	
-	
-	'members_status_single' => array( 'app'		      => 'members',
-									  'allowRedirect' => 0,
-									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=single(?:&|&amp;)status_id=(\d+?)(&|$)#i', 'statuses/id/$1/$2' ),
-									  'in'            => array( 'regex'   => "#/statuses/id/(\d+?)/#i",
-															    'matches' => array( array( 'app'    , 'members' ),
-															    					array( 'section', 'status' ),
-															    					array( 'module' , 'profile' ),
-															    					array( 'type'   , 'single' ),
-															    					array( 'status_id', '$1' ) ) ) ),
-															    					
-	'members_status_friends'=> array( 'app'		      => 'members',
-									  'allowRedirect' => 0,
-									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=friends(&|$)#i', 'statuses/friends/$2' ),
-									  'in'            => array( 'regex'   => "#/statuses/friends#i",
-															    'matches' => array( array( 'app'    , 'members' ),
-															    					array( 'section', 'status' ),
-															    					array( 'module' , 'profile' ),
-															    					array( 'type'   , 'friends' ) ) ) ),
-	
-	'members_status_all'	=> array( 'app'		      => 'members',
-									  'allowRedirect' => 0,
-									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status((?:&|&amp;)type=all)?(&|$)#i', 'statuses/all/$2' ),
-									  'in'            => array( 'regex'   => "#/statuses/all#i",
-															    'matches' => array( array( 'app'    , 'members' ),
-															    					array( 'section', 'status' ),
-															    					array( 'module' , 'profile'  ) ) ) ),
-
-						
-	'members_list'  => array( 
-						'app'			=> 'members',
-						'allowRedirect' => 0,
-						'out'			=> array( '#app=members((&|&amp;)module=list)?#i', 'members/' ),
-						'in'			=> array( 
-													'regex'		=> "#/members(/|$|\?)#i",
-													'matches'	=> array( array( 'app', 'members' ),
-																		  array( 'module', 'list' )  )
-												) 
-									),
-									
-	'most_liked'  => array( 
-						'app'			=> 'members',
-						'allowRedirect' => 0,
-						'out'			=> array( '#app=members(?:&|&amp;)module=reputation(?:&|&amp;)section=most#i', 'best-content/' ),
-						'in'			=> array( 
-													'regex'		=> "#/best-content(/|$|\?)#i",
-													'matches'	=> array( array( 'app', 'members' ),
-																		  array( 'module', 'reputation' ),
-																		  array( 'section', 'most' )  )
-												) 
-									),
-);
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.4.5
+ * Sets up SEO templates
+ * Last Updated: $Date: 2013-02-04 18:48:34 -0500 (Mon, 04 Feb 2013) $
+ * </pre>
+ *
+ * @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		20th February 2002
+ * @version		$Rev: 11934 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ * SEO templates
+ *
+ * 'allowRedirect' is a flag to tell IP.Board whether to check the incoming link and if not formatted correctly, redirect the correct one
+ *
+ * OUT FORMAT REGEX:
+ * First array element is a regex to run to see if we've a match for the URL
+ * The second array element is the template to use the results of the parenthesis capture
+ *
+ * Special variable #{__title__} is replaced with the $title data passed to output->formatUrl( $url, $title)
+ *
+ * IMPORTANT: Remember that when these regex are used, the output has not been fully parsed so you will get:
+ * showuser={$data['member_id']} NOT showuser=1 so do not try and match numerics only!
+ *
+ * IN FORMAT REGEX
+ *
+ * This allows the registry to piece back together a URL based on the template regex
+ * So, for example: "/user/(\d+?)/", 'matches' => array(  array( 'showuser' => '$1' ) )tells IP.Board to populate 'showuser' with the result
+ * of the parenthesis capture #1
+ */
+$_SEOTEMPLATES = array(
+	
+	'showuser'	=> array( 'app'		      => 'members',
+						  'allowRedirect' => 1,
+						  'out'           => array( '#showuser=(.+?)((?:&|&amp;)f=(.+?))?(&|$)#i', 'user/$1-#{__title__}/$2$4' ),
+						  'in'            => array( 'regex'   => "#^/user/(\d+?)(?:-|/|$)#i",
+												    'matches' => array( array( 'showuser', '$1' ) ) ) ),
+	
+
+	'members_status_legacy' => array( 'app'		      => 'members',
+									  'allowRedirect' => 0,
+									  'out'           => array( '#app=xxxxx(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=single(&|$)#i', 'statuses/user/#{__title-0__}-#{__title-1__}/$1' ),
+									  'newTemplate'	  => 'members_status_single',
+									  'in'            => array( 'regex'   => "#^/statuses/id/(\d+?)(/|$|\?)#i",
+															    'matches' => array( array( 'app'    , 'members' ),
+															    					array( 'module' , 'profile' ),
+															    					array( 'section', 'status' ),
+															    					array( 'type'   , 'single' ),
+															    					array( 'status_id', '$1' ) ) ) ),
+
+	'members_status_single' => array( 'app'		      => 'members',
+									  'allowRedirect' => 0,
+									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=single(&|$)#i', 'statuses/user/#{__title-0__}-#{__title-1__}/$1' ),
+									  'in'            => array( 'regex'   => "#^/statuses/user/([^/]+?)/\{__varBlock__\}status_id#i",
+															    'matches' => array( array( 'app'    , 'members' ),
+															    					array( 'module' , 'profile' ),
+															    					array( 'section', 'status' ),
+															    					array( 'type'   , 'single' ) ) ) ),
+	'members_status_member_all'	=> array( 'app'		      => 'members',
+									  	  'allowRedirect' => 0,
+									  	  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=memberall(?:&|&amp;)member_id=\d+?(&|$)#i', 'statuses/user/#{__title-0__}-#{__title-1__}/$1' ),
+									  	  'in'            => array( 'regex'   => "#^/statuses/user/(\d+?)(?:-([^/]+?))?/(?!\#\{__varBlock__\}status_id)#i",
+															    	'matches' => array( array( 'app'       , 'members' ),
+															    						array( 'module'    , 'profile' ),
+															    						array( 'section'   , 'status' ),
+															    						array( 'member_id' , '$1' ) ) ) ),
+															    																		    					
+	'members_status_friends'=> array( 'app'		      => 'members',
+									  'allowRedirect' => 0,
+									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=friends(&|$)#i', 'statuses/friends/$2' ),
+									  'in'            => array( 'regex'   => "#^/statuses/friends#i",
+															    'matches' => array( array( 'app'    , 'members' ),
+															    					array( 'module' , 'profile' ),
+															    					array( 'section', 'status' ),
+															    					array( 'type'   , 'friends' ) ) ) ),
+	
+	'members_status_all'	=> array( 'app'		      => 'members',
+									  'allowRedirect' => 0,
+									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status((?:&|&amp;)type=all)?(&|$)#i', 'statuses/all/$2' ),
+									  'in'            => array( 'regex'   => "#^/statuses/all#i",
+															    'matches' => array( array( 'app'    , 'members' ),
+															    					array( 'module' , 'profile'  ),
+															    					array( 'section', 'status' ) ) ) ),
+
+						
+	'members_list'  => array( 
+						'app'			=> 'members',
+						'allowRedirect' => 0,
+						'out'			=> array( '#app=members((&|&amp;)module=list)?#i', 'members/' ),
+						'in'			=> array( 
+													'regex'		=> "#^/members(/|$|\?)#i",
+													'matches'	=> array( array( 'app', 'members' ),
+																		  array( 'module', 'list' )  )
+												) 
+									),
+									
+	'most_liked'  => array( 
+						'app'			=> 'members',
+						'allowRedirect' => 0,
+						'out'			=> array( '#app=members(?:&|&amp;)module=reputation(?:&|&amp;)section=most#i', 'best-content/' ),
+						'in'			=> array( 
+													'regex'		=> "#^/best-content(/|$|\?)#i",
+													'matches'	=> array( array( 'app', 'members' ),
+																		  array( 'module', 'reputation' ),
+																		  array( 'section', 'most' )  )
+												) 
+									),
+);

upload/admin/applications/members/extensions/furlTemplatesID.php

@@ -0,0 +1,124 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.4.5
+ * Sets up SEO templates
+ * Last Updated: $Date: 2013-02-04 18:48:34 -0500 (Mon, 04 Feb 2013) $
+ * </pre>
+ *
+ * @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		20th February 2002
+ * @version		$Rev: 11934 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ * SEO templates
+ *
+ * 'allowRedirect' is a flag to tell IP.Board whether to check the incoming link and if not formatted correctly, redirect the correct one
+ *
+ * OUT FORMAT REGEX:
+ * First array element is a regex to run to see if we've a match for the URL
+ * The second array element is the template to use the results of the parenthesis capture
+ *
+ * Special variable #{__title__} is replaced with the $title data passed to output->formatUrl( $url, $title)
+ *
+ * IMPORTANT: Remember that when these regex are used, the output has not been fully parsed so you will get:
+ * showuser={$data['member_id']} NOT showuser=1 so do not try and match numerics only!
+ *
+ * IN FORMAT REGEX
+ *
+ * This allows the registry to piece back together a URL based on the template regex
+ * So, for example: "/user/(\d+?)/", 'matches' => array(  array( 'showuser' => '$1' ) )tells IP.Board to populate 'showuser' with the result
+ * of the parenthesis capture #1
+ */
+$_SEOTEMPLATES = array(
+	
+	'showuser'	=> array( 'app'		      => 'members',
+						  'allowRedirect' => 1,
+						  'out'           => array( '#showuser=(.+?)((?:&|&amp;)f=(.+?))?(&|$)#i', 'user/$1/$2$4' ),
+						  'in'            => array( 'regex'   => "#^/user/(\d+?)(?:-|/|$)#i",
+												    'matches' => array( array( 'showuser', '$1' ) ) ) ),
+	
+
+	'members_status_legacy' => array( 'app'		      => 'members',
+									  'allowRedirect' => 0,
+									  'out'           => array( '#app=xxxxx(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=single(&|$)#i', 'statuses/user/#{__title-0__}/$1' ),
+									  'newTemplate'	  => 'members_status_single',
+									  'in'            => array( 'regex'   => "#^/statuses/id/(\d+?)(/|$|\?)#i",
+															    'matches' => array( array( 'app'    , 'members' ),
+															    					array( 'module' , 'profile' ),
+															    					array( 'section', 'status' ),
+															    					array( 'type'   , 'single' ),
+															    					array( 'status_id', '$1' ) ) ) ),
+
+	'members_status_single' => array( 'app'		      => 'members',
+									  'allowRedirect' => 0,
+									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=single(&|$)#i', 'statuses/user/#{__title-0__}/$1' ),
+									  'in'            => array( 'regex'   => "#^/statuses/user/([^/]+?)/\{__varBlock__\}status_id#i",
+															    'matches' => array( array( 'app'    , 'members' ),
+															    					array( 'module' , 'profile' ),
+															    					array( 'section', 'status' ),
+															    					array( 'type'   , 'single' ) ) ) ),
+	'members_status_member_all'	=> array( 'app'		      => 'members',
+									  	  'allowRedirect' => 0,
+									  	  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=memberall(?:&|&amp;)member_id=\d+?(&|$)#i', 'statuses/user/#{__title-0__}/$1' ),
+									  	  'in'            => array( 'regex'   => "#^/statuses/user/(\d+?)(?:-([^/]+?))?/(?!\#\{__varBlock__\}status_id)#i",
+															    	'matches' => array( array( 'app'       , 'members' ),
+															    						array( 'module'    , 'profile' ),
+															    						array( 'section'   , 'status' ),
+															    						array( 'member_id' , '$1' ) ) ) ),
+															    																		    					
+	'members_status_friends'=> array( 'app'		      => 'members',
+									  'allowRedirect' => 0,
+									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=friends(&|$)#i', 'statuses/friends/$2' ),
+									  'in'            => array( 'regex'   => "#^/statuses/friends#i",
+															    'matches' => array( array( 'app'    , 'members' ),
+															    					array( 'module' , 'profile' ),
+															    					array( 'section', 'status' ),
+															    					array( 'type'   , 'friends' ) ) ) ),
+	
+	'members_status_all'	=> array( 'app'		      => 'members',
+									  'allowRedirect' => 0,
+									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status((?:&|&amp;)type=all)?(&|$)#i', 'statuses/all/$2' ),
+									  'in'            => array( 'regex'   => "#^/statuses/all#i",
+															    'matches' => array( array( 'app'    , 'members' ),
+															    					array( 'module' , 'profile'  ),
+															    					array( 'section', 'status' ) ) ) ),
+
+						
+	'members_list'  => array( 
+						'app'			=> 'members',
+						'allowRedirect' => 0,
+						'out'			=> array( '#app=members((&|&amp;)module=list)?#i', 'members/' ),
+						'in'			=> array( 
+													'regex'		=> "#^/members(/|$|\?)#i",
+													'matches'	=> array( array( 'app', 'members' ),
+																		  array( 'module', 'list' )  )
+												) 
+									),
+									
+	'most_liked'  => array( 
+						'app'			=> 'members',
+						'allowRedirect' => 0,
+						'out'			=> array( '#app=members(?:&|&amp;)module=reputation(?:&|&amp;)section=most#i', 'best-content/' ),
+						'in'			=> array( 
+													'regex'		=> "#^/best-content(/|$|\?)#i",
+													'matches'	=> array( array( 'app', 'members' ),
+																		  array( 'module', 'reputation' ),
+																		  array( 'section', 'most' )  )
+												) 
+									),
+);

upload/admin/applications/members/extensions/memberSync.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Forum permissions mappings
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-08-22 10:11:25 -0400 (Wed, 22 Aug 2012) $
  * </pre>
  *
  * @author 		$author$
@@ -14,7 +14,7 @@
  * @package		IP.Board
  * @subpackage	Forums
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $ 
+ * @version		$Rev: 11249 $ 
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -32,7 +32,7 @@ if ( ! defined( 'IN_IPB' ) )
  * @package		IP.Board
  * @subpackage  Members
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $ 
+ * @version		$Rev: 11249 $ 
  */
 class membersMemberSync
 {
@@ -74,17 +74,6 @@ class membersMemberSync
 		$this->registry->getClass('memberStatus')->deleteAllMemberStatus();
 	}
 	
-	/**
-	 * This method is run when a member is un-flagged as a spammer
-	 *
-	 * @param	array 	$member	Array of member data
-	 * @return	@e void
-	 */
-	public function onUnSetAsSpammer( $member )
-	{
-
-	}
-	
 	/**
 	 * This method is called after a member account has been removed
 	 *

upload/admin/applications/members/extensions/modcp/plugin_banned.php

@@ -7,7 +7,7 @@
  * $Author: mmecham $
  * @since		2/17/2011
  * $LastChangedDate: 2012-01-24 11:56:40 -0500 (Tue, 24 Jan 2012) $
- * @version		v3.3.4
+ * @version		v3.4.5
  * $Revision: 10180 $
  */
 

upload/admin/applications/members/extensions/modcp/plugin_iplookup.php

@@ -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: mark $
  * @since		2/18/2011
- * $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
- * @version		v3.3.4
- * $Revision: 10914 $
+ * $LastChangedDate: 2012-03-23 08:34:13 -0400 (Fri, 23 Mar 2012) $
+ * @version		v3.4.5
+ * $Revision: 10474 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/extensions/modcp/plugin_modposts.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		2/17/2011
  * $LastChangedDate: 2011-11-16 11:36:38 -0500 (Wed, 16 Nov 2011) $
- * @version		v3.3.4
+ * @version		v3.4.5
  * $Revision: 9829 $
  */
 

upload/admin/applications/members/extensions/modcp/plugin_restrictposts.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		2/17/2011
  * $LastChangedDate: 2011-11-16 11:36:38 -0500 (Wed, 16 Nov 2011) $
- * @version		v3.3.4
+ * @version		v3.4.5
  * $Revision: 9829 $
  */
 

upload/admin/applications/members/extensions/modcp/plugin_suspended.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		2/17/2011
  * $LastChangedDate: 2011-11-16 11:36:38 -0500 (Wed, 16 Nov 2011) $
- * @version		v3.3.4
+ * @version		v3.4.5
  * $Revision: 9829 $
  */
 

upload/admin/applications/members/extensions/modcp/plugin_warn.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 10000 $
  */
 

upload/admin/applications/members/extensions/notifications/config.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Define the core notification types
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2013-05-21 20:51:17 -0400 (Tue, 21 May 2013) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Forums
  * @link		http://www.invisionpower.com
  * @since		20th February 2002
- * @version		$Rev: 10914 $
+ * @version		$Rev: 12263 $
  *
  */
 
@@ -38,21 +38,46 @@ class members_notifications
 		 */
 		$_NOTIFY	= array(
 							array( 'key' => 'profile_comment', 'default' => array( 'inline' ), 'disabled' => array(), 'icon' => 'notify_profilecomment' ),
-							array( 'key' => 'friend_request', 'default' => array( 'inline' ), 'disabled' => array(), 'icon' => 'notify_friendrequest' ),
-							array( 'key' => 'friend_request_approve', 'default' => array( 'inline' ), 'disabled' => array(), 'icon' => 'notify_friendrequest' ),
+							array( 'key' => 'friend_request', 'default' => array( 'inline' ), 'disabled' => array(), 'show_callback' => true, 'icon' => 'notify_friendrequest' ),
+							array( 'key' => 'friend_request_approve', 'default' => array( 'inline' ), 'disabled' => array(), 'show_callback' => true, 'icon' => 'notify_friendrequest' ),
 							array( 'key' => 'new_private_message', 'default' => array( 'email' ), 'disabled' => array( 'inline' ), 'icon' => 'notify_pm' ),
 							array( 'key' => 'reply_private_message', 'default' => array( 'email' ), 'disabled' => array( 'inline' ), 'icon' => 'notify_pm' ),
 							array( 'key' => 'invite_private_message', 'default' => array( 'email' ), 'disabled' => array( 'inline' ), 'icon' => 'notify_pm' ),
-							array( 'key' => 'reply_your_status', 'default' => array(), 'disabled' => array(), 'icon' => 'notify_statusreply' ),
-							array( 'key' => 'reply_any_status', 'default' => array(), 'disabled' => array(), 'icon' => 'notify_statusreply' ),
-							array( 'key' => 'friend_status_update', 'default' => array(), 'disabled' => array(), 'icon' => 'notify_statusreply' ),
+							array( 'key' => 'reply_your_status', 'default' => array(), 'disabled' => array(), 'show_callback' => true, 'icon' => 'notify_statusreply' ),
+							array( 'key' => 'reply_any_status', 'default' => array(), 'disabled' => array(), 'show_callback' => true, 'icon' => 'notify_statusreply' ),
+							array( 'key' => 'friend_status_update', 'default' => array(), 'disabled' => array(), 'show_callback' => true, 'icon' => 'notify_statusreply' ),
 							array( 'key' => 'warning', 'default' => array( 'email' ), 'disabled' => array(), 'show_callback' => true, 'icon' => 'notify_warning' ),
 							array( 'key' => 'warning_mods', 'default' => array( 'inline' ), 'disabled' => array(), 'show_callback' => true, 'icon' => 'notify_warning' ),
 							);/*noLibHook*/
 							
 		return $_NOTIFY;
 	}
+
+	public function friend_request( $member )
+	{
+		return (bool) ( ipsRegistry::$settings['friends_enabled'] && $member['g_can_add_friends'] );
+	}
+
+	public function friend_request_approve( $member )
+	{
+		return (bool) ( ipsRegistry::$settings['friends_enabled'] && $member['g_can_add_friends'] );
+	}
+
+	public function friend_status_update( $member )
+	{
+		return (bool) ( ipsRegistry::$settings['su_enabled'] && ipsRegistry::$settings['friends_enabled'] && $member['g_can_add_friends'] );
+	}
 	
+	public function reply_your_status( $member )
+	{
+		return (bool) ( ipsRegistry::$settings['su_enabled'] );
+	}
+
+	public function reply_any_status( $member )
+	{
+		return (bool) ( ipsRegistry::$settings['su_enabled'] );
+	}
+
 	public function warning( $member )
 	{
 		if ( !ipsRegistry::$settings['warn_on'] )

upload/admin/applications/members/extensions/notifications/pm.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Fetches meta data for notifications
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$author$
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Forums
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/extensions/profileTabs/friends.conf.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Config for about me tab
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		20th February 2002
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  *
  */
 

upload/admin/applications/members/extensions/profileTabs/friends.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile Plugin Library
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-09-14 10:11:40 -0400 (Fri, 14 Sep 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mark $
  * @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		20th February 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 11340 $
  *
  */
 
@@ -69,7 +69,7 @@ class profile_friends extends profile_plugin_parent
 		/* Get em! */
 		$queryData = array( 'select'		=> 'f.*',
 							 'from'			=> array( 'profile_friends' => 'f' ),
-							 'where'		=> 'f.friends_member_id=' . $member['member_id'] . ' AND f.friends_approved=1',
+							 'where'		=> 'f.friends_member_id=' . $member['member_id'] . ' AND f.friends_approved=1 AND m.member_banned=0 AND ( ! ' . IPSBWOptions::sql( 'bw_is_spammer', 'members_bitoptions', 'members', 'global', 'has' ) . ')',
 							 'add_join'		=> array(
 												  1 => array( 'select' => 'pp.*',
 															  'from'   => array( 'profile_portal' => 'pp' ),
@@ -100,7 +100,7 @@ class profile_friends extends profile_plugin_parent
 		{
 			if( $row['member_id'] )
 			{
-				$friends[ $row['members_display_name'] ]	= IPSMember::buildDisplayData( $row, 0 );
+				$friends[ IPSText::mbstrtolower($row['members_display_name']) ]	= IPSMember::buildDisplayData( $row, 0 );
 			}
 		}
 		

upload/admin/applications/members/extensions/profileTabs/reputation.conf.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Config for reputation tab
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		4th January 2012
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  *
  */
 

upload/admin/applications/members/extensions/profileTabs/reputation.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Reputation Profile Tab
- * Last Updated: $Date: 2012-07-09 12:56:26 -0400 (Mon, 09 Jul 2012) $
+ * Last Updated: $Date: 2012-09-27 11:58:26 -0400 (Thu, 27 Sep 2012) $
  * </pre>
  *
- * @author 		$Author: AndyMillne $
+ * @author 		$Author: mark $
  * @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		4th January 2012
- * @version		$Revision: 11047 $
+ * @version		$Revision: 11387 $
  *
  */
 
@@ -64,7 +64,7 @@ class profile_reputation extends profile_plugin_parent
 		
 		/* What is it we're getting? */
 		$app = ( ! empty($this->request['app_tab']) and isset( $supportedApps[ $this->request['app_tab'] ] ) ) ? $this->request['app_tab'] : 'forums';
-		$type = ( isset( $this->request['type'] ) and $this->request['type'] == 'received' ) ? 'received' : 'given';
+		$type = ( isset( $this->request['type'] ) and $this->request['type'] == 'given' ) ? 'given' : 'received';
 		$st = isset( $this->request['st'] ) ? intval( $this->request['st'] ) : 0;
 		
 		/* Can we view given reputation - If not, no point going any further*/
@@ -88,7 +88,7 @@ class profile_reputation extends profile_plugin_parent
 		$this->DB->build( $queryForCount );
 		
 		$rawQuery = $this->DB->fetchSqlString();
-		
+				
 		$this->DB->flushQuery();
 		
 		$this->DB->allow_sub_select = 1;

upload/admin/applications/members/extensions/profileTabs/status.conf.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Config for about me tab
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		20th February 2002
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  *
  */
 

upload/admin/applications/members/extensions/profileTabs/status.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile Plugin Library
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-08-28 17:56:22 -0400 (Tue, 28 Aug 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		20th February 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 11296 $
  *
  */
 
@@ -57,5 +57,4 @@ class profile_status extends profile_plugin_parent
 		
 		return $content ? $content : $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_status_to_show' );
 	}
-	
 }

upload/admin/applications/members/extensions/reportPlugins/messages.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Report Center :: Private Messages plugin
- * Last Updated: $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $LastChangedDate: 2013-05-08 17:43:20 -0400 (Wed, 08 May 2013) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 12240 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -323,19 +323,19 @@ class messages_plugin
 										)		);
 
 		$message	= "[quote name='" . IPSText::getTextClass('bbcode')->makeQuoteSafe( $data['members_display_name'] ) . "']";
-		$message	.= $data['msg_post'];
+		$message	.= $this->registry->output->parseIPSTags( $data['msg_post'] );
 		$message	.= "[/quote]\n\n";
 		$message	.= $this->request['message'];
 		
-		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-		IPSText::getTextClass('bbcode')->parse_html			= 0;
-		IPSText::getTextClass('bbcode')->parse_emoticons	= 1;
-		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-		IPSText::getTextClass('bbcode')->parsing_section	= 'reports';
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$editor = new $classToLoad();
+		
+		$editor->setLegacyMode(false);
 		
 		$build_report = array(
 							'rid'			=> $rid,
-							'report'		=> IPSText::getTextClass('bbcode')->preDbParse( $message ),
+							'report'		=> $editor->process( $message ),
 							'report_by'		=> $this->memberData['member_id'],
 							'date_reported'	=> time(),
 							);

upload/admin/applications/members/extensions/reportPlugins/profiles.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Report Center :: Profiles plugin
- * Last Updated: $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $LastChangedDate: 2013-04-12 20:11:40 -0400 (Fri, 12 Apr 2013) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 12172 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -158,11 +158,20 @@ class profiles_plugin
 		$ex_form_data = array(
 								'member_id'	=> $mem,
 								'ctyp'		=> 'profile',
-								'title'		=> $member['members_display_name']
+								'title'		=> $member['members_display_name'] ? $member['members_display_name'] : $this->lang->words['missing_name_report'],
 							);
 		
 		$this->registry->output->setTitle( $this->lang->words['report_mem_page'] );
-		$this->registry->output->addNavigation( $member['members_display_name'], "showuser=" . $member['member_id'] );
+
+		if( $member['members_display_name'] )
+		{
+			$this->registry->output->addNavigation( $member['members_display_name'], "showuser=" . $member['member_id'] );
+		}
+		else
+		{
+			$this->registry->output->addNavigation( $this->lang->words['missing_name_report'], '' );
+		}
+		
 		$this->registry->output->addNavigation( $this->lang->words['report_mem_page'], '' );
 		
 		$this->lang->words['report_basic_title']		= $this->lang->words['report_mem_page'];
@@ -171,7 +180,7 @@ class profiles_plugin
 		
 		$url = $this->registry->getClass('output')->buildSEOUrl( "showuser=" . $ex_form_data['member_id'], 'public', $member['members_seo_name'], 'showuser' );
 		
-		return $this->registry->getClass('reportLibrary')->showReportForm( $member['members_display_name'], $url, $ex_form_data );
+		return $this->registry->getClass('reportLibrary')->showReportForm( $member['members_display_name'] ? $member['members_display_name'] : $this->lang->words['missing_name_report'], $url, $ex_form_data );
 	}
 
 	/**
@@ -262,15 +271,15 @@ class profiles_plugin
 			$this->DB->update( 'rc_reports_index', array( 'date_updated' => time(), 'status' => $status['new'], 'seoname' => $data['members_seo_name'], 'seotemplate' => 'showuser' ), "id='{$rid}'" );
 		}
 		
-		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-		IPSText::getTextClass('bbcode')->parse_html			= 0;
-		IPSText::getTextClass('bbcode')->parse_emoticons	= 1;
-		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-		IPSText::getTextClass('bbcode')->parsing_section	= 'reports';
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$editor = new $classToLoad();
+		
+		$editor->setLegacyMode(false);
 		
 		$build_report = array(
 							'rid'			=> $rid,
-							'report'		=> IPSText::getTextClass('bbcode')->preDbParse( $this->request['message'] ),
+							'report'		=> $editor->process( $this->request['message'] ),
 							'report_by'		=> $this->memberData['member_id'],
 							'date_reported'	=> time(),
 							);

upload/admin/applications/members/extensions/search/config.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Config file
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2013-04-15 17:26:30 -0400 (Mon, 15 Apr 2013) $
  * </pre>
  *
  * @author 		$author$
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Forums
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 12179 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -22,16 +22,18 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+$memberData = ipsRegistry::member()->fetchMemberData();
+
 /* Can search with this app */
-$CONFIG['can_search']			= 1;
+$CONFIG['can_search']			= ( $memberData['g_mem_info'] ) ? 1 : 0;
 
 /* Can view new content with this app */
-$CONFIG['can_viewNewContent']	= 1;
+$CONFIG['can_viewNewContent']	= ( $memberData['g_mem_info'] ) ? 1 : 0;
 $CONFIG['can_vnc_filter_by_followed']	= 0;
 $CONFIG['can_vnc_unread_content']		= 0;
 
 /* Can fetch user generated content */
-$CONFIG['can_userContent']		= 1;
+$CONFIG['can_userContent']		= ( $memberData['g_mem_info'] ) ? 1 : 0;
 
 /* Content types, put the default one first */
 if( $_REQUEST['do'] == 'user_activity' )

upload/admin/applications/members/extensions/search/form.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Returns HTML for the form (optional class, not required)
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$author$
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Forums
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/extensions/search/format.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Formats forum search results
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-25 13:17:47 -0400 (Fri, 25 May 2012) $
  * </pre>
  *
  * @author 		$author$
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Forums
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10798 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/extensions/sphinxTemplate.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * 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

@@ -7,7 +7,7 @@
  * $Author: ips_terabyte $ (Original: Mark)
  * @since		-
  * $LastChangedDate: 2010-10-14 13:11:17 -0400 (Thu, 14 Oct 2010) $
- * @version		v3.3.4
+ * @version		v3.4.5
  * $Revision: 477 $
  */
 

upload/admin/applications/members/js/ipsEditGroup.js

@@ -20,17 +20,17 @@ function checkform() {
 	
 	if ( isAdmin && isAdmin.checked == true )
 	{
-		msg += 'Members in this group can access the Admin Control Panel\n\n';
+		msg += ipb.lang['can_access_cp'] + '\n\n';
 	}
 	
 	if ( isMod && isMod.checked == true )
 	{
-		msg += 'Members in this group are super moderators.\n\n';
+		msg += ipb.lang['is_supmod'] + '\n\n';
 	}
 	
 	if ( msg != '' )
 	{
-		if( confirm( "Security Check\n--------------\nMember Group Title: " + $F('g_title') + "\n--------------\n\n" + msg + 'Is this correct?' ) )
+		if( confirm( ipb.lang['security_check'] + "\n--------------\n" + ipb.lang['group_title'] + $F('g_title') + "\n--------------\n\n" + msg ) )
 		{
 			return true;
 		}

upload/admin/applications/members/modules_admin/ajax/bulkmail.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.4.5
+ * Bulk Mail Recipients List Generator (AJAX)
+ * Last Updated: $Date: 2012-07-12 18:15:50 +0100 (Thu, 12 Jul 2012) $
+ * </pre>
+ *
+ * @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
+ * @version		$Revision: 11070 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class admin_members_ajax_bulkmail extends ipsAjaxCommand 
+{
+	/**
+	 * Main class entry point
+	 *
+	 * @param	object		ipsRegistry reference
+	 * @return	@e void		[Outputs to screen]
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+	
+		require_once IPSLib::getAppDir( 'members' ) . '/sources/classes/bulkMailFilter.php';
+		$this->html			= $this->registry->output->loadTemplate('cp_skin_bulkmail');
+		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_bulkmail' ) );
+		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'bulkmail_send' );
+		
+		$controllerClass = IPSLib::loadActionOverloader( IPSLib::getAppDir('members') . '/modules_admin/bulkmail/bulkmail.php', 'admin_members_bulkmail_bulkmail' );
+		$controller = new $controllerClass( $registry );
+		$controller->makeRegistryShortcuts( $registry );
+		
+		//-----------------------------------------
+		// Load Mail
+		//-----------------------------------------
+		
+		$id = intval( $this->request['id'] );		
+		$mail = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'bulk_mail', 'where' => 'mail_id=' . $id ) );
+		
+		if ( ! $mail['mail_id'] )
+		{
+			$this->returnHTML( '' );
+		}
+		if ( ! $mail['mail_subject'] and ! $mail['mail_content'] )
+		{
+			$this->returnHTML( '' );
+		}
+		
+		$opts = unserialize( stripslashes( $mail['mail_opts'] ) );
+		$mail['mail_html_on'] = $opts['mail_html_on'];
+		
+		//-----------------------------------------
+ 		// Get Members
+ 		//-----------------------------------------
+ 		
+ 		/* Start with a basic query */
+		$queryData = array(
+			'select'	=> 'm.member_id, m.members_display_name, m.email',
+			'from'		=> array( 'members' => 'm' ),
+			'order'		=> 'm.members_display_name',
+			'limit'		=> array( ( 10000 * ( $this->request['page'] - 1 ) ), 10000 )
+			);
+			
+		/* Add in filters */
+ 		$_queryData = $controller->_buildMembersQuery( $opts['filters'] );
+ 		$queryData['add_join'] = $_queryData['add_join'];
+ 		$queryData['where'] = implode( ' AND ' , $_queryData['where'] );
+ 		
+ 		/* Count */
+		$this->DB->build( $queryData );
+		$this->DB->execute();
+		while ( $row = $this->DB->fetch() )
+		{
+			$members[] = $row;
+		}
+		
+		//-----------------------------------------
+		// Display
+		//-----------------------------------------
+		
+		$this->returnHTML( $this->html->mss_recipients( $this->request['page'], $this->request['countmembers'], $members ) );
+	}
+}

upload/admin/applications/members/modules_admin/ajax/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 8655 $
  */
 

upload/admin/applications/members/modules_admin/ajax/editform.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Member property updater (AJAX)
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-07-12 13:15:50 -0400 (Thu, 12 Jul 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Revision: 10914 $
+ * @version		$Revision: 11070 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -251,7 +251,13 @@ class admin_members_ajax_editform extends ipsAjaxCommand
 						{
 							$member['_group_title'] = $group['g_title'];
 						}
-
+						
+						/* If it's an admin group, make sure the admin banning can promote to this group */
+						if ( $group['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission('member_move_admin2'))
+						{
+							continue;	
+						}
+						
 						$member_groups[] = array( $group['g_id'], $group['g_title'] );
 					}
 					

upload/admin/applications/members/modules_admin/ajax/members.php

@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Member list AJAX handler
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-10-26 11:50:52 -0400 (Fri, 26 Oct 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: AndyMillne $
  * @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: 10914 $
+ * @version		$Revision: 11525 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -525,7 +525,7 @@ class admin_members_ajax_members extends ipsAjaxCommand
 		{
 			try
 			{
-				$message	= $this->_getManagementClass()->unmarkMembersAsSpam( $ids, $this->request['type'] == 'unspam_posts' ? true : false );
+				$message	= $this->_getManagementClass()->unmarkMembersAsSpam( $ids, ( $this->request['type'] == 'unspam' OR $this->request['type'] == 'unspam_posts' ) ? true : false );
 			}
 			catch( Exception $error )
 			{

upload/admin/applications/members/modules_admin/bulkmail/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 8655 $
  */
 

upload/admin/applications/members/modules_admin/bulkmail/xml/menu.xml

@@ -2,10 +2,10 @@
 <menu>
 	<tabitems>
 		<item>
-			<title>Bulk Mail</title>
+			<title>Рассылки</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Bulk Mail</subitemtitle>
+					<subitemtitle>Рассылки</subitemtitle>
 					<subitemlang>bulkmail</subitemlang>
 					<subsection>bulkmail</subsection>
 					<subitemurl>do=bulk_mail</subitemurl>
@@ -14,6 +14,5 @@
 				</subitem>
 			</subitems>
 		</item>
-		
 	</tabitems>
 </menu>

upload/admin/applications/members/modules_admin/bulkmail/xml/permissions.xml

@@ -1,34 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <permissions>
 	<group>
-		<grouptitle>Creating Bulk Mail</grouptitle>
+		<grouptitle>Управление рассылками</grouptitle>
 		<grouplang>mem_bulkmail</grouplang>
 		<items>
 			<item>
 				<key>bulkmail_addedit</key>
-				<string>Can add/edit bulk emails?</string>
+				<string>Может добавлять/изменять рассылки?</string>
 			</item>
 			<item>
 				<key>bulkmail_delete</key>
-				<string>Can delete bulk emails?</string>
+				<string>Может удалять рассылки?</string>
+			</item>
+			<item>
+				<key>bulkmail_lists</key>
+				<string>Может управлять списком контактов?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Sending/Resending Bulk Mails</grouptitle>
+		<grouptitle>Отправка рассылок</grouptitle>
 		<grouplang>mem_bulkmailsend</grouplang>
 		<items>
 			<item>
 				<key>bulkmail_view</key>
-				<string>Can monitor/view bulk emails?</string>
+				<string>Может просматривать текущие рассылки?</string>
 			</item>
 			<item>
 				<key>bulkmail_send</key>
-				<string>Can send bulk emails?</string>
+				<string>Может запускать отправку рассылки?</string>
 			</item>
 			<item>
 				<key>bulkmail_cancel</key>
-				<string>Can cancel bulk emails?</string>
+				<string>Может отменить отправку рассылки?</string>
 			</item>
 		</items>
 	</group>

upload/admin/applications/members/modules_admin/cfields/customfields.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Custom field management
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-08-28 17:56:22 -0400 (Tue, 28 Aug 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Revision: 10914 $
+ * @version		$Revision: 11296 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -263,6 +263,7 @@ class admin_members_cfields_customfields extends ipsCommand
 			/* Text Bits */
 			$title = $this->lang->words['cf_gcreate'];
 			$do    = 'do_add_group';
+			$button = $this->lang->words['cf_g_save'];
 		}
 		/* Edit Form */
 		else
@@ -281,6 +282,7 @@ class admin_members_cfields_customfields extends ipsCommand
 			/* Text Bits */
 			$title = $this->lang->words['cf_gedit'];
 			$do    = 'do_edit_group';
+			$button = $this->lang->words['cf_g_editbutton'];
 		}
 		
 		/* Default Values */
@@ -290,7 +292,7 @@ class admin_members_cfields_customfields extends ipsCommand
 					);
 		
 		/* Output */
-		$this->registry->output->html .= $this->html->groupForm( $id, $data, $title, $do );		
+		$this->registry->output->html .= $this->html->groupForm( $id, $data, $title, $do, $button );		
 	}
 
 	/**

upload/admin/applications/members/modules_admin/cfields/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 477 $
  */
 

upload/admin/applications/members/modules_admin/cfields/xml/menu.xml

@@ -2,10 +2,10 @@
 <menu>
 	<tabitems>
 		<item>
-			<title>Custom Profile Fields</title>
+			<title>Дополнительные Поля Профиля</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Custom Profile Fields</subitemtitle>
+					<subitemtitle>Дополнительные Поля Профиля</subitemtitle>
 					<subitemlang>customfields</subitemlang>
 					<subsection>customfields</subsection>
 					<subitemurl></subitemurl>

upload/admin/applications/members/modules_admin/cfields/xml/permissions.xml

@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <permissions>
 	<group>
-		<grouptitle>Custom Profile Fields</grouptitle>
+		<grouptitle>Дополнительные поля профиля</grouptitle>
 		<grouplang>members_cfields</grouplang>
 		<items>
 			<item>
 				<key>profilefields_global</key>
-				<string>Can access custom profile fields management?</string>
+				<string>Может управлять полями?</string>
 			</item>
 			<item>
 				<key>profilefields_add</key>
-				<string>Can add new profile fields?</string>
+				<string>Может добавлять новые?</string>
 			</item>
 			<item>
 				<key>profilefields_edit</key>
-				<string>Can edit profile fields?</string>
+				<string>Может изменять?</string>
 			</item>
 			<item>
 				<key>profilefields_delete</key>
-				<string>Can delete profile fields?</string>
+				<string>Может удалять?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Custom Profile Field Groups</grouptitle>
+		<grouptitle>Группы полей</grouptitle>
 		<grouplang>members_cfieldgroups</grouplang>
 		<items>
 			<item>
 				<key>profilefieldgroups_global</key>
-				<string>Can access custom profile field group management?</string>
+				<string>Может управлять группами?</string>
 			</item>
 			<item>
 				<key>profilefieldgroups_add</key>
-				<string>Can add new profile field group?</string>
+				<string>Может добавлять новые?</string>
 			</item>
 			<item>
 				<key>profilefieldgroups_edit</key>
-				<string>Can edit profile field group?</string>
+				<string>Может изменять?</string>
 			</item>
 			<item>
 				<key>profilefieldgroups_delete</key>
-				<string>Can delete profile field group?</string>
+				<string>Может удалять?</string>
 			</item>
 		</items>
 	</group>

upload/admin/applications/members/modules_admin/groups/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 8655 $
  */
 

upload/admin/applications/members/modules_admin/groups/groups.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Group management
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2013-04-03 17:54:22 -0400 (Wed, 03 Apr 2013) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Revision: 10914 $
+ * @version		$Revision: 12149 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -153,7 +153,7 @@ class admin_members_groups_groups extends ipsCommand
 		
 		while ( $row = $this->DB->fetch( $o ) )
 		{
-			$_extra = ( $this->request['showSecondary'] ) ? ' OR mgroup_others LIKE \'%,' . intval($row['g_id']) . ',%\'' : '';
+			$_extra = ( $this->request['showSecondary'] ) ? ' OR ' . $this->DB->buildWherePermission( array( intval($row['g_id']) ), 'mgroup_others', false ) : '';
 			
 			/* As much as I hate nested queries, this is actually quicker especially when you add in the LIKE check.*/
 			$count = $this->DB->buildAndFetch( array( 'select'	=> 'COUNT(*) as count',
@@ -435,6 +435,47 @@ class admin_members_groups_groups extends ipsCommand
 			}
 		}
 
+		//-----------------------------------------
+		// Fix settings
+		//-----------------------------------------
+
+		$_toUpdate	= array();
+
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_conf_settings', 'where' => "conf_extra='#show_groups#'" ) );
+		$o = $this->DB->execute();
+
+		while( $r = $this->DB->fetch($o) )
+		{
+			/* Dropdown with the deleted group selected? Return to default. */
+			if( $r['conf_type'] == 'dropdown' AND $r['conf_value'] == $this->request['id'] )
+			{
+				$_toUpdate[ $r['conf_key'] ]	= $r['conf_default'];
+			}
+			/* Multiselect with deleted group selected?  Fix values then. */
+			else if( $r['conf_type'] == 'multi' AND strpos( $r['conf_value'], (string) $this->request['id'] ) !== false )
+			{
+				$_values	= explode( ',', $r['conf_value'] );
+				$_newValues	= array();
+
+				foreach( $_values as $_value )
+				{
+					if( $_value != $this->request['id'] )
+					{
+						$_newValues[]	= $_value;
+					}
+				}
+
+				$_toUpdate[ $r['conf_key'] ]	= ( count($_newValues) ) ? $_newValues : $r['conf_default'];
+			}
+		}
+
+		if( count($_toUpdate) )
+		{
+			/* The multiselect settings have evalphp which forces it to inspect $_POST */
+			$_POST	= array_merge( $_POST, $_toUpdate );
+			IPSLib::updateSettings( $_toUpdate );
+		}
+
 		//-----------------------------------------
 		// Rebuild caches
 		//-----------------------------------------
@@ -563,6 +604,10 @@ class admin_members_groups_groups extends ipsCommand
 		$this->request['p_width']	= str_replace( ":", "", $this->request['p_width'] );
 		$this->request['p_height']	= str_replace( ":", "", $this->request['p_height'] );
 		
+		$this->request['g_attach_max'] 		= intval( $this->request['g_attach_max'] );
+		$this->request['g_attach_per_post'] = intval( $this->request['g_attach_per_post'] );
+		$this->request['p_max'] 			= intval( $this->request['p_max'] );
+		
 		$sig_limits		= array(
 								$this->request['use_signatures'],
 								$this->request['max_images'],
@@ -594,7 +639,7 @@ class admin_members_groups_groups extends ipsCommand
 							'g_hide_from_list'		=> intval($this->request['g_hide_from_list']),
 							'g_perm_id'				=> $new_perm_set_id ? $new_perm_set_id : implode( ",", $this->request['permid'] ),
 							'g_icon'				=> trim( IPSText::safeslashes( $_POST['g_icon'] ) ),
-							'g_attach_max'			=> ( $this->request['g_attach_max'] == '' ) ? 0 : $this->request['g_attach_max'],
+							'g_attach_max'			=> ( $this->request['g_attach_max'] == '' ) ? 0 : intval($this->request['g_attach_max']),
 							'g_max_messages'		=> intval($this->request['g_max_messages']),
 							'g_max_mass_pm'			=> intval($this->request['g_max_mass_pm']),
 							'g_pm_flood_mins'		=> intval($this->request['g_pm_flood_mins']),
@@ -848,6 +893,7 @@ class admin_members_groups_groups extends ipsCommand
 		// And output to form
 		//-----------------------------------------
 		
+		$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}&amp;{$this->form_code}", $this->lang->words['menu__manage_groups'] );
 		$this->registry->output->html .= $this->html->groupsForm( $type, $group, $perm_masks, $blocks, $firstTab );
 	}
 }

upload/admin/applications/members/modules_admin/groups/permissions.php

@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Permissions management
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-12-21 13:31:16 -0500 (Fri, 21 Dec 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: AndyMillne $
  * @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: 10914 $
+ * @version		$Revision: 11748 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -517,6 +517,7 @@ class admin_members_groups_permissions extends ipsCommand
 		}
 
 		/* Output */
+		$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}&amp;{$this->form_code}", $this->lang->words['menu__manage_perms'] );
 		$this->registry->output->html .= $this->html->permissionEditor( $set_data['perm_name'], $matricies, $id, $apps );
 	}	
 	

upload/admin/applications/members/modules_admin/groups/xml/menu.xml

@@ -2,10 +2,10 @@
 <menu>
 	<tabitems>
 		<item>
-			<title>Manage Member Groups</title>
+			<title>Управление Группами</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Manage Member Groups</subitemtitle>
+					<subitemtitle>Управление Группами</subitemtitle>
 					<subitemlang>manage_groups</subitemlang>
 					<subsection>groups</subsection>
 					<subitemurl>do=groups_overview</subitemurl>
@@ -15,10 +15,10 @@
 			</subitems>
 		</item>
 		<item>
-			<title>Manage User Permissions</title>
+			<title>Управление Правами Доступа</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Manage User Permissions</subitemtitle>
+					<subitemtitle>Управление Правами Доступа</subitemtitle>
 					<subitemlang>manage_perms</subitemlang>
 					<subsection>permissions</subsection>
 					<subitemurl>do=overview</subitemurl>

upload/admin/applications/members/modules_admin/groups/xml/permissions.xml

@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <permissions>
 	<group>
-		<grouptitle>Managing Groups</grouptitle>
+		<grouptitle>Управление группами</grouptitle>
 		<grouplang>members_groups</grouplang>
 		<items>
 			<item>
 				<key>groups_add</key>
-				<string>Can add groups?</string>
+				<string>Может добавлять группы?</string>
 			</item>
 			<item>
 				<key>groups_add_admin</key>
-				<string>Can add ADMIN groups?</string>
+				<string>Может добавлять АДМИНИСТРАТОРСКИЕ группы?</string>
 			</item>
 			<item>
 				<key>groups_edit</key>
-				<string>Can edit groups?</string>
+				<string>Может редактировать группы?</string>
 			</item>
 			<item>
 				<key>groups_edit_admin</key>
-				<string>Can edit ADMIN groups?</string>
+				<string>Может редактировать АДМИНИСТРАТОРСКИЕ группы?</string>
 			</item>
 			<item>
 				<key>groups_delete</key>
-				<string>Can delete groups?</string>
+				<string>Может удалять группы?</string>
 			</item>
 			<item>
 				<key>groups_delete_admin</key>
-				<string>Can delete ADMIN groups?</string>
+				<string>Может удалять АДМИНИСТРАТОРСКИЕ группы?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Managing Permissions</grouptitle>
+		<grouptitle>Управление правами</grouptitle>
 		<grouplang>members_perms</grouplang>
 		<items>
 			<item>
 				<key>perms_manage</key>
-				<string>Can manage permission sets and configure permission access?</string>
+				<string>Может добавлять и редактировать маски доступа?</string>
 			</item>
 			<item>
 				<key>perms_delete</key>
-				<string>Can remove permission sets?</string>
+				<string>Может удалять маски доступа?</string>
 			</item>
 		</items>
 	</group>	

upload/admin/applications/members/modules_admin/members/banfilters.php

@@ -7,7 +7,7 @@
  * $Author: ips_terabyte $
  * @since		-
  * $LastChangedDate: 2011-03-22 12:48:06 -0400 (Tue, 22 Mar 2011) $
- * @version		v3.3.4
+ * @version		v3.4.5
  * $Revision: 8149 $
  */
 

upload/admin/applications/members/modules_admin/members/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 8655 $
  */
 

upload/admin/applications/members/modules_admin/members/editform.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Member property updater (AJAX)
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2013-05-08 12:08:00 -0400 (Wed, 08 May 2013) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Revision: 10914 $
+ * @version		$Revision: 12237 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -270,7 +270,7 @@ class admin_members_members_editform extends ipsCommand
 			$display_name          = IPSText::removeControlCharacters( $display_name );
 		}
 		
-		if ( $field == 'members_display_name' AND preg_match( "#[\[\];,\|]#", str_replace( '&#39;', "'", str_replace( '&amp;', '&', str_replace( '&quot;', '"', str_replace( '&#33;', '!', $display_name ) ) ) ) ) )
+		if ( $field == 'members_display_name' AND preg_match( "#[\[\];,\|]#", IPSText::UNhtmlspecialchars( $display_name ) ) )
 		{
 			$this->registry->output->showError( $this->lang->words['m_displaynames'] );
 		}
@@ -355,22 +355,6 @@ class admin_members_members_editform extends ipsCommand
 			}
 		}
 		
-        //-----------------------------------------
-    	// Load handler...
-    	//-----------------------------------------
-    	
-    	if( $field == 'name' )
-    	{
-			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
-			$han_login   = new $classToLoad( $this->registry );
-	    	$han_login->init();
-	    	$han_login->changeName( $member['name'], $display_name, $member['email'], $member );
-    	}
-    	else
-    	{
-    		IPSLib::runMemberSync( 'onNameChange', $member_id, $display_name );
-    	}
-
 		$this->registry->output->global_message	= $this->lang->words[ $field . '_updated_success'];
 		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'module=members&do=viewmember&member_id=' . $member_id );
 	}

upload/admin/applications/members/modules_admin/members/members.php

@@ -6,9 +6,9 @@
  * $License: http://www.invisionpower.com/company/standards.php#license$
  * $Author: bfarber $
  * @since		1st March 2002
- * $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
- * @version		v3.3.4
- * $Revision: 10914 $
+ * $LastChangedDate: 2013-05-02 23:43:16 -0400 (Thu, 02 May 2013) $
+ * @version		v3.4.5
+ * $Revision: 12217 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -445,6 +445,7 @@ class admin_members_members_members extends ipsCommand
 		$_editor->setAllowBbcode( true );
 		$_editor->setAllowSmilies( false );
 		$_editor->setAllowHtml( $member['g_dohtml'] );
+		$_editor->setIsHtml( $member['bw_html_sig'] );
 		$_editor->setContent( $sig_editor, 'signatures' );
 		
 		$member['signature_editor']	= $_editor->show( 'signature', array( 'noSmilies' => true, 'height' => 350 ) );
@@ -664,6 +665,42 @@ class admin_members_members_members extends ipsCommand
 			return;
 		}
 		
+		//-----------------------------------------
+		// Are we banning ourselves ?
+		//-----------------------------------------
+		
+		if( $member['member_id'] == $this->memberData['member_id'] )
+		{
+			$this->registry->output->global_message = $this->lang->words['m_banyourself'];
+			$this->_memberView();
+			return;
+		}
+		
+		//-----------------------------------------
+		// What about demoting or promoting ?
+		//-----------------------------------------
+				
+		if ( $this->request['ban__group'] != $member['member_group_id'] && $this->request['ban__group_change'] )
+		{			
+			// Demote
+			if( $member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission('member_move_admin1') )
+			{
+					$this->registry->output->global_message = $this->lang->words['m_admindemote'];
+					$this->_memberView();
+					return;
+			}
+			// Promote
+			if( !$member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission('member_move_admin2') )
+			{
+				if( $this->caches['group_cache'][ $this->request['ban__group'] ]['g_access_cp'] )
+				{
+					$this->registry->output->global_message = $this->lang->words['m_adminpromote'];
+					$this->_memberView();
+					return;
+				}
+			}
+		}
+		
 		//-----------------------------------------
 		// Check ban settings...
 		//-----------------------------------------
@@ -715,6 +752,10 @@ class admin_members_members_members extends ipsCommand
 		else if( !$this->request['ban__member'] AND $member['member_banned'] )
 		{
 			IPSMember::save( $member['member_id'], array( 'core' => array( 'member_banned' => 0 ) ) );
+
+			/* Also update warn logs to -2
+				@link http://community.invisionpower.com/resources/bugs.html/_/ip-board/banning-a-member-from-the-acp-shows-the-user-an-incorrect-more-details-link-r42079 */
+			$this->DB->update( 'members_warn_logs', array( 'wl_suspend' => '-2' ), "wl_suspend=-1 AND wl_member=" . $member['member_id'] );
 		}
 		
 		if( $this->request['ban__name'] AND !$name_banned )
@@ -761,7 +802,7 @@ class admin_members_members_members extends ipsCommand
 		{
 			IPSMember::save( $member['member_id'], array( 'core' => array( 'member_group_id' => intval($this->request['ban__group']) ) ) );
 			
-			/* Password has been changed! */
+			/* Group has been changed! */
 			IPSLib::runMemberSync( 'onGroupChange', $member['member_id'], intval($this->request['ban__group']), $member['member_group_id'] );
 		}
 		
@@ -1045,6 +1086,17 @@ class admin_members_members_members extends ipsCommand
 		// INIT
 		//-----------------------------------------
 		
+		$init	= intval( $this->request['init'] );
+		$img	= '<img src="' . $this->settings['skin_acp_url'] . '/images/loading_anim.gif" alt="-" /> ';
+		$count  = 0;
+		$pergo	= 25;
+		
+		if ( ! $init )
+		{
+			$url = $this->settings['base_url'] . '&' . $this->form_code_js . "&do=doprune&count=0&init=1";
+			$this->registry->output->multipleRedirectInit( $url );
+		}
+		
 		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('members') . '/sources/adminSearch.php', 'adminMemberSearch', 'members' );
 		$searchHelper	= new $classToLoad( $this->registry );
 		
@@ -1077,11 +1129,8 @@ class admin_members_members_members extends ipsCommand
 		
 		if ( !$count )
 		{
-			$this->registry->output->global_message	= $this->lang->words['m_noprune'];
-
-			ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );
-			
-			return $this->_memberList();
+			ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );			
+			$this->registry->output->multipleRedirectFinish();
 		}
 
 		//-----------------------------------------
@@ -1090,35 +1139,30 @@ class admin_members_members_members extends ipsCommand
 
 		$results	= $searchHelper->getSearchResults( 0, 0, $extraQuery, true );
 
-		if( !count($results['ids']) )
-		{
-			$this->registry->output->showError( $this->lang->words['m_noprune'], 11235 );
-		}
-
+		$_delIds   = array_slice($results['ids'], 0, $pergo);
+		$_delNames = array_slice($results['names'], 0, $pergo);
+		
 		//-----------------------------------------
 		// Delete members
 		//-----------------------------------------
 		
-		IPSMember::remove( $results['ids'], true );
-
+		IPSMember::remove( $_delIds, true );
+		
 		//-----------------------------------------
 		// Admin log
 		//-----------------------------------------
 		
-		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_deletedlog'], implode( ",", $results['names'] ) ) );
-		
-		//-----------------------------------------
-		// Reset staff cookie
-		//-----------------------------------------
-		
-		ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_deletedlog'], implode( ",", $_delNames ) ) );
 
 		//-----------------------------------------
-		// Redirect
+		// Let's go round again.
+		// (Maybe we'll turn back the hands of time)
 		//-----------------------------------------
 		
-		$this->registry->output->global_message	= $this->lang->words['m_deleted'];
-		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=members_list' );
+		$count = intval($this->request['count']) + $pergo;
+		$url = $this->settings['base_url'] . '&' . $this->form_code_js . "&do=doprune&count={$count}&init=1";
+		
+		$this->registry->output->multipleRedirectHit( $url, $img . sprintf( $this->lang->words['m_deleted'], $count ) );
 	}
 	
 	/**
@@ -1132,12 +1176,14 @@ class admin_members_members_members extends ipsCommand
 		// Error checking
 		//-----------------------------------------
 		
-		if( !$this->request['move_to_group'] )
+		$this->request['move_to_group'] = intval($this->request['move_to_group']);
+		
+		if ( empty($this->request['move_to_group']) )
 		{
 			$this->registry->output->showError( $this->lang->words['m_whatgroup'], 11236 );
 		}
 		
-		if( !$this->registry->getClass('class_permissions')->checkPermission( 'member_move_admin2') )
+		if ( !$this->registry->getClass('class_permissions')->checkPermission( 'member_move_admin2') )
 		{
 			if( $this->caches['group_cache'][ $this->request['move_to_group'] ]['g_access_cp'] )
 			{
@@ -1196,7 +1242,13 @@ class admin_members_members_members extends ipsCommand
 		// Move the members
 		//-----------------------------------------
 		
-		$this->DB->update( 'members', array( 'member_group_id' => intval($this->request['move_to_group']) ), 'member_id IN(' . implode( ',', $results['ids'] ) . ')' );
+		$this->DB->update( 'members', array( 'member_group_id' => $this->request['move_to_group'] ), 'member_id IN(' . implode( ',', $results['ids'] ) . ')' );
+		
+		/* Now run our gruop change functions */
+		foreach( $results['groups'] as $mid => $mgroup )
+		{
+			IPSLib::runMemberSync( 'onGroupChange', $mid, $this->request['move_to_group'], $mgroup );
+		}
 		
 		//-----------------------------------------
 		// Store admin log
@@ -1299,7 +1351,7 @@ class admin_members_members_members extends ipsCommand
 				}
 			}
 			
-			$names[] = $r['name'];
+			$names[ $r['member_id'] ] = $r['name'];
 		}
 		
 		//-----------------------------------------
@@ -1318,7 +1370,7 @@ class admin_members_members_members extends ipsCommand
 		// Delete
 		//-----------------------------------------
 		
-		IPSMember::remove( $ids, true );
+		IPSMember::remove( array_keys( $names ), true );
 		
 		//-----------------------------------------
 		// Clear "cookies"
@@ -1761,41 +1813,51 @@ class admin_members_members_members extends ipsCommand
 				}
 			}
 		}
-
+		
+		//-----------------------------------------
+		// What about moving member in general?
+		//-----------------------------------------
+		
+		if ( $this->request['member_group_id'] != $member['member_group_id'] AND ! $this->registry->getClass('class_permissions')->checkPermission( 'member_move' ) )
+		{
+			$this->registry->output->global_message = $this->lang->words['m_movemembers'];
+			$this->_memberView();
+			return;
+		}
+		
+		//-----------------------------------------
+		// Restricted?
+		//-----------------------------------------
+		
+		$restricted = ( is_array($this->registry->getClass('class_permissions')->restrictions_row) AND count($this->registry->getClass('class_permissions')->restrictions_row) ) ? true : false;
+		
 		/* Load editor stuff */
 		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
 		$_editor = new $classToLoad();
-
+		
+		/* Load parser */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
+		$parser = new $classToLoad();
+		
 		/* Get signature */
 		$_editor->setAllowBbcode( true );
 		$_editor->setAllowSmilies( false );
+		$_editor->setIsHtml( $this->request['bw_html_sig'] && $member['g_dohtml'] );
 		$_editor->setAllowHtml( $member['g_dohtml'] );
+		$_editor->setBbcodeSection('signatures');
 		
 		$signature	= $_editor->process( $_POST['signature'] );
 		
-		IPSText::getTextClass('bbcode')->parse_smilies		= 0;
-		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-		IPSText::getTextClass('bbcode')->parse_html			= $member['g_dohtml'];
-		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-		IPSText::getTextClass('bbcode')->parsing_section	= 'signatures';
-		
-		$signature		= IPSText::getTextClass('bbcode')->preDbParse( $signature );
-		$cacheSignature	= IPSText::getTextClass('bbcode')->preDisplayParse( $signature );
+		$cacheSignature	= $parser->display( $signature );
 
 		/* About me editor */
 		$_editor->setAllowBbcode( true );
 		$_editor->setAllowSmilies( true );
 		$_editor->setAllowHtml( $member['g_dohtml'] );
+		$_editor->setBbcodeSection( 'aboutme' );
 		
-		$aboutme 		= $_editor->process( $_POST['aboutme'] );
-		IPSText::getTextClass('bbcode')->parse_smilies		= 1;
-		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-		IPSText::getTextClass('bbcode')->parse_html			= $member['g_dohtml'];
-		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-		IPSText::getTextClass('bbcode')->parsing_section	= 'aboutme';
+		$aboutme = $_editor->process( $_POST['aboutme'] );
 		
-		$aboutme		= IPSText::getTextClass('bbcode')->preDbParse( $aboutme );
-
 		//-----------------------------------------
 		// Ok? Load interface and child classes
 		//-----------------------------------------
@@ -1995,52 +2057,50 @@ class admin_members_members_members extends ipsCommand
 			{
 				$this->DB->delete( 'admin_permission_rows', 'row_id=' . $member['member_id'] . " AND row_id_type='member'" );
 			}*/
-		}						
-		
-		//-----------------------------------------
-		// Restriction permissions stuff
-		//-----------------------------------------
-
-		if ( is_array($this->registry->getClass('class_permissions')->restrictions_row) AND count($this->registry->getClass('class_permissions')->restrictions_row) )
-		{
-			$is_admin	= 0;
-			$groups		= ipsRegistry::cache()->getCache('group_cache');
 			
-			if ( is_array( $this->request['mgroup_others'] ) AND count( $this->request['mgroup_others'] ) )
-			{
-				foreach( $this->request['mgroup_others'] as $omg )
+			//-----------------------------------------
+			// Restriction permissions stuff
+			//-----------------------------------------
+			
+				$is_admin	= 0;
+				$groups		= ipsRegistry::cache()->getCache('group_cache');
+					
+				if ( is_array( $this->request['mgroup_others'] ) AND count( $this->request['mgroup_others'] ) )
 				{
-					if ( $groups[ intval($omg) ]['g_access_cp'] )
+					foreach( $this->request['mgroup_others'] as $omg )
 					{
-						$is_admin	= 1;
-						break;
+						if ( $groups[ intval($omg) ]['g_access_cp'] )
+						{
+							$is_admin	= 1;
+							break;
+						}
 					}
 				}
-			}
-			
-			if( $groups[ intval($this->request['member_group_id']) ]['g_access_cp'] )
-			{
-				$is_admin	= 1;
-			}
-
-			if ( $is_admin )
-			{
-				//-------------------------------------------------
-				// Copy restrictions if they do not have any yet...
-				//-------------------------------------------------
-				
-				$check = $this->DB->buildAndFetch( array( 'select' => 'row_updated', 'from' => 'admin_permission_rows', 'where' => "row_id_type='member' AND row_id=" . $this->request['member_id'] ) );
-				
-				if( !$check['row_updated'] )
+					
+				if( $groups[ intval($this->request['member_group_id']) ]['g_access_cp'] )
 				{
-					$this->DB->replace( 'admin_permission_rows', array( 'row_id'			=> $this->request['member_id'],
-																		'row_id_type'		=> 'member',
-																		'row_perm_cache'	=> serialize($this->registry->getClass('class_permissions')->restrictions_row),
-																		'row_updated'		=> time() ), array( 'row_id', 'row_id_type' ) );
+					$is_admin	= 1;
 				}
-			}
-		}	
-
+			
+				if ( $is_admin && $restricted ) // and the admin promoting has restrictions
+				{
+					//-------------------------------------------------
+					// Copy restrictions if they do not have any yet...
+					//-------------------------------------------------
+			
+					$check = $this->DB->buildAndFetch( array( 'select' => 'row_updated', 'from' => 'admin_permission_rows', 'where' => "row_id_type='member' AND row_id=" . $this->request['member_id'] ) );
+			
+					if( !$check['row_updated'] )
+					{
+						$this->DB->replace( 'admin_permission_rows', array( 'row_id'			=> $this->request['member_id'],
+								'row_id_type'		=> 'member',
+								'row_perm_cache'	=> serialize($this->registry->getClass('class_permissions')->restrictions_row),
+								'row_updated'		=> time() ), array( 'row_id', 'row_id_type' ) );
+					}
+				}
+			
+		}						
+		
 		//-----------------------------------------
 		// Moved from validating group?
 		//-----------------------------------------
@@ -2071,9 +2131,24 @@ class admin_members_members_members extends ipsCommand
 		
 		$this->registry->output->global_message = $this->lang->words['m_edited'];
 
-		$triggerGroups	= $member['mgroup_others'] ? implode( ',', array_merge( is_array($member['mgroup_others']) ? $member['mgroup_others'] : array(), array( $member['member_group_id'] ) ) ) : $member['member_group_id'];
-		//$this->_memberView();
-		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&do=viewmember&trigger=' . $triggerGroups . '&member_id=' . $this->request['member_id'] );
+		if ( $is_admin )
+		{
+			if ( !$restricted ) // Let's prompt to add restrictions
+			{ 
+				$member = IPSMember::load( $member['member_id'] );
+				$this->_showAdminForm( $member, array() );
+				$this->_memberView();
+			}
+			else // They're created with promoting admin's restrictions
+			{
+				$this->registry->output->global_message = $this->lang->words['m_edited_restricted'];
+				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&do=viewmember&member_id=' . $this->request['member_id'] );
+			}
+		}
+		else
+		{
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&do=viewmember&member_id=' . $this->request['member_id'] );
+		}
 	}
 	
 	/**

upload/admin/applications/members/modules_admin/members/notifications.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Configure default notification options
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  *
  */
 

upload/admin/applications/members/modules_admin/members/ranks.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Member management
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-08-28 17:56:22 -0400 (Tue, 28 Aug 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Revision: 10914 $
+ * @version		$Revision: 11296 $
  *
  */
 
@@ -203,12 +203,12 @@ class admin_members_members_ranks extends ipsCommand
 				$this->registry->output->showError( $this->lang->words['rnk_completeform'], 11239 );
 			}
 		}
-		
-		if ( $this->request['pips'] > 100 )
+
+		if ( is_numeric( $this->request['pips'] ) && $this->request['pips'] > 100 )
 		{
-			$this->registry->output->showError( $this->lang->words['rnk_max100'], 11240 );
+			$this->registry->output->showError( $this->lang->words['rnk_mx100'], 11240 );
 		}
-		
+
 		if( $type == 'add' )
 		{
 			$this->DB->insert( 'titles', array(

upload/admin/applications/members/modules_admin/members/reputation.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Reputation System
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  *
  */
 

upload/admin/applications/members/modules_admin/members/xml/menu.xml

@@ -2,10 +2,10 @@
 <menu>
 	<tabitems>
 		<item>
-			<title>Manage Members</title>
+			<title>Управление Пользователями</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Manage Members</subitemtitle>
+					<subitemtitle>Управление Пользователями</subitemtitle>
 					<subitemlang>manage_members</subitemlang>
 					<subsection>members</subsection>
 					<subitemurl>do=members_overview</subitemurl>
@@ -16,10 +16,10 @@
 		</item>
 
 		<item>
-			<title>Member Ranks</title>
+			<title>Звания</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Member Ranks</subitemtitle>
+					<subitemtitle>Звания</subitemtitle>
 					<subitemlang>mem_ranks</subitemlang>
 					<subsection>ranks</subsection>
 					<subitemurl>do=ranks_overview</subitemurl>
@@ -30,10 +30,10 @@
 		</item>
 		
 		<item>
-			<title>Member Reputation</title>
+			<title>Репутация</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Member Reputation</subitemtitle>
+					<subitemtitle>Репутация</subitemtitle>
 					<subitemlang>mem_rep</subitemlang>
 					<subsection>reputation</subsection>
 					<subitemurl>do=overview</subitemurl>
@@ -44,10 +44,10 @@
 		</item>
 
 		<item>
-			<title>Member Management Tools</title>
+			<title>Инструменты Управления Пользователями</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Member Management Tools</subitemtitle>
+					<subitemtitle>Инструменты Управления Пользователями</subitemtitle>
 					<subitemlang>mem_tools</subitemlang>
 					<subsection>tools</subsection>
 					<subitemurl></subitemurl>
@@ -58,10 +58,10 @@
 		</item>
 	
 		<item>
-			<title>Add New Member</title>
+			<title>Добавить Пользователя</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Add New Member</subitemtitle>
+					<subitemtitle>Добавить Пользователя</subitemtitle>
 					<subitemlang>mem_add</subitemlang>
 					<subsection>members</subsection>
 					<subitemurl>do=add</subitemurl>
@@ -72,10 +72,10 @@
 		</item>
 		
 		<item>
-			<title>Ban Filters</title>
+			<title>Бан-Фильтры</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Ban Filters</subitemtitle>
+					<subitemtitle>Бан-Фильтры</subitemtitle>
 					<subitemlang>banfilters</subitemlang>
 					<subsection>banfilters</subsection>
 					<subitemurl></subitemurl>
@@ -86,10 +86,10 @@
 		</item>
 
 		<item>
-			<title>Notification Defaults</title>
+			<title>Настройки Уведомлений</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Notification Defaults</subitemtitle>
+					<subitemtitle>Настройки Уведомлений</subitemtitle>
 					<subitemlang>notifications</subitemlang>
 					<subsection>notifications</subsection>
 					<subitemurl></subitemurl>

upload/admin/applications/members/modules_admin/members/xml/permissions.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <permissions>
 	<group>
-		<grouptitle>Managing Members</grouptitle>
+		<grouptitle>Управление пользователями</grouptitle>
 		<grouplang>members_members</grouplang>
 		<items>
 			<item>
 				<key>member_add</key>
-				<string>Can add members?</string>
+				<string>Может добавлять?</string>
 			</item>
 			<item>
 				<key>member_add_admin</key>
-				<string>Can add ADMINS?</string>
+				<string>Может добавлять администраторов?</string>
 			</item>
 			<item>
 				<key>member_edit</key>
-				<string>Can edit members?</string>
+				<string>Может изменять?</string>
 			</item>
 			<item>
 				<key>member_edit_admin</key>
-				<string>Can edit ADMINS?</string>
+				<string>Может изменять администраторов?</string>
 			</item>
 			<item>
 				<key>member_delete</key>
-				<string>Can delete members?</string>
+				<string>Может удалять?</string>
 			</item>
 			<item>
 				<key>member_delete_admin</key>
-				<string>Can delete ADMINS?</string>
+				<string>Может удалять администраторов?</string>
 			</item>
 			<item>
 				<key>member_login</key>
@@ -34,141 +34,141 @@
 			</item>
 			<item>
 				<key>members_merge</key>
-				<string>Can merge two user accounts?</string>
+				<string>Может объединять?</string>
 			</item>
 			<item>
 				<key>member_suspend</key>
-				<string>Can suspend and unsuspend members?</string>
+				<string>Может блокировать?</string>
 			</item>
 			<item>
 				<key>member_suspend_admin</key>
-				<string>Can suspend and unsuspend ADMINS?</string>
+				<string>Может блокировать администраторов?</string>
 			</item>
 			<item>
 				<key>member_prune</key>
-				<string>Can prune members?</string>
+				<string>Может удалять?</string>
 			</item>
 			<item>
 				<key>member_prune_admin</key>
-				<string>Can prune ADMINS?</string>
+				<string>Может удалять администраторов?</string>
 			</item>
 			<item>
 				<key>member_move</key>
-				<string>Can bulk move members to other groups? (Does not apply to editing members where the group can still be changed)</string>
+				<string>Может переносить из группы в группу?</string>
 			</item>
 			<item>
 				<key>member_move_admin1</key>
-				<string>Can move ADMINS to other groups?</string>
+				<string>Может переносить администраторов в другие группы?</string>
 			</item>
 			<item>
 				<key>member_move_admin2</key>
-				<string>Can promote members to ADMIN?</string>
+				<string>Может переносить в группу администраторов?</string>
 			</item>
 			<item>
 				<key>member_ban</key>
-				<string>Can ban members?</string>
+				<string>Может банить?</string>
 			</item>
 			<item>
 				<key>member_ban_admin</key>
-				<string>Can ban ADMINS?</string>
+				<string>Может банить администраторов?</string>
 			</item>
 			<item>
 				<key>member_photo</key>
-				<string>Can upload new member photos?</string>
+				<string>Может изменять фотографии пользователям?</string>
 			</item>
 			<item>
 				<key>member_photo_admin</key>
-				<string>Can upload new photos for ADMINS?</string>
+				<string>Может изменять фотографии администраторам?</string>
 			</item>
 			<item>
 				<key>membertools_validating</key>
-				<string>Can manage validating members?</string>
+				<string>Может управлять ожидающими активации?</string>
 			</item>
 			<item>
 				<key>membertools_locked</key>
-				<string>Can manage locked members?</string>
+				<string>Может управлять заблокированными?</string>
 			</item>
 			<item>
 				<key>membertools_banned</key>
-				<string>Can manage banned members?</string>
+				<string>Может управлять забаненными?</string>
 			</item>
 			<item>
 				<key>membertools_spam</key>
-				<string>Can manage spam members?</string>
+				<string>Может управлять спам-пользователями?</string>
 			</item>
 			<item>
 				<key>membertools_incomplete</key>
-				<string>Can manage incomplete members?</string>
+				<string>Может управлять не завершившими регистрацию?</string>
 			</item>
 			<item>
 				<key>membertools_delete_pms</key>
-				<string>Can delete private messages?</string>
+				<string>Может удалять личные сообщения?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Member Tools</grouptitle>
+		<grouptitle>Инструменты</grouptitle>
 		<grouplang>members_tools</grouplang>
 		<items>
 			<item>
 				<key>membertools_ip</key>
-				<string>Can use the IP address tools?</string>
+				<string>Может использовать инструменты работы с IP-адресами?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Member Ranks</grouptitle>
+		<grouptitle>Звания</grouptitle>
 		<grouplang>members_ranks</grouplang>
 		<items>
 			<item>
 				<key>ranks_add</key>
-				<string>Can view and add new member ranks?</string>
+				<string>Может просматривать и добавлять?</string>
 			</item>
 			<item>
 				<key>ranks_edit</key>
-				<string>Can edit member ranks?</string>
+				<string>Может изменять?</string>
 			</item>
 			<item>
 				<key>ranks_delete</key>
-				<string>Can delete member ranks?</string>
+				<string>Может удалять?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Managing Ban Filters</grouptitle>
+		<grouptitle>Бан-фильтр</grouptitle>
 		<grouplang>members_banfilters</grouplang>
 		<items>
 			<item>
 				<key>ban_manage</key>
-				<string>Can manage ban filters?</string>
+				<string>Может управлять фильтром?</string>
 			</item>
 			<item>
 				<key>ban_remove</key>
-				<string>Can remove ban filters?</string>
+				<string>Может удалять правила?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Member Reputation</grouptitle>
+		<grouptitle>Репутация</grouptitle>
 		<grouplang>members_reputation</grouplang>
 		<items>
 			<item>
 				<key>reps_manage</key>
-				<string>Can manage reputation levels?</string>
+				<string>Может управлять?</string>
 			</item>
 			<item>
 				<key>reps_delete</key>
-				<string>Can delete reputation levels?</string>
+				<string>Может удалять уровни репутации?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Notification Defaults</grouptitle>
+		<grouptitle>Уведомления</grouptitle>
 		<grouplang>members_notifications</grouplang>
 		<items>
 			<item>
 				<key>configure_notifications</key>
-				<string>Configure notification defaults?</string>
+				<string>Может настраивать значения по-умолчанию для уведомлений?</string>
 			</item>
 		</items>
 	</group>

upload/admin/applications/members/modules_admin/restrictions/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 8655 $
  */
 

upload/admin/applications/members/modules_admin/restrictions/xml/menu.xml

@@ -2,10 +2,10 @@
 <menu>
 	<tabitems>
 		<item>
-			<title>Manage ACP Restrictions</title>
+			<title>Управление Ограничениями в АЦ</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Manage ACP Restrictions</subitemtitle>
+					<subitemtitle>Управление Ограничениями в АЦ</subitemtitle>
 					<subitemlang>restrictions</subitemlang>
 					<subsection>restrictions</subsection>
 					<subitemurl>do=overview</subitemurl>

upload/admin/applications/members/modules_admin/restrictions/xml/permissions.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <permissions>
 	<group>
-		<grouptitle>Manage ACP Restrictions</grouptitle>
+		<grouptitle>Управление ограничениями доступа</grouptitle>
 		<grouplang>members_restrictions</grouplang>
 		<items>
 			<item>
 				<key>restrictions_add_member</key>
-				<string>Can add member restrictions?</string>
+				<string>Может добавлять ограничения?</string>
 			</item>
 			<item>
 				<key>restrictions_edit_member</key>
-				<string>Can edit member restrictions?</string>
+				<string>Может изменять ограничения?</string>
 			</item>
 			<item>
 				<key>restrictions_delete_member</key>
-				<string>Can remove member restrictions?</string>
+				<string>Может удалять ограничения?</string>
 			</item>
 			<item>
 				<key>restrictions_add_group</key>
-				<string>Can add group restrictions?</string>
+				<string>Может добавлять ограничения для групп?</string>
 			</item>
 			<item>
 				<key>restrictions_edit_group</key>
-				<string>Can edit group restrictions?</string>
+				<string>Может изменять ограничения для групп?</string>
 			</item>
 			<item>
 				<key>restrictions_delete_group</key>
-				<string>Can remove group restrictions?</string>
+				<string>Может удалять ограничения для групп?</string>
 			</item>
 		</items>
 	</group>

upload/admin/applications/members/modules_admin/warnings/actions.php

@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Warning Actions
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-10-01 11:12:40 -0400 (Mon, 01 Oct 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $ (original: Mark)
+ * @author 		$Author: mark $ (original: Mark)
  * @copyright	© 2011 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: 10914 $
+ * @version		$Revision: 11396 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -192,14 +192,14 @@ class admin_members_warnings_actions extends ipsCommand
 			}
 			
 			$this->DB->update( 'members_warn_actions', $save, "wa_id={$id}" );
-			$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['warn_actions_edited'], $save['wa_name'] ) );
+			$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['warn_actions_edited'], $save['wa_points'] ) );
 		}
 		else
 		{
 			$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'actions_add' );
 			
 			$this->DB->insert( 'members_warn_actions', $save );
-			$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['warn_actions_created'], $save['wa_name'] ) );
+			$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['warn_actions_created'], $save['wa_points'] ) );
 		}
 				
 		//-----------------------------------------
@@ -231,7 +231,7 @@ class admin_members_warnings_actions extends ipsCommand
 		}
 		
 		$this->DB->delete( 'members_warn_actions', "wa_id={$id}" );
-		$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['warn_actions_deleted'], $current['wa_name'] ) );
+		$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['warn_actions_deleted'], $current['wa_points'] ) );
 		
 		$this->registry->output->redirect( "{$this->settings['base_url']}app=members&amp;module=warnings&amp;section=actions", $this->lang->words['warn_actions_del_saved'] );
 	}

upload/admin/applications/members/modules_admin/warnings/defaultSection.php

@@ -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: ips_terabyte $
  * @since		07th May 2012
- * $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
- * @version		v3.3.4
- * $Revision: 10914 $
+ * $LastChangedDate: 2012-05-07 11:22:43 -0400 (Mon, 07 May 2012) $
+ * @version		v3.4.5
+ * $Revision: 10695 $
  */
 
 $DEFAULT_SECTION = 'reasons';

upload/admin/applications/members/modules_admin/warnings/reasons.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Warning Reasons
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $ (original: Mark)
@@ -13,7 +13,7 @@
  * @package		IP.Board
  * @subpackage	Members
  * @link		http://www.invisionpower.com
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  */
 
 if ( ! defined( 'IN_ACP' ) )

upload/admin/applications/members/modules_admin/warnings/xml/menu.xml

@@ -2,10 +2,10 @@
 <menu>
 	<tabitems>
 		<item>
-			<title>Reasons</title>
+			<title>Причины</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Reasons</subitemtitle>
+					<subitemtitle>Причины</subitemtitle>
 					<subitemlang>warn_reasons</subitemlang>
 					<subsection>reasons</subsection>
 					<subitemurl></subitemurl>
@@ -15,10 +15,10 @@
 			</subitems>
 		</item>
 		<item>
-			<title>Actions</title>
+			<title>Действия</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Actions</subitemtitle>
+					<subitemtitle>Действия</subitemtitle>
 					<subitemlang>warn_actions</subitemlang>
 					<subsection>actions</subsection>
 					<subitemurl></subitemurl>

upload/admin/applications/members/modules_admin/warnings/xml/permissions.xml

@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <permissions>
 	<group>
-		<grouptitle>Reasons</grouptitle>
+		<grouptitle>Причины</grouptitle>
 		<grouplang>warn_reasons</grouplang>
 		<items>
 			<item>
 				<key>reasons_view</key>
-				<string>Can view warning reasons?</string>
+				<string>Может просматривать?</string>
 			</item>
 			<item>
 				<key>reasons_edit</key>
-				<string>Can edit warning reasons?</string>
+				<string>Может изменять?</string>
 			</item>
 			<item>
 				<key>reasons_add</key>
-				<string>Can add new warning reasons?</string>
+				<string>Может добавлять?</string>
 			</item>
 			<item>
 				<key>reasons_delete</key>
-				<string>Can delete warning reasons?</string>
+				<string>Может удалять?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Actions</grouptitle>
+		<grouptitle>Действия</grouptitle>
 		<grouplang>warn_actions</grouplang>
 		<items>
 			<item>
 				<key>actions_view</key>
-				<string>Can view warning actions?</string>
+				<string>Может просматривать?</string>
 			</item>
 			<item>
 				<key>actions_edit</key>
-				<string>Can edit warning actions?</string>
+				<string>Может изменять?</string>
 			</item>
 			<item>
 				<key>actions_add</key>
-				<string>Can add new warning actions?</string>
+				<string>Может добавлять?</string>
 			</item>
 			<item>
 				<key>actions_delete</key>
-				<string>Can delete warning actions?</string>
+				<string>Может удалять?</string>
 			</item>
 		</items>
 	</group>

upload/admin/applications/members/modules_public/ajax/card.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile AJAX hCard
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-30 13:28:08 -0400 (Wed, 30 May 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @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		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10824 $
  *
  */
 

upload/admin/applications/members/modules_public/ajax/dname.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile display name history
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  *
  */
 

upload/admin/applications/members/modules_public/ajax/dst.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Member AJAX DST switcher
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  *
  */
 

upload/admin/applications/members/modules_public/ajax/friends.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile AJAX Comment Handler
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  *
  */
 

upload/admin/applications/members/modules_public/ajax/ignore.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile AJAX Ignore User
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/modules_public/ajax/load.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile AJAX Tab Loader
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/modules_public/ajax/messenger.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile AJAX Ignored User methods
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2013-01-29 18:38:34 -0500 (Tue, 29 Jan 2013) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: AndyMillne $
  * @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: 10914 $
+ * @version		$Revision: 11914 $
  *
  */
 
@@ -124,13 +124,13 @@ class public_members_ajax_messenger extends ipsAjaxCommand
  		/* Alright. Fetch the last 10 */
  		//$this->messengerFunctions->addFolderFilter('myconvo');
  		
- 		$topics = $this->messengerFunctions->getPersonalTopicsList( $this->memberData['member_id'], 'myconvo', array( 'sort' => 'date', 'offsetStart' => 0, 'offsetEnd' => 10 ) );
+ 		$topics = $this->messengerFunctions->getPersonalTopicsList( $this->memberData['member_id'], 'all', array( 'sort' => 'date', 'offsetStart' => 0, 'offsetEnd' => 10 ) );
  		$topics = ( ! is_array( $topics ) ) ? array() : $topics;
  		
  		/* reset */
  		$this->messengerFunctions->resetMembersAlertCounts( $this->memberData );
  		
- 		$this->returnJsonArray( array( 'html' => $this->cleanOutput( $this->registry->output->getTemplate('global_other')->inboxList( $topics ) ) ) );
+ 		$this->returnJsonArray( array( 'html' => $this->registry->output->getTemplate('global_other')->inboxList( $topics ) ), true );
  	}
  	
 	/**
@@ -165,7 +165,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 		/* Attempt to fetch the conversation */
 		try
 		{
-			$conversationData = $this->messengerFunctions->fetchConversation( $topicID, $this->memberData['member_id'], array( 'offsetStart' => 0, 'offsetEnd' => 150 ) );
+			$conversationData = $this->messengerFunctions->fetchConversation( $topicID, $this->memberData['member_id'], array( 'offsetStart' => 0, 'offsetEnd' => 300 ) );
 			
 			$html = $this->registry->getClass('output')->getTemplate('messaging')->showConversationForArchive( $conversationData['topicData'], $conversationData['replyData'], $conversationData['memberData'] );
 			
@@ -353,7 +353,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 		
 		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_editors' ), 'core' );
 		
-		return $this->returnJsonArray( array( 'success' => $this->registry->getClass('output')->getTemplate('messaging')->PMQuickForm( $toMemberData ) ) );
+		return $this->returnHtml( $this->registry->getClass('output')->getTemplate('messaging')->PMQuickForm( $toMemberData ) );
 	}
 	
 	/**

upload/admin/applications/members/modules_public/ajax/photo.php

@@ -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: mmecham $
  * @since		7th Feb 2011
- * $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
- * @version		v3.3.4
- * $Revision: 10914 $
+ * $LastChangedDate: 2012-05-11 11:17:52 -0400 (Fri, 11 May 2012) $
+ * @version		v3.4.5
+ * $Revision: 10727 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/modules_public/ajax/rate.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile AJAX Tab Loader
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2013-03-19 10:12:37 -0400 (Tue, 19 Mar 2013) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @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		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 10914 $
+ * @version		$Revision: 12086 $
  *
  */
 
@@ -41,7 +41,7 @@ class public_members_ajax_rate extends ipsAjaxCommand
     	
 		$rating_id	= intval($this->request['rating']);
 		$rating_id	= $rating_id > 5 ? 5 : $rating_id;
-		$rating_id	= $rating_id < 0 ? 0 : $rating_id;
+		$rating_id	= $rating_id < 1 ? 1 : $rating_id;
 		$member_id	= intval($this->request['member_id']);
 		$member		= array();
 		$type		= 'new';

upload/admin/applications/members/modules_public/ajax/status.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Allow user to change their status
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-11-05 09:03:19 -0500 (Mon, 05 Nov 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: AndyMillne $
  * @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		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 10914 $
+ * @version		$Revision: 11554 $
  *
  */
 
@@ -122,7 +122,7 @@ class public_members_ajax_status extends ipsAjaxCommand
 		$statusData = $this->registry->getClass('memberStatus')->getStatusData();
 		
 		/* Fetch */
-		$this->returnJsonArray( array( 'status' => 'success', 'status_replies' => $statusData['status_replies'] + 1, 'html' => $this->cleanOutput( $this->registry->getClass('output')->getTemplate( $skin_group )->statusReplies( $this->registry->getClass('memberStatus')->fetchAllReplies() ) ) ) );
+		$this->returnJsonArray( array( 'status' => 'success', 'status_replies' => $statusData['status_replies'] + 1, 'html' => $this->registry->getClass('output')->getTemplate( $skin_group )->statusReplies( $this->registry->getClass('memberStatus')->fetchAllReplies() ) ), true );
 	}
 	
 	/**
@@ -311,7 +311,7 @@ class public_members_ajax_status extends ipsAjaxCommand
 		/* And the number of replies */
 		$statusData = $this->registry->getClass('memberStatus')->getStatusData();
 		
-		$this->returnJsonArray( array( 'status' => 'success', 'html' => $this->cleanOutput( $reply ), 'status_replies' => $statusData['status_replies'] + 1 ) );
+		$this->returnJsonArray( array( 'status' => 'success', 'html' => $reply, 'status_replies' => $statusData['status_replies'] + 1 ), true );
 	}
 	
 	/**
@@ -371,9 +371,25 @@ class public_members_ajax_status extends ipsAjaxCommand
 		/* Update */
 		$newStatus = $this->registry->getClass('memberStatus')->create();
 		
-		/* Now grab the reply and return it */
-		$new = $this->registry->getClass('output')->getTemplate( $skin_group )->statusUpdates( $this->registry->getClass('memberStatus')->fetch( $this->memberData['member_id'], array( 'relatedTo' => $forMemberId, 'isApproved' => true, 'sort_dir' => 'desc', 'limit' => 1 ) ), $smallSpace );
+		if ( ! $newStatus )
+		{
+			$this->returnJsonError( $this->lang->words['status_off'] );
+		}
 		
-		$this->returnJsonArray( array( 'status' => 'success', 'html' => $this->cleanOutput( $new ) ) );
+		/* Now grab the reply and return it */
+		$status = $this->registry->getClass('memberStatus')->fetch( $this->memberData['member_id'], array( 'relatedTo' => $forMemberId, 'sort_dir' => 'desc', 'limit' => 1 ) );
+		
+		$last = $status;
+		$last = array_pop( $last );
+		
+		if ( $last['status_approved'] )
+		{
+			$new = $this->registry->getClass('output')->getTemplate( $skin_group )->statusUpdates( $status, $smallSpace );
+			$this->returnJsonArray( array( 'status' => 'success', 'html' => $new ), true );
+		}
+		else
+		{
+			$this->returnJsonError( 'prof_comment_mod' );
+		}
 	}
 }

upload/admin/applications/members/modules_public/ajax/warnings.php

@@ -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: AndyMillne $ (Original: Mark)
+ * $Author: bfarber $ (Original: Mark)
  * @since		9 Nov 2011
- * $LastChangedDate: 2012-06-19 08:37:02 -0400 (Tue, 19 Jun 2012) $
- * @version		v3.3.4
- * $Revision: 10947 $
+ * $LastChangedDate: 2012-06-29 10:12:14 -0400 (Fri, 29 Jun 2012) $
+ * @version		v3.4.5
+ * $Revision: 11007 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/modules_public/list/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 8655 $
  */
 

upload/admin/applications/members/modules_public/messaging/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 8655 $
  */
 

upload/admin/applications/members/modules_public/messaging/markasread.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Mark a private message as read
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		Brandon Farber
@@ -15,7 +15,7 @@
  * @subpackage	Forums
  * @link		http://www.invisionpower.com
  * @since		Thurs 7th Jan 2010
- * @version		$Rev: 10914 $
+ * @version		$Rev: 10721 $
  *
  */
 

upload/admin/applications/members/modules_public/messaging/search.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Online list
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		12th March 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  *
  */
 

upload/admin/applications/members/modules_public/messaging/send.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Online list
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-12-13 08:29:08 -0500 (Thu, 13 Dec 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: AndyMillne $
  * @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		12th March 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 11713 $
  *
  */
 
@@ -95,12 +95,6 @@ class public_members_messaging_send extends ipsCommand
 			$this->registry->getClass('output')->showError( 'messenger_disabled', 10227, null, null, 404 );
 		}		
 		
-		//-----------------------------------------
-		// Reset Classes
-		//-----------------------------------------
-		
-		IPSText::resetTextClass('bbcode');
-		
 		//-----------------------------------------
 		// Load lang file
 		//-----------------------------------------
@@ -613,23 +607,12 @@ class public_members_messaging_send extends ipsCommand
 			{
 				if ( $type == 'reply' )
 				{
+					/* Load parser */
+					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
+					$parser = new $classToLoad();
+					
 					/* We're quoting a post... */
-					if ( $_editor->getRteEnabled() )
-					{
-						$displayData['message'] = "[quote name='".IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($msgData['members_display_name'])."' timestamp='" . $msgData['msg_date'] . "']<br />{$msgData['msg_post']}".'[/quote]'."<br />";
-					}
-					else
-					{
-						IPSText::getTextClass('bbcode')->parse_html		= 0;
-						IPSText::getTextClass('bbcode')->parse_nl2br	= 1;
-						IPSText::getTextClass('bbcode')->parse_smilies	= 1;
-						IPSText::getTextClass('bbcode')->parse_bbcode	= 1;
-						IPSText::getTextClass('bbcode')->parsing_section = 'pms';
-
-						$msgData['msg_post'] = IPSText::getTextClass('bbcode')->preEditParse( $msgData['msg_post'] );
-						
-						$displayData['message'] = "[quote name='".IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($msgData['members_display_name'])."' timestamp='" . $msgData['msg_date'] . "']\n{$msgData['msg_post']}".'[/quote]'."\n";
-					}
+					$displayData['message'] = $parser->buildQuoteTag( $msgData['msg_post'], $msgData['members_display_name'], $msgData['msg_date'], 0, 0 );
 				}
 				else if ( $type == 'edit' )
 				{
@@ -650,18 +633,18 @@ class public_members_messaging_send extends ipsCommand
 			/* Grab language for attachment previews */
 			$this->registry->getClass( 'class_localization')->loadLanguageFile( array( "public_topic" ), 'forums' );
 			
-    		IPSText::getTextClass('bbcode')->parse_html					= 0;
-			IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
-			IPSText::getTextClass('bbcode')->parse_smilies				= 1;
-			IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
-			IPSText::getTextClass('bbcode')->parsing_section			= 'pms';
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
-			
-			$this->settings['max_emos'] = 0;
+			/* Load parser */
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
+			$parser = new $classToLoad();
 			
+			$parser->set( array( 'memberData'     => $this->memberData,
+								 'parseBBCode'    => 1,
+								 'parseArea'	  => 'pms',
+								 'parseHtml'      => 0,
+								 'parseEmoticons' => 1 ) );
+		
 			$msg = $_editor->process( $_POST['Post-NS'] );
-			$msg = IPSText::getTextClass('bbcode')->preDisplayParse( IPSText::getTextClass('bbcode')->preDbParse( $msg ) );
+			$msg = $parser->display( $msg );
 			
 			if ( ! is_object( $this->class_attach ) )
 			{
@@ -820,27 +803,27 @@ class public_members_messaging_send extends ipsCommand
     	{
 			/* Grab language for attachment previews */
 			$this->registry->getClass( 'class_localization')->loadLanguageFile( array( "public_topic" ), 'forums' );
-	
-    		IPSText::getTextClass('bbcode')->parse_html					= 0;
-			IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
-			IPSText::getTextClass('bbcode')->parse_smilies				= 1;
-			IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
-			IPSText::getTextClass('bbcode')->parsing_section			= 'pms';
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
 			
-			$this->settings['max_emos'] = 0;
+			/* Load parser */
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
+			$parser = new $classToLoad();
 			
+			$parser->set( array( 'memberData'     => $this->memberData,
+								 'parseBBCode'    => 1,
+								 'parseArea'	  => 'pms',
+								 'parseHtml'      => 0,
+								 'parseEmoticons' => 1 ) );
+								 
 			if( $this->request['_from'] == 'quickPM' )
 			{
-				$old_msg	= $_POST['Post'];
+				$old_msg	= $_editor->process( $_editor->fromPlainTextArea( $_POST['Post'] ) );
 			}
 			else
 			{
 				$old_msg	= $_editor->process( $_POST['Post'] );
 			}
 			
-			$old_msg = IPSText::getTextClass('bbcode')->preDisplayParse( IPSText::getTextClass('bbcode')->preDbParse( $old_msg ) );
+			$old_msg = $parser->display( $old_msg );
 			
 			if ( ! is_object( $this->class_attach ) )
 			{
@@ -938,20 +921,17 @@ class public_members_messaging_send extends ipsCommand
 					$_msg_id                = $draftTopic['msg_id'];
 					$this->_postKey         = $draftTopic['msg_post_key'];
 					
-					IPSText::getTextClass('bbcode')->parse_html		= 0;
-					IPSText::getTextClass('bbcode')->parse_nl2br	= 1;
-					IPSText::getTextClass('bbcode')->parse_smilies	= 1;
-					IPSText::getTextClass('bbcode')->parse_bbcode	= 1;
-					IPSText::getTextClass('bbcode')->parsing_section = 'pms';
+					/* Load parser */
+					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/text/parser.php', 'classes_text_parser' );
+					$parser = new $classToLoad();
 					
-					if ( $_editor->getRteEnabled() )
-					{
-						$displayData['message'] = IPSText::getTextClass('bbcode')->convertForRTE( $draftTopic['msg_post'] );	
-					}
-					else
-					{
-						$displayData['message'] = IPSText::getTextClass('bbcode')->preEditParse( $draftTopic['msg_post'] );
-					} 
+					$parser->set( array( 'memberData'     => $this->memberData,
+										 'parseBBCode'    => 1,
+										 'parseArea'	  => 'pms',
+										 'parseHtml'      => 0,
+										 'parseEmoticons' => 1 ) );
+								 
+					$displayData['message'] = $draftTopic['msg_post'];	
 	 			}
 	 		}
  		}

upload/admin/applications/members/modules_public/online/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 8655 $
  */
 

upload/admin/applications/members/modules_public/online/online.php

@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Online list
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -14,7 +14,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		12th March 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  */
 
 if ( ! defined( 'IN_IPB' ) )

upload/admin/applications/members/modules_public/profile/defaultSection.php

@@ -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.3.4
+ * @version		v3.4.5
  * $Revision: 8655 $
  */
 

upload/admin/applications/members/modules_public/profile/dname.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile View
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		20th February 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  *
  */
 

upload/admin/applications/members/modules_public/profile/friends.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile View
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		20th February 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  *
  */
 

upload/admin/applications/members/modules_public/profile/ignore.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Ignore a user
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Members
  * @link		http://www.invisionpower.com
  * @since		20th February 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10721 $
  *
  */
 

upload/admin/applications/members/modules_public/profile/photo.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Profile Photo
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-06-06 06:31:40 -0400 (Wed, 06 Jun 2012) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: AndyMillne $
  * @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		20th February 2002
- * @version		$Revision: 10914 $
+ * @version		$Revision: 10874 $
  *
  */
 

upload/admin/applications/members/modules_public/profile/status.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Allow user to change their status
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2013-05-02 11:20:01 -0400 (Thu, 02 May 2013) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: AndyMillne $
  * @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		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 10914 $
+ * @version		$Revision: 12213 $
  *
  */
 
@@ -84,6 +84,52 @@ class public_members_profile_status extends ipsCommand
 			case 'unlockStatus':
 				$this->_unlockStatus();
 			break;
+			case 'approveStatus':
+				$this->_approveStatus();
+				break;			
+		}
+	}
+	
+	/**
+	 * Approve a status
+	 *
+	 */
+	protected function _approveStatus()
+	{
+		/* INIT */
+		$status_id = intval( $this->request['status_id'] );
+	
+		/* Quick check? */
+		if ( ! $status_id )
+		{
+			$this->registry->output->showError( 'status_off', 10282, null, null, 404 );
+		}
+	
+		/* Set Author */
+		$this->registry->getClass('memberStatus')->setAuthor( $this->memberData );
+	
+		/* Set Data */
+		$this->registry->getClass('memberStatus')->setStatusData( $status_id );
+		
+		$status = $this->registry->getClass('memberStatus')->fetch();
+	
+		/* Can we approve? */
+		if ( ! $this->registry->getClass('memberStatus')->canApproveStatus() )
+		{
+			$this->registry->output->showError( 'status_off', 10283, null, null, 403 );
+		}
+	
+		/* Update */
+		$this->registry->getClass('memberStatus')->approveStatus();
+	
+		/* Got a return URL? */
+		if ( $this->request['rurl'] )
+		{
+			$this->registry->output->redirectScreen( $this->lang->words['status_approved'], base64_decode( $this->request['rurl'] ) );
+		}
+		else
+		{
+			$this->registry->output->redirectScreen( $this->lang->words['status_approved'], $this->settings['base_url'] . 'showuser=' . $status[$status_id]['status_member_id'], $this->memberData['members_seo_name'] . '&tab=status' );
 		}
 	}
 	
@@ -170,25 +216,30 @@ class public_members_profile_status extends ipsCommand
 	}
 	
 	/**
-	* Delete a status reply
+	* Show status updates list
 	*
 	*/
 	protected function _list()
 	{
+		if ( ! $this->settings['su_enabled'] )
+		{
+			$this->registry->output->showError( 'su_disabled', 1028277, null, null, 404 );
+		}
+		
 		/* INIT */
 		$filters = array( 'offset' => intval( $this->request['st'] ), 'limit' => 15, 'getCount' => true );
 		
 		/* Add to the filters */
-		if ( $this->request['member_id'] )
-		{
-			$filters['relatedTo']  = intval( $this->request['member_id'] );
-			$filters['isApproved'] = true;
-		}
-		else if ( $this->request['status_id'] )
+		if ( $this->request['status_id'] )
 		{
 			$filters['status_id'] = intval( $this->request['status_id'] );
 			$filters['type']      = 'all';
 		}
+		else if ( $this->request['member_id'] )
+		{
+			$filters['relatedTo']  = intval( $this->request['member_id'] );
+			$filters['isApproved'] = true;
+		}
 		else if ( $this->request['type'] == 'friends' )
 		{
 			$filters['friends_only'] = 1;
@@ -202,6 +253,17 @@ class public_members_profile_status extends ipsCommand
 		$statuses = $this->registry->getClass('memberStatus')->fetch( $this->memberData, $filters );
 		$count    = $this->registry->getClass('memberStatus')->getStatusCount();
 		
+		/* Add canonical */
+		if ( count( $statuses ) && $this->request['status_id'] )
+		{
+			$tmp   = $statuses;
+			$pop   = array_pop( $tmp );
+			
+			$this->registry->output->addCanonicalTag( 'app=members&amp;module=profile&amp;section=status&amp;type=single', array( $pop['member_id'], $pop['members_seo_name'] ), 'members_status_single' );
+
+			$this->registry->getClass('output')->checkPermalink( array( $pop['member_id'], $pop['members_seo_name'] ) );
+		}
+
 		$pages    = $this->registry->getClass('output')->generatePagination( array( 'totalItems' 			=> $count,
 																					'itemsPerPage'			=> 15,
 																					'currentStartValue'   	=> $this->request['st'],