Merge branch 'master' of https://github.com/Spuds/playpen

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),
@@ -1767,7 +1767,7 @@ function loadTemplate($template_name, $style_sheets = array(), $fatal = true)
 			$sheet_path = file_exists($settings['theme_dir']. '/css/' . $sheet . '.css') ? 'theme_url' : (file_exists($settings['default_theme_dir']. '/css/' . $sheet . '.css') ? 'default_theme_url' : '');
 			if ($sheet_path)
 			{
-				$context['html_headers'] .= "\n\t" . '<link rel="stylesheet" type="text/css" id="' . $sheet . '_css" href="' . $settings[$sheet_path] . '/css/' . $sheet . '.css" />';
+				$context['html_headers'] .= "\n\t" . '<link rel="stylesheet" type="text/css" id="' . $sheet . '_css" href="' . $settings[$sheet_path] . '/css/' . $sheet . '.css?alp21" />';
 				if ($db_show_debug === true)
 					$context['debug']['sheets'][] = $sheet . ' (' . basename($settings[$sheet_path]) . ')';
 			}

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/MessageIndex.php

@@ -482,7 +482,7 @@ function MessageIndex()
 						'name' => $row['first_display_name'],
 						'id' => $row['first_id_member'],
 						'href' => !empty($row['first_id_member']) ? $scripturl . '?action=profile;u=' . $row['first_id_member'] : '',
-						'link' => !empty($row['first_id_member']) ? '<a href="' . $scripturl . '?action=profile;u=' . $row['first_id_member'] . '" title="' . $txt['profile_of'] . ' ' . $row['first_display_name'] . '">' . $row['first_display_name'] . '</a>' : $row['first_display_name']
+						'link' => !empty($row['first_id_member']) ? '<a href="' . $scripturl . '?action=profile;u=' . $row['first_id_member'] . '" title="' . $txt['profile_of'] . ' ' . $row['first_display_name'] . '" class="preview">' . $row['first_display_name'] . '</a>' : $row['first_display_name']
 					),
 					'time' => timeformat($row['first_poster_time']),
 					'timestamp' => forum_time(true, $row['first_poster_time']),

Sources/Profile.php

@@ -538,7 +538,7 @@ function ModifyProfile($post_errors = array())
 				$good_password = in_array(true, call_integration_hook('integrate_verify_password', array($cur_profile['member_name'], $_POST['oldpasswrd'], false)), true);
 
 				// Bad password!!!
-				if (!$good_password && $user_info['passwd'] != sha1(strtolower($user_profile[$memID]['memberName']) . un_htmlspecialchars(stripslashes($_POST['oldpasswrd']))))
+				if (!$good_password && $user_info['passwd'] != sha1(strtolower($user_profile[$memID]['member_name']) . un_htmlspecialchars(stripslashes($_POST['oldpasswrd']))))
 					$post_errors[] = 'bad_password';
 
 				// Warn other elements not to jump the gun and do custom changes!

Sources/Register.php

@@ -105,6 +105,14 @@ function Register($reg_errors = array())
 			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
 		else
 			$context['agreement'] = '';
+		
+		// Nothing to show, lets disable registration and inform the admin of this error
+		if (empty($context['agreement']))
+		{
+			// No file found or a blank file, log the error so the admin knows there is a problem!
+			log_error($txt['registration_agreement_missing'], 'critical');
+			fatal_lang_error('registration_disabled', false);
+		}
 	}
 
 	if (!empty($modSettings['userLanguage']))

Sources/Reports.php

@@ -466,7 +466,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'],
 	);
 
@@ -485,7 +485,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})
@@ -506,7 +506,7 @@ function MemberGroupsReport()
 			'online_color' => '',
 			'min_posts' => -1,
 			'max_messages' => null,
-			'stars' => ''
+			'icons' => ''
 		),
 		array(
 			'id_group' => 0,
@@ -514,7 +514,7 @@ function MemberGroupsReport()
 			'online_color' => '',
 			'min_posts' => -1,
 			'max_messages' => null,
-			'stars' => ''
+			'icons' => ''
 		),
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
@@ -523,14 +523,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-Editor.php

