r95

Исправление ошибок git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@95 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

upload/config.php

@@ -2,7 +2,6 @@
 
 /**
   * Database
-  * SphinX Search
   * Cache
     - Tracker Cache
     - Forum Cache
@@ -45,6 +44,7 @@
 
   * Ads
   * Misc
+  * Captcha
 */
 
 if (!defined('BB_ROOT')) die(basename(__FILE__));
@@ -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 r94';
+$bb_cfg['tp_release_state'] = 'TP II r95';
 $bb_cfg['tp_release_date'] = '11-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger

upload/includes/ucp/usercp_register.php

@@ -22,6 +22,7 @@ $adm_edit = false;                      // редактирование адми
 require(INC_DIR .'bbcode.php');
 require(INC_DIR .'functions_validate.php');
 require(INC_DIR .'functions_selects.php');
+require(INC_DIR .'ucp/usercp_avatar.php');
 
 $pr_data = array();   // данные редактируемого либо регистрационного профиля
 $db_data = array();   // данные для базы: регистрационные либо измененные данные юзера
@@ -145,8 +146,6 @@ switch ($mode)
 			bb_die('Профиль не найден');
 		}
 
-		include(INC_DIR . 'ucp/usercp_avatar.php');
-
 		if (!bf($pr_data['user_opt'], 'user_opt', 'allow_avatar') && ($bb_cfg['allow_avatar_upload'] || $bb_cfg['allow_avatar_local'] || $bb_cfg['allow_avatar_remote']))
 		{
 			$template->assign_block_vars('switch_avatar_block', array());
@@ -691,8 +690,7 @@ if ($submit && !$errors)
 
 		if (IS_ADMIN)
 		{
-			set_pr_die_append_msg($new_user_id);
+			$message = $lang['ACCOUNT_ADDED'];
-			$die_msg = "Пользователь <b>$username</b> был успешно создан";
 		}
 		else
 		{
@@ -755,17 +753,15 @@ if ($submit && !$errors)
 			}
 		}
 
-		$die_msg = $die_msg . '<br /><br />' . sprintf($lang['CLICK_RETURN_INDEX'],  '<a href="' . append_sid("index.php") . '">', '</a>');
+		$message = $message . '<br /><br />' . sprintf($lang['CLICK_RETURN_INDEX'],  '<a href="' . append_sid("index.php") . '">', '</a>');
 
