From 7241e419fe91af2bb694002b8944c0e07c272e82 Mon Sep 17 00:00:00 2001
From: Exile <iglix@me.com>
Date: Wed, 27 Aug 2014 17:26:20 +0400
Subject: [PATCH] Group fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Наточил я свой топор, багофиксов полон двор. Некоторые изменения и фиксы новой системы групп по результатам тестирования.
---
 README.md                                 |  6 +++--
 upgrade/r600-stable.php                   | 14 ++++++++++
 upload/config.php                         |  4 +--
 upload/groupcp.php                        | 27 ++++++++++---------
 upload/includes/functions.php             |  3 ++-
 upload/language/en/main.php               |  5 ++--
 upload/language/ru/main.php               |  7 ++---
 upload/language/uk/main.php               |  7 ++---
 upload/posting.php                        |  1 +
 upload/templates/default/group_config.tpl | 31 ++++++++++++----------
 upload/templates/default/groupcp.tpl      | 18 ++++++++-----
 upload/templates/default/posting.tpl      |  7 +++--
 upload/templates/default/tracker.tpl      | 32 +++++++++++++----------
 upload/templates/default/viewtopic.tpl    | 18 ++++++-------
 upload/tracker.php                        | 18 ++++++-------
 upload/viewtopic.php                      |  3 ++-
 16 files changed, 117 insertions(+), 84 deletions(-)

diff --git a/README.md b/README.md
index fe6f10d6e..b2b560184 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,10 @@ TorrentPier II - движок торрент-трекера, написанны
 
 2. Создаем базу данных, в которую при помощи phpmyadmin (или любого другого удобного инструмента) импортируем дамп, расположенный в папке **install/sql/mysql.sql**
 3. Правим файл конфигурации **config.php**, загруженный на сервер:
-> $bb_cfg['db']['db1'] = array('localhost', 'dbase', 'user', 'pass', $charset, $pconnect);    
-> В данной строке изменяем данные входа в базу данных, остальные правки в файле вносятся по усмотрению, исходя из необходимости из внесения (ориентируйтесь на описания, указанные у полей).
+> ***$bb_cfg['db']['db1'] = array('localhost', 'dbase', 'user', 'pass', $charset, $pconnect);***
+В данной строке изменяем данные входа в базу данных
+***$domain_name = 'torrentpier.me';***
+В данной строке указываем ваше доменное имя. Остальные правки в файле вносятся по усмотрению, исходя из необходимости из внесения (ориентируйтесь на описания, указанные у полей).
 
 4. Редактируем указанные файлы:
  + **favicon.ico** (меняем на свою иконку, если есть)  
