Minahito
minah****@users*****
2006年 10月 19日 (木) 17:55:53 JST
Index: xoops2jp/html/class/mail/xoopsmultimailer.php diff -u xoops2jp/html/class/mail/xoopsmultimailer.php:1.2.8.1 xoops2jp/html/class/mail/xoopsmultimailer.php:1.2.8.1.2.1 --- xoops2jp/html/class/mail/xoopsmultimailer.php:1.2.8.1 Sun Nov 20 21:14:56 2005 +++ xoops2jp/html/class/mail/xoopsmultimailer.php Thu Oct 19 17:55:53 2006 @@ -1,5 +1,5 @@ <?php -// $Id: xoopsmultimailer.php,v 1.2.8.1 2005/11/20 12:14:56 nobunobu Exp $ +// $Id: xoopsmultimailer.php,v 1.2.8.1.2.1 2006/10/19 08:55:53 minahito Exp $ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // // Copyright (c) 2000 XOOPS.org // @@ -24,20 +24,20 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // ------------------------------------------------------------------------ // -// Author: Jochen Büînagel (job****@buenn*****) // -// URL: http://www.xoops.org // +// Author: Jochen B—¬nagel (job****@buenn*****) // +// URL: http://www.xoops.org // // Project: The XOOPS Project // // ------------------------------------------------------------------------- // /** - * @package class - * @subpackage mail + * @package class + * @subpackage mail * * @filesource * - * @author Jochen Büînagel <jb****@buenn*****> - * @copyright copyright (c) 2000-2003 The XOOPS Project (http://www.xoops.org) + * @author Jochen B—¬nagel <jb****@buenn*****> + * @copyright copyright (c) 2000-2003 The XOOPS Project (http://www.xoops.org) * - * @version $Revision: 1.2.8.1 $ - $Date: 2005/11/20 12:14:56 $ + * @version $Revision: 1.2.8.1.2.1 $ - $Date: 2006/10/19 08:55:53 $ */ /** @@ -54,125 +54,125 @@ * If you have problems sending mail with "mail()", you can edit the member variables * to suit your setting. Later this will be possible through the admin panel. * - * @todo Make a page in the admin panel for setting mailer preferences. + * @todo Make a page in the admin panel for setting mailer preferences. * - * @package class - * @subpackage mail + * @package class + * @subpackage mail * - * @author Jochen Buennagel <job****@buenn*****> - * @copyright (c) 2000-2003 The Xoops Project - www.xoops.org - * @version $Revision: 1.2.8.1 $ - changed by $Author: nobunobu $ on $Date: 2005/11/20 12:14:56 $ + * @author Jochen Buennagel <job****@buenn*****> + * @copyright (c) 2000-2003 The Xoops Project - www.xoops.org + * @version $Revision: 1.2.8.1.2.1 $ - changed by $Author: minahito $ on $Date: 2006/10/19 08:55:53 $ */ class XoopsMultiMailer extends PHPMailer { - /** - * "from" address - * @var string - * @access private - */ - var $From = ""; - - /** - * "from" name - * @var string - * @access private - */ - var $FromName = ""; - - // can be "smtp", "sendmail", or "mail" - /** - * Method to be used when sending the mail. - * - * This can be: - * <li>mail (standard PHP function "mail()") (default) - * <li>smtp (send through any SMTP server, SMTPAuth is supported. - * You must set {@link $Host}, for SMTPAuth also {@link $SMTPAuth}, - * {@link $Username}, and {@link $Password}.) - * <li>sendmail (manually set the path to your sendmail program - * to something different than "mail()" uses in {@link $Sendmail}) - * - * @var string - * @access private - */ - var $Mailer = "mail"; - - /** - * set if $Mailer is "sendmail" - * - * Only used if {@link $Mailer} is set to "sendmail". - * Contains the full path to your sendmail program or replacement. - * @var string - * @access private - */ - var $Sendmail = "/usr/sbin/sendmail"; - - /** - * SMTP Host. - * - * Only used if {@link $Mailer} is set to "smtp" - * @var string - * @access private - */ - var $Host = ""; - - /** - * Does your SMTP host require SMTPAuth authentication? - * @var boolean - * @access private - */ - var $SMTPAuth = FALSE; - - /** - * Username for authentication with your SMTP host. - * - * Only used if {@link $Mailer} is "smtp" and {@link $SMTPAuth} is TRUE - * @var string - * @access private - */ - var $Username = ""; - - /** - * Password for SMTPAuth. - * - * Only used if {@link $Mailer} is "smtp" and {@link $SMTPAuth} is TRUE - * @var string - * @access private - */ - var $Password = ""; - - /** - * Constuctor - * - * @access public - * @return void - * - * @global $xoopsConfig - */ - function XoopsMultiMailer(){ - global $xoopsConfig; - - $config_handler =& xoops_gethandler('config'); - $xoopsMailerConfig =& $config_handler->getConfigsByCat(XOOPS_CONF_MAILER); - $this->From = $xoopsMailerConfig['from']; - if ($this->From == '') { - $this->From = $xoopsConfig['adminmail']; - } - // $this->Sender = $xoopsConfig['adminmail']; //TODO: This line is added in OTX by Marijuana. We must verify. - if ($xoopsMailerConfig["mailmethod"] == "smtpauth") { - $this->Mailer = "smtp"; - $this->SMTPAuth = TRUE; - $this->Host = implode(';',$xoopsMailerConfig['smtphost']); - $this->Username = $xoopsMailerConfig['smtpuser']; - $this->Password = $xoopsMailerConfig['smtppass']; - } else { - $this->Mailer = $xoopsMailerConfig['mailmethod']; - $this->SMTPAuth = FALSE; - $this->Sendmail = $xoopsMailerConfig['sendmailpath']; - $this->Host = implode(';',$xoopsMailerConfig['smtphost']); - } - } + /** + * "from" address + * @var string + * @access private + */ + var $From = ""; + + /** + * "from" name + * @var string + * @access private + */ + var $FromName = ""; + + // can be "smtp", "sendmail", or "mail" + /** + * Method to be used when sending the mail. + * + * This can be: + * <li>mail (standard PHP function "mail()") (default) + * <li>smtp (send through any SMTP server, SMTPAuth is supported. + * You must set {@link $Host}, for SMTPAuth also {@link $SMTPAuth}, + * {@link $Username}, and {@link $Password}.) + * <li>sendmail (manually set the path to your sendmail program + * to something different than "mail()" uses in {@link $Sendmail}) + * + * @var string + * @access private + */ + var $Mailer = "mail"; + + /** + * set if $Mailer is "sendmail" + * + * Only used if {@link $Mailer} is set to "sendmail". + * Contains the full path to your sendmail program or replacement. + * @var string + * @access private + */ + var $Sendmail = "/usr/sbin/sendmail"; + + /** + * SMTP Host. + * + * Only used if {@link $Mailer} is set to "smtp" + * @var string + * @access private + */ + var $Host = ""; + + /** + * Does your SMTP host require SMTPAuth authentication? + * @var boolean + * @access private + */ + var $SMTPAuth = FALSE; + + /** + * Username for authentication with your SMTP host. + * + * Only used if {@link $Mailer} is "smtp" and {@link $SMTPAuth} is TRUE + * @var string + * @access private + */ + var $Username = ""; + + /** + * Password for SMTPAuth. + * + * Only used if {@link $Mailer} is "smtp" and {@link $SMTPAuth} is TRUE + * @var string + * @access private + */ + var $Password = ""; + + /** + * Constuctor + * + * @access public + * @return void + * + * @global $xoopsConfig + */ + function XoopsMultiMailer(){ + global $xoopsConfig; + $this->ClearAllRecipients(); + $config_handler =& xoops_gethandler('config'); + $xoopsMailerConfig =& $config_handler->getConfigsByCat(XOOPS_CONF_MAILER); + $this->From = $xoopsMailerConfig['from']; + if ($this->From == '') { + $this->From = $xoopsConfig['adminmail']; + } + $this->Sender = $xoopsConfig['adminmail']; + if ($xoopsMailerConfig["mailmethod"] == "smtpauth") { + $this->Mailer = "smtp"; + $this->SMTPAuth = TRUE; + $this->Host = implode(';',$xoopsMailerConfig['smtphost']); + $this->Username = $xoopsMailerConfig['smtpuser']; + $this->Password = $xoopsMailerConfig['smtppass']; + } else { + $this->Mailer = $xoopsMailerConfig['mailmethod']; + $this->SMTPAuth = FALSE; + $this->Sendmail = $xoopsMailerConfig['sendmailpath']; + $this->Host = implode(';',$xoopsMailerConfig['smtphost']); + } + } - /** + /** * Formats an address correctly. This overrides the default AddrFormat method * which does not seem to encode $FromName correctly * This method name is renamed from "addr_format", because method name in parent class is renamed.