@@ -1465,7 +1465,7 @@ function create_control_richedit($editorOptions)
 		if ($context['show_spellchecking'])
 		{
 			$context['html_headers'] .= '
-		<script type="text/javascript" src="' . $settings['default_theme_url'] . '/scripts/spellcheck.js"></script>';
+		<script type="text/javascript" src="' . $settings['default_theme_url'] . '/scripts/spellcheck.js?alp21"></script>';
 
 			// Some hidden information is needed in order to make the spell checking work.
 			if (!isset($_REQUEST['xml']))

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']))
@@ -424,37 +424,37 @@ function template_main()
 		// Maybe we can approve it, maybe we should?
 		if ($message['can_approve'])
 			echo '
-									<li class="approve_button"><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve'], '</a></li>';
+									<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"  class="approve_button">', $txt['approve'], '</a></li>';
 
 		// Can they reply? Have they turned on quick reply?
 		if ($context['can_quote'] && !empty($options['display_quick_reply']))
 			echo '
-									<li class="quote_button"><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" onclick="return oQuickReply.quote(', $message['id'], ');">', $txt['quote'], '</a></li>';
+									<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" onclick="return oQuickReply.quote(', $message['id'], ');" class="quote_button">', $txt['quote'], '</a></li>';
 
 		// So... quick reply is off, but they *can* reply?
 		elseif ($context['can_quote'])
 			echo '
-									<li class="quote_button"><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '">', $txt['quote'], '</a></li>';
+									<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" class="quote_button">', $txt['quote'], '</a></li>';
 
 		// Can the user modify the contents of this post?
 		if ($message['can_modify'])
 			echo '
-									<li class="modify_button"><a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '">', $txt['modify'], '</a></li>';
+									<li><a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '" class="modify_button">', $txt['modify'], '</a></li>';
 
 		// How about... even... remove it entirely?!
 		if ($message['can_remove'])
 			echo '
-									<li class="remove_button"><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');">', $txt['remove'], '</a></li>';
+									<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');" class="remove_button">', $txt['remove'], '</a></li>';
 
 		// What about splitting it off the rest of the topic?
 		if ($context['can_split'] && !empty($context['real_num_replies']))
 			echo '
-									<li class="split_button"><a href="', $scripturl, '?action=splittopics;topic=', $context['current_topic'], '.0;at=', $message['id'], '">', $txt['split'], '</a></li>';
+									<li><a href="', $scripturl, '?action=splittopics;topic=', $context['current_topic'], '.0;at=', $message['id'], '" class="split_button">', $txt['split'], '</a></li>';
 
 		// Can we restore topics?
 		if ($context['can_restore_msg'])
 			echo '
-									<li class="restore_button"><a href="', $scripturl, '?action=restoretopic;msgs=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['restore_message'], '</a></li>';
+									<li><a href="', $scripturl, '?action=restoretopic;msgs=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" class="restore_button">', $txt['restore_message'], '</a></li>';
 
 		// Show a checkbox for quick moderation?
 		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $message['can_remove'])
@@ -597,7 +597,7 @@ function template_main()
 			echo '
 								<a href="', $scripturl, '?action=profile;area=issuewarning;u=', $message['member']['id'], ';msg=', $message['id'], '"><img src="', $settings['images_url'], '/warn.png" alt="', $txt['issue_warning_post'], '" title="', $txt['issue_warning_post'], '" /></a>';
 		echo '
-								<img src="', $settings['images_url'], '/ip.png" alt="" />';
+								<img class="centericon" src="', $settings['images_url'], '/ip.png" alt="" />';
 
 		// Show the IP to this user for this post - because you can moderate?
 		if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip']))
@@ -911,6 +911,7 @@ function template_main()
 
 	echo '
 				// ]]></script>';
+	
 }
 
 ?>

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']))
@@ -385,19 +385,19 @@ function template_folder()
 					// Is there than more than one recipient you can reply to?
 					if ($message['number_recipients'] > 1 && $context['display_mode'] != 2)
 						echo '
-					<li class="reply_all_button"><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=all">', $txt['reply_to_all'], '</a></li>';
+					<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=all" class="reply_all_button">', $txt['reply_to_all'], '</a></li>';
 
 					echo '
-					<li class="reply_button"><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $txt['reply'], '</a></li>
-					<li class="quote_button"><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote', $context['folder'] == 'sent' ? '' : ';u=' . $message['member']['id'], '">', $txt['quote'], '</a></li>';
+					<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '" class="reply_button">', $txt['reply'], '</a></li>
+					<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote', $context['folder'] == 'sent' ? '' : ';u=' . $message['member']['id'], '" class="quote_button">', $txt['quote'], '</a></li>';
 				}
 				// This is for "forwarding" - even if the member is gone.
 				else
 					echo '
-					<li class="quote_button"><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $txt['reply_quote'], '</a></li>';
+					<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote" class="quote_button">', $txt['reply_quote'], '</a></li>';
 			}
 			echo '
-					<li class="remove_button"><a href="', $scripturl, '?action=pm;sa=pmactions;pm_actions[', $message['id'], ']=delete;f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', addslashes($txt['remove_message']), '?\');">', $txt['delete'], '</a></li>';
+					<li><a href="', $scripturl, '?action=pm;sa=pmactions;pm_actions[', $message['id'], ']=delete;f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', addslashes($txt['remove_message']), '?\');" class="remove_button">', $txt['delete'], '</a></li>';
 
 			if (empty($context['display_mode']))
 				echo '

Themes/default/Post.template.php

@@ -684,7 +684,7 @@ function template_main()
 
 	if ($context['can_quote'])
 		echo '
-						newPostsHTML += \'<ul class="reset smalltext quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li class="quote_button"><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');"><span>',$txt['bbc_quote'],'</span><\' + \'/a></li></ul>\';';
+						newPostsHTML += \'<ul class="reset smalltext quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');" class="quote_button"><span>',$txt['bbc_quote'],'</span><\' + \'/a></li></ul>\';';
 
 	echo '
 						newPostsHTML += \'<br class="clear" />\';
@@ -795,7 +795,7 @@ function template_main()
 			{
 				echo '
 					<ul class="reset smalltext quickbuttons" id="msg_', $post['id'], '_quote">
-						<li class="quote_button"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span>',$txt['bbc_quote'],'</span></a></li>
+						<li><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');" class="quote_button"><span>',$txt['bbc_quote'],'</span></a></li>
 					</ul>';
 			}
 

Themes/default/Profile.template.php