diff --git a/upgrade/r600-stable.php b/upgrade/r600-stable.php
index f2eb73d01..b11071ac2 100644
--- a/upgrade/r600-stable.php
+++ b/upgrade/r600-stable.php
@@ -123,6 +123,20 @@ INSERT INTO `bb_cron` VALUES (23, 1, 'Update forums atom', 'update_forums_atom.p
 UPDATE `bb_attachments_config` SET `config_value` = 'old_files' WHERE `config_name` = 'upload_dir';
                                                                                       // изменено 595 ↑
 DELETE FROM `bb_smilies` WHERE `code` = ':cd:';                                       // удалено 596
+ALTER TABLE `bb_groups` CHANGE `group_description` `group_description` text NOT NULL DEFAULT '';
+                                                                                      // изменено 598 ↑
+ALTER TABLE `bb_groups` ADD `avatar_ext_id` int(15) NOT NULL DEFAULT '0' AFTER `group_id`;
+                                                                                      // добавлено 598 ↑
+ALTER TABLE `bb_groups` ADD `mod_time` INT(11) NOT NULL DEFAULT '0' AFTER `group_time`;
+                                                                                      // добавлено 598 ↑
+ALTER TABLE `bb_groups` ADD `release_group` tinyint(4) NOT NULL DEFAULT '0' AFTER `group_type`;
+                                                                                      // добавлено 598 ↑
+ALTER TABLE `bb_groups` ADD `group_signature` text NOT NULL DEFAULT '' AFTER `group_description`;
+                                                                                      // добавлено 598 ↑
+ALTER TABLE `bb_posts` ADD `poster_rg_id` mediumint(8) NOT NULL DEFAULT '0' AFTER `poster_ip`;
+                                                                                      // добавлено 598 ↑
+ALTER TABLE `bb_posts` ADD `attach_rg_sig` tinyint(4) NOT NULL DEFAULT '0' AFTER `poster_rg_id`;
+                                                                                      // добавлено 598 ↑
 
 Удаленные файлы/папки:
 
diff --git a/upload/config.php b/upload/config.php
index 8dcba493b..cacbe6c57 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -550,7 +550,7 @@ $bb_cfg['gen_forums_allowed_ext'] = array('zip', 'rar');            // для о
 $bb_cfg['avatars'] = array(
 	'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов
 	'bot_avatar'  => 'gallery/bot.gif',               // аватара бота
-	'max_size'    => 50*1024,                         // размер аватары в байтах
+	'max_size'    => 100*1024,                        // размер аватары в байтах
 	'max_height'  => 100,                             // высота аватара в px
 	'max_width'   => 100,                             // ширина аватара в px
 	'no_avatar'   => 'gallery/noavatar.png',          // дефолтная аватара
@@ -561,7 +561,7 @@ $bb_cfg['avatars'] = array(
 // Group avatars
 $bb_cfg['group_avatars'] = array(
 	'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов
-	'max_size'    => 50*1024,                         // размер аватары в байтах
+	'max_size'    => 100*1024,                        // размер аватары в байтах
 	'max_height'  => 300,                             // высота аватара в px
 	'max_width'   => 300,                             // ширина аватара в px
 	'no_avatar'   => 'gallery/noavatar.png',          // дефолтная аватара
diff --git a/upload/groupcp.php b/upload/groupcp.php
index d3aa41afc..b80ed9848 100644
--- a/upload/groupcp.php
+++ b/upload/groupcp.php
@@ -149,7 +149,7 @@ if (!$group_id)
 			$candidates  = ($data['c']) ? $lang['PENDING_MEMBERS'] .': '. $data['c'] : $lang['NO_PENDING_GROUP_MEMBERS'];
 
 			$options .= '<li class="pad_2"><a href="'. GROUP_URL . $data['id'] .'" class="med bold">'. $text .'</a></li>';
-			$options .= ($data['rg']) ? '<ul><li class="med">'. $lang['RELEASE_GROUP'] .'</li>' : '';
+			$options .= ($data['rg']) ? '<ul><li class="med">'. $lang['RELEASE_GROUP'] .'</li>' : '<ul>';
 			$options .= '<li class="seedmed">'. $members .'</li>';
 			if (IS_AM)
 			{
@@ -212,6 +212,7 @@ else if (@$_POST['joingroup'])
 	}
 	if ($row['user_id'])
 	{
+		set_die_append_msg(false, false, $group_id);
 		bb_die($lang['ALREADY_MEMBER_GROUP']);
 	}
 
@@ -238,21 +239,15 @@ else if (@$_POST['joingroup'])
 		$emailer->reset();
 	}
 
-	$message = $lang['GROUP_JOINED'] .'<br /><br />';
-	$message .= sprintf($lang['CLICK_RETURN_GROUP'], '<a href="'. GROUP_URL ."$group_id" .'">', '</a>') .'<br /><br />';
-	$message .= sprintf($lang['CLICK_RETURN_INDEX'], '<a href="'. "index.php" .'">', '</a>');
-
-	bb_die($message);
+	set_die_append_msg(false, false, $group_id);
+	bb_die($lang['GROUP_JOINED']);
 }
 else if (!empty($_POST['unsub']) || !empty($_POST['unsubpending']))
 {
 	delete_user_group($group_id, $userdata['user_id']);
 
-	$message = $lang['UNSUB_SUCCESS'] .'<br /><br />';
-	$message .= sprintf($lang['CLICK_RETURN_GROUP'], '<a href="'. GROUP_URL ."$group_id" .'">', '</a>') .'<br /><br />';
-	$message .= sprintf($lang['CLICK_RETURN_INDEX'], '<a href="'. "index.php" .'">', '</a>');
-
-	bb_die($message);
+	set_die_append_msg(false, false, $group_id);
+	bb_die($lang['UNSUB_SUCCESS']);
 }
 else
 {
@@ -467,6 +462,7 @@ else
 		'PAGE_TITLE'             => $lang['GROUP_CONTROL_PANEL'],
 		'GROUP_NAME'             => htmlCHR($group_info['group_name']),
 		'GROUP_DESCRIPTION'      => bbcode2html($group_info['group_description']),
+		'GROUP_SIGNATURE'        => bbcode2html($group_info['group_signature']),
 		'GROUP_AVATAR'           => get_avatar(GROUP_AVATAR_MASK . $group_id, $group_info['avatar_ext_id'], true),
 		'GROUP_DETAILS'          => $group_details,
 		'GROUP_TIME'             => (!empty($group_info['group_time'])) ? sprintf('%s <span class="posted_since">(%s)</span>', bb_date($group_info['group_time']), delta_time($group_info['group_time'])) : $lang['NONE'],
@@ -505,7 +501,11 @@ else
 		case 'releases':
 			// TODO Correct SQL to posts with attach and limit them, optimization
 
-			if (!$group_info['release_group']) bb_die($lang['NOT_A_RELEASE_GROUP']);
+			if (!$group_info['release_group'])
+			{
+				set_die_append_msg(false, false, $group_id);
+				bb_die($lang['NOT_A_RELEASE_GROUP']);
+			}
 
 			// Count releases for pagination
 			$all_releases = DB()->fetch_rowset("
@@ -535,7 +535,8 @@ else
 
 			if (!$releases = DB()->fetch_rowset($sql))
 			{
-				bb_die('Could not get releases data');
+				set_die_append_msg(false, false, $group_id);
+				bb_die($lang['NO_SEARCH_MATCH']);
 			}
 
 			foreach ($releases as $i => $release)
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 980bfba53..d66311bc5 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -2651,13 +2651,14 @@ function create_magnet ($infohash, $auth_key, $logged_in)
 	return '<a href="magnet:?xt=urn:btih:'. bin2hex($infohash) .'&tr='. urlencode($bb_cfg['bt_announce_url'] . $passkey_url) .'"><img src="'. $images['icon_magnet'] .'" width="12" height="12" border="0" /></a>';
 }
 
-function set_die_append_msg ($forum_id = null, $topic_id = null)
+function set_die_append_msg ($forum_id = null, $topic_id = null, $group_id = null)
 {
 	global $lang, $template;
 
 	$msg = '';
 	$msg .= ($topic_id) ? '<p class="mrg_10"><a href="'. TOPIC_URL . $topic_id .'">'. $lang['TOPIC_RETURN'] .'</a></p>' : '';
 	$msg .= ($forum_id) ? '<p class="mrg_10"><a href="'. FORUM_URL . $forum_id .'">'. $lang['FORUM_RETURN'] .'</a></p>' : '';
+	$msg .= ($group_id) ? '<p class="mrg_10"><a href="'. GROUP_URL . $group_id .'">'. $lang['GROUP_RETURN'] .'</a></p>' : '';
 	$msg .= '<p class="mrg_10"><a href="index.php">'. $lang['INDEX_RETURN'] .'</a></p>';
 	$template->assign_var('BB_DIE_APPEND_MSG', $msg);
 }
diff --git a/upload/language/en/main.php b/upload/language/en/main.php
index b69b49e89..477f69142 100644
--- a/upload/language/en/main.php
+++ b/upload/language/en/main.php
@@ -717,6 +717,7 @@ $lang['JOIN_A_GROUP'] = 'Join a Group';
 $lang['GROUP_INFORMATION'] = 'Group Information';
 $lang['GROUP_NAME'] = 'Group name';
 $lang['GROUP_DESCRIPTION'] = 'Group description';
+$lang['GROUP_SIGNATURE'] = 'Group signature';
 $lang['GROUP_MEMBERSHIP'] = 'Group membership';
 $lang['GROUP_MEMBERS'] = 'Group Members';
 $lang['GROUP_MODERATOR'] = 'Group Moderator';
@@ -785,10 +786,10 @@ $lang['MEMBERS_IN_GROUP'] = 'Members in group';
 // Release Groups
 $lang['POST_RELEASE_FROM_GROUP'] = 'Post release from group';
 $lang['CHOOSE_RELEASE_GROUP'] = 'Select release group';
-$lang['ATTACH_RG_SIG'] = 'Attach release group signature';
+$lang['ATTACH_RG_SIG'] = 'attach release group signature';
 $lang['RELEASE_FROM_RG'] = 'Release was prepared by';
 $lang['GROUPS_RELEASES'] = 'Group\'s releases';
-$lang['MORE_RELEASES'] = 'All releases';
+$lang['MORE_RELEASES'] = 'Find all releases of the group';
 $lang['NOT_A_RELEASE_GROUP'] = 'This group is not a release group';
 
 //
diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php
index d645b060e..466beb2a5 100644
--- a/upload/language/ru/main.php
+++ b/upload/language/ru/main.php
@@ -717,6 +717,7 @@ $lang['JOIN_A_GROUP'] = 'Вступить в группу';
 $lang['GROUP_INFORMATION'] = 'Информация о группе';
 $lang['GROUP_NAME'] = 'Название группы';
 $lang['GROUP_DESCRIPTION'] = 'Описание группы';
+$lang['GROUP_SIGNATURE'] = 'Подпись группы';
 $lang['GROUP_MEMBERSHIP'] = 'Членство в группе';
 $lang['GROUP_MEMBERS'] = 'Члены группы';
 $lang['GROUP_MODERATOR'] = 'Модератор группы';
@@ -785,10 +786,10 @@ $lang['MEMBERS_IN_GROUP'] = 'Кол-во участников';
 // Release Groups
 $lang['POST_RELEASE_FROM_GROUP'] = 'Создать релиз от группы';
 $lang['CHOOSE_RELEASE_GROUP'] = 'Выбрать релиз группу';
-$lang['ATTACH_RG_SIG'] = 'Добавить подпись релиз группы';
+$lang['ATTACH_RG_SIG'] = 'добавить подпись релиз группы';
 $lang['RELEASE_FROM_RG'] = 'Релиз подготовлен';
 $lang['GROUPS_RELEASES'] = 'Релизы группы';
-$lang['MORE_RELEASES'] = 'Все релизы';
+$lang['MORE_RELEASES'] = 'Найти все релизы группы';
 $lang['NOT_A_RELEASE_GROUP'] = 'Эта группа не является релиз группой';
 
 //
@@ -2061,7 +2062,7 @@ $lang['DELETED_GROUP'] = 'Группа была успешно удалена';
 $lang['CREATE_NEW_GROUP'] = 'Создать новую группу';
 $lang['EDIT_GROUP'] = 'Изменить группу';
 $lang['GROUP_STATUS'] = 'Статус группы';
-$lang['GROUP_DELETE'] = 'Удалить группу.';
+$lang['GROUP_DELETE'] = 'Удалить группу';
 $lang['GROUP_DELETE_CHECK'] = 'Удалить эту группу';
 $lang['SUBMIT_GROUP_CHANGES'] = 'Сохранить изменения';
 $lang['RESET_GROUP_CHANGES'] = 'Отменить изменения';
diff --git a/upload/language/uk/main.php b/upload/language/uk/main.php
index 53ea7ba7c..911c3bcc8 100644
--- a/upload/language/uk/main.php
+++ b/upload/language/uk/main.php
@@ -717,6 +717,7 @@ $lang['JOIN_A_GROUP'] = 'Вступити в групу';
 $lang['GROUP_INFORMATION'] = 'Інформація про групі';
 $lang['GROUP_NAME'] = 'Назва групи';
 $lang['GROUP_DESCRIPTION'] = 'Опис групи';
+$lang['GROUP_SIGNATURE'] = 'Підпис групи';
 $lang['GROUP_MEMBERSHIP'] = 'Членство в групі';
 $lang['GROUP_MEMBERS'] = 'Учасники групи';
 $lang['GROUP_MODERATOR'] = 'Модератор групи';
@@ -785,10 +786,10 @@ $lang['MEMBERS_IN_GROUP'] = 'Кількість учасників';
 // Release Groups
 $lang['POST_RELEASE_FROM_GROUP'] = 'Створити реліз від групи';
 $lang['CHOOSE_RELEASE_GROUP'] = 'Вибрати реліз групи';
-$lang['ATTACH_RG_SIG'] = 'Додати підпис реліз групи';
+$lang['ATTACH_RG_SIG'] = 'додати підпис реліз групи';
 $lang['RELEASE_FROM_RG'] = 'Реліз підготовлений';
 $lang['GROUPS_RELEASES'] = 'Релізи групи';
-$lang['MORE_RELEASES'] = 'Всі релізи';
+$lang['MORE_RELEASES'] = 'Знайти усі релізи групи';
 $lang['NOT_A_RELEASE_GROUP'] = 'Ця група не є реліз групою';
 
 //
@@ -2061,7 +2062,7 @@ $lang['DELETED_GROUP'] = 'Група була успішно видалено';
 $lang['CREATE_NEW_GROUP'] = 'Створити нову групу';
 $lang['EDIT_GROUP'] = 'Змінити групу';
 $lang['GROUP_STATUS'] = 'Статус групи';
-$lang['GROUP_DELETE'] = 'Видалити групу.';
+$lang['GROUP_DELETE'] = 'Видалити групу';
 $lang['GROUP_DELETE_CHECK'] = 'Видалити цю групу';
 $lang['SUBMIT_GROUP_CHANGES'] = 'Зберегти зміни';
 $lang['RESET_GROUP_CHANGES'] = 'Відмінити зміни';
diff --git a/upload/posting.php b/upload/posting.php
index 1b20357d1..ad8bfddcf 100644
--- a/upload/posting.php
+++ b/upload/posting.php
@@ -30,6 +30,7 @@ $topic_type = (@$_POST['topictype']) ? (int) $_POST['topictype'] : POST_NORMAL;
 $topic_type = in_array($topic_type, array(POST_NORMAL, POST_STICKY, POST_ANNOUNCE)) ? $topic_type : POST_NORMAL;
 
 $selected_rg = 0;
+$switch_rg_sig = 0;
 $switch_poster_rg_sig = 0;
 
 if ($mode == 'smilies')
diff --git a/upload/templates/default/group_config.tpl b/upload/templates/default/group_config.tpl
index 4e0b646f5..afbf9f1c7 100644
--- a/upload/templates/default/group_config.tpl
+++ b/upload/templates/default/group_config.tpl
@@ -23,17 +23,17 @@ function manage_group(mode, value) {
 	</tr>
 	<tr>
 		<td>{L_GROUP_NAME}:</td>
-		<td><input type="text" id="group_name" size="80" value="{GROUP_NAME}" onblur="javascript:manage_group(this.id, this.value, this.id);" /></td>
+		<td><input type="text" id="group_name" size="80" value="{GROUP_NAME}" onblur="manage_group(this.id, this.value);" /></td>
 	</tr>
 	<tr>
 		<td>{L_GROUP_DESCRIPTION}:</td>
 		<td><div id="preview_description"></div>
 			<p>
-				<textarea cols="80" id="group_description" rows="6" >{GROUP_DESCRIPTION}</textarea>
+				<textarea cols="80" id="group_description" rows="6">{GROUP_DESCRIPTION}</textarea>
 			</p>
 			<p>
 				<input type="button" value="{L_AJAX_PREVIEW}" onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_description').val()});ajax.callback.posts=function(data){$('div#preview_description').html(data.message_html);initPostBBCode('div#preview_description')}">
-				<input type="button" value="{L_SAVE}" onclick="javascript:manage_group('group_description',$('textarea#group_description').val())">
+				<input type="button" value="{L_SAVE}" onclick="manage_group('group_description',$('textarea#group_description').val())">
 			</p>
 		</td>
 	</tr>
@@ -41,11 +41,11 @@ function manage_group(mode, value) {
 		<td>{L_SIGNATURE}:</td>
 		<td><div id="preview_signature"></div>
 			<p>
-				<textarea cols="80" id="group_signature" rows="3" >{GROUP_SIGNATURE}</textarea>
+				<textarea cols="80" id="group_signature" rows="3">{GROUP_SIGNATURE}</textarea>
 			</p>
 			<p>
 				<input type="button" value="{L_AJAX_PREVIEW}" onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_signature').val()});ajax.callback.posts=function(data){$('div#preview_signature').html(data.message_html);initPostBBCode('div#preview_signature')}">
-				<input type="button" value="{L_SAVE}" onclick="javascript:manage_group('group_signature',$('textarea#group_signature').val())">
+				<input type="button" value="{L_SAVE}" onclick="manage_group('group_signature',$('textarea#group_signature').val())">
 			</p>
 		</td>
 	</tr>
@@ -53,36 +53,39 @@ function manage_group(mode, value) {
 		<td>{L_GROUP_TYPE}:</td>
 		<td>
 			<p>
-				<label><input type="radio" name="group_type" onchange="javascript:manage_group(this.name,this.value)" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} />{L_GROUP_OPEN}</label> &nbsp;&nbsp;
-				<label><input type="radio" name="group_type" onchange="javascript:manage_group(this.name,this.value)" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} />{L_GROUP_CLOSED}</label> &nbsp;&nbsp;
-				<label><input type="radio" name="group_type" onchange="javascript:manage_group(this.name,this.value)" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} />{L_GROUP_HIDDEN}</label>
+				<label><input type="radio" name="group_type" onchange="manage_group(this.name,this.value)" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} />{L_GROUP_OPEN}</label> &nbsp;&nbsp;
+				<label><input type="radio" name="group_type" onchange="manage_group(this.name,this.value)" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} />{L_GROUP_CLOSED}</label> &nbsp;&nbsp;
+				<label><input type="radio" name="group_type" onchange="manage_group(this.name,this.value)" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} />{L_GROUP_HIDDEN}</label>
 			</p>
 		</td>
 	</tr>
 	<tr>
