NatLibFi / Skosmos

model/VocabularyConfig.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
     private $plugins;
     private $languageOrderCache = array();
 
-    public function __construct($resource, $globalPlugins=array())
+    public function __construct($resource, $globalPlugins = array())
     {
         $this->resource = $resource;
         $plugins = $this->resource->allLiterals('skosmos:usePlugin');
@@ -36,7 +36,7 @@ 
         $langs = $this->getLanguages();
         $deflang = reset($langs); // picking the first one from the list with reset since the keys are not numeric
         if (sizeof($langs) > 1) {
-            trigger_error("Default language for vocabulary '" . $this->getShortName() . "' unknown, choosing '$deflang'.", E_USER_WARNING);
+            trigger_error("Default language for vocabulary '".$this->getShortName()."' unknown, choosing '$deflang'.", E_USER_WARNING);
         }
 
         return $deflang;

controller/WebController.php

Spacing +18 added lines, -18 removed lines

@@ -37,7 +37,7 @@ 
         // specify where to look for templates and cache
         $loader = new Twig_Loader_Filesystem('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));
         $this->twig->addExtension(new Twig_Extensions_Extension_I18n());
         // used for setting the base href for the relative urls
         $this->twig->addGlobal("BaseHref", $this->getBaseHref());
@@ -60,7 +60,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);
@@ -272,9 +272,9 @@ 
     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 .= "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";
@@ -296,11 +296,11 @@ 
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
         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();
-        $subject = $this->model->getConfig()->getServiceName() . " feedback";
+        $subject = $this->model->getConfig()->getServiceName()." feedback";
         // determine the sender address of the message
         $sender = $this->model->getConfig()->getFeedbackSender();
         if (empty($sender)) $sender = $envelopeSender;
@@ -313,10 +313,10 @@ 
         $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, $subject, $message, $headers, $params);
@@ -324,7 +324,7 @@ 
             header("HTTP/1.0 404 Not Found");
             $template = $this->twig->loadTemplate('error-page.twig');
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -371,7 +371,7 @@ 
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null;
         $vocabObjects = array();
         if ($vocids) {
-            foreach($vocids as $vocid) {
+            foreach ($vocids as $vocid) {
                 $vocabObjects[] = $this->model->getVocabulary($vocid);
             }
         }
@@ -382,7 +382,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());
             }
             $this->invokeGenericErrorPage($request, $e->getMessage());
             return;
@@ -398,7 +398,7 @@ 
                 'search_count' => $counts,
                 'languages' => $this->languages,
                 'search_results' => $searchResults,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'global_search' => true,
                 'term' => $request->getQueryParamRaw('q'),
                 'lang_list' => $langList,
@@ -423,7 +423,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(
@@ -444,7 +444,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(),
@@ -590,7 +590,7 @@ 
      * Loads and renders the view containing a list of recent changes in the vocabulary.
      * @param Request $request
      */
-    public function invokeChangeList($request, $prop='dc:created')
+    public function invokeChangeList($request, $prop = 'dc:created')
     {
         // set language parameters for gettext
         $this->setLanguageProperties($request->getLang());

model/ConceptMappingPropertyValue.php

Spacing +8 added lines, -8 removed lines

@@ -36,7 +36,7 @@ 
     {
         $label = $this->getLabel();
         $notation = $this->getNotation();
-        return $notation . $label;
+        return $notation.$label;
     }
 
     public function getType()
@@ -188,42 +188,42 @@ 
             'from' => [
                 'memberSet' => [
                     [
-                        'uri' => (string) $this->source->getUri(),
+                        'uri' => (string)$this->source->getUri(),
                     ]
                 ]
             ],
             'to' => [
                 'memberSet' => [
                     [
-                        'uri' => (string) $this->getUri()
+                        'uri' => (string)$this->getUri()
                     ]
                 ]
             ],
             // EXTRA
-            'description' => gettext($this->type . "_help"), // pop-up text
+            'description' => gettext($this->type."_help"), // pop-up text
             'hrefLink' => $hrefLink, // link to resource as displayed in the UI
             'lang' => $propertyLang, // TBD: could it be part of the prefLabel?
-            'vocabName' => (string) $this->getVocabName(), // vocabulary as displayed in the UI
+            'vocabName' => (string)$this->getVocabName(), // vocabulary as displayed in the UI
             'typeLabel' => gettext($this->type), // a text used in the UI instead of, for example, skos:closeMatch
         ];
 
         $fromScheme = $this->vocab->getDefaultConceptScheme();
         if (isset($fromScheme)) {
             $ret['fromScheme'] = [
-                'uri' => (string) $fromScheme,
+                'uri' => (string)$fromScheme,
             ];
         }
 
         $exvocab = $this->getExvocab();
         if (isset($exvocab)) {
             $ret['toScheme'] = [
-                'uri' => (string) $exvocab->getDefaultConceptScheme(),
+                'uri' => (string)$exvocab->getDefaultConceptScheme(),
             ];
         }
 
         $notation = $this->getNotation();
         if (isset($notation)) {
-            $ret['to']['memberSet'][0]['notation'] = (string) $notation;
+            $ret['to']['memberSet'][0]['notation'] = (string)$notation;
         }
 
         $label = $this->getLabel(null, $queryExVocabs);

model/GlobalConfig.php

Spacing +7 added lines, -7 removed lines

@@ -28,17 +28,17 @@ 
      */
     private $configModifiedTime = null;
 
-    public function __construct($config_name='/../config.ttl')
+    public function __construct($config_name = '/../config.ttl')
     {
         $this->cache = new Cache();
         try {
-            $this->filePath = realpath( dirname(__FILE__) . $config_name );
+            $this->filePath = realpath(dirname(__FILE__).$config_name);
             if (!file_exists($this->filePath)) {
                 throw new Exception('config.ttl file is missing, please provide one.');
             }
             $this->initializeConfig();
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
             return;
         }
     }
@@ -72,8 +72,8 @@ 
             // use APC user cache to store parsed config.ttl configuration
             if ($this->cache->isAvailable() && !is_null($this->configModifiedTime)) {
                 // @codeCoverageIgnoreStart
-                $key = realpath($this->filePath) . ", " . $this->configModifiedTime;
-                $nskey = "namespaces of " . $key;
+                $key = realpath($this->filePath).", ".$this->configModifiedTime;
+                $nskey = "namespaces of ".$key;
                 $this->graph = $this->cache->fetch($key);
                 $this->namespaces = $this->cache->fetch($nskey);
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -94,7 +94,7 @@ 
             $this->resource = $configResources[0];
             $this->initializeNamespaces();
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }      
     }
 
