diff --git a/upload/config.php b/upload/config.php index 93faeb6f9..1d96230bf 100644 --- a/upload/config.php +++ b/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 diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index f151226f1..f3f0a5d3f 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/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,31 +146,29 @@ 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() ); + $template->assign_block_vars('switch_avatar_block', array()); - if ( $bb_cfg['allow_avatar_upload'] && file_exists(@phpbb_realpath('./' . $bb_cfg['avatar_path'])) ) + if ($bb_cfg['allow_avatar_upload'] && file_exists(@phpbb_realpath('./' . $bb_cfg['avatar_path']))) { - $template->assign_block_vars('switch_avatar_block.switch_avatar_local_upload', array() ); - $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_upload', array() ); + $template->assign_block_vars('switch_avatar_block.switch_avatar_local_upload', array()); + $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_upload', array()); } - if ( $bb_cfg['allow_avatar_remote'] ) + if ($bb_cfg['allow_avatar_remote']) { - $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_link', array() ); + $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_link', array()); } - if ( $bb_cfg['allow_avatar_local'] && file_exists(@phpbb_realpath('./' . $bb_cfg['avatar_gallery_path'])) ) + if ($bb_cfg['allow_avatar_local'] && file_exists(@phpbb_realpath('./' . $bb_cfg['avatar_gallery_path']))) { - $template->assign_block_vars('switch_avatar_block.switch_avatar_local_gallery', array() ); + $template->assign_block_vars('switch_avatar_block.switch_avatar_local_gallery', array()); } } else { - $template->assign_block_vars('not_avatar_block', array() ); + $template->assign_block_vars('not_avatar_block', array()); } break; @@ -477,7 +476,7 @@ foreach ($profile_fields as $field => $can_edit) $skype = isset($_POST['user_skype']) ? (string) $_POST['user_skype'] : $pr_data['user_skype']; if ($submit && $skype != $pr_data['user_skype']) { - if ( !preg_match("#^[a-zA-Z0-9_.\-@,]{6,32}$#", $skype)) + if (!preg_match("#^[a-zA-Z0-9_.\-@,]{6,32}$#", $skype)) { $errors[] = $lang['SKYPE_ERROR']; } @@ -490,30 +489,30 @@ foreach ($profile_fields as $field => $can_edit) case 'user_avatar': case 'user_avatar_type': - if( isset($_POST['avatargallery']) && !$errors ) + if(isset($_POST['avatargallery']) && !$errors) { - $avatar_category = ( !empty($_POST['avatarcategory']) ) ? htmlspecialchars($_POST['avatarcategory']) : ''; + $avatar_category = (!empty($_POST['avatarcategory'])) ? htmlspecialchars($_POST['avatarcategory']) : ''; $dir = @opendir($bb_cfg['avatar_gallery_path']); $avatar_images = array(); - while( $file = @readdir($dir) ) + while($file = @readdir($dir)) { - if( $file != '.' && $file != '..' && !is_file($bb_cfg['avatar_gallery_path'] . '/' . $file) && !is_link($bb_cfg['avatar_gallery_path'] . '/' . $file) ) + if($file != '.' && $file != '..' && !is_file($bb_cfg['avatar_gallery_path'] . '/' . $file) && !is_link($bb_cfg['avatar_gallery_path'] . '/' . $file)) { $sub_dir = @opendir($bb_cfg['avatar_gallery_path'] . '/' . $file); $avatar_row_count = 0; $avatar_col_count = 0; - while( $sub_file = @readdir($sub_dir) ) + while($sub_file = @readdir($sub_dir)) { - if( preg_match('/(\.gif$|\.png$|\.jpg|\.jpeg)$/is', $sub_file) ) + if(preg_match('/(\.gif$|\.png$|\.jpg|\.jpeg)$/is', $sub_file)) { $avatar_images[$file][$avatar_row_count][$avatar_col_count] = $sub_file; $avatar_name[$file][$avatar_row_count][$avatar_col_count] = ucfirst(str_replace("_", " ", preg_replace('/^(.*)\..*$/', '\1', $sub_file))); $avatar_col_count++; - if( $avatar_col_count == 5 ) + if($avatar_col_count == 5) { $avatar_row_count++; $avatar_col_count = 0; @@ -528,17 +527,17 @@ foreach ($profile_fields as $field => $can_edit) @ksort($avatar_images); @reset($avatar_images); - if( empty($category) ) + if(empty($category)) { - list($category, ) = each($avatar_images); + list($category,) = each($avatar_images); } @reset($avatar_images); $s_categories = ' {L_DELETE}

+ + + + + + + + {L_UPLOAD_AVATAR_FILE}: + + + + + + + + + {L_UPLOAD_AVATAR_URL}:
{L_UPLOAD_AVATAR_URL_EXPLAIN}
+ + + + + + {L_LINK_REMOTE_AVATAR}:
{L_LINK_REMOTE_AVATAR_EXPLAIN}
+ + + + + + {L_AVATAR_GALLERY}: + + + + diff --git a/upload/tracker.php b/upload/tracker.php index 05cd7f3ab..7ffd436dc 100644 --- a/upload/tracker.php +++ b/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