r209

git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@209 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

upload/config.php

@@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Beta';
-$bb_cfg['tp_release_state'] = 'R208';
+$bb_cfg['tp_release_state'] = 'R209';
-$bb_cfg['tp_release_date'] = '12-08-2011';
+$bb_cfg['tp_release_date'] = '14-08-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
 $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут";

upload/groupcp.php

@@ -6,66 +6,41 @@ define('BB_ROOT', './');
 require(BB_ROOT ."common.php");
 require(INC_DIR .'functions_group.php');
 
+$page_cfg['use_tablesorter'] = true;
+
 $s_member_groups = $s_pending_groups = $s_member_groups_opt = $s_pending_groups_opt = '';
 $select_sort_mode = $select_sort_order = '';
 
-// -------------------------
+function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$pm, &$email, &$www)
-//
-function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq)
 {
 	global $lang, $images, $bb_cfg;
 
-	$from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' ';
+	$from   = ( !empty($row['user_from']) ) ? $row['user_from'] : '';
-	$joined = bb_date($row['user_regdate'], $date_format);
+	$joined = bb_date($row['user_regdate'], $lang['DATE_FORMAT']);
-	$posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
+	$posts  = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
+	$pm     = ($bb_cfg['text_buttons']) ? '<a class="txtb" href="'. append_sid("privmsg.php?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'">'. $lang['SEND_PM_TXTB'] .'</a>' : '<a href="' . append_sid("privmsg.php?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>';
 	
-	//$poster_avatar = get_avatar($row['user_avatar'], $row['user_avatar_type'], !bf($row['user_opt'], 'user_opt', 'allow_avatar'));
+	if (bf($row['user_opt'], 'user_opt', 'viewemail') || $group_mod)
+    {
+       	$email_uri = ($bb_cfg['board_email_form']) ? append_sid("profile.php?mode=email&amp;". POST_USERS_URL ."=".$row['user_id']) : 'mailto:'. $row['user_email'];
+       	$email = '<a class="editable" href="'. $email_uri .'">'. $row['user_email'] .'</a>';
+    }
+    else
+    {
+       	$email = '';
+    }
 
-	if ( bf($row['user_opt'], 'user_opt', 'viewemail') || $group_mod )
+    if ($row['user_website'])
-	{
+    {
-		$email_uri = ( $bb_cfg['board_email_form'] ) ? "profile.php?mode=email&amp;u={$row['user_id']}" : 'mailto:' . $row['user_email'];
+        $www = ($bb_cfg['text_buttons']) ? '<a class="txtb" href="'. $row['user_website'] .'"  target="_userwww">'. $lang['VISIT_WEBSITE_TXTB'] .'</a>' : '<a class="txtb" href="'. $row['user_website'] .'" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['VISIT_WEBSITE'] . '" title="' . $lang['VISIT_WEBSITE'] . '" border="0" /></a>';
-
+    }
-		$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['SEND_EMAIL'] . '" title="' . $lang['SEND_EMAIL'] . '" border="0" /></a>';
+    else
-		$email = '<a href="' . $email_uri . '">' . $lang['SEND_EMAIL'] . '</a>';
+    {
-	}
+        $www = '';
-	else
+    }
-	{
-		$email_img = '&nbsp;';
-		$email = '&nbsp;';
-	}
-
-	$temp_url = "profile.php?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id'];
-	$profile_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['READ_PROFILE'] . '" title="' . $lang['READ_PROFILE'] . '" border="0" /></a>';
-	$profile = '<a href="' . $temp_url . '">' . $lang['READ_PROFILE'] . '</a>';
-
-	$temp_url = "privmsg.php?mode=post&amp;" . POST_USERS_URL . "=" . $row['user_id'];
-	$pm_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>';
-	$pm = '<a href="' . $temp_url . '">' . $lang['SEND_PRIVATE_MESSAGE'] . '</a>';
-
-	$www_img = ( $row['user_website'] ) ? '<a href="' . $row['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['VISIT_WEBSITE'] . '" title="' . $lang['VISIT_WEBSITE'] . '" border="0" /></a>' : '';
-	$www = ( $row['user_website'] ) ? '<a href="' . $row['user_website'] . '" target="_userwww">' . $lang['VISIT_WEBSITE'] . '</a>' : '';
-
-	if ( !empty($row['user_icq']) )
-	{
-		$icq_status_img = '<a href="http://wwp.icq.com/' . $row['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $row['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>';
-		$icq_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $row['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>';
-		$icq =  '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $row['user_icq'] . '">' . $lang['ICQ'] . '</a>';
-	}
-	else
-	{
-		$icq_status_img = '';
-		$icq_img = '';
-		$icq = '';
-	}
-
-	$temp_url = "search.php?search_author=1&amp;uid={$row['user_id']}";
-	$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . sprintf($lang['SEARCH_USER_POSTS'], $row['username']) . '" title="' . sprintf($lang['SEARCH_USER_POSTS'], $row['username']) . '" border="0" /></a>';
-	$search = '<a href="' . $temp_url . '">' . sprintf($lang['SEARCH_USER_POSTS'], $row['username']) . '</a>';
 
 	return;
 }
-//
-// --------------------------
 
 $user->session_start(array('req_login' => true));
 
@@ -101,17 +76,22 @@ if (!$group_id)
 			g.group_name, g.group_description, g.group_id, g.group_type,
 			IF(ug.user_id IS NOT NULL, IF(ug.user_pending = 1, $pending, $member), 0) AS membership,
 			g.group_moderator, u.username AS moderator_name,
-			IF(g.group_moderator = ug.user_id, 1, 0) AS is_group_mod
+			IF(g.group_moderator = ug.user_id, 1, 0) AS is_group_mod,
+			COUNT(ug2.user_id) AS members, SUM(ug2.user_pending) AS candidates
 		FROM
 			". BB_GROUPS ." g
 		LEFT JOIN
 			". BB_USER_GROUP ." ug ON
 			    ug.group_id = g.group_id
 			AND ug.user_id = ". $userdata['user_id'] ."
+		LEFT JOIN
+			". BB_USER_GROUP ." ug2 ON
+			    ug2.group_id = g.group_id
 		LEFT JOIN
 			". BB_USERS ." u ON g.group_moderator = u.user_id
 		WHERE
 			g.group_single_user = 0
+		GROUP BY g.group_id
 		ORDER BY
 			is_group_mod DESC,
 			membership   DESC,
@@ -123,33 +103,60 @@ if (!$group_id)
 	{
 		if ($row['is_group_mod'])
 		{
-			$type = 'mod';
+			$type = 'MOD';
 		}
 		else if ($row['membership'] == $member)
 		{
-			$type = 'member';
+			$type = 'MEMBER';
 		}
 		else if ($row['membership'] == $pending)
 		{
-			$type = 'pending';
+			$type = 'PENDING';
 		}
 		else if ($row['group_type'] == GROUP_OPEN)
 		{
-			$type = 'open';
+			$type = 'OPEN';
 		}
 		else if ($row['group_type'] == GROUP_CLOSED)
 		{
-			$type = 'closed';
+			$type = 'CLOSED';
 		}
 		else if ($row['group_type'] == GROUP_HIDDEN && IS_ADMIN)
 		{
-			$type = 'hidden';
+			$type = 'HIDDEN';
 		}
 		else
 		{
 			continue;
 		}
-		$groups[$type][$row['group_name']] = $row['group_id'];
+
+		$data = array('id' => $row['group_id'], 'm' => ($row['members'] - $row['candidates']), 'c' => $row['candidates']);
+
+		$groups[$type][$row['group_name']] = $data;
+	}
+
+	function build_group($params)
+	{
+		global $lang;
+
+		$options = '';
+		foreach ($params as $name => $data)
+		{
+     		$text  = htmlCHR(str_short(rtrim($name), HTML_SELECT_MAX_LENGTH));
+
+     		$members = ($data['m']) ? $lang['MEMBERS_IN_GROUP'] .': '. $data['m'] : $lang['NO_GROUP_MEMBERS'];
+     		$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 .= '<ul><li class="seedmed">'. $members .'</li>';
+            if(IS_AM)
+            {
+	            $options .= '<li class="leechmed">'. $candidates .'</li>';
+            }
+            $options .= '</ul>';
+
+        }
+		return $options;
 	}
 
 	if ($groups)
@@ -159,8 +166,8 @@ if (!$group_id)
 		foreach ($groups as $type => $grp)
 		{
 			$template->assign_block_vars('groups', array(
-				'MEMBERSHIP'   => $lang['GROUP_MEMBER_' . strtoupper($type)],
+				'MEMBERSHIP'   => $lang["GROUP_MEMBER_{$type}"],
-				'GROUP_SELECT' => build_select(POST_GROUPS_URL, $grp),
+				'GROUP_SELECT' => build_group($grp),
 			));
 		}
 
@@ -235,7 +242,7 @@ else if (@$_POST['joingroup'])
 
 	if ($bb_cfg['groupcp_send_email'])
 	{
-		include(BB_ROOT .'includes/emailer.class.php');
+		include(INC_DIR .'emailer.class.php');
 		$emailer = new emailer($bb_cfg['smtp_delivery']);
 
 		$emailer->from($bb_cfg['board_email']);
@@ -295,7 +302,7 @@ else
 
 			if ($bb_cfg['groupcp_send_email'])
 			{
-				require(BB_ROOT .'includes/emailer.class.php');
+				require(INC_DIR .'emailer.class.php');
 				$emailer = new emailer($bb_cfg['smtp_delivery']);
 
 				$emailer->from($bb_cfg['board_email']);
@@ -410,45 +417,41 @@ else
 		WHERE user_id = ". $group_info['group_moderator'] ."
 	");
 
-	// Get user information for this group
+    // Members
-	$members_count = $modgroup_pending_count = 0;
+	$count_members = DB()->fetch_rowset("
-
+		SELECT u.username, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending
-	// Members
-	$group_members = DB()->fetch_rowset("
-		SELECT u.username, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, u.user_icq, ug.user_pending
 		FROM ". BB_USER_GROUP ." ug, ". BB_USERS ." u
 		WHERE ug.group_id = $group_id
 			AND ug.user_pending = 0
 			AND ug.user_id <> ". $group_moderator['user_id'] ."
 			AND u.user_id = ug.user_id
 		ORDER BY u.username
-		LIMIT $start, ". ($per_page + 1) ."
+	");
+    $count_members = count($count_members);
+
+	// Get user information for this group
+	$modgroup_pending_count = 0;
+
+	// Members
+	$group_members = DB()->fetch_rowset("
+		SELECT u.username, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending
+		FROM ". BB_USER_GROUP ." ug, ". BB_USERS ." u
+		WHERE ug.group_id = $group_id
+			AND ug.user_pending = 0
+			AND ug.user_id <> ". $group_moderator['user_id'] ."
+			AND u.user_id = ug.user_id
+		ORDER BY u.username
+		LIMIT $start, $per_page
 	");
 	$members_count = count($group_members);
 
-	if ($members_count == $per_page + 1)
+	generate_pagination(GROUP_URL . $group_id, $count_members, $per_page, $start);
-	{
-		array_pop($group_members);
-	}
-
-	if ($members_count > $per_page)
-	{
-		$items_count = $start + ($per_page * 2);
-		$pages = '?';
-	}
-	else
-	{
-		$items_count = $start + $members_count;
-		$pages = (!$members_count) ? 1 : ceil($items_count / $per_page);
-	}
-
-    generate_pagination(GROUP_URL . $group_id, $items_count, $per_page, $start);
 
 	// Pending
 	if ($is_moderator)
 	{
 		$modgroup_pending_list = DB()->fetch_rowset("
-			SELECT u.username, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, u.user_icq
+			SELECT u.username, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email
 			FROM ". BB_USER_GROUP ." ug, ". BB_USERS ." u
 			WHERE ug.group_id = $group_id
 				AND ug.user_pending = 1
@@ -524,9 +527,25 @@ else
 	$username = $group_moderator['username'];
 	$user_id = $group_moderator['user_id'];
 
-	generate_user_info($group_moderator, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq);
+	generate_user_info($group_moderator, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www);
 
+    $group_type = '';
+    if($group_info['group_type'] == GROUP_OPEN)
+    {
+    	$group_type = $lang['GROUP_OPEN'];
+    }
+	elseif($group_info['group_type'] == GROUP_CLOSED)
+	{
+		$group_type = $lang['GROUP_CLOSED'];
+	}
+	elseif($group_info['group_type'] == GROUP_HIDDEN)
+	{
+		$group_type = $lang['GROUP_HIDDEN'];
+	}
+
+	$i = 0;
 	$template->assign_vars(array(
+		'ROW_NUMBER'    => $i + ( $start + 1 ),
 		'GROUP_INFO' => true,
 		'PAGE_TITLE' => $lang['GROUP_CONTROL_PANEL'],
 
@@ -537,24 +556,12 @@ else
 		'MOD_FROM' => $from,
 		'MOD_JOINED' => $joined,
 		'MOD_POSTS' => $posts,
-		'MOD_AVATAR_IMG' => $poster_avatar,
-		'MOD_PROFILE_IMG' => $profile_img,
-		'MOD_PROFILE' => $profile,
-		'MOD_SEARCH_IMG' => $search_img,
-		'MOD_SEARCH' => $search,
-		'MOD_PM_IMG' => $pm_img,
 		'MOD_PM' => $pm,
-		'MOD_EMAIL_IMG' => $email_img,
 		'MOD_EMAIL' => $email,
-		'MOD_WWW_IMG' => $www_img,
 		'MOD_WWW' => $www,
-		'MOD_ICQ_STATUS_IMG' => $icq_status_img,
-		'MOD_ICQ_IMG' => $icq_img,
-		'MOD_ICQ' => $icq,
-
 		'U_MOD_VIEWPROFILE' => "profile.php?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id",
 		'U_SEARCH_USER' => "search.php?mode=searchuser",
-
+        'GROUP_TYPE' => $group_type,
 		'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
 		'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED,
 		'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN,
@@ -573,34 +580,23 @@ else
 		$username = $member['username'];
 		$user_id = $member['user_id'];
 
-		generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq);
+		generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www);
 
 		if ($group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator)
 		{
 			$row_class = !($i % 2) ? 'row1' : 'row2';
 
 			$template->assign_block_vars('member', array(
+				'ROW_NUMBER'    => $i + ( $start + 1 ),
 				'ROW_CLASS' => $row_class,
 				'USERNAME' => $username,
 				'FROM' => $from,
 				'JOINED' => $joined,
 				'POSTS' => $posts,
 				'USER_ID' => $user_id,
-				'AVATAR_IMG' => $poster_avatar,
-				'PROFILE_IMG' => $profile_img,
-				'PROFILE' => $profile,
-				'SEARCH_IMG' => $search_img,
-				'SEARCH' => $search,
-				'PM_IMG' => $pm_img,
 				'PM' => $pm,
-				'EMAIL_IMG' => $email_img,
 				'EMAIL' => $email,
-				'WWW_IMG' => $www_img,
 				'WWW' => $www,
-				'ICQ_STATUS_IMG' => $icq_status_img,
-				'ICQ_IMG' => $icq_img,
-				'ICQ' => $icq,
-
 				'U_VIEWPROFILE' => "profile.php?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id",
 			));
 
@@ -634,7 +630,7 @@ else
 			$username = $member['username'];
 			$user_id = $member['user_id'];
 
-			generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq);
+			generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www);
 
 			$row_class = !($i % 2) ? 'row1' : 'row2';
 
@@ -647,21 +643,8 @@ else
 				'JOINED' => $joined,
 				'POSTS' => $posts,
 				'USER_ID' => $user_id,
-				'AVATAR_IMG' => $poster_avatar,
-				'PROFILE_IMG' => $profile_img,
-				'PROFILE' => $profile,
-				'SEARCH_IMG' => $search_img,
-				'SEARCH' => $search,
-				'PM_IMG' => $pm_img,
 				'PM' => $pm,
-				'EMAIL_IMG' => $email_img,
 				'EMAIL' => $email,
-				'WWW_IMG' => $www_img,
-				'WWW' => $www,
-				'ICQ_STATUS_IMG' => $icq_status_img,
-				'ICQ_IMG' => $icq_img,
-				'ICQ' => $icq,
-
 				'U_VIEWPROFILE' => "profile.php?mode=viewprofile&amp;". POST_USERS_URL ."=$user_id",
 			));
 		}

upload/language/lang_english/lang_main.php

@@ -782,7 +782,7 @@ $lang['NONE'] = 'None';
 $lang['SUBSCRIBE'] = 'Subscribe';
 $lang['UNSUBSCRIBE_GROUP'] = 'Unsubscribe';
 $lang['VIEW_INFORMATION'] = 'View Information';
-
+$lang['MEMBERS_IN_GROUP'] = 'Members in group';
 
 //
 // Search
@@ -1538,7 +1538,7 @@ $lang['TRACKER_S'] = 'on tracker';
 
 // copyright
 $lang['NOTICE'] = '!ATTENTION!';
-$lang['POWERED'] = 'Powered by <a target="_blank" href="http://torrentpier.me">TorrentPier</a> &copy; Meithar';
+$lang['POWERED'] = 'Powered by <a target="_blank" href="http://torrentpier.me">TorrentPier II</a> &copy; Meithar';
 $lang['DIVE'] = 'The forum is submitted on base <a target="_blank" href="http://www.phpbb.com">phpBB</a> &copy; phpBB Group';
 $lang['COPY'] = 'The site does not give electronic versions of products, and is engaged only in a collecting and cataloguing of the references sent and published at a forum by our readers. If you are the legal owner of any submitted material and do not wish that the reference to him{it} was in our catalogue, contact us and we shall immediately remove her. Files for an exchange on tracker are given by users of a site, and the administration does not bear the responsibility for their maintenance. The request to not fill in the files protected by copyrights, and also files of the illegal maintenance!';
 

upload/language/lang_russian/lang_main.php

@@ -786,7 +786,7 @@ $lang['NONE'] = 'Нет';
 $lang['SUBSCRIBE'] = 'Записаться в группу';
 $lang['UNSUBSCRIBE_GROUP'] = 'Выйти из группы';
 $lang['VIEW_INFORMATION'] = 'Просмотреть информацию';
-
+$lang['MEMBERS_IN_GROUP'] = 'Кол-во участников';
 
 //
 // Search
@@ -1543,7 +1543,7 @@ $lang['TRACKER_S'] = 'по трекеру';
 
 // copyright
 $lang['NOTICE'] = '!ВНИМАНИЕ!';
-$lang['POWERED'] = 'Powered by <a target="_blank" href="http://torrentpier.me">TorrentPier</a> &copy; Meithar';
+$lang['POWERED'] = 'Powered by <a target="_blank" href="http://torrentpier.me">TorrentPier II</a> &copy; Meithar';
 $lang['DIVE'] = 'Форум представлен на базе <a target="_blank" href="http://www.phpbb.com">phpBB</a> &copy; phpBB Group';
 $lang['COPY'] = 'Сайт не предоставляет электронные версии произведений, а занимается лишь коллекционированием и каталогизацией ссылок, присылаемых и публикуемых на форуме нашими читателями. Если вы являетесь правообладателем какого-либо представленного материала и не желаете, чтобы ссылка на него находилась в нашем каталоге, свяжитесь с нами, и мы незамедлительно удалим её. Файлы для обмена на трекере предоставлены пользователями сайта, и администрация не несёт ответственности за их содержание. Просьба не заливать файлы, защищенные авторскими правами, а также файлы нелегального содержания!';
 

upload/language/lang_russian/lang_xs.php

@@ -43,7 +43,7 @@ $lang['XS_MENU'] = 'Меню «<b>eXtreme Styles</b>»';
 $lang['XS_CONFIGURATION'] = 'Конфигурация';
 $lang['XS_CONFIGURATION_EXPLAIN'] = 'Эта функция позволяет вам управлять стилями.';
 $lang['XS_MANAGE_CACHE'] = 'Управление кешем';
-$lang['XS_MANAGE_CACHE_EXPLAIN'] = 'This feature allows you to manage cached files.';
+$lang['XS_MANAGE_CACHE_EXPLAIN'] = 'Эта функция позволяет вам управлять кэшированными файлами.';
 $lang['XS_SET_CONFIGURATION_LC'] = 'Выбрать конфигурацию';
 $lang['XS_SET_DEFAULT_STYLE_LC'] = 'Выбрать стандартный стиль';
 $lang['XS_MANAGE_CACHE_LC'] = 'Управление кешем';

upload/templates/default/groupcp.tpl

@@ -1,4 +1,7 @@
 <h1 class="pagetitle">{PAGE_TITLE}<!-- IF GROUP_NAME --> :: {GROUP_NAME}<!-- ENDIF --></h1>
+<!-- IF GROUP_TYPE --><div class="pad_4">{L_GROUP_TYPE}: <b>{GROUP_TYPE}</b></div><!-- ENDIF -->
+<!-- IF PAGINATION --><div class="pad_4">{PAGE_NUMBER}</div><!-- ENDIF -->
+<div class="spacer_4"></div>
 
 <p class="nav"><a href="{U_INDEX}">{T_INDEX}</a></p>
 
@@ -6,32 +9,40 @@
 <!--========================================================================-->
 
 <table class="forumline">
-<col class="row1">
-<col class="row2">
 <tr>
-	<th colspan="2">{L_MEMBERSHIP_DETAILS}</th>
+	<th>{L_MEMBERSHIP_DETAILS}</th>
 </tr>
-<!-- BEGIN groups -->
+<tbody class="row1">
 <tr>
-	<td width="30%"><span class="gen">{groups.MEMBERSHIP}</span></td>
+	<td class="pad_4">
-	<td style="padding: 5px 30px;">
+	<table class="bordered wAuto bCenter">
-	<form method="get" action="{S_USERGROUP_ACTION}">
+	<tr class="row2">
-	{S_HIDDEN_FIELDS}
+	    <!-- BEGIN groups -->
-		<div style="float: left;">
+		<td class="pad_8 med bold">{groups.MEMBERSHIP}</td>
-			{groups.GROUP_SELECT}
+		<!-- END groups -->
-		</div>
+	</tr>
-		<div style="float: right;">
+	<tr>
-			<input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />
+		<!-- BEGIN groups -->
-		</div>
+		<td class="vTop pad_4">
-	</form>
+			<ul>
+			    {groups.GROUP_SELECT}
+			</ul>
+		</td>
+		<!-- END groups -->
+	</tr>
+	</table>
 	</td>
 </tr>
-<!-- END groups -->
+</tbody>
+<tr>
+	<td class="catBottom">&nbsp;</td>
+</tr>
 </table>
 
 <!--========================================================================-->
 <!-- ENDIF / SELECT_GROUP -->
 
+
 <!-- IF GROUP_INFO -->
 <!--========================================================================-->
 
@@ -56,17 +67,14 @@
 <!-- ENDIF / GROUP_DESCRIPTION -->
 <tr>
 	<td>{L_GROUP_MEMBERSHIP}:</td>
-	<td><p>{GROUP_DETAILS}</p>
+	<td><p>{GROUP_DETAILS}
 	<!-- IF SHOW_SUBSCRIBE_CONTROLS -->
-	<p class="mrg_4">
+		<input class="mainoption" type="submit" name="joingroup" value="{L_JOIN_A_GROUP}" onclick="return confirm('{L_JOIN_A_GROUP}?');" />
-		<input class="mainoption" type="submit" name="joingroup" value="{L_JOIN_A_GROUP}" onclick="return confirm('{L_JOIN_A_GROUP}?');" />&nbsp;&nbsp;
-	</p>
 	<!-- ENDIF -->
 	<!-- IF SHOW_UNSUBSCRIBE_CONTROLS -->
-	<p class="mrg_4">
+		<input class="mainoption" type="submit" name="{CONTROL_NAME}" value="{L_UNSUBSCRIBE_GROUP}" onclick="return confirm('{L_UNSUBSCRIBE_GROUP}?');" />
-		<input class="mainoption" type="submit" name="{CONTROL_NAME}" value="{L_UNSUBSCRIBE_GROUP}" onclick="return confirm('{L_UNSUBSCRIBE_GROUP}?');" />&nbsp;&nbsp;
-	</p>
 	<!-- ENDIF -->
+	</p>
 	</td>
 </tr>
 <!-- BEGIN switch_mod_option -->
@@ -77,7 +85,6 @@
 			<label><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} />{L_GROUP_OPEN}</label> &nbsp;&nbsp;
 			<label><input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} />{L_GROUP_CLOSED}</label> &nbsp;&nbsp;
 			<label><input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} />{L_GROUP_HIDDEN}</label>
-			
 			&nbsp; <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" />
 		</p>
 	</td>
@@ -92,40 +99,49 @@
 <form action="{S_GROUPCP_ACTION}" method="post" name="post">
 {S_HIDDEN_FIELDS}
 
-<table class="forumline">
+<table class="forumline tablesorter">
+<thead>
 <tr>
-	<th>{L_PRIVATE_MESSAGE}</th>
+	<th class="{sorter: 'digit'}" ><b class="tbs-text">#</b></th>
-	<th>{L_USERNAME}</th>
+	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_USERNAME}</b></th>
-	<th>{L_POSTS_SHORT}</th>
+	<th class="{sorter: false}" ><b class="tbs-text">{L_PM}</b></th>
-	<th>{L_LOCATION}</th>
+	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_EMAIL}</b></th>
-	<th>{L_EMAIL}</th>
+	<th class="{sorter: false}" ><b class="tbs-text">{L_LOCATION}</b></th>
-	<th>{L_WEBSITE}</th>
+	<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_JOINED}</b></th>
-	<th>{L_SELECT}</th>
+	<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_POSTS_SHORT}</b></th>
+	<th class="{sorter: false}" ><b class="tbs-text">{L_WEBSITE}</b></th>
+	<th class="{sorter: false}" ><b class="tbs-text">#</b></th>
 </tr>
 <tr>
