github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-14 18:48:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r552

Browse source 
Унификация работы с email, начатая в r545. Исправление недочетов названной ревизии. Перенос настроек email в config.php. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@552 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
glix08 2013-09-05 16:13:21 +00:00
commit e3d240ba55
8 changed files with 139 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

7
install/sql/mysql.sql
View file

@ -554,9 +554,6 @@ INSERT INTO `bb_config` VALUES ('avatar_max_height', '100');
INSERT INTO `bb_config` VALUES ('avatar_max_width', '100');
INSERT INTO `bb_config` VALUES ('avatar_path', 'images/avatars');
INSERT INTO `bb_config` VALUES ('board_disable', '0');
INSERT INTO `bb_config` VALUES ('board_email', 'board_email@yourdomain.com');
INSERT INTO `bb_config` VALUES ('board_email_form', '0');
INSERT INTO `bb_config` VALUES ('board_email_sig', 'Thanks, The Management');
INSERT INTO `bb_config` VALUES ('board_startdate', '');
INSERT INTO `bb_config` VALUES ('board_timezone', '0');
INSERT INTO `bb_config` VALUES ('bonus_upload', '');
@ -622,10 +619,6 @@ INSERT INTO `bb_config` VALUES ('seed_bonus_user_regdate', '0');
INSERT INTO `bb_config` VALUES ('site_desc', 'A _little_ text to describe your forum');
INSERT INTO `bb_config` VALUES ('sitename', 'TorrentPier II - Torrent Tracker');
INSERT INTO `bb_config` VALUES ('smilies_path', 'images/smiles');
INSERT INTO `bb_config` VALUES ('smtp_delivery', '0');
INSERT INTO `bb_config` VALUES ('smtp_host', '');
INSERT INTO `bb_config` VALUES ('smtp_password', '');
INSERT INTO `bb_config` VALUES ('smtp_username', '');
INSERT INTO `bb_config` VALUES ('topics_per_page', '50');
INSERT INTO `bb_config` VALUES ('version', '.0.22');
INSERT INTO `bb_config` VALUES ('xs_add_comments', '0');

223
upload/admin/admin_board.php
View file

