! 4677: Text string "stars" and image name (star*.gif) needs change. So much ugliness to keep the code consistent with the name change ... stars is now icons, everywhere I hope.

Signed-off-by: Spuds <[email protected]>

Sources/Groups.php

@@ -72,7 +72,7 @@ function GroupList()
 	// Yep, find the groups...
 	$request = $smcFunc['db_query']('', '
 		SELECT mg.id_group, mg.group_name, mg.description, mg.group_type, mg.online_color, mg.hidden,
-			mg.stars, IFNULL(gm.id_member, 0) AS can_moderate
+			mg.icons, IFNULL(gm.id_member, 0) AS can_moderate
 		FROM {db_prefix}membergroups AS mg
 			LEFT JOIN {db_prefix}group_moderators AS gm ON (gm.id_group = mg.id_group AND gm.id_member = {int:current_member})
 		WHERE mg.min_posts = {int:min_posts}
@@ -96,7 +96,7 @@ function GroupList()
 		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
 			continue;
 
-		$row['stars'] = explode('#', $row['stars']);
+		$row['icons'] = explode('#', $row['icons']);
 
 		$context['groups'][$row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -105,7 +105,7 @@ function GroupList()
 			'color' => $row['online_color'],
 			'type' => $row['group_type'],
 			'num_members' => 0,
-			'stars' => !empty($row['stars'][0]) && !empty($row['stars'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $row['stars'][1] . '" alt="*" />', $row['stars'][0]) : '',
+			'icons' => !empty($row['icons'][0]) && !empty($row['icons'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $row['icons'][1] . '" alt="*" />', $row['icons'][0]) : '',
 		);
 
 		$context['can_moderate'] |= $row['can_moderate'];
@@ -183,12 +183,12 @@ function GroupList()
 					'style' => 'width: 50%;',
 				),
 			),
-			'stars' => array(
+			'icons' => array(
 				'header' => array(
-					'value' => $txt['membergroups_stars'],
+					'value' => $txt['membergroups_icons'],
 				),
 				'data' => array(
-					'db' => 'stars',
+					'db' => 'icons',
 				),
 			),
 			'moderators' => array(
@@ -235,7 +235,7 @@ function list_getGroups($start, $items_per_page, $sort)
 	// Yep, find the groups...
 	$request = $smcFunc['db_query']('', '
 		SELECT mg.id_group, mg.group_name, mg.description, mg.group_type, mg.online_color, mg.hidden,
-			mg.stars, IFNULL(gm.id_member, 0) AS can_moderate
+			mg.icons, IFNULL(gm.id_member, 0) AS can_moderate
 		FROM {db_prefix}membergroups AS mg
 			LEFT JOIN {db_prefix}group_moderators AS gm ON (gm.id_group = mg.id_group AND gm.id_member = {int:current_member})
 		WHERE mg.min_posts = {int:min_posts}
@@ -259,7 +259,7 @@ function list_getGroups($start, $items_per_page, $sort)
 		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
 			continue;
 
-		$row['stars'] = explode('#', $row['stars']);
+		$row['icons'] = explode('#', $row['icons']);
 
 		$groups[$row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -269,7 +269,7 @@ function list_getGroups($start, $items_per_page, $sort)
 			'type' => $row['group_type'],
 			'num_members' => 0,
 			'moderators' => array(),
-			'stars' => !empty($row['stars'][0]) && !empty($row['stars'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $row['stars'][1] . '" alt="*" />', $row['stars'][0]) : '',
+			'icons' => !empty($row['icons'][0]) && !empty($row['icons'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $row['icons'][1] . '" alt="*" />', $row['icons'][0]) : '',
 		);
 
 		$context['can_moderate'] |= $row['can_moderate'];
@@ -387,7 +387,7 @@ function MembergroupMembers()
 	// Load up the group details.
 	$request = $smcFunc['db_query']('', '
 		SELECT id_group AS id, group_name AS name, CASE WHEN min_posts = {int:min_posts} THEN 1 ELSE 0 END AS assignable, hidden, online_color,
-			stars, description, CASE WHEN min_posts != {int:min_posts} THEN 1 ELSE 0 END AS is_post_group, group_type
+			icons, description, CASE WHEN min_posts != {int:min_posts} THEN 1 ELSE 0 END AS is_post_group, group_type
 		FROM {db_prefix}membergroups
 		WHERE id_group = {int:id_group}
 		LIMIT 1',
@@ -402,9 +402,9 @@ function MembergroupMembers()
 	$context['group'] = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	// Fix the stars.
-	$context['group']['stars'] = explode('#', $context['group']['stars']);
-	$context['group']['stars'] = !empty($context['group']['stars'][0]) && !empty($context['group']['stars'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $context['group']['stars'][1] . '" alt="*" />', $context['group']['stars'][0]) : '';
+	// Fix the membergroup icons.
+	$context['group']['icons'] = explode('#', $context['group']['icons']);
+	$context['group']['icons'] = !empty($context['group']['icons'][0]) && !empty($context['group']['icons'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $context['group']['icons'][1] . '" alt="*" />', $context['group']['icons'][0]) : '';
 	$context['group']['can_moderate'] = allowedTo('manage_membergroups') && (allowedTo('admin_forum') || $context['group']['group_type'] != 1);
 
 	$context['linktree'][] = array(

Sources/Load.php

@@ -900,7 +900,7 @@ function loadMemberData($users, $is_name = false, $set = 'normal')
 			mem.karma_good, mem.id_post_group, mem.karma_bad, mem.lngfile, mem.id_group, mem.time_offset, mem.show_online,
 			mem.buddy_list, mg.online_color AS member_group_color, IFNULL(mg.group_name, {string:blank_string}) AS member_group,
 			pg.online_color AS post_group_color, IFNULL(pg.group_name, {string:blank_string}) AS post_group, mem.is_activated, mem.warning,
-			CASE WHEN mem.id_group = 0 OR mg.stars = {string:blank_string} THEN pg.stars ELSE mg.stars END AS stars' . (!empty($modSettings['titlesEnable']) ? ',
+			CASE WHEN mem.id_group = 0 OR mg.icons = {string:blank_string} THEN pg.icons ELSE mg.icons END AS icons' . (!empty($modSettings['titlesEnable']) ? ',
 			mem.usertitle' : '');
 		$select_tables = '
 			LEFT JOIN {db_prefix}log_online AS lo ON (lo.id_member = mem.id_member)
@@ -921,7 +921,7 @@ function loadMemberData($users, $is_name = false, $set = 'normal')
 			mem.total_time_logged_in, mem.id_post_group, mem.notify_announcements, mem.notify_regularity, mem.notify_send_body,
 			mem.notify_types, lo.url, mg.online_color AS member_group_color, IFNULL(mg.group_name, {string:blank_string}) AS member_group,
 			pg.online_color AS post_group_color, IFNULL(pg.group_name, {string:blank_string}) AS post_group, mem.ignore_boards, mem.warning,
-			CASE WHEN mem.id_group = 0 OR mg.stars = {string:blank_string} THEN pg.stars ELSE mg.stars END AS stars, mem.password_salt, mem.pm_prefs';
+			CASE WHEN mem.id_group = 0 OR mg.icons = {string:blank_string} THEN pg.icons ELSE mg.icons END AS icons, mem.password_salt, mem.pm_prefs';
 		$select_tables = '
 			LEFT JOIN {db_prefix}log_online AS lo ON (lo.id_member = mem.id_member)
 			LEFT JOIN {db_prefix}attachments AS a ON (a.id_member = mem.id_member)
@@ -991,7 +991,7 @@ function loadMemberData($users, $is_name = false, $set = 'normal')
 		if (($row = cache_get_data('moderator_group_info', 480)) == null)
 		{
 			$request = $smcFunc['db_query']('', '
-				SELECT group_name AS member_group, online_color AS member_group_color, stars
+				SELECT group_name AS member_group, online_color AS member_group_color, icons
 				FROM {db_prefix}membergroups
 				WHERE id_group = {int:moderator_group}
 				LIMIT 1',
@@ -1011,9 +1011,9 @@ function loadMemberData($users, $is_name = false, $set = 'normal')
 			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2)
 				$user_profile[$id]['member_group'] = $row['member_group'];
 
-			// If the Moderator group has no color or stars, but their group does... don't overwrite.
-			if (!empty($row['stars']))
-				$user_profile[$id]['stars'] = $row['stars'];
+			// If the Moderator group has no color or icons, but their group does... don't overwrite.
+			if (!empty($row['icons']))
+				$user_profile[$id]['icons'] = $row['icons'];
 			if (!empty($row['member_group_color']))
 				$user_profile[$id]['member_group_color'] = $row['member_group_color'];
 		}
@@ -1064,7 +1064,7 @@ function loadMemberContext($user, $display_custom_fields = false)
 	$profile['signature'] = parse_bbc($profile['signature'], true, 'sig' . $profile['id_member']);
 
 	$profile['is_online'] = (!empty($profile['show_online']) || allowedTo('moderate_forum')) && $profile['is_online'] > 0;
-	$profile['stars'] = empty($profile['stars']) ? array('', '') : explode('#', $profile['stars']);
+	$profile['icons'] = empty($profile['icons']) ? array('', '') : explode('#', $profile['icons']);
 	// Setup the buddy status here (One whole in_array call saved :P)
 	$profile['buddy'] = in_array($profile['id_member'], $user_info['buddies']);
 	$buddy_list = !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : array();
@@ -1168,7 +1168,7 @@ function loadMemberContext($user, $display_custom_fields = false)
 		'group_id' => $profile['id_group'],
 		'post_group' => $profile['post_group'],
 		'post_group_color' => $profile['post_group_color'],
-		'group_stars' => str_repeat('<img src="' . str_replace('$language', $context['user']['language'], isset($profile['stars'][1]) ? $settings['images_url'] . '/' . $profile['stars'][1] : '') . '" alt="*" />', empty($profile['stars'][0]) || empty($profile['stars'][1]) ? 0 : $profile['stars'][0]),
+		'group_icons' => str_repeat('<img src="' . str_replace('$language', $context['user']['language'], isset($profile['icons'][1]) ? $settings['images_url'] . '/' . $profile['icons'][1] : '') . '" alt="*" />', empty($profile['icons'][0]) || empty($profile['icons'][1]) ? 0 : $profile['icons'][0]),
 		'warning' => $profile['warning'],
 		'warning_status' => !empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $profile['warning'] ? 'mute' : (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $profile['warning'] ? 'moderate' : (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $profile['warning'] ? 'watch' : (''))),
 		'local_time' => timeformat(time() + ($profile['time_offset'] - $user_info['time_offset']) * 3600, false),

Sources/ManageMembergroups.php

@@ -127,32 +127,32 @@ function MembergroupIndex()
 					'reverse' => 'CASE WHEN id_group < 4 THEN id_group ELSE 4 END, group_name DESC',
 				),
 			),
-			'stars' => array(
+			'icons' => array(
 				'header' => array(
-					'value' => $txt['membergroups_stars'],
+					'value' => $txt['membergroups_icons'],
 				),
 				'data' => array(
 					'function' => create_function('$rowData', '
 						global $settings;
 
-						$stars = explode(\'#\', $rowData[\'stars\']);
+						$icons = explode(\'#\', $rowData[\'icons\']);
 
-						// In case no stars are setup, return with nothing
-						if (empty($stars[0]) || empty($stars[1]))
+						// In case no icons are setup, return with nothing
+						if (empty($icons[0]) || empty($icons[1]))
 							return \'\';
 
 						// Otherwise repeat the image a given number of times.
 						else
 						{
-							$image = sprintf(\'<img src="%1$s/%2$s" alt="*" />\', $settings[\'images_url\'], $stars[1]);
-							return str_repeat($image, $stars[0]);
+							$image = sprintf(\'<img src="%1$s/%2$s" alt="*" />\', $settings[\'images_url\'], $icons[1]);
+							return str_repeat($image, $icons[0]);
 						}
 					'),
 
 				),
 				'sort' => array(
-					'default' => 'stars',
-					'reverse' => 'stars DESC',
+					'default' => 'icons',
+					'reverse' => 'icons DESC',
 				)
 			),
 			'members' => array(
@@ -236,28 +236,28 @@ function MembergroupIndex()
 					'reverse' => 'group_name DESC',
 				),
 			),
-			'stars' => array(
+			'icons' => array(
 				'header' => array(
-					'value' => $txt['membergroups_stars'],
+					'value' => $txt['membergroups_icons'],
 				),
 				'data' => array(
 					'function' => create_function('$rowData', '
 						global $settings;
 
-						$stars = explode(\'#\', $rowData[\'stars\']);
+						$icons = explode(\'#\', $rowData[\'icons\']);
 
-						if (empty($stars[0]) || empty($stars[1]))
+						if (empty($icons[0]) || empty($icons[1]))
 							return \'\';
 						else
 						{
-							$star_image = sprintf(\'<img src="%1$s/%2$s" alt="*" />\', $settings[\'images_url\'], $stars[1]);
-							return str_repeat($star_image, $stars[0]);
+							$icon_image = sprintf(\'<img src="%1$s/%2$s" alt="*" />\', $settings[\'images_url\'], $icons[1]);
+							return str_repeat($icon_image, $icons[0]);
 						}
 					'),
 				),
 				'sort' => array(
-					'default' => 'CASE WHEN id_group < 4 THEN id_group ELSE 4 END, stars',
-					'reverse' => 'CASE WHEN id_group < 4 THEN id_group ELSE 4 END, stars DESC',
+					'default' => 'CASE WHEN id_group < 4 THEN id_group ELSE 4 END, icons',
+					'reverse' => 'CASE WHEN id_group < 4 THEN id_group ELSE 4 END, icons DESC',
 				)
 			),
 			'members' => array(
@@ -352,7 +352,7 @@ function AddMembergroup()
 			'{db_prefix}membergroups',
 			array(
 				'id_group' => 'int', 'description' => 'string', 'group_name' => 'string-80', 'min_posts' => 'int',
-				'stars' => 'string', 'online_color' => 'string', 'group_type' => 'int',
+				'icons' => 'string', 'online_color' => 'string', 'group_type' => 'int',
 			),
 			array(
 				$id_group, '', $smcFunc['htmlspecialchars']($_POST['group_name'], ENT_QUOTES), ($postCountBasedGroup ? (int) $_POST['min_posts'] : '-1'),
@@ -456,7 +456,7 @@ function AddMembergroup()
 			if ($copy_id > 0 && $_POST['perm_type'] == 'copy')
 			{
 				$request = $smcFunc['db_query']('', '
-					SELECT online_color, max_messages, stars
+					SELECT online_color, max_messages, icons
 					FROM {db_prefix}membergroups
 					WHERE id_group = {int:copy_from}
 					LIMIT 1',
@@ -473,13 +473,13 @@ function AddMembergroup()
 					SET
 						online_color = {string:online_color},
 						max_messages = {int:max_messages},
-						stars = {string:stars}
+						icons = {string:icons}
 					WHERE id_group = {int:current_group}',
 					array(
 						'max_messages' => $group_info['max_messages'],
 						'current_group' => $id_group,
 						'online_color' => $group_info['online_color'],
-						'stars' => $group_info['stars'],
+						'icons' => $group_info['icons'],
 					)
 				);
 			}
@@ -709,7 +709,7 @@ function EditMembergroup()
 		// Set variables to their proper value.
 		$_POST['max_messages'] = isset($_POST['max_messages']) ? (int) $_POST['max_messages'] : 0;
 		$_POST['min_posts'] = isset($_POST['min_posts']) && isset($_POST['group_type']) && $_POST['group_type'] == -1 && $_REQUEST['group'] > 3 ? abs($_POST['min_posts']) : ($_REQUEST['group'] == 4 ? 0 : -1);
-		$_POST['stars'] = (empty($_POST['star_count']) || $_POST['star_count'] < 0) ? '' : min((int) $_POST['star_count'], 99) . '#' . $_POST['star_image'];
+		$_POST['icons'] = (empty($_POST['icon_count']) || $_POST['icon_count'] < 0) ? '' : min((int) $_POST['icon_count'], 99) . '#' . $_POST['icon_image'];
 		$_POST['group_desc'] = isset($_POST['group_desc']) && ($_REQUEST['group'] == 1 || (isset($_POST['group_type']) && $_POST['group_type'] != -1)) ? trim($_POST['group_desc']) : '';
 		$_POST['group_type'] = !isset($_POST['group_type']) || $_POST['group_type'] < 0 || $_POST['group_type'] > 3 || ($_POST['group_type'] == 1 && !allowedTo('admin_forum')) ? 0 : (int) $_POST['group_type'];
 		$_POST['group_hidden'] = empty($_POST['group_hidden']) || $_POST['min_posts'] != -1 || $_REQUEST['group'] == 3 ? 0 : (int) $_POST['group_hidden'];
@@ -721,7 +721,7 @@ function EditMembergroup()
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}membergroups
 			SET group_name = {string:group_name}, online_color = {string:online_color},
-				max_messages = {int:max_messages}, min_posts = {int:min_posts}, stars = {string:stars},
+				max_messages = {int:max_messages}, min_posts = {int:min_posts}, icons = {string:icons},
 				description = {string:group_desc}, group_type = {int:group_type}, hidden = {int:group_hidden},
 				id_parent = {int:group_inherit}
 			WHERE id_group = {int:current_group}',
@@ -734,7 +734,7 @@ function EditMembergroup()
 				'current_group' => (int) $_REQUEST['group'],
 				'group_name' => $smcFunc['htmlspecialchars']($_POST['group_name']),
 				'online_color' => $_POST['online_color'],
-				'stars' => $_POST['stars'],
+				'icons' => $_POST['icons'],
 				'group_desc' => $_POST['group_desc'],
 			)
 		);
@@ -973,7 +973,7 @@ function EditMembergroup()
 
 	// Fetch the current group information.
 	$request = $smcFunc['db_query']('', '
-		SELECT group_name, description, min_posts, online_color, max_messages, stars, group_type, hidden, id_parent
+		SELECT group_name, description, min_posts, online_color, max_messages, icons, group_type, hidden, id_parent
 		FROM {db_prefix}membergroups
 		WHERE id_group = {int:current_group}
 		LIMIT 1',
@@ -986,7 +986,7 @@ function EditMembergroup()
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	$row['stars'] = explode('#', $row['stars']);
+	$row['icons'] = explode('#', $row['icons']);
 
 	$context['group'] = array(
 		'id' => $_REQUEST['group'],
@@ -996,8 +996,8 @@ function EditMembergroup()
 		'color' => $row['online_color'],
 		'min_posts' => $row['min_posts'],
 		'max_messages' => $row['max_messages'],
-		'star_count' => (int) $row['stars'][0],
-		'star_image' => isset($row['stars'][1]) ? $row['stars'][1] : '',
+		'icon_count' => (int) $row['icons'][0],
+		'icon_image' => isset($row['icons'][1]) ? $row['icons'][1] : '',
 		'is_post_group' => $row['min_posts'] != -1,
 		'type' => $row['min_posts'] != -1 ? 0 : $row['group_type'],
 		'hidden' => $row['min_posts'] == -1 ? $row['hidden'] : 0,

Sources/ManagePermissions.php

@@ -125,7 +125,7 @@ function PermissionIndex()
 			'link' => '',
 			'is_post_group' => false,
 			'color' => '',
-			'stars' => '',
+			'icons' => '',
 			'children' => array(),
 			'num_permissions' => array(
 				'allowed' => 0,
@@ -144,7 +144,7 @@ function PermissionIndex()
 			'href' => $scripturl . '?action=moderate;area=viewgroups;sa=members;group=0',
 			'is_post_group' => false,
 			'color' => '',
-			'stars' => '',
+			'icons' => '',
 			'children' => array(),
 			'num_permissions' => array(
 				'allowed' => 0,
@@ -159,7 +159,7 @@ function PermissionIndex()
 
 	// Query the database defined membergroups.
 	$query = $smcFunc['db_query']('', '
-		SELECT id_group, id_parent, group_name, min_posts, online_color, stars
+		SELECT id_group, id_parent, group_name, min_posts, online_color, icons
 		FROM {db_prefix}membergroups' . (empty($modSettings['permission_enable_postgroups']) ? '
 		WHERE min_posts = {int:min_posts}' : '') . '
 		ORDER BY id_parent = {int:not_inherited} DESC, min_posts, CASE WHEN id_group < {int:newbie_group} THEN id_group ELSE 4 END, group_name',
@@ -179,7 +179,7 @@ function PermissionIndex()
 			continue;
 		}
 
-		$row['stars'] = explode('#', $row['stars']);
+		$row['icons'] = explode('#', $row['icons']);
 		$context['groups'][$row['id_group']] = array(
 			'id' => $row['id_group'],
 			'name' => $row['group_name'],
@@ -190,7 +190,7 @@ function PermissionIndex()
 			'href' => $scripturl . '?action=moderate;area=viewgroups;sa=members;group=' . $row['id_group'],
 			'is_post_group' => $row['min_posts'] != -1,
 			'color' => empty($row['online_color']) ? '' : $row['online_color'],
-			'stars' => !empty($row['stars'][0]) && !empty($row['stars'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $row['stars'][1] . '" alt="*" />', $row['stars'][0]) : '',
+			'icons' => !empty($row['icons'][0]) && !empty($row['icons'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $row['icons'][1] . '" alt="*" />', $row['icons'][0]) : '',
 			'children' => array(),
 			'num_permissions' => array(
 				'allowed' => $row['id_group'] == 1 ? '(' . $txt['permissions_all'] . ')' : 0,

Sources/Reports.php

@@ -446,7 +446,7 @@ function MemberGroupsReport()
 		'color' => $txt['member_group_color'],
 		'min_posts' => $txt['member_group_min_posts'],
 		'max_messages' => $txt['member_group_max_messages'],
-		'stars' => $txt['member_group_stars'],
+		'icons' => $txt['member_group_icons'],
 		'#sep#2' => $txt['member_group_access'],
 	);
 
@@ -465,7 +465,7 @@ function MemberGroupsReport()
 
 	// Now start cycling the membergroups!
 	$request = $smcFunc['db_query']('', '
-		SELECT mg.id_group, mg.group_name, mg.online_color, mg.min_posts, mg.max_messages, mg.stars,
+		SELECT mg.id_group, mg.group_name, mg.online_color, mg.min_posts, mg.max_messages, mg.icons,
 			CASE WHEN bp.permission IS NOT NULL OR mg.id_group = {int:admin_group} THEN 1 ELSE 0 END AS can_moderate
 		FROM {db_prefix}membergroups AS mg
 			LEFT JOIN {db_prefix}board_permissions AS bp ON (bp.id_group = mg.id_group AND bp.id_profile = {int:default_profile} AND bp.permission = {string:moderate_board})
@@ -486,7 +486,7 @@ function MemberGroupsReport()
 			'online_color' => '',
 			'min_posts' => -1,
 			'max_messages' => null,
-			'stars' => ''
+			'icons' => ''
 		),
 		array(
 			'id_group' => 0,
@@ -494,7 +494,7 @@ function MemberGroupsReport()
 			'online_color' => '',
 			'min_posts' => -1,
 			'max_messages' => null,
-			'stars' => ''
+			'icons' => ''
 		),
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
@@ -503,14 +503,14 @@ function MemberGroupsReport()
 
 	foreach ($rows as $row)
 	{
-		$row['stars'] = explode('#', $row['stars']);
+		$row['icons'] = explode('#', $row['icons']);
 
 		$group = array(
 			'name' => $row['group_name'],
 			'color' => empty($row['online_color']) ? '-' : '<span style="color: ' . $row['online_color'] . ';">' . $row['online_color'] . '</span>',
 			'min_posts' => $row['min_posts'] == -1 ? 'N/A' : $row['min_posts'],
 			'max_messages' => $row['max_messages'],
-			'stars' => !empty($row['stars'][0]) && !empty($row['stars'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $row['stars'][1] . '" alt="*" />', $row['stars'][0]) : '',
+			'icons' => !empty($row['icons'][0]) && !empty($row['icons'][1]) ? str_repeat('<img src="' . $settings['images_url'] . '/' . $row['icons'][1] . '" alt="*" />', $row['icons'][0]) : '',
 		);
 
 		// Board permissions.

Sources/Subs-Membergroups.php

@@ -649,7 +649,7 @@ function list_getMembergroups($start, $items_per_page, $sort, $membergroup_type)
 
 	// Get the basic group data.
 	$request = $smcFunc['db_query']('substring_membergroups', '
-		SELECT id_group, group_name, min_posts, online_color, stars, 0 AS num_members
+		SELECT id_group, group_name, min_posts, online_color, icons, 0 AS num_members
 		FROM {db_prefix}membergroups
 		WHERE min_posts ' . ($membergroup_type === 'post_count' ? '!=' : '=') . ' -1' . (allowedTo('admin_forum') ? '' : '
 			AND group_type != {int:is_protected}') . '
@@ -665,7 +665,7 @@ function list_getMembergroups($start, $items_per_page, $sort, $membergroup_type)
 			'group_name' => $row['group_name'],
 			'min_posts' => $row['min_posts'],
 			'online_color' => $row['online_color'],
-			'stars' => $row['stars'],
+			'icons' => $row['icons'],
 			'num_members' => $row['num_members'],
 		);
 	$smcFunc['db_free_result']($request);

Themes/default/Display.template.php

@@ -271,7 +271,7 @@ function template_main()
 				echo '
 								<li class="postgroup">', $message['member']['post_group'], '</li>';
 			echo '
-								<li class="stars">', $message['member']['group_stars'], '</li>';
+								<li class="icons">', $message['member']['group_icons'], '</li>';
 
 			// Show avatars, images, etc.?
 			if (!empty($settings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))

Themes/default/ManageMembergroups.template.php

@@ -299,19 +299,19 @@ function template_edit_group()
 							<input type="text" name="online_color" id="online_color_input" value="', $context['group']['color'], '" size="20" class="input_text" />
 						</dd>
 						<dt>
-							<label for="star_count_input"><strong>', $txt['membergroups_star_count'], ':</strong></label>
+							<label for="icon_count_input"><strong>', $txt['membergroups_icon_count'], ':</strong></label>
 						</dt>
 						<dd>
-							<input type="text" name="star_count" id="star_count_input" value="', $context['group']['star_count'], '" size="4" onkeyup="if (this.value.length > 2) this.value = 99;" onkeydown="this.onkeyup();" onchange="if (this.value != 0) this.form.star_image.onchange();" class="input_text" />
+							<input type="text" name="icon_count" id="icon_count_input" value="', $context['group']['icon_count'], '" size="4" onkeyup="if (this.value.length > 2) this.value = 99;" onkeydown="this.onkeyup();" onchange="if (this.value != 0) this.form.icon_image.onchange();" class="input_text" />
 						</dd>
 						<dt>
-							<label for="star_image_input"><strong>', $txt['membergroups_star_image'], ':</strong></label><br />
-							<span class="smalltext">', $txt['membergroups_star_image_note'], '</span>
+							<label for="icon_image_input"><strong>', $txt['membergroups_icon_image'], ':</strong></label><br />
+							<span class="smalltext">', $txt['membergroups_icon_image_note'], '</span>
 						</dt>
 						<dd>
 							', $txt['membergroups_images_url'], '
-							<input type="text" name="star_image" id="star_image_input" value="', $context['group']['star_image'], '" onchange="if (this.value &amp;&amp; this.form.star_count.value == 0) this.form.star_count.value = 1; else if (!this.value) this.form.star_count.value = 0; document.getElementById(\'star_preview\').src = smf_images_url + \'/\' + (this.value &amp;&amp; this.form.star_count.value > 0 ? this.value.replace(/\$language/g, \'', $context['user']['language'], '\') : \'blank.png\');" size="20" class="input_text" />
-							<img id="star_preview" src="', $settings['images_url'], '/', $context['group']['star_image'] == '' ? 'blank.png' : $context['group']['star_image'], '" alt="*" />
+							<input type="text" name="icon_image" id="icon_image_input" value="', $context['group']['icon_image'], '" onchange="if (this.value &amp;&amp; this.form.icon_count.value == 0) this.form.icon_count.value = 1; else if (!this.value) this.form.icon_count.value = 0; document.getElementById(\'star_preview\').src = smf_images_url + \'/\' + (this.value &amp;&amp; this.form.icon_count.value > 0 ? this.value.replace(/\$language/g, \'', $context['user']['language'], '\') : \'blank.png\');" size="20" class="input_text" />
+							<img id="star_preview" src="', $settings['images_url'], '/', $context['group']['icon_image'] == '' ? 'blank.png' : $context['group']['icon_image'], '" alt="*" />
 						</dd>
 						<dt>
 							<label for="max_messages_input"><strong>', $txt['membergroups_max_messages'], ':</strong></label><br />
@@ -450,7 +450,7 @@ function template_group_members()
 							<strong>', $txt['name'], ':</strong>
 						</dt>
 						<dd>
-							<span ', $context['group']['online_color'] ? 'style="color: ' . $context['group']['online_color'] . ';"' : '', '>', $context['group']['name'], '</span> ', $context['group']['stars'], '
+							<span ', $context['group']['online_color'] ? 'style="color: ' . $context['group']['online_color'] . ';"' : '', '>', $context['group']['name'], '</span> ', $context['group']['icons'], '
 						</dd>';
 	//Any description to show?
 	if (!empty($context['group']['description']))

Themes/default/PersonalMessage.template.php

@@ -213,7 +213,7 @@ function template_folder()
 					echo '
 				<li class="postgroup">', $message['member']['post_group'], '</li>';
 				echo '
-				<li class="stars">', $message['member']['group_stars'], '</li>';
+				<li class="icons">', $message['member']['group_icons'], '</li>';
 
 				// Show avatars, images, etc.?
 				if (!empty($settings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))

Themes/default/css/index.css

@@ -1785,7 +1785,7 @@ p#whoisviewing {
 .poster ul ul li {
 	display: inline;
 }
-.poster li.stars, .poster li.avatar, .poster li.blurb, li.postcount, li.im_icons ul {
+.poster li.icons, .poster li.avatar, .poster li.blurb, li.postcount, li.im_icons ul {
 	margin-top: 0.5em;
 }
 .poster li.avatar {

Themes/default/languages/ManageMembers.english.php

@@ -46,9 +46,9 @@ $txt['membergroups_group_type_free'] = 'Free <span class="smalltext">(User may l
 $txt['membergroups_group_type_post'] = 'Post Based <span class="smalltext">(Membership based on post count)</span>';
 $txt['membergroups_min_posts'] = 'Required posts';
 $txt['membergroups_online_color'] = 'Color in online list';
-$txt['membergroups_star_count'] = 'Number of star images';
-$txt['membergroups_star_image'] = 'Star image filename';
-$txt['membergroups_star_image_note'] = 'you can use $language for the language of the user';
+$txt['membergroups_icon_count'] = 'Number of icon images';
+$txt['membergroups_icon_image'] = 'Icon image filename';
+$txt['membergroups_icon_image_note'] = 'you can use $language for the language of the user';
 $txt['membergroups_max_messages'] = 'Max personal messages';
 $txt['membergroups_max_messages_note'] = '0 = unlimited';
 $txt['membergroups_edit_save'] = 'Save';
@@ -77,7 +77,7 @@ $txt['membergroups_images_url'] = '{theme URL}/images/';
 $txt['membergroups_select_visible_boards'] = 'Show boards';
 $txt['membergroups_members_top'] = 'Members';
 $txt['membergroups_name'] = 'Name';
-$txt['membergroups_stars'] = 'Stars';
+$txt['membergroups_icons'] = 'Icons';
 
 $txt['admin_browse_approve'] = 'Members whose accounts are awaiting approval';
 $txt['admin_browse_approve_desc'] = 'From here you can manage all members who are waiting to have their accounts approved.';

Themes/default/languages/Reports.english.php

@@ -74,7 +74,7 @@ $txt['board_perms_group_read_only'] = 'This board does not allow posting';
 $txt['member_group_color'] = 'Color';
 $txt['member_group_min_posts'] = 'Minimum Posts';
 $txt['member_group_max_messages'] = 'Max Personal Messages';
-$txt['member_group_stars'] = 'Stars';
+$txt['member_group_icons'] = 'Icons';
 $txt['member_group_settings'] = 'Settings';
 $txt['member_group_access'] = 'Board Access';
 

Themes/penguin/Display.template.php

@@ -262,7 +262,7 @@ function template_main()
 		//						<li class="membergroup">', $message['member']['group'], '</li>';
 
 //			echo '
-//								<li class="stars">', $message['member']['group_stars'], '</li>';
+//								<li class="icons">', $message['member']['group_icons'], '</li>';
 
 			// Show avatars, images, etc.?
 			if (!empty($settings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))
@@ -318,7 +318,7 @@ function template_main()
 		}
 
 			echo '
-								<li class="stars">', $message['member']['group_stars'], '</li>';
+								<li class="icons">', $message['member']['group_icons'], '</li>';
 
 		// Show the member's primary group (like 'Administrator') if they have one.
 		if (!empty($message['member']['group']))

Themes/penguin/css/index.css

@@ -3927,7 +3927,7 @@ ul.quickbuttons li.quote_button:hover a {
 	margin: 0px 2px -2.55em 0;
 	word-wrap: break-word;
 }
-.poster li.title, .poster li.online_button , .poster li.stars {
+.poster li.title, .poster li.online_button , .poster li.icons {
 	margin: 2px 0 0 0;
 }
 .poster li.avatar {
@@ -3937,7 +3937,7 @@ ul.quickbuttons li.quote_button:hover a {
 	font-weight: bold;
 	padding: 0px 0 0px 0; max-width: 136px;
 }
-.poster li.stars {
+.poster li.icons {
 	padding: 2px 5px 0 5px;
 }
 .poster li.avatar {

other/install_2-1_mysql.sql

@@ -1173,7 +1173,7 @@ CREATE TABLE {$db_prefix}membergroups (
   online_color varchar(20) NOT NULL default '',
   min_posts mediumint(9) NOT NULL default '-1',
   max_messages smallint(5) unsigned NOT NULL default '0',
-  stars varchar(255) NOT NULL default '',
+  icons varchar(255) NOT NULL default '',
   group_type tinyint(3) NOT NULL default '0',
   hidden tinyint(3) NOT NULL default '0',
   id_parent smallint(5) NOT NULL default '-2',
@@ -1186,15 +1186,15 @@ CREATE TABLE {$db_prefix}membergroups (
 #
 
 INSERT INTO {$db_prefix}membergroups
-	(id_group, group_name, description, online_color, min_posts, stars, group_type)
-VALUES (1, '{$default_administrator_group}', '', '#FF0000', -1, '5#staradmin.png', 1),
-	(2, '{$default_global_moderator_group}', '', '#0000FF', -1, '5#stargmod.png', 0),
-	(3, '{$default_moderator_group}', '', '', -1, '5#starmod.png', 0),
-	(4, '{$default_newbie_group}', '', '', 0, '1#star.png', 0),
-	(5, '{$default_junior_group}', '', '', 50, '2#star.png', 0),
-	(6, '{$default_full_group}', '', '', 100, '3#star.png', 0),
-	(7, '{$default_senior_group}', '', '', 250, '4#star.png', 0),
-	(8, '{$default_hero_group}', '', '', 500, '5#star.png', 0);
+	(id_group, group_name, description, online_color, min_posts, icons, group_type)
+VALUES (1, '{$default_administrator_group}', '', '#FF0000', -1, '5#iconadmin.png', 1),
+	(2, '{$default_global_moderator_group}', '', '#0000FF', -1, '5#icongmod.png', 0),
+	(3, '{$default_moderator_group}', '', '', -1, '5#iconmod.png', 0),
+	(4, '{$default_newbie_group}', '', '', 0, '1#icon.png', 0),
+	(5, '{$default_junior_group}', '', '', 50, '2#icon.png', 0),
+	(6, '{$default_full_group}', '', '', 100, '3#icon.png', 0),
+	(7, '{$default_senior_group}', '', '', 250, '4#icon.png', 0),
+	(8, '{$default_hero_group}', '', '', 500, '5#icon.png', 0);
 # --------------------------------------------------------
 
 #

other/install_2-1_postgresql.sql

@@ -1561,7 +1561,7 @@ CREATE TABLE {$db_prefix}membergroups (
   online_color varchar(20) NOT NULL default '',
   min_posts int NOT NULL default '-1',
   max_messages smallint NOT NULL default '0',
-  stars varchar(255) NOT NULL,
+  icons varchar(255) NOT NULL,
   group_type smallint NOT NULL default '0',
   hidden smallint NOT NULL default '0',
   id_parent smallint NOT NULL default '-2',
@@ -1578,14 +1578,14 @@ CREATE INDEX {$db_prefix}membergroups_min_posts ON {$db_prefix}membergroups (min
 # Dumping data for table `membergroups`
 #
 
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars, group_type) VALUES (1, '{$default_administrator_group}', '', '#FF0000', -1, '5#staradmin.png', 1);
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (2, '{$default_global_moderator_group}', '', '#0000FF', -1, '5#stargmod.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (3, '{$default_moderator_group}', '', '', -1, '5#starmod.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (4, '{$default_newbie_group}', '', '', 0, '1#star.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (5, '{$default_junior_group}', '', '', 50, '2#star.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (6, '{$default_full_group}', '', '', 100, '3#star.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (7, '{$default_senior_group}', '', '', 250, '4#star.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (8, '{$default_hero_group}', '', '', 500, '5#star.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons, group_type) VALUES (1, '{$default_administrator_group}', '', '#FF0000', -1, '5#iconadmin.png', 1);
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (2, '{$default_global_moderator_group}', '', '#0000FF', -1, '5#icongmod.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (3, '{$default_moderator_group}', '', '', -1, '5#iconmod.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (4, '{$default_newbie_group}', '', '', 0, '1#icon.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (5, '{$default_junior_group}', '', '', 50, '2#icon.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (6, '{$default_full_group}', '', '', 100, '3#icon.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (7, '{$default_senior_group}', '', '', 250, '4#icon.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (8, '{$default_hero_group}', '', '', 500, '5#icon.png');
 # --------------------------------------------------------
 
 #

other/install_2-1_sqlite.sql

@@ -1272,7 +1272,7 @@ CREATE TABLE {$db_prefix}membergroups (
   online_color varchar(20) NOT NULL default '',
   min_posts int NOT NULL default '-1',
   max_messages smallint NOT NULL default '0',
-  stars varchar(255) NOT NULL,
+  icons varchar(255) NOT NULL,
   group_type smallint NOT NULL default '0',
   hidden smallint NOT NULL default '0',
   id_parent smallint NOT NULL default '-2'
@@ -1289,14 +1289,14 @@ CREATE INDEX {$db_prefix}membergroups_min_posts ON {$db_prefix}membergroups (min
 #
 
 BEGIN TRANSACTION;
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars, group_type) VALUES (1, '{$default_administrator_group}', '', '#FF0000', -1, '5#staradmin.png', 1);
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (2, '{$default_global_moderator_group}', '', '#0000FF', -1, '5#stargmod.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (3, '{$default_moderator_group}', '', '', -1, '5#starmod.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (4, '{$default_newbie_group}', '', '', 0, '1#star.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (5, '{$default_junior_group}', '', '', 50, '2#star.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (6, '{$default_full_group}', '', '', 100, '3#star.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (7, '{$default_senior_group}', '', '', 250, '4#star.png');
-INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, stars) VALUES (8, '{$default_hero_group}', '', '', 500, '5#star.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons, group_type) VALUES (1, '{$default_administrator_group}', '', '#FF0000', -1, '5#iconadmin.png', 1);
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (2, '{$default_global_moderator_group}', '', '#0000FF', -1, '5#icongmod.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (3, '{$default_moderator_group}', '', '', -1, '5#iconmod.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (4, '{$default_newbie_group}', '', '', 0, '1#icon.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (5, '{$default_junior_group}', '', '', 50, '2#icon.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (6, '{$default_full_group}', '', '', 100, '3#icon.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (7, '{$default_senior_group}', '', '', 250, '4#icon.png');
+INSERT INTO {$db_prefix}membergroups (id_group, group_name, description, online_color, min_posts, icons) VALUES (8, '{$default_hero_group}', '', '', 500, '5#icon.png');
 COMMIT;
 
 # --------------------------------------------------------

other/upgrade_2-1_mysql.sql

@@ -182,3 +182,11 @@ ADD COLUMN deny_member_groups varchar(255) NOT NULL DEFAULT '';
 ALTER TABLE {$db_prefix}mail_queue
 CHANGE body body mediumtext NOT NULL;
 ---#
+
+/******************************************************************************/
+--- Name changes
+/******************************************************************************/
+---# Altering the membergroup stars to icons
+ALTER TABLE {$db_prefix}membergroups
+CHANGE `stars` `icons` varchar(255) NOT NULL DEFAULT '';
+---#

other/upgrade_2-1_postgresql.sql

@@ -232,3 +232,13 @@ upgrade_query("
 ---}
 ---#
 
+/******************************************************************************/
+--- Name changes
+/******************************************************************************/
+---# Altering the membergroup stars to icons
+---{
+upgrade_query("
+	ALTER TABLE {$db_prefix}membergroups
+	CHANGE `stars` `icons` varchar(255) NOT NULL DEFAULT ''");
+---}
+---#

other/upgrade_2-1_sqlite.sql

@@ -207,3 +207,14 @@ $smcFunc['db_alter_table']('{db_prefix}boards', array(
 ));
 ---}
 ---#
+
+/******************************************************************************/
+--- Name changes
+/******************************************************************************/
+---# Altering the membergroup stars to icons
+---{
+upgrade_query("
+	ALTER TABLE {$db_prefix}membergroups
+	CHANGE `stars` `icons` varchar(255) NOT NULL DEFAULT ''");
+---}
+---#