@@ -324,7 +324,7 @@ 
     public function getGlobalPlugins()
     {
         $globalPlugins = array();
-        $globalPluginsResource =  $this->getResource()->getResource("skosmos:globalPlugins");
+        $globalPluginsResource = $this->getResource()->getResource("skosmos:globalPlugins");
         if ($globalPluginsResource) {
             foreach ($globalPluginsResource as $resource) {
                 $globalPlugins[] = $resource->getValue();

model/Model.php

Spacing +8 added lines, -8 removed lines

@@ -218,18 +218,18 @@ 
         }
 
         $vocabs = $params->getVocabs();
-        $showDeprecated=false;
+        $showDeprecated = false;
         if (sizeof($vocabs) === 1) { // search within vocabulary
             $voc = $vocabs[0];
             $sparql = $voc->getSparql();
-            $showDeprecated=$voc->getConfig()->getShowDeprecated();
+            $showDeprecated = $voc->getConfig()->getShowDeprecated();
         } else { // multi-vocabulary or global search
             $voc = null;
             $sparql = $this->getDefaultSparql();
             // @TODO : in a global search showDeprecated will always be false and cannot be set globally
         }
 
-        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params,$showDeprecated);
+        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params, $showDeprecated);
         if ($params->getRest() && $results && $params->getSearchLimit() !== 0) {
           $results = array_slice($results, $params->getOffset(), $params->getSearchLimit());
         }
@@ -384,7 +384,7 @@ 
     public function getVocabularyCategories()
     {
         $cats = $this->globalConfig->getGraph()->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 
@@ -467,9 +467,9 @@ 
         }
 
         // if there are multiple vocabularies and one is the preferred vocabulary, return it
-        if($preferredVocabId != null) {
+        if ($preferredVocabId != null) {
             foreach ($vocabs as $vocab) {
-                if($vocab->getId() == $preferredVocabId) {
+                if ($vocab->getId() == $preferredVocabId) {
                     // double check that a label exists in the preferred vocabulary
                     if ($vocab->getConceptLabel($uri, null) !== null) {
                         return $vocab;
@@ -575,7 +575,7 @@ 
         // using apc cache for the resource if available
         if ($this->globalConfig->getCache()->isAvailable()) {
             // @codeCoverageIgnoreStart
-            $key = 'fetch: ' . $uri;
+            $key = 'fetch: '.$uri;
             $resource = $this->globalConfig->getCache()->fetch($key);
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
                 $resource = $this->fetchResourceFromUri($uri);
@@ -596,7 +596,7 @@ 
      */
     public function getSparqlImplementation($dialect, $endpoint, $graph)
     {
-        $classname = $dialect . "Sparql";
+        $classname = $dialect."Sparql";
 
         return new $classname($endpoint, $graph, $this);
     }

controller/RestController.php

Spacing +16 added lines, -16 removed lines

@@ -25,7 +25,7 @@ 
         // wrap with JSONP callback if requested
         if (filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_STRING)) {
             header("Content-type: application/javascript; charset=utf-8");
-            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW) . "(" . json_encode($data) . ");";
+            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW)."(".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]);
                     }
                 }
             }
@@ -160,7 +160,7 @@ 
         if ($request->getQueryParam('labellang')) {
             $ret['@context']['@language'] = $request->getQueryParam('labellang');
         } elseif ($request->getQueryParam('lang')) {
-            $ret['@context']['@language'] = $request->getQueryParam('lang');;
+            $ret['@context']['@language'] = $request->getQueryParam('lang'); ;
         }
         return $ret;
     }
@@ -226,7 +226,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(),
@@ -277,7 +277,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(),
@@ -351,7 +351,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(),
@@ -388,7 +388,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, array(
             '@context' => array(
@@ -548,19 +548,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]);
 		}
     }
 
@@ -620,7 +620,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;
@@ -814,7 +814,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 {

controller/Controller.php

Spacing +5 added lines, -5 removed lines

@@ -142,18 +142,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);
     }
 
     /**
@@ -187,7 +187,7 @@ 
     {
         if ($modifiedDate) {
             $ifModifiedSince = $this->getIfModifiedSince();
-            $this->sendHeader("Last-Modified: " . $modifiedDate->format('Y-m-d H:i:s'));
+            $this->sendHeader("Last-Modified: ".$modifiedDate->format('Y-m-d H:i:s'));
             if (!is_null($ifModifiedSince) && $ifModifiedSince >= $modifiedDate) {
                 $this->sendHeader("HTTP/1.0 304 Not Modified");
                 return true;