@ -50,8 +50,8 @@ else
if (isset($_POST['submit']) && $row['config_value'] != $new[$config_name])
{
if($config_name == 'seed_bonus_points' || $config_name == 'seed_bonus_release') $new[$config_name] = serialize($new[$config_name]);
if($config_name == 'bonus_upload' || $config_name == 'bonus_upload_price') $new[$config_name] = serialize($new[$config_name]);
if ($config_name == 'seed_bonus_points' || $config_name == 'seed_bonus_release') $new[$config_name] = serialize($new[$config_name]);
if ($config_name == 'bonus_upload' || $config_name == 'bonus_upload_price') $new[$config_name] = serialize($new[$config_name]);
bb_update_config(array($config_name => $new[$config_name]));
}
@ -62,143 +62,138 @@ else
if ($mode == 'config')
{
message_die(GENERAL_MESSAGE, $lang['CONFIG_UPDATED'] . $return_links['config'] . $return_links['index']);
}
}
elseif ($mode == 'config_mods')
{
message_die(GENERAL_MESSAGE, $lang['CONFIG_UPDATED'] . $return_links['config_mods'] . $return_links['index']);
}
}
}
}
}
switch($mode)
{
case 'config_mods':
$template->assign_vars(array(
'S_CONFIG_ACTION' => 'admin_board.php?mode=config_mods',
$template->assign_vars(array(
'S_CONFIG_ACTION' => 'admin_board.php?mode=config_mods',
'CONFIG_MODS' => true,
'REPORTS_ENABLED' => $new['reports_enabled'],
'GALLERY_ENABLED' => $new['gallery_enabled'],
'PIC_DIR' => $new['pic_dir'],
'PIC_MAX_SIZE' => $new['pic_max_size'],
'AUTO_DELETE_POSTED_PICS' => $new['auto_delete_posted_pics'],
'MAGNET_LINKS_ENABLED' => $new['magnet_links_enabled'],
'GENDER' => $new['gender'],
'CALLSEED' => $new['callseed'],
'TOR_STATS' => $new['tor_stats'],
'SHOW_LATEST_NEWS' => $new['show_latest_news'],
'MAX_NEWS_TITLE' => $new['max_news_title'],
'LATEST_NEWS_COUNT' => $new['latest_news_count'],
'LATEST_NEWS_FORUM_ID' => $new['latest_news_forum_id'],
'SHOW_NETWORK_NEWS' => $new['show_network_news'],
'MAX_NET_TITLE' => $new['max_net_title'],
'NETWORK_NEWS_COUNT' => $new['network_news_count'],
'NETWORK_NEWS_FORUM_ID' => $new['network_news_forum_id'],
'WHOIS_INFO' => $new['whois_info'],
'SHOW_MOD_INDEX' => $new['show_mod_index'],
'BIRTHDAY_ENABLED' => $new['birthday_enabled'],
'BIRTHDAY_MAX_AGE' => $new['birthday_max_age'],
'BIRTHDAY_MIN_AGE' => $new['birthday_min_age'],
'BIRTHDAY_CHECK_DAY' => $new['birthday_check_day'],
'PREMOD' => $new['premod'],
'TOR_COMMENT' => $new['tor_comment'],
'NEW_TPLS' => $new['new_tpls'],
'SEED_BONUS_ENABLED' => $new['seed_bonus_enabled'],
'SEED_BONUS_TOR_SIZE' => $new['seed_bonus_tor_size'],
'SEED_BONUS_USER_REGDATE' => $new['seed_bonus_user_regdate'],
));
'REPORTS_ENABLED' => $new['reports_enabled'],
'GALLERY_ENABLED' => $new['gallery_enabled'],
'PIC_DIR' => $new['pic_dir'],
'PIC_MAX_SIZE' => $new['pic_max_size'],
'AUTO_DELETE_POSTED_PICS' => $new['auto_delete_posted_pics'],
'MAGNET_LINKS_ENABLED' => $new['magnet_links_enabled'],
'GENDER' => $new['gender'],
'CALLSEED' => $new['callseed'],
'TOR_STATS' => $new['tor_stats'],
'SHOW_LATEST_NEWS' => $new['show_latest_news'],
'MAX_NEWS_TITLE' => $new['max_news_title'],
'LATEST_NEWS_COUNT' => $new['latest_news_count'],
'LATEST_NEWS_FORUM_ID' => $new['latest_news_forum_id'],
'SHOW_NETWORK_NEWS' => $new['show_network_news'],
'MAX_NET_TITLE' => $new['max_net_title'],
'NETWORK_NEWS_COUNT' => $new['network_news_count'],
'NETWORK_NEWS_FORUM_ID' => $new['network_news_forum_id'],
'WHOIS_INFO' => $new['whois_info'],
'SHOW_MOD_INDEX' => $new['show_mod_index'],
'BIRTHDAY_ENABLED' => $new['birthday_enabled'],
'BIRTHDAY_MAX_AGE' => $new['birthday_max_age'],
'BIRTHDAY_MIN_AGE' => $new['birthday_min_age'],
'BIRTHDAY_CHECK_DAY' => $new['birthday_check_day'],
'PREMOD' => $new['premod'],
'TOR_COMMENT' => $new['tor_comment'],
'NEW_TPLS' => $new['new_tpls'],
'SEED_BONUS_ENABLED' => $new['seed_bonus_enabled'],
'SEED_BONUS_TOR_SIZE' => $new['seed_bonus_tor_size'],
'SEED_BONUS_USER_REGDATE' => $new['seed_bonus_user_regdate'],
));
if($new['seed_bonus_points'] && $new['seed_bonus_release'])
{ $seed_bonus = unserialize($new['seed_bonus_points']);
$seed_release = unserialize($new['seed_bonus_release']);
if ($new['seed_bonus_points'] && $new['seed_bonus_release'])
{
$seed_bonus = unserialize($new['seed_bonus_points']);
$seed_release = unserialize($new['seed_bonus_release']);
foreach($seed_bonus as $i => $row)
{
if(!$row || !$seed_release[$i]) continue;
foreach ($seed_bonus as $i => $row)
{
if (!$row || !$seed_release[$i]) continue;
$template->assign_block_vars('seed_bonus', array(
'RELEASE' => $seed_release[$i],
'POINTS' => $row,
));
} }
$template->assign_block_vars('seed_bonus', array(
'RELEASE' => $seed_release[$i],
'POINTS' => $row,
));
}
}
if($new['bonus_upload'] && $new['bonus_upload_price'])
{
$upload_row = unserialize($new['bonus_upload']);
if ($new['bonus_upload'] && $new['bonus_upload_price'])
{
$upload_row = unserialize($new['bonus_upload']);
$price_row = unserialize($new['bonus_upload_price']);
foreach($upload_row as $i => $row)
{
if(!$row || !$price_row[$i]) continue;
foreach ($upload_row as $i => $row)
{
if (!$row || !$price_row[$i]) continue;
$template->assign_block_vars('bonus_upload', array(
'UP' => $row,
'PRICE' => $price_row[$i],
));
}
}
$template->assign_block_vars('bonus_upload', array(
'UP' => $row,
'PRICE' => $price_row[$i],
));
}
}
break;
default:
$template->assign_vars(array(
'S_CONFIG_ACTION' => 'admin_board.php?mode=config',
'S_CONFIG_ACTION' => 'admin_board.php?mode=config',
'CONFIG' => true,
'SITENAME' => htmlCHR($new['sitename']),
'CONFIG_SITE_DESCRIPTION' => htmlCHR($new['site_desc']),
'DISABLE_BOARD' => ($new['board_disable']) ? true : false,
'SITENAME' => htmlCHR($new['sitename']),
'CONFIG_SITE_DESCRIPTION' => htmlCHR($new['site_desc']),
'DISABLE_BOARD' => ($new['board_disable']) ? true : false,
'ACTIVATION_NONE' => USER_ACTIVATION_NONE,
'ACTIVATION_NONE_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : '',
'ACTIVATION_USER' => USER_ACTIVATION_SELF,
'ACTIVATION_USER_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : '',
'ACTIVATION_ADMIN' => USER_ACTIVATION_ADMIN,
'ACTIVATION_ADMIN_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : '',
'ACTIVATION_NONE' => USER_ACTIVATION_NONE,
'ACTIVATION_NONE_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : '',
'ACTIVATION_USER' => USER_ACTIVATION_SELF,
'ACTIVATION_USER_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : '',
'ACTIVATION_ADMIN' => USER_ACTIVATION_ADMIN,
'ACTIVATION_ADMIN_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : '',
'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false,
'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'],
'BOARD_EMAIL_FORM' => ($new['board_email_form']) ? true : false,
'MAX_POLL_OPTIONS' => $new['max_poll_options'],
'FLOOD_INTERVAL' => $new['flood_interval'],
'TOPICS_PER_PAGE' => $new['topics_per_page'],
'POSTS_PER_PAGE' => $new['posts_per_page'],
'HOT_TOPIC' => $new['hot_threshold'],
'LANG_SELECT' => language_select($new['default_lang'], 'default_lang', 'language'),
'DEFAULT_DATEFORMAT' => $new['default_dateformat'],
'TIMEZONE_SELECT' => tz_select($new['board_timezone'], 'board_timezone'),
'PRIVMSG_DISABLE' => ($new['privmsg_disable']) ? false : true,
'INBOX_LIMIT' => $new['max_inbox_privmsgs'],
'SENTBOX_LIMIT' => $new['max_sentbox_privmsgs'],
'SAVEBOX_LIMIT' => $new['max_savebox_privmsgs'],
'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'],
'LOGIN_RESET_TIME' => $new['login_reset_time'],
'PRUNE_ENABLE' => ($new['prune_enable']) ? true : false,
'ALLOW_BBCODE' => ($new['allow_bbcode']) ? true : false,
'ALLOW_SMILIES' => ($new['allow_smilies']) ? true : false,
'ALLOW_SIG' => ($new['allow_sig']) ? true : false,
'SIG_SIZE' => $new['max_sig_chars'],
'ALLOW_NAMECHANGE' => ($new['allow_namechange']) ? true : false,
'ALLOW_AVATARS_LOCAL' => ($new['allow_avatar_local']) ? true : false,
'ALLOW_AVATAR_REMOTE' => ($new['allow_avatar_remote']) ? true : false,
'ALLOW_AVATAR_UPLOAD' => ($new['allow_avatar_upload']) ? true : false,
'AVATAR_FILESIZE' => $new['avatar_filesize'],
'AVATAR_MAX_HEIGHT' => $new['avatar_max_height'],
'AVATAR_MAX_WIDTH' => $new['avatar_max_width'],
'AVATAR_PATH' => $new['avatar_path'],
'AVATAR_GALLERY_PATH' => $new['avatar_gallery_path'],
'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false,
'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'],
'MAX_POLL_OPTIONS' => $new['max_poll_options'],
'FLOOD_INTERVAL' => $new['flood_interval'],
'TOPICS_PER_PAGE' => $new['topics_per_page'],
'POSTS_PER_PAGE' => $new['posts_per_page'],
'HOT_TOPIC' => $new['hot_threshold'],
'LANG_SELECT' => language_select($new['default_lang'], 'default_lang', 'language'),
'DEFAULT_DATEFORMAT' => $new['default_dateformat'],
'TIMEZONE_SELECT' => tz_select($new['board_timezone'], 'board_timezone'),
'PRIVMSG_DISABLE' => ($new['privmsg_disable']) ? false : true,
'INBOX_LIMIT' => $new['max_inbox_privmsgs'],
'SENTBOX_LIMIT' => $new['max_sentbox_privmsgs'],
'SAVEBOX_LIMIT' => $new['max_savebox_privmsgs'],
'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'],
'LOGIN_RESET_TIME' => $new['login_reset_time'],
'PRUNE_ENABLE' => ($new['prune_enable']) ? true : false,
'ALLOW_BBCODE' => ($new['allow_bbcode']) ? true : false,
'ALLOW_SMILIES' => ($new['allow_smilies']) ? true : false,
'ALLOW_SIG' => ($new['allow_sig']) ? true : false,
'SIG_SIZE' => $new['max_sig_chars'],
'ALLOW_NAMECHANGE' => ($new['allow_namechange']) ? true : false,
'ALLOW_AVATARS_LOCAL' => ($new['allow_avatar_local']) ? true : false,
'ALLOW_AVATAR_REMOTE' => ($new['allow_avatar_remote']) ? true : false,
'ALLOW_AVATAR_UPLOAD' => ($new['allow_avatar_upload']) ? true : false,
'AVATAR_FILESIZE' => $new['avatar_filesize'],
'AVATAR_MAX_HEIGHT' => $new['avatar_max_height'],
'AVATAR_MAX_WIDTH' => $new['avatar_max_width'],
'AVATAR_PATH' => $new['avatar_path'],
'AVATAR_GALLERY_PATH' => $new['avatar_gallery_path'],
'NO_AVATAR' => $new['no_avatar'],
'SMILIES_PATH' => $new['smilies_path'],
'INBOX_PRIVMSGS' => $new['max_inbox_privmsgs'],
'SENTBOX_PRIVMSGS' => $new['max_sentbox_privmsgs'],
'SAVEBOX_PRIVMSGS' => $new['max_savebox_privmsgs'],
'EMAIL_FROM' => $new['board_email'],
'EMAIL_SIG' => $new['board_email_sig'],
'SMTP_DELIVERY' => ($new['smtp_delivery']) ? true : false,
'SMTP_HOST' => $new['smtp_host'],
'SMTP_USERNAME' => $new['smtp_username'],
'SMTP_PASSWORD' => $new['smtp_password'],
));
break;
'SMILIES_PATH' => $new['smilies_path'],
'INBOX_PRIVMSGS' => $new['max_inbox_privmsgs'],
'SENTBOX_PRIVMSGS' => $new['max_sentbox_privmsgs'],
'SAVEBOX_PRIVMSGS' => $new['max_savebox_privmsgs'],
));
break;
}
print_page('admin_board.tpl', 'admin');
print_page('admin_board.tpl', 'admin');

