r81

Языковые и обновление кеша новостей git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@81 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

upload/ajax/change_tor_status.php

@@ -18,7 +18,7 @@ $attach_id  = (int) $this->request['attach_id'];
 $new_status = (int) $this->request['status'];
 
 // Валидность статуса
-if (!isset($lang['tor_status'][$new_status]))
+if (!isset($lang['TOR_STATUS_NAME'][$new_status]))
 {
 	$this->ajax_die("Такого статуса не существует: $new_status");
 }
@@ -64,7 +64,7 @@ if ($tor['tor_status'] != TOR_NOT_APPROVED && $tor['checked_user_id'] != $userda
 {
 	if (empty($this->request['confirmed']))
 	{
-		$msg  = "Раздача имеет статус: {$lang['tor_status'][$tor['tor_status']]}\n\n";
+		$msg  = "Раздача имеет статус: {$lang['TOR_STATUS_NAME'][$tor['tor_status']]}\n\n";
 		$msg .= ($username = get_username($tor['checked_user_id'])) ? "Статус изменен: ". html_entity_decode($username) .", ". delta_time($tor['checked_time']) ." назад\n\n" : "";
 		$msg .= "Продолжить?";
 		$this->prompt_for_confirm($msg);
@@ -74,4 +74,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] .' '. $lang['tor_status'][$new_status];
+$this->response['status']    = $bb_cfg['tor_icons'][$new_status] .' '. $lang['TOR_STATUS_NAME'][$new_status];

upload/ajax/mod_action.php

@@ -15,7 +15,7 @@ switch ($mode)
 	    $status   = (int) $this->request['status'];
 
 	    // Валидность статуса
-		if (!isset($lang['tor_status'][$status]))
+		if (!isset($lang['TOR_STATUS_NAME'][$status]))
 		{
 			$this->ajax_die("Такого статуса не существует: $new_status");
 		}
@@ -48,6 +48,14 @@ switch ($mode)
 
 		DB()->query("UPDATE ". BB_TOPICS ." SET topic_title = '$topic_title_sql' WHERE topic_id = $topic_id LIMIT 1");
 
+        //Обновление кеша новостей на главной
+		$news_forums = array_flip(explode(',', $bb_cfg['latest_news_forum_id']));
+		if(isset($news_forums[$t_data['forum_id']]) && $bb_cfg['show_latest_news'])
+		{
			global $datastore;
+
+			$datastore->enqueue('latest_news');
+			$datastore->update('latest_news');
		}
+
         $this->response['topic_id'] = $topic_id;
 		$this->response['topic_title'] = $new_title;
 		break;

upload/attach_mod/displaying_torrent.php

@@ -222,10 +222,10 @@ if ($tor_reged && $tor_info)
 			'TOR_SILVER_GOLD' => $tor_type,
 
 			// torrent status mod
-			'TOR_STATUS_TEXT' => $lang['tor_status'][$tor_info['tor_status']],
+			'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']) ? ('&nbsp;&middot;&nbsp; <a href='. PROFILE_URL . $cuid . '>' . get_username($cuid) . '</a>&nbsp; &middot;&nbsp; <i>'. delta_time($tor_info['checked_time']) .' назад</i>') : '',
-			'TOR_STATUS_SELECT' => build_select('', array_flip($bb_cfg['change_tor_status_select']), TOR_APPROVED),
+			'TOR_STATUS_SELECT' => build_select('', array_flip($bb_cfg['tor_status_name']), TOR_APPROVED),
 			//end torrent status mod
 
 			'S_UPLOAD_IMAGE'  => $upload_image,

upload/config.php

@@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.0.2';
-$bb_cfg['tp_release_state'] = 'TP II r80';
+$bb_cfg['tp_release_state'] = 'TP II r81';
 $bb_cfg['tp_release_date'] = '05-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger

upload/includes/datastore/build_cat_forums.php

