1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 09:16:55 +02:00

- search updates

git-svn-id: file:///svn/phpbb/trunk@5003 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2004-10-19 19:26:58 +00:00
parent 028c05a9a6
commit c091164d7e
10 changed files with 168 additions and 355 deletions

View File

@@ -46,27 +46,28 @@ class messenger
// Sets an email address to send to
function to($address, $realname = '')
{
$pos = sizeof($this->addresses['to']);
$pos = isset($this->addresses['to']) ? sizeof($this->addresses['to']) : 0;
$this->addresses['to'][$pos]['email'] = trim($address);
$this->addresses['to'][$pos]['name'] = trim($realname);
}
function cc($address, $realname = '')
{
$pos = sizeof($this->addresses['cc']);
$pos = isset($this->addresses['cc']) ? sizeof($this->addresses['cc']) : 0;
$this->addresses['cc'][$pos]['email'] = trim($address);
$this->addresses['cc'][$pos]['name'] = trim($realname);
}
function bcc($address, $realname = '')
{
$pos = sizeof($this->addresses['bcc']);
$pos = isset($this->addresses['bcc']) ? sizeof($this->addresses['bcc']) : 0;
$this->addresses['bcc'][$pos]['email'] = trim($address);
$this->addresses['bcc'][$pos]['name'] = trim($realname);
}
function im($address, $realname = '')
{
$pos = sizeof($this->addresses['im']);
$pos = isset($this->addresses['im']) ? sizeof($this->addresses['im']) : 0;
$this->addresses['im'][$pos]['uid'] = trim($address);
$this->addresses['im'][$pos]['name'] = trim($realname);
}
@@ -772,6 +773,7 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $encoding, $headers
// We try to send messages even if a few people do not seem to have valid email addresses, but if no one has, we have to exit here.
if (!$rcpt)
{
$user->start();
$err_msg .= '<br /><br />' . sprintf($user->lang['INVALID_EMAIL_LOG'], htmlspecialchars($mail_to_address));
$smtp->close_session();
return false;