-		<td>{L_RELEASE_GROUP}</td>
+		<td>{L_RELEASE_GROUP}:</td>
 		<td>
-			<label><input type="radio" name="release_group" value="1" onclick="javascript:manage_group(this.name,this.value)" <!-- IF RELEASE_GROUP -->checked="checked"<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
-			<label><input type="radio" name="release_group" value="0" onclick="javascript:manage_group(this.name,this.value)" <!-- IF not RELEASE_GROUP -->checked="checked"<!-- ENDIF --> />{L_NO}</label>
+			<label><input type="radio" name="release_group" value="1" onclick="manage_group(this.name,this.value)" <!-- IF RELEASE_GROUP -->checked="checked"<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
+			<label><input type="radio" name="release_group" value="0" onclick="manage_group(this.name,this.value)" <!-- IF not RELEASE_GROUP -->checked="checked"<!-- ENDIF --> />{L_NO}</label>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			{L_AVATAR}
+			{L_AVATAR}:
 			<!-- IF AVATAR_URL_PATH -->
+			<br /><br />
 			<div id="avatar" align="center">
 				<p>
 					<img src="{AVATARS_URL}/{AVATAR_URL_PATH}" alt="avatar" />
 				</p>
+				<br />
 				<p>
-					<input type="button" name="delete_avatar" value="{L_DELETE_IMAGE}" onclick="javascript:manage_group(this.name,this.value)" />
+					<input type="button" name="delete_avatar" value="{L_DELETE_IMAGE}" onclick="manage_group(this.name,this.value)" />
 				</p>
 			</div>
 			<!-- ENDIF -->
 		</td>
 		<td valign="top">
