From 866b15b5d0cda4e4abe4838c9249683b928a9e63 Mon Sep 17 00:00:00 2001 From: pherum83 Date: Thu, 9 Feb 2012 23:08:25 +0000 Subject: [PATCH] r366 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P.S. В рабочей БД ничего изменять не нужно git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@366 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- install/sql/mysql.sql | 52 +++++++++---------- upload/admin/admin_board.php | 1 + upload/ajax.php | 7 --- upload/config.php | 4 +- upload/templates/admin/admin_board.tpl | 7 +++ upload/templates/admin/admin_bt_forum_cfg.tpl | 15 +----- 6 files changed, 37 insertions(+), 49 deletions(-) diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 048e6ba6f..ad0984236 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -85,7 +85,7 @@ CREATE TABLE `bb_ads` ( `ad_desc` varchar(255) NOT NULL default '', `ad_html` text NOT NULL, PRIMARY KEY (`ad_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -171,7 +171,7 @@ CREATE TABLE `bb_attachments_desc` ( KEY `filetime` (`filetime`), KEY `filesize` (`filesize`), KEY `physical_filename` (`physical_filename`(10)) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -227,7 +227,7 @@ CREATE TABLE `bb_banlist` ( `ban_email` varchar(255) NOT NULL default '', PRIMARY KEY (`ban_id`), KEY `ban_ip_user_id` (`ban_ip`,`ban_userid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -518,7 +518,7 @@ CREATE TABLE `bb_categories` ( `cat_order` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`cat_id`), KEY `cat_order` (`cat_order`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_categories` @@ -684,7 +684,7 @@ CREATE TABLE `bb_cron` ( PRIMARY KEY (`cron_id`), UNIQUE KEY `title` (`cron_title`), UNIQUE KEY `script` (`cron_script`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=22 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_cron` @@ -722,7 +722,7 @@ CREATE TABLE `bb_disallow` ( `disallow_id` mediumint(8) unsigned NOT NULL auto_increment, `disallow_username` varchar(25) NOT NULL default '', PRIMARY KEY (`disallow_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -736,7 +736,7 @@ CREATE TABLE `bb_extensions` ( `extension` varchar(100) NOT NULL default '', `comment` varchar(100) NOT NULL default '', PRIMARY KEY (`ext_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=30 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_extensions` @@ -788,7 +788,7 @@ CREATE TABLE `bb_extension_groups` ( `max_filesize` int(20) NOT NULL default '0', `forum_permissions` text NOT NULL, PRIMARY KEY (`group_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_extension_groups` @@ -846,7 +846,7 @@ CREATE TABLE `bb_forums` ( KEY `cat_id` (`cat_id`), KEY `forum_last_post_id` (`forum_last_post_id`), KEY `forum_parent` (`forum_parent`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_forums` @@ -869,7 +869,7 @@ CREATE TABLE `bb_groups` ( `group_single_user` tinyint(1) NOT NULL default '1', PRIMARY KEY (`group_id`), KEY `group_single_user` (`group_single_user`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -917,7 +917,7 @@ CREATE TABLE `bb_posts` ( KEY `poster_id` (`poster_id`), KEY `post_time` (`post_time`), KEY `forum_id_post_time` (`forum_id`,`post_time`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_posts` @@ -987,7 +987,7 @@ CREATE TABLE `bb_privmsgs` ( PRIMARY KEY (`privmsgs_id`), KEY `privmsgs_from_userid` (`privmsgs_from_userid`), KEY `privmsgs_to_userid` (`privmsgs_to_userid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -1012,7 +1012,7 @@ CREATE TABLE `bb_quota_limits` ( `quota_desc` varchar(20) NOT NULL default '', `quota_limit` bigint(20) unsigned NOT NULL default '0', PRIMARY KEY (`quota_limit_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_quota_limits` @@ -1036,7 +1036,7 @@ CREATE TABLE `bb_ranks` ( `rank_image` varchar(255) NOT NULL default '', `rank_style` varchar(255) NOT NULL default '', PRIMARY KEY (`rank_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_ranks` @@ -1068,7 +1068,7 @@ CREATE TABLE `bb_reports` ( KEY `report_status` (`report_status`), KEY `report_reason_id` (`report_reason_id`), KEY `report_subject` (`report_subject`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -1088,7 +1088,7 @@ CREATE TABLE `bb_reports_changes` ( KEY `report_id` (`report_id`), KEY `user_id` (`user_id`), KEY `report_change_time` (`report_change_time`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -1110,7 +1110,7 @@ CREATE TABLE `bb_reports_modules` ( PRIMARY KEY (`report_module_id`), KEY `report_module_order` (`report_module_order`), KEY `auth_view` (`auth_view`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_reports_modules` @@ -1137,7 +1137,7 @@ CREATE TABLE `bb_reports_reasons` ( PRIMARY KEY (`report_reason_id`), KEY `report_type_id` (`report_module_id`), KEY `report_reason_order` (`report_reason_order`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Структура таблицы `bb_search_rebuild` @@ -1156,7 +1156,7 @@ CREATE TABLE `bb_search_rebuild` ( `search_size` int(10) unsigned NOT NULL default '0', `rebuild_session_status` tinyint(1) NOT NULL default '0', PRIMARY KEY (`rebuild_session_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -1296,7 +1296,7 @@ CREATE TABLE `bb_topics` ( KEY `topic_last_post_id` (`topic_last_post_id`), KEY `topic_last_post_time` (`topic_last_post_time`), FULLTEXT KEY `topic_title` (`topic_title`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_topics` @@ -1333,7 +1333,7 @@ CREATE TABLE `bb_topic_templates` ( `tpl_desc` varchar(255) NOT NULL default '', PRIMARY KEY (`tpl_id`), UNIQUE KEY `tpl_name` (`tpl_name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=15 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_topic_templates` @@ -1401,7 +1401,7 @@ CREATE TABLE IF NOT EXISTS `bb_users` ( KEY `username` (`username`(10)), KEY `user_email` (`user_email`(10)), KEY `user_level` (`user_level`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Дамп данных таблицы `bb_users` @@ -1440,7 +1440,7 @@ CREATE TABLE `bb_vote_desc` ( `vote_length` int(11) NOT NULL default '0', PRIMARY KEY (`vote_id`), KEY `topic_id` (`topic_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -1483,7 +1483,7 @@ CREATE TABLE `bb_words` ( `word` char(100) NOT NULL default '', `replacement` char(100) NOT NULL default '', PRIMARY KEY (`word_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -1540,7 +1540,7 @@ CREATE TABLE IF NOT EXISTS `xbt_announce_log` ( `uid` int(11) NOT NULL default '0', `mtime` int(11) NOT NULL default '0', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -1598,6 +1598,6 @@ CREATE TABLE IF NOT EXISTS `xbt_scrape_log` ( `uid` int(11) NOT NULL default '0', `mtime` int(11) NOT NULL default '0', PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- \ No newline at end of file diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php index 61f4f6b5d..60918bcce 100644 --- a/upload/admin/admin_board.php +++ b/upload/admin/admin_board.php @@ -92,6 +92,7 @@ switch($mode) 'NETWORK_NEWS_COUNT' => $new['network_news_count'], 'NETWORK_NEWS_FORUM_ID' => $new['network_news_forum_id'], 'WHOIS_INFO' => $new['whois_info'], + 'SHOW_MOD_INDEX' => $new['show_mod_index'], )); break; diff --git a/upload/ajax.php b/upload/ajax.php index 5bdf254ed..5ac160a3d 100644 --- a/upload/ajax.php +++ b/upload/ajax.php @@ -68,7 +68,6 @@ 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'), @@ -516,10 +515,4 @@ 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 dd48cd59d..5600e5959 100644 --- a/upload/config.php +++ b/upload/config.php @@ -53,7 +53,7 @@ $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'] = 'R364'; +$bb_cfg['tp_release_state'] = 'R366'; $bb_cfg['tp_release_date'] = '10-02-2012'; // Database @@ -163,7 +163,7 @@ $tr_cfg = array( 'limit_seed_ips' => 0, 'limit_leech_ips' => 0, 'tor_topic_up' => true, - 'gold_silver_enabled' => true, + 'gold_silver_enabled' => true, ); $bb_cfg['show_dl_status_in_search'] = true; diff --git a/upload/templates/admin/admin_board.tpl b/upload/templates/admin/admin_board.tpl index 417029bd0..176600400 100644 --- a/upload/templates/admin/admin_board.tpl +++ b/upload/templates/admin/admin_board.tpl @@ -315,6 +315,13 @@

{L_WHOIS_INFO}

+ +

{L_SHOW_MOD_HOME_PAGE}

+ +    + + + {L_LATEST_NEWS} diff --git a/upload/templates/admin/admin_bt_forum_cfg.tpl b/upload/templates/admin/admin_bt_forum_cfg.tpl index 3bac75cf7..ae7105a88 100644 --- a/upload/templates/admin/admin_bt_forum_cfg.tpl +++ b/upload/templates/admin/admin_bt_forum_cfg.tpl @@ -1,13 +1,5 @@

{L_FORUM_CFG_TITLE}

- +
{S_HIDDEN_FIELDS} @@ -31,11 +23,6 @@ function show_mod_index(){ {L_BT_SELECT_FORUMS_EXPL} - - {L_SHOW_MOD_HOME_PAGE} - {L_YES} {L_NO} - -