-	<td colspan="7" class="catTitle">{L_GROUP_MODERATOR}</td>
+	<td colspan="9" class="catTitle">{L_GROUP_MODERATOR}</td>
 </tr>
 <tr class="row1 tCenter">
-	<td>{MOD_PM_IMG}</td>
+	<td width="3%">{ROW_NUMBER}</td>
 	<td><a href="{U_MOD_VIEWPROFILE}" class="gen"><b>{MOD_USERNAME}</b></a></td>
-	<td>{MOD_POSTS}</td>
+	<td>{MOD_PM}</td>
+	<td>{MOD_EMAIL}</td>
 	<td>{MOD_FROM}</td>
-	<td>{MOD_EMAIL_IMG}</td>
+	<td class="small">{MOD_JOINED}</td>
-	<td>{MOD_WWW_IMG}</td>
+	<td>{MOD_POSTS}</td>
-	<td>&nbsp;</td>
+	<td>{MOD_WWW}</td>
+	<td width="3%">&nbsp;</td>
 </tr>
 <tr>
-	<td colspan="7" class="catTitle">{L_GROUP_MEMBERS}</td>
+	<td colspan="9" class="catTitle">{L_GROUP_MEMBERS}</td>
 </tr>
+</thead>
+
 <!-- BEGIN member -->
 <tr class="{member.ROW_CLASS} tCenter">
