Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Resolved 0000580: Send mail by define smtp configuration
Merge branch-1_7 2104:2105 into BSF

git-svn-id: http://piwigo.org/svn/trunk@2106 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
rub committed Sep 25, 2007
1 parent 1a55452 commit 08bc601
Show file tree
Hide file tree
Showing 3 changed files with 430 additions and 242 deletions.
155 changes: 155 additions & 0 deletions include/class_smtp_mail.inc.php
@@ -0,0 +1,155 @@
<?php
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
// | revision : $Revision$
// +-----------------------------------------------------------------------+
// | This program is free software; you can redistribute it and/or modify |
// | it under the terms of the GNU General Public License as published by |
// | the Free Software Foundation |
// | |
// | This program is distributed in the hope that it will be useful, but |
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
// | General Public License for more details. |
// | |
// | You should have received a copy of the GNU General Public License |
// | along with this program; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+

// These function were originally a part of the punBB.

class smtp_mail
{
var $socket;
var $no_error;
var $host;
var $user;
var $password;
var $email_webmaster;

function smtp_mail($host, $user, $password, $email_webmaster)
{
$this->host = $host;
$this->user = $user;
$this->password = $password;
$this->email_webmaster = $email_webmaster;
}

// Adaptation of server_parse
function server_parse($expected_response)
{
if ($this->no_error)
{
$server_response = '';
while (substr($server_response, 3, 1) != ' ')
{
if (!($server_response = fgets($this->socket, 256)))
{
trigger_error('Couldn\'t get mail server response codes.', E_USER_WARNING);
$this->no_error = false;
}
}
}

if ($this->no_error)
{
if (!(substr($server_response, 0, 3) == $expected_response))
{
trigger_error('Unable to send e-mail. Error message reported by the SMTP server: "'.$server_response.'"', E_USER_WARNING);
$this->no_error = false;
}
}
return $this->no_error;
}

function server_write($s)
{
$this->no_error = $this->no_error && (fwrite($this->socket, $s) !== false);
return $this->no_error;
}

// Adaptation of pun_mail
function mail($to, $subject, $message, $headers = '')
{
$this->no_error = true;

$recipients = explode(',', $to);

// Are we using port 25 or a custom port?
if (strpos($this->host, ':') !== false)
{
list($smtp_host, $smtp_port) = explode(':', $this->host);
}
else
{
$smtp_host = $this->host;
$smtp_port = 25;
}

if ($this->socket = fsockopen($smtp_host, $smtp_port, $errno, $errstr, 15))
{
$this->server_parse('220');

if (!empty($this->user) && !empty($this->password))
{
$this->server_write('EHLO '.$smtp_host."\r\n");
$this->server_parse('250');

$this->server_write('AUTH LOGIN'."\r\n");
$this->server_parse('334');

$this->server_write(base64_encode($this->user)."\r\n");
$this->no_error = $this->no_error && $this->no_error = $this->server_parse('334');

$this->server_write(base64_encode($this->password)."\r\n");
$this->server_parse('235');
}
else
{
$this->server_write('HELO '.$smtp_host."\r\n");
$this->server_parse('250');
}

$this->server_write('MAIL FROM: <'.$this->email_webmaster.'>'."\r\n");
$this->server_parse('250');

$to_header = 'To: ';

@reset($recipients);
while (list(, $email) = @each($recipients))
{
$this->server_write('RCPT TO: <'.$email.'>'."\r\n");
$this->server_parse('250');

$to_header .= '<'.$email.'>, ';
}

$this->server_write('DATA'."\r\n");
$this->server_parse('354');

$this->server_write('Subject: '.$subject."\r\n".$to_header."\r\n".$headers."\r\n\r\n".$message."\r\n");
$this->server_write('.'."\r\n");
$this->server_parse('250');

$this->server_write('QUIT'."\r\n");
fclose($this->socket);
}
else
{
trigger_error('Could not connect to smtp host "'.$this->host.'" ('.$errno.') ('.$errstr.')', E_USER_WARNING);
$this->no_error = false;;
}

return $this->no_error;
}
}

?>
12 changes: 12 additions & 0 deletions include/config_default.inc.php
Expand Up @@ -285,6 +285,18 @@
// Value could be text/plain or text/html
$conf['default_email_format'] = 'text/html';

// smtp configuration
// (work if fsockopen function is allowed for smtp port)
// smtp_host: smtp server host
// if null, regular mail function is used
// format: hoststring[:port]
// exemple: smtp.pwg.net:21
// smtp_user/smtp_password: user & password for smtp identication
$conf['smtp_host'] = '';
$conf['smtp_user'] = '';
$conf['smtp_password'] = '';


// check_upgrade_feed: check if there are database upgrade required. Set to
// true, a message will strongly encourage you to upgrade your database if
// needed.
Expand Down

0 comments on commit 08bc601

Please sign in to comment.