@@ -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 | } |