@@ -42,441 +42,441 @@ discard block |
||
42 | 42 | |
43 | 43 | class PHPMailer { |
44 | 44 | |
45 | - ///////////////////////////////////////////////// |
|
46 | - // PROPERTIES, PUBLIC |
|
47 | - ///////////////////////////////////////////////// |
|
48 | - |
|
49 | - /** |
|
50 | - * Email priority (1 = High, 3 = Normal, 5 = low). |
|
51 | - * @var int |
|
52 | - */ |
|
53 | - public $Priority = 3; |
|
54 | - |
|
55 | - /** |
|
56 | - * Sets the CharSet of the message. |
|
57 | - * @var string |
|
58 | - */ |
|
59 | - public $CharSet = 'iso-8859-1'; |
|
60 | - |
|
61 | - /** |
|
62 | - * Sets the Content-type of the message. |
|
63 | - * @var string |
|
64 | - */ |
|
65 | - public $ContentType = 'text/plain'; |
|
66 | - |
|
67 | - /** |
|
68 | - * Sets the Encoding of the message. Options for this are |
|
69 | - * "8bit", "7bit", "binary", "base64", and "quoted-printable". |
|
70 | - * @var string |
|
71 | - */ |
|
72 | - public $Encoding = '8bit'; |
|
73 | - |
|
74 | - /** |
|
75 | - * Holds the most recent mailer error message. |
|
76 | - * @var string |
|
77 | - */ |
|
78 | - public $ErrorInfo = ''; |
|
79 | - |
|
80 | - /** |
|
81 | - * Sets the From email address for the message. |
|
82 | - * @var string |
|
83 | - */ |
|
84 | - public $From = 'root@localhost'; |
|
85 | - |
|
86 | - /** |
|
87 | - * Sets the From name of the message. |
|
88 | - * @var string |
|
89 | - */ |
|
90 | - public $FromName = 'Root User'; |
|
91 | - |
|
92 | - /** |
|
93 | - * Sets the Sender email (Return-Path) of the message. If not empty, |
|
94 | - * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode. |
|
95 | - * @var string |
|
96 | - */ |
|
97 | - public $Sender = ''; |
|
98 | - |
|
99 | - /** |
|
100 | - * Sets the Subject of the message. |
|
101 | - * @var string |
|
102 | - */ |
|
103 | - public $Subject = ''; |
|
104 | - |
|
105 | - /** |
|
106 | - * Sets the Body of the message. This can be either an HTML or text body. |
|
107 | - * If HTML then run IsHTML(true). |
|
108 | - * @var string |
|
109 | - */ |
|
110 | - public $Body = ''; |
|
111 | - |
|
112 | - /** |
|
113 | - * Sets the text-only body of the message. This automatically sets the |
|
114 | - * email to multipart/alternative. This body can be read by mail |
|
115 | - * clients that do not have HTML email capability such as mutt. Clients |
|
116 | - * that can read HTML will view the normal Body. |
|
117 | - * @var string |
|
118 | - */ |
|
119 | - public $AltBody = ''; |
|
120 | - |
|
121 | - /** |
|
122 | - * Sets word wrapping on the body of the message to a given number of |
|
123 | - * characters. |
|
124 | - * @var int |
|
125 | - */ |
|
126 | - public $WordWrap = 0; |
|
127 | - |
|
128 | - /** |
|
129 | - * Method to send mail: ("mail", "sendmail", or "smtp"). |
|
130 | - * @var string |
|
131 | - */ |
|
132 | - public $Mailer = 'mail'; |
|
133 | - |
|
134 | - /** |
|
135 | - * Sets the path of the sendmail program. |
|
136 | - * @var string |
|
137 | - */ |
|
138 | - public $Sendmail = '/usr/sbin/sendmail'; |
|
139 | - |
|
140 | - /** |
|
141 | - * Path to PHPMailer plugins. Useful if the SMTP class |
|
142 | - * is in a different directory than the PHP include path. |
|
143 | - * @var string |
|
144 | - */ |
|
145 | - public $PluginDir = ''; |
|
146 | - |
|
147 | - /** |
|
148 | - * Sets the email address that a reading confirmation will be sent. |
|
149 | - * @var string |
|
150 | - */ |
|
151 | - public $ConfirmReadingTo = ''; |
|
152 | - |
|
153 | - /** |
|
154 | - * Sets the hostname to use in Message-Id and Received headers |
|
155 | - * and as default HELO string. If empty, the value returned |
|
156 | - * by SERVER_NAME is used or 'localhost.localdomain'. |
|
157 | - * @var string |
|
158 | - */ |
|
159 | - public $Hostname = ''; |
|
160 | - |
|
161 | - /** |
|
162 | - * Sets the message ID to be used in the Message-Id header. |
|
163 | - * If empty, a unique id will be generated. |
|
164 | - * @var string |
|
165 | - */ |
|
166 | - public $MessageID = ''; |
|
167 | - |
|
168 | - ///////////////////////////////////////////////// |
|
169 | - // PROPERTIES FOR SMTP |
|
170 | - ///////////////////////////////////////////////// |
|
171 | - |
|
172 | - /** |
|
173 | - * Sets the SMTP hosts. All hosts must be separated by a |
|
174 | - * semicolon. You can also specify a different port |
|
175 | - * for each host by using this format: [hostname:port] |
|
176 | - * (e.g. "smtp1.example.com:25;smtp2.example.com"). |
|
177 | - * Hosts will be tried in order. |
|
178 | - * @var string |
|
179 | - */ |
|
180 | - public $Host = 'localhost'; |
|
181 | - |
|
182 | - /** |
|
183 | - * Sets the default SMTP server port. |
|
184 | - * @var int |
|
185 | - */ |
|
186 | - public $Port = 25; |
|
187 | - |
|
188 | - /** |
|
189 | - * Sets the SMTP HELO of the message (Default is $Hostname). |
|
190 | - * @var string |
|
191 | - */ |
|
192 | - public $Helo = ''; |
|
193 | - |
|
194 | - /** |
|
195 | - * Sets connection prefix. |
|
196 | - * Options are "", "ssl" or "tls" |
|
197 | - * @var string |
|
198 | - */ |
|
199 | - public $SMTPSecure = ''; |
|
200 | - |
|
201 | - /** |
|
202 | - * Sets SMTP authentication. Utilizes the Username and Password variables. |
|
203 | - * @var bool |
|
204 | - */ |
|
205 | - public $SMTPAuth = false; |
|
206 | - |
|
207 | - /** |
|
208 | - * Sets SMTP username. |
|
209 | - * @var string |
|
210 | - */ |
|
211 | - public $Username = ''; |
|
212 | - |
|
213 | - /** |
|
214 | - * Sets SMTP password. |
|
215 | - * @var string |
|
216 | - */ |
|
217 | - public $Password = ''; |
|
218 | - |
|
219 | - /** |
|
220 | - * Sets the SMTP server timeout in seconds. |
|
221 | - * This function will not work with the win32 version. |
|
222 | - * @var int |
|
223 | - */ |
|
224 | - public $Timeout = 10; |
|
225 | - |
|
226 | - /** |
|
227 | - * Sets SMTP class debugging on or off. |
|
228 | - * @var bool |
|
229 | - */ |
|
230 | - public $SMTPDebug = false; |
|
231 | - |
|
232 | - /** |
|
233 | - * Prevents the SMTP connection from being closed after each mail |
|
234 | - * sending. If this is set to true then to close the connection |
|
235 | - * requires an explicit call to SmtpClose(). |
|
236 | - * @var bool |
|
237 | - */ |
|
238 | - public $SMTPKeepAlive = false; |
|
239 | - |
|
240 | - /** |
|
241 | - * Provides the ability to have the TO field process individual |
|
242 | - * emails, instead of sending to entire TO addresses |
|
243 | - * @var bool |
|
244 | - */ |
|
245 | - public $SingleTo = false; |
|
246 | - |
|
247 | - /** |
|
248 | - * If SingleTo is true, this provides the array to hold the email addresses |
|
249 | - * @var bool |
|
250 | - */ |
|
251 | - public $SingleToArray = array(); |
|
252 | - |
|
253 | - /** |
|
254 | - * Provides the ability to change the line ending |
|
255 | - * @var string |
|
256 | - */ |
|
257 | - public $LE = "\n"; |
|
258 | - |
|
259 | - /** |
|
260 | - * Used with DKIM DNS Resource Record |
|
261 | - * @var string |
|
262 | - */ |
|
263 | - public $DKIM_selector = 'phpmailer'; |
|
264 | - |
|
265 | - /** |
|
266 | - * Used with DKIM DNS Resource Record |
|
267 | - * optional, in format of email address '[email protected]' |
|
268 | - * @var string |
|
269 | - */ |
|
270 | - public $DKIM_identity = ''; |
|
271 | - |
|
272 | - /** |
|
273 | - * Used with DKIM DNS Resource Record |
|
274 | - * optional, in format of email address '[email protected]' |
|
275 | - * @var string |
|
276 | - */ |
|
277 | - public $DKIM_domain = ''; |
|
278 | - |
|
279 | - /** |
|
280 | - * Used with DKIM DNS Resource Record |
|
281 | - * optional, in format of email address '[email protected]' |
|
282 | - * @var string |
|
283 | - */ |
|
284 | - public $DKIM_private = ''; |
|
285 | - |
|
286 | - /** |
|
287 | - * Callback Action function name |
|
288 | - * the function that handles the result of the send email action. Parameters: |
|
289 | - * bool $result result of the send action |
|
290 | - * string $to email address of the recipient |
|
291 | - * string $cc cc email addresses |
|
292 | - * string $bcc bcc email addresses |
|
293 | - * string $subject the subject |
|
294 | - * string $body the email body |
|
295 | - * @var string |
|
296 | - */ |
|
297 | - public $action_function = ''; //'callbackAction'; |
|
298 | - |
|
299 | - /** |
|
300 | - * Sets the PHPMailer Version number |
|
301 | - * @var string |
|
302 | - */ |
|
303 | - public $Version = '5.1'; |
|
304 | - |
|
305 | - ///////////////////////////////////////////////// |
|
306 | - // PROPERTIES, PRIVATE AND PROTECTED |
|
307 | - ///////////////////////////////////////////////// |
|
308 | - |
|
309 | - private $smtp = NULL; |
|
310 | - private $to = array(); |
|
311 | - private $cc = array(); |
|
312 | - private $bcc = array(); |
|
313 | - private $ReplyTo = array(); |
|
314 | - private $all_recipients = array(); |
|
315 | - private $attachment = array(); |
|
316 | - private $CustomHeader = array(); |
|
317 | - private $message_type = ''; |
|
318 | - private $boundary = array(); |
|
319 | - protected $language = array(); |
|
320 | - private $error_count = 0; |
|
321 | - private $sign_cert_file = ""; |
|
322 | - private $sign_key_file = ""; |
|
323 | - private $sign_key_pass = ""; |
|
324 | - private $exceptions = false; |
|
325 | - |
|
326 | - ///////////////////////////////////////////////// |
|
327 | - // CONSTANTS |
|
328 | - ///////////////////////////////////////////////// |
|
329 | - |
|
330 | - const STOP_MESSAGE = 0; // message only, continue processing |
|
331 | - const STOP_CONTINUE = 1; // message?, likely ok to continue processing |
|
332 | - const STOP_CRITICAL = 2; // message, plus full stop, critical error reached |
|
333 | - |
|
334 | - ///////////////////////////////////////////////// |
|
335 | - // METHODS, VARIABLES |
|
336 | - ///////////////////////////////////////////////// |
|
337 | - |
|
338 | - /** |
|
339 | - * Constructor |
|
340 | - * @param boolean $exceptions Should we throw external exceptions? |
|
341 | - */ |
|
342 | - public function __construct($exceptions = false) { |
|
45 | + ///////////////////////////////////////////////// |
|
46 | + // PROPERTIES, PUBLIC |
|
47 | + ///////////////////////////////////////////////// |
|
48 | + |
|
49 | + /** |
|
50 | + * Email priority (1 = High, 3 = Normal, 5 = low). |
|
51 | + * @var int |
|
52 | + */ |
|
53 | + public $Priority = 3; |
|
54 | + |
|
55 | + /** |
|
56 | + * Sets the CharSet of the message. |
|
57 | + * @var string |
|
58 | + */ |
|
59 | + public $CharSet = 'iso-8859-1'; |
|
60 | + |
|
61 | + /** |
|
62 | + * Sets the Content-type of the message. |
|
63 | + * @var string |
|
64 | + */ |
|
65 | + public $ContentType = 'text/plain'; |
|
66 | + |
|
67 | + /** |
|
68 | + * Sets the Encoding of the message. Options for this are |
|
69 | + * "8bit", "7bit", "binary", "base64", and "quoted-printable". |
|
70 | + * @var string |
|
71 | + */ |
|
72 | + public $Encoding = '8bit'; |
|
73 | + |
|
74 | + /** |
|
75 | + * Holds the most recent mailer error message. |
|
76 | + * @var string |
|
77 | + */ |
|
78 | + public $ErrorInfo = ''; |
|
79 | + |
|
80 | + /** |
|
81 | + * Sets the From email address for the message. |
|
82 | + * @var string |
|
83 | + */ |
|
84 | + public $From = 'root@localhost'; |
|
85 | + |
|
86 | + /** |
|
87 | + * Sets the From name of the message. |
|
88 | + * @var string |
|
89 | + */ |
|
90 | + public $FromName = 'Root User'; |
|
91 | + |
|
92 | + /** |
|
93 | + * Sets the Sender email (Return-Path) of the message. If not empty, |
|
94 | + * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode. |
|
95 | + * @var string |
|
96 | + */ |
|
97 | + public $Sender = ''; |
|
98 | + |
|
99 | + /** |
|
100 | + * Sets the Subject of the message. |
|
101 | + * @var string |
|
102 | + */ |
|
103 | + public $Subject = ''; |
|
104 | + |
|
105 | + /** |
|
106 | + * Sets the Body of the message. This can be either an HTML or text body. |
|
107 | + * If HTML then run IsHTML(true). |
|
108 | + * @var string |
|
109 | + */ |
|
110 | + public $Body = ''; |
|
111 | + |
|
112 | + /** |
|
113 | + * Sets the text-only body of the message. This automatically sets the |
|
114 | + * email to multipart/alternative. This body can be read by mail |
|
115 | + * clients that do not have HTML email capability such as mutt. Clients |
|
116 | + * that can read HTML will view the normal Body. |
|
117 | + * @var string |
|
118 | + */ |
|
119 | + public $AltBody = ''; |
|
120 | + |
|
121 | + /** |
|
122 | + * Sets word wrapping on the body of the message to a given number of |
|
123 | + * characters. |
|
124 | + * @var int |
|
125 | + */ |
|
126 | + public $WordWrap = 0; |
|
127 | + |
|
128 | + /** |
|
129 | + * Method to send mail: ("mail", "sendmail", or "smtp"). |
|
130 | + * @var string |
|
131 | + */ |
|
132 | + public $Mailer = 'mail'; |
|
133 | + |
|
134 | + /** |
|
135 | + * Sets the path of the sendmail program. |
|
136 | + * @var string |
|
137 | + */ |
|
138 | + public $Sendmail = '/usr/sbin/sendmail'; |
|
139 | + |
|
140 | + /** |
|
141 | + * Path to PHPMailer plugins. Useful if the SMTP class |
|
142 | + * is in a different directory than the PHP include path. |
|
143 | + * @var string |
|
144 | + */ |
|
145 | + public $PluginDir = ''; |
|
146 | + |
|
147 | + /** |
|
148 | + * Sets the email address that a reading confirmation will be sent. |
|
149 | + * @var string |
|
150 | + */ |
|
151 | + public $ConfirmReadingTo = ''; |
|
152 | + |
|
153 | + /** |
|
154 | + * Sets the hostname to use in Message-Id and Received headers |
|
155 | + * and as default HELO string. If empty, the value returned |
|
156 | + * by SERVER_NAME is used or 'localhost.localdomain'. |
|
157 | + * @var string |
|
158 | + */ |
|
159 | + public $Hostname = ''; |
|
160 | + |
|
161 | + /** |
|
162 | + * Sets the message ID to be used in the Message-Id header. |
|
163 | + * If empty, a unique id will be generated. |
|
164 | + * @var string |
|
165 | + */ |
|
166 | + public $MessageID = ''; |
|
167 | + |
|
168 | + ///////////////////////////////////////////////// |
|
169 | + // PROPERTIES FOR SMTP |
|
170 | + ///////////////////////////////////////////////// |
|
171 | + |
|
172 | + /** |
|
173 | + * Sets the SMTP hosts. All hosts must be separated by a |
|
174 | + * semicolon. You can also specify a different port |
|
175 | + * for each host by using this format: [hostname:port] |
|
176 | + * (e.g. "smtp1.example.com:25;smtp2.example.com"). |
|
177 | + * Hosts will be tried in order. |
|
178 | + * @var string |
|
179 | + */ |
|
180 | + public $Host = 'localhost'; |
|
181 | + |
|
182 | + /** |
|
183 | + * Sets the default SMTP server port. |
|
184 | + * @var int |
|
185 | + */ |
|
186 | + public $Port = 25; |
|
187 | + |
|
188 | + /** |
|
189 | + * Sets the SMTP HELO of the message (Default is $Hostname). |
|
190 | + * @var string |
|
191 | + */ |
|
192 | + public $Helo = ''; |
|
193 | + |
|
194 | + /** |
|
195 | + * Sets connection prefix. |
|
196 | + * Options are "", "ssl" or "tls" |
|
197 | + * @var string |
|
198 | + */ |
|
199 | + public $SMTPSecure = ''; |
|
200 | + |
|
201 | + /** |
|
202 | + * Sets SMTP authentication. Utilizes the Username and Password variables. |
|
203 | + * @var bool |
|
204 | + */ |
|
205 | + public $SMTPAuth = false; |
|
206 | + |
|
207 | + /** |
|
208 | + * Sets SMTP username. |
|
209 | + * @var string |
|
210 | + */ |
|
211 | + public $Username = ''; |
|
212 | + |
|
213 | + /** |
|
214 | + * Sets SMTP password. |
|
215 | + * @var string |
|
216 | + */ |
|
217 | + public $Password = ''; |
|
218 | + |
|
219 | + /** |
|
220 | + * Sets the SMTP server timeout in seconds. |
|
221 | + * This function will not work with the win32 version. |
|
222 | + * @var int |
|
223 | + */ |
|
224 | + public $Timeout = 10; |
|
225 | + |
|
226 | + /** |
|
227 | + * Sets SMTP class debugging on or off. |
|
228 | + * @var bool |
|
229 | + */ |
|
230 | + public $SMTPDebug = false; |
|
231 | + |
|
232 | + /** |
|
233 | + * Prevents the SMTP connection from being closed after each mail |
|
234 | + * sending. If this is set to true then to close the connection |
|
235 | + * requires an explicit call to SmtpClose(). |
|
236 | + * @var bool |
|
237 | + */ |
|
238 | + public $SMTPKeepAlive = false; |
|
239 | + |
|
240 | + /** |
|
241 | + * Provides the ability to have the TO field process individual |
|
242 | + * emails, instead of sending to entire TO addresses |
|
243 | + * @var bool |
|
244 | + */ |
|
245 | + public $SingleTo = false; |
|
246 | + |
|
247 | + /** |
|
248 | + * If SingleTo is true, this provides the array to hold the email addresses |
|
249 | + * @var bool |
|
250 | + */ |
|
251 | + public $SingleToArray = array(); |
|
252 | + |
|
253 | + /** |
|
254 | + * Provides the ability to change the line ending |
|
255 | + * @var string |
|
256 | + */ |
|
257 | + public $LE = "\n"; |
|
258 | + |
|
259 | + /** |
|
260 | + * Used with DKIM DNS Resource Record |
|
261 | + * @var string |
|
262 | + */ |
|
263 | + public $DKIM_selector = 'phpmailer'; |
|
264 | + |
|
265 | + /** |
|
266 | + * Used with DKIM DNS Resource Record |
|
267 | + * optional, in format of email address '[email protected]' |
|
268 | + * @var string |
|
269 | + */ |
|
270 | + public $DKIM_identity = ''; |
|
271 | + |
|
272 | + /** |
|
273 | + * Used with DKIM DNS Resource Record |
|
274 | + * optional, in format of email address '[email protected]' |
|
275 | + * @var string |
|
276 | + */ |
|
277 | + public $DKIM_domain = ''; |
|
278 | + |
|
279 | + /** |
|
280 | + * Used with DKIM DNS Resource Record |
|
281 | + * optional, in format of email address '[email protected]' |
|
282 | + * @var string |
|
283 | + */ |
|
284 | + public $DKIM_private = ''; |
|
285 | + |
|
286 | + /** |
|
287 | + * Callback Action function name |
|
288 | + * the function that handles the result of the send email action. Parameters: |
|
289 | + * bool $result result of the send action |
|
290 | + * string $to email address of the recipient |
|
291 | + * string $cc cc email addresses |
|
292 | + * string $bcc bcc email addresses |
|
293 | + * string $subject the subject |
|
294 | + * string $body the email body |
|
295 | + * @var string |
|
296 | + */ |
|
297 | + public $action_function = ''; //'callbackAction'; |
|
298 | + |
|
299 | + /** |
|
300 | + * Sets the PHPMailer Version number |
|
301 | + * @var string |
|
302 | + */ |
|
303 | + public $Version = '5.1'; |
|
304 | + |
|
305 | + ///////////////////////////////////////////////// |
|
306 | + // PROPERTIES, PRIVATE AND PROTECTED |
|
307 | + ///////////////////////////////////////////////// |
|
308 | + |
|
309 | + private $smtp = NULL; |
|
310 | + private $to = array(); |
|
311 | + private $cc = array(); |
|
312 | + private $bcc = array(); |
|
313 | + private $ReplyTo = array(); |
|
314 | + private $all_recipients = array(); |
|
315 | + private $attachment = array(); |
|
316 | + private $CustomHeader = array(); |
|
317 | + private $message_type = ''; |
|
318 | + private $boundary = array(); |
|
319 | + protected $language = array(); |
|
320 | + private $error_count = 0; |
|
321 | + private $sign_cert_file = ""; |
|
322 | + private $sign_key_file = ""; |
|
323 | + private $sign_key_pass = ""; |
|
324 | + private $exceptions = false; |
|
325 | + |
|
326 | + ///////////////////////////////////////////////// |
|
327 | + // CONSTANTS |
|
328 | + ///////////////////////////////////////////////// |
|
329 | + |
|
330 | + const STOP_MESSAGE = 0; // message only, continue processing |
|
331 | + const STOP_CONTINUE = 1; // message?, likely ok to continue processing |
|
332 | + const STOP_CRITICAL = 2; // message, plus full stop, critical error reached |
|
333 | + |
|
334 | + ///////////////////////////////////////////////// |
|
335 | + // METHODS, VARIABLES |
|
336 | + ///////////////////////////////////////////////// |
|
337 | + |
|
338 | + /** |
|
339 | + * Constructor |
|
340 | + * @param boolean $exceptions Should we throw external exceptions? |
|
341 | + */ |
|
342 | + public function __construct($exceptions = false) { |
|
343 | 343 | $this->exceptions = ($exceptions == true); |
344 | - } |
|
345 | - |
|
346 | - /** |
|
347 | - * Sets message type to HTML. |
|
348 | - * @param bool $ishtml |
|
349 | - * @return void |
|
350 | - */ |
|
351 | - public function IsHTML($ishtml = true) { |
|
344 | + } |
|
345 | + |
|
346 | + /** |
|
347 | + * Sets message type to HTML. |
|
348 | + * @param bool $ishtml |
|
349 | + * @return void |
|
350 | + */ |
|
351 | + public function IsHTML($ishtml = true) { |
|
352 | 352 | if ($ishtml) { |
353 | - $this->ContentType = 'text/html'; |
|
353 | + $this->ContentType = 'text/html'; |
|
354 | 354 | } else { |
355 | - $this->ContentType = 'text/plain'; |
|
355 | + $this->ContentType = 'text/plain'; |
|
356 | + } |
|
356 | 357 | } |
357 | - } |
|
358 | 358 | |
359 | - /** |
|
360 | - * Sets Mailer to send message using SMTP. |
|
361 | - * @return void |
|
362 | - */ |
|
363 | - public function IsSMTP() { |
|
359 | + /** |
|
360 | + * Sets Mailer to send message using SMTP. |
|
361 | + * @return void |
|
362 | + */ |
|
363 | + public function IsSMTP() { |
|
364 | 364 | $this->Mailer = 'smtp'; |
365 | - } |
|
365 | + } |
|
366 | 366 | |
367 | - /** |
|
368 | - * Sets Mailer to send message using PHP mail() function. |
|
369 | - * @return void |
|
370 | - */ |
|
371 | - public function IsMail() { |
|
367 | + /** |
|
368 | + * Sets Mailer to send message using PHP mail() function. |
|
369 | + * @return void |
|
370 | + */ |
|
371 | + public function IsMail() { |
|
372 | 372 | $this->Mailer = 'mail'; |
373 | - } |
|
373 | + } |
|
374 | 374 | |
375 | - /** |
|
376 | - * Sets Mailer to send message using the $Sendmail program. |
|
377 | - * @return void |
|
378 | - */ |
|
379 | - public function IsSendmail() { |
|
375 | + /** |
|
376 | + * Sets Mailer to send message using the $Sendmail program. |
|
377 | + * @return void |
|
378 | + */ |
|
379 | + public function IsSendmail() { |
|
380 | 380 | if (!stristr(ini_get('sendmail_path'), 'sendmail')) { |
381 | - $this->Sendmail = '/var/qmail/bin/sendmail'; |
|
381 | + $this->Sendmail = '/var/qmail/bin/sendmail'; |
|
382 | 382 | } |
383 | 383 | $this->Mailer = 'sendmail'; |
384 | - } |
|
384 | + } |
|
385 | 385 | |
386 | - /** |
|
387 | - * Sets Mailer to send message using the qmail MTA. |
|
388 | - * @return void |
|
389 | - */ |
|
390 | - public function IsQmail() { |
|
386 | + /** |
|
387 | + * Sets Mailer to send message using the qmail MTA. |
|
388 | + * @return void |
|
389 | + */ |
|
390 | + public function IsQmail() { |
|
391 | 391 | if (stristr(ini_get('sendmail_path'), 'qmail')) { |
392 | - $this->Sendmail = '/var/qmail/bin/sendmail'; |
|
392 | + $this->Sendmail = '/var/qmail/bin/sendmail'; |
|
393 | 393 | } |
394 | 394 | $this->Mailer = 'sendmail'; |
395 | - } |
|
396 | - |
|
397 | - ///////////////////////////////////////////////// |
|
398 | - // METHODS, RECIPIENTS |
|
399 | - ///////////////////////////////////////////////// |
|
400 | - |
|
401 | - /** |
|
402 | - * Adds a "To" address. |
|
403 | - * @param string $address |
|
404 | - * @param string $name |
|
405 | - * @return boolean true on success, false if address already used |
|
406 | - */ |
|
407 | - public function AddAddress($address, $name = '') { |
|
395 | + } |
|
396 | + |
|
397 | + ///////////////////////////////////////////////// |
|
398 | + // METHODS, RECIPIENTS |
|
399 | + ///////////////////////////////////////////////// |
|
400 | + |
|
401 | + /** |
|
402 | + * Adds a "To" address. |
|
403 | + * @param string $address |
|
404 | + * @param string $name |
|
405 | + * @return boolean true on success, false if address already used |
|
406 | + */ |
|
407 | + public function AddAddress($address, $name = '') { |
|
408 | 408 | return $this->AddAnAddress('to', $address, $name); |
409 | - } |
|
410 | - |
|
411 | - /** |
|
412 | - * Adds a "Cc" address. |
|
413 | - * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer. |
|
414 | - * @param string $address |
|
415 | - * @param string $name |
|
416 | - * @return boolean true on success, false if address already used |
|
417 | - */ |
|
418 | - public function AddCC($address, $name = '') { |
|
409 | + } |
|
410 | + |
|
411 | + /** |
|
412 | + * Adds a "Cc" address. |
|
413 | + * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer. |
|
414 | + * @param string $address |
|
415 | + * @param string $name |
|
416 | + * @return boolean true on success, false if address already used |
|
417 | + */ |
|
418 | + public function AddCC($address, $name = '') { |
|
419 | 419 | return $this->AddAnAddress('cc', $address, $name); |
420 | - } |
|
421 | - |
|
422 | - /** |
|
423 | - * Adds a "Bcc" address. |
|
424 | - * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer. |
|
425 | - * @param string $address |
|
426 | - * @param string $name |
|
427 | - * @return boolean true on success, false if address already used |
|
428 | - */ |
|
429 | - public function AddBCC($address, $name = '') { |
|
420 | + } |
|
421 | + |
|
422 | + /** |
|
423 | + * Adds a "Bcc" address. |
|
424 | + * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer. |
|
425 | + * @param string $address |
|
426 | + * @param string $name |
|
427 | + * @return boolean true on success, false if address already used |
|
428 | + */ |
|
429 | + public function AddBCC($address, $name = '') { |
|
430 | 430 | return $this->AddAnAddress('bcc', $address, $name); |
431 | - } |
|
432 | - |
|
433 | - /** |
|
434 | - * Adds a "Reply-to" address. |
|
435 | - * @param string $address |
|
436 | - * @param string $name |
|
437 | - * @return boolean |
|
438 | - */ |
|
439 | - public function AddReplyTo($address, $name = '') { |
|
431 | + } |
|
432 | + |
|
433 | + /** |
|
434 | + * Adds a "Reply-to" address. |
|
435 | + * @param string $address |
|
436 | + * @param string $name |
|
437 | + * @return boolean |
|
438 | + */ |
|
439 | + public function AddReplyTo($address, $name = '') { |
|
440 | 440 | return $this->AddAnAddress('ReplyTo', $address, $name); |
441 | - } |
|
442 | - |
|
443 | - /** |
|
444 | - * Adds an address to one of the recipient arrays |
|
445 | - * Addresses that have been added already return false, but do not throw exceptions |
|
446 | - * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo' |
|
447 | - * @param string $address The email address to send to |
|
448 | - * @param string $name |
|
449 | - * @return boolean true on success, false if address already used or invalid in some way |
|
450 | - * @access private |
|
451 | - */ |
|
452 | - private function AddAnAddress($kind, $address, $name = '') { |
|
441 | + } |
|
442 | + |
|
443 | + /** |
|
444 | + * Adds an address to one of the recipient arrays |
|
445 | + * Addresses that have been added already return false, but do not throw exceptions |
|
446 | + * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo' |
|
447 | + * @param string $address The email address to send to |
|
448 | + * @param string $name |
|
449 | + * @return boolean true on success, false if address already used or invalid in some way |
|
450 | + * @access private |
|
451 | + */ |
|
452 | + private function AddAnAddress($kind, $address, $name = '') { |
|
453 | 453 | if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) { |
454 | - error_log('Invalid recipient array: ' . $kind); |
|
455 | - return false; |
|
454 | + error_log('Invalid recipient array: ' . $kind); |
|
455 | + return false; |
|
456 | 456 | } |
457 | 457 | $address = trim($address); |
458 | 458 | $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim |
459 | 459 | if (!self::ValidateAddress($address)) { |
460 | - $this->SetError($this->Lang('invalid_address').': '. $address); |
|
461 | - if ($this->exceptions) { |
|
460 | + $this->SetError($this->Lang('invalid_address').': '. $address); |
|
461 | + if ($this->exceptions) { |
|
462 | 462 | throw new phpmailerException($this->Lang('invalid_address').': '.$address); |
463 | - } |
|
464 | - error_log($this->Lang('invalid_address').': '.$address); |
|
465 | - return false; |
|
463 | + } |
|
464 | + error_log($this->Lang('invalid_address').': '.$address); |
|
465 | + return false; |
|
466 | 466 | } |
467 | 467 | if ($kind != 'ReplyTo') { |
468 | - if (!isset($this->all_recipients[strtolower($address)])) { |
|
468 | + if (!isset($this->all_recipients[strtolower($address)])) { |
|
469 | 469 | array_push($this->$kind, array($address, $name)); |
470 | 470 | $this->all_recipients[strtolower($address)] = true; |
471 | 471 | return true; |
472 | - } |
|
472 | + } |
|
473 | 473 | } else { |
474 | - if (!array_key_exists(strtolower($address), $this->ReplyTo)) { |
|
474 | + if (!array_key_exists(strtolower($address), $this->ReplyTo)) { |
|
475 | 475 | $this->ReplyTo[strtolower($address)] = array($address, $name); |
476 | - return true; |
|
476 | + return true; |
|
477 | + } |
|
477 | 478 | } |
478 | - } |
|
479 | - return false; |
|
479 | + return false; |
|
480 | 480 | } |
481 | 481 | |
482 | 482 | /** |
@@ -485,148 +485,148 @@ discard block |
||
485 | 485 | * @param string $name |
486 | 486 | * @return boolean |
487 | 487 | */ |
488 | - public function SetFrom($address, $name = '',$auto=1) { |
|
488 | + public function SetFrom($address, $name = '',$auto=1) { |
|
489 | 489 | $address = trim($address); |
490 | 490 | $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim |
491 | 491 | if (!self::ValidateAddress($address)) { |
492 | - $this->SetError($this->Lang('invalid_address').': '. $address); |
|
493 | - if ($this->exceptions) { |
|
492 | + $this->SetError($this->Lang('invalid_address').': '. $address); |
|
493 | + if ($this->exceptions) { |
|
494 | 494 | throw new phpmailerException($this->Lang('invalid_address').': '.$address); |
495 | - } |
|
496 | - error_log($this->Lang('invalid_address').': '.$address); |
|
497 | - return false; |
|
495 | + } |
|
496 | + error_log($this->Lang('invalid_address').': '.$address); |
|
497 | + return false; |
|
498 | 498 | } |
499 | 499 | $this->From = $address; |
500 | 500 | $this->FromName = $name; |
501 | 501 | if ($auto) { |
502 | - if (empty($this->ReplyTo)) { |
|
502 | + if (empty($this->ReplyTo)) { |
|
503 | 503 | $this->AddAnAddress('ReplyTo', $address, $name); |
504 | - } |
|
505 | - if (empty($this->Sender)) { |
|
504 | + } |
|
505 | + if (empty($this->Sender)) { |
|
506 | 506 | $this->Sender = $address; |
507 | - } |
|
507 | + } |
|
508 | 508 | } |
509 | 509 | return true; |
510 | - } |
|
511 | - |
|
512 | - /** |
|
513 | - * Check that a string looks roughly like an email address should |
|
514 | - * Static so it can be used without instantiation |
|
515 | - * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator |
|
516 | - * Conforms approximately to RFC2822 |
|
517 | - * @link http://www.hexillion.com/samples/#Regex Original pattern found here |
|
518 | - * @param string $address The email address to check |
|
519 | - * @return boolean |
|
520 | - * @static |
|
521 | - * @access public |
|
522 | - */ |
|
523 | - public static function ValidateAddress($address) { |
|
510 | + } |
|
511 | + |
|
512 | + /** |
|
513 | + * Check that a string looks roughly like an email address should |
|
514 | + * Static so it can be used without instantiation |
|
515 | + * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator |
|
516 | + * Conforms approximately to RFC2822 |
|
517 | + * @link http://www.hexillion.com/samples/#Regex Original pattern found here |
|
518 | + * @param string $address The email address to check |
|
519 | + * @return boolean |
|
520 | + * @static |
|
521 | + * @access public |
|
522 | + */ |
|
523 | + public static function ValidateAddress($address) { |
|
524 | 524 | if (function_exists('filter_var')) { //Introduced in PHP 5.2 |
525 | - if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) { |
|
525 | + if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) { |
|
526 | 526 | return false; |
527 | - } else { |
|
527 | + } else { |
|
528 | 528 | return true; |
529 | - } |
|
529 | + } |
|
530 | 530 | } else { |
531 | - return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address); |
|
531 | + return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address); |
|
532 | + } |
|
532 | 533 | } |
533 | - } |
|
534 | 534 | |
535 | - ///////////////////////////////////////////////// |
|
536 | - // METHODS, MAIL SENDING |
|
537 | - ///////////////////////////////////////////////// |
|
535 | + ///////////////////////////////////////////////// |
|
536 | + // METHODS, MAIL SENDING |
|
537 | + ///////////////////////////////////////////////// |
|
538 | 538 | |
539 | - /** |
|
540 | - * Creates message and assigns Mailer. If the message is |
|
541 | - * not sent successfully then it returns false. Use the ErrorInfo |
|
542 | - * variable to view description of the error. |
|
543 | - * @return bool |
|
544 | - */ |
|
545 | - public function Send() { |
|
539 | + /** |
|
540 | + * Creates message and assigns Mailer. If the message is |
|
541 | + * not sent successfully then it returns false. Use the ErrorInfo |
|
542 | + * variable to view description of the error. |
|
543 | + * @return bool |
|
544 | + */ |
|
545 | + public function Send() { |
|
546 | 546 | try { |
547 | - if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) { |
|
547 | + if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) { |
|
548 | 548 | throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL); |
549 | - } |
|
549 | + } |
|
550 | 550 | |
551 | - // Set whether the message is multipart/alternative |
|
552 | - if(!empty($this->AltBody)) { |
|
551 | + // Set whether the message is multipart/alternative |
|
552 | + if(!empty($this->AltBody)) { |
|
553 | 553 | $this->ContentType = 'multipart/alternative'; |
554 | - } |
|
554 | + } |
|
555 | 555 | |
556 | - $this->error_count = 0; // reset errors |
|
557 | - $this->SetMessageType(); |
|
558 | - $header = $this->CreateHeader(); |
|
559 | - $body = $this->CreateBody(); |
|
556 | + $this->error_count = 0; // reset errors |
|
557 | + $this->SetMessageType(); |
|
558 | + $header = $this->CreateHeader(); |
|
559 | + $body = $this->CreateBody(); |
|
560 | 560 | |
561 | - if (empty($this->Body)) { |
|
561 | + if (empty($this->Body)) { |
|
562 | 562 | throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL); |
563 | - } |
|
563 | + } |
|
564 | 564 | |
565 | - // digitally sign with DKIM if enabled |
|
566 | - if ($this->DKIM_domain && $this->DKIM_private) { |
|
565 | + // digitally sign with DKIM if enabled |
|
566 | + if ($this->DKIM_domain && $this->DKIM_private) { |
|
567 | 567 | $header_dkim = $this->DKIM_Add($header,$this->Subject,$body); |
568 | 568 | $header = str_replace("\r\n","\n",$header_dkim) . $header; |
569 | - } |
|
569 | + } |
|
570 | 570 | |
571 | - // Choose the mailer and send through it |
|
572 | - switch($this->Mailer) { |
|
571 | + // Choose the mailer and send through it |
|
572 | + switch($this->Mailer) { |
|
573 | 573 | case 'sendmail': |
574 | 574 | return $this->SendmailSend($header, $body); |
575 | 575 | case 'smtp': |
576 | 576 | return $this->SmtpSend($header, $body); |
577 | 577 | default: |
578 | 578 | return $this->MailSend($header, $body); |
579 | - } |
|
579 | + } |
|
580 | 580 | |
581 | 581 | } catch (phpmailerException $e) { |
582 | - $this->SetError($e->getMessage()); |
|
583 | - if ($this->exceptions) { |
|
582 | + $this->SetError($e->getMessage()); |
|
583 | + if ($this->exceptions) { |
|
584 | 584 | throw $e; |
585 | - } |
|
586 | - return false; |
|
587 | - } |
|
588 | - } |
|
589 | - |
|
590 | - /** |
|
591 | - * Sends mail using the $Sendmail program. |
|
592 | - * @param string $header The message headers |
|
593 | - * @param string $body The message body |
|
594 | - * @access protected |
|
595 | - * @return bool |
|
596 | - */ |
|
597 | - protected function SendmailSend($header, $body) |
|
598 | - { |
|
599 | - if (!(is_file($this->Sendmail) and is_executable($this->Sendmail))) { |
|
600 | - throw new phpmailerException( |
|
601 | - $this->lang('execute').$this->Sendmail, |
|
602 | - self::STOP_CRITICAL |
|
603 | - ); |
|
604 | - } |
|
605 | - if (!empty($this->Sender) and $this->validateAddress($this->Sender)) { |
|
606 | - if ($this->Mailer == 'qmail') { |
|
607 | - $sendmail = sprintf( |
|
608 | - '%s -f%s', |
|
609 | - escapeshellcmd($this->Sendmail), |
|
610 | - escapeshellarg($this->Sender) |
|
611 | - ); |
|
612 | - } else { |
|
613 | - $sendmail = sprintf( |
|
614 | - '%s -oi -f%s -t', |
|
615 | - escapeshellcmd($this->Sendmail), |
|
616 | - escapeshellarg($this->Sender) |
|
617 | - ); |
|
618 | - } |
|
619 | - } else { |
|
620 | - if ($this->Mailer == 'qmail') { |
|
621 | - $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail)); |
|
622 | - } else { |
|
623 | - $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail)); |
|
624 | - } |
|
625 | - } |
|
585 | + } |
|
586 | + return false; |
|
587 | + } |
|
588 | + } |
|
589 | + |
|
590 | + /** |
|
591 | + * Sends mail using the $Sendmail program. |
|
592 | + * @param string $header The message headers |
|
593 | + * @param string $body The message body |
|
594 | + * @access protected |
|
595 | + * @return bool |
|
596 | + */ |
|
597 | + protected function SendmailSend($header, $body) |
|
598 | + { |
|
599 | + if (!(is_file($this->Sendmail) and is_executable($this->Sendmail))) { |
|
600 | + throw new phpmailerException( |
|
601 | + $this->lang('execute').$this->Sendmail, |
|
602 | + self::STOP_CRITICAL |
|
603 | + ); |
|
604 | + } |
|
605 | + if (!empty($this->Sender) and $this->validateAddress($this->Sender)) { |
|
606 | + if ($this->Mailer == 'qmail') { |
|
607 | + $sendmail = sprintf( |
|
608 | + '%s -f%s', |
|
609 | + escapeshellcmd($this->Sendmail), |
|
610 | + escapeshellarg($this->Sender) |
|
611 | + ); |
|
612 | + } else { |
|
613 | + $sendmail = sprintf( |
|
614 | + '%s -oi -f%s -t', |
|
615 | + escapeshellcmd($this->Sendmail), |
|
616 | + escapeshellarg($this->Sender) |
|
617 | + ); |
|
618 | + } |
|
619 | + } else { |
|
620 | + if ($this->Mailer == 'qmail') { |
|
621 | + $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail)); |
|
622 | + } else { |
|
623 | + $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail)); |
|
624 | + } |
|
625 | + } |
|
626 | 626 | if ($this->SingleTo === true) { |
627 | - foreach ($this->SingleToArray as $key => $val) { |
|
627 | + foreach ($this->SingleToArray as $key => $val) { |
|
628 | 628 | if(!@$mail = popen($sendmail, 'w')) { |
629 | - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
|
629 | + throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
|
630 | 630 | } |
631 | 631 | fputs($mail, "To: " . $val . "\n"); |
632 | 632 | fputs($mail, $header); |
@@ -636,96 +636,96 @@ discard block |
||
636 | 636 | $isSent = ($result == 0) ? 1 : 0; |
637 | 637 | $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); |
638 | 638 | if($result != 0) { |
639 | - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
|
639 | + throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
|
640 | + } |
|
640 | 641 | } |
641 | - } |
|
642 | 642 | } else { |
643 | - if(!@$mail = popen($sendmail, 'w')) { |
|
643 | + if(!@$mail = popen($sendmail, 'w')) { |
|
644 | 644 | throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
645 | - } |
|
646 | - fputs($mail, $header); |
|
647 | - fputs($mail, $body); |
|
648 | - $result = pclose($mail); |
|
649 | - // implement call back function if it exists |
|
650 | - $isSent = ($result == 0) ? 1 : 0; |
|
651 | - $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body); |
|
652 | - if($result != 0) { |
|
645 | + } |
|
646 | + fputs($mail, $header); |
|
647 | + fputs($mail, $body); |
|
648 | + $result = pclose($mail); |
|
649 | + // implement call back function if it exists |
|
650 | + $isSent = ($result == 0) ? 1 : 0; |
|
651 | + $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body); |
|
652 | + if($result != 0) { |
|
653 | 653 | throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
654 | - } |
|
654 | + } |
|
655 | 655 | } |
656 | 656 | return true; |
657 | - } |
|
658 | - |
|
659 | - /** |
|
660 | - * Sends mail using the PHP mail() function. |
|
661 | - * @param string $header The message headers |
|
662 | - * @param string $body The message body |
|
663 | - * @access protected |
|
664 | - * @return bool |
|
665 | - */ |
|
666 | - protected function MailSend($header, $body) { |
|
657 | + } |
|
658 | + |
|
659 | + /** |
|
660 | + * Sends mail using the PHP mail() function. |
|
661 | + * @param string $header The message headers |
|
662 | + * @param string $body The message body |
|
663 | + * @access protected |
|
664 | + * @return bool |
|
665 | + */ |
|
666 | + protected function MailSend($header, $body) { |
|
667 | 667 | $toArr = array(); |
668 | 668 | foreach($this->to as $t) { |
669 | - $toArr[] = $this->AddrFormat($t); |
|
669 | + $toArr[] = $this->AddrFormat($t); |
|
670 | 670 | } |
671 | 671 | $to = implode(', ', $toArr); |
672 | 672 | |
673 | 673 | $params = sprintf("-oi -f %s", $this->Sender); |
674 | 674 | if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) { |
675 | - $old_from = ini_get('sendmail_from'); |
|
676 | - ini_set('sendmail_from', $this->Sender); |
|
677 | - if ($this->SingleTo === true && count($toArr) > 1) { |
|
675 | + $old_from = ini_get('sendmail_from'); |
|
676 | + ini_set('sendmail_from', $this->Sender); |
|
677 | + if ($this->SingleTo === true && count($toArr) > 1) { |
|
678 | 678 | foreach ($toArr as $key => $val) { |
679 | - $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); |
|
680 | - // implement call back function if it exists |
|
681 | - $isSent = ($rt == 1) ? 1 : 0; |
|
682 | - $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); |
|
679 | + $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); |
|
680 | + // implement call back function if it exists |
|
681 | + $isSent = ($rt == 1) ? 1 : 0; |
|
682 | + $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); |
|
683 | 683 | } |
684 | - } else { |
|
684 | + } else { |
|
685 | 685 | $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); |
686 | 686 | // implement call back function if it exists |
687 | 687 | $isSent = ($rt == 1) ? 1 : 0; |
688 | 688 | $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body); |
689 | - } |
|
689 | + } |
|
690 | 690 | } else { |
691 | - if ($this->SingleTo === true && count($toArr) > 1) { |
|
691 | + if ($this->SingleTo === true && count($toArr) > 1) { |
|
692 | 692 | foreach ($toArr as $key => $val) { |
693 | - $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); |
|
694 | - // implement call back function if it exists |
|
695 | - $isSent = ($rt == 1) ? 1 : 0; |
|
696 | - $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); |
|
693 | + $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); |
|
694 | + // implement call back function if it exists |
|
695 | + $isSent = ($rt == 1) ? 1 : 0; |
|
696 | + $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); |
|
697 | 697 | } |
698 | - } else { |
|
698 | + } else { |
|
699 | 699 | $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header); |
700 | 700 | // implement call back function if it exists |
701 | 701 | $isSent = ($rt == 1) ? 1 : 0; |
702 | 702 | $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body); |
703 | - } |
|
703 | + } |
|
704 | 704 | } |
705 | 705 | if (isset($old_from)) { |
706 | - ini_set('sendmail_from', $old_from); |
|
706 | + ini_set('sendmail_from', $old_from); |
|
707 | 707 | } |
708 | 708 | if(!$rt) { |
709 | - throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL); |
|
709 | + throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL); |
|
710 | 710 | } |
711 | 711 | return true; |
712 | - } |
|
713 | - |
|
714 | - /** |
|
715 | - * Sends mail via SMTP using PhpSMTP |
|
716 | - * Returns false if there is a bad MAIL FROM, RCPT, or DATA input. |
|
717 | - * @param string $header The message headers |
|
718 | - * @param string $body The message body |
|
719 | - * @uses SMTP |
|
720 | - * @access protected |
|
721 | - * @return bool |
|
722 | - */ |
|
723 | - protected function SmtpSend($header, $body) { |
|
712 | + } |
|
713 | + |
|
714 | + /** |
|
715 | + * Sends mail via SMTP using PhpSMTP |
|
716 | + * Returns false if there is a bad MAIL FROM, RCPT, or DATA input. |
|
717 | + * @param string $header The message headers |
|
718 | + * @param string $body The message body |
|
719 | + * @uses SMTP |
|
720 | + * @access protected |
|
721 | + * @return bool |
|
722 | + */ |
|
723 | + protected function SmtpSend($header, $body) { |
|
724 | 724 | require_once $this->PluginDir . 'class.smtp.php'; |
725 | 725 | $bad_rcpt = array(); |
726 | 726 | |
727 | 727 | if(!$this->SmtpConnect()) { |
728 | - throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL); |
|
728 | + throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL); |
|
729 | 729 | } |
730 | 730 | |
731 | 731 | if (!empty($this->Sender) and $this->validateAddress($this->Sender)) { |
@@ -734,71 +734,71 @@ discard block |
||
734 | 734 | $smtp_from = $this->From; |
735 | 735 | } |
736 | 736 | if(!$this->smtp->Mail($smtp_from)) { |
737 | - throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL); |
|
737 | + throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL); |
|
738 | 738 | } |
739 | 739 | |
740 | 740 | // Attempt to send attach all recipients |
741 | 741 | foreach($this->to as $to) { |
742 | - if (!$this->smtp->Recipient($to[0])) { |
|
742 | + if (!$this->smtp->Recipient($to[0])) { |
|
743 | 743 | $bad_rcpt[] = $to[0]; |
744 | 744 | // implement call back function if it exists |
745 | 745 | $isSent = 0; |
746 | 746 | $this->doCallback($isSent,$to[0],'','',$this->Subject,$body); |
747 | - } else { |
|
747 | + } else { |
|
748 | 748 | // implement call back function if it exists |
749 | 749 | $isSent = 1; |
750 | 750 | $this->doCallback($isSent,$to[0],'','',$this->Subject,$body); |
751 | - } |
|
751 | + } |
|
752 | 752 | } |
753 | 753 | foreach($this->cc as $cc) { |
754 | - if (!$this->smtp->Recipient($cc[0])) { |
|
754 | + if (!$this->smtp->Recipient($cc[0])) { |
|
755 | 755 | $bad_rcpt[] = $cc[0]; |
756 | 756 | // implement call back function if it exists |
757 | 757 | $isSent = 0; |
758 | 758 | $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body); |
759 | - } else { |
|
759 | + } else { |
|
760 | 760 | // implement call back function if it exists |
761 | 761 | $isSent = 1; |
762 | 762 | $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body); |
763 | - } |
|
763 | + } |
|
764 | 764 | } |
765 | 765 | foreach($this->bcc as $bcc) { |
766 | - if (!$this->smtp->Recipient($bcc[0])) { |
|
766 | + if (!$this->smtp->Recipient($bcc[0])) { |
|
767 | 767 | $bad_rcpt[] = $bcc[0]; |
768 | 768 | // implement call back function if it exists |
769 | 769 | $isSent = 0; |
770 | 770 | $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body); |
771 | - } else { |
|
771 | + } else { |
|
772 | 772 | // implement call back function if it exists |
773 | 773 | $isSent = 1; |
774 | 774 | $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body); |
775 | - } |
|
775 | + } |
|
776 | 776 | } |
777 | 777 | |
778 | 778 | |
779 | 779 | if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses |
780 | - $badaddresses = implode(', ', $bad_rcpt); |
|
781 | - throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses); |
|
780 | + $badaddresses = implode(', ', $bad_rcpt); |
|
781 | + throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses); |
|
782 | 782 | } |
783 | 783 | if(!$this->smtp->Data($header . $body)) { |
784 | - throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL); |
|
784 | + throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL); |
|
785 | 785 | } |
786 | 786 | if($this->SMTPKeepAlive == true) { |
787 | - $this->smtp->Reset(); |
|
787 | + $this->smtp->Reset(); |
|
788 | 788 | } |
789 | 789 | return true; |
790 | - } |
|
791 | - |
|
792 | - /** |
|
793 | - * Initiates a connection to an SMTP server. |
|
794 | - * Returns false if the operation failed. |
|
795 | - * @uses SMTP |
|
796 | - * @access public |
|
797 | - * @return bool |
|
798 | - */ |
|
799 | - public function SmtpConnect() { |
|
790 | + } |
|
791 | + |
|
792 | + /** |
|
793 | + * Initiates a connection to an SMTP server. |
|
794 | + * Returns false if the operation failed. |
|
795 | + * @uses SMTP |
|
796 | + * @access public |
|
797 | + * @return bool |
|
798 | + */ |
|
799 | + public function SmtpConnect() { |
|
800 | 800 | if(is_null($this->smtp)) { |
801 | - $this->smtp = new SMTP(); |
|
801 | + $this->smtp = new SMTP(); |
|
802 | 802 | } |
803 | 803 | |
804 | 804 | $this->smtp->do_debug = $this->SMTPDebug; |
@@ -808,14 +808,14 @@ discard block |
||
808 | 808 | |
809 | 809 | // Retry while there is no connection |
810 | 810 | try { |
811 | - while($index < count($hosts) && !$connection) { |
|
811 | + while($index < count($hosts) && !$connection) { |
|
812 | 812 | $hostinfo = array(); |
813 | 813 | if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) { |
814 | - $host = $hostinfo[1]; |
|
815 | - $port = $hostinfo[2]; |
|
814 | + $host = $hostinfo[1]; |
|
815 | + $port = $hostinfo[2]; |
|
816 | 816 | } else { |
817 | - $host = $hosts[$index]; |
|
818 | - $port = $this->Port; |
|
817 | + $host = $hosts[$index]; |
|
818 | + $port = $this->Port; |
|
819 | 819 | } |
820 | 820 | |
821 | 821 | $tls = ($this->SMTPSecure == 'tls'); |
@@ -823,140 +823,140 @@ discard block |
||
823 | 823 | |
824 | 824 | if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) { |
825 | 825 | |
826 | - $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname()); |
|
827 | - $this->smtp->Hello($hello); |
|
826 | + $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname()); |
|
827 | + $this->smtp->Hello($hello); |
|
828 | 828 | |
829 | - if ($tls) { |
|
829 | + if ($tls) { |
|
830 | 830 | if (!$this->smtp->StartTLS()) { |
831 | - throw new phpmailerException($this->Lang('tls')); |
|
831 | + throw new phpmailerException($this->Lang('tls')); |
|
832 | 832 | } |
833 | 833 | |
834 | 834 | //We must resend HELO after tls negotiation |
835 | 835 | $this->smtp->Hello($hello); |
836 | - } |
|
836 | + } |
|
837 | 837 | |
838 | - $connection = true; |
|
839 | - if ($this->SMTPAuth) { |
|
838 | + $connection = true; |
|
839 | + if ($this->SMTPAuth) { |
|
840 | 840 | if (!$this->smtp->Authenticate($this->Username, $this->Password)) { |
841 | - throw new phpmailerException($this->Lang('authenticate')); |
|
841 | + throw new phpmailerException($this->Lang('authenticate')); |
|
842 | + } |
|
842 | 843 | } |
843 | - } |
|
844 | 844 | } |
845 | 845 | $index++; |
846 | 846 | if (!$connection) { |
847 | - throw new phpmailerException($this->Lang('connect_host')); |
|
847 | + throw new phpmailerException($this->Lang('connect_host')); |
|
848 | + } |
|
848 | 849 | } |
849 | - } |
|
850 | 850 | } catch (phpmailerException $e) { |
851 | - $this->smtp->Reset(); |
|
852 | - throw $e; |
|
851 | + $this->smtp->Reset(); |
|
852 | + throw $e; |
|
853 | 853 | } |
854 | 854 | return true; |
855 | - } |
|
855 | + } |
|
856 | 856 | |
857 | - /** |
|
858 | - * Closes the active SMTP session if one exists. |
|
859 | - * @return void |
|
860 | - */ |
|
861 | - public function SmtpClose() { |
|
857 | + /** |
|
858 | + * Closes the active SMTP session if one exists. |
|
859 | + * @return void |
|
860 | + */ |
|
861 | + public function SmtpClose() { |
|
862 | 862 | if(!is_null($this->smtp)) { |
863 | - if($this->smtp->Connected()) { |
|
863 | + if($this->smtp->Connected()) { |
|
864 | 864 | $this->smtp->Quit(); |
865 | 865 | $this->smtp->Close(); |
866 | - } |
|
867 | - } |
|
868 | - } |
|
869 | - |
|
870 | - /** |
|
871 | - * Sets the language for all class error messages. |
|
872 | - * Returns false if it cannot load the language file. The default language is English. |
|
873 | - * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br") |
|
874 | - * @param string $lang_path Path to the language file directory |
|
875 | - * @access public |
|
876 | - */ |
|
877 | - function SetLanguage($langcode = 'en', $lang_path = 'language/') { |
|
866 | + } |
|
867 | + } |
|
868 | + } |
|
869 | + |
|
870 | + /** |
|
871 | + * Sets the language for all class error messages. |
|
872 | + * Returns false if it cannot load the language file. The default language is English. |
|
873 | + * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br") |
|
874 | + * @param string $lang_path Path to the language file directory |
|
875 | + * @access public |
|
876 | + */ |
|
877 | + function SetLanguage($langcode = 'en', $lang_path = 'language/') { |
|
878 | 878 | //Define full set of translatable strings |
879 | 879 | $PHPMAILER_LANG = array( |
880 | - 'provide_address' => 'You must provide at least one recipient email address.', |
|
881 | - 'mailer_not_supported' => ' mailer is not supported.', |
|
882 | - 'execute' => 'Could not execute: ', |
|
883 | - 'instantiate' => 'Could not instantiate mail function.', |
|
884 | - 'authenticate' => 'SMTP Error: Could not authenticate.', |
|
885 | - 'from_failed' => 'The following From address failed: ', |
|
886 | - 'recipients_failed' => 'SMTP Error: The following recipients failed: ', |
|
887 | - 'data_not_accepted' => 'SMTP Error: Data not accepted.', |
|
888 | - 'connect_host' => 'SMTP Error: Could not connect to SMTP host.', |
|
889 | - 'file_access' => 'Could not access file: ', |
|
890 | - 'file_open' => 'File Error: Could not open file: ', |
|
891 | - 'encoding' => 'Unknown encoding: ', |
|
892 | - 'signing' => 'Signing Error: ', |
|
893 | - 'smtp_error' => 'SMTP server error: ', |
|
894 | - 'empty_message' => 'Message body empty', |
|
895 | - 'invalid_address' => 'Invalid address', |
|
896 | - 'variable_set' => 'Cannot set or reset variable: ' |
|
880 | + 'provide_address' => 'You must provide at least one recipient email address.', |
|
881 | + 'mailer_not_supported' => ' mailer is not supported.', |
|
882 | + 'execute' => 'Could not execute: ', |
|
883 | + 'instantiate' => 'Could not instantiate mail function.', |
|
884 | + 'authenticate' => 'SMTP Error: Could not authenticate.', |
|
885 | + 'from_failed' => 'The following From address failed: ', |
|
886 | + 'recipients_failed' => 'SMTP Error: The following recipients failed: ', |
|
887 | + 'data_not_accepted' => 'SMTP Error: Data not accepted.', |
|
888 | + 'connect_host' => 'SMTP Error: Could not connect to SMTP host.', |
|
889 | + 'file_access' => 'Could not access file: ', |
|
890 | + 'file_open' => 'File Error: Could not open file: ', |
|
891 | + 'encoding' => 'Unknown encoding: ', |
|
892 | + 'signing' => 'Signing Error: ', |
|
893 | + 'smtp_error' => 'SMTP server error: ', |
|
894 | + 'empty_message' => 'Message body empty', |
|
895 | + 'invalid_address' => 'Invalid address', |
|
896 | + 'variable_set' => 'Cannot set or reset variable: ' |
|
897 | 897 | ); |
898 | 898 | //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"! |
899 | 899 | $l = true; |
900 | 900 | if ($langcode != 'en') { //There is no English translation file |
901 | - $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php'; |
|
901 | + $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php'; |
|
902 | 902 | } |
903 | 903 | $this->language = $PHPMAILER_LANG; |
904 | 904 | return ($l == true); //Returns false if language not found |
905 | - } |
|
905 | + } |
|
906 | 906 | |
907 | - /** |
|
908 | - * Return the current array of language strings |
|
909 | - * @return array |
|
910 | - */ |
|
911 | - public function GetTranslations() { |
|
907 | + /** |
|
908 | + * Return the current array of language strings |
|
909 | + * @return array |
|
910 | + */ |
|
911 | + public function GetTranslations() { |
|
912 | 912 | return $this->language; |
913 | - } |
|
914 | - |
|
915 | - ///////////////////////////////////////////////// |
|
916 | - // METHODS, MESSAGE CREATION |
|
917 | - ///////////////////////////////////////////////// |
|
918 | - |
|
919 | - /** |
|
920 | - * Creates recipient headers. |
|
921 | - * @access public |
|
922 | - * @return string |
|
923 | - */ |
|
924 | - public function AddrAppend($type, $addr) { |
|
913 | + } |
|
914 | + |
|
915 | + ///////////////////////////////////////////////// |
|
916 | + // METHODS, MESSAGE CREATION |
|
917 | + ///////////////////////////////////////////////// |
|
918 | + |
|
919 | + /** |
|
920 | + * Creates recipient headers. |
|
921 | + * @access public |
|
922 | + * @return string |
|
923 | + */ |
|
924 | + public function AddrAppend($type, $addr) { |
|
925 | 925 | $addr_str = $type . ': '; |
926 | 926 | $addresses = array(); |
927 | 927 | foreach ($addr as $a) { |
928 | - $addresses[] = $this->AddrFormat($a); |
|
928 | + $addresses[] = $this->AddrFormat($a); |
|
929 | 929 | } |
930 | 930 | $addr_str .= implode(', ', $addresses); |
931 | 931 | $addr_str .= $this->LE; |
932 | 932 | |
933 | 933 | return $addr_str; |
934 | - } |
|
935 | - |
|
936 | - /** |
|
937 | - * Formats an address correctly. |
|
938 | - * @access public |
|
939 | - * @return string |
|
940 | - */ |
|
941 | - public function AddrFormat($addr) { |
|
934 | + } |
|
935 | + |
|
936 | + /** |
|
937 | + * Formats an address correctly. |
|
938 | + * @access public |
|
939 | + * @return string |
|
940 | + */ |
|
941 | + public function AddrFormat($addr) { |
|
942 | 942 | if (empty($addr[1])) { |
943 | - return $this->SecureHeader($addr[0]); |
|
943 | + return $this->SecureHeader($addr[0]); |
|
944 | 944 | } else { |
945 | - return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">"; |
|
946 | - } |
|
947 | - } |
|
948 | - |
|
949 | - /** |
|
950 | - * Wraps message for use with mailers that do not |
|
951 | - * automatically perform wrapping and for quoted-printable. |
|
952 | - * Original written by philippe. |
|
953 | - * @param string $message The message to wrap |
|
954 | - * @param integer $length The line length to wrap to |
|
955 | - * @param boolean $qp_mode Whether to run in Quoted-Printable mode |
|
956 | - * @access public |
|
957 | - * @return string |
|
958 | - */ |
|
959 | - public function WrapText($message, $length, $qp_mode = false) { |
|
945 | + return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">"; |
|
946 | + } |
|
947 | + } |
|
948 | + |
|
949 | + /** |
|
950 | + * Wraps message for use with mailers that do not |
|
951 | + * automatically perform wrapping and for quoted-printable. |
|
952 | + * Original written by philippe. |
|
953 | + * @param string $message The message to wrap |
|
954 | + * @param integer $length The line length to wrap to |
|
955 | + * @param boolean $qp_mode Whether to run in Quoted-Printable mode |
|
956 | + * @access public |
|
957 | + * @return string |
|
958 | + */ |
|
959 | + public function WrapText($message, $length, $qp_mode = false) { |
|
960 | 960 | $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE; |
961 | 961 | // If utf-8 encoding is used, we will need to make sure we don't |
962 | 962 | // split multibyte characters when we wrap |
@@ -964,140 +964,140 @@ discard block |
||
964 | 964 | |
965 | 965 | $message = $this->FixEOL($message); |
966 | 966 | if (substr($message, -1) == $this->LE) { |
967 | - $message = substr($message, 0, -1); |
|
967 | + $message = substr($message, 0, -1); |
|
968 | 968 | } |
969 | 969 | |
970 | 970 | $line = explode($this->LE, $message); |
971 | 971 | $message = ''; |
972 | 972 | for ($i=0 ;$i < count($line); $i++) { |
973 | - $line_part = explode(' ', $line[$i]); |
|
974 | - $buf = ''; |
|
975 | - for ($e = 0; $e<count($line_part); $e++) { |
|
973 | + $line_part = explode(' ', $line[$i]); |
|
974 | + $buf = ''; |
|
975 | + for ($e = 0; $e<count($line_part); $e++) { |
|
976 | 976 | $word = $line_part[$e]; |
977 | 977 | if ($qp_mode and (strlen($word) > $length)) { |
978 | - $space_left = $length - strlen($buf) - 1; |
|
979 | - if ($e != 0) { |
|
978 | + $space_left = $length - strlen($buf) - 1; |
|
979 | + if ($e != 0) { |
|
980 | 980 | if ($space_left > 20) { |
981 | - $len = $space_left; |
|
982 | - if ($is_utf8) { |
|
981 | + $len = $space_left; |
|
982 | + if ($is_utf8) { |
|
983 | 983 | $len = $this->UTF8CharBoundary($word, $len); |
984 | - } elseif (substr($word, $len - 1, 1) == "=") { |
|
984 | + } elseif (substr($word, $len - 1, 1) == "=") { |
|
985 | 985 | $len--; |
986 | - } elseif (substr($word, $len - 2, 1) == "=") { |
|
986 | + } elseif (substr($word, $len - 2, 1) == "=") { |
|
987 | 987 | $len -= 2; |
988 | - } |
|
989 | - $part = substr($word, 0, $len); |
|
990 | - $word = substr($word, $len); |
|
991 | - $buf .= ' ' . $part; |
|
992 | - $message .= $buf . sprintf("=%s", $this->LE); |
|
988 | + } |
|
989 | + $part = substr($word, 0, $len); |
|
990 | + $word = substr($word, $len); |
|
991 | + $buf .= ' ' . $part; |
|
992 | + $message .= $buf . sprintf("=%s", $this->LE); |
|
993 | 993 | } else { |
994 | - $message .= $buf . $soft_break; |
|
994 | + $message .= $buf . $soft_break; |
|
995 | 995 | } |
996 | 996 | $buf = ''; |
997 | - } |
|
998 | - while (strlen($word) > 0) { |
|
997 | + } |
|
998 | + while (strlen($word) > 0) { |
|
999 | 999 | $len = $length; |
1000 | 1000 | if ($is_utf8) { |
1001 | - $len = $this->UTF8CharBoundary($word, $len); |
|
1001 | + $len = $this->UTF8CharBoundary($word, $len); |
|
1002 | 1002 | } elseif (substr($word, $len - 1, 1) == "=") { |
1003 | - $len--; |
|
1003 | + $len--; |
|
1004 | 1004 | } elseif (substr($word, $len - 2, 1) == "=") { |
1005 | - $len -= 2; |
|
1005 | + $len -= 2; |
|
1006 | 1006 | } |
1007 | 1007 | $part = substr($word, 0, $len); |
1008 | 1008 | $word = substr($word, $len); |
1009 | 1009 | |
1010 | 1010 | if (strlen($word) > 0) { |
1011 | - $message .= $part . sprintf("=%s", $this->LE); |
|
1011 | + $message .= $part . sprintf("=%s", $this->LE); |
|
1012 | 1012 | } else { |
1013 | - $buf = $part; |
|
1013 | + $buf = $part; |
|
1014 | + } |
|
1014 | 1015 | } |
1015 | - } |
|
1016 | 1016 | } else { |
1017 | - $buf_o = $buf; |
|
1018 | - $buf .= ($e == 0) ? $word : (' ' . $word); |
|
1017 | + $buf_o = $buf; |
|
1018 | + $buf .= ($e == 0) ? $word : (' ' . $word); |
|
1019 | 1019 | |
1020 | - if (strlen($buf) > $length and $buf_o != '') { |
|
1020 | + if (strlen($buf) > $length and $buf_o != '') { |
|
1021 | 1021 | $message .= $buf_o . $soft_break; |
1022 | 1022 | $buf = $word; |
1023 | - } |
|
1023 | + } |
|
1024 | 1024 | } |
1025 | - } |
|
1026 | - $message .= $buf . $this->LE; |
|
1025 | + } |
|
1026 | + $message .= $buf . $this->LE; |
|
1027 | 1027 | } |
1028 | 1028 | |
1029 | 1029 | return $message; |
1030 | - } |
|
1031 | - |
|
1032 | - /** |
|
1033 | - * Finds last character boundary prior to maxLength in a utf-8 |
|
1034 | - * quoted (printable) encoded string. |
|
1035 | - * Original written by Colin Brown. |
|
1036 | - * @access public |
|
1037 | - * @param string $encodedText utf-8 QP text |
|
1038 | - * @param int $maxLength find last character boundary prior to this length |
|
1039 | - * @return int |
|
1040 | - */ |
|
1041 | - public function UTF8CharBoundary($encodedText, $maxLength) { |
|
1030 | + } |
|
1031 | + |
|
1032 | + /** |
|
1033 | + * Finds last character boundary prior to maxLength in a utf-8 |
|
1034 | + * quoted (printable) encoded string. |
|
1035 | + * Original written by Colin Brown. |
|
1036 | + * @access public |
|
1037 | + * @param string $encodedText utf-8 QP text |
|
1038 | + * @param int $maxLength find last character boundary prior to this length |
|
1039 | + * @return int |
|
1040 | + */ |
|
1041 | + public function UTF8CharBoundary($encodedText, $maxLength) { |
|
1042 | 1042 | $foundSplitPos = false; |
1043 | 1043 | $lookBack = 3; |
1044 | 1044 | while (!$foundSplitPos) { |
1045 | - $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack); |
|
1046 | - $encodedCharPos = strpos($lastChunk, "="); |
|
1047 | - if ($encodedCharPos !== false) { |
|
1045 | + $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack); |
|
1046 | + $encodedCharPos = strpos($lastChunk, "="); |
|
1047 | + if ($encodedCharPos !== false) { |
|
1048 | 1048 | // Found start of encoded character byte within $lookBack block. |
1049 | 1049 | // Check the encoded byte value (the 2 chars after the '=') |
1050 | 1050 | $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2); |
1051 | 1051 | $dec = hexdec($hex); |
1052 | 1052 | if ($dec < 128) { // Single byte character. |
1053 | - // If the encoded char was found at pos 0, it will fit |
|
1054 | - // otherwise reduce maxLength to start of the encoded char |
|
1055 | - $maxLength = ($encodedCharPos == 0) ? $maxLength : |
|
1053 | + // If the encoded char was found at pos 0, it will fit |
|
1054 | + // otherwise reduce maxLength to start of the encoded char |
|
1055 | + $maxLength = ($encodedCharPos == 0) ? $maxLength : |
|
1056 | 1056 | $maxLength - ($lookBack - $encodedCharPos); |
1057 | - $foundSplitPos = true; |
|
1057 | + $foundSplitPos = true; |
|
1058 | 1058 | } elseif ($dec >= 192) { // First byte of a multi byte character |
1059 | - // Reduce maxLength to split at start of character |
|
1060 | - $maxLength = $maxLength - ($lookBack - $encodedCharPos); |
|
1061 | - $foundSplitPos = true; |
|
1059 | + // Reduce maxLength to split at start of character |
|
1060 | + $maxLength = $maxLength - ($lookBack - $encodedCharPos); |
|
1061 | + $foundSplitPos = true; |
|
1062 | 1062 | } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back |
1063 | - $lookBack += 3; |
|
1063 | + $lookBack += 3; |
|
1064 | 1064 | } |
1065 | - } else { |
|
1065 | + } else { |
|
1066 | 1066 | // No encoded character found |
1067 | 1067 | $foundSplitPos = true; |
1068 | - } |
|
1068 | + } |
|
1069 | 1069 | } |
1070 | 1070 | return $maxLength; |
1071 | - } |
|
1071 | + } |
|
1072 | 1072 | |
1073 | 1073 | |
1074 | - /** |
|
1075 | - * Set the body wrapping. |
|
1076 | - * @access public |
|
1077 | - * @return void |
|
1078 | - */ |
|
1079 | - public function SetWordWrap() { |
|
1074 | + /** |
|
1075 | + * Set the body wrapping. |
|
1076 | + * @access public |
|
1077 | + * @return void |
|
1078 | + */ |
|
1079 | + public function SetWordWrap() { |
|
1080 | 1080 | if($this->WordWrap < 1) { |
1081 | - return; |
|
1081 | + return; |
|
1082 | 1082 | } |
1083 | 1083 | |
1084 | 1084 | switch($this->message_type) { |
1085 | - case 'alt': |
|
1085 | + case 'alt': |
|
1086 | 1086 | case 'alt_attachments': |
1087 | 1087 | $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap); |
1088 | 1088 | break; |
1089 | - default: |
|
1089 | + default: |
|
1090 | 1090 | $this->Body = $this->WrapText($this->Body, $this->WordWrap); |
1091 | 1091 | break; |
1092 | 1092 | } |
1093 | - } |
|
1093 | + } |
|
1094 | 1094 | |
1095 | - /** |
|
1096 | - * Assembles message header. |
|
1097 | - * @access public |
|
1098 | - * @return string The assembled header |
|
1099 | - */ |
|
1100 | - public function CreateHeader() { |
|
1095 | + /** |
|
1096 | + * Assembles message header. |
|
1097 | + * @access public |
|
1098 | + * @return string The assembled header |
|
1099 | + */ |
|
1100 | + public function CreateHeader() { |
|
1101 | 1101 | $result = ''; |
1102 | 1102 | |
1103 | 1103 | // Set the boundaries |
@@ -1107,24 +1107,24 @@ discard block |
||
1107 | 1107 | |
1108 | 1108 | $result .= $this->HeaderLine('Date', self::RFCDate()); |
1109 | 1109 | if($this->Sender == '') { |
1110 | - $result .= $this->HeaderLine('Return-Path', trim($this->From)); |
|
1110 | + $result .= $this->HeaderLine('Return-Path', trim($this->From)); |
|
1111 | 1111 | } else { |
1112 | - $result .= $this->HeaderLine('Return-Path', trim($this->Sender)); |
|
1112 | + $result .= $this->HeaderLine('Return-Path', trim($this->Sender)); |
|
1113 | 1113 | } |
1114 | 1114 | |
1115 | 1115 | // To be created automatically by mail() |
1116 | 1116 | if($this->Mailer != 'mail') { |
1117 | - if ($this->SingleTo === true) { |
|
1117 | + if ($this->SingleTo === true) { |
|
1118 | 1118 | foreach($this->to as $t) { |
1119 | - $this->SingleToArray[] = $this->AddrFormat($t); |
|
1119 | + $this->SingleToArray[] = $this->AddrFormat($t); |
|
1120 | 1120 | } |
1121 | - } else { |
|
1121 | + } else { |
|
1122 | 1122 | if(count($this->to) > 0) { |
1123 | - $result .= $this->AddrAppend('To', $this->to); |
|
1123 | + $result .= $this->AddrAppend('To', $this->to); |
|
1124 | 1124 | } elseif (count($this->cc) == 0) { |
1125 | - $result .= $this->HeaderLine('To', 'undisclosed-recipients:;'); |
|
1125 | + $result .= $this->HeaderLine('To', 'undisclosed-recipients:;'); |
|
1126 | + } |
|
1126 | 1127 | } |
1127 | - } |
|
1128 | 1128 | } |
1129 | 1129 | |
1130 | 1130 | $from = array(); |
@@ -1134,97 +1134,97 @@ discard block |
||
1134 | 1134 | |
1135 | 1135 | // sendmail and mail() extract Cc from the header before sending |
1136 | 1136 | if(count($this->cc) > 0) { |
1137 | - $result .= $this->AddrAppend('Cc', $this->cc); |
|
1137 | + $result .= $this->AddrAppend('Cc', $this->cc); |
|
1138 | 1138 | } |
1139 | 1139 | |
1140 | 1140 | // sendmail and mail() extract Bcc from the header before sending |
1141 | 1141 | if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) { |
1142 | - $result .= $this->AddrAppend('Bcc', $this->bcc); |
|
1142 | + $result .= $this->AddrAppend('Bcc', $this->bcc); |
|
1143 | 1143 | } |
1144 | 1144 | |
1145 | 1145 | if(count($this->ReplyTo) > 0) { |
1146 | - $result .= $this->AddrAppend('Reply-to', $this->ReplyTo); |
|
1146 | + $result .= $this->AddrAppend('Reply-to', $this->ReplyTo); |
|
1147 | 1147 | } |
1148 | 1148 | |
1149 | 1149 | // mail() sets the subject itself |
1150 | 1150 | if($this->Mailer != 'mail') { |
1151 | - $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject))); |
|
1151 | + $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject))); |
|
1152 | 1152 | } |
1153 | 1153 | |
1154 | 1154 | if($this->MessageID != '') { |
1155 | - $result .= $this->HeaderLine('Message-ID',$this->MessageID); |
|
1155 | + $result .= $this->HeaderLine('Message-ID',$this->MessageID); |
|
1156 | 1156 | } else { |
1157 | - $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE); |
|
1157 | + $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE); |
|
1158 | 1158 | } |
1159 | 1159 | $result .= $this->HeaderLine('X-Priority', $this->Priority); |
1160 | 1160 | $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)'); |
1161 | 1161 | |
1162 | 1162 | if($this->ConfirmReadingTo != '') { |
1163 | - $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>'); |
|
1163 | + $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>'); |
|
1164 | 1164 | } |
1165 | 1165 | |
1166 | 1166 | // Add custom headers |
1167 | 1167 | for($index = 0; $index < count($this->CustomHeader); $index++) { |
1168 | - $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1]))); |
|
1168 | + $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1]))); |
|
1169 | 1169 | } |
1170 | 1170 | if (!$this->sign_key_file) { |
1171 | - $result .= $this->HeaderLine('MIME-Version', '1.0'); |
|
1172 | - $result .= $this->GetMailMIME(); |
|
1171 | + $result .= $this->HeaderLine('MIME-Version', '1.0'); |
|
1172 | + $result .= $this->GetMailMIME(); |
|
1173 | 1173 | } |
1174 | 1174 | |
1175 | 1175 | return $result; |
1176 | - } |
|
1177 | - |
|
1178 | - /** |
|
1179 | - * Returns the message MIME. |
|
1180 | - * @access public |
|
1181 | - * @return string |
|
1182 | - */ |
|
1183 | - public function GetMailMIME() { |
|
1176 | + } |
|
1177 | + |
|
1178 | + /** |
|
1179 | + * Returns the message MIME. |
|
1180 | + * @access public |
|
1181 | + * @return string |
|
1182 | + */ |
|
1183 | + public function GetMailMIME() { |
|
1184 | 1184 | $result = ''; |
1185 | 1185 | switch($this->message_type) { |
1186 | - case 'plain': |
|
1186 | + case 'plain': |
|
1187 | 1187 | $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding); |
1188 | 1188 | $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet); |
1189 | 1189 | break; |
1190 | - case 'attachments': |
|
1190 | + case 'attachments': |
|
1191 | 1191 | case 'alt_attachments': |
1192 | 1192 | if($this->InlineImageExists()){ |
1193 | - $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE); |
|
1193 | + $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE); |
|
1194 | 1194 | } else { |
1195 | - $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;'); |
|
1196 | - $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); |
|
1195 | + $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;'); |
|
1196 | + $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); |
|
1197 | 1197 | } |
1198 | 1198 | break; |
1199 | - case 'alt': |
|
1199 | + case 'alt': |
|
1200 | 1200 | $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;'); |
1201 | 1201 | $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); |
1202 | 1202 | break; |
1203 | 1203 | } |
1204 | 1204 | |
1205 | 1205 | if($this->Mailer != 'mail') { |
1206 | - $result .= $this->LE.$this->LE; |
|
1206 | + $result .= $this->LE.$this->LE; |
|
1207 | 1207 | } |
1208 | 1208 | |
1209 | 1209 | return $result; |
1210 | - } |
|
1211 | - |
|
1212 | - /** |
|
1213 | - * Assembles the message body. Returns an empty string on failure. |
|
1214 | - * @access public |
|
1215 | - * @return string The assembled message body |
|
1216 | - */ |
|
1217 | - public function CreateBody() { |
|
1210 | + } |
|
1211 | + |
|
1212 | + /** |
|
1213 | + * Assembles the message body. Returns an empty string on failure. |
|
1214 | + * @access public |
|
1215 | + * @return string The assembled message body |
|
1216 | + */ |
|
1217 | + public function CreateBody() { |
|
1218 | 1218 | $body = ''; |
1219 | 1219 | |
1220 | 1220 | if ($this->sign_key_file) { |
1221 | - $body .= $this->GetMailMIME(); |
|
1221 | + $body .= $this->GetMailMIME(); |
|
1222 | 1222 | } |
1223 | 1223 | |
1224 | 1224 | $this->SetWordWrap(); |
1225 | 1225 | |
1226 | 1226 | switch($this->message_type) { |
1227 | - case 'alt': |
|
1227 | + case 'alt': |
|
1228 | 1228 | $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', ''); |
1229 | 1229 | $body .= $this->EncodeString($this->AltBody, $this->Encoding); |
1230 | 1230 | $body .= $this->LE.$this->LE; |
@@ -1233,16 +1233,16 @@ discard block |
||
1233 | 1233 | $body .= $this->LE.$this->LE; |
1234 | 1234 | $body .= $this->EndBoundary($this->boundary[1]); |
1235 | 1235 | break; |
1236 | - case 'plain': |
|
1236 | + case 'plain': |
|
1237 | 1237 | $body .= $this->EncodeString($this->Body, $this->Encoding); |
1238 | 1238 | break; |
1239 | - case 'attachments': |
|
1239 | + case 'attachments': |
|
1240 | 1240 | $body .= $this->GetBoundary($this->boundary[1], '', '', ''); |
1241 | 1241 | $body .= $this->EncodeString($this->Body, $this->Encoding); |
1242 | 1242 | $body .= $this->LE; |
1243 | 1243 | $body .= $this->AttachAll(); |
1244 | 1244 | break; |
1245 | - case 'alt_attachments': |
|
1245 | + case 'alt_attachments': |
|
1246 | 1246 | $body .= sprintf("--%s%s", $this->boundary[1], $this->LE); |
1247 | 1247 | $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE); |
1248 | 1248 | $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body |
@@ -1257,46 +1257,46 @@ discard block |
||
1257 | 1257 | } |
1258 | 1258 | |
1259 | 1259 | if ($this->IsError()) { |
1260 | - $body = ''; |
|
1260 | + $body = ''; |
|
1261 | 1261 | } elseif ($this->sign_key_file) { |
1262 | - try { |
|
1262 | + try { |
|
1263 | 1263 | $file = tempnam('', 'mail'); |
1264 | 1264 | file_put_contents($file, $body); //TODO check this worked |
1265 | 1265 | $signed = tempnam("", "signed"); |
1266 | 1266 | if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) { |
1267 | - @unlink($file); |
|
1268 | - @unlink($signed); |
|
1269 | - $body = file_get_contents($signed); |
|
1267 | + @unlink($file); |
|
1268 | + @unlink($signed); |
|
1269 | + $body = file_get_contents($signed); |
|
1270 | 1270 | } else { |
1271 | - @unlink($file); |
|
1272 | - @unlink($signed); |
|
1273 | - throw new phpmailerException($this->Lang("signing").openssl_error_string()); |
|
1271 | + @unlink($file); |
|
1272 | + @unlink($signed); |
|
1273 | + throw new phpmailerException($this->Lang("signing").openssl_error_string()); |
|
1274 | 1274 | } |
1275 | - } catch (phpmailerException $e) { |
|
1275 | + } catch (phpmailerException $e) { |
|
1276 | 1276 | $body = ''; |
1277 | 1277 | if ($this->exceptions) { |
1278 | - throw $e; |
|
1278 | + throw $e; |
|
1279 | + } |
|
1279 | 1280 | } |
1280 | - } |
|
1281 | 1281 | } |
1282 | 1282 | |
1283 | 1283 | return $body; |
1284 | - } |
|
1284 | + } |
|
1285 | 1285 | |
1286 | - /** |
|
1287 | - * Returns the start of a message boundary. |
|
1288 | - * @access private |
|
1289 | - */ |
|
1290 | - private function GetBoundary($boundary, $charSet, $contentType, $encoding) { |
|
1286 | + /** |
|
1287 | + * Returns the start of a message boundary. |
|
1288 | + * @access private |
|
1289 | + */ |
|
1290 | + private function GetBoundary($boundary, $charSet, $contentType, $encoding) { |
|
1291 | 1291 | $result = ''; |
1292 | 1292 | if($charSet == '') { |
1293 | - $charSet = $this->CharSet; |
|
1293 | + $charSet = $this->CharSet; |
|
1294 | 1294 | } |
1295 | 1295 | if($contentType == '') { |
1296 | - $contentType = $this->ContentType; |
|
1296 | + $contentType = $this->ContentType; |
|
1297 | 1297 | } |
1298 | 1298 | if($encoding == '') { |
1299 | - $encoding = $this->Encoding; |
|
1299 | + $encoding = $this->Encoding; |
|
1300 | 1300 | } |
1301 | 1301 | $result .= $this->TextLine('--' . $boundary); |
1302 | 1302 | $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet); |
@@ -1305,80 +1305,80 @@ discard block |
||
1305 | 1305 | $result .= $this->LE; |
1306 | 1306 | |
1307 | 1307 | return $result; |
1308 | - } |
|
1308 | + } |
|
1309 | 1309 | |
1310 | - /** |
|
1311 | - * Returns the end of a message boundary. |
|
1312 | - * @access private |
|
1313 | - */ |
|
1314 | - private function EndBoundary($boundary) { |
|
1310 | + /** |
|
1311 | + * Returns the end of a message boundary. |
|
1312 | + * @access private |
|
1313 | + */ |
|
1314 | + private function EndBoundary($boundary) { |
|
1315 | 1315 | return $this->LE . '--' . $boundary . '--' . $this->LE; |
1316 | - } |
|
1317 | - |
|
1318 | - /** |
|
1319 | - * Sets the message type. |
|
1320 | - * @access private |
|
1321 | - * @return void |
|
1322 | - */ |
|
1323 | - private function SetMessageType() { |
|
1316 | + } |
|
1317 | + |
|
1318 | + /** |
|
1319 | + * Sets the message type. |
|
1320 | + * @access private |
|
1321 | + * @return void |
|
1322 | + */ |
|
1323 | + private function SetMessageType() { |
|
1324 | 1324 | if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) { |
1325 | - $this->message_type = 'plain'; |
|
1325 | + $this->message_type = 'plain'; |
|
1326 | 1326 | } else { |
1327 | - if(count($this->attachment) > 0) { |
|
1327 | + if(count($this->attachment) > 0) { |
|
1328 | 1328 | $this->message_type = 'attachments'; |
1329 | - } |
|
1330 | - if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) { |
|
1329 | + } |
|
1330 | + if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) { |
|
1331 | 1331 | $this->message_type = 'alt'; |
1332 | - } |
|
1333 | - if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) { |
|
1332 | + } |
|
1333 | + if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) { |
|
1334 | 1334 | $this->message_type = 'alt_attachments'; |
1335 | - } |
|
1335 | + } |
|
1336 | + } |
|
1336 | 1337 | } |
1337 | - } |
|
1338 | 1338 | |
1339 | - /** |
|
1340 | - * Returns a formatted header line. |
|
1341 | - * @access public |
|
1342 | - * @return string |
|
1343 | - */ |
|
1344 | - public function HeaderLine($name, $value) { |
|
1339 | + /** |
|
1340 | + * Returns a formatted header line. |
|
1341 | + * @access public |
|
1342 | + * @return string |
|
1343 | + */ |
|
1344 | + public function HeaderLine($name, $value) { |
|
1345 | 1345 | return $name . ': ' . $value . $this->LE; |
1346 | - } |
|
1347 | - |
|
1348 | - /** |
|
1349 | - * Returns a formatted mail line. |
|
1350 | - * @access public |
|
1351 | - * @return string |
|
1352 | - */ |
|
1353 | - public function TextLine($value) { |
|
1346 | + } |
|
1347 | + |
|
1348 | + /** |
|
1349 | + * Returns a formatted mail line. |
|
1350 | + * @access public |
|
1351 | + * @return string |
|
1352 | + */ |
|
1353 | + public function TextLine($value) { |
|
1354 | 1354 | return $value . $this->LE; |
1355 | - } |
|
1356 | - |
|
1357 | - ///////////////////////////////////////////////// |
|
1358 | - // CLASS METHODS, ATTACHMENTS |
|
1359 | - ///////////////////////////////////////////////// |
|
1360 | - |
|
1361 | - /** |
|
1362 | - * Adds an attachment from a path on the filesystem. |
|
1363 | - * Returns false if the file could not be found |
|
1364 | - * or accessed. |
|
1365 | - * @param string $path Path to the attachment. |
|
1366 | - * @param string $name Overrides the attachment name. |
|
1367 | - * @param string $encoding File encoding (see $Encoding). |
|
1368 | - * @param string $type File extension (MIME) type. |
|
1369 | - * @return bool |
|
1370 | - */ |
|
1371 | - public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { |
|
1355 | + } |
|
1356 | + |
|
1357 | + ///////////////////////////////////////////////// |
|
1358 | + // CLASS METHODS, ATTACHMENTS |
|
1359 | + ///////////////////////////////////////////////// |
|
1360 | + |
|
1361 | + /** |
|
1362 | + * Adds an attachment from a path on the filesystem. |
|
1363 | + * Returns false if the file could not be found |
|
1364 | + * or accessed. |
|
1365 | + * @param string $path Path to the attachment. |
|
1366 | + * @param string $name Overrides the attachment name. |
|
1367 | + * @param string $encoding File encoding (see $Encoding). |
|
1368 | + * @param string $type File extension (MIME) type. |
|
1369 | + * @return bool |
|
1370 | + */ |
|
1371 | + public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { |
|
1372 | 1372 | try { |
1373 | - if ( !@is_file($path) ) { |
|
1373 | + if ( !@is_file($path) ) { |
|
1374 | 1374 | throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE); |
1375 | - } |
|
1376 | - $filename = basename($path); |
|
1377 | - if ( $name == '' ) { |
|
1375 | + } |
|
1376 | + $filename = basename($path); |
|
1377 | + if ( $name == '' ) { |
|
1378 | 1378 | $name = $filename; |
1379 | - } |
|
1379 | + } |
|
1380 | 1380 | |
1381 | - $this->attachment[] = array( |
|
1381 | + $this->attachment[] = array( |
|
1382 | 1382 | 0 => $path, |
1383 | 1383 | 1 => $filename, |
1384 | 1384 | 2 => $name, |
@@ -1387,36 +1387,36 @@ discard block |
||
1387 | 1387 | 5 => false, // isStringAttachment |
1388 | 1388 | 6 => 'attachment', |
1389 | 1389 | 7 => 0 |
1390 | - ); |
|
1390 | + ); |
|
1391 | 1391 | |
1392 | 1392 | } catch (phpmailerException $e) { |
1393 | - $this->SetError($e->getMessage()); |
|
1394 | - if ($this->exceptions) { |
|
1393 | + $this->SetError($e->getMessage()); |
|
1394 | + if ($this->exceptions) { |
|
1395 | 1395 | throw $e; |
1396 | - } |
|
1397 | - error_log($e->getMessage()."\n"); |
|
1398 | - if ( $e->getCode() == self::STOP_CRITICAL ) { |
|
1396 | + } |
|
1397 | + error_log($e->getMessage()."\n"); |
|
1398 | + if ( $e->getCode() == self::STOP_CRITICAL ) { |
|
1399 | 1399 | return false; |
1400 | - } |
|
1400 | + } |
|
1401 | 1401 | } |
1402 | 1402 | return true; |
1403 | - } |
|
1403 | + } |
|
1404 | 1404 | |
1405 | - /** |
|
1406 | - * Return the current array of attachments |
|
1407 | - * @return array |
|
1408 | - */ |
|
1409 | - public function GetAttachments() { |
|
1405 | + /** |
|
1406 | + * Return the current array of attachments |
|
1407 | + * @return array |
|
1408 | + */ |
|
1409 | + public function GetAttachments() { |
|
1410 | 1410 | return $this->attachment; |
1411 | - } |
|
1412 | - |
|
1413 | - /** |
|
1414 | - * Attaches all fs, string, and binary attachments to the message. |
|
1415 | - * Returns an empty string on failure. |
|
1416 | - * @access private |
|
1417 | - * @return string |
|
1418 | - */ |
|
1419 | - private function AttachAll() { |
|
1411 | + } |
|
1412 | + |
|
1413 | + /** |
|
1414 | + * Attaches all fs, string, and binary attachments to the message. |
|
1415 | + * Returns an empty string on failure. |
|
1416 | + * @access private |
|
1417 | + * @return string |
|
1418 | + */ |
|
1419 | + private function AttachAll() { |
|
1420 | 1420 | // Return text of body |
1421 | 1421 | $mime = array(); |
1422 | 1422 | $cidUniq = array(); |
@@ -1424,70 +1424,70 @@ discard block |
||
1424 | 1424 | |
1425 | 1425 | // Add all attachments |
1426 | 1426 | foreach ($this->attachment as $attachment) { |
1427 | - // Check for string attachment |
|
1428 | - $bString = $attachment[5]; |
|
1429 | - if ($bString) { |
|
1427 | + // Check for string attachment |
|
1428 | + $bString = $attachment[5]; |
|
1429 | + if ($bString) { |
|
1430 | 1430 | $string = $attachment[0]; |
1431 | - } else { |
|
1431 | + } else { |
|
1432 | 1432 | $path = $attachment[0]; |
1433 | - } |
|
1434 | - |
|
1435 | - if (in_array($attachment[0], $incl)) { continue; } |
|
1436 | - $filename = $attachment[1]; |
|
1437 | - $name = $attachment[2]; |
|
1438 | - $encoding = $attachment[3]; |
|
1439 | - $type = $attachment[4]; |
|
1440 | - $disposition = $attachment[6]; |
|
1441 | - $cid = $attachment[7]; |
|
1442 | - $incl[] = $attachment[0]; |
|
1443 | - if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; } |
|
1444 | - $cidUniq[$cid] = true; |
|
1445 | - |
|
1446 | - $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE); |
|
1447 | - $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE); |
|
1448 | - $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE); |
|
1449 | - |
|
1450 | - if($disposition == 'inline') { |
|
1433 | + } |
|
1434 | + |
|
1435 | + if (in_array($attachment[0], $incl)) { continue; } |
|
1436 | + $filename = $attachment[1]; |
|
1437 | + $name = $attachment[2]; |
|
1438 | + $encoding = $attachment[3]; |
|
1439 | + $type = $attachment[4]; |
|
1440 | + $disposition = $attachment[6]; |
|
1441 | + $cid = $attachment[7]; |
|
1442 | + $incl[] = $attachment[0]; |
|
1443 | + if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; } |
|
1444 | + $cidUniq[$cid] = true; |
|
1445 | + |
|
1446 | + $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE); |
|
1447 | + $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE); |
|
1448 | + $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE); |
|
1449 | + |
|
1450 | + if($disposition == 'inline') { |
|
1451 | 1451 | $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE); |
1452 | - } |
|
1452 | + } |
|
1453 | 1453 | |
1454 | - $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE); |
|
1454 | + $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE); |
|
1455 | 1455 | |
1456 | - // Encode as string attachment |
|
1457 | - if($bString) { |
|
1456 | + // Encode as string attachment |
|
1457 | + if($bString) { |
|
1458 | 1458 | $mime[] = $this->EncodeString($string, $encoding); |
1459 | 1459 | if($this->IsError()) { |
1460 | - return ''; |
|
1460 | + return ''; |
|
1461 | 1461 | } |
1462 | 1462 | $mime[] = $this->LE.$this->LE; |
1463 | - } else { |
|
1463 | + } else { |
|
1464 | 1464 | $mime[] = $this->EncodeFile($path, $encoding); |
1465 | 1465 | if($this->IsError()) { |
1466 | - return ''; |
|
1466 | + return ''; |
|
1467 | 1467 | } |
1468 | 1468 | $mime[] = $this->LE.$this->LE; |
1469 | - } |
|
1469 | + } |
|
1470 | 1470 | } |
1471 | 1471 | |
1472 | 1472 | $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE); |
1473 | 1473 | |
1474 | 1474 | return join('', $mime); |
1475 | - } |
|
1476 | - |
|
1477 | - /** |
|
1478 | - * Encodes attachment in requested format. |
|
1479 | - * Returns an empty string on failure. |
|
1480 | - * @param string $path The full path to the file |
|
1481 | - * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' |
|
1482 | - * @see EncodeFile() |
|
1483 | - * @access private |
|
1484 | - * @return string |
|
1485 | - */ |
|
1486 | - private function EncodeFile($path, $encoding = 'base64') { |
|
1475 | + } |
|
1476 | + |
|
1477 | + /** |
|
1478 | + * Encodes attachment in requested format. |
|
1479 | + * Returns an empty string on failure. |
|
1480 | + * @param string $path The full path to the file |
|
1481 | + * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' |
|
1482 | + * @see EncodeFile() |
|
1483 | + * @access private |
|
1484 | + * @return string |
|
1485 | + */ |
|
1486 | + private function EncodeFile($path, $encoding = 'base64') { |
|
1487 | 1487 | try { |
1488 | - if (!is_readable($path)) { |
|
1488 | + if (!is_readable($path)) { |
|
1489 | 1489 | throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE); |
1490 | - } |
|
1490 | + } |
|
1491 | 1491 | $magic_quotes = get_magic_quotes_runtime(); |
1492 | 1492 | if ($magic_quotes) { |
1493 | 1493 | if (version_compare(PHP_VERSION, '5.3.0', '<')) { |
@@ -1507,114 +1507,114 @@ discard block |
||
1507 | 1507 | } |
1508 | 1508 | return $file_buffer; |
1509 | 1509 | } catch (Exception $e) { |
1510 | - $this->SetError($e->getMessage()); |
|
1511 | - return ''; |
|
1512 | - } |
|
1513 | - } |
|
1514 | - |
|
1515 | - /** |
|
1516 | - * Encodes string to requested format. |
|
1517 | - * Returns an empty string on failure. |
|
1518 | - * @param string $str The text to encode |
|
1519 | - * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' |
|
1520 | - * @access public |
|
1521 | - * @return string |
|
1522 | - */ |
|
1523 | - public function EncodeString ($str, $encoding = 'base64') { |
|
1510 | + $this->SetError($e->getMessage()); |
|
1511 | + return ''; |
|
1512 | + } |
|
1513 | + } |
|
1514 | + |
|
1515 | + /** |
|
1516 | + * Encodes string to requested format. |
|
1517 | + * Returns an empty string on failure. |
|
1518 | + * @param string $str The text to encode |
|
1519 | + * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' |
|
1520 | + * @access public |
|
1521 | + * @return string |
|
1522 | + */ |
|
1523 | + public function EncodeString ($str, $encoding = 'base64') { |
|
1524 | 1524 | $encoded = ''; |
1525 | 1525 | switch(strtolower($encoding)) { |
1526 | - case 'base64': |
|
1526 | + case 'base64': |
|
1527 | 1527 | $encoded = chunk_split(base64_encode($str), 76, $this->LE); |
1528 | 1528 | break; |
1529 | - case '7bit': |
|
1529 | + case '7bit': |
|
1530 | 1530 | case '8bit': |
1531 | 1531 | $encoded = $this->FixEOL($str); |
1532 | 1532 | //Make sure it ends with a line break |
1533 | 1533 | if (substr($encoded, -(strlen($this->LE))) != $this->LE) |
1534 | - $encoded .= $this->LE; |
|
1534 | + $encoded .= $this->LE; |
|
1535 | 1535 | break; |
1536 | - case 'binary': |
|
1536 | + case 'binary': |
|
1537 | 1537 | $encoded = $str; |
1538 | 1538 | break; |
1539 | - case 'quoted-printable': |
|
1539 | + case 'quoted-printable': |
|
1540 | 1540 | $encoded = $this->EncodeQP($str); |
1541 | 1541 | break; |
1542 | - default: |
|
1542 | + default: |
|
1543 | 1543 | $this->SetError($this->Lang('encoding') . $encoding); |
1544 | 1544 | break; |
1545 | 1545 | } |
1546 | 1546 | return $encoded; |
1547 | - } |
|
1548 | - |
|
1549 | - /** |
|
1550 | - * Encode a header string to best (shortest) of Q, B, quoted or none. |
|
1551 | - * @access public |
|
1552 | - * @return string |
|
1553 | - */ |
|
1554 | - public function EncodeHeader($str, $position = 'text') { |
|
1547 | + } |
|
1548 | + |
|
1549 | + /** |
|
1550 | + * Encode a header string to best (shortest) of Q, B, quoted or none. |
|
1551 | + * @access public |
|
1552 | + * @return string |
|
1553 | + */ |
|
1554 | + public function EncodeHeader($str, $position = 'text') { |
|
1555 | 1555 | $x = 0; |
1556 | 1556 | |
1557 | 1557 | switch (strtolower($position)) { |
1558 | - case 'phrase': |
|
1558 | + case 'phrase': |
|
1559 | 1559 | if (!preg_match('/[\200-\377]/', $str)) { |
1560 | - // Can't use addslashes as we don't know what value has magic_quotes_sybase |
|
1561 | - $encoded = addcslashes($str, "\0..\37\177\\\""); |
|
1562 | - if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) { |
|
1560 | + // Can't use addslashes as we don't know what value has magic_quotes_sybase |
|
1561 | + $encoded = addcslashes($str, "\0..\37\177\\\""); |
|
1562 | + if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) { |
|
1563 | 1563 | return ($encoded); |
1564 | - } else { |
|
1564 | + } else { |
|
1565 | 1565 | return ("\"$encoded\""); |
1566 | - } |
|
1566 | + } |
|
1567 | 1567 | } |
1568 | 1568 | $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches); |
1569 | 1569 | break; |
1570 | - case 'comment': |
|
1570 | + case 'comment': |
|
1571 | 1571 | $x = preg_match_all('/[()"]/', $str, $matches); |
1572 | 1572 | // Fall-through |
1573 | - case 'text': |
|
1573 | + case 'text': |
|
1574 | 1574 | default: |
1575 | 1575 | $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches); |
1576 | 1576 | break; |
1577 | 1577 | } |
1578 | 1578 | |
1579 | 1579 | if ($x == 0) { |
1580 | - return ($str); |
|
1580 | + return ($str); |
|
1581 | 1581 | } |
1582 | 1582 | |
1583 | 1583 | $maxlen = 75 - 7 - strlen($this->CharSet); |
1584 | 1584 | // Try to select the encoding which should produce the shortest output |
1585 | 1585 | if (strlen($str)/3 < $x) { |
1586 | - $encoding = 'B'; |
|
1587 | - // Modified by Ivan Tcholakov, 24-JAN-2010. |
|
1588 | - //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) { |
|
1589 | - if ($this->HasMultiBytes($str)) { |
|
1590 | - // |
|
1586 | + $encoding = 'B'; |
|
1587 | + // Modified by Ivan Tcholakov, 24-JAN-2010. |
|
1588 | + //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) { |
|
1589 | + if ($this->HasMultiBytes($str)) { |
|
1590 | + // |
|
1591 | 1591 | // Use a custom function which correctly encodes and wraps long |
1592 | 1592 | // multibyte strings without breaking lines within a character |
1593 | 1593 | $encoded = $this->Base64EncodeWrapMB($str); |
1594 | - } else { |
|
1594 | + } else { |
|
1595 | 1595 | $encoded = base64_encode($str); |
1596 | 1596 | $maxlen -= $maxlen % 4; |
1597 | 1597 | $encoded = trim(chunk_split($encoded, $maxlen, "\n")); |
1598 | - } |
|
1598 | + } |
|
1599 | 1599 | } else { |
1600 | - $encoding = 'Q'; |
|
1601 | - $encoded = $this->EncodeQ($str, $position); |
|
1602 | - $encoded = $this->WrapText($encoded, $maxlen, true); |
|
1603 | - $encoded = str_replace('='.$this->LE, "\n", trim($encoded)); |
|
1600 | + $encoding = 'Q'; |
|
1601 | + $encoded = $this->EncodeQ($str, $position); |
|
1602 | + $encoded = $this->WrapText($encoded, $maxlen, true); |
|
1603 | + $encoded = str_replace('='.$this->LE, "\n", trim($encoded)); |
|
1604 | 1604 | } |
1605 | 1605 | |
1606 | 1606 | $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded); |
1607 | 1607 | $encoded = trim(str_replace("\n", $this->LE, $encoded)); |
1608 | 1608 | |
1609 | 1609 | return $encoded; |
1610 | - } |
|
1611 | - |
|
1612 | - /** |
|
1613 | - * Checks if a string contains multibyte characters. |
|
1614 | - * @access public |
|
1615 | - * @param string $str multi-byte text to wrap encode |
|
1616 | - * @return bool |
|
1617 | - */ |
|
1610 | + } |
|
1611 | + |
|
1612 | + /** |
|
1613 | + * Checks if a string contains multibyte characters. |
|
1614 | + * @access public |
|
1615 | + * @param string $str multi-byte text to wrap encode |
|
1616 | + * @return bool |
|
1617 | + */ |
|
1618 | 1618 | public function HasMultiBytes($str) |
1619 | 1619 | { |
1620 | 1620 | if (function_exists('mb_strlen')) { |
@@ -1625,15 +1625,15 @@ discard block |
||
1625 | 1625 | |
1626 | 1626 | } |
1627 | 1627 | |
1628 | - /** |
|
1629 | - * Correctly encodes and wraps long multibyte strings for mail headers |
|
1630 | - * without breaking lines within a character. |
|
1631 | - * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php |
|
1632 | - * @access public |
|
1633 | - * @param string $str multi-byte text to wrap encode |
|
1634 | - * @return string |
|
1635 | - */ |
|
1636 | - public function Base64EncodeWrapMB($str) { |
|
1628 | + /** |
|
1629 | + * Correctly encodes and wraps long multibyte strings for mail headers |
|
1630 | + * without breaking lines within a character. |
|
1631 | + * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php |
|
1632 | + * @access public |
|
1633 | + * @param string $str multi-byte text to wrap encode |
|
1634 | + * @return string |
|
1635 | + */ |
|
1636 | + public function Base64EncodeWrapMB($str) { |
|
1637 | 1637 | $start = "=?".$this->CharSet."?B?"; |
1638 | 1638 | $end = "?="; |
1639 | 1639 | $encoded = ""; |
@@ -1650,9 +1650,9 @@ discard block |
||
1650 | 1650 | $offset = $avgLength = floor($length * $ratio * .75); |
1651 | 1651 | |
1652 | 1652 | for ($i = 0; $i < $mb_length; $i += $offset) { |
1653 | - $lookBack = 0; |
|
1653 | + $lookBack = 0; |
|
1654 | 1654 | |
1655 | - do { |
|
1655 | + do { |
|
1656 | 1656 | $offset = $avgLength - $lookBack; |
1657 | 1657 | // Modified by Ivan Tcholakov, 24-JAN-2010. |
1658 | 1658 | //$chunk = mb_substr($str, $i, $offset, $this->CharSet); |
@@ -1660,85 +1660,85 @@ discard block |
||
1660 | 1660 | // |
1661 | 1661 | $chunk = base64_encode($chunk); |
1662 | 1662 | $lookBack++; |
1663 | - } |
|
1664 | - while (strlen($chunk) > $length); |
|
1663 | + } |
|
1664 | + while (strlen($chunk) > $length); |
|
1665 | 1665 | |
1666 | - $encoded .= $chunk . $this->LE; |
|
1666 | + $encoded .= $chunk . $this->LE; |
|
1667 | 1667 | } |
1668 | 1668 | |
1669 | 1669 | // Chomp the last linefeed |
1670 | 1670 | $encoded = substr($encoded, 0, -strlen($this->LE)); |
1671 | 1671 | return $encoded; |
1672 | - } |
|
1673 | - |
|
1674 | - /** |
|
1675 | - * Encode string to quoted-printable. |
|
1676 | - * Only uses standard PHP, slow, but will always work |
|
1677 | - * @access public |
|
1678 | - * @param string $string the text to encode |
|
1679 | - * @param integer $line_max Number of chars allowed on a line before wrapping |
|
1680 | - * @return string |
|
1681 | - */ |
|
1682 | - public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) { |
|
1672 | + } |
|
1673 | + |
|
1674 | + /** |
|
1675 | + * Encode string to quoted-printable. |
|
1676 | + * Only uses standard PHP, slow, but will always work |
|
1677 | + * @access public |
|
1678 | + * @param string $string the text to encode |
|
1679 | + * @param integer $line_max Number of chars allowed on a line before wrapping |
|
1680 | + * @return string |
|
1681 | + */ |
|
1682 | + public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) { |
|
1683 | 1683 | $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'); |
1684 | 1684 | $lines = preg_split('/(?:\r\n|\r|\n)/', $input); |
1685 | 1685 | $eol = "\r\n"; |
1686 | 1686 | $escape = '='; |
1687 | 1687 | $output = ''; |
1688 | 1688 | while( list(, $line) = each($lines) ) { |
1689 | - $linlen = strlen($line); |
|
1690 | - $newline = ''; |
|
1691 | - for($i = 0; $i < $linlen; $i++) { |
|
1689 | + $linlen = strlen($line); |
|
1690 | + $newline = ''; |
|
1691 | + for($i = 0; $i < $linlen; $i++) { |
|
1692 | 1692 | $c = substr( $line, $i, 1 ); |
1693 | 1693 | $dec = ord( $c ); |
1694 | 1694 | if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E |
1695 | - $c = '=2E'; |
|
1695 | + $c = '=2E'; |
|
1696 | 1696 | } |
1697 | 1697 | if ( $dec == 32 ) { |
1698 | - if ( $i == ( $linlen - 1 ) ) { // convert space at eol only |
|
1698 | + if ( $i == ( $linlen - 1 ) ) { // convert space at eol only |
|
1699 | 1699 | $c = '=20'; |
1700 | - } else if ( $space_conv ) { |
|
1700 | + } else if ( $space_conv ) { |
|
1701 | 1701 | $c = '=20'; |
1702 | - } |
|
1702 | + } |
|
1703 | 1703 | } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required |
1704 | - $h2 = floor($dec/16); |
|
1705 | - $h1 = floor($dec%16); |
|
1706 | - $c = $escape.$hex[$h2].$hex[$h1]; |
|
1704 | + $h2 = floor($dec/16); |
|
1705 | + $h1 = floor($dec%16); |
|
1706 | + $c = $escape.$hex[$h2].$hex[$h1]; |
|
1707 | 1707 | } |
1708 | 1708 | if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted |
1709 | - $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay |
|
1710 | - $newline = ''; |
|
1711 | - // check if newline first character will be point or not |
|
1712 | - if ( $dec == 46 ) { |
|
1709 | + $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay |
|
1710 | + $newline = ''; |
|
1711 | + // check if newline first character will be point or not |
|
1712 | + if ( $dec == 46 ) { |
|
1713 | 1713 | $c = '=2E'; |
1714 | - } |
|
1714 | + } |
|
1715 | 1715 | } |
1716 | 1716 | $newline .= $c; |
1717 | - } // end of for |
|
1718 | - $output .= $newline.$eol; |
|
1717 | + } // end of for |
|
1718 | + $output .= $newline.$eol; |
|
1719 | 1719 | } // end of while |
1720 | 1720 | return $output; |
1721 | - } |
|
1722 | - |
|
1723 | - /** |
|
1724 | - * Encode string to RFC2045 (6.7) quoted-printable format |
|
1725 | - * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version |
|
1726 | - * Also results in same content as you started with after decoding |
|
1727 | - * @see EncodeQPphp() |
|
1728 | - * @access public |
|
1729 | - * @param string $string the text to encode |
|
1730 | - * @param integer $line_max Number of chars allowed on a line before wrapping |
|
1731 | - * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function |
|
1732 | - * @return string |
|
1733 | - * @author Marcus Bointon |
|
1734 | - */ |
|
1735 | - public function EncodeQP($string, $line_max = 76, $space_conv = false) { |
|
1721 | + } |
|
1722 | + |
|
1723 | + /** |
|
1724 | + * Encode string to RFC2045 (6.7) quoted-printable format |
|
1725 | + * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version |
|
1726 | + * Also results in same content as you started with after decoding |
|
1727 | + * @see EncodeQPphp() |
|
1728 | + * @access public |
|
1729 | + * @param string $string the text to encode |
|
1730 | + * @param integer $line_max Number of chars allowed on a line before wrapping |
|
1731 | + * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function |
|
1732 | + * @return string |
|
1733 | + * @author Marcus Bointon |
|
1734 | + */ |
|
1735 | + public function EncodeQP($string, $line_max = 76, $space_conv = false) { |
|
1736 | 1736 | if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3) |
1737 | - return quoted_printable_encode($string); |
|
1737 | + return quoted_printable_encode($string); |
|
1738 | 1738 | } |
1739 | 1739 | $filters = stream_get_filters(); |
1740 | 1740 | if (!in_array('convert.*', $filters)) { //Got convert stream filter? |
1741 | - return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation |
|
1741 | + return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation |
|
1742 | 1742 | } |
1743 | 1743 | $fp = fopen('php://temp/', 'r+'); |
1744 | 1744 | $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks |
@@ -1751,32 +1751,32 @@ discard block |
||
1751 | 1751 | $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange |
1752 | 1752 | fclose($fp); |
1753 | 1753 | return $out; |
1754 | - } |
|
1755 | - |
|
1756 | - /** |
|
1757 | - * Encode string to q encoding. |
|
1758 | - * @link http://tools.ietf.org/html/rfc2047 |
|
1759 | - * @param string $str the text to encode |
|
1760 | - * @param string $position Where the text is going to be used, see the RFC for what that means |
|
1761 | - * @access public |
|
1762 | - * @return string |
|
1763 | - */ |
|
1764 | - public function EncodeQ ($str, $position = 'text') { |
|
1754 | + } |
|
1755 | + |
|
1756 | + /** |
|
1757 | + * Encode string to q encoding. |
|
1758 | + * @link http://tools.ietf.org/html/rfc2047 |
|
1759 | + * @param string $str the text to encode |
|
1760 | + * @param string $position Where the text is going to be used, see the RFC for what that means |
|
1761 | + * @access public |
|
1762 | + * @return string |
|
1763 | + */ |
|
1764 | + public function EncodeQ ($str, $position = 'text') { |
|
1765 | 1765 | // There should not be any EOL in the string |
1766 | 1766 | $encoded = preg_replace('/[\r\n]*/', '', $str); |
1767 | 1767 | |
1768 | 1768 | switch (strtolower($position)) { |
1769 | - case 'phrase': |
|
1769 | + case 'phrase': |
|
1770 | 1770 | $encoded = @preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded); |
1771 | 1771 | break; |
1772 | - case 'comment': |
|
1772 | + case 'comment': |
|
1773 | 1773 | $encoded = @preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded); |
1774 | - case 'text': |
|
1774 | + case 'text': |
|
1775 | 1775 | default: |
1776 | 1776 | // Replace every high ascii, control =, ? and _ characters |
1777 | 1777 | //TODO using /e (equivalent to eval()) is probably not a good idea |
1778 | 1778 | $encoded = @preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e', |
1779 | - "'='.sprintf('%02X', ord('\\1'))", $encoded); |
|
1779 | + "'='.sprintf('%02X', ord('\\1'))", $encoded); |
|
1780 | 1780 | break; |
1781 | 1781 | } |
1782 | 1782 | |
@@ -1784,187 +1784,187 @@ discard block |
||
1784 | 1784 | $encoded = str_replace(' ', '_', $encoded); |
1785 | 1785 | |
1786 | 1786 | return $encoded; |
1787 | - } |
|
1788 | - |
|
1789 | - /** |
|
1790 | - * Adds a string or binary attachment (non-filesystem) to the list. |
|
1791 | - * This method can be used to attach ascii or binary data, |
|
1792 | - * such as a BLOB record from a database. |
|
1793 | - * @param string $string String attachment data. |
|
1794 | - * @param string $filename Name of the attachment. |
|
1795 | - * @param string $encoding File encoding (see $Encoding). |
|
1796 | - * @param string $type File extension (MIME) type. |
|
1797 | - * @return void |
|
1798 | - */ |
|
1799 | - public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') { |
|
1787 | + } |
|
1788 | + |
|
1789 | + /** |
|
1790 | + * Adds a string or binary attachment (non-filesystem) to the list. |
|
1791 | + * This method can be used to attach ascii or binary data, |
|
1792 | + * such as a BLOB record from a database. |
|
1793 | + * @param string $string String attachment data. |
|
1794 | + * @param string $filename Name of the attachment. |
|
1795 | + * @param string $encoding File encoding (see $Encoding). |
|
1796 | + * @param string $type File extension (MIME) type. |
|
1797 | + * @return void |
|
1798 | + */ |
|
1799 | + public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') { |
|
1800 | 1800 | // Append to $attachment array |
1801 | 1801 | $this->attachment[] = array( |
1802 | - 0 => $string, |
|
1803 | - 1 => $filename, |
|
1804 | - 2 => basename($filename), |
|
1805 | - 3 => $encoding, |
|
1806 | - 4 => $type, |
|
1807 | - 5 => true, // isStringAttachment |
|
1808 | - 6 => 'attachment', |
|
1809 | - 7 => 0 |
|
1802 | + 0 => $string, |
|
1803 | + 1 => $filename, |
|
1804 | + 2 => basename($filename), |
|
1805 | + 3 => $encoding, |
|
1806 | + 4 => $type, |
|
1807 | + 5 => true, // isStringAttachment |
|
1808 | + 6 => 'attachment', |
|
1809 | + 7 => 0 |
|
1810 | 1810 | ); |
1811 | - } |
|
1812 | - |
|
1813 | - /** |
|
1814 | - * Adds an embedded attachment. This can include images, sounds, and |
|
1815 | - * just about any other document. Make sure to set the $type to an |
|
1816 | - * image type. For JPEG images use "image/jpeg" and for GIF images |
|
1817 | - * use "image/gif". |
|
1818 | - * @param string $path Path to the attachment. |
|
1819 | - * @param string $cid Content ID of the attachment. Use this to identify |
|
1820 | - * the Id for accessing the image in an HTML form. |
|
1821 | - * @param string $name Overrides the attachment name. |
|
1822 | - * @param string $encoding File encoding (see $Encoding). |
|
1823 | - * @param string $type File extension (MIME) type. |
|
1824 | - * @return bool |
|
1825 | - */ |
|
1826 | - public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { |
|
1811 | + } |
|
1812 | + |
|
1813 | + /** |
|
1814 | + * Adds an embedded attachment. This can include images, sounds, and |
|
1815 | + * just about any other document. Make sure to set the $type to an |
|
1816 | + * image type. For JPEG images use "image/jpeg" and for GIF images |
|
1817 | + * use "image/gif". |
|
1818 | + * @param string $path Path to the attachment. |
|
1819 | + * @param string $cid Content ID of the attachment. Use this to identify |
|
1820 | + * the Id for accessing the image in an HTML form. |
|
1821 | + * @param string $name Overrides the attachment name. |
|
1822 | + * @param string $encoding File encoding (see $Encoding). |
|
1823 | + * @param string $type File extension (MIME) type. |
|
1824 | + * @return bool |
|
1825 | + */ |
|
1826 | + public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { |
|
1827 | 1827 | |
1828 | 1828 | if ( !@is_file($path) ) { |
1829 | - $this->SetError($this->Lang('file_access') . $path); |
|
1830 | - return false; |
|
1829 | + $this->SetError($this->Lang('file_access') . $path); |
|
1830 | + return false; |
|
1831 | 1831 | } |
1832 | 1832 | |
1833 | 1833 | $filename = basename($path); |
1834 | 1834 | if ( $name == '' ) { |
1835 | - $name = $filename; |
|
1835 | + $name = $filename; |
|
1836 | 1836 | } |
1837 | 1837 | |
1838 | 1838 | // Append to $attachment array |
1839 | 1839 | $this->attachment[] = array( |
1840 | - 0 => $path, |
|
1841 | - 1 => $filename, |
|
1842 | - 2 => $name, |
|
1843 | - 3 => $encoding, |
|
1844 | - 4 => $type, |
|
1845 | - 5 => false, // isStringAttachment |
|
1846 | - 6 => 'inline', |
|
1847 | - 7 => $cid |
|
1840 | + 0 => $path, |
|
1841 | + 1 => $filename, |
|
1842 | + 2 => $name, |
|
1843 | + 3 => $encoding, |
|
1844 | + 4 => $type, |
|
1845 | + 5 => false, // isStringAttachment |
|
1846 | + 6 => 'inline', |
|
1847 | + 7 => $cid |
|
1848 | 1848 | ); |
1849 | 1849 | |
1850 | 1850 | return true; |
1851 | - } |
|
1852 | - |
|
1853 | - /** |
|
1854 | - * Returns true if an inline attachment is present. |
|
1855 | - * @access public |
|
1856 | - * @return bool |
|
1857 | - */ |
|
1858 | - public function InlineImageExists() { |
|
1851 | + } |
|
1852 | + |
|
1853 | + /** |
|
1854 | + * Returns true if an inline attachment is present. |
|
1855 | + * @access public |
|
1856 | + * @return bool |
|
1857 | + */ |
|
1858 | + public function InlineImageExists() { |
|
1859 | 1859 | foreach($this->attachment as $attachment) { |
1860 | - if ($attachment[6] == 'inline') { |
|
1860 | + if ($attachment[6] == 'inline') { |
|
1861 | 1861 | return true; |
1862 | - } |
|
1862 | + } |
|
1863 | 1863 | } |
1864 | 1864 | return false; |
1865 | - } |
|
1865 | + } |
|
1866 | 1866 | |
1867 | - ///////////////////////////////////////////////// |
|
1868 | - // CLASS METHODS, MESSAGE RESET |
|
1869 | - ///////////////////////////////////////////////// |
|
1867 | + ///////////////////////////////////////////////// |
|
1868 | + // CLASS METHODS, MESSAGE RESET |
|
1869 | + ///////////////////////////////////////////////// |
|
1870 | 1870 | |
1871 | - /** |
|
1872 | - * Clears all recipients assigned in the TO array. Returns void. |
|
1873 | - * @return void |
|
1874 | - */ |
|
1875 | - public function ClearAddresses() { |
|
1871 | + /** |
|
1872 | + * Clears all recipients assigned in the TO array. Returns void. |
|
1873 | + * @return void |
|
1874 | + */ |
|
1875 | + public function ClearAddresses() { |
|
1876 | 1876 | foreach($this->to as $to) { |
1877 | - unset($this->all_recipients[strtolower($to[0])]); |
|
1877 | + unset($this->all_recipients[strtolower($to[0])]); |
|
1878 | 1878 | } |
1879 | 1879 | $this->to = array(); |
1880 | - } |
|
1880 | + } |
|
1881 | 1881 | |
1882 | - /** |
|
1883 | - * Clears all recipients assigned in the CC array. Returns void. |
|
1884 | - * @return void |
|
1885 | - */ |
|
1886 | - public function ClearCCs() { |
|
1882 | + /** |
|
1883 | + * Clears all recipients assigned in the CC array. Returns void. |
|
1884 | + * @return void |
|
1885 | + */ |
|
1886 | + public function ClearCCs() { |
|
1887 | 1887 | foreach($this->cc as $cc) { |
1888 | - unset($this->all_recipients[strtolower($cc[0])]); |
|
1888 | + unset($this->all_recipients[strtolower($cc[0])]); |
|
1889 | 1889 | } |
1890 | 1890 | $this->cc = array(); |
1891 | - } |
|
1891 | + } |
|
1892 | 1892 | |
1893 | - /** |
|
1894 | - * Clears all recipients assigned in the BCC array. Returns void. |
|
1895 | - * @return void |
|
1896 | - */ |
|
1897 | - public function ClearBCCs() { |
|
1893 | + /** |
|
1894 | + * Clears all recipients assigned in the BCC array. Returns void. |
|
1895 | + * @return void |
|
1896 | + */ |
|
1897 | + public function ClearBCCs() { |
|
1898 | 1898 | foreach($this->bcc as $bcc) { |
1899 | - unset($this->all_recipients[strtolower($bcc[0])]); |
|
1899 | + unset($this->all_recipients[strtolower($bcc[0])]); |
|
1900 | 1900 | } |
1901 | 1901 | $this->bcc = array(); |
1902 | - } |
|
1902 | + } |
|
1903 | 1903 | |
1904 | - /** |
|
1905 | - * Clears all recipients assigned in the ReplyTo array. Returns void. |
|
1906 | - * @return void |
|
1907 | - */ |
|
1908 | - public function ClearReplyTos() { |
|
1904 | + /** |
|
1905 | + * Clears all recipients assigned in the ReplyTo array. Returns void. |
|
1906 | + * @return void |
|
1907 | + */ |
|
1908 | + public function ClearReplyTos() { |
|
1909 | 1909 | $this->ReplyTo = array(); |
1910 | - } |
|
1911 | - |
|
1912 | - /** |
|
1913 | - * Clears all recipients assigned in the TO, CC and BCC |
|
1914 | - * array. Returns void. |
|
1915 | - * @return void |
|
1916 | - */ |
|
1917 | - public function ClearAllRecipients() { |
|
1910 | + } |
|
1911 | + |
|
1912 | + /** |
|
1913 | + * Clears all recipients assigned in the TO, CC and BCC |
|
1914 | + * array. Returns void. |
|
1915 | + * @return void |
|
1916 | + */ |
|
1917 | + public function ClearAllRecipients() { |
|
1918 | 1918 | $this->to = array(); |
1919 | 1919 | $this->cc = array(); |
1920 | 1920 | $this->bcc = array(); |
1921 | 1921 | $this->all_recipients = array(); |
1922 | - } |
|
1923 | - |
|
1924 | - /** |
|
1925 | - * Clears all previously set filesystem, string, and binary |
|
1926 | - * attachments. Returns void. |
|
1927 | - * @return void |
|
1928 | - */ |
|
1929 | - public function ClearAttachments() { |
|
1922 | + } |
|
1923 | + |
|
1924 | + /** |
|
1925 | + * Clears all previously set filesystem, string, and binary |
|
1926 | + * attachments. Returns void. |
|
1927 | + * @return void |
|
1928 | + */ |
|
1929 | + public function ClearAttachments() { |
|
1930 | 1930 | $this->attachment = array(); |
1931 | - } |
|
1931 | + } |
|
1932 | 1932 | |
1933 | - /** |
|
1934 | - * Clears all custom headers. Returns void. |
|
1935 | - * @return void |
|
1936 | - */ |
|
1937 | - public function ClearCustomHeaders() { |
|
1933 | + /** |
|
1934 | + * Clears all custom headers. Returns void. |
|
1935 | + * @return void |
|
1936 | + */ |
|
1937 | + public function ClearCustomHeaders() { |
|
1938 | 1938 | $this->CustomHeader = array(); |
1939 | - } |
|
1940 | - |
|
1941 | - ///////////////////////////////////////////////// |
|
1942 | - // CLASS METHODS, MISCELLANEOUS |
|
1943 | - ///////////////////////////////////////////////// |
|
1944 | - |
|
1945 | - /** |
|
1946 | - * Adds the error message to the error container. |
|
1947 | - * @access protected |
|
1948 | - * @return void |
|
1949 | - */ |
|
1950 | - protected function SetError($msg) { |
|
1939 | + } |
|
1940 | + |
|
1941 | + ///////////////////////////////////////////////// |
|
1942 | + // CLASS METHODS, MISCELLANEOUS |
|
1943 | + ///////////////////////////////////////////////// |
|
1944 | + |
|
1945 | + /** |
|
1946 | + * Adds the error message to the error container. |
|
1947 | + * @access protected |
|
1948 | + * @return void |
|
1949 | + */ |
|
1950 | + protected function SetError($msg) { |
|
1951 | 1951 | $this->error_count++; |
1952 | 1952 | if ($this->Mailer == 'smtp' and !is_null($this->smtp)) { |
1953 | - $lasterror = $this->smtp->getError(); |
|
1954 | - if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) { |
|
1953 | + $lasterror = $this->smtp->getError(); |
|
1954 | + if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) { |
|
1955 | 1955 | $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n"; |
1956 | - } |
|
1956 | + } |
|
1957 | 1957 | } |
1958 | 1958 | $this->ErrorInfo = $msg; |
1959 | - } |
|
1960 | - |
|
1961 | - /** |
|
1962 | - * Returns the proper RFC 822 formatted date. |
|
1963 | - * @access public |
|
1964 | - * @return string |
|
1965 | - * @static |
|
1966 | - */ |
|
1967 | - public static function RFCDate() { |
|
1959 | + } |
|
1960 | + |
|
1961 | + /** |
|
1962 | + * Returns the proper RFC 822 formatted date. |
|
1963 | + * @access public |
|
1964 | + * @return string |
|
1965 | + * @static |
|
1966 | + */ |
|
1967 | + public static function RFCDate() { |
|
1968 | 1968 | $tz = date('Z'); |
1969 | 1969 | $tzs = ($tz < 0) ? '-' : '+'; |
1970 | 1970 | $tz = abs($tz); |
@@ -1972,346 +1972,346 @@ discard block |
||
1972 | 1972 | $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz); |
1973 | 1973 | |
1974 | 1974 | return $result; |
1975 | - } |
|
1976 | - |
|
1977 | - /** |
|
1978 | - * Returns the server hostname or 'localhost.localdomain' if unknown. |
|
1979 | - * @access private |
|
1980 | - * @return string |
|
1981 | - */ |
|
1982 | - private function ServerHostname() { |
|
1975 | + } |
|
1976 | + |
|
1977 | + /** |
|
1978 | + * Returns the server hostname or 'localhost.localdomain' if unknown. |
|
1979 | + * @access private |
|
1980 | + * @return string |
|
1981 | + */ |
|
1982 | + private function ServerHostname() { |
|
1983 | 1983 | if (!empty($this->Hostname)) { |
1984 | - $result = $this->Hostname; |
|
1984 | + $result = $this->Hostname; |
|
1985 | 1985 | } elseif (isset($_SERVER['SERVER_NAME'])) { |
1986 | - $result = $_SERVER['SERVER_NAME']; |
|
1986 | + $result = $_SERVER['SERVER_NAME']; |
|
1987 | 1987 | } else { |
1988 | - $result = 'localhost.localdomain'; |
|
1988 | + $result = 'localhost.localdomain'; |
|
1989 | 1989 | } |
1990 | 1990 | |
1991 | 1991 | return $result; |
1992 | - } |
|
1993 | - |
|
1994 | - /** |
|
1995 | - * Returns a message in the appropriate language. |
|
1996 | - * @access private |
|
1997 | - * @return string |
|
1998 | - */ |
|
1999 | - private function Lang($key) { |
|
1992 | + } |
|
1993 | + |
|
1994 | + /** |
|
1995 | + * Returns a message in the appropriate language. |
|
1996 | + * @access private |
|
1997 | + * @return string |
|
1998 | + */ |
|
1999 | + private function Lang($key) { |
|
2000 | 2000 | if(count($this->language) < 1) { |
2001 | - $this->SetLanguage('en'); // set the default language |
|
2001 | + $this->SetLanguage('en'); // set the default language |
|
2002 | 2002 | } |
2003 | 2003 | |
2004 | 2004 | if(isset($this->language[$key])) { |
2005 | - return $this->language[$key]; |
|
2005 | + return $this->language[$key]; |
|
2006 | 2006 | } else { |
2007 | - return 'Language string failed to load: ' . $key; |
|
2007 | + return 'Language string failed to load: ' . $key; |
|
2008 | + } |
|
2008 | 2009 | } |
2009 | - } |
|
2010 | 2010 | |
2011 | - /** |
|
2012 | - * Returns true if an error occurred. |
|
2013 | - * @access public |
|
2014 | - * @return bool |
|
2015 | - */ |
|
2016 | - public function IsError() { |
|
2011 | + /** |
|
2012 | + * Returns true if an error occurred. |
|
2013 | + * @access public |
|
2014 | + * @return bool |
|
2015 | + */ |
|
2016 | + public function IsError() { |
|
2017 | 2017 | return ($this->error_count > 0); |
2018 | - } |
|
2019 | - |
|
2020 | - /** |
|
2021 | - * Changes every end of line from CR or LF to CRLF. |
|
2022 | - * @access private |
|
2023 | - * @return string |
|
2024 | - */ |
|
2025 | - private function FixEOL($str) { |
|
2018 | + } |
|
2019 | + |
|
2020 | + /** |
|
2021 | + * Changes every end of line from CR or LF to CRLF. |
|
2022 | + * @access private |
|
2023 | + * @return string |
|
2024 | + */ |
|
2025 | + private function FixEOL($str) { |
|
2026 | 2026 | $str = str_replace("\r\n", "\n", $str); |
2027 | 2027 | $str = str_replace("\r", "\n", $str); |
2028 | 2028 | $str = str_replace("\n", $this->LE, $str); |
2029 | 2029 | return $str; |
2030 | - } |
|
2031 | - |
|
2032 | - /** |
|
2033 | - * Adds a custom header. |
|
2034 | - * @access public |
|
2035 | - * @return void |
|
2036 | - */ |
|
2037 | - public function AddCustomHeader($custom_header) { |
|
2030 | + } |
|
2031 | + |
|
2032 | + /** |
|
2033 | + * Adds a custom header. |
|
2034 | + * @access public |
|
2035 | + * @return void |
|
2036 | + */ |
|
2037 | + public function AddCustomHeader($custom_header) { |
|
2038 | 2038 | $this->CustomHeader[] = explode(':', $custom_header, 2); |
2039 | - } |
|
2040 | - |
|
2041 | - /** |
|
2042 | - * Evaluates the message and returns modifications for inline images and backgrounds |
|
2043 | - * @access public |
|
2044 | - * @return $message |
|
2045 | - */ |
|
2046 | - public function MsgHTML($message, $basedir = '') { |
|
2039 | + } |
|
2040 | + |
|
2041 | + /** |
|
2042 | + * Evaluates the message and returns modifications for inline images and backgrounds |
|
2043 | + * @access public |
|
2044 | + * @return $message |
|
2045 | + */ |
|
2046 | + public function MsgHTML($message, $basedir = '') { |
|
2047 | 2047 | preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images); |
2048 | 2048 | if(isset($images[2])) { |
2049 | - foreach($images[2] as $i => $url) { |
|
2049 | + foreach($images[2] as $i => $url) { |
|
2050 | 2050 | // do not change urls for absolute images (thanks to corvuscorax) |
2051 | 2051 | if (!preg_match('#^[A-z]+://#',$url)) { |
2052 | - $filename = basename($url); |
|
2053 | - $directory = dirname($url); |
|
2054 | - ($directory == '.')?$directory='':''; |
|
2055 | - $cid = 'cid:' . md5($filename); |
|
2056 | - $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
2057 | - $mimeType = self::_mime_types($ext); |
|
2058 | - if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; } |
|
2059 | - if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; } |
|
2060 | - if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) { |
|
2052 | + $filename = basename($url); |
|
2053 | + $directory = dirname($url); |
|
2054 | + ($directory == '.')?$directory='':''; |
|
2055 | + $cid = 'cid:' . md5($filename); |
|
2056 | + $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
2057 | + $mimeType = self::_mime_types($ext); |
|
2058 | + if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; } |
|
2059 | + if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; } |
|
2060 | + if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) { |
|
2061 | 2061 | $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message); |
2062 | - } |
|
2062 | + } |
|
2063 | + } |
|
2063 | 2064 | } |
2064 | - } |
|
2065 | 2065 | } |
2066 | 2066 | $this->IsHTML(true); |
2067 | 2067 | $this->Body = $message; |
2068 | 2068 | $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message))); |
2069 | 2069 | if (!empty($textMsg) && empty($this->AltBody)) { |
2070 | - $this->AltBody = html_entity_decode($textMsg); |
|
2070 | + $this->AltBody = html_entity_decode($textMsg); |
|
2071 | 2071 | } |
2072 | 2072 | if (empty($this->AltBody)) { |
2073 | - $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n"; |
|
2074 | - } |
|
2075 | - } |
|
2076 | - |
|
2077 | - /** |
|
2078 | - * Gets the MIME type of the embedded or inline image |
|
2079 | - * @param string File extension |
|
2080 | - * @access public |
|
2081 | - * @return string MIME type of ext |
|
2082 | - * @static |
|
2083 | - */ |
|
2084 | - public static function _mime_types($ext = '') { |
|
2073 | + $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n"; |
|
2074 | + } |
|
2075 | + } |
|
2076 | + |
|
2077 | + /** |
|
2078 | + * Gets the MIME type of the embedded or inline image |
|
2079 | + * @param string File extension |
|
2080 | + * @access public |
|
2081 | + * @return string MIME type of ext |
|
2082 | + * @static |
|
2083 | + */ |
|
2084 | + public static function _mime_types($ext = '') { |
|
2085 | 2085 | $mimes = array( |
2086 | - 'hqx' => 'application/mac-binhex40', |
|
2087 | - 'cpt' => 'application/mac-compactpro', |
|
2088 | - 'doc' => 'application/msword', |
|
2089 | - 'bin' => 'application/macbinary', |
|
2090 | - 'dms' => 'application/octet-stream', |
|
2091 | - 'lha' => 'application/octet-stream', |
|
2092 | - 'lzh' => 'application/octet-stream', |
|
2093 | - 'exe' => 'application/octet-stream', |
|
2094 | - 'class' => 'application/octet-stream', |
|
2095 | - 'psd' => 'application/octet-stream', |
|
2096 | - 'so' => 'application/octet-stream', |
|
2097 | - 'sea' => 'application/octet-stream', |
|
2098 | - 'dll' => 'application/octet-stream', |
|
2099 | - 'oda' => 'application/oda', |
|
2100 | - 'pdf' => 'application/pdf', |
|
2101 | - 'ai' => 'application/postscript', |
|
2102 | - 'eps' => 'application/postscript', |
|
2103 | - 'ps' => 'application/postscript', |
|
2104 | - 'smi' => 'application/smil', |
|
2105 | - 'smil' => 'application/smil', |
|
2106 | - 'mif' => 'application/vnd.mif', |
|
2107 | - 'xls' => 'application/vnd.ms-excel', |
|
2108 | - 'ppt' => 'application/vnd.ms-powerpoint', |
|
2109 | - 'wbxml' => 'application/vnd.wap.wbxml', |
|
2110 | - 'wmlc' => 'application/vnd.wap.wmlc', |
|
2111 | - 'dcr' => 'application/x-director', |
|
2112 | - 'dir' => 'application/x-director', |
|
2113 | - 'dxr' => 'application/x-director', |
|
2114 | - 'dvi' => 'application/x-dvi', |
|
2115 | - 'gtar' => 'application/x-gtar', |
|
2116 | - 'php' => 'application/x-httpd-php', |
|
2117 | - 'php4' => 'application/x-httpd-php', |
|
2118 | - 'php3' => 'application/x-httpd-php', |
|
2119 | - 'phtml' => 'application/x-httpd-php', |
|
2120 | - 'phps' => 'application/x-httpd-php-source', |
|
2121 | - 'js' => 'application/x-javascript', |
|
2122 | - 'swf' => 'application/x-shockwave-flash', |
|
2123 | - 'sit' => 'application/x-stuffit', |
|
2124 | - 'tar' => 'application/x-tar', |
|
2125 | - 'tgz' => 'application/x-tar', |
|
2126 | - 'xhtml' => 'application/xhtml+xml', |
|
2127 | - 'xht' => 'application/xhtml+xml', |
|
2128 | - 'zip' => 'application/zip', |
|
2129 | - 'mid' => 'audio/midi', |
|
2130 | - 'midi' => 'audio/midi', |
|
2131 | - 'mpga' => 'audio/mpeg', |
|
2132 | - 'mp2' => 'audio/mpeg', |
|
2133 | - 'mp3' => 'audio/mpeg', |
|
2134 | - 'aif' => 'audio/x-aiff', |
|
2135 | - 'aiff' => 'audio/x-aiff', |
|
2136 | - 'aifc' => 'audio/x-aiff', |
|
2137 | - 'ram' => 'audio/x-pn-realaudio', |
|
2138 | - 'rm' => 'audio/x-pn-realaudio', |
|
2139 | - 'rpm' => 'audio/x-pn-realaudio-plugin', |
|
2140 | - 'ra' => 'audio/x-realaudio', |
|
2141 | - 'rv' => 'video/vnd.rn-realvideo', |
|
2142 | - 'wav' => 'audio/x-wav', |
|
2143 | - 'bmp' => 'image/bmp', |
|
2144 | - 'gif' => 'image/gif', |
|
2145 | - 'jpeg' => 'image/jpeg', |
|
2146 | - 'jpg' => 'image/jpeg', |
|
2147 | - 'jpe' => 'image/jpeg', |
|
2148 | - 'png' => 'image/png', |
|
2149 | - 'tiff' => 'image/tiff', |
|
2150 | - 'tif' => 'image/tiff', |
|
2151 | - 'css' => 'text/css', |
|
2152 | - 'html' => 'text/html', |
|
2153 | - 'htm' => 'text/html', |
|
2154 | - 'shtml' => 'text/html', |
|
2155 | - 'txt' => 'text/plain', |
|
2156 | - 'text' => 'text/plain', |
|
2157 | - 'log' => 'text/plain', |
|
2158 | - 'rtx' => 'text/richtext', |
|
2159 | - 'rtf' => 'text/rtf', |
|
2160 | - 'xml' => 'text/xml', |
|
2161 | - 'xsl' => 'text/xml', |
|
2162 | - 'mpeg' => 'video/mpeg', |
|
2163 | - 'mpg' => 'video/mpeg', |
|
2164 | - 'mpe' => 'video/mpeg', |
|
2165 | - 'qt' => 'video/quicktime', |
|
2166 | - 'mov' => 'video/quicktime', |
|
2167 | - 'avi' => 'video/x-msvideo', |
|
2168 | - 'movie' => 'video/x-sgi-movie', |
|
2169 | - 'doc' => 'application/msword', |
|
2170 | - 'word' => 'application/msword', |
|
2171 | - 'xl' => 'application/excel', |
|
2172 | - 'eml' => 'message/rfc822' |
|
2086 | + 'hqx' => 'application/mac-binhex40', |
|
2087 | + 'cpt' => 'application/mac-compactpro', |
|
2088 | + 'doc' => 'application/msword', |
|
2089 | + 'bin' => 'application/macbinary', |
|
2090 | + 'dms' => 'application/octet-stream', |
|
2091 | + 'lha' => 'application/octet-stream', |
|
2092 | + 'lzh' => 'application/octet-stream', |
|
2093 | + 'exe' => 'application/octet-stream', |
|
2094 | + 'class' => 'application/octet-stream', |
|
2095 | + 'psd' => 'application/octet-stream', |
|
2096 | + 'so' => 'application/octet-stream', |
|
2097 | + 'sea' => 'application/octet-stream', |
|
2098 | + 'dll' => 'application/octet-stream', |
|
2099 | + 'oda' => 'application/oda', |
|
2100 | + 'pdf' => 'application/pdf', |
|
2101 | + 'ai' => 'application/postscript', |
|
2102 | + 'eps' => 'application/postscript', |
|
2103 | + 'ps' => 'application/postscript', |
|
2104 | + 'smi' => 'application/smil', |
|
2105 | + 'smil' => 'application/smil', |
|
2106 | + 'mif' => 'application/vnd.mif', |
|
2107 | + 'xls' => 'application/vnd.ms-excel', |
|
2108 | + 'ppt' => 'application/vnd.ms-powerpoint', |
|
2109 | + 'wbxml' => 'application/vnd.wap.wbxml', |
|
2110 | + 'wmlc' => 'application/vnd.wap.wmlc', |
|
2111 | + 'dcr' => 'application/x-director', |
|
2112 | + 'dir' => 'application/x-director', |
|
2113 | + 'dxr' => 'application/x-director', |
|
2114 | + 'dvi' => 'application/x-dvi', |
|
2115 | + 'gtar' => 'application/x-gtar', |
|
2116 | + 'php' => 'application/x-httpd-php', |
|
2117 | + 'php4' => 'application/x-httpd-php', |
|
2118 | + 'php3' => 'application/x-httpd-php', |
|
2119 | + 'phtml' => 'application/x-httpd-php', |
|
2120 | + 'phps' => 'application/x-httpd-php-source', |
|
2121 | + 'js' => 'application/x-javascript', |
|
2122 | + 'swf' => 'application/x-shockwave-flash', |
|
2123 | + 'sit' => 'application/x-stuffit', |
|
2124 | + 'tar' => 'application/x-tar', |
|
2125 | + 'tgz' => 'application/x-tar', |
|
2126 | + 'xhtml' => 'application/xhtml+xml', |
|
2127 | + 'xht' => 'application/xhtml+xml', |
|
2128 | + 'zip' => 'application/zip', |
|
2129 | + 'mid' => 'audio/midi', |
|
2130 | + 'midi' => 'audio/midi', |
|
2131 | + 'mpga' => 'audio/mpeg', |
|
2132 | + 'mp2' => 'audio/mpeg', |
|
2133 | + 'mp3' => 'audio/mpeg', |
|
2134 | + 'aif' => 'audio/x-aiff', |
|
2135 | + 'aiff' => 'audio/x-aiff', |
|
2136 | + 'aifc' => 'audio/x-aiff', |
|
2137 | + 'ram' => 'audio/x-pn-realaudio', |
|
2138 | + 'rm' => 'audio/x-pn-realaudio', |
|
2139 | + 'rpm' => 'audio/x-pn-realaudio-plugin', |
|
2140 | + 'ra' => 'audio/x-realaudio', |
|
2141 | + 'rv' => 'video/vnd.rn-realvideo', |
|
2142 | + 'wav' => 'audio/x-wav', |
|
2143 | + 'bmp' => 'image/bmp', |
|
2144 | + 'gif' => 'image/gif', |
|
2145 | + 'jpeg' => 'image/jpeg', |
|
2146 | + 'jpg' => 'image/jpeg', |
|
2147 | + 'jpe' => 'image/jpeg', |
|
2148 | + 'png' => 'image/png', |
|
2149 | + 'tiff' => 'image/tiff', |
|
2150 | + 'tif' => 'image/tiff', |
|
2151 | + 'css' => 'text/css', |
|
2152 | + 'html' => 'text/html', |
|
2153 | + 'htm' => 'text/html', |
|
2154 | + 'shtml' => 'text/html', |
|
2155 | + 'txt' => 'text/plain', |
|
2156 | + 'text' => 'text/plain', |
|
2157 | + 'log' => 'text/plain', |
|
2158 | + 'rtx' => 'text/richtext', |
|
2159 | + 'rtf' => 'text/rtf', |
|
2160 | + 'xml' => 'text/xml', |
|
2161 | + 'xsl' => 'text/xml', |
|
2162 | + 'mpeg' => 'video/mpeg', |
|
2163 | + 'mpg' => 'video/mpeg', |
|
2164 | + 'mpe' => 'video/mpeg', |
|
2165 | + 'qt' => 'video/quicktime', |
|
2166 | + 'mov' => 'video/quicktime', |
|
2167 | + 'avi' => 'video/x-msvideo', |
|
2168 | + 'movie' => 'video/x-sgi-movie', |
|
2169 | + 'doc' => 'application/msword', |
|
2170 | + 'word' => 'application/msword', |
|
2171 | + 'xl' => 'application/excel', |
|
2172 | + 'eml' => 'message/rfc822' |
|
2173 | 2173 | ); |
2174 | 2174 | return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)]; |
2175 | - } |
|
2176 | - |
|
2177 | - /** |
|
2178 | - * Set (or reset) Class Objects (variables) |
|
2179 | - * |
|
2180 | - * Usage Example: |
|
2181 | - * $page->set('X-Priority', '3'); |
|
2182 | - * |
|
2183 | - * @access public |
|
2184 | - * @param string $name Parameter Name |
|
2185 | - * @param mixed $value Parameter Value |
|
2186 | - * NOTE: will not work with arrays, there are no arrays to set/reset |
|
2187 | - * @todo Should this not be using __set() magic function? |
|
2188 | - */ |
|
2189 | - public function set($name, $value = '') { |
|
2175 | + } |
|
2176 | + |
|
2177 | + /** |
|
2178 | + * Set (or reset) Class Objects (variables) |
|
2179 | + * |
|
2180 | + * Usage Example: |
|
2181 | + * $page->set('X-Priority', '3'); |
|
2182 | + * |
|
2183 | + * @access public |
|
2184 | + * @param string $name Parameter Name |
|
2185 | + * @param mixed $value Parameter Value |
|
2186 | + * NOTE: will not work with arrays, there are no arrays to set/reset |
|
2187 | + * @todo Should this not be using __set() magic function? |
|
2188 | + */ |
|
2189 | + public function set($name, $value = '') { |
|
2190 | 2190 | try { |
2191 | - if (isset($this->$name) ) { |
|
2191 | + if (isset($this->$name) ) { |
|
2192 | 2192 | $this->$name = $value; |
2193 | - } else { |
|
2193 | + } else { |
|
2194 | 2194 | throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL); |
2195 | - } |
|
2195 | + } |
|
2196 | 2196 | } catch (Exception $e) { |
2197 | - $this->SetError($e->getMessage()); |
|
2198 | - if ($e->getCode() == self::STOP_CRITICAL) { |
|
2197 | + $this->SetError($e->getMessage()); |
|
2198 | + if ($e->getCode() == self::STOP_CRITICAL) { |
|
2199 | 2199 | return false; |
2200 | - } |
|
2200 | + } |
|
2201 | 2201 | } |
2202 | 2202 | return true; |
2203 | - } |
|
2204 | - |
|
2205 | - /** |
|
2206 | - * Strips newlines to prevent header injection. |
|
2207 | - * @access public |
|
2208 | - * @param string $str String |
|
2209 | - * @return string |
|
2210 | - */ |
|
2211 | - public function SecureHeader($str) { |
|
2203 | + } |
|
2204 | + |
|
2205 | + /** |
|
2206 | + * Strips newlines to prevent header injection. |
|
2207 | + * @access public |
|
2208 | + * @param string $str String |
|
2209 | + * @return string |
|
2210 | + */ |
|
2211 | + public function SecureHeader($str) { |
|
2212 | 2212 | $str = str_replace("\r", '', $str); |
2213 | 2213 | $str = str_replace("\n", '', $str); |
2214 | 2214 | return trim($str); |
2215 | - } |
|
2216 | - |
|
2217 | - /** |
|
2218 | - * Set the private key file and password to sign the message. |
|
2219 | - * |
|
2220 | - * @access public |
|
2221 | - * @param string $key_filename Parameter File Name |
|
2222 | - * @param string $key_pass Password for private key |
|
2223 | - */ |
|
2224 | - public function Sign($cert_filename, $key_filename, $key_pass) { |
|
2215 | + } |
|
2216 | + |
|
2217 | + /** |
|
2218 | + * Set the private key file and password to sign the message. |
|
2219 | + * |
|
2220 | + * @access public |
|
2221 | + * @param string $key_filename Parameter File Name |
|
2222 | + * @param string $key_pass Password for private key |
|
2223 | + */ |
|
2224 | + public function Sign($cert_filename, $key_filename, $key_pass) { |
|
2225 | 2225 | $this->sign_cert_file = $cert_filename; |
2226 | 2226 | $this->sign_key_file = $key_filename; |
2227 | 2227 | $this->sign_key_pass = $key_pass; |
2228 | - } |
|
2229 | - |
|
2230 | - /** |
|
2231 | - * Set the private key file and password to sign the message. |
|
2232 | - * |
|
2233 | - * @access public |
|
2234 | - * @param string $key_filename Parameter File Name |
|
2235 | - * @param string $key_pass Password for private key |
|
2236 | - */ |
|
2237 | - public function DKIM_QP($txt) { |
|
2228 | + } |
|
2229 | + |
|
2230 | + /** |
|
2231 | + * Set the private key file and password to sign the message. |
|
2232 | + * |
|
2233 | + * @access public |
|
2234 | + * @param string $key_filename Parameter File Name |
|
2235 | + * @param string $key_pass Password for private key |
|
2236 | + */ |
|
2237 | + public function DKIM_QP($txt) { |
|
2238 | 2238 | $tmp=""; |
2239 | 2239 | $line=""; |
2240 | 2240 | for ($i=0;$i<strlen($txt);$i++) { |
2241 | - $ord=ord($txt[$i]); |
|
2242 | - if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) { |
|
2241 | + $ord=ord($txt[$i]); |
|
2242 | + if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) { |
|
2243 | 2243 | $line.=$txt[$i]; |
2244 | - } else { |
|
2244 | + } else { |
|
2245 | 2245 | $line.="=".sprintf("%02X",$ord); |
2246 | - } |
|
2246 | + } |
|
2247 | 2247 | } |
2248 | 2248 | return $line; |
2249 | - } |
|
2250 | - |
|
2251 | - /** |
|
2252 | - * Generate DKIM signature |
|
2253 | - * |
|
2254 | - * @access public |
|
2255 | - * @param string $s Header |
|
2256 | - */ |
|
2257 | - public function DKIM_Sign($s) { |
|
2249 | + } |
|
2250 | + |
|
2251 | + /** |
|
2252 | + * Generate DKIM signature |
|
2253 | + * |
|
2254 | + * @access public |
|
2255 | + * @param string $s Header |
|
2256 | + */ |
|
2257 | + public function DKIM_Sign($s) { |
|
2258 | 2258 | $privKeyStr = file_get_contents($this->DKIM_private); |
2259 | 2259 | if ($this->DKIM_passphrase!='') { |
2260 | - $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase); |
|
2260 | + $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase); |
|
2261 | 2261 | } else { |
2262 | - $privKey = $privKeyStr; |
|
2262 | + $privKey = $privKeyStr; |
|
2263 | 2263 | } |
2264 | 2264 | if (openssl_sign($s, $signature, $privKey)) { |
2265 | - return base64_encode($signature); |
|
2265 | + return base64_encode($signature); |
|
2266 | + } |
|
2266 | 2267 | } |
2267 | - } |
|
2268 | 2268 | |
2269 | - /** |
|
2270 | - * Generate DKIM Canonicalization Header |
|
2271 | - * |
|
2272 | - * @access public |
|
2273 | - * @param string $s Header |
|
2274 | - */ |
|
2275 | - public function DKIM_HeaderC($s) { |
|
2269 | + /** |
|
2270 | + * Generate DKIM Canonicalization Header |
|
2271 | + * |
|
2272 | + * @access public |
|
2273 | + * @param string $s Header |
|
2274 | + */ |
|
2275 | + public function DKIM_HeaderC($s) { |
|
2276 | 2276 | $s=preg_replace("/\r\n\s+/"," ",$s); |
2277 | 2277 | $lines=explode("\r\n",$s); |
2278 | 2278 | foreach ($lines as $key=>$line) { |
2279 | - list($heading,$value)=explode(":",$line,2); |
|
2280 | - $heading=strtolower($heading); |
|
2281 | - $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces |
|
2282 | - $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value |
|
2279 | + list($heading,$value)=explode(":",$line,2); |
|
2280 | + $heading=strtolower($heading); |
|
2281 | + $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces |
|
2282 | + $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value |
|
2283 | 2283 | } |
2284 | 2284 | $s=implode("\r\n",$lines); |
2285 | 2285 | return $s; |
2286 | - } |
|
2287 | - |
|
2288 | - /** |
|
2289 | - * Generate DKIM Canonicalization Body |
|
2290 | - * |
|
2291 | - * @access public |
|
2292 | - * @param string $body Message Body |
|
2293 | - */ |
|
2294 | - public function DKIM_BodyC($body) { |
|
2286 | + } |
|
2287 | + |
|
2288 | + /** |
|
2289 | + * Generate DKIM Canonicalization Body |
|
2290 | + * |
|
2291 | + * @access public |
|
2292 | + * @param string $body Message Body |
|
2293 | + */ |
|
2294 | + public function DKIM_BodyC($body) { |
|
2295 | 2295 | if ($body == '') return "\r\n"; |
2296 | 2296 | // stabilize line endings |
2297 | 2297 | $body=str_replace("\r\n","\n",$body); |
2298 | 2298 | $body=str_replace("\n","\r\n",$body); |
2299 | 2299 | // END stabilize line endings |
2300 | 2300 | while (substr($body,strlen($body)-4,4) == "\r\n\r\n") { |
2301 | - $body=substr($body,0,strlen($body)-2); |
|
2301 | + $body=substr($body,0,strlen($body)-2); |
|
2302 | 2302 | } |
2303 | 2303 | return $body; |
2304 | - } |
|
2305 | - |
|
2306 | - /** |
|
2307 | - * Create the DKIM header, body, as new header |
|
2308 | - * |
|
2309 | - * @access public |
|
2310 | - * @param string $headers_line Header lines |
|
2311 | - * @param string $subject Subject |
|
2312 | - * @param string $body Body |
|
2313 | - */ |
|
2314 | - public function DKIM_Add($headers_line,$subject,$body) { |
|
2304 | + } |
|
2305 | + |
|
2306 | + /** |
|
2307 | + * Create the DKIM header, body, as new header |
|
2308 | + * |
|
2309 | + * @access public |
|
2310 | + * @param string $headers_line Header lines |
|
2311 | + * @param string $subject Subject |
|
2312 | + * @param string $body Body |
|
2313 | + */ |
|
2314 | + public function DKIM_Add($headers_line,$subject,$body) { |
|
2315 | 2315 | $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms |
2316 | 2316 | $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body |
2317 | 2317 | $DKIMquery = 'dns/txt'; // Query method |
@@ -2319,11 +2319,11 @@ discard block |
||
2319 | 2319 | $subject_header = "Subject: $subject"; |
2320 | 2320 | $headers = explode("\r\n",$headers_line); |
2321 | 2321 | foreach($headers as $header) { |
2322 | - if (strpos($header,'From:') === 0) { |
|
2322 | + if (strpos($header,'From:') === 0) { |
|
2323 | 2323 | $from_header=$header; |
2324 | - } elseif (strpos($header,'To:') === 0) { |
|
2324 | + } elseif (strpos($header,'To:') === 0) { |
|
2325 | 2325 | $to_header=$header; |
2326 | - } |
|
2326 | + } |
|
2327 | 2327 | } |
2328 | 2328 | $from = str_replace('|','=7C',$this->DKIM_QP($from_header)); |
2329 | 2329 | $to = str_replace('|','=7C',$this->DKIM_QP($to_header)); |
@@ -2344,19 +2344,19 @@ discard block |
||
2344 | 2344 | $toSign = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs); |
2345 | 2345 | $signed = $this->DKIM_Sign($toSign); |
2346 | 2346 | return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n"; |
2347 | - } |
|
2347 | + } |
|
2348 | 2348 | |
2349 | - protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) { |
|
2349 | + protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) { |
|
2350 | 2350 | if (!empty($this->action_function) && function_exists($this->action_function)) { |
2351 | - $params = array($isSent,$to,$cc,$bcc,$subject,$body); |
|
2352 | - call_user_func_array($this->action_function,$params); |
|
2351 | + $params = array($isSent,$to,$cc,$bcc,$subject,$body); |
|
2352 | + call_user_func_array($this->action_function,$params); |
|
2353 | + } |
|
2353 | 2354 | } |
2354 | - } |
|
2355 | 2355 | } |
2356 | 2356 | |
2357 | 2357 | class phpmailerException extends Exception { |
2358 | - public function errorMessage() { |
|
2358 | + public function errorMessage() { |
|
2359 | 2359 | $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n"; |
2360 | 2360 | return $errorMsg; |
2361 | - } |
|
2361 | + } |
|
2362 | 2362 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License |
39 | 39 | */ |
40 | 40 | |
41 | -if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n"); |
|
41 | +if (version_compare(PHP_VERSION, '5.0.0', '<')) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n"); |
|
42 | 42 | |
43 | 43 | class PHPMailer { |
44 | 44 | |
@@ -50,64 +50,64 @@ discard block |
||
50 | 50 | * Email priority (1 = High, 3 = Normal, 5 = low). |
51 | 51 | * @var int |
52 | 52 | */ |
53 | - public $Priority = 3; |
|
53 | + public $Priority = 3; |
|
54 | 54 | |
55 | 55 | /** |
56 | 56 | * Sets the CharSet of the message. |
57 | 57 | * @var string |
58 | 58 | */ |
59 | - public $CharSet = 'iso-8859-1'; |
|
59 | + public $CharSet = 'iso-8859-1'; |
|
60 | 60 | |
61 | 61 | /** |
62 | 62 | * Sets the Content-type of the message. |
63 | 63 | * @var string |
64 | 64 | */ |
65 | - public $ContentType = 'text/plain'; |
|
65 | + public $ContentType = 'text/plain'; |
|
66 | 66 | |
67 | 67 | /** |
68 | 68 | * Sets the Encoding of the message. Options for this are |
69 | 69 | * "8bit", "7bit", "binary", "base64", and "quoted-printable". |
70 | 70 | * @var string |
71 | 71 | */ |
72 | - public $Encoding = '8bit'; |
|
72 | + public $Encoding = '8bit'; |
|
73 | 73 | |
74 | 74 | /** |
75 | 75 | * Holds the most recent mailer error message. |
76 | 76 | * @var string |
77 | 77 | */ |
78 | - public $ErrorInfo = ''; |
|
78 | + public $ErrorInfo = ''; |
|
79 | 79 | |
80 | 80 | /** |
81 | 81 | * Sets the From email address for the message. |
82 | 82 | * @var string |
83 | 83 | */ |
84 | - public $From = 'root@localhost'; |
|
84 | + public $From = 'root@localhost'; |
|
85 | 85 | |
86 | 86 | /** |
87 | 87 | * Sets the From name of the message. |
88 | 88 | * @var string |
89 | 89 | */ |
90 | - public $FromName = 'Root User'; |
|
90 | + public $FromName = 'Root User'; |
|
91 | 91 | |
92 | 92 | /** |
93 | 93 | * Sets the Sender email (Return-Path) of the message. If not empty, |
94 | 94 | * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode. |
95 | 95 | * @var string |
96 | 96 | */ |
97 | - public $Sender = ''; |
|
97 | + public $Sender = ''; |
|
98 | 98 | |
99 | 99 | /** |
100 | 100 | * Sets the Subject of the message. |
101 | 101 | * @var string |
102 | 102 | */ |
103 | - public $Subject = ''; |
|
103 | + public $Subject = ''; |
|
104 | 104 | |
105 | 105 | /** |
106 | 106 | * Sets the Body of the message. This can be either an HTML or text body. |
107 | 107 | * If HTML then run IsHTML(true). |
108 | 108 | * @var string |
109 | 109 | */ |
110 | - public $Body = ''; |
|
110 | + public $Body = ''; |
|
111 | 111 | |
112 | 112 | /** |
113 | 113 | * Sets the text-only body of the message. This automatically sets the |
@@ -116,39 +116,39 @@ discard block |
||
116 | 116 | * that can read HTML will view the normal Body. |
117 | 117 | * @var string |
118 | 118 | */ |
119 | - public $AltBody = ''; |
|
119 | + public $AltBody = ''; |
|
120 | 120 | |
121 | 121 | /** |
122 | 122 | * Sets word wrapping on the body of the message to a given number of |
123 | 123 | * characters. |
124 | 124 | * @var int |
125 | 125 | */ |
126 | - public $WordWrap = 0; |
|
126 | + public $WordWrap = 0; |
|
127 | 127 | |
128 | 128 | /** |
129 | 129 | * Method to send mail: ("mail", "sendmail", or "smtp"). |
130 | 130 | * @var string |
131 | 131 | */ |
132 | - public $Mailer = 'mail'; |
|
132 | + public $Mailer = 'mail'; |
|
133 | 133 | |
134 | 134 | /** |
135 | 135 | * Sets the path of the sendmail program. |
136 | 136 | * @var string |
137 | 137 | */ |
138 | - public $Sendmail = '/usr/sbin/sendmail'; |
|
138 | + public $Sendmail = '/usr/sbin/sendmail'; |
|
139 | 139 | |
140 | 140 | /** |
141 | 141 | * Path to PHPMailer plugins. Useful if the SMTP class |
142 | 142 | * is in a different directory than the PHP include path. |
143 | 143 | * @var string |
144 | 144 | */ |
145 | - public $PluginDir = ''; |
|
145 | + public $PluginDir = ''; |
|
146 | 146 | |
147 | 147 | /** |
148 | 148 | * Sets the email address that a reading confirmation will be sent. |
149 | 149 | * @var string |
150 | 150 | */ |
151 | - public $ConfirmReadingTo = ''; |
|
151 | + public $ConfirmReadingTo = ''; |
|
152 | 152 | |
153 | 153 | /** |
154 | 154 | * Sets the hostname to use in Message-Id and Received headers |
@@ -156,14 +156,14 @@ discard block |
||
156 | 156 | * by SERVER_NAME is used or 'localhost.localdomain'. |
157 | 157 | * @var string |
158 | 158 | */ |
159 | - public $Hostname = ''; |
|
159 | + public $Hostname = ''; |
|
160 | 160 | |
161 | 161 | /** |
162 | 162 | * Sets the message ID to be used in the Message-Id header. |
163 | 163 | * If empty, a unique id will be generated. |
164 | 164 | * @var string |
165 | 165 | */ |
166 | - public $MessageID = ''; |
|
166 | + public $MessageID = ''; |
|
167 | 167 | |
168 | 168 | ///////////////////////////////////////////////// |
169 | 169 | // PROPERTIES FOR SMTP |
@@ -177,57 +177,57 @@ discard block |
||
177 | 177 | * Hosts will be tried in order. |
178 | 178 | * @var string |
179 | 179 | */ |
180 | - public $Host = 'localhost'; |
|
180 | + public $Host = 'localhost'; |
|
181 | 181 | |
182 | 182 | /** |
183 | 183 | * Sets the default SMTP server port. |
184 | 184 | * @var int |
185 | 185 | */ |
186 | - public $Port = 25; |
|
186 | + public $Port = 25; |
|
187 | 187 | |
188 | 188 | /** |
189 | 189 | * Sets the SMTP HELO of the message (Default is $Hostname). |
190 | 190 | * @var string |
191 | 191 | */ |
192 | - public $Helo = ''; |
|
192 | + public $Helo = ''; |
|
193 | 193 | |
194 | 194 | /** |
195 | 195 | * Sets connection prefix. |
196 | 196 | * Options are "", "ssl" or "tls" |
197 | 197 | * @var string |
198 | 198 | */ |
199 | - public $SMTPSecure = ''; |
|
199 | + public $SMTPSecure = ''; |
|
200 | 200 | |
201 | 201 | /** |
202 | 202 | * Sets SMTP authentication. Utilizes the Username and Password variables. |
203 | 203 | * @var bool |
204 | 204 | */ |
205 | - public $SMTPAuth = false; |
|
205 | + public $SMTPAuth = false; |
|
206 | 206 | |
207 | 207 | /** |
208 | 208 | * Sets SMTP username. |
209 | 209 | * @var string |
210 | 210 | */ |
211 | - public $Username = ''; |
|
211 | + public $Username = ''; |
|
212 | 212 | |
213 | 213 | /** |
214 | 214 | * Sets SMTP password. |
215 | 215 | * @var string |
216 | 216 | */ |
217 | - public $Password = ''; |
|
217 | + public $Password = ''; |
|
218 | 218 | |
219 | 219 | /** |
220 | 220 | * Sets the SMTP server timeout in seconds. |
221 | 221 | * This function will not work with the win32 version. |
222 | 222 | * @var int |
223 | 223 | */ |
224 | - public $Timeout = 10; |
|
224 | + public $Timeout = 10; |
|
225 | 225 | |
226 | 226 | /** |
227 | 227 | * Sets SMTP class debugging on or off. |
228 | 228 | * @var bool |
229 | 229 | */ |
230 | - public $SMTPDebug = false; |
|
230 | + public $SMTPDebug = false; |
|
231 | 231 | |
232 | 232 | /** |
233 | 233 | * Prevents the SMTP connection from being closed after each mail |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | * emails, instead of sending to entire TO addresses |
243 | 243 | * @var bool |
244 | 244 | */ |
245 | - public $SingleTo = false; |
|
245 | + public $SingleTo = false; |
|
246 | 246 | |
247 | 247 | /** |
248 | 248 | * If SingleTo is true, this provides the array to hold the email addresses |
@@ -254,34 +254,34 @@ discard block |
||
254 | 254 | * Provides the ability to change the line ending |
255 | 255 | * @var string |
256 | 256 | */ |
257 | - public $LE = "\n"; |
|
257 | + public $LE = "\n"; |
|
258 | 258 | |
259 | 259 | /** |
260 | 260 | * Used with DKIM DNS Resource Record |
261 | 261 | * @var string |
262 | 262 | */ |
263 | - public $DKIM_selector = 'phpmailer'; |
|
263 | + public $DKIM_selector = 'phpmailer'; |
|
264 | 264 | |
265 | 265 | /** |
266 | 266 | * Used with DKIM DNS Resource Record |
267 | 267 | * optional, in format of email address '[email protected]' |
268 | 268 | * @var string |
269 | 269 | */ |
270 | - public $DKIM_identity = ''; |
|
270 | + public $DKIM_identity = ''; |
|
271 | 271 | |
272 | 272 | /** |
273 | 273 | * Used with DKIM DNS Resource Record |
274 | 274 | * optional, in format of email address '[email protected]' |
275 | 275 | * @var string |
276 | 276 | */ |
277 | - public $DKIM_domain = ''; |
|
277 | + public $DKIM_domain = ''; |
|
278 | 278 | |
279 | 279 | /** |
280 | 280 | * Used with DKIM DNS Resource Record |
281 | 281 | * optional, in format of email address '[email protected]' |
282 | 282 | * @var string |
283 | 283 | */ |
284 | - public $DKIM_private = ''; |
|
284 | + public $DKIM_private = ''; |
|
285 | 285 | |
286 | 286 | /** |
287 | 287 | * Callback Action function name |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | * Sets the PHPMailer Version number |
301 | 301 | * @var string |
302 | 302 | */ |
303 | - public $Version = '5.1'; |
|
303 | + public $Version = '5.1'; |
|
304 | 304 | |
305 | 305 | ///////////////////////////////////////////////// |
306 | 306 | // PROPERTIES, PRIVATE AND PROTECTED |
@@ -451,13 +451,13 @@ discard block |
||
451 | 451 | */ |
452 | 452 | private function AddAnAddress($kind, $address, $name = '') { |
453 | 453 | if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) { |
454 | - error_log('Invalid recipient array: ' . $kind); |
|
454 | + error_log('Invalid recipient array: '.$kind); |
|
455 | 455 | return false; |
456 | 456 | } |
457 | 457 | $address = trim($address); |
458 | 458 | $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim |
459 | 459 | if (!self::ValidateAddress($address)) { |
460 | - $this->SetError($this->Lang('invalid_address').': '. $address); |
|
460 | + $this->SetError($this->Lang('invalid_address').': '.$address); |
|
461 | 461 | if ($this->exceptions) { |
462 | 462 | throw new phpmailerException($this->Lang('invalid_address').': '.$address); |
463 | 463 | } |
@@ -485,11 +485,11 @@ discard block |
||
485 | 485 | * @param string $name |
486 | 486 | * @return boolean |
487 | 487 | */ |
488 | - public function SetFrom($address, $name = '',$auto=1) { |
|
488 | + public function SetFrom($address, $name = '', $auto = 1) { |
|
489 | 489 | $address = trim($address); |
490 | 490 | $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim |
491 | 491 | if (!self::ValidateAddress($address)) { |
492 | - $this->SetError($this->Lang('invalid_address').': '. $address); |
|
492 | + $this->SetError($this->Lang('invalid_address').': '.$address); |
|
493 | 493 | if ($this->exceptions) { |
494 | 494 | throw new phpmailerException($this->Lang('invalid_address').': '.$address); |
495 | 495 | } |
@@ -522,7 +522,7 @@ discard block |
||
522 | 522 | */ |
523 | 523 | public static function ValidateAddress($address) { |
524 | 524 | if (function_exists('filter_var')) { //Introduced in PHP 5.2 |
525 | - if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) { |
|
525 | + if (filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) { |
|
526 | 526 | return false; |
527 | 527 | } else { |
528 | 528 | return true; |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | } |
550 | 550 | |
551 | 551 | // Set whether the message is multipart/alternative |
552 | - if(!empty($this->AltBody)) { |
|
552 | + if (!empty($this->AltBody)) { |
|
553 | 553 | $this->ContentType = 'multipart/alternative'; |
554 | 554 | } |
555 | 555 | |
@@ -564,12 +564,12 @@ discard block |
||
564 | 564 | |
565 | 565 | // digitally sign with DKIM if enabled |
566 | 566 | if ($this->DKIM_domain && $this->DKIM_private) { |
567 | - $header_dkim = $this->DKIM_Add($header,$this->Subject,$body); |
|
568 | - $header = str_replace("\r\n","\n",$header_dkim) . $header; |
|
567 | + $header_dkim = $this->DKIM_Add($header, $this->Subject, $body); |
|
568 | + $header = str_replace("\r\n", "\n", $header_dkim).$header; |
|
569 | 569 | } |
570 | 570 | |
571 | 571 | // Choose the mailer and send through it |
572 | - switch($this->Mailer) { |
|
572 | + switch ($this->Mailer) { |
|
573 | 573 | case 'sendmail': |
574 | 574 | return $this->SendmailSend($header, $body); |
575 | 575 | case 'smtp': |
@@ -625,32 +625,32 @@ discard block |
||
625 | 625 | } |
626 | 626 | if ($this->SingleTo === true) { |
627 | 627 | foreach ($this->SingleToArray as $key => $val) { |
628 | - if(!@$mail = popen($sendmail, 'w')) { |
|
629 | - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
|
628 | + if (!@$mail = popen($sendmail, 'w')) { |
|
629 | + throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL); |
|
630 | 630 | } |
631 | - fputs($mail, "To: " . $val . "\n"); |
|
631 | + fputs($mail, "To: ".$val."\n"); |
|
632 | 632 | fputs($mail, $header); |
633 | 633 | fputs($mail, $body); |
634 | 634 | $result = pclose($mail); |
635 | 635 | // implement call back function if it exists |
636 | 636 | $isSent = ($result == 0) ? 1 : 0; |
637 | - $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); |
|
638 | - if($result != 0) { |
|
639 | - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
|
637 | + $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body); |
|
638 | + if ($result != 0) { |
|
639 | + throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL); |
|
640 | 640 | } |
641 | 641 | } |
642 | 642 | } else { |
643 | - if(!@$mail = popen($sendmail, 'w')) { |
|
644 | - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
|
643 | + if (!@$mail = popen($sendmail, 'w')) { |
|
644 | + throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL); |
|
645 | 645 | } |
646 | 646 | fputs($mail, $header); |
647 | 647 | fputs($mail, $body); |
648 | 648 | $result = pclose($mail); |
649 | 649 | // implement call back function if it exists |
650 | 650 | $isSent = ($result == 0) ? 1 : 0; |
651 | - $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body); |
|
652 | - if($result != 0) { |
|
653 | - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); |
|
651 | + $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body); |
|
652 | + if ($result != 0) { |
|
653 | + throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL); |
|
654 | 654 | } |
655 | 655 | } |
656 | 656 | return true; |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | */ |
666 | 666 | protected function MailSend($header, $body) { |
667 | 667 | $toArr = array(); |
668 | - foreach($this->to as $t) { |
|
668 | + foreach ($this->to as $t) { |
|
669 | 669 | $toArr[] = $this->AddrFormat($t); |
670 | 670 | } |
671 | 671 | $to = implode(', ', $toArr); |
@@ -679,13 +679,13 @@ discard block |
||
679 | 679 | $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); |
680 | 680 | // implement call back function if it exists |
681 | 681 | $isSent = ($rt == 1) ? 1 : 0; |
682 | - $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); |
|
682 | + $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body); |
|
683 | 683 | } |
684 | 684 | } else { |
685 | 685 | $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); |
686 | 686 | // implement call back function if it exists |
687 | 687 | $isSent = ($rt == 1) ? 1 : 0; |
688 | - $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body); |
|
688 | + $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body); |
|
689 | 689 | } |
690 | 690 | } else { |
691 | 691 | if ($this->SingleTo === true && count($toArr) > 1) { |
@@ -693,19 +693,19 @@ discard block |
||
693 | 693 | $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); |
694 | 694 | // implement call back function if it exists |
695 | 695 | $isSent = ($rt == 1) ? 1 : 0; |
696 | - $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); |
|
696 | + $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body); |
|
697 | 697 | } |
698 | 698 | } else { |
699 | 699 | $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header); |
700 | 700 | // implement call back function if it exists |
701 | 701 | $isSent = ($rt == 1) ? 1 : 0; |
702 | - $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body); |
|
702 | + $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body); |
|
703 | 703 | } |
704 | 704 | } |
705 | 705 | if (isset($old_from)) { |
706 | 706 | ini_set('sendmail_from', $old_from); |
707 | 707 | } |
708 | - if(!$rt) { |
|
708 | + if (!$rt) { |
|
709 | 709 | throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL); |
710 | 710 | } |
711 | 711 | return true; |
@@ -721,10 +721,10 @@ discard block |
||
721 | 721 | * @return bool |
722 | 722 | */ |
723 | 723 | protected function SmtpSend($header, $body) { |
724 | - require_once $this->PluginDir . 'class.smtp.php'; |
|
724 | + require_once $this->PluginDir.'class.smtp.php'; |
|
725 | 725 | $bad_rcpt = array(); |
726 | 726 | |
727 | - if(!$this->SmtpConnect()) { |
|
727 | + if (!$this->SmtpConnect()) { |
|
728 | 728 | throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL); |
729 | 729 | } |
730 | 730 | |
@@ -733,57 +733,57 @@ discard block |
||
733 | 733 | } else { |
734 | 734 | $smtp_from = $this->From; |
735 | 735 | } |
736 | - if(!$this->smtp->Mail($smtp_from)) { |
|
737 | - throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL); |
|
736 | + if (!$this->smtp->Mail($smtp_from)) { |
|
737 | + throw new phpmailerException($this->Lang('from_failed').$smtp_from, self::STOP_CRITICAL); |
|
738 | 738 | } |
739 | 739 | |
740 | 740 | // Attempt to send attach all recipients |
741 | - foreach($this->to as $to) { |
|
741 | + foreach ($this->to as $to) { |
|
742 | 742 | if (!$this->smtp->Recipient($to[0])) { |
743 | 743 | $bad_rcpt[] = $to[0]; |
744 | 744 | // implement call back function if it exists |
745 | 745 | $isSent = 0; |
746 | - $this->doCallback($isSent,$to[0],'','',$this->Subject,$body); |
|
746 | + $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body); |
|
747 | 747 | } else { |
748 | 748 | // implement call back function if it exists |
749 | 749 | $isSent = 1; |
750 | - $this->doCallback($isSent,$to[0],'','',$this->Subject,$body); |
|
750 | + $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body); |
|
751 | 751 | } |
752 | 752 | } |
753 | - foreach($this->cc as $cc) { |
|
753 | + foreach ($this->cc as $cc) { |
|
754 | 754 | if (!$this->smtp->Recipient($cc[0])) { |
755 | 755 | $bad_rcpt[] = $cc[0]; |
756 | 756 | // implement call back function if it exists |
757 | 757 | $isSent = 0; |
758 | - $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body); |
|
758 | + $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body); |
|
759 | 759 | } else { |
760 | 760 | // implement call back function if it exists |
761 | 761 | $isSent = 1; |
762 | - $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body); |
|
762 | + $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body); |
|
763 | 763 | } |
764 | 764 | } |
765 | - foreach($this->bcc as $bcc) { |
|
765 | + foreach ($this->bcc as $bcc) { |
|
766 | 766 | if (!$this->smtp->Recipient($bcc[0])) { |
767 | 767 | $bad_rcpt[] = $bcc[0]; |
768 | 768 | // implement call back function if it exists |
769 | 769 | $isSent = 0; |
770 | - $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body); |
|
770 | + $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body); |
|
771 | 771 | } else { |
772 | 772 | // implement call back function if it exists |
773 | 773 | $isSent = 1; |
774 | - $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body); |
|
774 | + $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body); |
|
775 | 775 | } |
776 | 776 | } |
777 | 777 | |
778 | 778 | |
779 | - if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses |
|
779 | + if (count($bad_rcpt) > 0) { //Create error message for any bad addresses |
|
780 | 780 | $badaddresses = implode(', ', $bad_rcpt); |
781 | - throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses); |
|
781 | + throw new phpmailerException($this->Lang('recipients_failed').$badaddresses); |
|
782 | 782 | } |
783 | - if(!$this->smtp->Data($header . $body)) { |
|
783 | + if (!$this->smtp->Data($header.$body)) { |
|
784 | 784 | throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL); |
785 | 785 | } |
786 | - if($this->SMTPKeepAlive == true) { |
|
786 | + if ($this->SMTPKeepAlive == true) { |
|
787 | 787 | $this->smtp->Reset(); |
788 | 788 | } |
789 | 789 | return true; |
@@ -797,7 +797,7 @@ discard block |
||
797 | 797 | * @return bool |
798 | 798 | */ |
799 | 799 | public function SmtpConnect() { |
800 | - if(is_null($this->smtp)) { |
|
800 | + if (is_null($this->smtp)) { |
|
801 | 801 | $this->smtp = new SMTP(); |
802 | 802 | } |
803 | 803 | |
@@ -808,7 +808,7 @@ discard block |
||
808 | 808 | |
809 | 809 | // Retry while there is no connection |
810 | 810 | try { |
811 | - while($index < count($hosts) && !$connection) { |
|
811 | + while ($index < count($hosts) && !$connection) { |
|
812 | 812 | $hostinfo = array(); |
813 | 813 | if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) { |
814 | 814 | $host = $hostinfo[1]; |
@@ -821,7 +821,7 @@ discard block |
||
821 | 821 | $tls = ($this->SMTPSecure == 'tls'); |
822 | 822 | $ssl = ($this->SMTPSecure == 'ssl'); |
823 | 823 | |
824 | - if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) { |
|
824 | + if ($this->smtp->Connect(($ssl ? 'ssl://' : '').$host, $port, $this->Timeout)) { |
|
825 | 825 | |
826 | 826 | $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname()); |
827 | 827 | $this->smtp->Hello($hello); |
@@ -859,8 +859,8 @@ discard block |
||
859 | 859 | * @return void |
860 | 860 | */ |
861 | 861 | public function SmtpClose() { |
862 | - if(!is_null($this->smtp)) { |
|
863 | - if($this->smtp->Connected()) { |
|
862 | + if (!is_null($this->smtp)) { |
|
863 | + if ($this->smtp->Connected()) { |
|
864 | 864 | $this->smtp->Quit(); |
865 | 865 | $this->smtp->Close(); |
866 | 866 | } |
@@ -922,7 +922,7 @@ discard block |
||
922 | 922 | * @return string |
923 | 923 | */ |
924 | 924 | public function AddrAppend($type, $addr) { |
925 | - $addr_str = $type . ': '; |
|
925 | + $addr_str = $type.': '; |
|
926 | 926 | $addresses = array(); |
927 | 927 | foreach ($addr as $a) { |
928 | 928 | $addresses[] = $this->AddrFormat($a); |
@@ -942,7 +942,7 @@ discard block |
||
942 | 942 | if (empty($addr[1])) { |
943 | 943 | return $this->SecureHeader($addr[0]); |
944 | 944 | } else { |
945 | - return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">"; |
|
945 | + return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase')." <".$this->SecureHeader($addr[0]).">"; |
|
946 | 946 | } |
947 | 947 | } |
948 | 948 | |
@@ -969,10 +969,10 @@ discard block |
||
969 | 969 | |
970 | 970 | $line = explode($this->LE, $message); |
971 | 971 | $message = ''; |
972 | - for ($i=0 ;$i < count($line); $i++) { |
|
972 | + for ($i = 0; $i < count($line); $i++) { |
|
973 | 973 | $line_part = explode(' ', $line[$i]); |
974 | 974 | $buf = ''; |
975 | - for ($e = 0; $e<count($line_part); $e++) { |
|
975 | + for ($e = 0; $e < count($line_part); $e++) { |
|
976 | 976 | $word = $line_part[$e]; |
977 | 977 | if ($qp_mode and (strlen($word) > $length)) { |
978 | 978 | $space_left = $length - strlen($buf) - 1; |
@@ -988,10 +988,10 @@ discard block |
||
988 | 988 | } |
989 | 989 | $part = substr($word, 0, $len); |
990 | 990 | $word = substr($word, $len); |
991 | - $buf .= ' ' . $part; |
|
992 | - $message .= $buf . sprintf("=%s", $this->LE); |
|
991 | + $buf .= ' '.$part; |
|
992 | + $message .= $buf.sprintf("=%s", $this->LE); |
|
993 | 993 | } else { |
994 | - $message .= $buf . $soft_break; |
|
994 | + $message .= $buf.$soft_break; |
|
995 | 995 | } |
996 | 996 | $buf = ''; |
997 | 997 | } |
@@ -1008,22 +1008,22 @@ discard block |
||
1008 | 1008 | $word = substr($word, $len); |
1009 | 1009 | |
1010 | 1010 | if (strlen($word) > 0) { |
1011 | - $message .= $part . sprintf("=%s", $this->LE); |
|
1011 | + $message .= $part.sprintf("=%s", $this->LE); |
|
1012 | 1012 | } else { |
1013 | 1013 | $buf = $part; |
1014 | 1014 | } |
1015 | 1015 | } |
1016 | 1016 | } else { |
1017 | 1017 | $buf_o = $buf; |
1018 | - $buf .= ($e == 0) ? $word : (' ' . $word); |
|
1018 | + $buf .= ($e == 0) ? $word : (' '.$word); |
|
1019 | 1019 | |
1020 | 1020 | if (strlen($buf) > $length and $buf_o != '') { |
1021 | - $message .= $buf_o . $soft_break; |
|
1021 | + $message .= $buf_o.$soft_break; |
|
1022 | 1022 | $buf = $word; |
1023 | 1023 | } |
1024 | 1024 | } |
1025 | 1025 | } |
1026 | - $message .= $buf . $this->LE; |
|
1026 | + $message .= $buf.$this->LE; |
|
1027 | 1027 | } |
1028 | 1028 | |
1029 | 1029 | return $message; |
@@ -1052,8 +1052,7 @@ discard block |
||
1052 | 1052 | if ($dec < 128) { // Single byte character. |
1053 | 1053 | // If the encoded char was found at pos 0, it will fit |
1054 | 1054 | // otherwise reduce maxLength to start of the encoded char |
1055 | - $maxLength = ($encodedCharPos == 0) ? $maxLength : |
|
1056 | - $maxLength - ($lookBack - $encodedCharPos); |
|
1055 | + $maxLength = ($encodedCharPos == 0) ? $maxLength : $maxLength - ($lookBack - $encodedCharPos); |
|
1057 | 1056 | $foundSplitPos = true; |
1058 | 1057 | } elseif ($dec >= 192) { // First byte of a multi byte character |
1059 | 1058 | // Reduce maxLength to split at start of character |
@@ -1077,11 +1076,11 @@ discard block |
||
1077 | 1076 | * @return void |
1078 | 1077 | */ |
1079 | 1078 | public function SetWordWrap() { |
1080 | - if($this->WordWrap < 1) { |
|
1079 | + if ($this->WordWrap < 1) { |
|
1081 | 1080 | return; |
1082 | 1081 | } |
1083 | 1082 | |
1084 | - switch($this->message_type) { |
|
1083 | + switch ($this->message_type) { |
|
1085 | 1084 | case 'alt': |
1086 | 1085 | case 'alt_attachments': |
1087 | 1086 | $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap); |
@@ -1102,24 +1101,24 @@ discard block |
||
1102 | 1101 | |
1103 | 1102 | // Set the boundaries |
1104 | 1103 | $uniq_id = md5(uniqid(time())); |
1105 | - $this->boundary[1] = 'b1_' . $uniq_id; |
|
1106 | - $this->boundary[2] = 'b2_' . $uniq_id; |
|
1104 | + $this->boundary[1] = 'b1_'.$uniq_id; |
|
1105 | + $this->boundary[2] = 'b2_'.$uniq_id; |
|
1107 | 1106 | |
1108 | 1107 | $result .= $this->HeaderLine('Date', self::RFCDate()); |
1109 | - if($this->Sender == '') { |
|
1108 | + if ($this->Sender == '') { |
|
1110 | 1109 | $result .= $this->HeaderLine('Return-Path', trim($this->From)); |
1111 | 1110 | } else { |
1112 | 1111 | $result .= $this->HeaderLine('Return-Path', trim($this->Sender)); |
1113 | 1112 | } |
1114 | 1113 | |
1115 | 1114 | // To be created automatically by mail() |
1116 | - if($this->Mailer != 'mail') { |
|
1115 | + if ($this->Mailer != 'mail') { |
|
1117 | 1116 | if ($this->SingleTo === true) { |
1118 | - foreach($this->to as $t) { |
|
1117 | + foreach ($this->to as $t) { |
|
1119 | 1118 | $this->SingleToArray[] = $this->AddrFormat($t); |
1120 | 1119 | } |
1121 | 1120 | } else { |
1122 | - if(count($this->to) > 0) { |
|
1121 | + if (count($this->to) > 0) { |
|
1123 | 1122 | $result .= $this->AddrAppend('To', $this->to); |
1124 | 1123 | } elseif (count($this->cc) == 0) { |
1125 | 1124 | $result .= $this->HeaderLine('To', 'undisclosed-recipients:;'); |
@@ -1133,38 +1132,38 @@ discard block |
||
1133 | 1132 | $result .= $this->AddrAppend('From', $from); |
1134 | 1133 | |
1135 | 1134 | // sendmail and mail() extract Cc from the header before sending |
1136 | - if(count($this->cc) > 0) { |
|
1135 | + if (count($this->cc) > 0) { |
|
1137 | 1136 | $result .= $this->AddrAppend('Cc', $this->cc); |
1138 | 1137 | } |
1139 | 1138 | |
1140 | 1139 | // sendmail and mail() extract Bcc from the header before sending |
1141 | - if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) { |
|
1140 | + if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) { |
|
1142 | 1141 | $result .= $this->AddrAppend('Bcc', $this->bcc); |
1143 | 1142 | } |
1144 | 1143 | |
1145 | - if(count($this->ReplyTo) > 0) { |
|
1144 | + if (count($this->ReplyTo) > 0) { |
|
1146 | 1145 | $result .= $this->AddrAppend('Reply-to', $this->ReplyTo); |
1147 | 1146 | } |
1148 | 1147 | |
1149 | 1148 | // mail() sets the subject itself |
1150 | - if($this->Mailer != 'mail') { |
|
1149 | + if ($this->Mailer != 'mail') { |
|
1151 | 1150 | $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject))); |
1152 | 1151 | } |
1153 | 1152 | |
1154 | - if($this->MessageID != '') { |
|
1155 | - $result .= $this->HeaderLine('Message-ID',$this->MessageID); |
|
1153 | + if ($this->MessageID != '') { |
|
1154 | + $result .= $this->HeaderLine('Message-ID', $this->MessageID); |
|
1156 | 1155 | } else { |
1157 | 1156 | $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE); |
1158 | 1157 | } |
1159 | 1158 | $result .= $this->HeaderLine('X-Priority', $this->Priority); |
1160 | 1159 | $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)'); |
1161 | 1160 | |
1162 | - if($this->ConfirmReadingTo != '') { |
|
1163 | - $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>'); |
|
1161 | + if ($this->ConfirmReadingTo != '') { |
|
1162 | + $result .= $this->HeaderLine('Disposition-Notification-To', '<'.trim($this->ConfirmReadingTo).'>'); |
|
1164 | 1163 | } |
1165 | 1164 | |
1166 | 1165 | // Add custom headers |
1167 | - for($index = 0; $index < count($this->CustomHeader); $index++) { |
|
1166 | + for ($index = 0; $index < count($this->CustomHeader); $index++) { |
|
1168 | 1167 | $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1]))); |
1169 | 1168 | } |
1170 | 1169 | if (!$this->sign_key_file) { |
@@ -1182,27 +1181,27 @@ discard block |
||
1182 | 1181 | */ |
1183 | 1182 | public function GetMailMIME() { |
1184 | 1183 | $result = ''; |
1185 | - switch($this->message_type) { |
|
1184 | + switch ($this->message_type) { |
|
1186 | 1185 | case 'plain': |
1187 | 1186 | $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding); |
1188 | 1187 | $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet); |
1189 | 1188 | break; |
1190 | 1189 | case 'attachments': |
1191 | 1190 | case 'alt_attachments': |
1192 | - if($this->InlineImageExists()){ |
|
1191 | + if ($this->InlineImageExists()) { |
|
1193 | 1192 | $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE); |
1194 | 1193 | } else { |
1195 | 1194 | $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;'); |
1196 | - $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); |
|
1195 | + $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"'); |
|
1197 | 1196 | } |
1198 | 1197 | break; |
1199 | 1198 | case 'alt': |
1200 | 1199 | $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;'); |
1201 | - $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); |
|
1200 | + $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"'); |
|
1202 | 1201 | break; |
1203 | 1202 | } |
1204 | 1203 | |
1205 | - if($this->Mailer != 'mail') { |
|
1204 | + if ($this->Mailer != 'mail') { |
|
1206 | 1205 | $result .= $this->LE.$this->LE; |
1207 | 1206 | } |
1208 | 1207 | |
@@ -1223,7 +1222,7 @@ discard block |
||
1223 | 1222 | |
1224 | 1223 | $this->SetWordWrap(); |
1225 | 1224 | |
1226 | - switch($this->message_type) { |
|
1225 | + switch ($this->message_type) { |
|
1227 | 1226 | case 'alt': |
1228 | 1227 | $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', ''); |
1229 | 1228 | $body .= $this->EncodeString($this->AltBody, $this->Encoding); |
@@ -1244,11 +1243,11 @@ discard block |
||
1244 | 1243 | break; |
1245 | 1244 | case 'alt_attachments': |
1246 | 1245 | $body .= sprintf("--%s%s", $this->boundary[1], $this->LE); |
1247 | - $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE); |
|
1248 | - $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body |
|
1246 | + $body .= sprintf("Content-Type: %s;%s"."\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE); |
|
1247 | + $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '').$this->LE; // Create text body |
|
1249 | 1248 | $body .= $this->EncodeString($this->AltBody, $this->Encoding); |
1250 | 1249 | $body .= $this->LE.$this->LE; |
1251 | - $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body |
|
1250 | + $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '').$this->LE; // Create the HTML body |
|
1252 | 1251 | $body .= $this->EncodeString($this->Body, $this->Encoding); |
1253 | 1252 | $body .= $this->LE.$this->LE; |
1254 | 1253 | $body .= $this->EndBoundary($this->boundary[2]); |
@@ -1289,16 +1288,16 @@ discard block |
||
1289 | 1288 | */ |
1290 | 1289 | private function GetBoundary($boundary, $charSet, $contentType, $encoding) { |
1291 | 1290 | $result = ''; |
1292 | - if($charSet == '') { |
|
1291 | + if ($charSet == '') { |
|
1293 | 1292 | $charSet = $this->CharSet; |
1294 | 1293 | } |
1295 | - if($contentType == '') { |
|
1294 | + if ($contentType == '') { |
|
1296 | 1295 | $contentType = $this->ContentType; |
1297 | 1296 | } |
1298 | - if($encoding == '') { |
|
1297 | + if ($encoding == '') { |
|
1299 | 1298 | $encoding = $this->Encoding; |
1300 | 1299 | } |
1301 | - $result .= $this->TextLine('--' . $boundary); |
|
1300 | + $result .= $this->TextLine('--'.$boundary); |
|
1302 | 1301 | $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet); |
1303 | 1302 | $result .= $this->LE; |
1304 | 1303 | $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding); |
@@ -1312,7 +1311,7 @@ discard block |
||
1312 | 1311 | * @access private |
1313 | 1312 | */ |
1314 | 1313 | private function EndBoundary($boundary) { |
1315 | - return $this->LE . '--' . $boundary . '--' . $this->LE; |
|
1314 | + return $this->LE.'--'.$boundary.'--'.$this->LE; |
|
1316 | 1315 | } |
1317 | 1316 | |
1318 | 1317 | /** |
@@ -1321,16 +1320,16 @@ discard block |
||
1321 | 1320 | * @return void |
1322 | 1321 | */ |
1323 | 1322 | private function SetMessageType() { |
1324 | - if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) { |
|
1323 | + if (count($this->attachment) < 1 && strlen($this->AltBody) < 1) { |
|
1325 | 1324 | $this->message_type = 'plain'; |
1326 | 1325 | } else { |
1327 | - if(count($this->attachment) > 0) { |
|
1326 | + if (count($this->attachment) > 0) { |
|
1328 | 1327 | $this->message_type = 'attachments'; |
1329 | 1328 | } |
1330 | - if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) { |
|
1329 | + if (strlen($this->AltBody) > 0 && count($this->attachment) < 1) { |
|
1331 | 1330 | $this->message_type = 'alt'; |
1332 | 1331 | } |
1333 | - if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) { |
|
1332 | + if (strlen($this->AltBody) > 0 && count($this->attachment) > 0) { |
|
1334 | 1333 | $this->message_type = 'alt_attachments'; |
1335 | 1334 | } |
1336 | 1335 | } |
@@ -1342,7 +1341,7 @@ discard block |
||
1342 | 1341 | * @return string |
1343 | 1342 | */ |
1344 | 1343 | public function HeaderLine($name, $value) { |
1345 | - return $name . ': ' . $value . $this->LE; |
|
1344 | + return $name.': '.$value.$this->LE; |
|
1346 | 1345 | } |
1347 | 1346 | |
1348 | 1347 | /** |
@@ -1351,7 +1350,7 @@ discard block |
||
1351 | 1350 | * @return string |
1352 | 1351 | */ |
1353 | 1352 | public function TextLine($value) { |
1354 | - return $value . $this->LE; |
|
1353 | + return $value.$this->LE; |
|
1355 | 1354 | } |
1356 | 1355 | |
1357 | 1356 | ///////////////////////////////////////////////// |
@@ -1370,11 +1369,11 @@ discard block |
||
1370 | 1369 | */ |
1371 | 1370 | public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { |
1372 | 1371 | try { |
1373 | - if ( !@is_file($path) ) { |
|
1374 | - throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE); |
|
1372 | + if (!@is_file($path)) { |
|
1373 | + throw new phpmailerException($this->Lang('file_access').$path, self::STOP_CONTINUE); |
|
1375 | 1374 | } |
1376 | 1375 | $filename = basename($path); |
1377 | - if ( $name == '' ) { |
|
1376 | + if ($name == '') { |
|
1378 | 1377 | $name = $filename; |
1379 | 1378 | } |
1380 | 1379 | |
@@ -1384,7 +1383,7 @@ discard block |
||
1384 | 1383 | 2 => $name, |
1385 | 1384 | 3 => $encoding, |
1386 | 1385 | 4 => $type, |
1387 | - 5 => false, // isStringAttachment |
|
1386 | + 5 => false, // isStringAttachment |
|
1388 | 1387 | 6 => 'attachment', |
1389 | 1388 | 7 => 0 |
1390 | 1389 | ); |
@@ -1395,7 +1394,7 @@ discard block |
||
1395 | 1394 | throw $e; |
1396 | 1395 | } |
1397 | 1396 | error_log($e->getMessage()."\n"); |
1398 | - if ( $e->getCode() == self::STOP_CRITICAL ) { |
|
1397 | + if ($e->getCode() == self::STOP_CRITICAL) { |
|
1399 | 1398 | return false; |
1400 | 1399 | } |
1401 | 1400 | } |
@@ -1440,29 +1439,29 @@ discard block |
||
1440 | 1439 | $disposition = $attachment[6]; |
1441 | 1440 | $cid = $attachment[7]; |
1442 | 1441 | $incl[] = $attachment[0]; |
1443 | - if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; } |
|
1442 | + if ($disposition == 'inline' && isset($cidUniq[$cid])) { continue; } |
|
1444 | 1443 | $cidUniq[$cid] = true; |
1445 | 1444 | |
1446 | 1445 | $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE); |
1447 | 1446 | $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE); |
1448 | 1447 | $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE); |
1449 | 1448 | |
1450 | - if($disposition == 'inline') { |
|
1449 | + if ($disposition == 'inline') { |
|
1451 | 1450 | $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE); |
1452 | 1451 | } |
1453 | 1452 | |
1454 | 1453 | $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE); |
1455 | 1454 | |
1456 | 1455 | // Encode as string attachment |
1457 | - if($bString) { |
|
1456 | + if ($bString) { |
|
1458 | 1457 | $mime[] = $this->EncodeString($string, $encoding); |
1459 | - if($this->IsError()) { |
|
1458 | + if ($this->IsError()) { |
|
1460 | 1459 | return ''; |
1461 | 1460 | } |
1462 | 1461 | $mime[] = $this->LE.$this->LE; |
1463 | 1462 | } else { |
1464 | 1463 | $mime[] = $this->EncodeFile($path, $encoding); |
1465 | - if($this->IsError()) { |
|
1464 | + if ($this->IsError()) { |
|
1466 | 1465 | return ''; |
1467 | 1466 | } |
1468 | 1467 | $mime[] = $this->LE.$this->LE; |
@@ -1486,7 +1485,7 @@ discard block |
||
1486 | 1485 | private function EncodeFile($path, $encoding = 'base64') { |
1487 | 1486 | try { |
1488 | 1487 | if (!is_readable($path)) { |
1489 | - throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE); |
|
1488 | + throw new phpmailerException($this->Lang('file_open').$path, self::STOP_CONTINUE); |
|
1490 | 1489 | } |
1491 | 1490 | $magic_quotes = get_magic_quotes_runtime(); |
1492 | 1491 | if ($magic_quotes) { |
@@ -1520,9 +1519,9 @@ discard block |
||
1520 | 1519 | * @access public |
1521 | 1520 | * @return string |
1522 | 1521 | */ |
1523 | - public function EncodeString ($str, $encoding = 'base64') { |
|
1522 | + public function EncodeString($str, $encoding = 'base64') { |
|
1524 | 1523 | $encoded = ''; |
1525 | - switch(strtolower($encoding)) { |
|
1524 | + switch (strtolower($encoding)) { |
|
1526 | 1525 | case 'base64': |
1527 | 1526 | $encoded = chunk_split(base64_encode($str), 76, $this->LE); |
1528 | 1527 | break; |
@@ -1540,7 +1539,7 @@ discard block |
||
1540 | 1539 | $encoded = $this->EncodeQP($str); |
1541 | 1540 | break; |
1542 | 1541 | default: |
1543 | - $this->SetError($this->Lang('encoding') . $encoding); |
|
1542 | + $this->SetError($this->Lang('encoding').$encoding); |
|
1544 | 1543 | break; |
1545 | 1544 | } |
1546 | 1545 | return $encoded; |
@@ -1582,7 +1581,7 @@ discard block |
||
1582 | 1581 | |
1583 | 1582 | $maxlen = 75 - 7 - strlen($this->CharSet); |
1584 | 1583 | // Try to select the encoding which should produce the shortest output |
1585 | - if (strlen($str)/3 < $x) { |
|
1584 | + if (strlen($str) / 3 < $x) { |
|
1586 | 1585 | $encoding = 'B'; |
1587 | 1586 | // Modified by Ivan Tcholakov, 24-JAN-2010. |
1588 | 1587 | //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) { |
@@ -1663,7 +1662,7 @@ discard block |
||
1663 | 1662 | } |
1664 | 1663 | while (strlen($chunk) > $length); |
1665 | 1664 | |
1666 | - $encoded .= $chunk . $this->LE; |
|
1665 | + $encoded .= $chunk.$this->LE; |
|
1667 | 1666 | } |
1668 | 1667 | |
1669 | 1668 | // Chomp the last linefeed |
@@ -1679,37 +1678,37 @@ discard block |
||
1679 | 1678 | * @param integer $line_max Number of chars allowed on a line before wrapping |
1680 | 1679 | * @return string |
1681 | 1680 | */ |
1682 | - public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) { |
|
1683 | - $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'); |
|
1681 | + public function EncodeQPphp($input = '', $line_max = 76, $space_conv = false) { |
|
1682 | + $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'); |
|
1684 | 1683 | $lines = preg_split('/(?:\r\n|\r|\n)/', $input); |
1685 | 1684 | $eol = "\r\n"; |
1686 | 1685 | $escape = '='; |
1687 | 1686 | $output = ''; |
1688 | - while( list(, $line) = each($lines) ) { |
|
1687 | + while (list(, $line) = each($lines)) { |
|
1689 | 1688 | $linlen = strlen($line); |
1690 | 1689 | $newline = ''; |
1691 | - for($i = 0; $i < $linlen; $i++) { |
|
1692 | - $c = substr( $line, $i, 1 ); |
|
1693 | - $dec = ord( $c ); |
|
1694 | - if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E |
|
1690 | + for ($i = 0; $i < $linlen; $i++) { |
|
1691 | + $c = substr($line, $i, 1); |
|
1692 | + $dec = ord($c); |
|
1693 | + if (($i == 0) && ($dec == 46)) { // convert first point in the line into =2E |
|
1695 | 1694 | $c = '=2E'; |
1696 | 1695 | } |
1697 | - if ( $dec == 32 ) { |
|
1698 | - if ( $i == ( $linlen - 1 ) ) { // convert space at eol only |
|
1696 | + if ($dec == 32) { |
|
1697 | + if ($i == ($linlen - 1)) { // convert space at eol only |
|
1699 | 1698 | $c = '=20'; |
1700 | - } else if ( $space_conv ) { |
|
1699 | + } else if ($space_conv) { |
|
1701 | 1700 | $c = '=20'; |
1702 | 1701 | } |
1703 | - } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required |
|
1704 | - $h2 = floor($dec/16); |
|
1705 | - $h1 = floor($dec%16); |
|
1702 | + } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required |
|
1703 | + $h2 = floor($dec / 16); |
|
1704 | + $h1 = floor($dec % 16); |
|
1706 | 1705 | $c = $escape.$hex[$h2].$hex[$h1]; |
1707 | 1706 | } |
1708 | - if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted |
|
1707 | + if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted |
|
1709 | 1708 | $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay |
1710 | 1709 | $newline = ''; |
1711 | 1710 | // check if newline first character will be point or not |
1712 | - if ( $dec == 46 ) { |
|
1711 | + if ($dec == 46) { |
|
1713 | 1712 | $c = '=2E'; |
1714 | 1713 | } |
1715 | 1714 | } |
@@ -1761,7 +1760,7 @@ discard block |
||
1761 | 1760 | * @access public |
1762 | 1761 | * @return string |
1763 | 1762 | */ |
1764 | - public function EncodeQ ($str, $position = 'text') { |
|
1763 | + public function EncodeQ($str, $position = 'text') { |
|
1765 | 1764 | // There should not be any EOL in the string |
1766 | 1765 | $encoded = preg_replace('/[\r\n]*/', '', $str); |
1767 | 1766 | |
@@ -1804,7 +1803,7 @@ discard block |
||
1804 | 1803 | 2 => basename($filename), |
1805 | 1804 | 3 => $encoding, |
1806 | 1805 | 4 => $type, |
1807 | - 5 => true, // isStringAttachment |
|
1806 | + 5 => true, // isStringAttachment |
|
1808 | 1807 | 6 => 'attachment', |
1809 | 1808 | 7 => 0 |
1810 | 1809 | ); |
@@ -1825,13 +1824,13 @@ discard block |
||
1825 | 1824 | */ |
1826 | 1825 | public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { |
1827 | 1826 | |
1828 | - if ( !@is_file($path) ) { |
|
1829 | - $this->SetError($this->Lang('file_access') . $path); |
|
1827 | + if (!@is_file($path)) { |
|
1828 | + $this->SetError($this->Lang('file_access').$path); |
|
1830 | 1829 | return false; |
1831 | 1830 | } |
1832 | 1831 | |
1833 | 1832 | $filename = basename($path); |
1834 | - if ( $name == '' ) { |
|
1833 | + if ($name == '') { |
|
1835 | 1834 | $name = $filename; |
1836 | 1835 | } |
1837 | 1836 | |
@@ -1842,7 +1841,7 @@ discard block |
||
1842 | 1841 | 2 => $name, |
1843 | 1842 | 3 => $encoding, |
1844 | 1843 | 4 => $type, |
1845 | - 5 => false, // isStringAttachment |
|
1844 | + 5 => false, // isStringAttachment |
|
1846 | 1845 | 6 => 'inline', |
1847 | 1846 | 7 => $cid |
1848 | 1847 | ); |
@@ -1856,7 +1855,7 @@ discard block |
||
1856 | 1855 | * @return bool |
1857 | 1856 | */ |
1858 | 1857 | public function InlineImageExists() { |
1859 | - foreach($this->attachment as $attachment) { |
|
1858 | + foreach ($this->attachment as $attachment) { |
|
1860 | 1859 | if ($attachment[6] == 'inline') { |
1861 | 1860 | return true; |
1862 | 1861 | } |
@@ -1873,7 +1872,7 @@ discard block |
||
1873 | 1872 | * @return void |
1874 | 1873 | */ |
1875 | 1874 | public function ClearAddresses() { |
1876 | - foreach($this->to as $to) { |
|
1875 | + foreach ($this->to as $to) { |
|
1877 | 1876 | unset($this->all_recipients[strtolower($to[0])]); |
1878 | 1877 | } |
1879 | 1878 | $this->to = array(); |
@@ -1884,7 +1883,7 @@ discard block |
||
1884 | 1883 | * @return void |
1885 | 1884 | */ |
1886 | 1885 | public function ClearCCs() { |
1887 | - foreach($this->cc as $cc) { |
|
1886 | + foreach ($this->cc as $cc) { |
|
1888 | 1887 | unset($this->all_recipients[strtolower($cc[0])]); |
1889 | 1888 | } |
1890 | 1889 | $this->cc = array(); |
@@ -1895,7 +1894,7 @@ discard block |
||
1895 | 1894 | * @return void |
1896 | 1895 | */ |
1897 | 1896 | public function ClearBCCs() { |
1898 | - foreach($this->bcc as $bcc) { |
|
1897 | + foreach ($this->bcc as $bcc) { |
|
1899 | 1898 | unset($this->all_recipients[strtolower($bcc[0])]); |
1900 | 1899 | } |
1901 | 1900 | $this->bcc = array(); |
@@ -1952,7 +1951,7 @@ discard block |
||
1952 | 1951 | if ($this->Mailer == 'smtp' and !is_null($this->smtp)) { |
1953 | 1952 | $lasterror = $this->smtp->getError(); |
1954 | 1953 | if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) { |
1955 | - $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n"; |
|
1954 | + $msg .= '<p>'.$this->Lang('smtp_error').$lasterror['smtp_msg']."</p>\n"; |
|
1956 | 1955 | } |
1957 | 1956 | } |
1958 | 1957 | $this->ErrorInfo = $msg; |
@@ -1968,7 +1967,7 @@ discard block |
||
1968 | 1967 | $tz = date('Z'); |
1969 | 1968 | $tzs = ($tz < 0) ? '-' : '+'; |
1970 | 1969 | $tz = abs($tz); |
1971 | - $tz = (int)($tz/3600)*100 + ($tz%3600)/60; |
|
1970 | + $tz = (int) ($tz / 3600) * 100 + ($tz % 3600) / 60; |
|
1972 | 1971 | $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz); |
1973 | 1972 | |
1974 | 1973 | return $result; |
@@ -1997,14 +1996,14 @@ discard block |
||
1997 | 1996 | * @return string |
1998 | 1997 | */ |
1999 | 1998 | private function Lang($key) { |
2000 | - if(count($this->language) < 1) { |
|
1999 | + if (count($this->language) < 1) { |
|
2001 | 2000 | $this->SetLanguage('en'); // set the default language |
2002 | 2001 | } |
2003 | 2002 | |
2004 | - if(isset($this->language[$key])) { |
|
2003 | + if (isset($this->language[$key])) { |
|
2005 | 2004 | return $this->language[$key]; |
2006 | 2005 | } else { |
2007 | - return 'Language string failed to load: ' . $key; |
|
2006 | + return 'Language string failed to load: '.$key; |
|
2008 | 2007 | } |
2009 | 2008 | } |
2010 | 2009 | |
@@ -2045,19 +2044,19 @@ discard block |
||
2045 | 2044 | */ |
2046 | 2045 | public function MsgHTML($message, $basedir = '') { |
2047 | 2046 | preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images); |
2048 | - if(isset($images[2])) { |
|
2049 | - foreach($images[2] as $i => $url) { |
|
2047 | + if (isset($images[2])) { |
|
2048 | + foreach ($images[2] as $i => $url) { |
|
2050 | 2049 | // do not change urls for absolute images (thanks to corvuscorax) |
2051 | - if (!preg_match('#^[A-z]+://#',$url)) { |
|
2050 | + if (!preg_match('#^[A-z]+://#', $url)) { |
|
2052 | 2051 | $filename = basename($url); |
2053 | 2052 | $directory = dirname($url); |
2054 | - ($directory == '.')?$directory='':''; |
|
2055 | - $cid = 'cid:' . md5($filename); |
|
2053 | + ($directory == '.') ? $directory = '' : ''; |
|
2054 | + $cid = 'cid:'.md5($filename); |
|
2056 | 2055 | $ext = pathinfo($filename, PATHINFO_EXTENSION); |
2057 | - $mimeType = self::_mime_types($ext); |
|
2058 | - if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; } |
|
2059 | - if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; } |
|
2060 | - if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) { |
|
2056 | + $mimeType = self::_mime_types($ext); |
|
2057 | + if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; } |
|
2058 | + if (strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; } |
|
2059 | + if ($this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64', $mimeType)) { |
|
2061 | 2060 | $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message); |
2062 | 2061 | } |
2063 | 2062 | } |
@@ -2065,12 +2064,12 @@ discard block |
||
2065 | 2064 | } |
2066 | 2065 | $this->IsHTML(true); |
2067 | 2066 | $this->Body = $message; |
2068 | - $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message))); |
|
2067 | + $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message))); |
|
2069 | 2068 | if (!empty($textMsg) && empty($this->AltBody)) { |
2070 | 2069 | $this->AltBody = html_entity_decode($textMsg); |
2071 | 2070 | } |
2072 | 2071 | if (empty($this->AltBody)) { |
2073 | - $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n"; |
|
2072 | + $this->AltBody = 'To view this email message, open it in a program that understands HTML!'."\n\n"; |
|
2074 | 2073 | } |
2075 | 2074 | } |
2076 | 2075 | |
@@ -2188,10 +2187,10 @@ discard block |
||
2188 | 2187 | */ |
2189 | 2188 | public function set($name, $value = '') { |
2190 | 2189 | try { |
2191 | - if (isset($this->$name) ) { |
|
2190 | + if (isset($this->$name)) { |
|
2192 | 2191 | $this->$name = $value; |
2193 | 2192 | } else { |
2194 | - throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL); |
|
2193 | + throw new phpmailerException($this->Lang('variable_set').$name, self::STOP_CRITICAL); |
|
2195 | 2194 | } |
2196 | 2195 | } catch (Exception $e) { |
2197 | 2196 | $this->SetError($e->getMessage()); |
@@ -2235,14 +2234,14 @@ discard block |
||
2235 | 2234 | * @param string $key_pass Password for private key |
2236 | 2235 | */ |
2237 | 2236 | public function DKIM_QP($txt) { |
2238 | - $tmp=""; |
|
2239 | - $line=""; |
|
2240 | - for ($i=0;$i<strlen($txt);$i++) { |
|
2241 | - $ord=ord($txt[$i]); |
|
2242 | - if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) { |
|
2243 | - $line.=$txt[$i]; |
|
2237 | + $tmp = ""; |
|
2238 | + $line = ""; |
|
2239 | + for ($i = 0; $i < strlen($txt); $i++) { |
|
2240 | + $ord = ord($txt[$i]); |
|
2241 | + if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) { |
|
2242 | + $line .= $txt[$i]; |
|
2244 | 2243 | } else { |
2245 | - $line.="=".sprintf("%02X",$ord); |
|
2244 | + $line .= "=".sprintf("%02X", $ord); |
|
2246 | 2245 | } |
2247 | 2246 | } |
2248 | 2247 | return $line; |
@@ -2256,8 +2255,8 @@ discard block |
||
2256 | 2255 | */ |
2257 | 2256 | public function DKIM_Sign($s) { |
2258 | 2257 | $privKeyStr = file_get_contents($this->DKIM_private); |
2259 | - if ($this->DKIM_passphrase!='') { |
|
2260 | - $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase); |
|
2258 | + if ($this->DKIM_passphrase != '') { |
|
2259 | + $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase); |
|
2261 | 2260 | } else { |
2262 | 2261 | $privKey = $privKeyStr; |
2263 | 2262 | } |
@@ -2273,15 +2272,15 @@ discard block |
||
2273 | 2272 | * @param string $s Header |
2274 | 2273 | */ |
2275 | 2274 | public function DKIM_HeaderC($s) { |
2276 | - $s=preg_replace("/\r\n\s+/"," ",$s); |
|
2277 | - $lines=explode("\r\n",$s); |
|
2275 | + $s = preg_replace("/\r\n\s+/", " ", $s); |
|
2276 | + $lines = explode("\r\n", $s); |
|
2278 | 2277 | foreach ($lines as $key=>$line) { |
2279 | - list($heading,$value)=explode(":",$line,2); |
|
2280 | - $heading=strtolower($heading); |
|
2281 | - $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces |
|
2282 | - $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value |
|
2278 | + list($heading, $value) = explode(":", $line, 2); |
|
2279 | + $heading = strtolower($heading); |
|
2280 | + $value = preg_replace("/\s+/", " ", $value); // Compress useless spaces |
|
2281 | + $lines[$key] = $heading.":".trim($value); // Don't forget to remove WSP around the value |
|
2283 | 2282 | } |
2284 | - $s=implode("\r\n",$lines); |
|
2283 | + $s = implode("\r\n", $lines); |
|
2285 | 2284 | return $s; |
2286 | 2285 | } |
2287 | 2286 | |
@@ -2294,11 +2293,11 @@ discard block |
||
2294 | 2293 | public function DKIM_BodyC($body) { |
2295 | 2294 | if ($body == '') return "\r\n"; |
2296 | 2295 | // stabilize line endings |
2297 | - $body=str_replace("\r\n","\n",$body); |
|
2298 | - $body=str_replace("\n","\r\n",$body); |
|
2296 | + $body = str_replace("\r\n", "\n", $body); |
|
2297 | + $body = str_replace("\n", "\r\n", $body); |
|
2299 | 2298 | // END stabilize line endings |
2300 | - while (substr($body,strlen($body)-4,4) == "\r\n\r\n") { |
|
2301 | - $body=substr($body,0,strlen($body)-2); |
|
2299 | + while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") { |
|
2300 | + $body = substr($body, 0, strlen($body) - 2); |
|
2302 | 2301 | } |
2303 | 2302 | return $body; |
2304 | 2303 | } |
@@ -2311,52 +2310,52 @@ discard block |
||
2311 | 2310 | * @param string $subject Subject |
2312 | 2311 | * @param string $body Body |
2313 | 2312 | */ |
2314 | - public function DKIM_Add($headers_line,$subject,$body) { |
|
2313 | + public function DKIM_Add($headers_line, $subject, $body) { |
|
2315 | 2314 | $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms |
2316 | 2315 | $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body |
2317 | 2316 | $DKIMquery = 'dns/txt'; // Query method |
2318 | - $DKIMtime = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone) |
|
2317 | + $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone) |
|
2319 | 2318 | $subject_header = "Subject: $subject"; |
2320 | - $headers = explode("\r\n",$headers_line); |
|
2321 | - foreach($headers as $header) { |
|
2322 | - if (strpos($header,'From:') === 0) { |
|
2323 | - $from_header=$header; |
|
2324 | - } elseif (strpos($header,'To:') === 0) { |
|
2325 | - $to_header=$header; |
|
2319 | + $headers = explode("\r\n", $headers_line); |
|
2320 | + foreach ($headers as $header) { |
|
2321 | + if (strpos($header, 'From:') === 0) { |
|
2322 | + $from_header = $header; |
|
2323 | + } elseif (strpos($header, 'To:') === 0) { |
|
2324 | + $to_header = $header; |
|
2326 | 2325 | } |
2327 | 2326 | } |
2328 | - $from = str_replace('|','=7C',$this->DKIM_QP($from_header)); |
|
2329 | - $to = str_replace('|','=7C',$this->DKIM_QP($to_header)); |
|
2330 | - $subject = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable |
|
2327 | + $from = str_replace('|', '=7C', $this->DKIM_QP($from_header)); |
|
2328 | + $to = str_replace('|', '=7C', $this->DKIM_QP($to_header)); |
|
2329 | + $subject = str_replace('|', '=7C', $this->DKIM_QP($subject_header)); // Copied header fields (dkim-quoted-printable |
|
2331 | 2330 | $body = $this->DKIM_BodyC($body); |
2332 | - $DKIMlen = strlen($body) ; // Length of body |
|
2333 | - $DKIMb64 = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body |
|
2334 | - $ident = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";"; |
|
2335 | - $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n". |
|
2336 | - "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n". |
|
2331 | + $DKIMlen = strlen($body); // Length of body |
|
2332 | + $DKIMb64 = base64_encode(pack("H*", sha1($body))); // Base64 of packed binary SHA-1 hash of body |
|
2333 | + $ident = ($this->DKIM_identity == '') ? '' : " i=".$this->DKIM_identity.";"; |
|
2334 | + $dkimhdrs = "DKIM-Signature: v=1; a=".$DKIMsignatureType."; q=".$DKIMquery."; l=".$DKIMlen."; s=".$this->DKIM_selector.";\r\n". |
|
2335 | + "\tt=".$DKIMtime."; c=".$DKIMcanonicalization.";\r\n". |
|
2337 | 2336 | "\th=From:To:Subject;\r\n". |
2338 | - "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n". |
|
2337 | + "\td=".$this->DKIM_domain.";".$ident."\r\n". |
|
2339 | 2338 | "\tz=$from\r\n". |
2340 | 2339 | "\t|$to\r\n". |
2341 | 2340 | "\t|$subject;\r\n". |
2342 | - "\tbh=" . $DKIMb64 . ";\r\n". |
|
2341 | + "\tbh=".$DKIMb64.";\r\n". |
|
2343 | 2342 | "\tb="; |
2344 | - $toSign = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs); |
|
2343 | + $toSign = $this->DKIM_HeaderC($from_header."\r\n".$to_header."\r\n".$subject_header."\r\n".$dkimhdrs); |
|
2345 | 2344 | $signed = $this->DKIM_Sign($toSign); |
2346 | 2345 | return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n"; |
2347 | 2346 | } |
2348 | 2347 | |
2349 | - protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) { |
|
2348 | + protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body) { |
|
2350 | 2349 | if (!empty($this->action_function) && function_exists($this->action_function)) { |
2351 | - $params = array($isSent,$to,$cc,$bcc,$subject,$body); |
|
2352 | - call_user_func_array($this->action_function,$params); |
|
2350 | + $params = array($isSent, $to, $cc, $bcc, $subject, $body); |
|
2351 | + call_user_func_array($this->action_function, $params); |
|
2353 | 2352 | } |
2354 | 2353 | } |
2355 | 2354 | } |
2356 | 2355 | |
2357 | 2356 | class phpmailerException extends Exception { |
2358 | 2357 | public function errorMessage() { |
2359 | - $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n"; |
|
2358 | + $errorMsg = '<strong>'.$this->getMessage()."</strong><br />\n"; |
|
2360 | 2359 | return $errorMsg; |
2361 | 2360 | } |
2362 | 2361 | } |