diff --git a/upload/config.php b/upload/config.php index 953eaaf39..103bbd0e0 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Beta'; -$bb_cfg['tp_release_state'] = 'R227'; +$bb_cfg['tp_release_state'] = 'R228'; $bb_cfg['tp_release_date'] = '17-08-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/captcha/captcha.php b/upload/includes/captcha/captcha.php index 4c8b78501..a2f6f0be8 100644 --- a/upload/includes/captcha/captcha.php +++ b/upload/includes/captcha/captcha.php @@ -7,7 +7,7 @@ class captcha_common { var $cfg = array(); // конфиг var $can_bypass = false; // может обойти капчу - var $cap_img_total = 1000; // количество текущих картинок + var $cap_img_total = 300; // количество текущих картинок var $new_per_minute = 10; // сколько генерить новых, столько же будет помечаться для удаления var $key_ttl = 300; // время жизни _code_ ключа var $cap_sid_len = 20; // длина sid'a diff --git a/upload/includes/page_footer.php b/upload/includes/page_footer.php index 8c3db5e41..1106cf51c 100644 --- a/upload/includes/page_footer.php +++ b/upload/includes/page_footer.php @@ -60,7 +60,7 @@ if ($show_dbg_info) $l[$i] = round($l[$i], 1); $l[$i] = (IS_ADMIN && $bb_cfg['max_srv_load'] && $l[$i] > ($bb_cfg['max_srv_load'] + 4)) ? "$l[$i]" : $l[$i]; } - $stat .= " | : $l[0] $l[1] $l[2]"; + $stat .= " | ". $lang['LIMIT'] ." $l[0] $l[1] $l[2]"; } $stat .= ' ]'; diff --git a/upload/index.php b/upload/index.php index 29002357c..4a2388c9d 100644 --- a/upload/index.php +++ b/upload/index.php @@ -273,7 +273,7 @@ foreach ($cat_forums as $cid => $c) $template->assign_block_vars('c.f.sf', array( 'SF_ID' => $fid, 'SF_NAME' => $fname_html, - 'SF_NEW' => $new ? $lang['NEW'] : '', + 'SF_NEW' => $new ? ' new' : '', )); continue; } diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 49ed8ed73..5b444522c 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1609,6 +1609,7 @@ $lang['ON'] = 'on'; $lang['OFF'] = 'off'; $lang['MEMORY'] = 'Mem: '; $lang['QUERIES'] = 'queries'; +$lang['LIMIT'] = 'Limit:'; // Attach Guest $lang['DOWNLOAD_INFO'] = 'Download free and at maximum speed!'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index a559f4647..030d0e55b 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1617,6 +1617,7 @@ $lang['ON'] = 'вкл'; $lang['OFF'] = 'выкл'; $lang['MEMORY'] = 'Память: '; $lang['QUERIES'] = 'запр.'; +$lang['LIMIT'] = 'Лимит:'; // Attach Guest $lang['DOWNLOAD_INFO'] = 'Скачать бесплатно и на максимальной скорости!'; diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl index 24bbaab20..139e3c1d7 100644 --- a/upload/templates/default/index.tpl +++ b/upload/templates/default/index.tpl @@ -87,7 +87,7 @@
{L_SUBFORUMS}: - •{c.f.sf.SF_NAME} + ►{c.f.sf.SF_NAME}