30
upload/ajax/edit_user_profile.php
View file

@ -47,7 +47,7 @@ switch ($field)
break;
case 'user_gender':
if(!$bb_cfg['gender']) $this->ajax_die($lang['MODULE_OFF']);
if (!$bb_cfg['gender']) $this->ajax_die($lang['MODULE_OFF']);
if (!isset($lang['GENDER_SELECT'][$value]))
{
$this->ajax_die($lang['ERROR']);
@ -56,19 +56,19 @@ switch ($field)
break;
case 'user_birthday':
if(!$bb_cfg['birthday_enabled']) $this->ajax_die($lang['MODULE_OFF']);
$data = explode('-', $value);
$b_day = (isset($data[2])) ? (int) $data[2] : '';
if (!$bb_cfg['birthday_enabled']) $this->ajax_die($lang['MODULE_OFF']);
$data = explode('-', $value);
$b_day = (isset($data[2])) ? (int) $data[2] : '';
$b_md = (isset($data[1])) ? (int) $data[1] : '';
$b_year = (isset($data[0])) ? (int) $data[0] : '';
if($b_day || $b_md || $b_year)
if ($b_day || $b_md || $b_year)
{
if((bb_date(TIMENOW, 'Y', 'false') - $b_year) > $bb_cfg['birthday_max_age'])
if ((bb_date(TIMENOW, 'Y', 'false') - $b_year) > $bb_cfg['birthday_max_age'])
{
$this->ajax_die(sprintf($lang['BIRTHDAY_TO_HIGH'], $bb_cfg['birthday_max_age']));
}
else if((bb_date(TIMENOW, 'Y', 'false') - $b_year) < $bb_cfg['birthday_min_age'])
else if ((bb_date(TIMENOW, 'Y', 'false') - $b_year) < $bb_cfg['birthday_min_age'])
{
$this->ajax_die(sprintf($lang['BIRTHDAY_TO_LOW'], $bb_cfg['birthday_min_age']));
}
@ -84,30 +84,30 @@ switch ($field)
}
else
{
$value = '';
$next_birthday_greeting = 0;
$value = '';
$next_birthday_greeting = 0;
}
DB()->query("UPDATE $table SET user_next_birthday_greeting = $next_birthday_greeting WHERE user_id = $user_id LIMIT 1");
$this->response['new_value'] = $this->request['value'];
$this->response['new_value'] = $this->request['value'];
break;
case 'user_icq':
case 'user_icq':
$value = (int) $value;
if ($value && !preg_match('#^\d{6,15}$#', $value))
{
$this->ajax_die($lang['ICQ_ERROR']);
}
$this->response['new_value'] = $this->request['value'];
break;
break;
case 'user_skype':
case 'user_skype':
if ($value && !preg_match("#^[a-zA-Z0-9_.\-@,]{6,32}$#", $value))
{
$this->ajax_die($lang['SKYPE_ERROR']);
}
$this->response['new_value'] = $this->request['value'];
break;
break;
case 'user_from':
case 'user_occ':
@ -162,7 +162,7 @@ switch ($field)
$value = (float) str_replace(',', '.', $this->request['value']);
$value = sprintf('%.2f', $value);
$this->response['new_value'] = $value;
break;
break;
default:
$this->ajax_die("invalid profile field: $field");

18
upload/config.php
View file

@ -55,8 +55,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
// Increase number of revision after update
$bb_cfg['tp_version'] = '2.5 (unstable)';
$bb_cfg['tp_release_date'] = '02-09-2013';
$bb_cfg['tp_release_state'] = 'R551';
$bb_cfg['tp_release_date'] = '05-09-2013';
$bb_cfg['tp_release_state'] = 'R552';
// Database
$charset = 'utf8';
@ -305,13 +305,15 @@ $bb_cfg['new_user_reg_restricted'] = false;
// Email
$bb_cfg['emailer_disabled'] = false;
$bb_cfg['smtp_host'] = '';
$bb_cfg['smtp_password'] = '';
$bb_cfg['smtp_username'] = '';
$bb_cfg['smtp_delivery'] = false; // set true if you want or have to send email via a named server instead of the local mail function
$bb_cfg['smtp_host'] = ''; // SMTP server host
$bb_cfg['smtp_password'] = ''; // enter a password if your SMTP server requires it
$bb_cfg['smtp_username'] = ''; // enter a username if your SMTP server requires it
$bb_cfg['board_email'] = 'admin@' . $domain_name;
$bb_cfg['board_email_sig'] = '';
$bb_cfg['sitename'] = $domain_name;
$bb_cfg['board_email'] = 'noreply@' . $domain_name; // admin email address
$bb_cfg['board_email_form'] = false; // can users send email to each other via board
$bb_cfg['board_email_sig'] = ''; // this text will be attached to all emails the board sends
$bb_cfg['board_email_sitename'] = $domain_name; // sitename used in all emails header
$bb_cfg['topic_notify_enabled'] = true;
$bb_cfg['pm_notify_enabled'] = true;

2
upload/includes/emailer.class.php
View file

@ -30,8 +30,8 @@ class emailer
global $bb_cfg;
$this->vars = array(
'SITENAME' => $bb_cfg['sitename'],
'BOARD_EMAIL' => $bb_cfg['board_email'],
'SITENAME' => $bb_cfg['board_email_sitename'],
'EMAIL_SIG' => !empty($bb_cfg['board_email_sig']) ? "-- \n{$bb_cfg['board_email_sig']}" : '',
);
}

