@@ -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())); |
@@ -52,8 +52,7 @@ discard block |
||
52 | 52 | foreach ($vocabularyPlugins as $plugin) { |
53 | 53 | if ($plugin instanceof EasyRdf\Literal) { |
54 | 54 | $pluginArray[] = $plugin->getValue(); |
55 | - } |
|
56 | - else { |
|
55 | + } else { |
|
57 | 56 | $pluginArray[] = $plugin->getLiteral('skosmos:usePlugin')->getValue(); |
58 | 57 | } |
59 | 58 | } |
@@ -202,8 +201,9 @@ discard block |
||
202 | 201 | public function getShortName() |
203 | 202 | { |
204 | 203 | $shortname = $this->getLiteral('skosmos:shortName'); |
205 | - if ($shortname) |
|
206 | - return $shortname; |
|
204 | + if ($shortname) { |
|
205 | + return $shortname; |
|
206 | + } |
|
207 | 207 | |
208 | 208 | // if no shortname exists fall back to the id |
209 | 209 | return $this->getId(); |
@@ -353,10 +353,12 @@ discard block |
||
353 | 353 | $ret = array(); |
354 | 354 | foreach ($resources as $res) { |
355 | 355 | $prop = $res->getURI(); |
356 | - if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible |
|
356 | + if (EasyRdf\RdfNamespace::shorten($prop) !== null) { |
|
357 | + // shortening property labels if possible |
|
357 | 358 | { |
358 | 359 | $prop = EasyRdf\RdfNamespace::shorten($prop); |
359 | 360 | } |
361 | + } |
|
360 | 362 | |
361 | 363 | $ret[] = $prop; |
362 | 364 | } |
@@ -373,10 +375,12 @@ discard block |
||
373 | 375 | $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty"); |
374 | 376 | foreach ($resources as $res) { |
375 | 377 | $prop = $res->getURI(); |
376 | - if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible |
|
378 | + if (EasyRdf\RdfNamespace::shorten($prop) !== null) { |
|
379 | + // shortening property labels if possible |
|
377 | 380 | { |
378 | 381 | $prop = EasyRdf\RdfNamespace::shorten($prop); |
379 | 382 | } |
383 | + } |
|
380 | 384 | |
381 | 385 | if ($prop === $property) { |
382 | 386 | return true; |
@@ -514,11 +518,12 @@ discard block |
||
514 | 518 | public function getId() |
515 | 519 | { |
516 | 520 | $uriparts = explode("#", $this->resource->getURI()); |
517 | - if (count($uriparts) != 1) |
|
518 | - // hash namespace |
|
521 | + if (count($uriparts) != 1) { |
|
522 | + // hash namespace |
|
519 | 523 | { |
520 | 524 | return $uriparts[1]; |
521 | 525 | } |
526 | + } |
|
522 | 527 | |
523 | 528 | // slash namespace |
524 | 529 | $uriparts = explode("/", $this->resource->getURI()); |
@@ -546,10 +551,12 @@ discard block |
||
546 | 551 | $ret = array(); |
547 | 552 | foreach ($resources as $res) { |
548 | 553 | $prop = $res->getURI(); |
549 | - if (EasyRdf\RdfNamespace::shorten($prop) !== null) // prefixing if possible |
|
554 | + if (EasyRdf\RdfNamespace::shorten($prop) !== null) { |
|
555 | + // prefixing if possible |
|
550 | 556 | { |
551 | 557 | $prop = EasyRdf\RdfNamespace::shorten($prop); |
552 | 558 | } |
559 | + } |
|
553 | 560 | |
554 | 561 | $ret[] = $prop; |
555 | 562 | } |
@@ -68,8 +68,9 @@ |
||
68 | 68 | public function getSearchTerm() : string |
69 | 69 | { |
70 | 70 | $term = $this->request->getQueryParamRaw('q') !== null ? $this->request->getQueryParamRaw('q') : $this->request->getQueryParamRaw('query'); |
71 | - if ((!isset($term) || strlen(trim($term)) === 0) && $this->rest) |
|
72 | - $term = $this->request->getQueryParamRaw('label'); |
|
71 | + if ((!isset($term) || strlen(trim($term)) === 0) && $this->rest) { |
|
72 | + $term = $this->request->getQueryParamRaw('label'); |
|
73 | + } |
|
73 | 74 | $term = trim(strval($term)); // surrounding whitespace is not considered significant |
74 | 75 | $term = Normalizer::normalize( $term, Normalizer::FORM_C ); //Normalize decomposed unicode characters #1184 |
75 | 76 | if ($this->rest) { |
@@ -74,7 +74,9 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function getQueryParam($paramName) |
76 | 76 | { |
77 | - if (!isset($this->queryParams[$paramName])) return null; |
|
77 | + if (!isset($this->queryParams[$paramName])) { |
|
78 | + return null; |
|
79 | + } |
|
78 | 80 | $val = filter_var($this->queryParams[$paramName], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
79 | 81 | return ($val !== null ? str_replace('\\', '', $val) : null); |
80 | 82 | } |
@@ -91,7 +93,9 @@ discard block |
||
91 | 93 | |
92 | 94 | public function getQueryParamPOST($paramName) |
93 | 95 | { |
94 | - if (!isset($this->queryParamsPOST[$paramName])) return null; |
|
96 | + if (!isset($this->queryParamsPOST[$paramName])) { |
|
97 | + return null; |
|
98 | + } |
|
95 | 99 | return filter_var($this->queryParamsPOST[$paramName], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
96 | 100 | } |
97 | 101 | |
@@ -106,7 +110,9 @@ discard block |
||
106 | 110 | |
107 | 111 | public function getServerConstant($paramName) |
108 | 112 | { |
109 | - if (!isset($this->serverConstants[$paramName])) return null; |
|
113 | + if (!isset($this->serverConstants[$paramName])) { |
|
114 | + return null; |
|
115 | + } |
|
110 | 116 | return filter_var($this->serverConstants[$paramName], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
111 | 117 | } |
112 | 118 | |
@@ -247,9 +253,11 @@ discard block |
||
247 | 253 | */ |
248 | 254 | public function setVocab($vocabid) |
249 | 255 | { |
250 | - if (strpos($vocabid, ' ') !== false) // if there are multiple vocabularies just storing the string |
|
256 | + if (strpos($vocabid, ' ') !== false) { |
|
257 | + // if there are multiple vocabularies just storing the string |
|
251 | 258 | { |
252 | 259 | $this->setVocabids($vocabid); |
260 | + } |
|
253 | 261 | } else { |
254 | 262 | $this->vocab = $this->model->getVocabulary($vocabid); |
255 | 263 | } |