diff --git a/upload/config.php b/upload/config.php index d9193d3a3..e22aaf282 100644 --- a/upload/config.php +++ b/upload/config.php @@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Increase number of revision after update $bb_cfg['tp_version'] = '2.5 Beta'; -$bb_cfg['tp_release_state'] = 'R416'; -$bb_cfg['tp_release_date'] = '12-05-2012'; +$bb_cfg['tp_release_state'] = 'R418'; +$bb_cfg['tp_release_date'] = '18-05-2012'; // Database $charset = 'utf8'; diff --git a/upload/includes/ucp/usercp_topic_watch.php b/upload/includes/ucp/usercp_topic_watch.php index 088cef286..309267d47 100644 --- a/upload/includes/ucp/usercp_topic_watch.php +++ b/upload/includes/ucp/usercp_topic_watch.php @@ -13,9 +13,10 @@ $user_id = $userdata['user_id']; $start = isset($_GET['start']) ? abs(intval($_GET['start'])) : 0; $per_page = $bb_cfg['topics_per_page']; -if ( isset($HTTP_POST_VARS['watch_list']) ) +if ( isset($_POST['topic_id_list']) ) { - $topic_ids = implode(",", $HTTP_POST_VARS['watch_list']); + $topic_ids = implode(",", $_POST['topic_id_list']); + $sql = "DELETE FROM ". BB_TOPICS_WATCH ." WHERE topic_id IN(". $topic_ids .") AND user_id = $user_id"; @@ -63,7 +64,7 @@ if ($watch_count > 0) for ( $i = 0; $i < count($watch); $i++ ) { $is_unread = is_unread($watch[$i]['topic_last_post_time'], $watch[$i]['topic_id'], $watch[$i]['forum_id']); - + $template->assign_block_vars('watch', array( 'ROW_CLASS' => ( !($i % 2) ) ? 'row1' : 'row2', 'POST_ID' => $watch[$i]['topic_first_post_id'], @@ -74,8 +75,8 @@ if ($watch_count > 0) 'FORUM_TITLE' => wbr($watch[$i]['forum_name']), 'U_FORUM' => FORUM_URL . $watch[$i]['forum_id'], 'REPLIES' => $watch[$i]['topic_replies'], - 'AUTHOR' => profile_url(array('username' => $watch[$i]['username'], 'user_rank' => $watch[$i]['user_rank'])) .'', - 'LAST_POST' => bb_date($watch[$i]['topic_last_post_time']) .'
'. profile_url(array('username' => $watch[$i]['last_username'], 'user_rank' => $watch[$i]['last_user_rank'])), + 'AUTHOR' => profile_url($watch[$i]), + 'LAST_POST' => bb_date($watch[$i]['topic_last_post_time']) .'
'. profile_url(array('user_id' => $watch[$i]['last_user_id'], 'username' => $watch[$i]['last_username'], 'user_rank' => $watch[$i]['last_user_rank'])), 'LAST_POST_ID' => $watch[$i]['topic_last_post_id'], 'IS_UNREAD' => $is_unread, 'TOPIC_ICON' => get_topic_icon($watch[$i], $is_unread), diff --git a/upload/includes/ucp/usercp_viewprofile.php b/upload/includes/ucp/usercp_viewprofile.php index fa05eca3e..623c046ee 100644 --- a/upload/includes/ucp/usercp_viewprofile.php +++ b/upload/includes/ucp/usercp_viewprofile.php @@ -100,6 +100,7 @@ $template->assign_vars(array( 'PAGE_TITLE' => sprintf($lang['VIEWING_USER_PROFILE'], $profiledata['username']), 'USERNAME' => $profiledata['username'], 'PROFILE_USER_ID' => $profiledata['user_id'], + 'PROFILE_USER' => $profile_user_id, 'USER_REGDATE' => bb_date($profiledata['user_regdate'], 'Y-m-d H:i', 'false'), 'POSTER_RANK' => ($poster_rank) ? "". $poster_rank ."" : $lang['USER'], 'RANK_IMAGE' => $rank_image, @@ -131,7 +132,7 @@ $template->assign_vars(array( 'U_SEARCH_TOPICS' => "search.php?uid={$profiledata['user_id']}&myt=1", 'U_SEARCH_RELEASES' => "tracker.php?rid={$profiledata['user_id']}#results", 'U_WATCHED_TOPICS' => "profile.php?mode=watch", - + 'S_PROFILE_ACTION' => 'profile.php', 'SIGNATURE' => $signature, diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 9e9640e53..ecef6b97d 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1632,6 +1632,7 @@ $lang['DOWNLOAD_TORRENT'] = 'Download torrent'; $lang['SEND_PM'] = 'Send PM'; $lang['SEND_MESSAGE'] = 'Send message'; $lang['EDIT_POST'] = 'Edit Post'; +$lang['EDIT_TOPIC_TITLE'] = 'Edit Topic title'; $lang['NEW_THREADS'] = 'New Threads'; $lang['PROFILE_NOT_FOUND'] = 'Profile not found'; @@ -1763,6 +1764,10 @@ $lang['DEL_LIST_MY_MESSAGE'] = 'Delete the selected topic from the list'; $lang['DEL_LIST_MY_MESSAGE_INFO'] = 'After removal of up to update the entire list it can be shown already deleted threads'; $lang['DEL_LIST_INFO'] = 'To delete an order from the list, click on the icon to the left of the names of any section'; +// +$lang['WATCHED_TOPICS'] = 'Watched Topics'; +$lang['NO_WATCHED_TOPICS'] = 'You are not watching any topics'; + // set_die_append_msg $lang['INDEX_RETURN'] = 'Back to home page'; $lang['FORUM_RETURN'] = 'Back to Forum'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index fcfaaa24a..c0cdb7eca 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -322,6 +322,7 @@ $lang['POST_A_NEW_TOPIC'] = 'Начать новую тему'; $lang['POST_A_REPLY'] = 'Ответить'; $lang['POST_TOPIC_AS'] = 'Статус создаваемой темы'; $lang['EDIT_POST'] = 'Редактировать сообщение'; +$lang['EDIT_TOPIC_TITLE'] = 'Изменить название темы'; $lang['EDIT_POST_NOT_1'] = 'Вам запрещено '; $lang['EDIT_POST_NOT_2'] = 'Вы не можете '; $lang['EDIT_POST_AJAX'] = 'редактировать сообщение со статусом'; @@ -1636,7 +1637,6 @@ $lang['SHOW_CAPTION'] = 'Показывать подпись'; $lang['DOWNLOAD_TORRENT'] = 'Скачивать торренты'; $lang['SEND_PM'] = 'Отправлять ЛС'; $lang['SEND_MESSAGE'] = 'Отправлять сообщения'; -$lang['EDIT_POST'] = 'Редактировать сообщения'; $lang['NEW_THREADS'] = 'Создавать темы'; $lang['PROFILE_NOT_FOUND'] = 'Профиль не найден'; diff --git a/upload/templates/default/usercp_topic_watch.tpl b/upload/templates/default/usercp_topic_watch.tpl index a596ebec1..dc0f4ad93 100644 --- a/upload/templates/default/usercp_topic_watch.tpl +++ b/upload/templates/default/usercp_topic_watch.tpl @@ -1,7 +1,6 @@ - + - +

{LOGGED_IN_USER_LIST}

@@ -469,7 +469,7 @@ td.topic_id { cursor: pointer; }
{t.TOPIC_AUTHOR} -
+ diff --git a/upload/templates/default/viewtopic.tpl b/upload/templates/default/viewtopic.tpl index 64ca11b00..d5be51818 100644 --- a/upload/templates/default/viewtopic.tpl +++ b/upload/templates/default/viewtopic.tpl @@ -83,7 +83,52 @@ function set_hid_chbox (id)
-

{TOPIC_TITLE}

+

+ {TOPIC_TITLE} + + + + + + +

+

{PAGINATION}