Продолжение удаление аттач-мода, мелочи

Удаляем ненужные таблицы; исправление некоторых мелких ошибок.
This commit is contained in:
Exile 2014-12-17 20:47:35 +03:00
commit c536899ec2
7 changed files with 12 additions and 82 deletions

View file

@ -15,45 +15,6 @@ CREATE TABLE IF NOT EXISTS `bb_attachments` (
-- Records of bb_attachments
-- ----------------------------
-- ----------------------------
-- Table structure for `bb_attachments_config`
-- ----------------------------
DROP TABLE IF EXISTS `bb_attachments_config`;
CREATE TABLE IF NOT EXISTS `bb_attachments_config` (
`config_name` varchar(255) NOT NULL DEFAULT '',
`config_value` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`config_name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------
-- Records of bb_attachments_config
-- ----------------------------
INSERT INTO `bb_attachments_config` VALUES ('upload_dir', 'data/old_files');
INSERT INTO `bb_attachments_config` VALUES ('upload_img', 'styles/images/icon_clip.gif');
INSERT INTO `bb_attachments_config` VALUES ('topic_icon', 'styles/images/icon_clip.gif');
INSERT INTO `bb_attachments_config` VALUES ('display_order', '0');
INSERT INTO `bb_attachments_config` VALUES ('max_filesize', '262144');
INSERT INTO `bb_attachments_config` VALUES ('attachment_quota', '52428800');
INSERT INTO `bb_attachments_config` VALUES ('max_filesize_pm', '262144');
INSERT INTO `bb_attachments_config` VALUES ('max_attachments', '1');
INSERT INTO `bb_attachments_config` VALUES ('max_attachments_pm', '1');
INSERT INTO `bb_attachments_config` VALUES ('disable_mod', '0');
INSERT INTO `bb_attachments_config` VALUES ('allow_pm_attach', '1');
INSERT INTO `bb_attachments_config` VALUES ('attach_version', '2.3.14');
INSERT INTO `bb_attachments_config` VALUES ('default_upload_quota', '0');
INSERT INTO `bb_attachments_config` VALUES ('default_pm_quota', '0');
INSERT INTO `bb_attachments_config` VALUES ('img_display_inlined', '1');
INSERT INTO `bb_attachments_config` VALUES ('img_max_width', '200');
INSERT INTO `bb_attachments_config` VALUES ('img_max_height', '200');
INSERT INTO `bb_attachments_config` VALUES ('img_link_width', '0');
INSERT INTO `bb_attachments_config` VALUES ('img_link_height', '0');
INSERT INTO `bb_attachments_config` VALUES ('img_create_thumbnail', '0');
INSERT INTO `bb_attachments_config` VALUES ('img_min_thumb_filesize', '12000');
INSERT INTO `bb_attachments_config` VALUES ('img_imagick', '/usr/bin/convert');
INSERT INTO `bb_attachments_config` VALUES ('use_gd2', '1');
INSERT INTO `bb_attachments_config` VALUES ('wma_autoplay', '0');
INSERT INTO `bb_attachments_config` VALUES ('flash_autoplay', '0');
-- ----------------------------
-- Table structure for `bb_attachments_desc`
-- ----------------------------
@ -80,22 +41,6 @@ CREATE TABLE IF NOT EXISTS `bb_attachments_desc` (
-- Records of bb_attachments_desc
-- ----------------------------
-- ----------------------------
-- Table structure for `bb_attach_quota`
-- ----------------------------
DROP TABLE IF EXISTS `bb_attach_quota`;
CREATE TABLE IF NOT EXISTS `bb_attach_quota` (
`user_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
`group_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
`quota_type` smallint(2) NOT NULL DEFAULT '0',
`quota_limit_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
KEY `quota_type` (`quota_type`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------
-- Records of bb_attach_quota
-- ----------------------------
-- ----------------------------
-- Table structure for `bb_auth_access`
-- ----------------------------
@ -885,24 +830,6 @@ CREATE TABLE IF NOT EXISTS `bb_privmsgs_text` (
-- Records of bb_privmsgs_text
-- ----------------------------
-- ----------------------------
-- Table structure for `bb_quota_limits`
-- ----------------------------
DROP TABLE IF EXISTS `bb_quota_limits`;
CREATE TABLE IF NOT EXISTS `bb_quota_limits` (
`quota_limit_id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
`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;
-- ----------------------------
-- Records of bb_quota_limits
-- ----------------------------
INSERT INTO `bb_quota_limits` VALUES ('1', 'Low', '262144');
INSERT INTO `bb_quota_limits` VALUES ('2', 'Medium', '10485760');
INSERT INTO `bb_quota_limits` VALUES ('3', 'High', '15728640');
-- ----------------------------
-- Table structure for `bb_ranks`
-- ----------------------------

View file

@ -57,4 +57,7 @@ INSERT INTO `bb_cron` VALUES ('', '1', 'Accrual seedbonus', 'tr_seed_bonus.php',
// 2.1.6
DROP TABLE IF EXISTS `bb_ads`;
DELETE FROM `bb_config` WHERE `config_name` = 'active_ads';
DELETE FROM `bb_cron` WHERE `cron_script` = 'attach_maintenance.php';
DELETE FROM `bb_cron` WHERE `cron_script` = 'attach_maintenance.php';
DROP TABLE IF EXISTS `bb_attachments_config`;
DROP TABLE IF EXISTS `bb_attach_quota`;
DROP TABLE IF EXISTS `bb_quota_limits`;

View file

@ -27,7 +27,7 @@ function base64_pack($number)
if ($number > 4096)
{
return;
return false;
}
else if ($number < $base)
{

View file

@ -139,7 +139,7 @@ class emailer
if ($bb_cfg['emailer_disabled'])
{
return;
return false;
}
// Escape all quotes

View file

@ -942,14 +942,14 @@ class sql_db
$dbg = $this->dbg[$id];
$this->explain_out .= '
<table width="98%" cellpadding="0" cellspacing="0" class="bodyline row2 bCenter" style="border-bottom: 0px;">
<table width="98%" cellpadding="0" cellspacing="0" class="bodyline row2 bCenter" style="border-bottom: 0;">
<tr>
<th style="height: 22px; cursor: pointer;" align="left">&nbsp;'. $dbg['src'] .'&nbsp; ['. sprintf('%.4f', $dbg['time']) .' s]&nbsp; <i>'. $dbg['info'] .'</i></th>
<th style="height: 22px; cursor: pointer;" align="right" title="Copy to clipboard" onclick="$.copyToClipboard( $(\'#'. $htid .'\').text() );">'. "$this->db_server.$this->selected_db" .' :: Query #'. ($this->num_queries+1) .'&nbsp;</th>
</tr>
<tr><td colspan="2">'. $this->explain_hold .'</td></tr>
</table>
<div class="sqlLog"><div id="'. $htid .'" class="sqlLogRow sqlExplain" style="padding: 0px;">'. short_query($dbg['sql'], true) .'&nbsp;&nbsp;</div></div>
<div class="sqlLog"><div id="'. $htid .'" class="sqlLogRow sqlExplain" style="padding: 0;">'. short_query($dbg['sql'], true) .'&nbsp;&nbsp;</div></div>
<br />';
break;

View file

@ -1525,7 +1525,7 @@ function bb_date ($gmepoch, $format = false, $friendly_date = true)
function birthday_age ($date)
{
global $bb_cfg;
if (!$date) return;
if (!$date) return false;
$tz = TIMENOW + (3600 * $bb_cfg['board_timezone']);
return delta_time(strtotime($date, $tz));
@ -1661,7 +1661,7 @@ function obtain_word_list (&$orig_word, &$replacement_word)
{
global $bb_cfg;
if (!$bb_cfg['use_word_censor']) return;
if (!$bb_cfg['use_word_censor']) return false;
if (!$sql = CACHE('bb_cache')->get('censored'))
{

View file

@ -180,7 +180,7 @@ function delete_torrent ($attach_id, $mode = '')
function change_tor_status ($attach_id, $new_tor_status)
{
global $topic_id, $userdata;
global $lang, $topic_id, $userdata;
$attach_id = (int) $attach_id;
$new_tor_status = (int) $new_tor_status;
@ -378,7 +378,7 @@ function tracker_register ($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVE
bb_die($mess);
}
return;
return true;
}
function send_torrent_with_passkey ($filename)