Added Extended Leaders Block

root/language/en/mods/portal/portal_leaders_module.php

@@ -35,6 +35,12 @@ $lang = array_merge($lang, array(
 	'NO_MODERATORS_P'		=> 'No Moderators',
 	'NO_GROUPS_P'			=> 'No Groups',
 	'ACP_PORTAL_LEADERS'	=> 'The Team',
+	
+	// ACP
+	'ACP_PORTAL_LEADERS'		=> 'Team Settings',
+	'ACP_PORTAL_LEADERS_EXP'	=> 'This is where you customize the team block',
+	'PORTAL_LEADERS_EXT'		=> 'Extended Leaders / Team',
+	'PORTAL_LEADERS_EXT_EXP'	=> 'The standard block lists all admins/mods, while the extended block includes all non-hidden groups with a legend.',
 ));
 
 ?>

root/portal/modules/portal_leaders.php

@@ -1,6 +1,6 @@
 <?php
 /**
-* @package Portal - User Menu
+* @package Portal - Leaders
 * @version $Id$
 * @copyright (c) 2009, 2010 Board3 Portal Team
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -15,7 +15,7 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* @package Modulname
+* @package Leaders
 */
 class portal_leaders_module
 {
@@ -46,144 +46,226 @@ class portal_leaders_module
 	*/
 	var $language = 'portal_leaders_module';
 
-	function get_template_center($module_id)
-	{
-		global $config, $template;
-
-		$template->assign_vars(array(
-			'EXAMPLE'			=> $config['portal_configname'],
-		));
-
-		return 'modulename_center.html';
-	}
-
 	function get_template_side($module_id)
 	{
-		global $config, $template, $user, $auth, $db, $phpEx;
+		global $config, $template, $user, $auth, $db, $phpEx, $phpbb_root_path;
 		
-		$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
-
 		// Display a listing of board admins, moderators
 		$user->add_lang('groups');
 
-		$user_ary = $auth->acl_get_list(false, array('a_', 'm_'), false);
+		if($config['board3_leaders_ext'])
-
-		$admin_id_ary = $mod_id_ary = $forum_id_ary = array();
-		foreach ($user_ary as $forum_id => $forum_ary)
 		{
-			foreach ($forum_ary as $auth_option => $id_ary)
+			$legends = array();
+			$groups = array();
+
+			if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
 			{
-				if (!$forum_id && $auth_option == 'a_')
+				$sql = 'SELECT group_id, group_name, group_colour, group_type
-				{
+					FROM ' . GROUPS_TABLE . '
-					$admin_id_ary = array_merge($admin_id_ary, $id_ary);
+					WHERE group_legend = 1
-					continue;
+					ORDER BY group_name ASC';
-				}
-				else
-				{
-					$mod_id_ary = array_merge($mod_id_ary, $id_ary);
-				}
-
-				if ($forum_id)
-				{
-					foreach ($id_ary as $id)
-					{
-						$forum_id_ary[$id][] = $forum_id;
-					}
-				}
-			}
-		}
-
-		$admin_id_ary = array_unique($admin_id_ary);
-		$mod_id_ary = array_unique($mod_id_ary);
-
-		// Admin group id...
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = 'ADMINISTRATORS'";
-		$result = $db->sql_query($sql);
-		$admin_group_id = (int) $db->sql_fetchfield('group_id');
-		$db->sql_freeresult($result);
-
-		$sql = 'SELECT forum_id, forum_name 
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_type = ' . FORUM_POST;
-		$result = $db->sql_query($sql);
-
-		$forums = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$forums[$row['forum_id']] = $row['forum_name'];
-		}
-		$db->sql_freeresult($result);
-
-		$sql = $db->sql_build_query('SELECT', array(
-			'SELECT'	=> 'u.user_id, u.group_id as default_group, u.username, u.user_colour, u.user_allow_pm, g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id',
-			'FROM'		=> array(
-				USERS_TABLE		=> 'u',
-				GROUPS_TABLE	=> 'g'
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(USER_GROUP_TABLE => 'ug'),
-					'ON'	=> 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . $user->data['user_id']
-				)),
-			'WHERE'		=> $db->sql_in_set('u.user_id', array_unique(array_merge($admin_id_ary, $mod_id_ary))) . '
-				AND u.group_id = g.group_id',
-			'ORDER_BY'	=> 'g.group_name ASC, u.username_clean ASC'
-		));
-
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$which_row = (in_array($row['user_id'], $admin_id_ary)) ? 'admin' : 'mod';
-
-			// We sort out admins not having the admin group as default
-			// The drawback is that only those admins are displayed which are within
-			// the special group 'Administrators' and also having it assigned as their default group.
-			// - might change
-			if ($which_row == 'admin' && $row['default_group'] != $admin_group_id)
-			{
-				// Remove from admin_id_ary, because the user may be a mod instead
-				unset($admin_id_ary[array_search($row['user_id'], $admin_id_ary)]);
-
-				if (!in_array($row['user_id'], $mod_id_ary))
-				{
-					continue;
-				}
-				else
-				{
-					$which_row = 'mod';
-				}
-			}
-
-			if ($row['group_type'] == GROUP_HIDDEN && !$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $user->data['user_id'])
-			{
-				$group_name = $user->lang['GROUP_UNDISCLOSED'];
-				$u_group = '';
 			}
 			else
 			{
-				$group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
+				$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type
-				$u_group = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id']);
+					FROM ' . GROUPS_TABLE . ' g
+					LEFT JOIN ' . USER_GROUP_TABLE . ' ug
+						ON (
+							g.group_id = ug.group_id
+							AND ug.user_id = ' . $user->data['user_id'] . '
+							AND ug.user_pending = 0
+						)
+					WHERE g.group_legend = 1
+						AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')
+					ORDER BY g.group_name ASC';
+			}
+			$result = $db->sql_query($sql);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$groups[$row['group_id']] = array(
+					'group_name'	=> $row['group_name'],
+					'group_colour'	=> $row['group_colour'],
+					'group_type'	=> $row['group_type'],
+					'group_users'	=> array(),
+				);
+				$legends[] = $row['group_id'];
+			}
+			$db->sql_freeresult($result);
+
+			if(sizeof($legends))
+			{
+				$sql = 'SELECT
+							u.user_id AS user_id, u.username AS username, u.user_colour AS user_colour, ug.group_id AS group_id
+						FROM
+							' . USERS_TABLE . ' AS u,
+							' . USER_GROUP_TABLE . ' AS ug
+						WHERE
+							ug.user_id = u.user_id
+							AND '. $db->sql_in_set('ug.group_id', $legends) . '
+						ORDER BY u.username ASC';
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$groups[$row['group_id']]['group_users'][] = array(
+						'user_id'		=> $row['user_id'],
+						'username'		=> $row['username'],
+						'user_colour'	=> $row['user_colour'],
+					);
+				}
+				$db->sql_freeresult($result);
 			}
 
