diff --git a/group_edit.php b/group_edit.php index 615131704..f4f1129b5 100644 --- a/group_edit.php +++ b/group_edit.php @@ -88,10 +88,9 @@ if ($is_moderator) 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_GROUP_CONFIG_ACTION' => "group_edit.php?" . POST_GROUPS_URL . "=$group_id", - 'AVATAR_EXPLAIN' => sprintf($lang['AVATAR_EXPLAIN'], $bb_cfg['group_avatars']['max_width'], $bb_cfg['group_avatars']['max_height'], (round($bb_cfg['group_avatars']['max_size'] / 1024))), - 'AVATAR_URL_PATH' => ($group_info['avatar_ext_id']) ? get_avatar_path(GROUP_AVATAR_MASK . $group_id, $group_info['avatar_ext_id']) : '', - - 'RELEASE_GROUP' => ($group_info['release_group']) ? true : false, + 'AVATAR_EXPLAIN' => sprintf($lang['AVATAR_EXPLAIN'], $bb_cfg['group_avatars']['max_width'], $bb_cfg['group_avatars']['max_height'], (round($bb_cfg['group_avatars']['max_size'] / 1024))), + 'AVATAR_IMG' => get_avatar(GROUP_AVATAR_MASK . $group_id, $group_info['avatar_ext_id']), + 'RELEASE_GROUP' => ($group_info['release_group']) ? true : false, )); $template->set_filenames(array('body' => 'group_edit.tpl')); diff --git a/index.php b/index.php index 28a5b4f50..6f4b9d20b 100644 --- a/index.php +++ b/index.php @@ -381,7 +381,7 @@ if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled']) continue; } - $week_list[] = profile_url($week) .' ('. birthday_age($week['user_birthday']) .')'; + $week_list[] = profile_url($week) .' ('. birthday_age($week['user_birthday']-1) .')'; } $week_all = ($week_all) ? ' ...' : ''; $week_list = sprintf($lang['BIRTHDAY_WEEK'], $bb_cfg['birthday_check_day'], join(', ', $week_list)) . $week_all; diff --git a/library/config.php b/library/config.php index e3fe766c2..b4f3ffc40 100644 --- a/library/config.php +++ b/library/config.php @@ -456,17 +456,17 @@ $bb_cfg['sf_on_first_page_only'] = true; $bb_cfg['allowed_topics_per_page'] = array(50, 100, 150, 200, 250, 300); // Topics -$bb_cfg['show_quick_reply'] = true; -$bb_cfg['show_rank_text'] = false; -$bb_cfg['show_rank_image'] = true; -$bb_cfg['show_poster_joined'] = true; -$bb_cfg['show_poster_posts'] = true; -$bb_cfg['show_poster_from'] = true; -$bb_cfg['show_bot_nick'] = false; -$bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links -$bb_cfg['parse_ed2k_links'] = true; // make ed2k links clickable -$bb_cfg['post_date_format'] = 'd-M-Y H:i'; -$bb_cfg['ext_link_new_win'] = true; // open external links in new window +$bb_cfg['show_quick_reply'] = true; +$bb_cfg['show_rank_text'] = false; +$bb_cfg['show_rank_image'] = true; +$bb_cfg['show_poster_joined'] = true; +$bb_cfg['show_poster_posts'] = true; +$bb_cfg['show_poster_from'] = true; +$bb_cfg['show_bot_nick'] = false; +$bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links +$bb_cfg['parse_ed2k_links'] = true; // make ed2k links clickable +$bb_cfg['post_date_format'] = 'd-M-Y H:i'; +$bb_cfg['ext_link_new_win'] = true; // open external links in new window $bb_cfg['topic_moved_days_keep'] = 7; // remove topic moved links after xx days (or FALSE to disable) @@ -538,50 +538,6 @@ $bb_cfg['ad_blocks'] = array( ), ); -// Attachments -$bb_cfg['attach'] = array( - 'upload_path' => DATA_DIR . 'torrent_files', // without '/' - 'max_size' => 250*1024, // bytes -); - -$bb_cfg['file_id_ext'] = array( - 1 => 'gif', - 2 => 'gz', - 3 => 'jpg', - 4 => 'png', - 5 => 'rar', - 6 => 'tar', - 7 => 'tiff', - 8 => 'torrent', - 9 => 'zip', -); - -$bb_cfg['tor_forums_allowed_ext'] = array('torrent', 'zip', 'rar'); // для разделов с раздачами -$bb_cfg['gen_forums_allowed_ext'] = array('zip', 'rar'); // для обычных разделов - -// Avatars -$bb_cfg['avatars'] = array( - 'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов - 'bot_avatar' => 'gallery/bot.gif', // аватара бота - 'max_size' => 100*1024, // размер аватары в байтах - 'max_height' => 100, // высота аватара в px - 'max_width' => 100, // ширина аватара в px - 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара - 'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами - 'up_allowed' => true, // разрешить загрузку аватар -); - -// Group avatars -$bb_cfg['group_avatars'] = array( - 'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов - 'max_size' => 300*1024, // размер аватары в байтах - 'max_height' => 300, // высота аватара в px - 'max_width' => 300, // ширина аватара в px - 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара - 'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами - 'up_allowed' => true, // разрешить загрузку аватар -); - // Misc define('MEM_USAGE', function_exists('memory_get_usage')); @@ -618,24 +574,68 @@ $bb_cfg['user_agreement_url'] = 'info.php?show=user_agreement'; $bb_cfg['copyright_holders_url'] = 'info.php?show=copyright_holders'; $bb_cfg['advert_url'] = 'info.php?show=advert'; +$bb_cfg['file_id_ext'] = array( + 1 => 'gif', + 2 => 'gz', + 3 => 'jpg', + 4 => 'png', + 5 => 'rar', + 6 => 'tar', + 7 => 'tiff', + 8 => 'torrent', + 9 => 'zip', +); + +$bb_cfg['tor_forums_allowed_ext'] = array('torrent', 'zip', 'rar'); // для разделов с раздачами +$bb_cfg['gen_forums_allowed_ext'] = array('zip', 'rar'); // для обычных разделов + +// Attachments +$bb_cfg['attach'] = array( + 'upload_path' => DATA_DIR . 'torrent_files', // путь к директории с torrent файлами + 'max_size' => 250*1024, // размер аватары в байтах +); + +// Avatars +$bb_cfg['avatars'] = array( + 'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов + 'bot_avatar' => 'gallery/bot.gif', // аватара бота + 'max_size' => 100*1024, // размер аватары в байтах + 'max_height' => 100, // высота аватара в px + 'max_width' => 100, // ширина аватара в px + 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара + 'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами + 'up_allowed' => true, // разрешить загрузку аватар +); + +// Group avatars +$bb_cfg['group_avatars'] = array( + 'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов + 'max_size' => 300*1024, // размер аватары в байтах + 'max_height' => 300, // высота аватара в px + 'max_width' => 300, // ширина аватара в px + 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара + 'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами + 'up_allowed' => true, // разрешить загрузку аватар +); + // Captcha $bb_cfg['captcha'] = array( 'disabled' => false, 'secret_key' => 'secret_key', - 'img_path' => INT_DATA_DIR .'captcha/', # with '/' - 'img_url' => './internal_data/captcha/', # with '/' + 'img_path' => INT_DATA_DIR .'captcha/', // with '/' + 'img_url' => './internal_data/captcha/', // with '/' ); // Atom feed $bb_cfg['atom'] = array( - 'path' => INT_DATA_DIR .'atom', # without '/' - 'url' => './internal_data/atom', # without '/' + 'path' => INT_DATA_DIR .'atom', // without '/' + 'url' => './internal_data/atom', // without '/' ); // Nofollow $bb_cfg['nofollow'] = array( 'disabled' => false, - 'allowed_url' => array($domain_name), // 'allowed.site', 'www.allowed.site' + 'allowed_url' => array($domain_name), // 'allowed.site', 'www.allowed.site' ); // Local config diff --git a/library/includes/api/sphinx.php b/library/includes/api/sphinx.php index a3afb1614..68b29869e 100644 --- a/library/includes/api/sphinx.php +++ b/library/includes/api/sphinx.php @@ -1,5 +1,7 @@ '; + $user_avatar = ''. $user_id .''; if ($user_id == BOT_UID && $bb_cfg['avatars']['bot_avatar']) { - $user_avatar = ''. $user_id .''; + $user_avatar = ''. $user_id .''; } - elseif ($allow_avatar && $ext_id) + else if ($allow_avatar && $ext_id) { - if (file_exists($bb_cfg['avatars']['upload_path'] . get_avatar_path($user_id, $ext_id))) + if (file_exists(get_avatar_path($user_id, $ext_id))) { - $user_avatar = ''. $user_id .''; + $user_avatar = ''. $user_id .''; } } diff --git a/library/includes/functions_upload.php b/library/includes/functions_upload.php index cd335b294..14244c730 100644 --- a/library/includes/functions_upload.php +++ b/library/includes/functions_upload.php @@ -1,5 +1,7 @@ file_ext_id, $bb_cfg['avatars']['upload_path']); + $file_path = get_avatar_path($params['user_id'], $this->file_ext_id); return $this->_move($file_path); } else if ($mode == 'attach') diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php index 46db112b4..84401a0a1 100644 --- a/library/includes/ucp/register.php +++ b/library/includes/ucp/register.php @@ -766,14 +766,13 @@ $template->assign_vars(array( 'AVATAR_EXPLAIN' => sprintf($lang['AVATAR_EXPLAIN'], $bb_cfg['avatars']['max_width'], $bb_cfg['avatars']['max_height'], (round($bb_cfg['avatars']['max_size'] / 1024))), 'AVATAR_DISALLOWED' => bf($pr_data['user_opt'], 'user_opt', 'dis_avatar'), 'AVATAR_DIS_EXPLAIN' => sprintf($lang['AVATAR_DISABLE'], $bb_cfg['terms_and_conditions_url']), + 'AVATAR_IMG' => get_avatar($pr_data['user_id'], $pr_data['avatar_ext_id'], !bf($pr_data['user_opt'], 'user_opt', 'dis_avatar')), 'SIGNATURE_EXPLAIN' => sprintf($lang['SIGNATURE_EXPLAIN'], $bb_cfg['max_sig_chars']), 'SIG_DISALLOWED' => bf($pr_data['user_opt'], 'user_opt', 'dis_sig'), 'PR_USER_ID' => $pr_data['user_id'], 'U_RESET_AUTOLOGIN' => LOGIN_URL . "?logout=1&reset_autologin=1&sid={$userdata['session_id']}", - - 'AVATAR_URL_PATH' => ($pr_data['avatar_ext_id']) ? get_avatar_path($pr_data['user_id'], $pr_data['avatar_ext_id']) : '', )); print_page('usercp_register.tpl'); \ No newline at end of file diff --git a/library/language/en/html/sidebar1.html b/library/language/en/html/sidebar1.html index 08fa4f64d..08fe86eea 100644 --- a/library/language/en/html/sidebar1.html +++ b/library/language/en/html/sidebar1.html @@ -1,9 +1,9 @@

