NatLibFi / Skosmos

src/model/LabelSkosXL.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     {
         $label = null;
         $labels = $this->resource->allResources('skosxl:prefLabel');
-        foreach($labels as $labres) {
+        foreach ($labels as $labres) {
             $label = $labres->getLiteral('skosxl:literalForm');
             if ($label->getLang() == $this->clang) {
                 return $label;
@@ -24,7 +24,7 @@ 
     {
         $ret = array();
         $props = $this->resource->properties();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             if ($prop !== 'rdf:type' && $prop !== 'skosxl:literalForm') {
                 // make sure to use the correct gettext keys for DC namespace
                 $propkey = str_starts_with($prop, 'dc11:') ?

src/model/Request.php

Spacing +2 added lines, -2 removed lines

@@ -169,7 +169,7 @@ 
 
     public function getRequestUri()
     {
-        return $this->getServerConstant('HTTP_HOST') . $this->getServerConstant('REQUEST_URI');
+        return $this->getServerConstant('HTTP_HOST').$this->getServerConstant('REQUEST_URI');
     }
 
     /**
@@ -177,7 +177,7 @@ 
      * @param string $newlang new UI language to set
      * @return string the relative url of the page
      */
-    public function getLangUrl($newlang=null)
+    public function getLangUrl($newlang = null)
     {
         $script_name = str_replace('/index.php', '', $this->getServerConstant('SCRIPT_NAME'));
         $langurl = substr(str_replace($script_name, '', strval($this->getServerConstant('REQUEST_URI'))), 1);

src/model/resolver/LOCResource.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
             $opts = array('http' => array('method'=>'HEAD',
                                           'user_agent' => 'Skosmos',
                                           'timeout' => $timeout));
-            $context  = stream_context_create($opts);
+            $context = stream_context_create($opts);
             $fd = fopen($this->uri, 'rb', false, $context);
             $headers = stream_get_meta_data($fd)['wrapper_data'];
             foreach ($headers as $header) {

src/model/PluginRegister.php

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
     private $requestedPlugins;
     private $pluginOrder;
 
-    public function __construct($requestedPlugins=array())
+    public function __construct($requestedPlugins = array())
     {
         $this->requestedPlugins = $requestedPlugins;
         $this->pluginOrder = array();
@@ -49,7 +49,7 @@ 
      * @param boolean $raw interpret $type values as raw text instead of files
      * @return array
      */
-    private function filterPlugins($type, $raw=false)
+    private function filterPlugins($type, $raw = false)
     {
         $plugins = $this->getPlugins();
         $plugins = $this->sortPlugins($plugins);
@@ -62,7 +62,7 @@ 
                         $ret[$name] = $files[$type];
                     } else {
                         foreach ($files[$type] as $file) {
-                            array_push($ret[$name], 'plugins/' . $name . '/' . $file);
+                            array_push($ret[$name], 'plugins/'.$name.'/'.$file);
                         }
                     }
                 }
@@ -94,7 +94,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsJS($names=null)
+    public function getPluginsJS($names = null)
     {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
@@ -108,7 +108,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsCSS($names=null)
+    public function getPluginsCSS($names = null)
     {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
@@ -122,7 +122,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsTemplates($names=null)
+    public function getPluginsTemplates($names = null)
     {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
@@ -136,7 +136,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getTemplates($names=null)
+    public function getTemplates($names = null)
     {
         $templateStrings = array();
         $plugins = $this->getPluginsTemplates($names);
@@ -144,8 +144,8 @@ 
             foreach ($templates as $path) {
                 if (file_exists($path)) {
                     $filename = explode('/', $path);
-                    $filename = $filename[sizeof($filename)-1];
-                    $id = $folder . '-' . substr($filename, 0, (strrpos($filename, ".")));
+                    $filename = $filename[sizeof($filename) - 1];
+                    $id = $folder.'-'.substr($filename, 0, (strrpos($filename, ".")));
                     $templateStrings[$id] = file_get_contents($path);
                 }
             }
@@ -158,7 +158,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginCallbacks($names=null)
+    public function getPluginCallbacks($names = null)
     {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
@@ -199,7 +199,7 @@ 
     protected function flatten($array)
     {
         $return = array();
-        array_walk_recursive($array, function ($a) use (&$return) { $return[] = $a; });
+        array_walk_recursive($array, function($a) use (&$return) { $return[] = $a; });
         return $return;
     }
 

src/model/Cache.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     /**
      * Wraps apc_store() and apcu_store()
      */
-    public function store($key, $value, $ttl=3600)
+    public function store($key, $value, $ttl = 3600)
     {
         if (function_exists('apcu_store')) {
             return apcu_store($key, $value, $ttl);

src/controller/Honeypot.php

Indentation +7 added lines, -7 removed lines

@@ -33,16 +33,16 @@
         // 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" .
+                '<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>';
     }
     /**
-    * Validate honeypot is empty
-    *
-    * @param  mixed $value
-    * @return boolean
-    */
+     * Validate honeypot is empty
+     *
+     * @param  mixed $value
+     * @return boolean
+     */
     public function validateHoneypot($value): bool
     {
         if ($this->disabled) {

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/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

Indentation +3 added lines, -3 removed lines

@@ -1165,9 +1165,9 @@
         return $this->returnJson(array_merge_recursive(
             $this->context,
             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') )
+                                                                                      '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') )
                                                         ),
             array('changeList' => $simpleChangeList)
         ));

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)
         ));