-			<div id="avatar_explain" class="med">{AVATAR_EXPLAIN}</div><br/>
+			<div id="avatar_explain" class="med">{AVATAR_EXPLAIN}</div>
 			<!-- IF $bb_cfg['group_avatars']['up_allowed'] -->
+				<br />
 				<form action="{S_GROUP_CONFIG_ACTION}" method="post" enctype="multipart/form-data">
 					{S_HIDDEN_FIELDS}
 					<input type="hidden" name="MAX_FILE_SIZE" value="{$bb_cfg['avatars']['max_size']}" />
diff --git a/upload/templates/default/groupcp.tpl b/upload/templates/default/groupcp.tpl
index 0cea61b76..53ca85776 100644
--- a/upload/templates/default/groupcp.tpl
+++ b/upload/templates/default/groupcp.tpl
@@ -25,7 +25,7 @@
 		<!-- BEGIN groups -->
 		<td class="vTop pad_4">
 			<ul>
-			    {groups.GROUP_SELECT}
+				{groups.GROUP_SELECT}
 			</ul>
 		</td>
 		<!-- END groups -->
@@ -64,17 +64,25 @@
 	<td valign="top">
 		<!-- IF GROUP_DESCRIPTION -->
 		<div class="post_wrap">{GROUP_DESCRIPTION}</div>
