@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | // specify where to look for templates and cache |
43 | 43 | $loader = new Twig_Loader_Filesystem('view'); |
44 | 44 | // initialize Twig environment |
45 | - $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir,'auto_reload' => true)); |
|
45 | + $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir, 'auto_reload' => true)); |
|
46 | 46 | $this->twig->addExtension(new Twig_Extensions_Extension_I18n()); |
47 | 47 | // used for setting the base href for the relative urls |
48 | 48 | $this->twig->addGlobal("BaseHref", $this->getBaseHref()); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $this->twig->addFilter($labelSorter); |
70 | 70 | |
71 | 71 | // register a Twig filter for generating strings from language codes with CLDR |
72 | - $langFilter = new Twig_SimpleFilter('lang_name', function ($langcode, $lang) { |
|
72 | + $langFilter = new Twig_SimpleFilter('lang_name', function($langcode, $lang) { |
|
73 | 73 | return Language::getName($langcode, $lang); |
74 | 74 | }); |
75 | 75 | $this->twig->addFilter($langFilter); |
@@ -116,18 +116,18 @@ discard block |
||
116 | 116 | $localname = $vocab->getLocalName($uri); |
117 | 117 | if ($localname !== $uri && $localname === urlencode($localname)) { |
118 | 118 | // check that the prefix stripping worked, and there are no problematic chars in localname |
119 | - $paramstr = sizeof($params) > 0 ? '?' . http_build_query($params) : ''; |
|
119 | + $paramstr = sizeof($params) > 0 ? '?'.http_build_query($params) : ''; |
|
120 | 120 | if ($type && $type !== '' && $type !== 'vocab' && !($localname === '' && $type === 'page')) { |
121 | - return "$vocid/$lang/$type/$localname" . $paramstr; |
|
121 | + return "$vocid/$lang/$type/$localname".$paramstr; |
|
122 | 122 | } |
123 | 123 | |
124 | - return "$vocid/$lang/$localname" . $paramstr; |
|
124 | + return "$vocid/$lang/$localname".$paramstr; |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | // case 2: URI outside vocabulary namespace, or has problematic chars |
128 | 128 | // pass the full URI as parameter instead |
129 | 129 | $params['uri'] = $uri; |
130 | - return "$vocid/$lang/$type/?" . http_build_query($params); |
|
130 | + return "$vocid/$lang/$type/?".http_build_query($params); |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | /** |
@@ -434,9 +434,9 @@ discard block |
||
434 | 434 | private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender) |
435 | 435 | { |
436 | 436 | $headers = "MIME-Version: 1.0″ . '\r\n"; |
437 | - $headers .= "Content-type: text/html; charset=UTF-8" . "\r\n"; |
|
437 | + $headers .= "Content-type: text/html; charset=UTF-8"."\r\n"; |
|
438 | 438 | if (!empty($toMail)) { |
439 | - $headers .= "Cc: " . $this->model->getConfig()->getFeedbackAddress() . "\r\n"; |
|
439 | + $headers .= "Cc: ".$this->model->getConfig()->getFeedbackAddress()."\r\n"; |
|
440 | 440 | } |
441 | 441 | if (!empty($fromEmail)) { |
442 | 442 | $headers .= "Reply-To: $fromName <$fromEmail>\r\n"; |
@@ -458,11 +458,11 @@ discard block |
||
458 | 458 | { |
459 | 459 | $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress(); |
460 | 460 | if ($fromVocab !== null && $fromVocab !== '') { |
461 | - $message = 'Feedback from vocab: ' . strtoupper($fromVocab) . "<br />" . $message; |
|
461 | + $message = 'Feedback from vocab: '.strtoupper($fromVocab)."<br />".$message; |
|
462 | 462 | } |
463 | 463 | |
464 | 464 | $envelopeSender = $this->model->getConfig()->getFeedbackEnvelopeSender(); |
465 | - $subject = $this->model->getConfig()->getServiceName() . " feedback"; |
|
465 | + $subject = $this->model->getConfig()->getServiceName()." feedback"; |
|
466 | 466 | // determine the sender address of the message |
467 | 467 | $sender = $this->model->getConfig()->getFeedbackSender(); |
468 | 468 | if (empty($sender)) $sender = $envelopeSender; |
@@ -475,10 +475,10 @@ discard block |
||
475 | 475 | $params = empty($envelopeSender) ? '' : "-f $envelopeSender"; |
476 | 476 | |
477 | 477 | // adding some information about the user for debugging purposes. |
478 | - $message = $message . "<br /><br /> Debugging information:" |
|
479 | - . "<br />Timestamp: " . date(DATE_RFC2822) |
|
480 | - . "<br />User agent: " . $request->getServerConstant('HTTP_USER_AGENT') |
|
481 | - . "<br />Referer: " . $request->getServerConstant('HTTP_REFERER'); |
|
478 | + $message = $message."<br /><br /> Debugging information:" |
|
479 | + . "<br />Timestamp: ".date(DATE_RFC2822) |
|
480 | + . "<br />User agent: ".$request->getServerConstant('HTTP_USER_AGENT') |
|
481 | + . "<br />Referer: ".$request->getServerConstant('HTTP_REFERER'); |
|
482 | 482 | |
483 | 483 | try { |
484 | 484 | mail($toAddress, $subject, $message, $headers, $params); |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | header("HTTP/1.0 404 Not Found"); |
487 | 487 | $template = $this->twig->loadTemplate('error-page.twig'); |
488 | 488 | if ($this->model->getConfig()->getLogCaughtExceptions()) { |
489 | - error_log('Caught exception: ' . $e->getMessage()); |
|
489 | + error_log('Caught exception: '.$e->getMessage()); |
|
490 | 490 | } |
491 | 491 | |
492 | 492 | echo $template->render( |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null; |
534 | 534 | $vocabObjects = array(); |
535 | 535 | if ($vocids) { |
536 | - foreach($vocids as $vocid) { |
|
536 | + foreach ($vocids as $vocid) { |
|
537 | 537 | $vocabObjects[] = $this->model->getVocabulary($vocid); |
538 | 538 | } |
539 | 539 | } |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | } catch (Exception $e) { |
545 | 545 | header("HTTP/1.0 404 Not Found"); |
546 | 546 | if ($this->model->getConfig()->getLogCaughtExceptions()) { |
547 | - error_log('Caught exception: ' . $e->getMessage()); |
|
547 | + error_log('Caught exception: '.$e->getMessage()); |
|
548 | 548 | } |
549 | 549 | $this->invokeGenericErrorPage($request, $e->getMessage()); |
550 | 550 | return; |
@@ -560,7 +560,7 @@ discard block |
||
560 | 560 | 'search_count' => $counts, |
561 | 561 | 'languages' => $this->languages, |
562 | 562 | 'search_results' => $searchResults, |
563 | - 'rest' => $parameters->getOffset()>0, |
|
563 | + 'rest' => $parameters->getOffset() > 0, |
|
564 | 564 | 'global_search' => true, |
565 | 565 | 'term' => $request->getQueryParamRaw('q'), |
566 | 566 | 'lang_list' => $langList, |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | } catch (Exception $e) { |
586 | 586 | header("HTTP/1.0 404 Not Found"); |
587 | 587 | if ($this->model->getConfig()->getLogCaughtExceptions()) { |
588 | - error_log('Caught exception: ' . $e->getMessage()); |
|
588 | + error_log('Caught exception: '.$e->getMessage()); |
|
589 | 589 | } |
590 | 590 | |
591 | 591 | echo $template->render( |
@@ -606,7 +606,7 @@ discard block |
||
606 | 606 | } catch (Exception $e) { |
607 | 607 | header("HTTP/1.0 404 Not Found"); |
608 | 608 | if ($this->model->getConfig()->getLogCaughtExceptions()) { |
609 | - error_log('Caught exception: ' . $e->getMessage()); |
|
609 | + error_log('Caught exception: '.$e->getMessage()); |
|
610 | 610 | } |
611 | 611 | |
612 | 612 | echo $template->render( |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | 'vocab' => $vocab, |
624 | 624 | 'search_results' => $searchResults, |
625 | 625 | 'search_count' => $counts, |
626 | - 'rest' => $parameters->getOffset()>0, |
|
626 | + 'rest' => $parameters->getOffset() > 0, |
|
627 | 627 | 'limit_parent' => $parameters->getParentLimit(), |
628 | 628 | 'limit_type' => $request->getQueryParam('type') ? explode('+', $request->getQueryParam('type')) : null, |
629 | 629 | 'limit_group' => $parameters->getGroupLimit(), |
@@ -752,7 +752,7 @@ discard block |
||
752 | 752 | * Loads and renders the view containing a list of recent changes in the vocabulary. |
753 | 753 | * @param Request $request |
754 | 754 | */ |
755 | - public function invokeChangeList($request, $prop='dc:created') |
|
755 | + public function invokeChangeList($request, $prop = 'dc:created') |
|
756 | 756 | { |
757 | 757 | // set language parameters for gettext |
758 | 758 | $this->setLanguageProperties($request->getLang()); |
@@ -137,10 +137,11 @@ discard block |
||
137 | 137 | public function labelSorter($conceptPropertyValueArray) { |
138 | 138 | usort($conceptPropertyValueArray, function($lit, $lit2) { |
139 | 139 | if ($lit->getType() === $lit2->getType()) { |
140 | - if ($lit->getLabel() === $lit2->getLabel()) return 0; |
|
140 | + if ($lit->getLabel() === $lit2->getLabel()) { |
|
141 | + return 0; |
|
142 | + } |
|
141 | 143 | return $lit->getLabel() < $lit2->getLabel() ? -1 : 1; |
142 | - } |
|
143 | - else if ($lit->getType() === "skos:prefLabel") { |
|
144 | + } else if ($lit->getType() === "skos:prefLabel") { |
|
144 | 145 | return -1; |
145 | 146 | } |
146 | 147 | return 1; |
@@ -465,11 +466,17 @@ discard block |
||
465 | 466 | $subject = $this->model->getConfig()->getServiceName() . " feedback"; |
466 | 467 | // determine the sender address of the message |
467 | 468 | $sender = $this->model->getConfig()->getFeedbackSender(); |
468 | - if (empty($sender)) $sender = $envelopeSender; |
|
469 | - if (empty($sender)) $sender = $this->model->getConfig()->getFeedbackAddress(); |
|
469 | + if (empty($sender)) { |
|
470 | + $sender = $envelopeSender; |
|
471 | + } |
|
472 | + if (empty($sender)) { |
|
473 | + $sender = $this->model->getConfig()->getFeedbackAddress(); |
|
474 | + } |
|
470 | 475 | |
471 | 476 | // determine sender name - default to "anonymous user" if not given by user |
472 | - if (empty($fromName)) $fromName = "anonymous user"; |
|
477 | + if (empty($fromName)) { |
|
478 | + $fromName = "anonymous user"; |
|
479 | + } |
|
473 | 480 | |
474 | 481 | $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender); |
475 | 482 | $params = empty($envelopeSender) ? '' : "-f $envelopeSender"; |