-	<td>{member.PM_IMG}</td>
+	<td width="3%">{member.ROW_NUMBER}</td>
 	<td><a href="{member.U_VIEWPROFILE}" class="gen">{member.USERNAME}</a></td>
-	<td>{member.POSTS}</td>
+	<td>{member.PM}</td>
+	<td>{member.EMAIL}</td>
 	<td>{member.FROM}</td>
-	<td>{member.EMAIL_IMG}</td>
+	<td class="small">{member.JOINED}</td>
-	<td>{member.WWW_IMG}</td>
+	<td>{member.POSTS}</td>
-	<td>
+	<td>{member.WWW}</td>
+	<td width="3%">
 		<!-- BEGIN switch_mod_option -->
 		<input type="checkbox" name="members[]" value="{member.USER_ID}" />
 		<!-- END switch_mod_option -->
@@ -135,19 +151,20 @@
 
 <!-- BEGIN switch_no_members -->
 <tr>
-	<td colspan="7" class="row1 tCenter">{L_NO_GROUP_MEMBERS}</td>
+	<td colspan="9" class="row1 tCenter">{L_NO_GROUP_MEMBERS}</td>
 </tr>
 <!-- END switch_no_members -->
 
 <!-- BEGIN switch_hidden_group -->
 <tr>
