Completed
Pull Request — master (#1130)
by
unknown
02:11
created
controller/WebController.php 2 patches
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -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.
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -234,6 +234,11 @@  discard block
 block discarded – undo
234 234
             ));
235 235
     }
236 236
 
237
+    /**
238
+     * @param string $fromName
239
+     * @param string|null $fromEmail
240
+     * @param string $sender
241
+     */
237 242
     private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
238 243
     {
239 244
         $headers = "MIME-Version: 1.0" . "\r\n";
@@ -255,6 +260,7 @@  discard block
 block discarded – undo
255 260
      * @param string $fromName senders own name.
256 261
      * @param string $fromEmail senders email address.
257 262
      * @param string $fromVocab which vocabulary is the feedback related to.
263
+     * @param string $toMail
258 264
      */
259 265
     public function sendFeedback($request, $message, $messageSubject, $fromName = null, $fromEmail = null, $fromVocab = null, $toMail = null)
260 266
     {
@@ -534,6 +540,7 @@  discard block
 block discarded – undo
534 540
 
535 541
     /**
536 542
      * Invokes a very generic errorpage.
543
+     * @param string $message
537 544
      */
538 545
     public function invokeGenericErrorPage($request, $message = null)
539 546
     {
Please login to merge, or discard this patch.