| @@ -76,10 +76,12 @@ | ||
| 76 | 76 | */ | 
| 77 | 77 | public function getUriSpace() | 
| 78 | 78 |      { | 
| 79 | - if ($this->urispace === null) // initialize cache | |
| 79 | +        if ($this->urispace === null) { | |
| 80 | + // initialize cache | |
| 80 | 81 |          { | 
| 81 | 82 |              $this->urispace = $this->resource->getLiteral('void:uriSpace')->getValue(); | 
| 82 | 83 | } | 
| 84 | + } | |
| 83 | 85 | |
| 84 | 86 | return $this->urispace; | 
| 85 | 87 | } | 
| @@ -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; | 
| @@ -124,8 +124,8 @@ | ||
| 124 | 124 | */ | 
| 125 | 125 | public function getEnvLang() | 
| 126 | 126 |      { | 
| 127 | - // get language from locale, same as used by gettext, set by Controller | |
| 128 | -       return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore | |
| 127 | + // get language from locale, same as used by gettext, set by Controller | |
| 128 | +        return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore | |
| 129 | 129 | } | 
| 130 | 130 | |
| 131 | 131 | /** | 
| @@ -69,8 +69,9 @@ | ||
| 69 | 69 | public function getSearchTerm() | 
| 70 | 70 |      { | 
| 71 | 71 |          $term = $this->request->getQueryParamRaw('q') ? $this->request->getQueryParamRaw('q') : $this->request->getQueryParamRaw('query'); | 
| 72 | - if (!$term && $this->rest) | |
| 73 | -            $term = $this->request->getQueryParamRaw('label'); | |
| 72 | +        if (!$term && $this->rest) { | |
| 73 | +                    $term = $this->request->getQueryParamRaw('label'); | |
| 74 | + } | |
| 74 | 75 | $term = trim($term); // surrounding whitespace is not considered significant | 
| 75 | 76 |          if ($this->rest) { | 
| 76 | 77 | return $term; | 
| @@ -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 | } | 
| @@ -559,9 +559,9 @@ | ||
| 559 | 559 | $vocid = $request->getVocab()->getId(); | 
| 560 | 560 |                  return $this->returnError('404', 'Not Found', "No download source URL known for vocabulary $vocid in language $dataLang"); | 
| 561 | 561 | } | 
| 562 | -		} else { | |
| 562 | +    } else { | |
| 563 | 563 |              header("Location: " . $urls[$format]); | 
| 564 | - } | |
| 564 | + } | |
| 565 | 565 | } | 
| 566 | 566 | |
| 567 | 567 |      private function returnDataResults($results, $format) { | 
| @@ -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 | } | 
| @@ -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_STRING); | 
| 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_STRING); | 
| 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_STRING); | 
| 111 | 117 | } | 
| 112 | 118 | |
| @@ -239,9 +245,11 @@ discard block | ||
| 239 | 245 | */ | 
| 240 | 246 | public function setVocab($vocabid) | 
| 241 | 247 |      { | 
| 242 | - if (strpos($vocabid, ' ') !== false) // if there are multiple vocabularies just storing the string | |
| 248 | +        if (strpos($vocabid, ' ') !== false) { | |
| 249 | + // if there are multiple vocabularies just storing the string | |
| 243 | 250 |          { | 
| 244 | 251 | $this->setVocabids($vocabid); | 
| 252 | + } | |
| 245 | 253 |          } else { | 
| 246 | 254 | $this->vocab = $this->model->getVocabulary($vocabid); | 
| 247 | 255 | } | 
| @@ -307,11 +307,17 @@ | ||
| 307 | 307 | $subject = $this->model->getConfig()->getServiceName() . " feedback"; | 
| 308 | 308 | // determine the sender address of the message | 
| 309 | 309 | $sender = $this->model->getConfig()->getFeedbackSender(); | 
| 310 | - if (empty($sender)) $sender = $envelopeSender; | |
| 311 | - if (empty($sender)) $sender = $this->model->getConfig()->getFeedbackAddress(); | |
| 310 | +        if (empty($sender)) { | |
| 311 | + $sender = $envelopeSender; | |
| 312 | + } | |
| 313 | +        if (empty($sender)) { | |
| 314 | + $sender = $this->model->getConfig()->getFeedbackAddress(); | |
| 315 | + } | |
| 312 | 316 | |
| 313 | 317 | // determine sender name - default to "anonymous user" if not given by user | 
| 314 | - if (empty($fromName)) $fromName = "anonymous user"; | |
| 318 | +        if (empty($fromName)) { | |
| 319 | + $fromName = "anonymous user"; | |
| 320 | + } | |
| 315 | 321 | |
| 316 | 322 | $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender); | 
| 317 | 323 | $params = empty($envelopeSender) ? '' : "-f $envelopeSender"; | 
| @@ -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 | |
| @@ -350,10 +350,12 @@ discard block | ||
| 350 | 350 | // register vocabulary ids as RDF namespace prefixes | 
| 351 | 351 |                  $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters | 
| 352 | 352 |                  try { | 
| 353 | - if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined | |
| 353 | +                    if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) { | |
| 354 | + // if not already defined | |
| 354 | 355 |                      { | 
| 355 | 356 | EasyRdf\RdfNamespace::set($prefix, $voc->getUriSpace()); | 
| 356 | 357 | } | 
| 358 | + } | |
| 357 | 359 | |
| 358 | 360 |                  } catch (Exception $e) { | 
| 359 | 361 | // not valid as namespace identifier, ignore | 
| @@ -475,8 +477,9 @@ discard block | ||
| 475 | 477 | |
| 476 | 478 | // no preferred vocabulary, or it was not found, search in which vocabulary the concept has a label | 
| 477 | 479 |          foreach ($vocabs as $vocab) { | 
| 478 | - if ($vocab->getConceptLabel($uri, null) !== null) | |
| 479 | - return $vocab; | |
| 480 | +            if ($vocab->getConceptLabel($uri, null) !== null) { | |
| 481 | + return $vocab; | |
| 482 | + } | |
| 480 | 483 | } | 
| 481 | 484 | |
| 482 | 485 | // if the URI couldn't be found, fall back to the first vocabulary |