r552

Унификация работы с email, начатая в r545. Исправление недочетов названной ревизии. Перенос настроек email в config.php. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@552 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

install/sql/mysql.sql

@@ -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');

upload/admin/admin_board.php

@@ -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 == '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 == 'bonus_upload' || $config_name == 'bonus_upload_price') $new[$config_name] = serialize($new[$config_name]);
 
 			bb_update_config(array($config_name => $new[$config_name]));
 		}
@@ -108,28 +108,30 @@ switch($mode)
 			'SEED_BONUS_USER_REGDATE' => $new['seed_bonus_user_regdate'],
 		));
 
-	    if($new['seed_bonus_points'] && $new['seed_bonus_release'])
+		if ($new['seed_bonus_points'] && $new['seed_bonus_release'])
-	    {
		    $seed_bonus = unserialize($new['seed_bonus_points']);
+		{
+			$seed_bonus = unserialize($new['seed_bonus_points']);
 			$seed_release = unserialize($new['seed_bonus_release']);
 
-		    foreach($seed_bonus as $i => $row)
+			foreach ($seed_bonus as $i => $row)
 			{
-			    if(!$row || !$seed_release[$i]) continue;
+				if (!$row || !$seed_release[$i]) continue;
 
 				$template->assign_block_vars('seed_bonus', array(
 					'RELEASE' => $seed_release[$i],
 					'POINTS'  => $row,
 				));
-		    }
	    }
+			}
+		}
 
-	    if($new['bonus_upload'] && $new['bonus_upload_price'])
+		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)
+			foreach ($upload_row as $i => $row)
 			{
-			    if(!$row || !$price_row[$i]) continue;
+				if (!$row || !$price_row[$i]) continue;
 
 				$template->assign_block_vars('bonus_upload', array(
 					'UP'     => $row,
@@ -157,7 +159,6 @@ switch($mode)
 
 			'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'],
@@ -191,12 +192,6 @@ switch($mode)
 			'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;
 }

upload/ajax/edit_user_profile.php

@@ -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']);
+		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']));
 			}

upload/config.php

@@ -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_date'] = '05-09-2013';
-$bb_cfg['tp_release_state'] = 'R551';
+$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_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_password']           = '';
+$bb_cfg['smtp_host']               = '';    // SMTP server host
-$bb_cfg['smtp_username']           = '';
+$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']             = 'noreply@' . $domain_name; // admin email address
-$bb_cfg['board_email_sig']         = '';
+$bb_cfg['board_email_form']        = false;        // can users send email to each other via board
-$bb_cfg['sitename']                = $domain_name;
+$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;

upload/includes/emailer.class.php

@@ -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']}" : '',
 		);
 	}

upload/language/lang_english/lang_admin.php

@@ -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';

upload/language/lang_russian/lang_admin.php

@@ -234,8 +234,6 @@ $lang['ABILITIES_SETTINGS'] = 'Общие настройки форумов и
 $lang['MAX_POLL_OPTIONS'] = 'Макс. кол-во вариантов ответа в опросе';
 $lang['FLOOD_INTERVAL'] = 'Задержка «флуда»';
 $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'] = 'Сообщений в «популярной» теме';
@@ -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'] = 'Макс. число сообщений в папке «Входящие»';

upload/templates/admin/admin_board.tpl

@@ -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>
@@ -228,32 +221,10 @@
     <th colspan="2">{L_EMAIL_SETTINGS}</th>
 </tr>
 <tr>
-	<td><h4>{L_ADMIN_EMAIL}</h4></td>
+    <td colspan="2" class="pad_0 tCenter">
-	<td><input class="post" type="text" size="25" maxlength="100" name="board_email" value="{EMAIL_FROM}" /></td>
+        <p class="warnColor1 warnBorder1 pad_10">Changes disabled (see <b>Email section</b> in config.php)</p>
-</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>
-</tr>
 
 <!-- ENDIF / CONFIG -->