+		<!-- ELSE -->
+			-
 		<!-- ENDIF / GROUP_DESCRIPTION -->
 	</td>
 </tr>
+<!-- IF GROUP_SIGNATURE -->
+<tr>
+	<td>{L_GROUP_SIGNATURE}:</td>
+	<td><div class="post_wrap">{GROUP_SIGNATURE}</div></td>
+</tr>
+<!-- ENDIF / GROUP_SIGNATURE -->
 <!-- IF RELEASE_GROUP -->
 <tr>
-	<td>{L_GROUP_TYPE}</td>
+	<td>{L_GROUP_TYPE}:</td>
 	<td>{L_RELEASE_GROUP}</td>
 </tr>
 <!-- ENDIF -->
 <tr>
-	<td>{L_GROUP_TIME}</td>
+	<td>{L_GROUP_TIME}:</td>
 	<td>{GROUP_TIME}</td>
 </tr>
 <tr>
@@ -103,7 +111,7 @@
 </form>
 
 <div class="spacer_10"></div>
-<p class="nav"><a href="{U_GROUP_MEMBERS}" name="members">{L_GROUP_MEMBERS}</a>&nbsp; <!-- IF RELEASE_GROUP -->::&nbsp;<a href="{U_GROUP_RELEASES}" name="releases">{L_GROUPS_RELEASES}</a><!-- ENDIF --></p>
+<p class="nav"><a href="{U_GROUP_MEMBERS}" name="members">{L_GROUP_MEMBERS}</a><!-- IF RELEASE_GROUP -->&nbsp;::&nbsp;<a href="{U_GROUP_RELEASES}" name="releases">{L_GROUPS_RELEASES}</a><!-- ENDIF --></p>
 
 <!-- IF MEMBERS -->
 <form action="{S_GROUPCP_ACTION}" method="post" name="post">