@@ -131,7 +131,7 @@ if ($bb_cfg['show_latest_news'] AND $news_forum_ids = $bb_cfg['latest_news_forum
 	$news_count = max($bb_cfg['latest_news_count'], 1);
 
 	$data = DB()->fetch_rowset("
-		SELECT topic_id, topic_time, topic_title
+		SELECT topic_id, topic_time, topic_title, forum_id
 		FROM ". BB_TOPICS ."
 		WHERE forum_id IN ($news_forum_ids)
 		ORDER BY topic_time DESC

upload/includes/functions_post.php

@@ -240,6 +240,16 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 		'post_text'      => $post_message,
 	));
 
+    //Îáíîâëåíèå êåøà íîâîñòåé íà ãëàâíîé
+	$news_forums = array_flip(explode(',', $bb_cfg['latest_news_forum_id']));
+	if(isset($news_forums[$forum_id]) && $bb_cfg['show_latest_news'] && $mode == 'newtopic')
+	{
+		global $datastore;
+
+		$datastore->enqueue('latest_news');
+		$datastore->update('latest_news');
+	}
+
 	//
 	// Add poll
 	//

upload/includes/init_bb.php

@@ -284,46 +284,17 @@ define('TOR_DOUBTFUL',      8);   // сомнительно
 define('TOR_CHECKING',      9);   // проверяется
 define('TOR_TMP',           10);  // временная
 
-// Названия
-$lang['tor_status'] = array(
-	TOR_TMP           => 'временная',
-	TOR_CLOSED_CPHOLD => 'закрыто правообладателем',
-	TOR_CLOSED        => 'закрыто',
-	TOR_NOT_APPROVED  => 'не проверено',
-	TOR_NEED_EDIT     => 'недооформлено',
-	TOR_NO_DESC       => 'неоформлено',
-	TOR_DUP           => 'повтор',
-	TOR_CONSUMED      => 'поглощено',
-	TOR_APPROVED      => 'проверено',
-	TOR_CHECKING      => 'проверяется',
-	TOR_DOUBTFUL      => 'сомнительно',
-);
-
-// Список доступных модераторам статусов
-$bb_cfg['change_tor_status_select'] = array(
-	TOR_CLOSED        => 'закрыто',
-	TOR_NOT_APPROVED  => 'не проверено',
-	TOR_NEED_EDIT     => 'недооформлено',
-	TOR_NO_DESC       => 'неоформлено',
-	TOR_DUP           => 'повтор',
-	TOR_CONSUMED      => 'поглощено',
-	TOR_TMP           => 'временная',
-	TOR_APPROVED      => 'проверено',
-	TOR_CHECKING      => 'проверяется',
-	TOR_DOUBTFUL      => 'сомнительно',
-);
-
 $bb_cfg['tor_icons'] = array(
-	TOR_APPROVED      => '<span class="tor-icon tor-approved">&radic;</span>',
+    TOR_NOT_APPROVED  => '<span class="tor-icon tor-not-approved">*</span>',
-	TOR_CHECKING      => '<span class="tor-icon tor-checking">%</span>',
     TOR_CLOSED        => '<span class="tor-icon tor-closed">x</span>',
+    TOR_APPROVED      => '<span class="tor-icon tor-approved">&radic;</span>',
+    TOR_NEED_EDIT     => '<span class="tor-icon tor-need-edit">?</span>',
+    TOR_NO_DESC       => '<span class="tor-icon tor-no-desc">!</span>',
+    TOR_DUP           => '<span class="tor-icon tor-dup">D</span>',
     TOR_CLOSED_CPHOLD => '<span class="tor-icon tor-closed-cp">&copy;</span>',
     TOR_CONSUMED      => '<span class="tor-icon tor-consumed">&sum;</span>',
     TOR_DOUBTFUL      => '<span class="tor-icon tor-approved">#</span>',
-	TOR_DUP           => '<span class="tor-icon tor-dup">D</span>',
+    TOR_CHECKING      => '<span class="tor-icon tor-checking">%</span>',
-	TOR_NEED_EDIT     => '<span class="tor-icon tor-need-edit">?</span>',
-	TOR_NO_DESC       => '<span class="tor-icon tor-no-desc">!</span>',
-	TOR_NOT_APPROVED  => '<span class="tor-icon tor-not-approved">*</span>',
     TOR_TMP           => '<span class="tor-icon tor-dup">T</span>',
 );
 

upload/includes/page_footer_dev.php

@@ -71,6 +71,22 @@ if (!empty($_COOKIE['explain']))
 $sql_log = !empty($_COOKIE['sql_log']) ? get_sql_log() : '';
 
 echo '
+<script type="text/javascript">
+function fixSqlLog() {
+	if ($("#sqlLog").height() > 400) {
+		$("#sqlLog").height(400);
+	}
+	$("#sqlLog div.sqlLogRow")
+		.hover(
+			function(){ $(this).addClass("sqlHover"); },
+			function(){ $(this).removeClass("sqlHover"); }
+		)
+		.click(
+			function(){ $(this).toggleClass("sqlHighlight"); }
+		)
+	;
+}
+</script>
 	<div class="sqlLogHead">
 ';
 if (PROFILER) {
@@ -103,25 +119,6 @@ echo '
 '. (UA_IE ? '<br />' : '') .'
 </div><!-- / sqlLog -->
 
-<script type="text/javascript">
-
-function fixSqlLog() {
-	if ($("#sqlLog").height() > 400) {
-		$("#sqlLog").height(400);
-	}
-	$("#sqlLog div.sqlLogRow")
-		.hover(
-			function(){ $(this).addClass("sqlHover"); },
-			function(){ $(this).removeClass("sqlHover"); }
-		)
-		.click(
-			function(){ $(this).toggleClass("sqlHighlight"); }
-		)
-	;
-}
-
-</script>
-
 <br clear="all" />
 ';
 }

upload/index.php

@@ -312,14 +312,15 @@ if ($bb_cfg['show_latest_news'])
 			'NEWS_TOPIC_ID' => $news['topic_id'],
 			'NEWS_TITLE'    => $news['topic_title'],
 			'NEWS_TIME'     => bb_date($news['topic_time'], 'd-M'),
-			'NEWS_IS_NEW'   => $news['topic_time'] > $lastvisit,
+			'NEWS_IS_NEW'   => is_unread($news['topic_time'], $news['topic_id'], $news['forum_id']),
 		));
 	}
 }
 // Allow cron