-	<td colspan="7" class="row1 tCenter">{L_HIDDEN_GROUP_MEMBERS}</td>
+	<td colspan="9" class="row1 tCenter">{L_HIDDEN_GROUP_MEMBERS}</td>
 </tr>
 <!-- END switch_hidden_group -->
 
 <!-- BEGIN switch_mod_option -->
+<tfoot>
 <tr>
-	<td colspan="7" class="cat" style="padding: 2px 12px;">
+	<td colspan="9" class="cat" style="padding: 2px 12px;">
 		<p id="add_group_member" class="floatL">
 			<input type="text" name="username" maxlength="50" size="20" />
 			<input type="submit" name="add" value="{L_ADD_MEMBER}" class="mainoption" />
@@ -158,6 +175,7 @@
 		</p>
 	</td>
 </tr>
+</tfoot>
 <!-- END switch_mod_option -->
 
 </table>
@@ -174,38 +192,45 @@
 
 <!-- IF PENDING_USERS -->
 <table class="forumline">
+<thead>
 <tr>
-		<th>{L_SELECT}</th>
+	<th class="{sorter: false}" ><b class="tbs-text">{L_SELECT}</b></th>
-		<th>{L_USERNAME}</th>
+	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_USERNAME}</b></th>
-		<th>{L_POSTS_SHORT}</th>
+	<th class="{sorter: false}" ><b class="tbs-text">{L_PM}</b></th>
-		<th>{L_LOCATION}</th>
+	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_EMAIL}</b></th>
-		<th>{L_EMAIL}</th>
+	<th class="{sorter: false}" ><b class="tbs-text">{L_LOCATION}</b></th>
-		<th>{L_WEBSITE}</th>
+	<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_JOINED}</b></th>
-		<th>{L_PRIVATE_MESSAGE}</th>
+	<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_POSTS_SHORT}</b></th>
+	<th class="{sorter: false}" ><b class="tbs-text">{L_WEBSITE}</b></th>
+	
 </tr>
 <tr>
 		<td class="catTitle" colspan="8">{L_PENDING_MEMBERS}</td>
 </tr>