@@ -386,22 +386,22 @@ function template_showPosts()
 			// If they *can* reply?
 			if ($post['can_reply'])
 				echo '
-						<li class="reply_button"><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span>', $txt['reply'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '" class="reply_button"><span>', $txt['reply'], '</span></a></li>';
 
 			// If they *can* quote?
 			if ($post['can_quote'])
 				echo '
-						<li class="quote_button"><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span>', $txt['quote'], '</span></a></li>';
+						<li><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '" class="quote_button"><span>', $txt['quote'], '</span></a></li>';
 
 			// Can we request notification of topics?
 			if ($post['can_mark_notify'])
 				echo '
-						<li class="notify_button"><a href="', $scripturl, '?action=notify;topic=', $post['topic'], '.', $post['start'], '"><span>', $txt['notify'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=notify;topic=', $post['topic'], '.', $post['start'], '" class="notify_button"><span>', $txt['notify'], '</span></a></li>';
 
 			// How about... even... remove it entirely?!
 			if ($post['can_delete'])
 				echo '
-						<li class="remove_button"><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');"><span>', $txt['remove'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');" class="remove_button"><span>', $txt['remove'], '</span></a></li>';
 
 			if ($post['can_reply'] || $post['can_mark_notify'] || $post['can_delete'])
 				echo '

Themes/default/Recent.template.php

@@ -47,22 +47,22 @@ function template_main()
 		// If they *can* reply?
 		if ($post['can_reply'])
 			echo '
-						<li class="reply_button"><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span>', $txt['reply'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '" class="reply_button"><span>', $txt['reply'], '</span></a></li>';
 
 		// If they *can* quote?
 		if ($post['can_quote'])
 			echo '
-						<li class="quote_button"><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span>', $txt['quote'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '" class="quote_button"><span>', $txt['quote'], '</span></a></li>';
 
 		// Can we request notification of topics?
 		if ($post['can_mark_notify'])
 			echo '
-						<li class="notify_button"><a href="', $scripturl, '?action=notify;topic=', $post['topic'], '.', $post['start'], '"><span>', $txt['notify'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=notify;topic=', $post['topic'], '.', $post['start'], '" class="notify_button"><span>', $txt['notify'], '</span></a></li>';
 
 		// How about... even... remove it entirely?!
 		if ($post['can_delete'])
 			echo '
-						<li class="remove_button"><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';recent;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');"><span>', $txt['remove'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';recent;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');" class="remove_button"><span>', $txt['remove'], '</span></a></li>';
 
 		if ($post['can_reply'] || $post['can_mark_notify'] || $post['can_delete'])
 			echo '

Themes/default/Register.template.php

@@ -327,6 +327,7 @@ function template_registration_form()
 			<input type="hidden" name="', $context['register_token_var'], '" value="', $context['register_token'], '" />
 			<input type="hidden" name="step" value="2" />
 		</form>
