From 2d1c734f5793b30c9a3b8e678ac913245196f915 Mon Sep 17 00:00:00 2001 From: pherum83 Date: Sun, 2 Oct 2011 12:49:25 +0000 Subject: [PATCH] r298 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit поиски золота, дата вступления, посветка строк в tracker.php git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@298 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/admin/admin_board.php | 172 ++++++------------- upload/admin/admin_groups.php | 8 +- upload/config.php | 7 +- upload/download.php | 7 +- upload/groupcp.php | 27 ++- upload/includes/functions_group.php | 3 +- upload/includes/sessions.php | 1 + upload/language/lang_english/lang_main.php | 2 + upload/language/lang_russian/lang_main.php | 2 + upload/misc/js/bbcode.js | 2 +- upload/templates/admin/admin_board.tpl | 105 ++++++++--- upload/templates/default/groupcp.tpl | 19 +- upload/templates/default/tracker.tpl | 9 +- upload/templates/default/usercp_register.tpl | 4 +- upload/templates/default/viewforum.tpl | 1 - upload/tracker.php | 14 +- 16 files changed, 201 insertions(+), 182 deletions(-) diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php index d256f6dc4..24ecc3dee 100644 --- a/upload/admin/admin_board.php +++ b/upload/admin/admin_board.php @@ -53,125 +53,67 @@ else } } -$lang_select = language_select($new['default_lang'], 'default_lang', "language"); -$timezone_select = tz_select($new['board_timezone'], 'board_timezone'); - -$disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : ""; -$disable_board_no = ( !$new['board_disable'] ) ? "checked=\"checked\"" : ""; - -$bbcode_yes = ( $new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; -$bbcode_no = ( !$new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; - -$activation_none = ( $new['require_activation'] == USER_ACTIVATION_NONE ) ? "checked=\"checked\"" : ""; -$activation_user = ( $new['require_activation'] == USER_ACTIVATION_SELF ) ? "checked=\"checked\"" : ""; -$activation_admin = ( $new['require_activation'] == USER_ACTIVATION_ADMIN ) ? "checked=\"checked\"" : ""; - -$confirm_yes = ($new['enable_confirm']) ? 'checked="checked"' : ''; -$confirm_no = (!$new['enable_confirm']) ? 'checked="checked"' : ''; - -$allow_autologin_yes = ($new['allow_autologin']) ? 'checked="checked"' : ''; -$allow_autologin_no = (!$new['allow_autologin']) ? 'checked="checked"' : ''; - -$board_email_form_yes = ( $new['board_email_form'] ) ? "checked=\"checked\"" : ""; -$board_email_form_no = ( !$new['board_email_form'] ) ? "checked=\"checked\"" : ""; - -$privmsg_on = ( !$new['privmsg_disable'] ) ? "checked=\"checked\"" : ""; -$privmsg_off = ( $new['privmsg_disable'] ) ? "checked=\"checked\"" : ""; - -$prune_yes = ( $new['prune_enable'] ) ? "checked=\"checked\"" : ""; -$prune_no = ( !$new['prune_enable'] ) ? "checked=\"checked\"" : ""; - -$smile_yes = ( $new['allow_smilies'] ) ? "checked=\"checked\"" : ""; -$smile_no = ( !$new['allow_smilies'] ) ? "checked=\"checked\"" : ""; - -$sig_yes = ( $new['allow_sig'] ) ? "checked=\"checked\"" : ""; -$sig_no = ( !$new['allow_sig'] ) ? "checked=\"checked\"" : ""; - -$namechange_yes = ( $new['allow_namechange'] ) ? "checked=\"checked\"" : ""; -$namechange_no = ( !$new['allow_namechange'] ) ? "checked=\"checked\"" : ""; - -$avatars_local_yes = ( $new['allow_avatar_local'] ) ? "checked=\"checked\"" : ""; -$avatars_local_no = ( !$new['allow_avatar_local'] ) ? "checked=\"checked\"" : ""; -$avatars_remote_yes = ( $new['allow_avatar_remote'] ) ? "checked=\"checked\"" : ""; -$avatars_remote_no = ( !$new['allow_avatar_remote'] ) ? "checked=\"checked\"" : ""; -$avatars_upload_yes = ( $new['allow_avatar_upload'] ) ? "checked=\"checked\"" : ""; -$avatars_upload_no = ( !$new['allow_avatar_upload'] ) ? "checked=\"checked\"" : ""; - -$smtp_yes = ( $new['smtp_delivery'] ) ? "checked=\"checked\"" : ""; -$smtp_no = ( !$new['smtp_delivery'] ) ? "checked=\"checked\"" : ""; - // // Escape any quotes in the site description for proper display in the text // box on the admin page // -$template->assign_vars(array( - "S_CONFIG_ACTION"=> append_sid("admin_board.php"), - "SITENAME" => htmlCHR($new['sitename']), - "CONFIG_SITE_DESCRIPTION" => htmlCHR($new['site_desc']), - "S_DISABLE_BOARD_YES" => $disable_board_yes, - "S_DISABLE_BOARD_NO" => $disable_board_no, - "ACTIVATION_NONE" => USER_ACTIVATION_NONE, - "ACTIVATION_NONE_CHECKED" => $activation_none, - "ACTIVATION_USER" => USER_ACTIVATION_SELF, - "ACTIVATION_USER_CHECKED" => $activation_user, - "ACTIVATION_ADMIN" => USER_ACTIVATION_ADMIN, - "ACTIVATION_ADMIN_CHECKED" => $activation_admin, - "CONFIRM_ENABLE" => $confirm_yes, - "CONFIRM_DISABLE" => $confirm_no, - "ALLOW_AUTOLOGIN_YES" => $allow_autologin_yes, - "ALLOW_AUTOLOGIN_NO" => $allow_autologin_no, - "AUTOLOGIN_TIME" => (int) $new['max_autologin_time'], - "BOARD_EMAIL_FORM_ENABLE" => $board_email_form_yes, - "BOARD_EMAIL_FORM_DISABLE" => $board_email_form_no, - "MAX_POLL_OPTIONS" => $new['max_poll_options'], - "FLOOD_INTERVAL" => $new['flood_interval'], - "TOPICS_PER_PAGE" => $new['topics_per_page'], - "POSTS_PER_PAGE" => $new['posts_per_page'], - "HOT_TOPIC" => $new['hot_threshold'], - "LANG_SELECT" => $lang_select, - "DEFAULT_DATEFORMAT" => $new['default_dateformat'], - "TIMEZONE_SELECT" => $timezone_select, - "S_PRIVMSG_ENABLED" => $privmsg_on, - "S_PRIVMSG_DISABLED" => $privmsg_off, - "INBOX_LIMIT" => $new['max_inbox_privmsgs'], - "SENTBOX_LIMIT" => $new['max_sentbox_privmsgs'], - "SAVEBOX_LIMIT" => $new['max_savebox_privmsgs'], - "MAX_LOGIN_ATTEMPTS" => $new['max_login_attempts'], - "LOGIN_RESET_TIME" => $new['login_reset_time'], - "PRUNE_YES" => $prune_yes, - "PRUNE_NO" => $prune_no, - "BBCODE_YES" => $bbcode_yes, - "BBCODE_NO" => $bbcode_no, - "SMILE_YES" => $smile_yes, - "SMILE_NO" => $smile_no, - "SIG_YES" => $sig_yes, - "SIG_NO" => $sig_no, - "SIG_SIZE" => $new['max_sig_chars'], - "NAMECHANGE_YES" => $namechange_yes, - "NAMECHANGE_NO" => $namechange_no, - "AVATARS_LOCAL_YES" => $avatars_local_yes, - "AVATARS_LOCAL_NO" => $avatars_local_no, - "AVATARS_REMOTE_YES" => $avatars_remote_yes, - "AVATARS_REMOTE_NO" => $avatars_remote_no, - "AVATARS_UPLOAD_YES" => $avatars_upload_yes, - "AVATARS_UPLOAD_NO" => $avatars_upload_no, - "AVATAR_FILESIZE" => $new['avatar_filesize'], - "AVATAR_MAX_HEIGHT" => $new['avatar_max_height'], - "AVATAR_MAX_WIDTH" => $new['avatar_max_width'], - "AVATAR_PATH" => $new['avatar_path'], - "AVATAR_GALLERY_PATH" => $new['avatar_gallery_path'], - "SMILIES_PATH" => $new['smilies_path'], - "INBOX_PRIVMSGS" => $new['max_inbox_privmsgs'], - "SENTBOX_PRIVMSGS" => $new['max_sentbox_privmsgs'], - "SAVEBOX_PRIVMSGS" => $new['max_savebox_privmsgs'], - "EMAIL_FROM" => $new['board_email'], - "EMAIL_SIG" => $new['board_email_sig'], - "SMTP_YES" => $smtp_yes, - "SMTP_NO" => $smtp_no, - "SMTP_HOST" => $new['smtp_host'], - "SMTP_USERNAME" => $new['smtp_username'], - "SMTP_PASSWORD" => $new['smtp_password']) -); +$template->assign_vars(array( + 'S_CONFIG_ACTION' => append_sid('admin_board.php'), + + 'SITENAME' => htmlCHR($new['sitename']), + 'CONFIG_SITE_DESCRIPTION' => htmlCHR($new['site_desc']), + 'DISABLE_BOARD' => ($new['board_disable']) ? true : false, + + 'ACTIVATION_NONE' => USER_ACTIVATION_NONE, + 'ACTIVATION_NONE_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : '', + 'ACTIVATION_USER' => USER_ACTIVATION_SELF, + 'ACTIVATION_USER_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : '', + 'ACTIVATION_ADMIN' => USER_ACTIVATION_ADMIN, + 'ACTIVATION_ADMIN_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : '', + + 'VISUAL_CONFIRM' => ($new['enable_confirm']) ? true : false, + 'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false, + 'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'], + 'BOARD_EMAIL_FORM' => ($new['board_email_form']) ? true : false, + 'MAX_POLL_OPTIONS' => $new['max_poll_options'], + 'FLOOD_INTERVAL' => $new['flood_interval'], + 'TOPICS_PER_PAGE' => $new['topics_per_page'], + 'POSTS_PER_PAGE' => $new['posts_per_page'], + 'HOT_TOPIC' => $new['hot_threshold'], + 'LANG_SELECT' => language_select($new['default_lang'], 'default_lang', 'language'), + 'DEFAULT_DATEFORMAT' => $new['default_dateformat'], + 'TIMEZONE_SELECT' => tz_select($new['board_timezone'], 'board_timezone'), + 'PRIVMSG_DISABLE' => ($new['privmsg_disable']) ? false : true, + 'INBOX_LIMIT' => $new['max_inbox_privmsgs'], + 'SENTBOX_LIMIT' => $new['max_sentbox_privmsgs'], + 'SAVEBOX_LIMIT' => $new['max_savebox_privmsgs'], + 'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'], + 'LOGIN_RESET_TIME' => $new['login_reset_time'], + 'PRUNE_ENABLE' => ($new['prune_enable']) ? true : false, + 'ALLOW_BBCODE' => ($new['allow_bbcode']) ? true : false, + 'ALLOW_SMILIES' => ($new['allow_smilies']) ? true : false, + 'ALLOW_SIG' => ($new['allow_sig']) ? true : false, + 'SIG_SIZE' => $new['max_sig_chars'], + 'ALLOW_NAMECHANGE' => ($new['allow_namechange']) ? true : false, + 'ALLOW_AVATARS_LOCAL' => ($new['allow_avatar_local']) ? true : false, + 'ALLOW_AVATAR_REMOTE' => ($new['allow_avatar_remote']) ? true : false, + 'ALLOW_AVATAR_UPLOAD' => ($new['allow_avatar_upload']) ? true : false, + 'AVATAR_FILESIZE' => $new['avatar_filesize'], + 'AVATAR_MAX_HEIGHT' => $new['avatar_max_height'], + 'AVATAR_MAX_WIDTH' => $new['avatar_max_width'], + 'AVATAR_PATH' => $new['avatar_path'], + 'AVATAR_GALLERY_PATH' => $new['avatar_gallery_path'], + 'SMILIES_PATH' => $new['smilies_path'], + 'INBOX_PRIVMSGS' => $new['max_inbox_privmsgs'], + 'SENTBOX_PRIVMSGS' => $new['max_sentbox_privmsgs'], + 'SAVEBOX_PRIVMSGS' => $new['max_savebox_privmsgs'], + 'EMAIL_FROM' => $new['board_email'], + 'EMAIL_SIG' => $new['board_email_sig'], + 'SMTP_DELIVERY' => ($new['smtp_delivery']) ? true : false, + 'SMTP_HOST' => $new['smtp_host'], + 'SMTP_USERNAME' => $new['smtp_username'], + 'SMTP_PASSWORD' => $new['smtp_password'], +)); print_page('admin_board.tpl', 'admin'); \ No newline at end of file diff --git a/upload/admin/admin_groups.php b/upload/admin/admin_groups.php index 1c82a6291..7cd2a7c2b 100644 --- a/upload/admin/admin_groups.php +++ b/upload/admin/admin_groups.php @@ -11,10 +11,10 @@ require('./pagestart.php'); require(INC_DIR .'functions_group.php'); -$group_id = (@$_REQUEST[POST_GROUPS_URL]) ? intval($_REQUEST[POST_GROUPS_URL]) : 0; -$mode = (@$_REQUEST['mode']) ? strval($_REQUEST['mode']) : ''; +$group_id = isset($_REQUEST[POST_GROUPS_URL]) ? intval($_REQUEST[POST_GROUPS_URL]) : 0; +$mode = isset($_REQUEST['mode']) ? strval($_REQUEST['mode']) : ''; -attachment_quota_settings('group', @$_POST['group_update'], $mode); +attachment_quota_settings('group', isset($_POST['group_update']), $mode); if (!empty($_POST['edit']) || !empty($_POST['new'])) { @@ -131,7 +131,7 @@ else if (!empty($_POST['group_update'])) add_user_into_group($group_id, $group_moderator); // Delete old moderator's user_group - if (@$_POST['delete_old_moderator']) + if (isset($_POST['delete_old_moderator'])) { delete_user_group($group_id, $group_info['group_moderator']); } diff --git a/upload/config.php b/upload/config.php index f7a9dc346..9d094fdf4 100644 --- a/upload/config.php +++ b/upload/config.php @@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Stable'; -$bb_cfg['tp_release_state'] = 'R297'; -$bb_cfg['tp_release_date'] = '01-10-2011'; +$bb_cfg['tp_release_state'] = 'R298'; +$bb_cfg['tp_release_date'] = '02-10-2011'; // Database $charset = 'utf8'; @@ -105,7 +105,6 @@ $bb_cfg['datastore_type'] = 'filecache'; $bb_cfg['server_name'] = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : 'torrentpier.me'; // The domain name from which this board runs $bb_cfg['server_port'] = (!empty($_SERVER['SERVER_PORT'])) ? $_SERVER['SERVER_PORT'] : 80; // The port your server is running on $bb_cfg['script_path'] = '/'; // The path where FORUM is located relative to the domain name -$bb_cfg['sitename'] = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : 'TorrentPier II - Torrent Tracker (see $bb_cfg[\'sitename\'] in config.php)'; // Name of your site // Server load $bb_cfg['max_srv_load'] = 0; // 0 - disable @@ -289,7 +288,7 @@ $bb_cfg['groupcp_send_email'] = true; $bb_cfg['tech_admin_email'] = 'admin@' . $bb_cfg['server_name']; // email for sending error reports $bb_cfg['abuse_email'] = 'abuse@' . $bb_cfg['server_name']; -$bb_cfg['adv_email'] = 'adv@' . $bb_cfg['server_name']; +$bb_cfg['adv_email'] = 'adv@' . $bb_cfg['server_name']; // AJAX define('AJAX_HTML_DIR', BB_ROOT .'ajax/html/'); diff --git a/upload/download.php b/upload/download.php index 7e004d095..b93a4fd38 100644 --- a/upload/download.php +++ b/upload/download.php @@ -343,10 +343,11 @@ if ($download_mode == PHYSICAL_LINK) } else { - if(IS_GUEST && !CAPTCHA()->verify_code()) + if(IS_GUEST && !CAPTCHA()->verify_code()) { - global $template; - $redirect_url = !empty($_POST['redirect_url']) ? $_POST['redirect_url'] : $_SERVER['HTTP_REFERER']; + global $template; + + $redirect_url = !empty($_POST['redirect_url']) ? $_POST['redirect_url'] : @$_SERVER['HTTP_REFERER']; $message = '
'; $message .= $lang['CONFIRM_CODE']; $message .= '
'. CAPTCHA()->get_html() .'
'; diff --git a/upload/groupcp.php b/upload/groupcp.php index 79c75db78..8b487a8d7 100644 --- a/upload/groupcp.php +++ b/upload/groupcp.php @@ -11,12 +11,13 @@ $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, &$pm, &$email, &$www, &$user_time) { global $lang, $images, $bb_cfg; $from = ( !empty($row['user_from']) ) ? $row['user_from'] : ''; $joined = bb_date($row['user_regdate'], $lang['DATE_FORMAT']); + $user_time = ( !empty($row['user_time']) ) ? bb_date($row['user_time'], $lang['DATE_FORMAT']) : $lang['NO']; $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; $pm = ($bb_cfg['text_buttons']) ? ''. $lang['SEND_PM_TXTB'] .'' : '' . $lang['SEND_PRIVATE_MESSAGE'] . ''; @@ -25,19 +26,13 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$ $email_uri = ($bb_cfg['board_email_form']) ? append_sid("profile.php?mode=email&". POST_USERS_URL ."=".$row['user_id']) : 'mailto:'. $row['user_email']; $email = ''. $row['user_email'] .''; } - else - { - $email = ''; - } + else $email = ''; if ($row['user_website']) { $www = ($bb_cfg['text_buttons']) ? ''. $lang['VISIT_WEBSITE_TXTB'] .'' : '' . $lang['VISIT_WEBSITE'] . ''; } - else - { - $www = ''; - } + else $www = ''; return; } @@ -238,7 +233,7 @@ else if (@$_POST['joingroup']) bb_die($lang['ALREADY_MEMBER_GROUP']); } - add_user_into_group($group_id, $userdata['user_id'], 1); + add_user_into_group($group_id, $userdata['user_id'], 1, TIMENOW); if ($bb_cfg['groupcp_send_email']) { @@ -419,7 +414,7 @@ else // Members $count_members = DB()->fetch_rowset(" - SELECT u.username, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending + SELECT u.username, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending, ug.user_time FROM ". BB_USER_GROUP ." ug, ". BB_USERS ." u WHERE ug.group_id = $group_id AND ug.user_pending = 0 @@ -434,7 +429,7 @@ else // Members $group_members = DB()->fetch_rowset(" - SELECT u.username, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending + SELECT u.username, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending, ug.user_time FROM ". BB_USER_GROUP ." ug, ". BB_USERS ." u WHERE ug.group_id = $group_id AND ug.user_pending = 0 @@ -527,7 +522,7 @@ 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, $pm, $email, $www); + generate_user_info($group_moderator, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www, $user_time); $group_type = ''; if($group_info['group_type'] == GROUP_OPEN) @@ -559,6 +554,7 @@ else 'MOD_PM' => $pm, 'MOD_EMAIL' => $email, 'MOD_WWW' => $www, + 'MOD_TIME' => $user_time, 'U_SEARCH_USER' => "search.php?mode=searchuser", 'GROUP_TYPE' => $group_type, 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, @@ -578,7 +574,7 @@ else { $user_id = $member['user_id']; - generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www); + generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www, $user_time); if ($group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator) { @@ -595,6 +591,7 @@ else 'PM' => $pm, 'EMAIL' => $email, 'WWW' => $www, + 'TIME' => $user_time, )); if ($is_moderator) @@ -626,7 +623,7 @@ else { $user_id = $member['user_id']; - generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www); + generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www, $user_time); $row_class = !($i % 2) ? 'row1' : 'row2'; diff --git a/upload/includes/functions_group.php b/upload/includes/functions_group.php index bfe155c21..026fd065e 100644 --- a/upload/includes/functions_group.php +++ b/upload/includes/functions_group.php @@ -75,12 +75,13 @@ function delete_group ($group_id) update_user_level('all'); } -function add_user_into_group ($group_id, $user_id, $user_pending = 0) +function add_user_into_group ($group_id, $user_id, $user_pending = 0, $user_time = TIMENOW) { $args = DB()->build_array('INSERT', array( 'group_id' => (int) $group_id, 'user_id' => (int) $user_id, 'user_pending' => (int) $user_pending, + 'user_time' => (int) $user_time, )); DB()->query("REPLACE INTO ". BB_USER_GROUP . $args); diff --git a/upload/includes/sessions.php b/upload/includes/sessions.php index dbe61b364..3a5acfc65 100644 --- a/upload/includes/sessions.php +++ b/upload/includes/sessions.php @@ -28,6 +28,7 @@ class user_common 'sp_op' => 0, // show spoiler opened 'tr_t_ax' => 0, // ajax open topics 'tr_t_t' => 0, // show time of the creation topics + 'hl_tr' => 1, // show cursor in tracker.php ); /** diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 6e8f7a074..99f0fb5ad 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -768,6 +768,7 @@ $lang['GROUP_ADDED'] = 'You have been added to this usergroup.'; $lang['ALREADY_MEMBER_GROUP'] = 'You are already a member of this group'; $lang['USER_IS_MEMBER_GROUP'] = 'User is already a member of this group'; $lang['GROUP_TYPE_UPDATED'] = 'Successfully updated group type.'; +$lang['EFFECTIVE_DATE'] = 'Effective Date'; $lang['COULD_NOT_ADD_USER'] = 'The user you selected does not exist.'; $lang['COULD_NOT_ANON_USER'] = 'You cannot make Anonymous a group member.'; @@ -1359,6 +1360,7 @@ $lang['GALLERY'] = 'Gallery'; $lang['OPEN_TOPICS'] = 'Open topics'; $lang['OPEN_IN_SAME_WINDOW'] = 'open in same window'; $lang['SHOW_TIME_TOPICS'] = 'show time of the creation topics'; +$lang['SHOW_CURSOR'] = 'highlight the row under the cursor'; $lang['BT_LOW_RATIO_FUNC'] = "You can't use this option (ratio is too low)"; $lang['BT_LOW_RATIO_FOR_DL'] = "With ratio %s you can't download torrents"; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 91d30d753..25dc3c037 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -773,6 +773,7 @@ $lang['GROUP_ADDED'] = 'Вы были включены в группу'; $lang['ALREADY_MEMBER_GROUP'] = 'Вы уже являетесь членом этой группы'; $lang['USER_IS_MEMBER_GROUP'] = 'Пользователь уже является членом этой группы'; $lang['GROUP_TYPE_UPDATED'] = 'Тип группы успешно изменён'; +$lang['EFFECTIVE_DATE'] = 'Дата вступления'; $lang['COULD_NOT_ADD_USER'] = 'Выбранного пользователя не существует'; $lang['COULD_NOT_ANON_USER'] = 'Вы не можете сделать анонимного пользователя членом группы'; @@ -1367,6 +1368,7 @@ $lang['GALLERY'] = 'Галерея'; $lang['OPEN_TOPICS'] = 'Открывать топики'; $lang['OPEN_IN_SAME_WINDOW'] = 'открывать в этом же окне'; $lang['SHOW_TIME_TOPICS'] = 'показывать время создания темы'; +$lang['SHOW_CURSOR'] = 'подсвечивать строки под курсором'; $lang['BT_LOW_RATIO_FUNC'] = 'У Вас слишком низкий рейтинг для того, чтобы воспользоваться этой функцией'; $lang['BT_LOW_RATIO_FOR_DL'] = 'Рейтинг %s уже не позволяет Вам скачивать новые торренты.

Для поднятия рейтинга Вы можете что-либо раздать из Ваших прошлых закачек, либо организовать новую раздачу.

Пожалуйста, помните о том, что Ваше yчастие в системе BitTorrent не может ограничиваться только скачиванием!'; diff --git a/upload/misc/js/bbcode.js b/upload/misc/js/bbcode.js index 4dd8df9a6..afbcd3d98 100644 --- a/upload/misc/js/bbcode.js +++ b/upload/misc/js/bbcode.js @@ -44,7 +44,7 @@ BBCode.prototype = { this.quoterText = sel; this.insertTag('_quoter'); } else { - this.insertAtCursor("[b]" + name + '[/b]\n'); + this.insertAtCursor("[b]" + name + '[/b], '); } return false; }, diff --git a/upload/templates/admin/admin_board.tpl b/upload/templates/admin/admin_board.tpl index 0ba61941a..8c350f1e8 100644 --- a/upload/templates/admin/admin_board.tpl +++ b/upload/templates/admin/admin_board.tpl @@ -23,53 +23,77 @@

{L_BOARD_DISABLE}

{L_BOARD_DISABLE_EXPLAIN}
- {L_YES}   {L_NO} + +    + +

{L_ACCT_ACTIVATION}

-
{L_ACC_NONE}
-
{L_ACC_USER}
-
{L_ACC_ADMIN}
+
+
+

{L_VISUAL_CONFIRM}

{L_VISUAL_CONFIRM_EXPLAIN}
- {L_YES}   {L_NO} + +    + +

{L_ALLOW_AUTOLOGIN}

{L_ALLOW_AUTOLOGIN_EXPLAIN}
- {L_YES}   {L_NO} + +    + +

{L_AUTOLOGIN_TIME}

{L_AUTOLOGIN_TIME_EXPLAIN}
- days + + {L_DAYS} +

{L_BOARD_EMAIL_FORM}

{L_BOARD_EMAIL_FORM_EXPLAIN}
- {L_ENABLED}   {L_DISABLED} + +    + +

{L_FLOOD_INTERVAL}

{L_FLOOD_INTERVAL_EXPLAIN}
- sec + + {L_SEC} +

{L_TOPICS_PER_PAGE}

- + + +

{L_POSTS_PER_PAGE}

- + + +

{L_HOT_THRESHOLD}

@@ -89,14 +113,20 @@

{L_ENABLE_PRUNE}

- {L_YES}   {L_NO} + +    + + {L_PRIVATE_MESSAGING}

{L_DISABLE_PRIVMSG}

- {L_ENABLED}   {L_DISABLED} + +    + +

{L_INBOX_LIMITS}

@@ -119,11 +149,17 @@

{L_ALLOW_BBCODE}

- {L_YES}   {L_NO} + +    + +

{L_ALLOW_SMILIES}

- {L_YES}   {L_NO} + +    + +

{L_SMILIES_PATH}

{L_SMILIES_PATH_EXPLAIN}
@@ -131,7 +167,10 @@

{L_ALLOW_SIG}

- {L_YES}   {L_NO} + +    + +

{L_MAX_SIG_LENGTH}

{L_MAX_SIG_LENGTH_EXPLAIN}
@@ -139,26 +178,38 @@

{L_ALLOW_NAME_CHANGE}

- {L_YES}   {L_NO} + +    + + {L_AVATAR_SETTINGS}

{L_ALLOW_LOCAL}

- {L_YES}   {L_NO} + +    + +

{L_ALLOW_REMOTE}

{L_ALLOW_REMOTE_EXPLAIN}
- {L_YES}   {L_NO} + +    + +

{L_ALLOW_UPLOAD}

- {L_YES}   {L_NO} + +    + +

{L_MAX_FILESIZE}

{L_MAX_FILESIZE_EXPLAIN}
- Bytes + {L_BYTES}

{L_MAX_AVATAR_SIZE}

{L_MAX_AVATAR_SIZE_EXPLAIN}
@@ -185,7 +236,10 @@

{L_USE_SMTP}

{L_USE_SMTP_EXPLAIN}
- {L_YES}   {L_NO} + +    + +

{L_SMTP_SERVER}

@@ -201,7 +255,8 @@ -    +    + diff --git a/upload/templates/default/groupcp.tpl b/upload/templates/default/groupcp.tpl index f2fc8756d..aa0ab21d2 100644 --- a/upload/templates/default/groupcp.tpl +++ b/upload/templates/default/groupcp.tpl @@ -107,13 +107,14 @@ {L_PM} {L_EMAIL} {L_LOCATION} - {L_JOINED} + {L_JOINED} {L_POSTS_SHORT} {L_WEBSITE} + {L_EFFECTIVE_DATE} # - {L_GROUP_MODERATOR} + {L_GROUP_MODERATOR} {ROW_NUMBER} @@ -124,10 +125,11 @@ {MOD_JOINED} {MOD_POSTS} {MOD_WWW} + {MOD_TIME}   - {L_GROUP_MEMBERS} + {L_GROUP_MEMBERS} @@ -141,6 +143,7 @@ {member.JOINED} {member.POSTS} {member.WWW} + {member.TIME} @@ -151,20 +154,20 @@ - {L_NO_GROUP_MEMBERS} + {L_NO_GROUP_MEMBERS} - {L_HIDDEN_GROUP_MEMBERS} + {L_HIDDEN_GROUP_MEMBERS} - +

@@ -202,10 +205,9 @@ {L_JOINED} {L_POSTS_SHORT} {L_WEBSITE} - - {L_PENDING_MEMBERS} + {L_PENDING_MEMBERS} @@ -218,7 +220,6 @@ {pending.JOINED} {pending.POSTS} {pending.WWW} - diff --git a/upload/templates/default/tracker.tpl b/upload/templates/default/tracker.tpl index 0d5fbfb3e..db31a22e8 100644 --- a/upload/templates/default/tracker.tpl +++ b/upload/templates/default/tracker.tpl @@ -149,6 +149,7 @@ ajax.callback.view_post = function(data) {

{ONLY_ACTIVE_CHBOX}

{SEED_EXIST_CHBOX}

{ONLY_NEW_CHBOX}[{MINIPOST_IMG_NEW}] 

+

{TOR_TYPE_CHBOX}

@@ -255,6 +256,11 @@ ajax.callback.view_post = function(data) { onclick="user.set('tr_t_t', this.checked ? 1 : 0);" />{L_SHOW_TIME_TOPICS} +
@@ -272,6 +278,7 @@ ajax.callback.view_post = function(data) { .tr_tm { margin-top: 2px; font-size: 10px; color: #676767; } .ch { font-style: italic; color: #0080FF; } #fs-sel-cat option.cat-title { font-weight: bold; color: #005A88; background: #F5F5F5; } +tr.hl-tr:hover td { background-color: #F8F8F8 !important; } @@ -300,7 +307,7 @@ ajax.callback.view_post = function(data) { - + diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl index 87c6a0d6f..057f7476d 100644 --- a/upload/templates/default/usercp_register.tpl +++ b/upload/templates/default/usercp_register.tpl @@ -23,8 +23,8 @@ ajax.callback.user_register = function(data){ - - + + diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl index 91d1ac7d1..5b98031fc 100644 --- a/upload/templates/default/viewforum.tpl +++ b/upload/templates/default/viewforum.tpl @@ -44,7 +44,6 @@ function show_forum_mod_options () $('input.topic-chbox').click(function(){ $('#tt-'+this.value).toggleClass('hl-tt'); }); - $('#pagination a').each(function(){ this.href += '&mod=1'; }); $('#mod-action-cell').append( $('#mod-action-content')[0] ); $('#show_mod_options').html($('#show_mod_options').text()); $('#mod-action-row, #mod-action-content, #mod-sel-topics').show(); diff --git a/upload/tracker.php b/upload/tracker.php index d9836d254..70b9b67e9 100644 --- a/upload/tracker.php +++ b/upload/tracker.php @@ -240,6 +240,7 @@ $GPC = array( 'show_speed' => array('ds', 0, CHBOX), 's_not_seen' => array('sns', $search_all, SELECT), 'time' => array('tm', $search_all, SELECT), + 'tor_type' => array('tor_type', 0, CHBOX), ); // Define all GPC vars with default values @@ -447,6 +448,7 @@ $prev_days = ($time_val != $search_all); $poster_id = (bool) $poster_id_val; $title_match = (bool) $title_match_sql; $s_not_seen = ($s_not_seen_val != $search_all); +$tor_type = (bool) $tor_type_val; $hide_cat = intval(!$show_cat_val); $hide_forum = intval(!$show_forum_val); @@ -598,6 +600,10 @@ if ($allowed_forums) { $SQL['WHERE'][] = "sn.seeders >= 1"; } + if ($tor_type) + { + $SQL['WHERE'][] = "tor.tor_type IN(1,2)"; + } // ORDER $SQL['ORDER BY'][] = "{$order_opt[$order_val]['sql']} {$sort_opt[$sort_val]['sql']}"; @@ -751,7 +757,7 @@ if ($allowed_forums) 'TOPIC_TIME' => bb_date($tor['topic_time'], 'd-M-y') .' · '. delta_time($tor['topic_time']), 'POST_ID' => $tor['post_id'], 'POSTER_ID' => $poster_id, - 'USERNAME' => profile_url(array('username' => $tor['username'], 'user_rank' => $tor['user_rank'])), + 'USERNAME' => ($hide_author) ? '' : profile_url(array('username' => $tor['username'], 'user_rank' => $tor['user_rank'])), 'ROW_CLASS' => $row_class, 'ROW_NUM' => $row_num, @@ -848,12 +854,15 @@ $template->assign_vars(array( )); // Displaying options +$tor_type_lang = $lang['GOLD'] . ' / ' . $lang['SILVER']; + $template->assign_vars(array( 'SHOW_CAT_CHBOX' => build_checkbox ($show_cat_key, $lang['BT_SHOW_CAT'], $show_cat_val), 'SHOW_FORUM_CHBOX' => build_checkbox ($show_forum_key, $lang['BT_SHOW_FORUM'], $show_forum_val), 'SHOW_AUTHOR_CHBOX' => build_checkbox ($show_author_key, $lang['BT_SHOW_AUTHOR'], $show_author_val), 'SHOW_SPEED_CHBOX' => build_checkbox ($show_speed_key, $lang['BT_SHOW_SPEED'], $show_speed_val), 'ALL_WORDS_CHBOX' => build_checkbox ($all_words_key, $lang['SEARCH_ALL_WORDS'], $all_words_val), + 'TOR_TYPE_CHBOX' => build_checkbox ($tor_type_key, $tor_type_lang, $tor_type_val), 'ONLY_MY_CHBOX' => build_checkbox ($my_key, $lang['BT_ONLY_MY'], $only_my, IS_GUEST), 'ONLY_ACTIVE_CHBOX' => build_checkbox ($active_key, $lang['BT_ONLY_ACTIVE'], $active_val), @@ -872,6 +881,8 @@ $template->assign_vars(array( 'AJAX_TOPICS' => $user->opt_js['tr_t_ax'], 'SHOW_TIME_TOPICS' => $user->opt_js['tr_t_t'], + 'SHOW_CURSOR' => $user->opt_js['hl_tr'], + 'U_SEARCH_USER' => "search.php?mode=searchuser&input_name=$poster_name_key", )); @@ -890,6 +901,7 @@ $save_through_pages = array( 'show_cat', 'show_forum', 'show_speed', + 'tor_type', ); $hidden_fields = array(); foreach ($save_through_pages as $name)

 ® 

{MINIPOST_IMG_NEW}{MINIPOST_IMG}		 {tor.TOR_STATUS_ICON}
{L_REGISTRATION_INFO}
{L_ITEMS_REQUIRED}
{L_ITEMS_REQUIRED}
{L_USERNAME}: *