Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2058) +++ branches/2.8.x/CHANGELOG (revision 2059) @@ -11,6 +11,8 @@ ! = Update/Change =============================================================================== +01 Jan-2014 Build 2059 Manuela v.d.Decken(DarkViper) +! update class Wbmailer for use of PHPMailerAutoload 01 Jan-2014 Build 2058 Manuela v.d.Decken(DarkViper) ! change wysiwyg module from filterMediaRel to filterReplaceSysvar ! change wb::ReplaceAbsoluteMediaUrl from filterMediaRel to filterReplaceSysvar Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2058) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2059) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.4'); -if(!defined('REVISION')) define('REVISION', '2058'); +if(!defined('REVISION')) define('REVISION', '2059'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/class.wbmailer.php =================================================================== --- branches/2.8.x/wb/framework/class.wbmailer.php (revision 2058) +++ branches/2.8.x/wb/framework/class.wbmailer.php (nonexistent) @@ -1,111 +0,0 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker 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; either version 2 of the License, or - (at your option) any later version. - - Website Baker 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 Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ -/* -------------------------------------------------------- */ -// Must include code to stop this file being accessed directly -if(!defined('WB_PATH')) { - require_once(dirname(__FILE__).'/globalExceptionHandler.php'); - throw new IllegalFileException(); -} -/* -------------------------------------------------------- */ -// Include PHPMailer class -require_once(WB_PATH."/include/phpmailer/class.phpmailer.php"); - -class wbmailer extends PHPMailer -{ - // new websitebaker mailer class (subset of PHPMailer class) - // setting default values - - function wbmailer() { - global $database; - // set mailer defaults (PHP mail function) - $db_wbmailer_routine = "phpmail"; - $db_wbmailer_smtp_host = ""; - $db_wbmailer_default_sendername = "WB Mailer"; - $db_server_email = SERVER_EMAIL; - - // get mailer settings from database - // $database = new database(); - $query = "SELECT * FROM " .TABLE_PREFIX. "settings"; - $results = $database->query($query); - while($setting = $results->fetchRow()) { - if ($setting['name'] == "wbmailer_routine") { $db_wbmailer_routine = $setting['value']; } - if ($setting['name'] == "wbmailer_smtp_host") { $db_wbmailer_smtp_host = $setting['value']; } - if ($setting['name'] == "wbmailer_smtp_auth") { $db_wbmailer_smtp_auth = (bool)$setting['value']; } - if ($setting['name'] == "wbmailer_smtp_username") { $db_wbmailer_smtp_username = $setting['value']; } - if ($setting['name'] == "wbmailer_smtp_password") { $db_wbmailer_smtp_password = $setting['value']; } - if ($setting['name'] == "wbmailer_default_sendername") { $db_wbmailer_default_sendername = $setting['value']; } - if ($setting['name'] == "server_email") { $db_server_email = $setting['value']; } - } - - // set method to send out emails - if($db_wbmailer_routine == "smtp" AND strlen($db_wbmailer_smtp_host) > 5) { - // use SMTP for all outgoing mails send by Website Baker - $this->IsSMTP(); - $this->Host = $db_wbmailer_smtp_host; - // check if SMTP authentification is required - if ($db_wbmailer_smtp_auth == "true" && strlen($db_wbmailer_smtp_username) > 1 && strlen($db_wbmailer_smtp_password) > 1) { - // use SMTP authentification - $this->SMTPAuth = true; // enable SMTP authentification - $this->Username = $db_wbmailer_smtp_username; // set SMTP username - $this->Password = $db_wbmailer_smtp_password; // set SMTP password - } - } else { - // use PHP mail() function for outgoing mails send by Website Baker - $this->IsMail(); - } - - // set language file for PHPMailer error messages - if(defined("LANGUAGE")) { - $this->SetLanguage(strtolower(LANGUAGE),"language"); // english default (also used if file is missing) - } - - // set default charset - if(defined('DEFAULT_CHARSET')) { - $this->CharSet = DEFAULT_CHARSET; - } else { - $this->CharSet='utf-8'; - } - - // set default sender name - if($this->FromName == 'Root User') { - if(isset($_SESSION['DISPLAY_NAME'])) { - $this->FromName = $_SESSION['DISPLAY_NAME']; // FROM NAME: display name of user logged in - } else { - $this->FromName = $db_wbmailer_default_sendername; // FROM NAME: set default name - } - } - - /* - some mail provider (lets say mail.com) reject mails send out by foreign mail - relays but using the providers domain in the from mail address (e.g. myname@mail.com) - */ - $this->From = $db_server_email; // FROM MAIL: (server mail) - - // set default mail formats - $this->IsHTML(true); - $this->WordWrap = 80; - $this->Timeout = 30; - } -} Property changes on: branches/2.8.x/wb/framework/class.wbmailer.php ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1,4 +0,0 ## -Id -Revision -HeadURL -Date \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2.8.x/wb/framework/class.WbMailer.php =================================================================== --- branches/2.8.x/wb/framework/class.WbMailer.php (nonexistent) +++ branches/2.8.x/wb/framework/class.WbMailer.php (revision 2059) @@ -0,0 +1,124 @@ + + Copyright (C) 2004-2009, Ryan Djurovich + + Website Baker 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; either version 2 of the License, or + (at your option) any later version. + + Website Baker 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 Website Baker; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ +/* -------------------------------------------------------- */ +// Must include code to stop this file being accessed directly +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} +/* -------------------------------------------------------- */ +// Include PHPMailer class if needed +if (!function_exists('PHPMailerAutoload')) { + require(WbAdaptor::getInstance()->AppPath.'include/phpmailer/PHPMailerAutoload.php'); +} + +class WbMailer extends PHPMailer +{ + // new websitebaker mailer class (subset of PHPMailer class) + // setting default values + + function __construct() { + + $oDb = WbDatabase::getInstance(); + // set mailer defaults (PHP mail function) + $db_wbmailer_routine = "phpmail"; + $db_wbmailer_smtp_host = ""; + $db_wbmailer_default_sendername = "WB Mailer"; + $db_server_email = SERVER_EMAIL; + + // get mailer settings from database + // $database = new database(); + $query = 'SELECT * FROM `'.$oDb->TablePrefix.'settings`'; + $oSettingSet = $oDb->doQuery($query); + while($aSettings = $oSettingSet->fetchRow(MYSQL_ASSOC)) { + switch ($aSettings['name']): + case 'wbmailer_routine': + $db_wbmailer_routine = $aSettings['value']; break; + case 'wbmailer_smtp_host': + $db_wbmailer_smtp_host = $aSettings['value']; break; + case 'wbmailer_smtp_auth': + $db_wbmailer_smtp_auth = (bool)$aSettings['value']; break; + case 'wbmailer_smtp_username': + $db_wbmailer_smtp_username = $aSettings['value']; break; + case 'wbmailer_smtp_password': + $db_wbmailer_smtp_password = $aSettings['value']; break; + case 'wbmailer_default_sendername': + $db_wbmailer_default_sendername = $aSettings['value']; break; + case 'server_email': + $db_server_email = $aSettings['value']; break; + default: + break; + endswitch; + } + + // set method to send out emails + if($db_wbmailer_routine == "smtp" AND strlen($db_wbmailer_smtp_host) > 5) { + // use SMTP for all outgoing mails send by Website Baker + $this->IsSMTP(); + $this->Host = $db_wbmailer_smtp_host; + // check if SMTP authentification is required + if ($db_wbmailer_smtp_auth == "true" && strlen($db_wbmailer_smtp_username) > 1 && strlen($db_wbmailer_smtp_password) > 1) { + // use SMTP authentification + $this->SMTPAuth = true; // enable SMTP authentification + $this->Username = $db_wbmailer_smtp_username; // set SMTP username + $this->Password = $db_wbmailer_smtp_password; // set SMTP password + } + } else { + // use PHP mail() function for outgoing mails send by Website Baker + $this->IsMail(); + } + + // set language file for PHPMailer error messages + if(defined("LANGUAGE")) { + $this->SetLanguage(strtolower(LANGUAGE),"language"); // english default (also used if file is missing) + } + + // set default charset + if(defined('DEFAULT_CHARSET')) { + $this->CharSet = DEFAULT_CHARSET; + } else { + $this->CharSet='utf-8'; + } + + // set default sender name + if($this->FromName == 'Root User') { + if(isset($_SESSION['DISPLAY_NAME'])) { + $this->FromName = $_SESSION['DISPLAY_NAME']; // FROM NAME: display name of user logged in + } else { + $this->FromName = $db_wbmailer_default_sendername; // FROM NAME: set default name + } + } + /* + some mail provider (lets say mail.com) reject mails send out by foreign mail + relays but using the providers domain in the from mail address (e.g. myname@mail.com) + */ + $this->From = $db_server_email; // FROM MAIL: (server mail) + + // set default mail formats + $this->IsHTML(true); + $this->WordWrap = 80; + $this->Timeout = 30; + } +} Property changes on: branches/2.8.x/wb/framework/class.WbMailer.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1,4 ## +Id +Revision +HeadURL +Date \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property