r407

INSERT INTO `bb_config` VALUES ('tor_comment', '1'); комментарий к раздаче забытые фуньки git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@407 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

install/sql/mysql.sql

@@ -689,6 +689,7 @@ INSERT INTO `bb_config` VALUES ('whois_info', 'http://ip-whois.net/ip_geo.php?ip
 INSERT INTO `bb_config` VALUES ('show_mod_index', '1');
 INSERT INTO `bb_config` VALUES ('premod', '0');
 INSERT INTO `bb_config` VALUES ('new_tpls', '1');
+INSERT INTO `bb_config` VALUES ('tor_comment', '1');
 
 -- --------------------------------------------------------
 

upload/admin/admin_board.php

@@ -101,6 +101,7 @@ switch($mode)
 		    'BIRTHDAY_MIN_AGE' => $new['birthday_min_age'],
 		    'BIRTHDAY_CHECK_DAY' => $new['birthday_check_day'],
 		    'PREMOD'     => $new['premod'],
+		    'TOR_COMMENT'     => $new['tor_comment'],
 		    'NEW_TPLS'     => $new['new_tpls'],
 		    'SEED_BONUS_ENABLED' => $new['seed_bonus_enabled'],
 		    'SEED_BONUS_TOR_SIZE' => $new['seed_bonus_tor_size'],

upload/ajax/change_tor_status.php

@@ -68,4 +68,4 @@ if ($tor['tor_status'] != TOR_NOT_APPROVED && $tor['checked_user_id'] != $userda
 change_tor_status($attach_id, $new_status);
 
 $this->response['attach_id'] = $attach_id;
-$this->response['status'] = $bb_cfg['tor_icons'][$new_status] .' <b> '. $lang['TOR_STATUS_NAME'][$new_status]. '</b> &middot; <a class="med" href='. PROFILE_URL . $userdata['user_id'] . '>' . $userdata['username'] . '</a> &middot; <i>'. delta_time(TIMENOW) . $lang['BACK']. '</i>';
+$this->response['status'] = $bb_cfg['tor_icons'][$new_status] .' <b> '. $lang['TOR_STATUS_NAME'][$new_status]. '</b> &middot; '. profile_url($userdata) .' &middot; <i>'. delta_time(TIMENOW) . $lang['BACK']. '</i>';

upload/attach_mod/displaying_torrent.php

@@ -108,10 +108,10 @@ if (!$tor_reged)
 }
 else
 {
-	$sql = "SELECT *
-		FROM ". BB_BT_TORRENTS ."
-		WHERE attach_id = $attach_id
-		LIMIT 1";
+	$sql = "SELECT bt.*, u.user_id, u.username, u.user_rank 
+		FROM ". BB_BT_TORRENTS ." bt
+		LEFT JOIN ". BB_USERS  ." u ON(bt.checked_user_id = u.user_id)
+		WHERE bt.attach_id = $attach_id";
 
 	if (!$result = DB()->sql_query($sql))
 	{
@@ -211,14 +211,15 @@ if ($tor_reged && $tor_info)
 			'DOWNLOAD_NAME'   => $display_name,
 			'TRACKER_LINK'    => $tracker_link,
 			'ATTACH_ID'       => $attach_id,
-			'TOR_FROZEN'      => (!IS_AM) ? (isset($bb_cfg['tor_frozen'][$tor_info['tor_status']]) && !(isset($bb_cfg['tor_frozen_author_download'][$tor_info['tor_status']]) && $userdata['user_id'] == $tor_info['poster_id'])) ? true : '' : '',
 			'TOR_SILVER_GOLD' => $tor_type,
 
 			// torrent status mod
+			'TOR_FROZEN'      => (!IS_AM) ? (isset($bb_cfg['tor_frozen'][$tor_info['tor_status']]) && !(isset($bb_cfg['tor_frozen_author_download'][$tor_info['tor_status']]) && $poster_id)) ? true : '' : '',
 			'TOR_STATUS_TEXT' => $lang['TOR_STATUS_NAME'][$tor_info['tor_status']],
 			'TOR_STATUS_ICON' => $bb_cfg['tor_icons'][$tor_info['tor_status']],
-			'TOR_STATUS_BY'   => ($cuid && $is_auth['auth_mod']) ? ('<span title="'.bb_date($tor_info['checked_time'], 'd-M-Y H:i').'"> &middot; <a class="med" href='. PROFILE_URL . $cuid . '>' . get_username($cuid) . '</a> &middot; <i>'. delta_time($tor_info['checked_time']) . $lang['BACK'] . '</i></span>') : '',
+			'TOR_STATUS_BY'   => ($cuid && $is_auth['auth_mod']) ? ('<span title="'. bb_date($tor_info['checked_time'], 'd-M-Y H:i') .'"> &middot; '. profile_url($tor_info) .' &middot; <i>'. delta_time($tor_info['checked_time']) . $lang['BACK'] .'</i></span>') : '',
 			'TOR_STATUS_SELECT' => build_select('', array_flip($lang['TOR_STATUS_NAME']), TOR_APPROVED),
+			'TOR_STATUS_REPLY' => $bb_cfg['tor_comment'] && in_array($tor_info['tor_status'], $bb_cfg['tor_reply']) && $poster_id,
 			//end torrent status mod
 
 			'S_UPLOAD_IMAGE'  => $upload_image,

upload/common.php

@@ -2089,6 +2089,42 @@ function ver_compare ($version1, $operator, $version2)
 	return version_compare($version1, $version2, $operator);
 }
 
+function dbg_log ($str, $file)
+{
+	$dir = LOG_DIR . (defined('IN_TRACKER') ? 'dbg_tr/' : 'dbg_bb/') . date('m-d_H') .'/';
+	return file_write($str, $dir . $file, false, false);
+}
+
+function log_get ($file = '', $prepend_str = false)
+{
+	log_request($file, $prepend_str, false);
+}
+
+function log_post ($file = '', $prepend_str = false)
+{
+	log_request($file, $prepend_str, true);
+}
+
+function log_request ($file = '', $prepend_str = false, $add_post = true)
+{
+	global $user;
+
+	$file = ($file) ? $file : 'req/'. date('m-d');
+	$str = array();
+	$str[] = date('m-d H:i:s');
+	if ($prepend_str !== false) $str[] = $prepend_str;
+	if (!empty($user->data)) $str[] = $user->id ."\t". html_entity_decode($user->name);
+	$str[] = sprintf('%-15s', $_SERVER['REMOTE_ADDR']);
+	$str[] = @$_SERVER['REQUEST_URI'];
+#	$str[] = @$_SERVER['QUERY_STRING'];
+#	$str[] = @$_SERVER['HTTP_ACCEPT_ENCODING'];
+	$str[] = @$_SERVER['HTTP_USER_AGENT'];
+	$str[] = @$_SERVER['HTTP_REFERER'];
+	if (!empty($_POST) && $add_post) $str[] = "post: ". str_compact(urldecode(http_build_query($_POST)));
+	$str = join("\t", $str) . "\n";
+	bb_log($str, $file);
+}
+
 // Board init
 if (defined('IN_PHPBB'))
 {

upload/config.php

@@ -52,8 +52,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
-$bb_cfg['tp_release_state'] = 'R406';
-$bb_cfg['tp_release_date'] = '21-04-2012';
+$bb_cfg['tp_release_state'] = 'R407';
+$bb_cfg['tp_release_date'] = '28-04-2012';
 
 // Database
 $charset  = 'utf8';

upload/includes/init_bb.php

@@ -334,6 +334,9 @@ $bb_cfg['tor_cannot_edit'] = array(
 // Запрет на создание новых раздач если стоит статус недооформлено/неоформлено/сомнительно
 $bb_cfg['tor_cannot_new'] = array(TOR_NEED_EDIT, TOR_NO_DESC, TOR_DOUBTFUL);
 
+// Разрешение на ответ релизера, если раздача исправлена.
+$bb_cfg['tor_reply'] = array(TOR_NEED_EDIT, TOR_NO_DESC, TOR_DOUBTFUL);
+
 // Table names
 define('BUF_TOPIC_VIEW',          'buf_topic_view');
 define('BUF_LAST_SEEDER',         'buf_last_seeder');

upload/language/lang_english/lang_admin.php

@@ -670,6 +670,7 @@ $lang['PIC_SIZE'] = 'The maximum size of images';
 $lang['AUTO_DELETE_POSTED_PICS'] = 'Delete Images hosted in remote positions';
 $lang['SHOW_MOD_HOME_PAGE'] = 'Show on moderators the index.php';
 $lang['PREMOD_HELP'] = '<h4><span class="tor-icon tor-dup">&#8719;</span> Pre-moderation</h4> <h6>If you do not have hands to the status of v, #, or T in this section, including subsections, the distribution will automatically receive this status</h6>';
+$lang['TOR_COMMENT'] = '<h4>Commentary on the status of distribution</h4> <h6>Comment successfully allows you to specify releasers mistakes. When nedooformlennyh statuses releasers available form of the response of the correction release</h6>';
 $lang['SEED_BONUS'] = 'Seed Bonus';
 $lang['SEED_BONUS_ADD'] = '<h4>Adding seed bonus </h4> <h6> Number of hands handed out by the user and the size of bonuses for them (charging times an hour) </h6>';
 $lang['SEED_BONUS_RELEASE'] = 'to N-number of releases';

upload/language/lang_english/lang_main.php

@@ -1244,6 +1244,8 @@ $lang['DEL_TORRENT'] = 'Are you sure you want to delete the torrent?';
 $lang['DEL_MOVE_TORRENT'] = 'Are you sure you want to delete and move the topic?';
 $lang['UNEXECUTED_RELEASE'] = 'Do you have a shapeless release before creating a new fix his unformed!';
 $lang['STATUS_DOES_EXIST'] = 'Such status does not exist: ';
+$lang['TOR_FIXED'] = 'Fixed';
+$lang['TOR_SENT_COMMENT'] = 'The information sent to the moderator. Expect.';
 //end torrent status mod
 
 $lang['BT_TOPIC_TITLE'] = 'Topic title';

upload/language/lang_russian/lang_admin.php

@@ -667,8 +667,8 @@ $lang['PIC_GALLERY'] = 'Директория для изображений';
 $lang['PIC_SIZE'] = 'Максимальный размер изображений';
 $lang['AUTO_DELETE_POSTED_PICS'] = 'Удалять изображения размещенные в удаленных постах';
 $lang['SHOW_MOD_HOME_PAGE'] = 'Показывать модераторов на главной';
-$lang['PREMOD_HELP'] = '<h4><span class="tor-icon tor-dup">&#8719;</span> Премодерация</h4> <h6>Если у пользователя нет раздач со статусом <span class="tor-icon tor-approved">&radic;</span>, <span class="tor-icon tor-approved">#</span> или <span class="tor-icon tor-dup">T</span> в текущем разделе, включая подразделы, то раздача автоматически получает данный статус</h6>';
-
+$lang['PREMOD_HELP'] = '<h4><span class="tor-icon tor-dup">&#8719;</span> Премодерация</h4> <h6>Если у релизера нет раздач со статусом <span class="tor-icon tor-approved">&radic;</span>, <span class="tor-icon tor-approved">#</span> или <span class="tor-icon tor-dup">T</span> в текущем разделе, включая подразделы, то раздача автоматически получает данный статус</h6>';
+$lang['TOR_COMMENT'] = '<h4>Комментарий к статусу раздачи</h4> <h6>Комметарий позволяет указать релизеру допущенные ошибки. При недооформленных статусах релизеру доступна форма ответа о исправлении релиза</h6>';
 $lang['SEED_BONUS_ADD'] = '<h4>Добавление сид бонуса</h4><h6>Кол-во раздаваемых раздач пользователем и размер начисления бонусов за них (начисления раз в час)</h6>';
 $lang['SEED_BONUS_RELEASE'] = 'до N-числа релизов';
 $lang['SEED_BONUS_POINTS'] = 'бонусов в час';

upload/language/lang_russian/lang_main.php

@@ -1251,6 +1251,8 @@ $lang['DEL_TORRENT'] = 'Вы уверены, что хотите удалить
 $lang['DEL_MOVE_TORRENT'] = 'Вы уверены, что хотите удалить и перенести топик?';
 $lang['UNEXECUTED_RELEASE'] = 'У вас есть неоформленный релиз, прежде чем создавать новый - исправьте свой неоформленный!';
 $lang['STATUS_DOES_EXIST'] = 'Такого статуса не существует: ';
+$lang['TOR_FIXED'] = 'Исправил';
+$lang['TOR_SENT_COMMENT'] = 'Информация отправлена модератору. Ожидайте.';
 //end torrent status mod
 
 $lang['BT_TOPIC_TITLE'] = 'Название темы';

upload/privmsg.php

@@ -54,7 +54,7 @@ else
 // Start session management
 $user->session_start(array('req_login' => true));
 
-if (IS_ADMIN || IS_MOD)
+if (IS_AM)
 {
 	$bb_cfg['max_inbox_privmsgs']   += 1000;
 	$bb_cfg['max_sentbox_privmsgs'] += 1000;

upload/templates/admin/admin_board.tpl

@@ -329,6 +329,13 @@
 		<label><input type="radio" name="premod" value="0" <!-- IF not PREMOD -->checked="checked"<!-- ENDIF --> />{L_DISABLED}</label>
 	</td>
 </tr>
+<tr>
+	<td>{L_TOR_COMMENT}</td>
+	<td>
+	    <label><input type="radio" name="tor_comment" value="1" <!-- IF TOR_COMMENT -->checked="checked"<!-- ENDIF --> />{L_ENABLED}</label>&nbsp;&nbsp;
+		<label><input type="radio" name="tor_comment" value="0" <!-- IF not TOR_COMMENT -->checked="checked"<!-- ENDIF --> />{L_DISABLED}</label>
+	</td>
+</tr>
 <tr>
 	<td><h4>{L_DESIGNER}</h4></td>
 	<td>

upload/templates/default/tracker.tpl

@@ -526,7 +526,7 @@ function get_fs_link ()
 		alert('{L_NOT_SEL_CHAPTERS}');
 	}
 	else {
-		fs_url += 'f%5B%5D='+ fs_val.join('&f%5B%5D=');
+		fs_url += 'f[]='+ fs_val.join('&f[]=');
 		window.prompt('{L_SEL_CHAPTERS}:', fs_url);
 	}
 	return false;