+		<br class="clear" />
 		<script type="text/javascript"><!-- // --><![CDATA[
 			var regTextStrings = {
 				"username_valid": "', $txt['registration_username_available'], '",

Themes/default/Search.template.php

@@ -493,17 +493,17 @@ function template_results()
 				// If they *can* reply?
 				if ($topic['can_reply'])
 					echo '
-								<li class="reply_button"><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'], '">', $txt['reply'], '</a></li>';
+								<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'], '" class="reply_button">', $txt['reply'], '</a></li>';
 
 				// If they *can* quote?
 				if ($topic['can_quote'])
 					echo '
-								<li class="quote_button"><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'] . ';quote=' . $message['id'] . '">', $txt['quote'], '</a></li>';
+								<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'] . ';quote=' . $message['id'] . '" class="quote_button">', $txt['quote'], '</a></li>';
 
 				// Can we request notification of topics?
 				if ($topic['can_mark_notify'])
 					echo '
-								<li class="notify_button"><a href="', $scripturl . '?action=notify;topic=' . $topic['id'] . '.' . $message['start'], '">', $txt['notify'], '</a></li>';
+								<li><a href="', $scripturl . '?action=notify;topic=' . $topic['id'] . '.' . $message['start'], '" class="notify_button">', $txt['notify'], '</a></li>';
 
 				if ($topic['can_reply'] || $topic['can_mark_notify'])
 					echo '

Themes/default/Themes.template.php

@@ -355,7 +355,7 @@ function template_set_options()
 							<span class="floatleft"><select name="', !empty($setting['default']) ? 'default_' : '', 'options_master[', $setting['id'], ']" onchange="this.form.options_', $setting['id'], '.disabled = this.selectedIndex != 1;">
 								<option value="0" selected="selected">', $txt['themeadmin_reset_options_none'], '</option>
 								<option value="1">', $txt['themeadmin_reset_options_change'], '</option>
-								<option value="2">', $txt['themeadmin_reset_options_remove'], '</option>
+								<option value="2">', $txt['themeadmin_reset_options_default'], '</option>
 							</select>&nbsp;</span>';
 		
 		// display checkbox options

Themes/default/css/index.css

@@ -164,7 +164,13 @@ input[disabled].input_text {
 }
 
 /* Standard horizontal rule.. ([hr], etc.) */
-hr, .hrcolor {
+hr {
+	height: 1px;
+	border: 0;
+	color: #ccc;
+	background-color: #ccc;
+}
+hr.hrcolor {
     height: 1px;
     border: none;
 	color: #ccc;
@@ -720,7 +726,7 @@ h3.titlebg a:hover, h4.titlebg a:hover {
 	color: #53616f;
 	text-decoration: none;
 }
-h3.catbg img.icon, h4.titlebg img.icon {
+h3.catbg img.icon {
 	vertical-align: middle;
 	margin: -2px 5px 0 0;
 }
@@ -737,8 +743,9 @@ h4.titlebg, h3.titlebg {
 	padding-right: 9px;
 }
 h4.titlebg img.icon {
+	vertical-align: middle;
 	float: left;
-	margin: 9px 8px 0 0;
+	margin: 10px 8px 0 0;
 }
 div.cat_bar {
 	background: #99abbf url(../images/theme/main_block.png) no-repeat 0 -160px;
@@ -793,7 +800,7 @@ table.table_list a.collapse {
 
 /* The half-round header bars for some tables. */
 .table_grid tr.catbg, .table_grid tr.titlebg {
-	font-size: 0.95em;
+	font-size: 1.05em;
 	border-bottom: 1px solid #fff;
 }
 .table_grid tr.catbg th, .table_grid tr.titlebg th {
@@ -839,7 +846,7 @@ table.table_grid thead tr.catbg th {
 	white-space: nowrap;
 }
 img.sort {
-	margin-bottom: -0.3em;
+	margin-bottom: -0.25em;
 	margin-left: .3em;
 }
 
@@ -1733,7 +1740,7 @@ div#pollmoderation {
 }
 #forumposts h3 img {
 	float: left;
-	margin: 8px 0.5em 0 0;
+	margin: 10px 0.5em 0 0;
 }
 #forumposts h3.catbg {
 	margin-bottom: 3px;
@@ -1750,6 +1757,8 @@ p#whoisviewing {
 .poster {
 	float: left;
 	width: 15em;
+	word-wrap: break-word;
+	overflow: hidden;
 }
 .postarea, .moderatorbar {
 	margin: 0 0 0 16em;
@@ -1783,7 +1792,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 {
@@ -1846,31 +1855,31 @@ ul.quickbuttons li a {
 ul.quickbuttons a:hover {
 	color: #a70;
 }
-ul.quickbuttons li.quote_button {
+ul.quickbuttons li a.quote_button {
 	background: url(../images/theme/quickbuttons.png) no-repeat 0 0;
 }
-ul.quickbuttons li.remove_button {
+ul.quickbuttons li a.remove_button {
 	background: url(../images/theme/quickbuttons.png) no-repeat 0 -30px;
 }
-ul.quickbuttons li.modify_button {
+ul.quickbuttons li a.modify_button {
 	background: url(../images/theme/quickbuttons.png) no-repeat 0 -60px;
 }
-ul.quickbuttons li.approve_button {
+ul.quickbuttons li a.approve_button {
 	background: url(../images/theme/quickbuttons.png) no-repeat 0 -90px;
 }
-ul.quickbuttons li.restore_button {
+ul.quickbuttons li a.restore_button {
 	background: url(../images/theme/quickbuttons.png) no-repeat 0 -120px;
 }
-ul.quickbuttons li.split_button {
+ul.quickbuttons li a.split_button {
 	background: url(../images/theme/quickbuttons.png) no-repeat 0 -150px;
 }
-ul.quickbuttons li.reply_button {
+ul.quickbuttons li a.reply_button {
 	background: url(../images/theme/quickbuttons.png) no-repeat 0 -180px;
 }
-ul.quickbuttons li.reply_all_button {
+ul.quickbuttons li a.reply_all_button {
 	background: url(../images/theme/quickbuttons.png) no-repeat 0 -180px;
 }
-ul.quickbuttons li.notify_button {
+ul.quickbuttons li a.notify_button {
 	background: url(../images/theme/quickbuttons.png) no-repeat 0 -210px;
 }
 ul.quickbuttons li.inline_mod_check {
@@ -3160,12 +3169,14 @@ span.hidelink {
     position: absolute;
     z-index: 999;
     left: -9999px;
-    padding: 10px;
-    width: 250px;
-	border-radius: 5px;
-	box-shadow: 1px 2px 2px rgba(0,0,0,0.3);
-	background: #e7eaef; 
-	border: 1px solid lightblue;
+	word-wrap: break-word;
+    max-width: 350px;
+	padding: 6px 9px;
+	color: #333;
+	background: #fff;
+	border: 1px solid #aaa;
+	border-radius: 4px 4px 4px 4px;
+	box-shadow: 1px 2px 4px rgba(0,0,0,0.2), 0 0px 10px rgba(0,0,0,0.05) inset;
 }
 
 /* Styles for the progress bar 

Themes/default/index.template.php

@@ -147,9 +147,15 @@ function template_html_above()
 
 	echo '
 	<script type="text/javascript"><!-- // --><![CDATA[
-		$(document).ready(function() { 
+		$(document).ready(function() {
+			// menu drop downs
 			$("ul.dropmenu").superfish();
+			
+			// tooltips
 			$(".preview").SMFtooltip();
+
+			// find all nested linked images and turn off the border
+			$("a.bbc_link img.bbc_img").parent().css("border", "0");
 		});
 	// ]]></script>';
 

Themes/default/languages/Errors.english.php

@@ -137,6 +137,7 @@ $txt['cannot_who_view'] = 'Sorry - you don\'t have the proper permissions to vie
 $txt['no_theme'] = 'That theme does not exist.';
 $txt['theme_dir_wrong'] = 'The default theme\'s directory is wrong, please correct it by clicking this text.';
 $txt['registration_disabled'] = 'Sorry, registration is currently disabled.';
+$txt['registration_agreement_missing'] = 'The registration agreement file, agreement.txt, is either missing or empty.  Registrations have been disable until this is fixed';
 $txt['registration_no_secret_question'] = 'Sorry, there is no secret question set for this member.';
 $txt['poll_range_error'] = 'Sorry, the poll must run for more than 0 days.';
 $txt['delFirstPost'] = 'You are not allowed to delete the first post in a topic.<p>If you want to delete this topic, click on the Remove Topic link, or ask a moderator/administrator to do it for you.</p>';

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/default/languages/Themes.english.php

@@ -121,10 +121,10 @@ $txt['themeadmin_reset_remove'] = 'Remove all members\' options and use the defa
 $txt['themeadmin_reset_remove_current'] = 'members currently using their own options.';
 // Don't use entities in the below string.
 $txt['themeadmin_reset_remove_confirm'] = 'Are you sure you want to remove all theme options?\\nThis may reset some custom profile fields as well.';
-$txt['themeadmin_reset_options_info'] = 'The options below will reset options for <em>everyone</em>.  To change an option, select &quot;change&quot; in the box next to it, and then select a value for it.  To use the default, select &quot;remove&quot;.  Otherwise, use &quot;don\'t change&quot; to keep it as-is.';
+$txt['themeadmin_reset_options_info'] = 'The options below will reset options for <em>everyone</em>.  To change an option, select &quot;change&quot; in the box next to it, and then select a value for it.  To use the default, select &quot;default&quot;.  Otherwise, use &quot;don\'t change&quot; to keep it as-is.';
 $txt['themeadmin_reset_options_change'] = 'Change';
 $txt['themeadmin_reset_options_none'] = 'Don\'t change';
-$txt['themeadmin_reset_options_remove'] = 'Remove';
+$txt['themeadmin_reset_options_default'] = 'Default';
 
 $txt['themeadmin_edit_browse'] = 'Browse the templates and files in this theme.';
 $txt['themeadmin_edit_style'] = 'Edit this theme\'s stylesheets.';

Themes/default/languages/index.english.php

@@ -412,6 +412,10 @@ $txt['code'] = 'Code';
 $txt['code_select'] = '[Select]';
 $txt['quote_from'] = 'Quote from';
 $txt['quote'] = 'Quote';
+$txt['fulledit'] = 'Full edit';
+$txt['edit'] = 'Edit';
+$txt['quick_edit'] = 'Quick Edit';
+$txt['post_options'] = 'More...';
 
 $txt['merge_to_topic_id'] = 'ID of target topic';
 $txt['split'] = 'Split Topic';

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']))
@@ -470,27 +470,27 @@ function template_main()
 		// Can they reply? Have they turned on quick reply?
 		//if ($context['can_quote'] && !empty($options['display_quick_reply']))
 		//	echo '
-		//							<li class="quote_button"><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" title="', $txt['quote'], '&nbsp;', $message['member']['name'], '\'s post" onclick="return oQuickReply.quote(', $message['id'], ');">', $txt['quote'], '</a></li>';
+		//							<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" title="', $txt['quote'], '&nbsp;', $message['member']['name'], '\'s post" onclick="return oQuickReply.quote(', $message['id'], ');" class="quote_button">', $txt['quote'], '</a></li>';
 
 		// So... quick reply is off, but they *can* reply?
 		//elseif ($context['can_quote'])
 		//	echo '
-		//							<li class="quote_button"><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" title="', $txt['quote'], '&nbsp;', $message['member']['name'], '\'s post">', $txt['quote'], '</a></li>';
+		//							<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" title="', $txt['quote'], '&nbsp;', $message['member']['name'], '\'s post" class="quote_button">', $txt['quote'], '</a></li>';
 
 		// Can the user modify the contents of this post?
 		if ($message['can_modify'])
 			echo '
-									<li class="modify_button"><a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '">Full&nbsp;edit</a></li>';
+									<li><a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '" title="', $txt['fulledit'], '" class="modify_button">', $txt['fulledit'], '</a></li>';
 
 		// Can the user modify the contents of this post?  Show the modify inline image.
 		if ($message['can_modify'])
 			echo '
-									<li class="modify_inline">Edit<img src="', $settings['images_url'], '/icons/modify_inline.png" alt="', $txt['modify_msg'], '" title="Quick edit" class="modifybutton" id="modify_button_', $message['id'], '" style="cursor: pointer; display: none;" onclick="oQuickModify.modifyMsg(\'', $message['id'], '\')" /></li>';
+									<li><a href="#" class="modify_inline" title="', $txt['quick_edit'], '">', $txt['edit'], '<img src="', $settings['images_url'], '/icons/modify_inline.png" alt="', $txt['modify_msg'], '" title="', $txt['quick_edit'] ,'" id="modify_button_', $message['id'], '" style="cursor: pointer; display: none;" onclick="oQuickModify.modifyMsg(\'', $message['id'], '\')" /></a></li>';
 
 		if ($context['can_moderate_forum'])
 		{
 			echo '
-									<li class="moderation_button"><a href="#">More..</a>
+									<li class="moderation_button"><a href="#">', $txt['post_options'], '</a>
 										<ul>';
 
 									// Maybe they want to report this post to the moderator(s)?
@@ -498,26 +498,30 @@ function template_main()
 										echo '
 											<li><a href="', $scripturl, '?action=reporttm;topic=', $context['current_topic'], '.', $message['counter'], ';msg=', $message['id'], '">', $txt['report_to_mod'], '</a></li>';
 										echo '
-											<li class="remove_button"><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');">', $txt['remove'], '</a></li>
-											<li class="split_button"><a href="', $scripturl, '?action=splittopics;topic=', $context['current_topic'], '.0;at=', $message['id'], '">', $txt['split'], '</a></li>';
+											<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');" class="remove_button">', $txt['remove'], '</a></li>
+											<li><a href="', $scripturl, '?action=splittopics;topic=', $context['current_topic'], '.0;at=', $message['id'], '" class="split_button">', $txt['split'], '</a></li>';
+									
 									// Maybe we can approve it, maybe we should?
 									if ($message['can_approve'])
 										echo '
-											<li class="approve_button"><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve'], '</a></li>';
+											<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" class="approve_button">', $txt['approve'], '</a></li>';
+									
 									// Can we restore topics?
 									if ($context['can_restore_msg'])
 										echo '
-											<li class="restore_button"><a href="', $scripturl, '?action=restoretopic;msgs=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['restore_message'], '</a></li>';
+											<li><a href="', $scripturl, '?action=restoretopic;msgs=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" class="restore_button">', $txt['restore_message'], '</a></li>';
+									
 									// Can we issue a warning because of this post?  Remember, we can't give guests warnings.
 									if ($context['can_issue_warning'] && !$message['is_message_author'] && !$message['member']['is_guest'])
 										echo '
-											<li class="issue_warning"><a href="', $scripturl, '?action=profile;area=issuewarning;u=', $message['member']['id'], ';msg=', $message['id'], '" title="', $txt['issue_warning_post'], '">Issue warning</a></li>';
+											<li><a href="', $scripturl, '?action=profile;area=issuewarning;u=', $message['member']['id'], ';msg=', $message['id'], '" title="', $txt['issue_warning_post'], '" class="issue_warning">Issue warning</a></li>';
+									
 									// Show a checkbox for quick moderation?
 									if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $message['can_remove'])
 										echo '
 											<li class="inline_mod_check" style="display: none;" id="in_topic_mod_check_', $message['id'], '"><label for="fukn_pita_bastard_', $message['id'], '">Select post&nbsp;</label></li>';
 										echo '
-											<li class="ip_link"><a href="', $scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '">', $message['member']['ip'], '</a></li>
+											<li><a href="', $scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '" class="ip_link">', $message['member']['ip'], '</a></li>
 										</ul>
 									</li>';
 		}
@@ -525,12 +529,12 @@ function template_main()
 		// Can they reply? Have they turned on quick reply?
 		if ($context['can_quote'] && !empty($options['display_quick_reply']))
 			echo '
-									<li class="quote_button"><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" title="', $txt['quote'], '&nbsp;', $message['member']['name'], '\'s post" onclick="return oQuickReply.quote(', $message['id'], ');">', $txt['quote'], '</a></li>';
+									<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" title="', $txt['quote'], '&nbsp;', $message['member']['name'], '\'s post" onclick="return oQuickReply.quote(', $message['id'], ');" class="quote_button">', $txt['quote'], '</a></li>';
 
 		// So... quick reply is off, but they *can* reply?
 		elseif ($context['can_quote'])
 			echo '
-									<li class="quote_button"><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" title="', $txt['quote'], '&nbsp;', $message['member']['name'], '\'s post">', $txt['quote'], '</a></li>';
+									<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" title="', $txt['quote'], '&nbsp;', $message['member']['name'], '\'s post" class="quote_button">', $txt['quote'], '</a></li>';
 
 		if ($message['can_approve'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'])
 			echo '
@@ -570,7 +574,7 @@ function template_main()
 	call_integration_hook('integrate_mod_buttons', array(&$mod_buttons));
 
 	echo '
-			<div class="windowbg"  id="display_lower_buttons">
+			<div class="windowbg" id="display_lower_buttons">
 				', template_button_strip($normal_buttons, 'left'), '', template_button_strip($reply_button, 'right'), '
 				<div id="moderationbuttons">', template_button_strip($mod_buttons, 'bottom', array('id' => 'moderationbuttons_strip')), '</div>
 				<div class="title_bar" style="margin: 10px 11px 10px 11px; border-radius: 4px; clear: both;">
@@ -799,23 +803,17 @@ function template_main()
 	echo '
 
 		$(document).ready(function(){
-				$("#quickReplyOptions").hide();
-				$("#QuickReply_swap").show();
+			$("#quickReplyOptions").hide();
+			$("#QuickReply_swap").show();
 
 			$("#QuickReply_swap").click(function(){
-			$("#quickReplyOptions").slideToggle();
+				$("#quickReplyOptions").slideToggle();
 			});
-		});
-
-		$(document).ready(function() { 
-			$("a.topic_reply_title").bt(jQuery.bt.options = {positions: "top, bottom"})
-		});
 
-		$(document).ready(function() { 
-			$("li.quote_button a").bt(jQuery.bt.options = {positions: "top, bottom"})
+			$("li a.quote_button, li a.modify_button, li a.modify_inline, a.topic_reply_title").bt(jQuery.bt.options = {positions: "top, bottom"});
 		});
 
-				// ]]></script>';
+		// ]]></script>';
 }
 
 ?>

Themes/penguin/MessageIndex.template.php

@@ -308,7 +308,7 @@ function template_main()
 
 			echo '
 							<span style="font-size: 1.083em; white-space: pre;">', $topic['replies'], ' ', $txt['replies'], '&nbsp;-&nbsp;', $topic['views'], ' ', $txt['views'], '</span><br />
-							', $topic['last_post']['time'], '&nbsp;', $txt['by'], '&nbsp;<strong style="white-space: pre;">', $topic['last_post']['member']['link'], '</strong>
+							', $topic['last_post']['time'], '&nbsp;', $txt['by'], '&nbsp;<span style="white-space: pre;"><strong>', $topic['last_post']['member']['link'], '</strong></span>
 						</div>';
 			//echo '
 			//			<div style="float: left; width: 100%; height: 0.6em; clear: both; margin: 0 0 0 0; padding: 2px 10px; overflow: visible;"><small style="font-weight: bold; display: block; margin: -8px 0 0 0; padding-right: 56px;" id="pages' . $topic['first_post']['id'] . '">', $topic['pages'], '</small></div>';
@@ -479,14 +479,23 @@ function template_main()
 			// add/remove a class element to keep track of the image status
 			$("#Child_swap").toggleClass("on");
 		});
-	});
 
-	$(document).ready(function(){
 		$("td.stickybg, td.stickybg2").show();
 		$("#Sticky_toggle").show();
 
 		$("#Sticky_toggle").click(function(){
 			$("td.stickybg, td.stickybg2").toggle();
+			
+			// swap the arrow up / down images
+			var sCurrent_image = $("#Sticky_toggle").attr("src");
+			if ($("#Sticky_toggle").attr("class") == "icon floatright") {
+				$("#Sticky_toggle").attr("src", sCurrent_image.replace("arrow", "arrow-down"));
+			} else {
+				$("#Sticky_toggle").attr("src", sCurrent_image.replace("arrow-down", "arrow"));
+			}
+			
+			// add/remove a class element to keep track of the image status
+			$("#Sticky_toggle").toggleClass("on");
 		});
 	});
 ';

Themes/penguin/Post.template.php

@@ -677,7 +677,7 @@ function template_main()
 
 	if ($context['can_quote'])
 		echo '
-						newPostsHTML += \'<ul class="reset smalltext quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li class="quote_button"><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');"><span>',$txt['bbc_quote'],'</span><\' + \'/a></li></ul>\';';
+						newPostsHTML += \'<ul class="reset smalltext quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');" class="quote_button"><span>',$txt['bbc_quote'],'</span><\' + \'/a></li></ul>\';';
 
 	echo '
 						newPostsHTML += \'<br class="clear" />\';
@@ -787,7 +787,7 @@ function template_main()
 			{
 				echo '
 					<ul class="reset smalltext quickbuttons" id="msg_', $post['id'], '_quote">
-						<li class="quote_button"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span style="white-space: pre;">',$txt['bbc_quote'],'</span></a></li>
+						<li><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');" class="quote_button"><span style="white-space: pre;">',$txt['bbc_quote'],'</span></a></li>
 					</ul>';
 			}
 

Themes/penguin/Profile.template.php

@@ -379,24 +379,24 @@ function template_showPosts()
 			// If they *can* reply?
 			if ($post['can_reply'])
 				echo '
-						<li class="reply_button"><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span>', $txt['reply'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '" class="reply_button"><span>', $txt['reply'], '</span></a></li>';
 
 			// If they *can* quote?
 			if ($post['can_quote'])
 				echo '
-						<li class="quote_button"><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span>', $txt['quote'], '</span></a></li>';
+						<li><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '" class="quote_button"><span>', $txt['quote'], '</span></a></li>';
 
 			// Can we request notification of topics?
 			if ($post['can_mark_notify'])
 				echo '
-						<li class="notify_button"><a href="', $scripturl, '?action=notify;topic=', $post['topic'], '.', $post['start'], '"><span>', $txt['notify'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=notify;topic=', $post['topic'], '.', $post['start'], '" class="notify_button"><span>', $txt['notify'], '</span></a></li>';
 
 			// How about... even... remove it entirely?!
 			if ($post['can_delete'])
 				echo '
-						<li class="remove_button"><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');"><span>', $txt['remove'], '</span></a></li>';
+						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');" class="remove_button"><span>', $txt['remove'], '</span></a></li>';
 
-			if ($post['can_reply'] || $post['can_mark_notify'] || $post['can_delete'])
+				if ($post['can_reply'] || $post['can_mark_notify'] || $post['can_delete'])
 				echo '
 					</ul>
 				</div>';

Themes/penguin/Themes.template.php

@@ -343,7 +343,7 @@ function template_set_options()
 							<span class="floatleft"><select name="', !empty($setting['default']) ? 'default_' : '', 'options_master[', $setting['id'], ']" onchange="this.form.options_', $setting['id'], '.disabled = this.selectedIndex != 1;">
 								<option value="0" selected="selected">', $txt['themeadmin_reset_options_none'], '</option>
 								<option value="1">', $txt['themeadmin_reset_options_change'], '</option>
-								<option value="2">', $txt['themeadmin_reset_options_remove'], '</option>
+								<option value="2">', $txt['themeadmin_reset_options_default'], '</option>
 							</select>&nbsp;</span>';
 		
 		// display checkbox options
@@ -698,7 +698,8 @@ function template_pick()
 						</li>
 					</ul>
 				</div>
-			</div>';
+			</div>
+			<br class="clear" />';
 
 		if (!empty($theme['variants']))
 		{

Themes/penguin/css/index.css

@@ -204,6 +204,7 @@ span.page_last a.navPages {
 .lastpost_stuff {
 	float: right;
 	margin: 0 7px 0 0;
+	word-wrap: break-word;
 }
 
 /* All input elements that are checkboxes or radio buttons shouldn't have a border around them. */
@@ -565,7 +566,7 @@ tr.catbg th a:link, tr.catbg th a:visited, tr.catbg2 td a:link, tr.catbg2 td a:v
 	background: #cacdd3;
 }
 div.windowbg, div.windowbg2, div.windowbg3, #preview_body {
-	overflow: auto;
+	/*overflow: auto;*/
 	float: left; 
 	width: 100%; 
 	padding: 6px;
@@ -3799,14 +3800,14 @@ ul.quickbuttons li.blurb {
 	font-weight: normal;
 	word-wrap: break-word;
 }
-ul.quickbuttons li.quote_button {
+ul.quickbuttons li a.quote_button {
 	float: right;
 }
 .quickbuttons li.moderation_button {
 	position: relative;
 }
-.quickbuttons li.modify_inline {
-	padding: 6px 22px 6px 4px;
+.quickbuttons li a.modify_inline {
+	padding: 2px 22px 2px 4px;
 	background: #fff;
 	border: 1px solid #bbb;
 	border-bottom: 1px solid #aaa;
@@ -3814,8 +3815,8 @@ ul.quickbuttons li.quote_button {
 	position: relative;
 	box-shadow: 0 -3px 6px rgba(0,0,0,0.07) inset, 1px 1px 2px rgba(0,0,0,0.15);
 }
-.quickbuttons li.modify_inline:hover {
-	padding: 7px 22px 6px 5px;
+.quickbuttons li a.modify_inline:hover {
+	padding: 2px 22px 2px 5px;
 	background: #f4f4f4;
 	border-top: none;
 	border-left: none;
@@ -3823,14 +3824,14 @@ ul.quickbuttons li.quote_button {
 	border-bottom: 1px solid #ccc; 
 	box-shadow: 1px 2px 6px rgba(14,39,61,0.2) inset, 1px 1px 1px rgba(0,0,0,0.6) inset, -4px -4px 4px rgba(255,255,255,0.8) inset;
 }
-.quickbuttons li.modify_inline img {
+.quickbuttons li a.modify_inline img {
 	margin: 0 0 0 0;
 	position: absolute;
 	top: 1px;
 	right: 0;
 	padding: 2px 4px 2px 25px;
 }
-.quickbuttons li.modify_inline:hover img {
+.quickbuttons li a.modify_inline:hover img {
 	right: 0;
 	padding: 3px 4px 4px 25px;
 }
@@ -3876,15 +3877,6 @@ ul.quickbuttons li.quote_button:hover a {
 	border-top: 1px solid rgba(0,0,0,0);
 	border-bottom: 1px solid rgba(0,0,0,0);
 }
-.quickbuttons li.sfhover li a, .quickbuttons li.sfhover li label, .poster  li.sfhover li a {
-	border: none;
-	padding: 0 5px;
-	font-size: 1em;
-	font-weight: normal;
-	line-height: 2em;
-	width: 13em;
-
-}
 /* Note: The next declaration is for keyboard access with js disabled. */
 .quickbuttons ul a:focus {
 	margin-left: 9999px;
@@ -3894,17 +3886,19 @@ ul.quickbuttons li.quote_button:hover a {
 	border-radius: 0 0 0 0;
 }
 .quickbuttons li:hover li a, .quickbuttons li.sfhover li a, .quickbuttons li:hover li label, .quickbuttons li.sfhover li label,
-.poster li:hover li a, .poster li.sfhover li a {
+.poster li:hover li a, .poster  li.sfhover li a{
 	margin: 0 0 0 0;
+	width: 13em;
+	line-height: 2em;
 	padding: 0 5px;
 	display: block;
 	border-radius: 0;
-	/* Necessary to allow highlighting of 1st level while hovering over submenu. */
 	background: none;
 	color: #346;
 	border: none;
 	text-shadow: none;
 	box-shadow: none;
+	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 }
 /* Levels 2 and 3 hover effects. */
 .quickbuttons li li:hover, .quickbuttons li li:hover>a, .quickbuttons li li a:focus, .quickbuttons li li:hover>label
@@ -3933,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 {
@@ -3943,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 {

Themes/penguin/index.template.php

@@ -404,7 +404,7 @@ function template_body_above()
 	// Custom banners and shoutboxes should be placed here, before the linktree.
 
 	// Show the navigation tree.
-				theme_linktree();
+	theme_linktree();
 
 }
 

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 ''");
+---}
+---#