-			$template->assign_block_vars($which_row, array(
+			if(sizeof($groups))
-				'USER_ID'			=> $row['user_id'],
+			{
-				'GROUP_NAME'		=> $group_name,
+				foreach($groups as $group_id => $group)
-				'GROUP_COLOR'		=> $row['group_colour'],
+				{
+					if(sizeof($group['group_users']))
+					{
+						$group_name = ($group['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group['group_name']] : $group['group_name'];
+						$u_group = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $group_id);
 
-				'U_GROUP'			=> $u_group,
+						$template->assign_block_vars('group', array(
+							'GROUP_NAME'	=> $group_name,
+							'GROUP_COLOUR'	=> $group['group_colour'],
+							'U_GROUP'		=> $u_group,
+						));
 
-				'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
+						foreach($group['group_users'] as $group_user)
-				'USERNAME'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
+						{
-				'USER_COLOR'		=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
+							$template->assign_block_vars('group.member', array(
-				'U_VIEW_PROFILE'	=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
+								'USER_ID'			=> $group_user['user_id'],
-			));
+								'USERNAME_FULL'		=> get_username_string('full', $group_user['user_id'], $group_user['username'], $group_user['user_colour']),
+							));
+						}
+					}
+				}
+			}
+			return 'leaders_ext_side.html';
 		}
