makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changes for UCP and registration, pretty minor overall. Fixed emailer to use

Browse source 
trigger_error insted of message_die.

emailer still needs some clean-up


git-svn-id: file:///svn/phpbb/trunk@3430 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
James Atkinson 2003-01-30 20:02:09 +00:00
parent 83e97693a4
commit a0d0d1da78
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
phpBB/includes/emailer.php
View file

@ -96,15 +96,15 @@ class emailer
$template_lang = $config['default_lang'];
}
$this->tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.txt';
$this->tpl_file = $phpbb_root_path . 'language/' . $template_lang . '/email/' . $template_file . '.txt';
if ( !file_exists($this->tpl_file) )
{
message_die(ERROR, 'Could not find email template file ' . $template_file);
trigger_error('Could not find email template file ' . $template_file);
}
if ( !$this->load_msg() )
{
message_die(ERROR, 'Could not load email template file ' . $template_file);
trigger_error('Could not load email template file ' . $template_file);
}
return true;
@ -117,12 +117,12 @@ class emailer
{
if ( $this->tpl_file == NULL )
{
message_die(ERROR, 'No template file set');
trigger_error('No template file set');
}
if ( !($fd = fopen($this->tpl_file, 'r')) )
{
message_die(ERROR, 'Failed opening template file');
trigger_error('Failed opening template file');
}
$this->msg .= fread($fd, filesize($this->tpl_file));
@ -173,7 +173,7 @@ class emailer
if ( $this->address == NULL )
{
message_die(ERROR, 'No email address set');
trigger_error('No email address set');
}
if ( !$this->parse_email() )
@ -191,7 +191,7 @@ class emailer
if ( !$result )
{
message_die(ERROR, 'Failed sending email');
trigger_error('Failed sending email');
}
return true;
@ -312,13 +312,13 @@ function server_parse($socket, $response)
{
if( !( $server_response = fgets($socket, 256) ) )
{
message_die(ERROR, 'Could not get mail server response codes');
trigger_error('Could not get mail server response codes');
}
}
if( !( substr($server_response, 0, 3) == $response ) )
{
message_die(ERROR, "Ran into problems sending Mail. Response: $server_response");
trigger_error("Ran into problems sending Mail. Response: $server_response");
}
}
@ -388,15 +388,15 @@ function smtpmail($mail_to, $subject, $message, $headers = '')
}
if(trim($mail_to) == '')
{
message_die(ERROR, 'No email address specified');
trigger_error('No email address specified');
}
if(trim($subject) == '')
{
message_die(ERROR, 'No email Subject specified');
trigger_error('No email Subject specified');
}
if(trim($message) == '')
{
message_die(ERROR, 'Email message was blank');
trigger_error('Email message was blank');
}
$mail_to_array = explode(",", $mail_to);
@ -406,7 +406,7 @@ function smtpmail($mail_to, $subject, $message, $headers = '')
//
if( !$socket = fsockopen($config['smtp_host'], 25, $errno, $errstr, 20) )
{
message_die(ERROR, "Could not connect to smtp host : $errno : $errstr");
trigger_error("Could not connect to smtp host : $errno : $errstr");
}
server_parse($socket, "220");

2
phpBB/includes/functions.php
View file

@ -36,7 +36,7 @@ function set_config($config_name, $config_value, $is_dynamic = FALSE)
WHERE config_name = "' . $config_name . '"');
$sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value)
VALUES ('$config_name', '" . $db->sql_escape($config_value) . "'";
VALUES ('$config_name', '" . $db->sql_escape($config_value) . "')";
$db->sql_query($sql);
}