From a44c5e03f7c0cf5f05b8f53d4899769f89117c87 Mon Sep 17 00:00:00 2001 From: dimka3210 Date: Thu, 9 Feb 2012 22:36:28 +0000 Subject: [PATCH] r364 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавление возможности скрытия модераторов с главной страницы. INSERT INTO `bb_config` VALUES ('show_mod_index', '1'); git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@364 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- install/sql/mysql.sql | 4 +++- upload/ajax.php | 8 ++++++++ upload/config.php | 7 +++---- upload/index.php | 19 +++++++++---------- upload/language/lang_english/lang_admin.php | 2 +- upload/language/lang_russian/lang_admin.php | 2 +- upload/templates/admin/admin_bt_forum_cfg.tpl | 15 ++++++++++++++- upload/templates/default/index.tpl | 2 +- 8 files changed, 40 insertions(+), 19 deletions(-) diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index c66732683..048e6ba6f 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -656,6 +656,7 @@ INSERT INTO `bb_config` VALUES ('max_net_title', '50'); INSERT INTO `bb_config` VALUES ('network_news_count', '5'); INSERT INTO `bb_config` VALUES ('network_news_forum_id', '2'); INSERT INTO `bb_config` VALUES ('whois_info', 'http://ip-whois.net/ip_geo.php?ip='); +INSERT INTO `bb_config` VALUES ('show_mod_index', '1'); -- -------------------------------------------------------- @@ -818,6 +819,7 @@ CREATE TABLE `bb_forums` ( `forum_posts` mediumint(8) unsigned NOT NULL default '0', `forum_topics` mediumint(8) unsigned NOT NULL default '0', `forum_last_post_id` mediumint(8) unsigned NOT NULL default '0', + `forum_tpl_id` smallint(6) NOT NULL DEFAULT '0', `prune_days` smallint(5) unsigned NOT NULL default '0', `auth_view` tinyint(2) NOT NULL default '0', `auth_read` tinyint(2) NOT NULL default '0', @@ -850,7 +852,7 @@ CREATE TABLE `bb_forums` ( -- Дамп данных таблицы `bb_forums` -- -INSERT INTO `bb_forums` VALUES (1, 1, 'Ваш первый форум', 'Описание вашего первого форума.', 0, 10, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0); +INSERT INTO `bb_forums` VALUES (1, 1, 'Ваш первый форум', 'Описание вашего первого форума.', 0, 10, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0); -- -------------------------------------------------------- diff --git a/upload/ajax.php b/upload/ajax.php index aca35fe91..5bdf254ed 100644 --- a/upload/ajax.php +++ b/upload/ajax.php @@ -68,6 +68,7 @@ class ajax_common 'change_user_rank' => array('admin'), 'change_user_opt' => array('admin'), 'manage_user' => array('admin'), + 'show_mod_index' => array('admin'), 'change_tor_status' => array('mod'), 'mod_action' => array('mod'), @@ -83,6 +84,7 @@ class ajax_common 'posts' => array('guest'), 'birthday_list' => array('guest'), 'get_forum_mods' => array('guest'), + ); var $action = null; @@ -514,4 +516,10 @@ class ajax_common cache_rm_user_sessions ($userdata['user_id']); } } + function show_mod_index(){ + $value = $this->request['value']; + DB()->query("UPDATE " . BB_CONFIG . " SET `config_value` = '{$value}' WHERE `config_name` = 'show_mod_index'"); + CACHE('bb_cache')->rm('config_bb_config'); + $this->ajax_die('Данные успешно обновлены!'); + } } diff --git a/upload/config.php b/upload/config.php index 4115f9b31..3ce7a204b 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.4 (beta)'; -$bb_cfg['tp_release_state'] = 'R363'; -$bb_cfg['tp_release_date'] = '08-02-2012'; +$bb_cfg['tp_release_state'] = 'R364'; +$bb_cfg['tp_release_date'] = '10-02-2012'; // Database $charset = 'utf8'; @@ -163,7 +163,6 @@ $tr_cfg = array( 'limit_seed_ips' => 0, 'limit_leech_ips' => 0, 'tor_topic_up' => true, - 'gold_silver_enabled' => true, ); $bb_cfg['show_dl_status_in_search'] = true; @@ -411,7 +410,7 @@ $bb_cfg['show_poster_joined'] = true; $bb_cfg['show_poster_posts'] = true; $bb_cfg['show_poster_from'] = true; $bb_cfg['show_bot_nick'] = false; -$bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links +$bb_cfg['text_buttons'] = true; // replace EDIT, QUOTE... images with text links $bb_cfg['parse_ed2k_links'] = true; // make ed2k links clickable $bb_cfg['post_date_format'] = 'd-M-Y H:i'; $bb_cfg['ext_link_new_win'] = true; // open external links in new window diff --git a/upload/index.php b/upload/index.php index 7a97fcf59..43c55cb1b 100644 --- a/upload/index.php +++ b/upload/index.php @@ -216,7 +216,7 @@ $template->assign_vars(array( 'TORRENTS_STAT' => ($bb_cfg['tor_stats']) ? sprintf($lang['TORRENTS_STAT'], $stats['torrentcount'], humn_size($stats['size'])) : '', 'PEERS_STAT' => ($bb_cfg['tor_stats']) ? sprintf($lang['PEERS_STAT'], $stats['peers'], $stats['seeders'], $stats['leechers']) : '', 'SPEED_STAT' => ($bb_cfg['tor_stats']) ? sprintf($lang['SPEED_STAT'], humn_size($stats['speed']) .'/s') : '', - + 'SHOW_MOD_INDEX' => $bb_cfg['show_mod_index'], 'FORUM_IMG' => $images['forum'], 'FORUM_NEW_IMG' => $images['forum_new'], 'FORUM_LOCKED_IMG' => $images['forum_locked'], @@ -286,15 +286,14 @@ foreach ($cat_forums as $cid => $c) $template->assign_block_vars('c.f', array( 'FORUM_FOLDER_IMG' => $folder_image, - 'FORUM_ID' => $fid, - 'FORUM_NAME' => $fname_html, - 'FORUM_DESC' => $f['forum_desc'], - 'POSTS' => commify($f['forum_posts']), - 'TOPICS' => commify($f['forum_topics']), - 'LAST_SF_ID' => isset($f['last_sf_id']) ? $f['last_sf_id'] : null, - - 'MODERATORS' => isset($moderators[$fid]) ? join(', ', $moderators[$fid]) : '', - 'FORUM_FOLDER_ALT' => ($new) ? $lang['NEW'] : $lang['OLD'], + 'FORUM_ID' => $fid, + 'FORUM_NAME' => $fname_html, + 'FORUM_DESC' => $f['forum_desc'], + 'POSTS' => commify($f['forum_posts']), + 'TOPICS' => commify($f['forum_topics']), + 'LAST_SF_ID' => isset($f['last_sf_id']) ? $f['last_sf_id'] : null, + 'MODERATORS' => isset($moderators[$fid]) ? join(', ', $moderators[$fid]) : '', + 'FORUM_FOLDER_ALT' => ($new) ? $lang['NEW'] : $lang['OLD'], )); if ($f['last_post_id']) diff --git a/upload/language/lang_english/lang_admin.php b/upload/language/lang_english/lang_admin.php index 64ddc2a20..dd5c6162c 100644 --- a/upload/language/lang_english/lang_admin.php +++ b/upload/language/lang_english/lang_admin.php @@ -655,7 +655,7 @@ $lang['REPORTS'] = 'Reports'; // // Reports [END] // - +$lang['SHOW_MOD_HOME_PAGE'] = 'Show on moderators the index.php?'; // // Mods // diff --git a/upload/language/lang_russian/lang_admin.php b/upload/language/lang_russian/lang_admin.php index 9453bf5dc..37ee799ca 100644 --- a/upload/language/lang_russian/lang_admin.php +++ b/upload/language/lang_russian/lang_admin.php @@ -653,7 +653,7 @@ $lang['REPORTS'] = 'Нарушения'; // // Reports [END] // - +$lang['SHOW_MOD_HOME_PAGE'] = 'Показывать модераторов на главной?'; // // Mods // diff --git a/upload/templates/admin/admin_bt_forum_cfg.tpl b/upload/templates/admin/admin_bt_forum_cfg.tpl index ae7105a88..3bac75cf7 100644 --- a/upload/templates/admin/admin_bt_forum_cfg.tpl +++ b/upload/templates/admin/admin_bt_forum_cfg.tpl @@ -1,5 +1,13 @@

{L_FORUM_CFG_TITLE}

- +
{S_HIDDEN_FIELDS} @@ -23,6 +31,11 @@ {L_BT_SELECT_FORUMS_EXPL} + + {L_SHOW_MOD_HOME_PAGE} + {L_YES} {L_NO} + +
diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl index 85cbac7eb..086e49e66 100644 --- a/upload/templates/default/index.tpl +++ b/upload/templates/default/index.tpl @@ -92,7 +92,7 @@

- +

{L_MODERATORS}: {c.f.MODERATORS}