NatLibFi / Skosmos

src/index.php

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
     }
     require_once '../vendor/autoload.php';
 } catch (Exception $e) {
-    echo "Error: " . $e->getMessage();
+    echo "Error: ".$e->getMessage();
     return;
 }
 
@@ -27,7 +27,7 @@ 
     // if language code missing, redirect to guessed language
     // in any case, redirect to <lang>/
     $lang = sizeof($parts) == 2 && $parts[1] !== '' ? $parts[1] : $controller->guessLanguage($request);
-    header("Location: " . $lang . "/");
+    header("Location: ".$lang."/");
 } else {
     if (array_key_exists($parts[1], $config->getLanguages())) { // global pages
         $request->setLang($parts[1]);
@@ -57,8 +57,8 @@ 
         }
         if (sizeof($parts) == 3) { // language code missing
             $lang = $controller->guessLanguage($request);
-            $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/";
-            header("Location: " . $newurl);
+            $newurl = $controller->getBaseHref().$vocab."/".$lang."/";
+            header("Location: ".$newurl);
         } else {
             if (array_key_exists($parts[2], $config->getLanguages())) {
                 $lang = $parts[2];
@@ -99,10 +99,10 @@ 
                 }
             } else { // language code missing, redirect to some language version
                 $lang = $controller->guessLanguage($request, $vocab);
-                $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/" . implode('/', array_slice($parts, 2));
+                $newurl = $controller->getBaseHref().$vocab."/".$lang."/".implode('/', array_slice($parts, 2));
                 $qs = $request->getServerConstant('QUERY_STRING');
                 if ($qs) {
-                    $newurl .= "?" . $qs;
+                    $newurl .= "?".$qs;
                 }
                 header("Location: $newurl");
             }

src/controller/Honeypot.php

Spacing +3 added lines, -3 removed lines

@@ -32,9 +32,9 @@
     {
         // Encrypt the current time
         $honey_time_encrypted = $this->getEncryptedTime();
-        return '<div id="' . $honey_name . '_wrap" style="display:none;">' . "\r\n" .
-               '<input name="' . $honey_name . '" type="text" value="" id="' . $honey_name . '"/>' . "\r\n" .
-               '<input name="' . $honey_time . '" type="text" value="' . $honey_time_encrypted . '"/>' . "\r\n" .
+        return '<div id="'.$honey_name.'_wrap" style="display:none;">'."\r\n".
+               '<input name="'.$honey_name.'" type="text" value="" id="'.$honey_name.'"/>'."\r\n".
+               '<input name="'.$honey_time.'" type="text" value="'.$honey_time_encrypted.'"/>'."\r\n".
                 '</div>';
     }
     /**

src/controller/WebController.php

Spacing +21 added lines, -21 removed lines

@@ -37,9 +37,9 @@ 
         }
 
         // specify where to look for templates and cache
-        $loader = new Twig_Loader_Filesystem(__DIR__ . '/../view');
+        $loader = new Twig_Loader_Filesystem(__DIR__.'/../view');
         // initialize Twig environment
-        $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir,'auto_reload' => true));
+        $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir, 'auto_reload' => true));
         // used for setting the base href for the relative urls
         $this->twig->addGlobal("BaseHref", $this->getBaseHref());
         // setting the service name string from the config.ttl
@@ -61,7 +61,7 @@ 
         $this->twig->addFilter(new Twig_SimpleFilter('link_url', array($this, 'linkUrlFilter')));
 
         // register a Twig filter for generating strings from language codes with CLDR
-        $langFilter = new Twig_SimpleFilter('lang_name', function ($langcode, $lang) {
+        $langFilter = new Twig_SimpleFilter('lang_name', function($langcode, $lang) {
             return Language::getName($langcode, $lang);
         });
         $this->twig->addFilter($langFilter);
@@ -247,16 +247,16 @@ 
 
     private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
     {
-        $headers = "MIME-Version: 1.0" . "\r\n";
-        $headers .= "Content-type: text/html; charset=UTF-8" . "\r\n";
+        $headers = "MIME-Version: 1.0"."\r\n";
+        $headers .= "Content-type: text/html; charset=UTF-8"."\r\n";
         if (!empty($toMail)) {
-            $headers .= "Cc: " . $this->model->getConfig()->getFeedbackAddress() . "\r\n";
+            $headers .= "Cc: ".$this->model->getConfig()->getFeedbackAddress()."\r\n";
         }
         if (!empty($fromEmail)) {
             $headers .= "Reply-To: $fromName <$fromEmail>\r\n";
         }
         $service = $this->model->getConfig()->getServiceName();
-        return $headers . "From: $fromName via $service <$sender>";
+        return $headers."From: $fromName via $service <$sender>";
     }
 
     /**
@@ -270,9 +270,9 @@ 
     public function sendFeedback($request, $message, $messageSubject, $fromName = null, $fromEmail = null, $fromVocab = null, $toMail = null)
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
-        $messageSubject = "[" . $this->model->getConfig()->getServiceName() . "] " . $messageSubject;
+        $messageSubject = "[".$this->model->getConfig()->getServiceName()."] ".$messageSubject;
         if ($fromVocab !== null && $fromVocab !== '') {
-            $message = 'Feedback from vocab: ' . strtoupper($fromVocab) . "<br />" . $message;
+            $message = 'Feedback from vocab: '.strtoupper($fromVocab)."<br />".$message;
         }
         $envelopeSender = $this->model->getConfig()->getFeedbackEnvelopeSender();
         // determine the sender address of the message
@@ -291,10 +291,10 @@ 
         $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender);
         $params = empty($envelopeSender) ? '' : "-f $envelopeSender";
         // adding some information about the user for debugging purposes.
-        $message = $message . "<br /><br /> Debugging information:"
-            . "<br />Timestamp: " . date(DATE_RFC2822)
-            . "<br />User agent: " . $request->getServerConstant('HTTP_USER_AGENT')
-            . "<br />Referer: " . $request->getServerConstant('HTTP_REFERER');
+        $message = $message."<br /><br /> Debugging information:"
+            . "<br />Timestamp: ".date(DATE_RFC2822)
+            . "<br />User agent: ".$request->getServerConstant('HTTP_USER_AGENT')
+            . "<br />Referer: ".$request->getServerConstant('HTTP_REFERER');
 
         try {
             mail($toAddress, $messageSubject, $message, $headers, $params);
@@ -302,7 +302,7 @@ 
             header("HTTP/1.0 404 Not Found");
             $template = $this->twig->loadTemplate('error.twig');
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -349,13 +349,13 @@ 
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null;
         $vocabObjects = array();
         if ($vocids) {
-            foreach($vocids as $vocid) {
+            foreach ($vocids as $vocid) {
                 try {
                     $vocabObjects[] = $this->model->getVocabulary($vocid);
                 } catch (ValueError $e) {
                     // fail fast with an error page if the vocabulary cannot be found
                     if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                        error_log('Caught exception: ' . $e->getMessage());
+                        error_log('Caught exception: '.$e->getMessage());
                     }
                     header("HTTP/1.0 400 Bad Request");
                     $this->invokeGenericErrorPage($request, $e->getMessage());
@@ -377,7 +377,7 @@ 
             $errored = true;
             header("HTTP/1.0 500 Internal Server Error");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
         }
         $vocabList = $this->model->getVocabularyList();
@@ -389,7 +389,7 @@ 
                 'search_count' => $counts,
                 'languages' => $this->languages,
                 'search_results' => $searchResults,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'global_search' => true,
                 'search_failed' => $errored,
                 'term' => $request->getQueryParamRaw('q'),
@@ -417,7 +417,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 500 Internal Server Error");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -442,7 +442,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 404 Not Found");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -461,7 +461,7 @@ 
                 'vocab' => $vocab,
                 'search_results' => $searchResults,
                 'search_count' => $counts,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'limit_parent' => $parameters->getParentLimit(),
                 'limit_type' =>  $request->getQueryParam('type') ? explode('+', $request->getQueryParam('type')) : null,
                 'limit_group' => $parameters->getGroupLimit(),

src/controller/Controller.php

Spacing +5 added lines, -5 removed lines

@@ -156,18 +156,18 @@ 
         $localname = $vocab->getLocalName($uri);
         if ($localname !== $uri && $localname === urlencode($localname)) {
             // check that the prefix stripping worked, and there are no problematic chars in localname
-            $paramstr = count($params) > 0 ? '?' . http_build_query($params) : '';
+            $paramstr = count($params) > 0 ? '?'.http_build_query($params) : '';
             if ($type && $type !== '' && $type !== 'vocab' && !($localname === '' && $type === 'page')) {
-                return "$vocid/$lang/$type/$localname" . $paramstr;
+                return "$vocid/$lang/$type/$localname".$paramstr;
             }
 
-            return "$vocid/$lang/$localname" . $paramstr;
+            return "$vocid/$lang/$localname".$paramstr;
         }
 
         // case 2: URI outside vocabulary namespace, or has problematic chars
         // pass the full URI as parameter instead
         $params['uri'] = $uri;
-        return "$vocid/$lang/$type/?" . http_build_query($params);
+        return "$vocid/$lang/$type/?".http_build_query($params);
     }
 
     /**
@@ -293,7 +293,7 @@ 
     {
         if ($modifiedDate) {
             $ifModifiedSince = $this->getIfModifiedSince();
-            $this->sendHeader("Last-Modified: " . $modifiedDate->format('D, d M Y H:i:s \G\M\T'));
+            $this->sendHeader("Last-Modified: ".$modifiedDate->format('D, d M Y H:i:s \G\M\T'));
             if ($ifModifiedSince !== null && $ifModifiedSince >= $modifiedDate) {
                 $this->sendHeader("HTTP/1.0 304 Not Modified");
                 return true;

src/controller/EntityController.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
         $baseurl = $this->getBaseHref();
         $vocid = $vocab->getId();
         $query = http_build_query(array('uri'=>$uri, 'format'=>$targetFormat));
-        $url = $baseurl . "rest/v1/$vocid/data?$query";
+        $url = $baseurl."rest/v1/$vocid/data?$query";
         $this->redirect303($url);
     }
 
@@ -27,16 +27,16 @@ 
         $localname = $vocab->getLocalName($uri);
 
         if (!$localname) {
-            $url = $baseurl . "$vocid/";
+            $url = $baseurl."$vocid/";
         } else {
 
             if ($localname !== $uri && $localname === urlencode($localname)) {
                 // the URI can be shortened
-                $url = $baseurl . "$vocid/page/$localname";
+                $url = $baseurl."$vocid/page/$localname";
             } else {
                 // must use full URI
                 $query = http_build_query(array('uri'=>$uri));
-                $url = $baseurl . "$vocid/page/?" . $query;
+                $url = $baseurl."$vocid/page/?".$query;
             }
         }
         $this->redirect303($url);
@@ -58,7 +58,7 @@ 
             // guess vocabulary based on URI
             $vocab = $this->model->guessVocabularyFromURI($request->getUri());
             if ($vocab === null) {
-                return $this->returnError('404', 'Not Found', 'Unrecognized URI ' . $request->getUri());
+                return $this->returnError('404', 'Not Found', 'Unrecognized URI '.$request->getUri());
             }
             $request->setVocab($vocab->getId());
         }

src/controller/RestController.php

Spacing +19 added lines, -19 removed lines

@@ -25,7 +25,7 @@ 
         // wrap with JSONP callback if requested
         if (filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_FULL_SPECIAL_CHARS)) {
             header("Content-type: application/javascript; charset=utf-8");
-            echo filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "(" . json_encode($data) . ");";
+            echo filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_FULL_SPECIAL_CHARS)."(".json_encode($data).");";
             return;
         }
 
@@ -88,7 +88,7 @@ 
                 'vocabularies' => 'onki:hasVocabulary',
                 'id' => 'onki:vocabularyIdentifier',
                 'uri' => '@id',
-                '@base' => $this->getBaseHref() . "rest/v1/vocabularies",
+                '@base' => $this->getBaseHref()."rest/v1/vocabularies",
             ),
             'uri' => '',
             'vocabularies' => $results,
@@ -105,7 +105,7 @@ 
         // convert to vocids array to support multi-vocabulary search
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : array();
         $vocabObjects = array();
-        foreach($vocids as $vocid) {
+        foreach ($vocids as $vocid) {
             $vocabObjects[] = $this->model->getVocabulary($vocid);
         }
         $parameters->setVocabularies($vocabObjects);
@@ -136,12 +136,12 @@ 
         foreach ($parameters->getAdditionalFields() as $field) {
 
             // Quick-and-dirty compactification
-            $context[$field] = 'skos:' . $field;
+            $context[$field] = 'skos:'.$field;
             foreach ($results as &$result) {
                 foreach ($result as $k => $v) {
-                    if ($k == 'skos:' . $field) {
+                    if ($k == 'skos:'.$field) {
                         $result[$field] = $v;
-                        unset($result['skos:' . $field]);
+                        unset($result['skos:'.$field]);
                     }
                 }
             }
@@ -232,7 +232,7 @@ 
                 'prefLabel' => 'skos:prefLabel',
                 'title' => 'dct:title',
                 '@language' => $request->getLang(),
-                '@base' => $this->getBaseHref() . "rest/v1/" . $vocab->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$vocab->getId()."/",
             ),
             'uri' => '',
             'id' => $vocab->getId(),
@@ -287,7 +287,7 @@ 
                 'subTypes' => array('@id' => 'void:class', '@type' => '@id'),
                 'count' => 'void:entities',
                 '@language' => $request->getLang(),
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
             ),
             'uri' => '',
             'id' => $request->getVocab()->getId(),
@@ -369,7 +369,7 @@ 
                 'language' => 'void-ext:language',
                 'properties' => 'void:propertyPartition',
                 'labels' => 'void:triples',
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
             ),
             'uri' => '',
             'id' => $request->getVocab()->getId(),
@@ -410,7 +410,7 @@ 
             $types[] = $type;
         }
 
-        $base = $request->getVocab() ? $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/" : $this->getBaseHref() . "rest/v1/";
+        $base = $request->getVocab() ? $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/" : $this->getBaseHref()."rest/v1/";
 
         $ret = array_merge_recursive(
             $this->context,
@@ -457,7 +457,7 @@ 
         if ($lang === null) {
             // case 1A: exact match on preferred label in any language
             foreach ($results as $res) {
-                if (isset($res['matchedPrefLabel']) && $res['matchedPrefLabel']  == $label) {
+                if (isset($res['matchedPrefLabel']) && $res['matchedPrefLabel'] == $label) {
                     $res['prefLabel'] = $res['matchedPrefLabel'];
                     unset($res['matchedPrefLabel']);
                     $hits[] = $res;
@@ -592,19 +592,19 @@ 
 
         $format = $this->negotiateFormat(array_keys($urls), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
         if (!$format) {
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . implode(' ', array_keys($urls)));
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".implode(' ', array_keys($urls)));
         }
         if (is_array($urls[$format])) {
             $arr = $urls[$format];
             $dataLang = $request->getLang();
             if (isset($arr[$dataLang])) {
-                header("Location: " . $arr[$dataLang]);
+                header("Location: ".$arr[$dataLang]);
             } else {
                 $vocid = $request->getVocab()->getId();
                 return $this->returnError('404', 'Not Found', "No download source URL known for vocabulary $vocid in language $dataLang");
             }
         } else {
-            header("Location: " . $urls[$format]);
+            header("Location: ".$urls[$format]);
         }
     }
 
@@ -668,7 +668,7 @@ 
 
         $format = $this->negotiateFormat(explode(' ', self::SUPPORTED_FORMATS), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
         if (!$format) {
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . self::SUPPORTED_FORMATS);
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".self::SUPPORTED_FORMATS);
         }
 
         $vocid = $vocab ? $vocab->getId() : null;
@@ -961,7 +961,7 @@ 
                         }
                     }
                     // if the main concept scheme was not found, set 'top' to the first 'tops' (sorted alphabetically on the URIs)
-                    if (! isset($results[$uri]['top'])) {
+                    if (!isset($results[$uri]['top'])) {
                         $results[$uri]['top'] = $results[$uri]['tops'][0];
                     }
                 } else {
@@ -1147,7 +1147,7 @@ 
         $changeList = $request->getVocab()->getChangeList($prop, $request->getLang(), $offset, $limit);
 
         $simpleChangeList = array();
-        foreach($changeList as $conceptInfo) {
+        foreach ($changeList as $conceptInfo) {
             if (array_key_exists('date', $conceptInfo)) {
                 $concept = array(
                     'uri' => $conceptInfo['uri'],
@@ -1164,10 +1164,10 @@ 
         }
         return $this->returnJson(array_merge_recursive(
             $this->context,
-            array('@context' => array( '@language' => $request->getLang(),
+            array('@context' => array('@language' => $request->getLang(),
                                                                                      'prefLabel' => 'skos:prefLabel',
                                                                                      'xsd' => 'http://www.w3.org/2001/XMLSchema#',
-                                                                                     'date' => array( '@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime') )
+                                                                                     'date' => array('@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime'))
                                                         ),
             array('changeList' => $simpleChangeList)
         ));

src/entity.php

Spacing +1 added lines, -1 removed lines

@@ -23,5 +23,5 @@
 
 } catch (Exception $e) {
     header("HTTP/1.0 500 Internal Server Error");
-    echo('ERROR: ' . $e->getMessage());
+    echo('ERROR: '.$e->getMessage());
 }