r382

1. Мои сообщения the end 2. внедрение сид бонусов (начало) INSERT INTO `bb_config` VALUES ('seed_bonus_enabled', '0'); INSERT INTO `bb_config` VALUES ('seed_bonus_release', ''); INSERT INTO `bb_config` VALUES ('seed_bonus_points', ''); INSERT INTO `bb_config` VALUES ('seed_bonus_tor_size', '0'); INSERT INTO `bb_config` VALUES ('seed_bonus_user_regdate', '0'); ALTER TABLE `bb_users` ADD `user_points` INT( 11 ) NOT NULL DEFAULT '0'; git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@382 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

upload/admin/admin_board.php

@@ -50,6 +50,8 @@ else
 
 		if (isset($_POST['submit']) && $row['config_value'] != $new[$config_name])
 		{
+			if($config_name == 'seed_bonus_points' || $config_name == 'seed_bonus_release') $new[$config_name] = serialize($new[$config_name]);
+
 			bb_update_config(array($config_name => $new[$config_name]));
 		}
 	}
@@ -92,14 +94,31 @@ 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'],			
+		    'SHOW_MOD_INDEX' => $new['show_mod_index'],
-		    'BIRTHDAY_ENABLED' => $new['birthday_enabled'],			
+		    'BIRTHDAY_ENABLED' => $new['birthday_enabled'],
 		    'L_BIRTHDAY_YEARS' => $lang['DELTA_TIME']['INTERVALS']['year'][2],
 		    'BIRTHDAY_MAX_AGE' => $new['birthday_max_age'],
 		    'BIRTHDAY_MIN_AGE' => $new['birthday_min_age'],
-		    'BIRTHDAY_CHECK_DAY' => $new['birthday_check_day'],		
+		    'BIRTHDAY_CHECK_DAY' => $new['birthday_check_day'],
-		    'PREMOD'     => $new['premod'],		
+		    'PREMOD'     => $new['premod'],
+		    'SEED_BONUS_ENABLED' => $new['seed_bonus_enabled'],
+		    'SEED_BONUS_TOR_SIZE' => $new['seed_bonus_tor_size'],
+		    'SEED_BONUS_USER_REGDATE' => $new['seed_bonus_user_regdate'],
 	    ));
+
+	    if($new['seed_bonus_points'] && $new['seed_bonus_release'])
+	    {
		    $seed_bonus = unserialize($new['seed_bonus_points']);
+		    $seed_release = unserialize($new['seed_bonus_release']);
+
+		    foreach($seed_bonus as $i => $row)
+		    {
+			    if(!$row || !$seed_release[$i]) continue;
+
+			    $template->assign_block_vars('seed_bonus', array(
+		            'RELEASE' => $seed_release[$i],
+		            'POINTS'  => $row,
+			    ));
+		    }
	    }
 	break;
 
 	default:

upload/language/lang_russian/lang_admin.php

@@ -668,3 +668,12 @@ $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['SEED_BONUS'] = 'Сид Бонус';
+$lang['SEED_BONUS_ADD'] = '<h4>Добавление сид бонуса</h4><h6>Кол-во раздаваемых раздач пользователем и размер начисления бонусов за них (начисления раз в час)</h6>';
+$lang['SEED_BONUS_RELEASE'] = 'до N-числа релизов';
+$lang['SEED_BONUS_POINTS'] = 'бонусов в час';
+$lang['SEED_BONUS_TOR_SIZE'] = '<h4>Минимальный размер раздачи, за который будут начисляться бонусы</h4><h6>Если хотите начислять бонусы за все раздачи, оставте поле пустым.</h6>';
+$lang['SEED_BONUS_USER_REGDATA'] = '<h4>Минимальный стаж пользователя на трекере, после которого будут начисляться бонусы</h4><h6>Если хотите начислять бонусы всем пользователям, оставте поле пустым.</h6>';
+

upload/search.php