@@ -197,13 +205,11 @@
 </table>
 
 <div class="bottom_info">
-
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
-
 </div><!--/bottom_info-->
 
 <!-- IF PENDING_USERS -->
diff --git a/upload/templates/default/posting.tpl b/upload/templates/default/posting.tpl
index 498a7e5ae..cb1a9a1e8 100644
--- a/upload/templates/default/posting.tpl
+++ b/upload/templates/default/posting.tpl
@@ -94,7 +94,6 @@
 <tr>
 	<td class="vTop pad_4">
 		<p><b>{L_MESSAGE}</b></p>
-
 		<table id="smilies" class="smilies borderless mrg_16">
 		<!-- BEGIN smilies_row -->
 		<tr>
@@ -115,10 +114,10 @@
 <!-- IF IN_PM -->
 <!-- ELSEIF LOGGED_IN -->
 <tr>
-	<td class="row1 vTop pad_4" valign="top">
+	<td class="vTop pad_4" valign="top">
 		<p><b>{L_OPTIONS}</b></p>
 	</td>
-	<td class="row2">
+	<td>
 	<div class="floatL">
 		<table class="borderless inline">
 		<!-- IF SHOW_UPDATE_POST_TIME -->
@@ -140,7 +139,7 @@
 <!-- ENDIF / LOGGED_IN -->
 <!-- IF ATTACHBOX && POSTER_RGROUPS -->
 <tr>