BitTorrent clients

diff --git a/library/language/ru/html/sidebar1.html b/library/language/ru/html/sidebar1.html index 6c999dfc9..49cb07edd 100644 --- a/library/language/ru/html/sidebar1.html +++ b/library/language/ru/html/sidebar1.html @@ -1,9 +1,9 @@

BitTorrent клиенты

diff --git a/library/language/uk/html/sidebar1.html b/library/language/uk/html/sidebar1.html index f0dcac149..d18ab59d1 100644 --- a/library/language/uk/html/sidebar1.html +++ b/library/language/uk/html/sidebar1.html @@ -1,9 +1,9 @@

BitTorrent клієнти

diff --git a/styles/templates/default/group_edit.tpl b/styles/templates/default/group_edit.tpl index afbf9f1c7..e66ce14ac 100644 --- a/styles/templates/default/group_edit.tpl +++ b/styles/templates/default/group_edit.tpl @@ -68,19 +68,11 @@ function manage_group(mode, value) { - {L_AVATAR}: - -

+ {L_AVATAR}:

-

- avatar -

-
-

- -

+

{AVATAR_IMG}


+

-
{AVATAR_EXPLAIN}
diff --git a/styles/templates/default/usercp_register.tpl b/styles/templates/default/usercp_register.tpl index aac351baa..cbc27c538 100644 --- a/styles/templates/default/usercp_register.tpl +++ b/styles/templates/default/usercp_register.tpl @@ -288,8 +288,8 @@ ajax.callback.posts = function(data){ -

avatar--

-

+

{AVATAR_IMG}

+