NatLibFi / Skosmos

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

index.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
     }
     require_once 'vendor/autoload.php';
 } catch (Exception $e) {
-    echo "Error: " . $e->getMessage();
+    echo "Error: ".$e->getMessage();
     return;
 }
 
@@ -32,7 +32,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();
-    header("Location: " . $lang . "/");
+    header("Location: ".$lang."/");
 } else {
   if (array_key_exists($parts[1], $config->getLanguages())) { // global pages
         $request->setLang($parts[1]);
@@ -61,8 +61,8 @@ 
         }
         if (sizeof($parts) == 3) { // language code missing
             $lang = $controller->guessLanguage();
-            $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];
@@ -103,10 +103,10 @@ 
                 }
             } else { // language code missing, redirect to some language version
                 $lang = $controller->guessLanguage($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");
             }

controller/RestController.php

Spacing +11 added lines, -11 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);
@@ -144,7 +144,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;
     }
@@ -211,7 +211,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(),
@@ -261,7 +261,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(),
@@ -335,7 +335,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(),
@@ -372,7 +372,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(
@@ -530,10 +530,10 @@ 
 
         $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)));
         }
 
-        header("Location: " . $urls[$format]);
+        header("Location: ".$urls[$format]);
     }
     
     private function returnDataResults($results, $format) {
@@ -587,7 +587,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;

model/ConceptProperty.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
      * @param string $prop property type eg. 'rdf:type'.
      * @param string $label
      */
-    public function __construct($prop, $label, $super=null)
+    public function __construct($prop, $label, $super = null)
     {
         $this->prop = $prop;
         $this->label = $label;
@@ -59,7 +59,7 @@ 
      */
     public function getDescription()
     {
-        $helpprop = $this->prop . "_help";
+        $helpprop = $this->prop."_help";
 
         return gettext($helpprop); // can't use string constant, it'd be picked up by xgettext
     }
@@ -78,7 +78,7 @@ 
 
     public function addValue($value)
     {
-        $this->values[$value->getNotation() . $value->getLabel() . $value->getUri()] = $value;
+        $this->values[$value->getNotation().$value->getLabel().$value->getUri()] = $value;
         $this->is_sorted = false;
     }
 
@@ -86,7 +86,7 @@ 
     {
         if (!empty($this->values)) {
             uksort($this->values, function($a, $b) {
-                return strnatcasecmp($a,$b);
+                return strnatcasecmp($a, $b);
             });
         }
         $this->is_sorted = true;

model/ConceptPropertyValue.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
     {
         $label = is_string($this->getLabel()) ? $this->getLabel() : $this->getLabel()->getValue();
         if ($this->vocab->getConfig()->sortByNotation()) {
-            $label = $this->getNotation() . $label;
+            $label = $this->getNotation().$label;
         }
 
         return $label;
@@ -120,7 +120,7 @@ 
     public function getReifiedPropertyValues() {
         $ret = array();
         $props = $this->resource->propertyUris();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             $prop = (EasyRdf_Namespace::shorten($prop) !== null) ? EasyRdf_Namespace::shorten($prop) : $prop;
             foreach ($this->resource->allLiterals($prop) as $val) {
                 if ($prop !== 'rdf:value' && $this->resource->get($prop)) { // shown elsewhere

model/Cache.php

Spacing +1 added lines, -1 removed lines

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

controller/Honeypot.php

Spacing +4 added lines, -4 removed lines

@@ -32,9 +32,9 @@ 
     {
         // Encrypt the current time
         $honey_time_encrypted = $this->getEncryptedTime();
-        $html = '<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" .
+        $html = '<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>';
         return $html;
     }
@@ -67,7 +67,7 @@ 
         // Get the decrypted time
         $value = $this->decryptTime($value);
         // The current time should be greater than the time the form was built + the speed option
-        return ( is_numeric($value) && time() > ($value + $parameters[0]) );
+        return (is_numeric($value) && time() > ($value + $parameters[0]));
     }
     /**
      * Get encrypted time

model/SkosmosTurtleParser.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
      */
     protected function peek()
     {
-        if(!$this->dataLength) { $this->dataLength = strlen($this->data); }
+        if (!$this->dataLength) { $this->dataLength = strlen($this->data); }
         if ($this->dataLength > $this->bytePos) {
             $slice = substr($this->data, $this->bytePos, 4);
             return mb_substr($slice, 0, 1, "UTF-8");
@@ -78,7 +78,7 @@ 
     {
         if ($this->bytePos - 4 > 0) {
             $slice = substr($this->data, $this->bytePos - 4, 4);
-            while($slice != '') {
+            while ($slice != '') {
                 if (!self::isWhitespace(mb_substr($slice, -1, 1, "UTF-8"))) {
                     return;
                 }

controller/WebController.php

Spacing +24 added lines, -24 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());
@@ -64,7 +64,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);
@@ -111,18 +111,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 = sizeof($params) > 0 ? '?' . http_build_query($params) : '';
+            $paramstr = sizeof($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);
     }
 
     /**
@@ -279,12 +279,12 @@ 
     private function createFeedbackHeaders($fromName, $fromEmail, $toMail)
     {
         $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 ($toMail) {
-            $headers .= "Cc: " . $this->model->getConfig()->getFeedbackAddress() . "\r\n";
+            $headers .= "Cc: ".$this->model->getConfig()->getFeedbackAddress()."\r\n";
         }
 
-        $headers .= "From: $fromName <$fromEmail>" . "\r\n" . 'X-Mailer: PHP/' . phpversion();
+        $headers .= "From: $fromName <$fromEmail>"."\r\n".'X-Mailer: PHP/'.phpversion();
         return $headers;
     }
 
@@ -299,20 +299,20 @@ 
     {
         $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;
         }
 
-        $subject = SERVICE_NAME . " feedback";
+        $subject = SERVICE_NAME." feedback";
         $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail);
         $envelopeSender = FEEDBACK_ENVELOPE_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 />IP address: " . $request->getServerConstant('REMOTE_ADDR')
-            . "<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 />IP address: ".$request->getServerConstant('REMOTE_ADDR')
+            . "<br />Referer: ".$request->getServerConstant('HTTP_REFERER');
 
         try {
             mail($toAddress, $subject, $message, $headers, $params);
@@ -320,7 +320,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(
@@ -367,7 +367,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);
             }
         }
@@ -378,7 +378,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;
@@ -394,7 +394,7 @@ 
                 'search_count' => $counts,
                 'languages' => $this->languages,
                 'search_results' => $searchResults,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'global_search' => true,
                 'term' => $request->getQueryParam('q'),
                 'lang_list' => $langList,
@@ -419,7 +419,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(
@@ -440,7 +440,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(
@@ -457,7 +457,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(),
@@ -582,7 +582,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());