@@ -79,10 +79,12 @@ |
||
| 79 | 79 | if ($sortable !== null) { |
| 80 | 80 | uksort($sortable, array($this, 'mycompare')); |
| 81 | 81 | foreach ($sortable as $prop => $vals) { |
| 82 | - if (is_array($prop)) // the ConceptProperty objects have their own sorting methods |
|
| 82 | + if (is_array($prop)) { |
|
| 83 | + // the ConceptProperty objects have their own sorting methods |
|
| 83 | 84 | { |
| 84 | 85 | ksort($sortable[$prop]); |
| 85 | 86 | } |
| 87 | + } |
|
| 86 | 88 | } |
| 87 | 89 | } |
| 88 | 90 | return $sortable; |
@@ -400,7 +400,9 @@ discard block |
||
| 400 | 400 | $hits[] = $res; |
| 401 | 401 | } |
| 402 | 402 | } |
| 403 | - if (sizeof($hits) > 0) return $hits; |
|
| 403 | + if (sizeof($hits) > 0) { |
|
| 404 | + return $hits; |
|
| 405 | + } |
|
| 404 | 406 | |
| 405 | 407 | // case 2: case-insensitive match on preferred label |
| 406 | 408 | foreach ($results as $res) { |
@@ -408,7 +410,9 @@ discard block |
||
| 408 | 410 | $hits[] = $res; |
| 409 | 411 | } |
| 410 | 412 | } |
| 411 | - if (sizeof($hits) > 0) return $hits; |
|
| 413 | + if (sizeof($hits) > 0) { |
|
| 414 | + return $hits; |
|
| 415 | + } |
|
| 412 | 416 | |
| 413 | 417 | if ($lang === null) { |
| 414 | 418 | // case 1A: exact match on preferred label in any language |
@@ -419,7 +423,9 @@ discard block |
||
| 419 | 423 | $hits[] = $res; |
| 420 | 424 | } |
| 421 | 425 | } |
| 422 | - if (sizeof($hits) > 0) return $hits; |
|
| 426 | + if (sizeof($hits) > 0) { |
|
| 427 | + return $hits; |
|
| 428 | + } |
|
| 423 | 429 | |
| 424 | 430 | // case 2A: case-insensitive match on preferred label in any language |
| 425 | 431 | foreach ($results as $res) { |
@@ -429,7 +435,9 @@ discard block |
||
| 429 | 435 | $hits[] = $res; |
| 430 | 436 | } |
| 431 | 437 | } |
| 432 | - if (sizeof($hits) > 0) return $hits; |
|
| 438 | + if (sizeof($hits) > 0) { |
|
| 439 | + return $hits; |
|
| 440 | + } |
|
| 433 | 441 | } |
| 434 | 442 | |
| 435 | 443 | // case 3: exact match on alternate label |
@@ -438,7 +446,9 @@ discard block |
||
| 438 | 446 | $hits[] = $res; |
| 439 | 447 | } |
| 440 | 448 | } |
| 441 | - if (sizeof($hits) > 0) return $hits; |
|
| 449 | + if (sizeof($hits) > 0) { |
|
| 450 | + return $hits; |
|
| 451 | + } |
|
| 442 | 452 | |
| 443 | 453 | |
| 444 | 454 | // case 4: case-insensitive match on alternate label |
@@ -447,7 +457,9 @@ discard block |
||
| 447 | 457 | $hits[] = $res; |
| 448 | 458 | } |
| 449 | 459 | } |
| 450 | - if (sizeof($hits) > 0) return $hits; |
|
| 460 | + if (sizeof($hits) > 0) { |
|
| 461 | + return $hits; |
|
| 462 | + } |
|
| 451 | 463 | |
| 452 | 464 | return $hits; |
| 453 | 465 | } |
@@ -40,8 +40,7 @@ |
||
| 40 | 40 | $ret[$name] = array(); |
| 41 | 41 | if ($raw) { |
| 42 | 42 | $ret[$name] = $files[$type]; |
| 43 | - } |
|
| 44 | - else { |
|
| 43 | + } else { |
|
| 45 | 44 | foreach ($files[$type] as $file) { |
| 46 | 45 | array_push($ret[$name], 'plugins/' . $name . '/' . $file); |
| 47 | 46 | } |
@@ -109,10 +109,12 @@ |
||
| 109 | 109 | */ |
| 110 | 110 | private function initializeNamespaces() { |
| 111 | 111 | foreach ($this->namespaces as $prefix => $fullUri) { |
| 112 | - if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined |
|
| 112 | + if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) { |
|
| 113 | + // if not already defined |
|
| 113 | 114 | { |
| 114 | 115 | EasyRdf\RdfNamespace::set($prefix, $fullUri); |
| 115 | 116 | } |
| 117 | + } |
|
| 116 | 118 | } |
| 117 | 119 | } |
| 118 | 120 | |
@@ -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; |
@@ -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())); |