@@ -14,6 +14,35 @@ $page_cfg['load_tpl_vars'] = array(
 
 $user->session_start(array('req_login' => $bb_cfg['disable_search_for_guest']));
 
+if (isset($_POST['del_my_post']))
+{
+	$template->assign_var('BB_DIE_APPEND_MSG', '
+		<a href="#" onclick="window.close(); window.opener.focus();">Закрыть и вернуться к списку "Мои сообщения"</a>
+		<br /><br />
+		<a href="index.php">Вернуться на главную страницу</a>
+	');
+
+	if (IS_GUEST)
+	{
+		redirect('index.php');
+	}
+	if (empty($_POST['topic_id_list']) OR !$topic_csv = get_id_csv($_POST['topic_id_list']))
+	{
+		bb_die($lang['NONE_SELECTED']);
+	}
+
+	DB()->query("UPDATE ". BB_POSTS ." SET user_post = 0 WHERE poster_id = {$user->id} AND topic_id IN($topic_csv)");
+
+	if (DB()->affected_rows())
+	{
+		bb_die('Выбранные темы ['. count($_POST['topic_id_list']) .' шт.] удалены из списка "Мои сообщения"');
+	}
+	else
+	{
+		bb_die("Темы не найдены в списке ваших сообщений (возможно вы их уже удалили)");
+	}
+}
+
 $tracking_topics = get_tracks('topic');
 $tracking_forums = get_tracks('forum');
 

upload/templates/admin/admin_board.tpl

@@ -424,6 +424,47 @@
 	<td><h4>{L_BIRTHDAY_CHECK_DAY}</h4></td>
 	<td><input class="post" type="text" size="25" maxlength="100" name="birthday_check_day" value="{BIRTHDAY_CHECK_DAY}" />&nbsp;{L_DAYS}</td>
 </tr>
+
+<tr class="row3 med">
+	<td class="bold tCenter" colspan="2">{L_SEED_BONUS}</td>
+</tr>
+<tr>
+	<td><h4>{L_SEED_BONUS}</h4></td>
+	<td>
+	    <label><input type="radio" name="seed_bonus_enabled" value="1" <!-- IF SEED_BONUS_ENABLED -->checked="checked"<!-- ENDIF --> />{L_ENABLED}</label>&nbsp;&nbsp;
+		<label><input type="radio" name="seed_bonus_enabled" value="0" <!-- IF not SEED_BONUS_ENABLED -->checked="checked"<!-- ENDIF --> />{L_DISABLED}</label>
+	</td>
+</tr>
+<!-- BEGIN seed_bonus -->
+<tr id="seed_bonus_{seed_bonus.RELEASE}">
+	<td>{L_SEED_BONUS_ADD}</td>
+	<td>
+	    <input class="post" type="text" size="5" name="seed_bonus_release[]" value="{seed_bonus.RELEASE}" />&nbsp;{L_SEED_BONUS_RELEASE} <br />
+		<input class="post" type="text" size="5" name="seed_bonus_points[]" value="{seed_bonus.POINTS}" />&nbsp;{L_SEED_BONUS_POINTS} &nbsp;
+		<input onclick="$('#seed_bonus_{seed_bonus.RELEASE}').remove();" class="post" type="button" size="2" value="{L_DELETE}" />
+	</td>
+</tr>
+<!-- END seed_bonus -->
+<tr class="row3 med"><td colspan="2"></td></tr>
+<tr id="seed_bonus">
+	<td>{L_SEED_BONUS_ADD}</td>
+	<td>
+	    <input class="post" type="text" size="5" name="seed_bonus_release[]" value="" />&nbsp;{L_SEED_BONUS_RELEASE} <br />
+		<input class="post" type="text" size="5" name="seed_bonus_points[]" value="" />&nbsp;{L_SEED_BONUS_POINTS}
+		<input onclick="$('#seed_bonus').clone().appendTo('.seed_bonus');" class="post" type="button" size="2" value="+" />
+		<input onclick="$('#seed_bonus').remove();" class="post" type="button" size="2" value="-" />
+	</td>
+</tr>
+<tbody class="seed_bonus"></tbody>
+<tr class="row3 med"><td colspan="2"></td></tr>
+<tr>
+	<td>{L_SEED_BONUS_TOR_SIZE}</td>
+	<td><input class="post" type="text" size="25" maxlength="100" name="seed_bonus_tor_size" value="{SEED_BONUS_TOR_SIZE}" />&nbsp;GB</td>
+</tr>
+<tr>
+	<td>{L_SEED_BONUS_USER_REGDATA}</td>
+	<td><input class="post" type="text" size="25" maxlength="100" name="seed_bonus_user_regdate" value="{SEED_BONUS_USER_REGDATE}" />&nbsp;{L_DAYS}</td>
+</tr>
 <!-- ENDIF / CONFIG_MODS -->
 <tr>
 	<td class="catBottom" colspan="2">

upload/templates/default/common.tpl

@@ -6,6 +6,7 @@
 	<table class="forumline message">
 		<tr><th>{MESSAGE_TITLE}</th></tr>
 		<tr><td>{MESSAGE_TEXT}</td></tr>
+		<!-- IF BB_DIE_APPEND_MSG --><tr><td>{BB_DIE_APPEND_MSG}</td></tr><!-- ENDIF -->
 	</table>
 
 	<!-- IF IN_ADMIN --><br /><br /><!-- ELSE --><div class="spacer_10"></div><!-- ENDIF -->

upload/templates/default/search_results.tpl

@@ -3,9 +3,14 @@
 <!-- ENDIF -->
 
 <div class="nav">
-	<p style="float: left;"><a href="{U_INDEX}">{T_INDEX}</a></p>
+	<a href="{U_INDEX}">{T_INDEX}</a>
-	<!-- IF LOGGED_IN --><p style="float: right;"><a href="#" class="small normal" onclick="setCookie('{COOKIE_MARK}', 'all_forums'); window.location.reload(); return false;">{L_MARK_ALL_FORUMS_READ}</a></p><!-- ENDIF -->
+	<!-- IF not DL_CONTROLS -->
-	<div class="clear"></div>
+	&nbsp;&middot;&nbsp;
+	<span id="show-edit-btn"><a href="#">Редактировать список</a></span>
+	<span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">отметить/инвертировать</a></span>
+	<!-- ENDIF -->
+	&nbsp;&middot;&nbsp;
+	<!-- IF LOGGED_IN --><a href="#" class="small normal" onclick="setCookie('{COOKIE_MARK}', 'all_forums'); window.location.reload(); return false;">{L_MARK_ALL_FORUMS_READ}</a><!-- ENDIF -->
 </div>
 
 <!-- IF DISPLAY_AS_POSTS -->
@@ -69,14 +74,75 @@
 
 <!-- IF DL_CONTROLS -->
 <form method="post" action="{DL_ACTION}">
+<!-- ELSE -->
+<script type="text/javascript">
+ajax.in_edit_mode = false;
+
+$(document).ready(function(){
+	$('#show-edit-btn a').click(function(){
+		show_edit_options();
+		$('#show-edit-btn').html( $('#edit-sel-topics').html() );
+		return false;
+	});
+
+
+	$('td.topic_id').click(function(){
+		if (!ajax.in_edit_mode) {
+			$('#show-edit-btn a').click();
+			$(this).find('input').click();
+		}
+	});
+});
+
+function show_edit_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" />';
+		$(this).html(input);
+	});
+
+	$('input.topic-chbox').click(function(){
+		if ($.browser.mozilla) {
+			$('#tr-'+this.value+' td').toggleClass('hl-selected-row');
+		}	else {
+			$('#tr-'+this.value).toggleClass('hl-selected-row');
+		}
+	});
+	$('#pagination a.pg').each(function(){ this.href += '&mod=1'; });
+	$('#ed-list-desc').hide();
+	$('#mod-action-cell').append( $('#mod-action-content')[0] );
+	$('#mod-action-row, #mod-action-content').show();
+
+	$('#mod-action').submit(function(){
+		var $form = $(this);
+		$('input[name~=topic_id_list]', $form).remove();
+		$('input.topic-chbox:checked').each(function(){
+			$form.append('<input type="hidden" name="topic_id_list[]" value="'+ this.value +'" />');
+			$('#tr-'+this.value).remove();
+		});
+	});
+	ajax.in_edit_mode = true;
+}
+</script>
+
+<div id="mod-action-content" style="display: none;">
+<form id="mod-action" method="post" action="search.php" target="_blank">
+	<input type="submit" name="del_my_post" value="Удалить выбранные темы из списка" class="bold" onclick="if (!window.confirm( this.value +'?' )){ return false };" />
+</form>
+</div>
+
+<style type="text/css">
+td.topic_id { cursor: pointer; }
+</style>
 <!-- ENDIF -->
 
 <table class="forumline forum">
 <col class="row1">
 <col class="row1" width="25%">
