поддержка ssl smtp отправки, добавление константы на папку с картинками

This commit is contained in:
PheRum 2014-10-23 21:05:30 +03:00
commit 5c51e6a824
2 changed files with 17 additions and 13 deletions

View file

@ -65,6 +65,9 @@ if (!defined('BB_ROOT')) die(basename(__FILE__));
$bb_cfg = $tr_cfg = $page_cfg = array(); $bb_cfg = $tr_cfg = $page_cfg = array();
// Increase number after changing js or css
$bb_cfg['js_ver'] = $bb_cfg['css_ver'] = 1;
// Primary domain name // Primary domain name
$domain_name = 'torrentpier.me'; // enter here your primary domain name of your site $domain_name = 'torrentpier.me'; // enter here your primary domain name of your site
$domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $domain_name; $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $domain_name;
@ -106,7 +109,7 @@ $bb_cfg['db_alias'] = array(
// Cache // Cache
$bb_cfg['cache']['pconnect'] = true; $bb_cfg['cache']['pconnect'] = true;
$bb_cfg['cache']['db_dir'] = realpath(BB_ROOT) .'/internal_data/cache/filecache/'; $bb_cfg['cache']['db_dir'] = realpath(BB_ROOT) .'/internal_data/cache/filecache/';
$bb_cfg['cache']['prefix'] = 'tp_'; // Префикс кеша 'tp_2' $bb_cfg['cache']['prefix'] = ''; // Префикс кеша 'tp_2'
$bb_cfg['cache']['memcache'] = array( $bb_cfg['cache']['memcache'] = array(
'host' => '127.0.0.1', 'host' => '127.0.0.1',
'port' => 11211, 'port' => 11211,
@ -145,9 +148,6 @@ if (isset($_SERVER['HTTP_CF_CONNECTING_IP']))
$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CF_CONNECTING_IP']; $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CF_CONNECTING_IP'];
} }
// Increase number after changing js or css
$bb_cfg['js_ver'] = $bb_cfg['css_ver'] = 1;
// GZip // GZip
$bb_cfg['gzip_compress'] = true; // compress output $bb_cfg['gzip_compress'] = true; // compress output
@ -162,7 +162,7 @@ $bb_cfg['allow_internal_ip'] = false; // Allow internal IP (10.xx..
$bb_cfg['ocelot'] = array( $bb_cfg['ocelot'] = array(
'enabled' => false, 'enabled' => false,
'host' => $domain_name, 'host' => $domain_name,
'url' => 'http://'. $domain_name .':34000/', 'url' => "http://$domain_name:34000/",
'secret' => 'some_10_chars', // 10 chars 'secret' => 'some_10_chars', // 10 chars
'stats' => 'some_10_chars', // 10 chars 'stats' => 'some_10_chars', // 10 chars
); );
@ -264,6 +264,7 @@ define('INC_DIR', BB_PATH .'/library/includes/' );
define('CLASS_DIR', BB_PATH .'/library/includes/classes/'); define('CLASS_DIR', BB_PATH .'/library/includes/classes/');
define('UCP_DIR', BB_PATH .'/library/includes/ucp/' ); define('UCP_DIR', BB_PATH .'/library/includes/ucp/' );
define('LANG_ROOT_DIR', BB_PATH .'/library/language/' ); define('LANG_ROOT_DIR', BB_PATH .'/library/language/' );
define('IMAGES_DIR', BB_PATH .'/styles/images/' );
define('TEMPLATES_DIR', BB_PATH .'/styles/templates/' ); define('TEMPLATES_DIR', BB_PATH .'/styles/templates/' );
// URL's // URL's
@ -356,12 +357,14 @@ $bb_cfg['reg_email_activation'] = false; // Требовать акт
// Email // Email
$bb_cfg['emailer_disabled'] = false; $bb_cfg['emailer_disabled'] = false;
$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_delivery'] = false; // send email via a named server instead of the local mail function
$bb_cfg['smtp_ssl'] = false; // use ssl connect
$bb_cfg['smtp_host'] = ''; // SMTP server host $bb_cfg['smtp_host'] = ''; // SMTP server host
$bb_cfg['smtp_password'] = ''; // enter a password if your SMTP server requires it $bb_cfg['smtp_port'] = 25; // SMTP server port
$bb_cfg['smtp_username'] = ''; // enter a username if your SMTP server requires it $bb_cfg['smtp_username'] = ''; // enter a username if your SMTP server requires it
$bb_cfg['smtp_password'] = ''; // enter a password if your SMTP server requires it
$bb_cfg['board_email'] = 'noreply@' . $domain_name; // admin email address $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_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_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['board_email_sitename'] = $domain_name; // sitename used in all emails header
@ -371,9 +374,9 @@ $bb_cfg['pm_notify_enabled'] = true;
$bb_cfg['group_send_email'] = true; $bb_cfg['group_send_email'] = true;
$bb_cfg['email_change_disabled'] = false; // disable changing email by user $bb_cfg['email_change_disabled'] = false; // disable changing email by user
$bb_cfg['tech_admin_email'] = 'admin@' . $domain_name; // email for sending error reports $bb_cfg['tech_admin_email'] = "admin@$domain_name"; // email for sending error reports
$bb_cfg['abuse_email'] = 'abuse@' . $domain_name; $bb_cfg['abuse_email'] = "abuse@$domain_name";
$bb_cfg['adv_email'] = 'adv@' . $domain_name; $bb_cfg['adv_email'] = "adv@$domain_name";
// Debug // Debug
define('DBG_LOG', false); // enable forum debug (off on production) define('DBG_LOG', false); // enable forum debug (off on production)
@ -570,7 +573,7 @@ $bb_cfg['avatars'] = array(
// Group avatars // Group avatars
$bb_cfg['group_avatars'] = array( $bb_cfg['group_avatars'] = array(
'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов 'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов
'max_size' => 100*1024, // размер аватары в байтах 'max_size' => 300*1024, // размер аватары в байтах
'max_height' => 300, // высота аватара в px 'max_height' => 300, // высота аватара в px
'max_width' => 300, // ширина аватара в px 'max_width' => 300, // ширина аватара в px
'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара

View file

@ -85,7 +85,8 @@ function smtpmail($mail_to, $subject, $message, $headers = '')
// Ok we have error checked as much as we can to this point let's get on // Ok we have error checked as much as we can to this point let's get on
// it already. // it already.
if( !$socket = @fsockopen($bb_cfg['smtp_host'], 25, $errno, $errstr, 20) ) $ssl = ($bb_cfg['smtp_ssl']) ? 'ssl://' : '';
if( !$socket = @fsockopen($ssl . $bb_cfg['smtp_host'], $bb_cfg['smtp_port'], $errno, $errstr, 20) )
{ {
bb_die('Could not connect to smtp host : '. $errno .' : '. $errstr); bb_die('Could not connect to smtp host : '. $errno .' : '. $errstr);
} }