12
upload/language/lang_english/lang_admin.php
View file

@ -233,8 +233,6 @@ $lang['ABILITIES_SETTINGS'] = 'User and Forum Basic Settings';
$lang['MAX_POLL_OPTIONS'] = 'Max number of poll options';
$lang['FLOOD_INTERVAL'] = 'Flood Interval';
$lang['FLOOD_INTERVAL_EXPLAIN'] = 'Number of seconds a user must wait between posts';
$lang['BOARD_EMAIL_FORM'] = 'User email via board';
$lang['BOARD_EMAIL_FORM_EXPLAIN'] = 'Users send email to each other via this board';
$lang['TOPICS_PER_PAGE'] = 'Topics Per Page';
$lang['POSTS_PER_PAGE'] = 'Posts Per Page';
$lang['HOT_THRESHOLD'] = 'Posts for Popular Threshold';
@ -266,16 +264,6 @@ $lang['AVATAR_GALLERY_PATH'] = 'Avatar Gallery Path';
$lang['AVATAR_GALLERY_PATH_EXPLAIN'] = 'Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery';
$lang['EMAIL_SETTINGS'] = 'Email Settings';
$lang['ADMIN_EMAIL'] = 'Admin Email Address';
$lang['EMAIL_SIG'] = 'Email Signature';
$lang['EMAIL_SIG_EXPLAIN'] = 'This text will be attached to all emails the board sends';
$lang['USE_SMTP'] = 'Use SMTP Server for email';
$lang['USE_SMTP_EXPLAIN'] = 'Say yes if you want or have to send email via a named server instead of the local mail function';
$lang['SMTP_SERVER'] = 'SMTP Server Address';
$lang['SMTP_USERNAME'] = 'SMTP Username';
$lang['SMTP_USERNAME_EXPLAIN'] = 'Only enter a username if your SMTP server requires it';
$lang['SMTP_PASSWORD'] = 'SMTP Password';
$lang['SMTP_PASSWORD_EXPLAIN'] = 'Only enter a password if your SMTP server requires it';
$lang['DISABLE_PRIVMSG'] = 'Private Messaging';
$lang['INBOX_LIMITS'] = 'Max posts in Inbox';

