diff --git a/class.phpmailer.php b/class.phpmailer.php old mode 100644 new mode 100755 index 0813cb082..14b3a63ae --- a/class.phpmailer.php +++ b/class.phpmailer.php @@ -444,7 +444,7 @@ class PHPMailer * @type string */ public $XMailer = ''; - + /** * Only For XOAUTH - Google * Options: An empty string for PHPMailer default, Enter the email used to get access token @@ -454,8 +454,8 @@ class PHPMailer // public $RefreshToken = ''; // public $ClientId = ''; // public $ClientSecret = ''; - - + + /** * An instance of the SMTP sender class. * @type SMTP @@ -1384,7 +1384,7 @@ public function smtpConnect($options = array()) if (is_null($this->smtp)) { $this->smtp = $this->getSMTPInstance(); } - + // Already connected? if ($this->smtp->connected()) { return true; @@ -1459,10 +1459,10 @@ public function smtpConnect($options = array()) } if ($this->SMTPAuth) { if (!$this->smtp->authenticate( - $this->Username, - $this->Password, - $this->AuthType, - $this->Realm, + $this->Username, + $this->Password, + $this->AuthType, + $this->Realm, $this->Workstation ) ) { @@ -1844,7 +1844,7 @@ public function createHeader() if ($this->XMailer == '') { $result .= $this->headerLine( 'X-Mailer', - 'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)' + 'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)' ); } else { $myXmailer = trim($this->XMailer); @@ -3613,7 +3613,10 @@ public function DKIM_Add($headers_line, $subject, $body) "\tbh=" . $DKIMb64 . ";\r\n" . "\tb="; $toSign = $this->DKIM_HeaderC( - $from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs + $from_header . "\r\n" . + $to_header . "\r\n" . + $subject_header . "\r\n" . + $dkimhdrs ); $signed = $this->DKIM_Sign($toSign); return $dkimhdrs . $signed . "\r\n"; diff --git a/class.phpmaileroauth.php b/class.phpmaileroauth.php old mode 100644 new mode 100755 index 60b5b69b3..e289625a6 --- a/class.phpmaileroauth.php +++ b/class.phpmaileroauth.php @@ -55,7 +55,7 @@ class PHPMailerOAuth extends PHPMailer * @access protected */ protected $oauth = null; - + /** * Get an OAuth instance to use. * @return OAuth @@ -87,11 +87,11 @@ public function smtpConnect($options = array()) if (is_null($this->smtp)) { $this->smtp = $this->getSMTPInstance(); } - + if (is_null($this->oauth)) { $this->oauth = $this->getOAUTHInstance(); } - + // Already connected? if ($this->smtp->connected()) { return true; diff --git a/class.phpmaileroauthgoogle.php b/class.phpmaileroauthgoogle.php old mode 100644 new mode 100755 index a6e11af85..a0fa8cf2e --- a/class.phpmaileroauthgoogle.php +++ b/class.phpmaileroauthgoogle.php @@ -30,7 +30,7 @@ class PHPMailerOAuthGoogle private $oauthRefreshToken = ''; private $oauthClientId = ''; private $oauthClientSecret = ''; - + public function __construct( $UserEmail, $ClientSecret, @@ -49,19 +49,19 @@ private function getProvider() { 'clientSecret' => $this->oauthClientSecret ]); } - + private function getGrant() { return new \League\OAuth2\Client\Grant\RefreshToken(); } - + private function getToken() { $provider = $this->getProvider(); $grant = $this->getGrant(); return $provider->getAccessToken($grant, ['refresh_token' => $this->oauthRefreshToken]); } - + public function getOauth64() { $token = $this->getToken(); diff --git a/language/phpmailer.lang-fr.php b/language/phpmailer.lang-fr.php old mode 100644 new mode 100755 index 78a66ae15..a661f98d3 --- a/language/phpmailer.lang-fr.php +++ b/language/phpmailer.lang-fr.php @@ -26,4 +26,4 @@ $PHPMAILER_LANG['smtp_connect_failed'] = 'Échec de la connexion SMTP.'; $PHPMAILER_LANG['smtp_error'] = 'Erreur du serveur SMTP : '; $PHPMAILER_LANG['variable_set'] = 'Impossible d\'initialiser ou de réinitialiser une variable : '; -//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: '; +$PHPMAILER_LANG['extension_missing'] = 'Extension manquante : ';