@@ -137,10 +137,11 @@ discard block |
||
137 | 137 | public function labelSorter($conceptPropertyValueArray) { |
138 | 138 | usort($conceptPropertyValueArray, function($lit, $lit2) { |
139 | 139 | if ($lit->getType() === $lit2->getType()) { |
140 | - if ($lit->getLabel() === $lit2->getLabel()) return 0; |
|
140 | + if ($lit->getLabel() === $lit2->getLabel()) { |
|
141 | + return 0; |
|
142 | + } |
|
141 | 143 | return $lit->getLabel() < $lit2->getLabel() ? -1 : 1; |
142 | - } |
|
143 | - else if ($lit->getType() === "skos:prefLabel") { |
|
144 | + } else if ($lit->getType() === "skos:prefLabel") { |
|
144 | 145 | return -1; |
145 | 146 | } |
146 | 147 | return 1; |
@@ -465,11 +466,17 @@ discard block |
||
465 | 466 | $subject = $this->model->getConfig()->getServiceName() . " feedback"; |
466 | 467 | // determine the sender address of the message |
467 | 468 | $sender = $this->model->getConfig()->getFeedbackSender(); |
468 | - if (empty($sender)) $sender = $envelopeSender; |
|
469 | - if (empty($sender)) $sender = $this->model->getConfig()->getFeedbackAddress(); |
|
469 | + if (empty($sender)) { |
|
470 | + $sender = $envelopeSender; |
|
471 | + } |
|
472 | + if (empty($sender)) { |
|
473 | + $sender = $this->model->getConfig()->getFeedbackAddress(); |
|
474 | + } |
|
470 | 475 | |
471 | 476 | // determine sender name - default to "anonymous user" if not given by user |
472 | - if (empty($fromName)) $fromName = "anonymous user"; |
|
477 | + if (empty($fromName)) { |
|
478 | + $fromName = "anonymous user"; |
|
479 | + } |
|
473 | 480 | |
474 | 481 | $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender); |
475 | 482 | $params = empty($envelopeSender) ? '' : "-f $envelopeSender"; |