12
upload/language/lang_russian/lang_admin.php
View file

@ -234,8 +234,6 @@ $lang['ABILITIES_SETTINGS'] = 'Общие настройки форумов и
$lang['MAX_POLL_OPTIONS'] = 'Макс. кол-во вариантов ответа в опросе';
$lang['FLOOD_INTERVAL'] = 'Задержка &laquo;флуда&raquo;';
$lang['FLOOD_INTERVAL_EXPLAIN'] = 'Время (в секундах), которое должно пройти между двумя сообщениями пользователя.';
$lang['BOARD_EMAIL_FORM'] = 'Рассылка e-mail сообщений через форумы';
$lang['BOARD_EMAIL_FORM_EXPLAIN'] = 'Пользователи смогут посылать друг другу e-mail через форумы';
$lang['TOPICS_PER_PAGE'] = 'Тем на страницу';
$lang['POSTS_PER_PAGE'] = 'Сообщений на страницу';
$lang['HOT_THRESHOLD'] = 'Сообщений в &laquo;популярной&raquo; теме';
@ -267,16 +265,6 @@ $lang['AVATAR_GALLERY_PATH'] = 'Путь к галерее аватар';
$lang['AVATAR_GALLERY_PATH_EXPLAIN'] = 'Каталог ниже корня phpBB для готовых картинок, например images/avatars/gallery';
$lang['EMAIL_SETTINGS'] = 'Настройки e-mail';
$lang['ADMIN_EMAIL'] = 'Адрес e-mail администратора';
$lang['EMAIL_SIG'] = 'Подпись в сообщениях e-mail';
$lang['EMAIL_SIG_EXPLAIN'] = 'Этот текст будет подставляться во все письма, рассылаемые из форумов';
$lang['USE_SMTP'] = 'Использовать сервер SMTP для отправки почты';
$lang['USE_SMTP_EXPLAIN'] = 'Отметьте, если вы хотите/вынуждены отсылать почту через сервер SMTP, а не локальную почтовую службу';
$lang['SMTP_SERVER'] = 'Адрес сервера SMTP';
$lang['SMTP_USERNAME'] = 'Имя пользователя для SMTP';
$lang['SMTP_USERNAME_EXPLAIN'] = 'Не указывайте имя пользователя если оно не требуется для работы с вашим сервером SMTP';
$lang['SMTP_PASSWORD'] = 'Пароль для SMTP';
$lang['SMTP_PASSWORD_EXPLAIN'] = 'Не указывайте пароль если он не требуется для работы с вашим сервером SMTP';
$lang['DISABLE_PRIVMSG'] = 'Личные сообщения';
$lang['INBOX_LIMITS'] = 'Макс. число сообщений в папке &laquo;Входящие&raquo;';