-if (IS_ADMIN || IS_MOD)
+if (IS_AM)
+{
+	if (@file_exists(CRON_RUNNING))
 	{
-	if (@file_exists(CRON_RUNNING)) {
 		if (@file_exists(CRON_ALLOWED))
 		{
 			unlink (CRON_ALLOWED);

upload/language/lang_english/lang_main.php

@@ -1157,14 +1157,19 @@ $lang['MAGNET'] = 'Magnet';
 //torrent status mod
 $lang['TOR_STATUS'] = 'Status';
 $lang['TOR_STATUS_SELECT_ACTION'] = 'Select status';
-$lang['TOR_STATUS_CHECKED'] = 'checked';//2
+$lang['TOR_STATUS_NAME'] = array(
-$lang['TOR_STATUS_NOT_CHECKED'] = 'not checked';//0
+    TOR_NOT_APPROVED  => 'not checked',
-$lang['TOR_STATUS_CLOSED'] = 'closed';//1
+    TOR_CLOSED        => 'closed',
-$lang['TOR_STATUS_D'] = 'repeat';//3
+    TOR_APPROVED      => 'checked',
-$lang['TOR_STATUS_NOT_PERFECT'] = 'neoformleno';//4
+    TOR_NEED_EDIT     => 'not formalized until',
-$lang['TOR_STATUS_PART_PERFECT'] = 'nedooformleno';//5
+    TOR_NO_DESC       => 'not formalized',
-$lang['TOR_STATUS_FISHILY'] = 'doubtful';//6
+    TOR_DUP           => 'repeat',
-$lang['TOR_STATUS_COPY'] = 'closed right';//7
+    TOR_CLOSED_CPHOLD => 'closed right',
+    TOR_CONSUMED      => 'absorbed',
+    TOR_DOUBTFUL      => 'doubtful',
+    TOR_CHECKING      => 'verified',
+    TOR_TMP           => 'temporary',
+);
 //end torrent status mod
 
 $lang['BT_TOPIC_TITLE'] = 'Topic title';

upload/language/lang_russian/lang_main.php

@@ -1163,14 +1163,19 @@ $lang['MAGNET'] = 'Magnet';
 //torrent status mod
 $lang['TOR_STATUS'] = 'Статус';
 $lang['TOR_STATUS_SELECT_ACTION'] = 'Выберите статус';
-$lang['TOR_STATUS_CHECKED'] = 'проверено'; // 2
+$lang['TOR_STATUS_NAME'] = array(
-$lang['TOR_STATUS_NOT_CHECKED'] = 'не проверено';//0
+    TOR_NOT_APPROVED  => 'не проверено',
-$lang['TOR_STATUS_CLOSED'] = 'закрыто';//1
+    TOR_CLOSED        => 'закрыто',
-$lang['TOR_STATUS_D'] = 'повтор';//3
+    TOR_APPROVED      => 'проверено',
-$lang['TOR_STATUS_NOT_PERFECT'] = 'неоформлено';//4
+    TOR_NEED_EDIT     => 'недооформлено',
-$lang['TOR_STATUS_PART_PERFECT'] = 'недооформлено';//5
+    TOR_NO_DESC       => 'неоформлено',
-$lang['TOR_STATUS_FISHILY'] = 'сомнительно';//6
+    TOR_DUP           => 'повтор',
-$lang['TOR_STATUS_COPY'] = 'закрыто правообладателем';//7
+    TOR_CLOSED_CPHOLD => 'закрыто правообладателем',
+    TOR_CONSUMED      => 'поглощено',
+    TOR_DOUBTFUL      => 'сомнительно',
+    TOR_CHECKING      => 'проверяется',
+    TOR_TMP           => 'временная',
+);
 //end torrent status mod
 
 $lang['BT_TOPIC_TITLE'] = 'Название темы';

upload/templates/default/viewforum.tpl

@@ -2,10 +2,10 @@
 <!-- IF SESSION_ADMIN -->
 
 <script type="text/javascript">
-in_moderation = false;
+ajax.in_moderation    = false;
-in_title_edit = false;
+ajax.in_title_edit    = false;
-tte_cur_topic_id = 0;
+ajax.tte_cur_topic_id = 0;
-tte_orig_html = '';
+ajax.tte_orig_html    = '';
 
 <!-- IF MODERATION_ON -->
 $(function(){
@@ -16,12 +16,12 @@ $(function(){
 	$('#show_mod_options a').click( function(){ show_forum_mod_options(); return false; } );
 
 	$('td.topic_id').click(function(){
-		if (!in_moderation) {
+		if (!ajax.in_moderation) {
 			show_forum_mod_options();
 		}
 	});
 	$('td.tt').dblclick(function(){
-		if (!in_moderation) {
+		if (!ajax.in_moderation) {
 			show_forum_mod_options();
 			$(this).dblclick();
 		}
@@ -34,12 +34,9 @@ function show_forum_mod_options ()
 	$('td.topic_id').each(function(){
 		var topic_id = $(this).attr('id');
 		var input = '<input id="sel-'+ topic_id +'" type="checkbox" value="'+ topic_id +'" class="topic-chbox" />';
-		if ($.browser.msie) {
+
-			$(this).html(input);
+		$(this).before('<td>'+input+'</td>').attr('colSpan', 1);
-		} else {
-			$(this).after('<td>'+input+'</td>').attr('colSpan', 1);
 		$(this).click(function(){ edit_topic_title(topic_id); });
-		}
 		$(this).siblings('td.tt').dblclick(function(){ edit_topic_title(topic_id); });
 	});
 	$('.tt-text').addClass('folded2 tLink')
@@ -67,29 +64,29 @@ function show_forum_mod_options ()
 			$form.attr('target', '_blank');
 		}
 	});
-	in_moderation = true;
+	ajax.in_moderation = true;
 }
 
 function edit_topic_title (topic_id)
 {
-	if (in_title_edit) return false;
+	if (ajax.in_title_edit) return false;
 
 	var $tt_td = $('td#'+topic_id).siblings('td.tt');
 	var tt_text = $tt_td.find('.tt-text').text();
 
 	$tt_td.attr({id: 'tte-'+topic_id});
-	tte_cur_topic_id = topic_id;
+	ajax.tte_cur_topic_id = topic_id;
-	tte_orig_html = $tt_td.html();
+	ajax.tte_orig_html = $tt_td.html();
 
 	$tt_td.html( $('#tt-edit-tpl').html() );
 	$('.tt-edit-input', $tt_td).val(tt_text).focus();
 
-	in_title_edit = true;
+	ajax.in_title_edit = true;
 }
 
 function tte_submit (mode)
 {
-	var topic_id = tte_cur_topic_id;
+	var topic_id = ajax.tte_cur_topic_id;
 	var $tt_td = $('#tte-'+topic_id);
 	var topic_title = $('.tt-edit-input', $tt_td).val();
 
@@ -97,11 +94,11 @@ function tte_submit (mode)
 		ajax.edit_topic_title(topic_id, topic_title);
 	}
 	else {
-		$tt_td.html(tte_orig_html);
+		$tt_td.html(ajax.tte_orig_html);
 		$('.tt-text').addClass('folded2 tLink')
 			.click(function(){ ajax.view_post(topic_id, this); return false; });
 	}
-	in_title_edit = false;
+	ajax.in_title_edit = false;
 }
 
 ajax.edit_topic_title = function(topic_id, topic_title) {
@@ -151,7 +148,7 @@ ajax.callback.mod_action = function(data) {
 	}
 	if(data.topic_title) {
 		var $tt_td = $('#tte-'+data.topic_id);
-		$tt_td.html(tte_orig_html);
+		$tt_td.html(ajax.tte_orig_html);
 		$('.tt-text', $tt_td).html(data.topic_title);
 	}
 }
@@ -160,19 +157,19 @@ ajax.callback.mod_action = function(data) {
 <div id="mod-action-content" style="display: none;">
 <form id="mod-action" method="post" action="modcp.php" class="tokenized">
 	<input type="hidden" name="f" value="{FORUM_ID}" />
-	<!-- IF TORRENTS -->
 	<div class="floatL">
+	<input type="checkbox" onclick="$('.topic-chbox').attr({ checked: this.checked }); if(this.checked){$('.tt-text').addClass('hl-tt');}else{$('.tt-text').removeClass('hl-tt');}" />
+	<!-- IF TORRENTS -->
 	{SELECT_ST}
 	<input type="button" onclick="mod_action('tor_status');" value="Изменить" />
-	</div>
 	<!-- ENDIF -->
+	</div>
 	<div class="floatR">
 	<input type="submit" name="delete" value="{L_DELETE}" />
 	<input type="submit" name="move" value="{L_MOVE}" />
 	<input type="submit" name="lock" value="{L_LOCK}" />
 	<input type="submit" name="unlock" value="{L_UNLOCK}" />
 	<label><input id="in-new-window" type="checkbox" />в новом окне</label>
-
 	</div>
 </form>
 </div>

upload/tracker.php

@@ -735,7 +735,7 @@ if ($allowed_forums)
 
 				'TOR_FROZEN'   => isset($bb_cfg['tor_frozen'][$tor['tor_status']]),
 				'TOR_STATUS_ICON' => $bb_cfg['tor_icons'][$tor['tor_status']],
-				'TOR_STATUS_TEXT' => $lang['tor_status'][$tor['tor_status']],
+				'TOR_STATUS_TEXT' => $lang['TOR_STATUS_NAME'][$tor['tor_status']],
 
 				'TOR_SIZE_RAW' => $size,
 				'TOR_SIZE'     => humn_size($size),

upload/viewforum.php

@@ -101,11 +101,11 @@ if ($is_auth['auth_mod'])
 		unset($_REQUEST['sort'], $_REQUEST['order'], $_REQUEST[$title_match_key]);
 		$show_type_separator = false;
 	}
-    $select_tst = array_merge(array('* любой' => -1), array_flip($lang['tor_status']));
+    $select_tst = array_merge(array('* любой' => -1), array_flip($lang['TOR_STATUS_NAME']));
 	$template->assign_vars(array(
 		'SELECT_TST' => build_select('tst', $select_tst, $tor_status),
 	));
-	$select_st = array_merge(array('Выберите статус' => -1), array_flip($lang['tor_status']));
+	$select_st = array_merge(array($lang['TOR_STATUS_SELECT_ACTION'] => -1), array_flip($lang['TOR_STATUS_NAME']));
 	$template->assign_vars(array(
 		'SELECT_ST'  => build_select('st', $select_st, -1),
 	));