diff --git a/upload/config.php b/upload/config.php
index f5a45d7e3..65ae8f366 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,8 +57,8 @@ $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 r112';
-$bb_cfg['tp_release_date'] = '15-07-2011';
+$bb_cfg['tp_release_state'] = 'TP II r118';
+$bb_cfg['tp_release_date'] = '18-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
 $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут";
diff --git a/upload/download.php b/upload/download.php
index cdec29756..fe266c581 100644
--- a/upload/download.php
+++ b/upload/download.php
@@ -343,6 +343,24 @@ if ($download_mode == PHYSICAL_LINK)
 }
 else
 {
+	if(IS_GUEST && !CAPTCHA()->verify_code())
+    {
+    	global $template;
+    	$redirect_url = !empty($_POST['redirect_url']) ? $_POST['redirect_url'] : $_SERVER['HTTP_REFERER'];
+    	$message = '<form action="'. DOWNLOAD_URL . $attachment['attach_id'] .'" method="post">';
+    	$message .= $lang['CONFIRM_CODE'];
+    	$message .= '<div class="mrg_10">'. CAPTCHA()->get_html() .'</div>';
+    	$message .= '<input type="hidden" name="redirect_url" value="'. $redirect_url .'" />';
+    	$message .= '<input type="submit" class="bold" value="'. $lang['SUBMIT'] .'" /> &nbsp;';
+    	$message .= '<input type="button" class="bold" value="Вернуться обратно" onclick="document.location.href = \''. $redirect_url .'\';" />';
+    	$message .= '</form>';
+    	$template->assign_vars(array(
+    	    'ERROR_MESSAGE' => $message,
+		));
+		require(PAGE_HEADER);
+		require(PAGE_FOOTER);
+    }
+
 	if (intval($attach_config['allow_ftp_upload']))
 	{
 		// We do not need a download path, we are not downloading physically
diff --git a/upload/includes/functions_torrent.php b/upload/includes/functions_torrent.php
index 3570d6a0e..6ddaeeccc 100644
--- a/upload/includes/functions_torrent.php
+++ b/upload/includes/functions_torrent.php
@@ -116,7 +116,7 @@ function tracker_unregister ($attach_id, $mode = '')
     // XBTT
     if($bb_cfg['announce_type'] == 'xbt')
     {
-		$sql = 'INSERT INTO '. BB_BT_TORRENTS ."_del(topic_id, info_hash)
+		$sql = "INSERT INTO ". BB_BT_TORRENTS ."_del(topic_id, info_hash)
 			SELECT topic_id, info_hash
 			FROM ". BB_BT_TORRENTS ."
 			WHERE attach_id = $attach_id ON DUPLICATE KEY UPDATE is_del=1";
@@ -470,7 +470,7 @@ function send_torrent_with_passkey ($filename)
 		message_die(GENERAL_ERROR, $lang['PASSKEY_ERR_TOR_NOT_REG']);
 	}
 
-	if (bf($userdata['user_opt'], 'user_opt', 'allow_passkey'))
+	if (bf($userdata['user_opt'], 'user_opt', 'allow_passkey') && !IS_GUEST)
 	{
 		message_die(GENERAL_ERROR, 'Could not add passkey');
 	}
diff --git a/upload/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl
index 4b169f0b6..e55370cc4 100644
--- a/upload/templates/default/posting_editor.tpl
+++ b/upload/templates/default/posting_editor.tpl
@@ -139,8 +139,8 @@
 	<input title="Alt+Enter" type="submit" name="preview" value="{L_PREVIEW}" id="post-preview-btn" onclick="$('#post-submit').remove();" />&nbsp;&nbsp;
 	<input title="Ctrl+Enter" type="submit" name="post" class="bold" value="{L_SUBMIT}" id="post-submit-btn" />
     <input type="button" value="Быстрый предпросмотр" onclick="ajax.exec({ action: 'view_message', message: $('textarea.editor').val() });">
+    <div id="post-js-warn">Для отправки сообщений необходимo включить JavaScript</div>
 </div>
-<div id="post-js-warn">Для отправки сообщений необходимo включить JavaScript</div>
 
 <script type="text/javascript">
 function dis_submit_btn ()