@@ -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 | } |
@@ -354,10 +354,12 @@ |
||
| 354 | 354 | // register vocabulary ids as RDF namespace prefixes |
| 355 | 355 | $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters |
| 356 | 356 | try { |
| 357 | - if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined |
|
| 357 | + if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) { |
|
| 358 | + // if not already defined |
|
| 358 | 359 | { |
| 359 | 360 | EasyRdf\RdfNamespace::set($prefix, $voc->getUriSpace()); |
| 360 | 361 | } |
| 362 | + } |
|
| 361 | 363 | |
| 362 | 364 | } catch (Exception $e) { |
| 363 | 365 | // not valid as namespace identifier, ignore |
@@ -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. |
@@ -125,11 +125,9 @@ discard block |
||
| 125 | 125 | return strcoll(strtolower($a->getLabel()), strtolower($b->getLabel())); |
| 126 | 126 | } |
| 127 | 127 | return 1; |
| 128 | - } |
|
| 129 | - else if ($bnot == null) { |
|
| 128 | + } else if ($bnot == null) { |
|
| 130 | 129 | return -1; |
| 131 | - } |
|
| 132 | - else { |
|
| 130 | + } else { |
|
| 133 | 131 | // assume that notations are unique, choose strategy |
| 134 | 132 | if ($this->sort_by_notation == "lexical") { |
| 135 | 133 | return strcoll($anot, $bnot); |
@@ -138,8 +136,7 @@ discard block |
||
| 138 | 136 | } |
| 139 | 137 | } |
| 140 | 138 | }); |
| 141 | - } |
|
| 142 | - else { |
|
| 139 | + } else { |
|
| 143 | 140 | uasort($this->values, function($a, $b) { |
| 144 | 141 | // assume that labels are unique |
| 145 | 142 | return strcoll(strtolower($a->getLabel()), strtolower($b->getLabel())); |