-	<td><b>{L_POST_RELEASE_FROM_GROUP}:</b></td>
+	<td class="vTop pad_4" valign="top"><b>{L_POST_RELEASE_FROM_GROUP}</b></td>
 	<td>
 		<select name="poster_rg">
 			<option value="-1">{L_CHOOSE_RELEASE_GROUP}</option>
diff --git a/upload/templates/default/tracker.tpl b/upload/templates/default/tracker.tpl
index 72d116a74..3a2515fcc 100644
--- a/upload/templates/default/tracker.tpl
+++ b/upload/templates/default/tracker.tpl
@@ -216,6 +216,12 @@ $(function(){
 					<p class="select">{S_NOT_SEEN_SELECT}</p>
 				</div>
 				</fieldset>
+				<fieldset>
+				<legend>{L_GROUPS_RELEASES}</legend>
+				<div>
+					<p class="select">{S_RG_SELECT}</p>
+				</div>
+				</fieldset>
 			</td>
 			<td width="30%">
 				<fieldset>
@@ -239,14 +245,18 @@ $(function(){
 				<legend>{L_MY_DOWNLOADS}</legend>
 				<div>
 					<table class="borderless my_downloads" cellspacing="0">
-					<tr>
-						<td>{DL_COMPL_CHBOX}</td>
-						<td>{DL_WILL_CHBOX}</td>
-					</tr>
-					<tr>
-						<td>{DL_DOWN_CHBOX}</td>
-						<td>{DL_CANCEL_CHBOX}</td>
-					</tr>
+						<tr>
+							<td>{DL_COMPL_CHBOX}</td>
+						</tr>
+						<tr>
+							<td>{DL_WILL_CHBOX}</td>
+						</tr>
+						<tr>
+							<td>{DL_DOWN_CHBOX}</td>
+						</tr>
+						<tr>
+							<td>{DL_CANCEL_CHBOX}</td>
+						</tr>
 					</table>
 				</div>
 				</fieldset>
@@ -267,12 +277,6 @@ $(function(){
 				</div>
 				</fieldset>
 				<fieldset>
-				<legend>{L_GROUPS_RELEASES}</legend>
-				<div>
-					<p class="select">{S_RG_SELECT}</p>
-				</div>
-				</fieldset>
-				<fieldset>
 				<legend><span class="a-hash bold" onclick="$(this).addClass('bold').next().removeClass('bold'); $('#title_search').attr('name','{TITLE_MATCH_NAME}');">{L_TITLE_MATCH}</span>&nbsp;&middot;&nbsp;<span class="a-hash" onclick="$(this).addClass('bold').prev().removeClass('bold'); $('#title_search').attr('name','hash');">{L_HASH_S}</span></legend>
 				<div>
 					<p class="input">
diff --git a/upload/templates/default/viewtopic.tpl b/upload/templates/default/viewtopic.tpl
index d7b868b93..5f8cfc4a7 100644
--- a/upload/templates/default/viewtopic.tpl
+++ b/upload/templates/default/viewtopic.tpl
@@ -406,19 +406,17 @@ function build_poll_add_form (src_el)
 				<span id="pe_{postrow.POST_ID}"></span>
 				<span id="pp_{postrow.POST_ID}">{postrow.MESSAGE}</span>
 				<!-- IF postrow.RG_NAME -->
-				<div align="center">
-					<table id="pg_{postrow.POST_ID}" style="border-left:4px solid #DEDEDE;">
-						<tr><td colspan="2" align="left" valign="middle" style="border-bottom:1px solid #DEDEDE;padding:5px;" class="genmed bold">{L_RELEASE_FROM_RG}:</td></tr>
-						<tr>
-							<td style="padding:5px;">{postrow.RG_AVATAR}</td>
-							<td align="left" style="padding:5px;" width="350px"><a href="{postrow.RG_URL}" class="med bold"><h1>{postrow.RG_NAME}</h1></a></td>
-						</tr>
-					</table>
+				<div id="pg_{postrow.POST_ID}" class="alert alert-warning" style="width: 93%;">
+					<h4 class="alert-heading">{L_RELEASE_FROM_RG} <a href="{postrow.RG_URL}">{postrow.RG_NAME}</a></h4>
+					<div id="pg_info_{postrow.POST_ID}">
+						<!-- IF postrow.RG_AVATAR --><hr /><a href="{postrow.RG_URL}">{postrow.RG_AVATAR}</a><!-- ENDIF -->
+						<!-- IF postrow.RG_SIG --><hr /><div id="rg_sig">{postrow.RG_SIG}</div><!-- ENDIF -->
+						<hr /><a href="{postrow.RG_FIND_URL}">{L_MORE_RELEASES}</a>
+					</div>
 				</div>
 				<!-- ENDIF -->
-				<!-- IF postrow.RG_SIG --><div id="rg_sig">{postrow.RG_SIG}</div><!-- ENDIF -->
 				<div id="pc_{postrow.POST_ID}" <!-- IF not postrow.MC_COMMENT -->style="display: none;"<!-- ENDIF -->>
-					<div id="mc_class_{postrow.POST_ID}" class="alert alert-{postrow.MC_CLASS}" style="width: 92%;">
+					<div id="mc_class_{postrow.POST_ID}" class="alert alert-{postrow.MC_CLASS}" style="width: 93%;">
 						<h4 class="alert-heading">{postrow.MC_TITLE}</h4><hr />
 						<div id="mc_comment_{postrow.POST_ID}">{postrow.MC_COMMENT}</div>
 					</div>
diff --git a/upload/tracker.php b/upload/tracker.php
index f5e047573..90b3114da 100644
--- a/upload/tracker.php
+++ b/upload/tracker.php
@@ -22,7 +22,7 @@ $user->session_start(array('req_login' => $bb_cfg['bt_tor_browse_only_reg']));
 set_die_append_msg();
 
 $tor_search_limit    = (IS_AM) ? 2000 : 500;
-$forum_select_size   = 26; // forum select box max rows
+$forum_select_size   = 25; // forum select box max rows
 $max_forum_name_len  = 60; // inside forum select box
 $max_forums_selected = 50;
 $title_match_max_len = 60;
@@ -477,14 +477,6 @@ if ($dl_will_val)   $dl_status[] = DL_STATUS_WILL;
 $dl_status_csv = join(',', $dl_status);
 
 // Switches
-$only_new        = ($new_val && !IS_GUEST);
-$only_active     = ($active_val || $seed_exist);
-$dl_search       = ($dl_status && !IS_GUEST);
-$only_my         = ($my_val && !IS_GUEST && !$dl_search);
-$prev_days       = ($time_val != $search_all);
-$s_release_group = ($s_rg_val != $search_all);
-$s_not_seen      = ($s_not_seen_val != $search_all);
-
 $seed_exist      = (bool) $seed_exist_val;
 $poster_id       = (bool) $poster_id_val;
 $title_match     = (bool) $title_match_sql;
@@ -495,6 +487,14 @@ $hide_forum      = intval(!$show_forum_val);
 $hide_author     = intval(!$show_author_val);
 $hide_speed      = intval(!$show_speed_val);
 
+$only_new        = ($new_val && !IS_GUEST);
+$only_active     = ($active_val || $seed_exist);
+$dl_search       = ($dl_status && !IS_GUEST);
+$only_my         = ($my_val && !IS_GUEST && !$dl_search);
+$prev_days       = ($time_val != $search_all);
+$s_release_group = ($s_rg_val != $search_all);
+$s_not_seen      = ($s_not_seen_val != $search_all);
+
 if ($s_not_seen_val != $search_all)
 {
 	$seed_exist_val = 0;
diff --git a/upload/viewtopic.php b/upload/viewtopic.php
index e27baefd2..20dae9cf7 100644
--- a/upload/viewtopic.php
+++ b/upload/viewtopic.php
@@ -693,7 +693,7 @@ for($i = 0; $i < $total_posts; $i++)
 	$mc_user_id       = profile_url(array('username' => $postrow[$i]['mc_username'], 'user_id' => $postrow[$i]['mc_user_id'], 'user_rank' => $postrow[$i]['mc_user_rank']));
 
 	$rg_id            = ($postrow[$i]['poster_rg_id']) ? $postrow[$i]['poster_rg_id'] : 0;
-	$rg_avatar        = get_avatar(GROUP_AVATAR_MASK . $rg_id, $postrow[$i]['rg_avatar_id'], true, 100, 100);
+	$rg_avatar        = get_avatar(GROUP_AVATAR_MASK . $rg_id, $postrow[$i]['rg_avatar_id']);
 	$rg_name          = ($postrow[$i]['group_name']) ? htmlCHR($postrow[$i]['group_name']) : '';
 	$rg_signature     = ($postrow[$i]['group_signature']) ? bbcode2html(htmlCHR($postrow[$i]['group_signature'])) : '';
 
@@ -883,6 +883,7 @@ for($i = 0; $i < $total_posts; $i++)
 		'RG_AVATAR'          => $rg_avatar,
 		'RG_NAME'            => $rg_name,
 		'RG_URL'             => GROUP_URL . $rg_id,
+		'RG_FIND_URL'        => 'tracker.php?srg='. $rg_id,
 		'RG_SIG'             => $rg_signature,
 	));