Version 4.1.19

applications/core/modules/admin/members/groups.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Groups
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @since		25 Mar 2013
  * @version		SVN_VERSION_NUMBER
  */
@@ -50,6 +50,7 @@ class _groups extends \IPS\Dispatcher\Controller
 		$table = new \IPS\Helpers\Table\Db( 'core_groups', \IPS\Http\Url::internal( 'app=core&module=members&controller=groups' ) );
 		
 		$table->include = array( 'word_custom', 'members' );
+		$table->noSort = array( 'members' );
 		$table->langPrefix = 'acpgroups_';
 		
 		$table->joins = array(
@@ -68,9 +69,8 @@ class _groups extends \IPS\Dispatcher\Controller
 					$onlineGuests = \IPS\Db::i()->select( 'COUNT(*)', 'core_sessions', array( 'login_type=? AND running_time>?', \IPS\Session\Front::LOGIN_TYPE_GUEST, \IPS\DateTime::create()->sub( new \DateInterval( 'PT30M' ) )->getTimeStamp() ) )->first();
 					return \IPS\Member::loggedIn()->language()->addToStack( 'online_guests', FALSE, array( 'pluralize' => array( $onlineGuests ) ) );
 				}
-				
-				$count = \IPS\Db::i()->select( 'COUNT(*)',  'core_members', array( 'member_group_id=? OR FIND_IN_SET( ?, mgroup_others )', $row['g_id'], $row['g_id'] ) )->first();
-				return "<!--{$count}--><a href='" . \IPS\Http\Url::internal( 'app=core&module=members&controller=members&advanced_search_submitted=1&csrfKey=' . \IPS\Session::i()->csrfKey . '&members_member_group_id=' . $row['g_id'] ) . "'>{$count}</a>";
+
+				return \IPS\Theme::i()->getTemplate( 'members' )->memberCounts( $row );
 			}
 		);
 		
@@ -123,6 +123,15 @@ class _groups extends \IPS\Dispatcher\Controller
 				);
 			}
 			
+			if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'members', 'member_export' ) )
+			{
+				$return['download'] = array(
+					'icon'		=> 'cloud-download',
+					'title'		=> 'members_export',
+					'link'		=> \IPS\Http\Url::internal( 'app=core&module=members&controller=members&do=export&_new=1&group=' ) . $row['g_id'],
+				);
+			}
+			
 			if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'members', 'groups_delete' ) AND !in_array( $row['g_id'], array( \IPS\Settings::i()->guest_group, \IPS\Settings::i()->member_group, \IPS\Settings::i()->admin_group ) ) )
 			{
 				$return['delete'] = array(
@@ -140,6 +149,17 @@ class _groups extends \IPS\Dispatcher\Controller
 		\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('groups');
 		\IPS\Output::i()->output .= \IPS\Theme::i()->getTemplate( 'global' )->block( 'groups', (string) $table );
 	}
+
+	/**
+	 * Fetch the number of members in this group
+	 *
+	 * @note	Fetched via AJAX after the page is loaded as this can be intensive with lots of groups and lots of members
+	 * @return	void
+	 */
+	public function getCount()
+	{
+		\IPS\Output::i()->sendOutput( \IPS\Member\Group::load( \IPS\Request::i()->group )->getCount(), 200, 'text/html' );
+	}
 	
 	/**
 	 * Add/Edit Group
@@ -239,7 +259,7 @@ class _groups extends \IPS\Dispatcher\Controller
 
 				/* Start a new section */
 				$form->addTab( '__app_' . $class::$permApp );
-				$matrix	= new \IPS\Helpers\Form\Matrix;
+				$matrix	= new \IPS\Helpers\Form\Matrix( $class );
 				$matrix->classes = array( 'cGroupPermissions' );
 				$matrix->showTooltips = TRUE;
 
@@ -268,7 +288,7 @@ class _groups extends \IPS\Dispatcher\Controller
 						foreach( $current[ $class::$permApp ][ $class::$permType ] AS $x => $y )
 						{
 							$matrix->checkAlls[ $class::$permissionLangPrefix . 'perm__' . $k ] = TRUE;
-							if ( mb_stripos( $y["perm_{$v}"], $group->g_id ) === FALSE AND $y["perm_{$v}"] !== '*' )
+							if ( $y["perm_{$v}"] !== '*' AND !in_array( $group->g_id, explode( ',', $y["perm_{$v}"] ) ) )
 							{
 								$matrix->checkAlls[ $class::$permissionLangPrefix . 'perm__' . $k ] = FALSE;
 								break;
@@ -304,6 +324,8 @@ class _groups extends \IPS\Dispatcher\Controller
 					$class::load( $permTypeId )->changePermissions( $group, $perms );
 				}
 			}
+			/* Log */
+			\IPS\Session::i()->log( 'permissions_adjusted_node', array( "core_group_". $group->g_id => TRUE ) );
 
 			/* Redirect */
 			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=members&controller=groups' ), 'saved' );
@@ -351,6 +373,9 @@ class _groups extends \IPS\Dispatcher\Controller
 	public function delete()
 	{
 		\IPS\Dispatcher::i()->checkAcpPermission( 'groups_delete' );
+
+		/* Make sure the user confirmed the deletion */
+		\IPS\Request::i()->confirmedDelete();
 		
 		/* Load group */
 		try
@@ -362,6 +387,7 @@ class _groups extends \IPS\Dispatcher\Controller
 			{
 				$form = new \IPS\Helpers\Form( 'form', 'delete' );
 				$form->add( new \IPS\Helpers\Form\Select( 'delete_group_move_to', NULL, TRUE, array( 'options' => \IPS\Member\Group::groups( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'members', 'member_move_admin2' ), FALSE ), 'parse' => 'normal' ) ) );
+				$form->hiddenValues['wasConfirmed']	= 1;
 				if ( $values = $form->values() )
 				{
 					\IPS\Db::i()->update( 'core_members', array( 'member_group_id' => $values['delete_group_move_to'] ), array( 'member_group_id=?', $group->g_id ) );