@@ -312,8 +312,7 @@ discard block |
||
| 312 | 312 | foreach ($res->propertyUris() as $prop) { |
| 313 | 313 | $this->addPropertyValues($res, $prop, $seen); |
| 314 | 314 | } |
| 315 | - } |
|
| 316 | - else { |
|
| 315 | + } else { |
|
| 317 | 316 | foreach ($props as $prop) { |
| 318 | 317 | if ($res->hasProperty($prop)) { |
| 319 | 318 | $this->addPropertyValues($res, $prop, $seen); |
@@ -678,7 +677,9 @@ discard block |
||
| 678 | 677 | $subPrefLabelProps = $this->graph->resourcesMatching('rdfs:subPropertyOf', $prefLabelProp); |
| 679 | 678 | foreach ($subPrefLabelProps as $subPrefLabelProp) { |
| 680 | 679 | // return the first available translation |
| 681 | - if ($subPrefLabelProp->label($lang)) return $subPrefLabelProp->label($lang); |
|
| 680 | + if ($subPrefLabelProp->label($lang)) { |
|
| 681 | + return $subPrefLabelProp->label($lang); |
|
| 682 | + } |
|
| 682 | 683 | } |
| 683 | 684 | return null; |
| 684 | 685 | } |
@@ -909,8 +910,7 @@ discard block |
||
| 909 | 910 | if (!in_array($vocabUriSpace, $context, true)) { |
| 910 | 911 | if (!isset($context[$vocabPrefix])) { |
| 911 | 912 | $context[$vocabPrefix] = $vocabUriSpace; |
| 912 | - } |
|
| 913 | - else if ($context[$vocabPrefix] !== $vocabUriSpace) { |
|
| 913 | + } else if ($context[$vocabPrefix] !== $vocabUriSpace) { |
|
| 914 | 914 | $i = 2; |
| 915 | 915 | while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) { |
| 916 | 916 | $i += 1; |
@@ -99,17 +99,14 @@ |
||
| 99 | 99 | return strcoll(strtolower($a->getLabel()), strtolower($b->getLabel())); |
| 100 | 100 | } |
| 101 | 101 | return 1; |
| 102 | - } |
|
| 103 | - else if ($bnot == null) { |
|
| 102 | + } else if ($bnot == null) { |
|
| 104 | 103 | return -1; |
| 105 | - } |
|
| 106 | - else { |
|
| 104 | + } else { |
|
| 107 | 105 | // assume that notations are unique |
| 108 | 106 | return strnatcasecmp($anot, $bnot); |
| 109 | 107 | } |
| 110 | 108 | }); |
| 111 | - } |
|
| 112 | - else { |
|
| 109 | + } else { |
|
| 113 | 110 | uasort($this->values, function($a, $b) { |
| 114 | 111 | // assume that labels are unique |
| 115 | 112 | return strcoll(strtolower($a->getLabel()), strtolower($b->getLabel())); |
@@ -47,12 +47,16 @@ discard block |
||
| 47 | 47 | $this->client = new EasyRdf\Sparql\Client($endpoint); |
| 48 | 48 | |
| 49 | 49 | // set graphClause so that it can be used by all queries |
| 50 | - if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable) |
|
| 50 | + if ($this->isDefaultEndpoint()) { |
|
| 51 | + // default endpoint; query any graph (and catch it in a variable) |
|
| 51 | 52 | { |
| 52 | 53 | $this->graphClause = "GRAPH $graph"; |
| 53 | - } elseif ($graph !== null) // query a specific graph |
|
| 54 | + } |
|
| 55 | + } elseif ($graph !== null) { |
|
| 56 | + // query a specific graph |
|
| 54 | 57 | { |
| 55 | 58 | $this->graphClause = "GRAPH <$graph>"; |
| 59 | + } |
|
| 56 | 60 | } else // query the default graph |
| 57 | 61 | { |
| 58 | 62 | $this->graphClause = ""; |
@@ -1274,8 +1278,7 @@ discard block |
||
| 1274 | 1278 | if (isset($row->qualifier)) { |
| 1275 | 1279 | if ($row->qualifier instanceof EasyRdf\Literal) { |
| 1276 | 1280 | $hit['qualifier'] = $row->qualifier->getValue(); |
| 1277 | - } |
|
| 1278 | - else { |
|
| 1281 | + } else { |
|
| 1279 | 1282 | $hit['qualifier'] = $row->qualifier->localName(); |
| 1280 | 1283 | } |
| 1281 | 1284 | } |
@@ -1955,8 +1958,7 @@ discard block |
||
| 1955 | 1958 | if (sizeof($ret) > 0) { |
| 1956 | 1959 | // existing concept, with children |
| 1957 | 1960 | return $ret; |
| 1958 | - } |
|
| 1959 | - else { |
|
| 1961 | + } else { |
|
| 1960 | 1962 | // nonexistent concept |
| 1961 | 1963 | return null; |
| 1962 | 1964 | } |
@@ -266,11 +266,17 @@ |
||
| 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. |