37
upload/templates/admin/admin_board.tpl
View file

@ -53,13 +53,6 @@
<input class="post" type="text" size="3" maxlength="4" name="max_autologin_time" value="{AUTOLOGIN_TIME}" /> {L_DAYS}
</td>
</tr>
<tr>
<td><h4>{L_BOARD_EMAIL_FORM}</h4><h6>{L_BOARD_EMAIL_FORM_EXPLAIN}</h6></td>
<td>
<label><input type="radio" name="board_email_form" value="1" <!-- IF BOARD_EMAIL_FORM -->checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>&nbsp;&nbsp;
<label><input type="radio" name="board_email_form" value="0" <!-- IF not BOARD_EMAIL_FORM -->checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label>
</td>
</tr>
<tr>
<td><h4>{L_FLOOD_INTERVAL}</h4><h6>{L_FLOOD_INTERVAL_EXPLAIN}</h6></td>
<td>
@ -225,34 +218,12 @@
<td><input class="post" type="text" size="35" maxlength="255" name="no_avatar" value="{NO_AVATAR}" /></td>
</tr>
<tr>
<th colspan="2">{L_EMAIL_SETTINGS}</th>
<th colspan="2">{L_EMAIL_SETTINGS}</th>
</tr>
<tr>
<td><h4>{L_ADMIN_EMAIL}</h4></td>
<td><input class="post" type="text" size="25" maxlength="100" name="board_email" value="{EMAIL_FROM}" /></td>
</tr>
<tr>
<td><h4>{L_EMAIL_SIG}</h4><h6>{L_EMAIL_SIG_EXPLAIN}</h6></td>
<td><textarea name="board_email_sig" rows="5" cols="30">{EMAIL_SIG}</textarea></td>
</tr>
<tr>
<td><h4>{L_USE_SMTP}</h4><h6>{L_USE_SMTP_EXPLAIN}</h6></td>
<td>
<label><input type="radio" name="smtp_delivery" value="1" <!-- IF SMTP_DELIVERY -->checked="checked"<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
<label><input type="radio" name="smtp_delivery" value="0" <!-- IF not SMTP_DELIVERY -->checked="checked"<!-- ENDIF --> />{L_NO}</label>
</td>
</tr>
<tr>
<td><h4>{L_SMTP_SERVER}</h4></td>
<td><input class="post" type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50" /></td>
</tr>
<tr>
<td><h4>{L_SMTP_USERNAME}</h4><h6>{L_SMTP_USERNAME_EXPLAIN}</h6></td>
<td><input class="post" type="text" name="smtp_username" value="{SMTP_USERNAME}" size="25" maxlength="255" /></td>
</tr>
<tr>
<td><h4>{L_SMTP_PASSWORD}</h4><h6>{L_SMTP_PASSWORD_EXPLAIN}</h6></td>
<td><input class="post" type="password" name="smtp_password" value="{SMTP_PASSWORD}" size="25" maxlength="255" /></td>
<td colspan="2" class="pad_0 tCenter">
<p class="warnColor1 warnBorder1 pad_10">Changes disabled (see <b>Email section</b> in config.php)</p>
</td>
</tr>
<!-- ENDIF / CONFIG -->