Completed
Push — develop ( c2e2a7...67117a )
by Maxim
07:15
created
manager/includes/extenders/modxmailer.class.inc.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
11 11
 use PHPMailer\PHPMailer\PHPMailer;
12 12
 use PHPMailer\PHPMailer\Exception as PHPMailerException;
13 13
 
14
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
15
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php';
16
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/SMTP.php';
14
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/Exception.php';
15
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/PHPMailer.php';
16
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/SMTP.php';
17 17
 
18 18
 /**
19 19
  * Class MODxMailer
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
     public function init(DocumentParser $modx)
47 47
     {
48 48
         $this->modx = $modx;
49
-        $this->PluginDir = MODX_MANAGER_PATH . 'includes/controls/phpmailer/';
49
+        $this->PluginDir = MODX_MANAGER_PATH.'includes/controls/phpmailer/';
50 50
 
51 51
         switch ($modx->config['email_method']) {
52 52
             case 'smtp':
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
             mb_language($this->mb_language);
113 113
             mb_internal_encoding($modx->config['modx_charset']);
114 114
         }
115
-        $exconf = MODX_MANAGER_PATH . 'includes/controls/phpmailer/config.inc.php';
115
+        $exconf = MODX_MANAGER_PATH.'includes/controls/phpmailer/config.inc.php';
116 116
         if (is_file($exconf)) {
117 117
             include($exconf);
118 118
         }
@@ -180,12 +180,12 @@  discard block
 block discarded – undo
180 180
         }
181 181
 
182 182
         if ($this->modx->debug) {
183
-            $debug_info = 'CharSet = ' . $this->CharSet . "\n";
184
-            $debug_info .= 'Encoding = ' . $this->Encoding . "\n";
185
-            $debug_info .= 'mb_language = ' . $this->mb_language . "\n";
186
-            $debug_info .= 'encode_header_method = ' . $this->encode_header_method . "\n";
183
+            $debug_info = 'CharSet = '.$this->CharSet."\n";
184
+            $debug_info .= 'Encoding = '.$this->Encoding."\n";
185
+            $debug_info .= 'mb_language = '.$this->mb_language."\n";
186
+            $debug_info .= 'encode_header_method = '.$this->encode_header_method."\n";
187 187
             $debug_info .= "send_mode = {$mode}\n";
188
-            $debug_info .= 'Subject = ' . $this->Subject . "\n";
188
+            $debug_info .= 'Subject = '.$this->Subject."\n";
189 189
             $log = "<pre>{$debug_info}\n{$header}\n{$org_body}</pre>";
190 190
             $this->modx->logEvent(1, 1, $log, 'MODxMailer debug information');
191 191
 
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
             ini_set('sendmail_from', $old_from);
252 252
         }
253 253
         if (!$rt) {
254
-            $msg = $this->Lang('instantiate') . "<br />\n";
254
+            $msg = $this->Lang('instantiate')."<br />\n";
255 255
             $msg .= "{$this->Subject}<br />\n";
256 256
             $msg .= "{$this->FromName}&lt;{$this->From}&gt;<br />\n";
257 257
             $msg .= mb_convert_encoding($body, $this->modx->config['modx_charset'], $this->CharSet);
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
         $classDump = call_user_func('get_object_vars', $this);
274 274
         unset($classDump['modx']);
275 275
         $this->modx->config['send_errormail'] = '0';
276
-        $this->modx->logEvent(0, 3, $msg . '<pre>' . print_r($classDump, true) . '</pre>', 'phpmailer');
276
+        $this->modx->logEvent(0, 3, $msg.'<pre>'.print_r($classDump, true).'</pre>', 'phpmailer');
277 277
 
278 278
         return parent::SetError($msg);
279 279
     }
Please login to merge, or discard this patch.