|
@@ -266,11 +266,17 @@ |
|
|
block discarded – undo |
|
266
|
266
|
$envelopeSender = $this->model->getConfig()->getFeedbackEnvelopeSender(); |
|
267
|
267
|
// determine the sender address of the message |
|
268
|
268
|
$sender = $this->model->getConfig()->getFeedbackSender(); |
|
269
|
|
- if (empty($sender)) $sender = $envelopeSender; |
|
270
|
|
- if (empty($sender)) $sender = $this->model->getConfig()->getFeedbackAddress(); |
|
|
269
|
+ if (empty($sender)) { |
|
|
270
|
+ $sender = $envelopeSender; |
|
|
271
|
+ } |
|
|
272
|
+ if (empty($sender)) { |
|
|
273
|
+ $sender = $this->model->getConfig()->getFeedbackAddress(); |
|
|
274
|
+ } |
|
271
|
275
|
|
|
272
|
276
|
// determine sender name - default to "anonymous user" if not given by user |
|
273
|
|
- if (empty($fromName)) $fromName = "anonymous user"; |
|
|
277
|
+ if (empty($fromName)) { |
|
|
278
|
+ $fromName = "anonymous user"; |
|
|
279
|
+ } |
|
274
|
280
|
$headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender); |
|
275
|
281
|
$params = empty($envelopeSender) ? '' : "-f $envelopeSender"; |
|
276
|
282
|
// adding some information about the user for debugging purposes. |
Please login to merge, or discard this patch.