-<col class="row1" width="75%">
+<col class="row4" width="75%">
-<col class="row1">
 <col class="row1">
+<col class="row4">
 <col class="row1">
 <tr>
 	<th>&nbsp;</th>
@@ -87,8 +153,8 @@
 	<th>{L_LASTPOST}</th>
 </tr>
 <!-- BEGIN t -->
-<tr class="tCenter">
+<tr id="tr-{t.TOPIC_ID}" class="tCenter">
-	<td>
+	<td id="{t.TOPIC_ID}" class="topic_id">
 		<!-- IF DL_CONTROLS -->
 			<input type="checkbox" name="dl_topics_id_list[]" value="{t.TOPIC_ID}" />
 		<!-- ELSE -->
@@ -96,7 +162,7 @@
 		<!-- ENDIF -->
 	</td>
 	<td><a href="{FORUM_URL}{t.FORUM_ID}" class="gen">{t.FORUM_NAME}</a></td>
-	<td class="tLeft" style="padding: 2px 5px 3px 4px;">
+		<td class="tLeft" style="padding: 2px 5px 3px 4px;">
 		<div class="topictitle" onmousedown="$p('tid_{t.TOPIC_ID}').className='opened'">
 			<!-- IF t.IS_UNREAD --><a href="{TOPIC_URL}{t.HREF_TOPIC_ID}{NEWEST_URL}">{ICON_NEWEST_REPLY}</a><!-- ENDIF -->
 			<!-- IF t.STATUS == MOVED --><span class="topicMoved">{L_TOPIC_MOVED}</span>
@@ -120,8 +186,8 @@
 	</td>
 </tr>
 <!-- END t -->
-<tr>
+<tr id="mod-action-row">
-	<td class="catBottom" colspan="6">
+	<td colspan="6" id="mod-action-cell" class="row2">
 	<!-- IF DL_CONTROLS -->
 		<input type="submit" name="dl_set_will" value="{L_DL_WILL}" class="liteoption" />
 		<input type="submit" name="dl_set_down" value="{L_DL_DOWN}" class="liteoption" />
@@ -130,10 +196,13 @@
 		<input type="hidden" name="redirect_type" value="search" />
 		<input type="hidden" name="mode" value="set_topics_dl_status" />
 	<!-- ELSE -->
-		&nbsp;
+		<span id="ed-list-desc" class="small">Для удаления тем из списка нажмите на иконку слева от названия любого раздела</span>
 	<!-- ENDIF -->
 	</td>
 </tr>
+<tr>
+	<td class="row2" colspan="6">&nbsp;</td>
+</tr>
 </table>
 
 <!-- IF DL_CONTROLS -->