-		$db->sql_freeresult($result);
+		else
+		{
+			
 
-		return 'leaders_side.html';
+			$user_ary = $auth->acl_get_list(false, array('a_', 'm_'), false);
+
+			$admin_id_ary = $mod_id_ary = $forum_id_ary = array();
+			foreach ($user_ary as $forum_id => $forum_ary)
+			{
+				foreach ($forum_ary as $auth_option => $id_ary)
+				{
+					if (!$forum_id && $auth_option == 'a_')
+					{
+						$admin_id_ary = array_merge($admin_id_ary, $id_ary);
+						continue;
+					}
+					else
+					{
+						$mod_id_ary = array_merge($mod_id_ary, $id_ary);
+					}
+
+					if ($forum_id)
+					{
+						foreach ($id_ary as $id)
+						{
+							$forum_id_ary[$id][] = $forum_id;
+						}
+					}
+				}
+			}
+
+			$admin_id_ary = array_unique($admin_id_ary);
+			$mod_id_ary = array_unique($mod_id_ary);
+
+			// Admin group id...
+			$sql = 'SELECT group_id
+				FROM ' . GROUPS_TABLE . "
+				WHERE group_name = 'ADMINISTRATORS'";
+			$result = $db->sql_query($sql);
+			$admin_group_id = (int) $db->sql_fetchfield('group_id');
+			$db->sql_freeresult($result);
+
+			$sql = 'SELECT forum_id, forum_name 
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type = ' . FORUM_POST;
+			$result = $db->sql_query($sql);
+
+			$forums = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$forums[$row['forum_id']] = $row['forum_name'];
+			}
+			$db->sql_freeresult($result);
+
+			$sql = $db->sql_build_query('SELECT', array(
+				'SELECT'	=> 'u.user_id, u.group_id as default_group, u.username, u.user_colour, u.user_allow_pm, g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id',
+				'FROM'		=> array(
+					USERS_TABLE		=> 'u',
+					GROUPS_TABLE	=> 'g'
+				),
+				'LEFT_JOIN'	=> array(
+					array(
+						'FROM'	=> array(USER_GROUP_TABLE => 'ug'),
+						'ON'	=> 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . $user->data['user_id']
+					)),
+				'WHERE'		=> $db->sql_in_set('u.user_id', array_unique(array_merge($admin_id_ary, $mod_id_ary))) . '
+					AND u.group_id = g.group_id',
+				'ORDER_BY'	=> 'g.group_name ASC, u.username_clean ASC'
+			));
+
+			$result = $db->sql_query($sql);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$which_row = (in_array($row['user_id'], $admin_id_ary)) ? 'admin' : 'mod';
+
+				// We sort out admins not having the admin group as default
+				// The drawback is that only those admins are displayed which are within
+				// the special group 'Administrators' and also having it assigned as their default group.
+				// - might change
+				if ($which_row == 'admin' && $row['default_group'] != $admin_group_id)
+				{
+					// Remove from admin_id_ary, because the user may be a mod instead
+					unset($admin_id_ary[array_search($row['user_id'], $admin_id_ary)]);
+
+					if (!in_array($row['user_id'], $mod_id_ary))
+					{
+						continue;
+					}
+					else
+					{
+						$which_row = 'mod';
+					}
+				}
+
+				if ($row['group_type'] == GROUP_HIDDEN && !$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $user->data['user_id'])
+				{
+					$group_name = $user->lang['GROUP_UNDISCLOSED'];
+					$u_group = '';
+				}
+				else
+				{
+					$group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
+					$u_group = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id']);
+				}
+
+				$template->assign_block_vars($which_row, array(
+					'USER_ID'			=> $row['user_id'],
+					'GROUP_NAME'		=> $group_name,
+					'GROUP_COLOR'		=> $row['group_colour'],
+
+					'U_GROUP'			=> $u_group,
+
+					'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
+					'USERNAME'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
+					'USER_COLOR'		=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
+					'U_VIEW_PROFILE'	=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
+				));
+			}
+			$db->sql_freeresult($result);
+			return 'leaders_side.html';
+		}
 	}
 
 	function get_template_acp($module_id)
@@ -191,9 +273,8 @@ class portal_leaders_module
 		return array(
 			'title'	=> 'ACP_PORTAL_LEADERS',
 			'vars'	=> array(
-				/*'legend1'				=> 'ACP_MODULENAME_CONFIGLEGEND',
+				'legend1'				=> 'ACP_PORTAL_LEADERS',
-				'portal_configname'		=> array('lang' => 'MODULENAME_CONFIGNAME',		'validate' => 'string',	'type' => 'text:10:200',	'explain' => false),
+				'board3_leaders_ext'	=> array('lang' => 'PORTAL_LEADERS_EXT',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-				'portal_configname2'	=> array('lang' => 'MODULENAME_CONFIGNAME2',	'validate' => 'int',	'type' => 'text:3:3',		'explain' => true),*/
 			),
 		);
 	}
@@ -203,7 +284,8 @@ class portal_leaders_module
 	*/
 	function install($module_id)
 	{
-		// nothing
+		// Show normal team block by default
+		set_config('board3_leaders_ext', 0);
 		return true;
 	}
 
@@ -211,8 +293,11 @@ class portal_leaders_module
 	{
 		global $db;
 
-		// nothing
+		$del_config = array(
-		
+			'board3_leaders_ext',
+		);
+		$sql = 'DELETE FROM ' . CONFIG_TABLE . '
+			WHERE ' . $db->sql_in_set('config_name', $del_config);
 		return $db->sql_query($sql);
 	}
 }

root/styles/prosilver/template/portal/modules/leaders_ext_side.html

@@ -0,0 +1,12 @@
+<!--version $Id$ //-->
+{$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{T_THEME_PATH}/images/portal/portal_team.png" width="16" height="16" alt="" />&nbsp;<!-- ENDIF -->{L_THE_TEAM}{$LR_BLOCK_H_R}
+	<!-- BEGIN group -->
+		<strong><a href="{group.U_GROUP}" style="color: #{group.GROUP_COLOUR};" class="username-coloured">{group.GROUP_NAME}</a></strong><br />
+	<!-- BEGIN member -->
+		<span style="float:left;"><img src="{T_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:left; padding-left:5px; padding-top:2px;"><strong>{group.member.USERNAME_FULL}</strong></span><br style="clear:both" />
+	<!-- END member -->
+	<br style="clear:both" />
+	<!-- BEGINELSE -->
+		{L_NO_GROUPS_P}
+	<!-- END group -->
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}