-		bb_die($die_msg);
+		bb_die($message);
 	}
 	/**
 	*  Редактирование
 	*/
 	else
 	{
-		set_pr_die_append_msg($pr_data['user_id']);
-
 		// если что-то было изменено
 		if ($db_data)
 		{
@@ -790,7 +786,7 @@ if ($submit && !$errors)
 					$emailer->use_template('user_activate', $pr_data['user_lang']);
 				}
 				$emailer->email_address($email);
-				$emailer->set_subject($lang['Reactivate']);
+				$emailer->set_subject($lang['REACTIVATE']);
 
 				$emailer->assign_vars(array(
 					'SITENAME'   => $bb_cfg['sitename'],
@@ -803,6 +799,7 @@ if ($submit && !$errors)
 				$emailer->reset();
 
 				$message = $lang['PROFILE_UPDATED_INACTIVE'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_INDEX'],  '<a href="' . append_sid("index.php") . '">', '</a>');
+			    $user->session_end();
 			}
 			else
 			{
@@ -875,16 +872,7 @@ if ($mode == 'editprofile' && $userdata['session_logged_in'])
 {
 	$template->assign_block_vars('switch_bittorrent', array());
 
-	$sql = 'SELECT auth_key
+	$row = DB()->fetch_row("SELECT auth_key FROM ". BB_BT_USERS ." WHERE user_id = $pr_user_id");
-		FROM '. BB_BT_USERS .'
-		WHERE user_id = '. $pr_user_id;
-
-	if (!$result = DB()->sql_query($sql))
-	{
-		message_die(GENERAL_ERROR, 'Could not query users passkey', '', __LINE__, __FILE__, $sql);
-	}
-
-	$row = DB()->sql_fetchrow($result);
 	$curr_passkey = ($row['auth_key']) ? $row['auth_key'] : '';
 
 	$template->assign_vars(array(
@@ -897,19 +885,6 @@ if ($mode == 'editprofile' && $userdata['session_logged_in'])
 }
 //bt end
 
-function set_pr_die_append_msg ($pr_uid)
-{
-	global $template;
-
-	$template->assign_var('BB_DIE_APPEND_MSG', '
-		<a href="'. PROFILE_URL . $pr_uid .'" onclick="return post2url(this.href, {after_edit: 1});">Перейти к просмотру профиля</a>
-		<br /><br />
-		<a href="profile.php?mode=editprofile'. (IS_ADMIN ? "&amp;u=$pr_uid" : '') .'" onclick="return post2url(this.href, {after_edit: 1});">Вернуться к редактированию</a>
-		<br /><br />
-		<a href="index.php">Вернуться на главную страницу</a>
-	');
-}
-
 require(PAGE_HEADER);
 
 $template->pparse('body');

upload/includes/ucp/usercp_sendpasswd.php

@@ -40,7 +40,7 @@ if ( isset($_POST['submit']) )
 			$user_password = make_rand_str(8);
 
 			$sql = "UPDATE " . BB_USERS . "
-				SET user_newpasswd = '" . md5($user_password) . "', user_actkey = '$user_actkey'
+				SET user_newpasswd = '" . md5(md5($user_password)) . "', user_actkey = '$user_actkey'
 				WHERE user_id = " . $row['user_id'];
 			if ( !DB()->sql_query($sql) )
 			{
@@ -63,8 +63,8 @@ if ( isset($_POST['submit']) )
 				'PASSWORD' => $user_password,
 				'EMAIL_SIG' => (!empty($bb_cfg['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $bb_cfg['board_email_sig']) : '',
 
-				'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
+				'U_ACTIVATE' => make_url('profile.php?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
-			);
+			));
 			$emailer->send();
 			$emailer->reset();
 

upload/templates/default/usercp_register.tpl

@@ -220,6 +220,52 @@ ajax.callback.view_message = function(data){
 	</td>
 </tr>
 <!-- END not_avatar_block -->
+<!-- BEGIN switch_avatar_block -->
+<tr>
+	<th colspan="2">{L_AVATAR_PANEL}</th>
+</tr>
+<tr>
+	<td colspan="2">
+		<table class="borderless bCenter w80 med">
+		<tr>
+			<td>{AVATAR_EXPLAIN}</td>
+			<td class="tCenter nowrap">
+				<p>{L_CURRENT_IMAGE}</p>
+				<p class="mrg_6">{USER_AVATAR}</p>
+				<p><label><input type="checkbox" name="avatardel" /> {L_DELETE}</label></p>
+			</td>
+		</tr>
+		</table>
+	</td>
+</tr>
+<!-- BEGIN switch_avatar_local_upload -->
+<tr>
+	<td>{L_UPLOAD_AVATAR_FILE}:</td>
+	<td>
+		<input type="file" name="avatar" size="40" />
+		<input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" />
+	</td>
+</tr>
+<!-- END switch_avatar_local_upload -->
+<!-- BEGIN switch_avatar_remote_upload -->
+<tr>
+	<td>{L_UPLOAD_AVATAR_URL}:<h6>{L_UPLOAD_AVATAR_URL_EXPLAIN}</h6></td>
+	<td><input type="text" name="avatarurl" size="44" /></td>
+</tr>
+<!-- END switch_avatar_remote_upload -->
+<!-- BEGIN switch_avatar_remote_link -->
+<tr>
+	<td>{L_LINK_REMOTE_AVATAR}:<h6>{L_LINK_REMOTE_AVATAR_EXPLAIN}</h6></td>
+	<td><input type="text" name="avatarremoteurl" size="44" /></td>
+</tr>
+<!-- END switch_avatar_remote_link -->
+<!-- BEGIN switch_avatar_local_gallery -->
+<tr>
+	<td>{L_AVATAR_GALLERY}:</td>
+	<td><input type="submit" name="avatargallery" value="{L_VIEW_AVATAR_GALLERY}" class="lite" /></td>
+</tr>
+<!-- END switch_avatar_local_gallery -->
+<!-- END switch_avatar_block -->
 <!-- ENDIF / EDIT_PROFILE -->
 
 <!-- IF SHOW_REG_AGREEMENT -->

upload/tracker.php

@@ -20,6 +20,7 @@ $tor_search_limit    = (IS_AM) ? 2000 : 500;
 $title_match_limit   = 700;                    // больше $tor_search_limit т.к. ищет по всем темам, а не только по раздачам
 $forum_select_size   = (UA_OPERA) ? 21 : 24;   // forum select box max rows
 $max_forum_name_len  = 60;                     // inside forum select box
+$max_forums_selected = 50;
 $title_match_max_len = 60;
 $poster_name_max_len = 25;
 $tor_colspan         = 13;                     // torrents table colspan with all columns