+</thead>
 <!-- BEGIN pending -->
 <tr class="{pending.ROW_CLASS} tCenter">
-	<td><input type="checkbox" name="pending_members[]" value="{pending.USER_ID}" /></td>
+	<td><input type="checkbox" name="pending_members[]" value="{pending.USER_ID}"/></td>
 	<td><a href="{pending.U_VIEWPROFILE}" class="gen">{pending.USERNAME}</a></td>
-	<td>{pending.POSTS}</td>
+	<td>{pending.PM}</td>
+	<td>{pending.EMAIL}</td>
 	<td>{pending.FROM}</td>
-	<td>{pending.EMAIL_IMG}</td>
+	<td class="small">{pending.JOINED}</td>
-	<td>{pending.WWW_IMG}</td>
+	<td>{pending.POSTS}</td>
-	<td>{pending.PM_IMG}</td>
+	<td>{pending.WWW}</td>
+	
 </tr>
 <!-- END pending -->
+<tfoot>
 <tr>
-	<td class="cat" colspan="7">
+	<td class="cat" colspan="8">
 		<input type="submit" name="approve" value="{L_APPROVE_SELECTED}" onclick="return confirm('{L_APPROVE_SELECTED}?');" class="mainoption" />
 		&nbsp;
 		<input type="submit" name="deny" value="{L_DENY_SELECTED}" onclick="return confirm('{L_DENY_SELECTED}?');" class="liteoption" />
 	</td>
 </tr>
+</tfoot>
 </table>
-
 <!-- ENDIF / PENDING_USERS -->
 
 </form>

upload/templates/default/usercp_viewprofile.tpl

@@ -453,7 +453,7 @@ $(document).ready(function(){
 	<!-- END leech -->
 
 	<tr class="row2 tCenter">
-		<td class="catBottom" colspan="4" class="pad_6">
+		<td class="catBottom pad_6" colspan="4">
 			<!-- IF SHOW_SEARCH_DL -->
 				<a href="{U_SEARCH_DL_WILL}" class="med">{L_SEARCH_DL_WILL_DOWNLOADS}</a>
 				::