WordPress.org
Get WordPress

Plugin Directory

Changeset 1581695


Ignore:
Timestamp:
01/25/2017 07:08:12 AM (9 years ago)
Author:
osexcel
Message:

6.6.1

  • Remove PHPmailer and use Default Wordpress PHPmailer to send emails
Location:
ose-firewall/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • ose-firewall/trunk/ose_firewall_badge.php

    r1581581 r1581695  
    44   Description: Plugin For Showing Centrora Security Badge
    55   Author: Centrora Security
    6    Version: 6.6.0
     6   Version: 6.6.1
    77*/ 
    88//include(dirname(__FILE__).'/includes/oseBadgeWidget.php');

  • ose-firewall/trunk/ose_wordpress_firewall.php

    r1581581 r1581695  
    55Description: Centrora Security (previously OSE Firewall) - A WordPress Security Firewall plugin created by Centrora. Protect your WordPress site by identify any malicious codes, spam, virus, SQL injection, and security vulnerabilities.
    66Author: Centrora (Previously ProWeb)
    7 Version: 6.6.0
     7Version: 6.6.1
    88Author URI: http://www.centrora.com/
    99*/

  • ose-firewall/trunk/readme.txt

    r1581581 r1581695  
    66Requires at least: 3.7
    77Tested up to: 4.7.1
    8 Stable tag: 6.6.0
     8Stable tag: 6.6.1
    99License: GPLv2 or later
    1010License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    164164
    165165== Changelog ==
     166
     167= 6.6.1 =
     168* Remove PHPmailer and use Default Wordpress PHPmailer to send emails
     169
    166170= 6.6.0 =
    167171* Added new OEM

  • ose-firewall/trunk/vendor/oseframework/emails/oseEmail.php

    r1387925 r1581695  
    255255    {
    256256        $receiptients = $this->getReceiptients($email->id);
    257         require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'oseEmailHelper.php');
    258         require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'phpmailer'.ODS.'phpmailer.php');
    259         require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'phpmailer'.ODS.'smtp.php');
    260257        if (empty($receiptients))
    261258        {
    … …  
    265262        {
    266263            $email->body = str_replace('[user]', $receiptient->name, $email->body);
    267             $mailer = new cPHPMailer();
     264            require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'oseEmailHelper.php');
     265            if (OSE_CMS=='wordpress') {
     266                require_once(OSE_ABSPATH.'/wp-includes/class-phpmailer.php');
     267                $mailer = new PHPMailer();
     268            }
     269            else {
     270                require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'phpmailer'.ODS.'phpmailer.php');
     271                require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'phpmailer'.ODS.'smtp.php');
     272                $mailer = new cPHPMailer();
     273                if ($config_var->mailer == 'smtp')
     274                {
     275                    $mailer->useSMTP($config_var->smtpauth, $config_var->smtphost, $config_var->smtpuser, $config_var->smtppass, $config_var->smtpsecure, $config_var->smtpport);
     276                }
     277            }
    268278            $mailer->From = $config_var->mailfrom;
    269279            $mailer->FromName = $config_var->fromname;
    270             if ($config_var->mailer == 'smtp')
    271             {
    272                 $mailer->useSMTP($config_var->smtpauth, $config_var->smtphost, $config_var->smtpuser, $config_var->smtppass, $config_var->smtpsecure, $config_var->smtpport);
    273             }
    274280            $this->addRecipient($mailer, $receiptient->email);
    275281            $mailer->Subject = OSEMailHelper::cleanLine($email->subject);
    … …  
    282288    public function sendMailTo($email, $config_var, $receiptients)
    283289    {
    284         require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'oseEmailHelper.php');
    285         require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'phpmailer'.ODS.'phpmailer.php');
    286         require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'phpmailer'.ODS.'smtp.php');
    287290        if (empty($receiptients))
    288291        {
    … …  
    292295        {
    293296            $email->body = str_replace('[user]', $receiptient->name, $email->body);
    294             $mailer = new cPHPMailer();
     297            require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'oseEmailHelper.php');
     298            if (OSE_CMS=='wordpress') {
     299                require_once(OSE_ABSPATH.'/wp-includes/class-phpmailer.php');
     300                $mailer = new PHPMailer();
     301            }
     302            else {
     303                require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'phpmailer'.ODS.'phpmailer.php');
     304                require_once(OSE_FRAMEWORKDIR.ODS.'oseframework'.ODS.'emails'.ODS.'phpmailer'.ODS.'smtp.php');
     305                $mailer = new cPHPMailer();
     306                if ($config_var->mailer == 'smtp')
     307                {
     308                    $mailer->useSMTP($config_var->smtpauth, $config_var->smtphost, $config_var->smtpuser, $config_var->smtppass, $config_var->smtpsecure, $config_var->smtpport);
     309                }
     310            }
    295311            $mailer->From = $config_var->mailfrom;
    296312            $mailer->FromName = $config_var->fromname;
    297             if ($config_var->mailer == 'smtp')
    298             {
    299                 $mailer->useSMTP($config_var->smtpauth, $config_var->smtphost, $config_var->smtpuser, $config_var->smtppass, $config_var->smtpsecure, $config_var->smtpport);
    300             }
    301313            $this->addRecipient($mailer, $receiptient->email);
    302314            $mailer->Subject = OSEMailHelper::cleanLine($email->subject);
Note: See TracChangeset for help on using the changeset viewer.