NatLibFi / Skosmos

model/Vocabulary.php

Braces +3 added lines, -1 removed lines

@@ -76,10 +76,12 @@
      */
     public function getUriSpace()
     {
-        if ($this->urispace === null) // initialize cache
+        if ($this->urispace === null) {
+          // initialize cache
         {
             $this->urispace = $this->resource->getLiteral('void:uriSpace')->getValue();
         }
+        }
 
         return $this->urispace;
     }

Spacing +8 added lines, -8 removed lines

@@ -92,7 +92,7 @@ 
             return $lname;
         }
         // already a full URI
-        return $this->getUriSpace() . $lname;
+        return $this->getUriSpace().$lname;
     }
 
     /**
@@ -153,7 +153,7 @@ 
                 foreach ($conceptscheme->allLiterals($prop, null) as $val) {
                     $prop = (substr($prop, 0, 5) == 'dc11:') ? str_replace('dc11:', 'dc:', $prop) : $prop;
                     if ($val->getValue() instanceof DateTime) {
-                        $val = Punic\Calendar::formatDate($val->getValue(), 'full', $lang) . ' ' . Punic\Calendar::format($val->getValue(), 'HH:mm:ss', $lang);
+                        $val = Punic\Calendar::formatDate($val->getValue(), 'full', $lang).' '.Punic\Calendar::format($val->getValue(), 'HH:mm:ss', $lang);
                     }
                     $ret[$prop][] = $val;
                 }
@@ -264,7 +264,7 @@ 
         }
         // don't know how to parse
         $rev = $parts[2];
-        $datestr = $parts[3] . ' ' . $parts[4];
+        $datestr = $parts[3].' '.$parts[4];
 
         return "$datestr (r$rev)";
     }
@@ -273,7 +273,7 @@ 
      * Counts the statistics of the vocabulary.
      * @return array of the concept/group counts
      */
-    public function getStatistics($lang = '', $array=null, $group=null)
+    public function getStatistics($lang = '', $array = null, $group = null)
     {
         $sparql = $this->getSparql();
         // find the number of concepts
@@ -482,7 +482,7 @@ 
      */
     public function searchConceptsAlphabetical($letter, $limit = null, $offset = null, $clang = null)
     {
-        return $this->getSparql()->queryConceptsAlphabetical($letter, $clang, $limit, $offset, $this->config->getIndexClasses(),$this->config->getShowDeprecated());
+        return $this->getSparql()->queryConceptsAlphabetical($letter, $clang, $limit, $offset, $this->config->getIndexClasses(), $this->config->getShowDeprecated());
     }
 
     /**
@@ -591,14 +591,14 @@ 
     {
       $changelist = $this->getSparql()->queryChangeList($clang, $offset, $prop);
       $bydate = array();
-      foreach($changelist as $concept) {
+      foreach ($changelist as $concept) {
         $concept['datestring'] = Punic\Calendar::formatDate($concept['date'], 'medium', $lang);
-        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true) . Punic\Calendar::format($concept['date'], ' y', $lang) ][strtolower($concept['prefLabel'])] = $concept;
+        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true).Punic\Calendar::format($concept['date'], ' y', $lang)][strtolower($concept['prefLabel'])] = $concept;
       }
       return $bydate;
     }
 
-    public function getTitle($lang=null) {
+    public function getTitle($lang = null) {
       return $this->config->getTitle($lang);
     }
     

rest.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     } elseif ($parts[1] == 'data') {
         $controller->data($request);
     } elseif (sizeof($parts) == 2) {
-        header("Location: " . $parts[1] . "/");
+        header("Location: ".$parts[1]."/");
     } else {
         $vocab = $parts[1];
         try {
@@ -93,5 +93,5 @@ 
     }
 } catch (Exception $e) {
     header("HTTP/1.0 500 Internal Server Error");
-    echo('ERROR: ' . $e->getMessage());
+    echo('ERROR: '.$e->getMessage());
 }

model/Request.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 
     public function getRequestUri()
     {
-        return $this->getServerConstant('HTTP_HOST') . $this->getServerConstant('REQUEST_URI');
+        return $this->getServerConstant('HTTP_HOST').$this->getServerConstant('REQUEST_URI');
     }
     
     /**

Braces +12 added lines, -4 removed lines

@@ -74,7 +74,9 @@ 
      */
     public function getQueryParam($paramName)
     {
-        if (!isset($this->queryParams[$paramName])) return null;
+        if (!isset($this->queryParams[$paramName])) {
+          return null;
+        }
         $val = filter_var($this->queryParams[$paramName], FILTER_SANITIZE_STRING);
         return ($val !== null ? str_replace('\\', '', $val) : null);
     }
@@ -91,7 +93,9 @@ 
 
     public function getQueryParamPOST($paramName)
     {
-        if (!isset($this->queryParamsPOST[$paramName])) return null;
+        if (!isset($this->queryParamsPOST[$paramName])) {
+          return null;
+        }
         return filter_var($this->queryParamsPOST[$paramName], FILTER_SANITIZE_STRING);
     }
 
@@ -106,7 +110,9 @@ 
 
     public function getServerConstant($paramName)
     {
-        if (!isset($this->serverConstants[$paramName])) return null;
+        if (!isset($this->serverConstants[$paramName])) {
+          return null;
+        }
         return filter_var($this->serverConstants[$paramName], FILTER_SANITIZE_STRING);
     }
 
@@ -239,9 +245,11 @@ 
      */
     public function setVocab($vocabid)
     {
-        if (strpos($vocabid, ' ') !== false) // if there are multiple vocabularies just storing the string
+        if (strpos($vocabid, ' ') !== false) {
+          // if there are multiple vocabularies just storing the string
         {
             $this->setVocabids($vocabid);
+        }
         } else {
             $this->vocab = $this->model->getVocabulary($vocabid);
         }

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

model/DataObject.php

Braces +3 added lines, -1 removed lines

@@ -79,10 +79,12 @@
         if ($sortable !== null) {
             uksort($sortable, array($this, 'mycompare'));
             foreach ($sortable as $prop => $vals) {
-                if (is_array($prop)) // the ConceptProperty objects have their own sorting methods
+                if (is_array($prop)) {
+                  // the ConceptProperty objects have their own sorting methods
                 {
                     ksort($sortable[$prop]);
                 }
+                }
             }
         }
         return $sortable;

model/sparql/GenericSparql.php

Braces +10 added lines, -6 removed lines

@@ -46,12 +46,16 @@ 
         $this->client = new EasyRdf\Sparql\Client($endpoint);
 
         // set graphClause so that it can be used by all queries
-        if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable)
+        if ($this->isDefaultEndpoint()) {
+          // default endpoint; query any graph (and catch it in a variable)
         {
             $this->graphClause = "GRAPH $graph";
-        } elseif ($graph) // query a specific graph
+        }
+        } elseif ($graph) {
+          // query a specific graph
         {
             $this->graphClause = "GRAPH <$graph>";
+        }
         } else // query the default graph
         {
             $this->graphClause = "";
@@ -100,8 +104,9 @@ 
             }
         }
         foreach ($graphs as $graph) {
-            if($graph !== NULL)
-                $clause .= "FROM NAMED <$graph> "; 
+            if($graph !== NULL) {
+                            $clause .= "FROM NAMED <$graph> ";
+            }
         }
         return $clause;
     }
@@ -1847,8 +1852,7 @@ 
         if (sizeof($ret) > 0) {
             // existing concept, with children
             return $ret;
-        }
-        else {
+        } else {
             // nonexistent concept
             return null;
         }

Spacing +54 added lines, -54 removed lines

@@ -87,11 +87,11 @@ 
     protected function query($query) {
         $queryId = sprintf("%05d", rand(0, 99999));
         $logger = $this->model->getLogger();
-        $logger->info("[qid $queryId] SPARQL query:\n" . $this->generateQueryPrefixes($query) . "\n$query\n");
+        $logger->info("[qid $queryId] SPARQL query:\n".$this->generateQueryPrefixes($query)."\n$query\n");
         $starttime = microtime(true);
         $result = $this->client->query($query);
         $elapsed = intval(round((microtime(true) - $starttime) * 1000));
-        if(method_exists($result, 'numRows')) {
+        if (method_exists($result, 'numRows')) {
             $numRows = $result->numRows();
             $logger->info("[qid $queryId] result: $numRows rows returned in $elapsed ms");
         } else { // graph result
@@ -107,20 +107,20 @@ 
      * @param Vocabulary[]|null $vocabs
      * @return string
      */
-    protected function generateFromClause($vocabs=null) {
+    protected function generateFromClause($vocabs = null) {
         $graphs = array();
         $clause = '';
         if (!$vocabs) {
             return $this->graph !== '?graph' && $this->graph !== NULL ? "FROM <$this->graph>" : '';
         }
-        foreach($vocabs as $vocab) {
+        foreach ($vocabs as $vocab) {
             $graph = $vocab->getGraph();
             if (!in_array($graph, $graphs)) {
                 array_push($graphs, $graph);
             }
         }
         foreach ($graphs as $graph) {
-            if($graph !== NULL)
+            if ($graph !== NULL)
                 $clause .= "FROM NAMED <$graph> "; 
         }
         return $clause;
@@ -271,9 +271,9 @@ 
     	  $queryPart = "BIND(lang($varnameInput) AS $varnameOutput)";
 	      $first = true;
 
-	      $queryPart .= "FILTER(" ;
+	      $queryPart .= "FILTER(";
         foreach ($values as $val) {
-            if($first != true){
+            if ($first != true) {
               $queryPart .= ' || ';
             }
 	      $first = false;
@@ -687,9 +687,9 @@ 
                 $conceptscheme['title'] = $row->title->getValue();
             }
             // add dct:subject and their labels in the result
-            if(isset($row->domain) && isset($row->domainLabel)){
-                $conceptscheme['subject']['uri']=$row->domain->getURI();
-                $conceptscheme['subject']['prefLabel']=$row->domainLabel->getValue();
+            if (isset($row->domain) && isset($row->domainLabel)) {
+                $conceptscheme['subject']['uri'] = $row->domain->getURI();
+                $conceptscheme['subject']['prefLabel'] = $row->domainLabel->getValue();
             }
 
             $ret[$row->cs->getURI()] = $conceptscheme;
@@ -752,7 +752,7 @@ 
         foreach ($graphs as $graph) {
           $values[] = "<$graph>";
         }
-        return "FILTER (?graph IN (" . implode(',', $values) . "))";
+        return "FILTER (?graph IN (".implode(',', $values)."))";
     }
 
     /**
@@ -762,16 +762,16 @@ 
      * @return string sparql query clauses
      */
     protected function formatLimitAndOffset($limit, $offset) {
-        $limit = ($limit) ? 'LIMIT ' . $limit : '';
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $limit = ($limit) ? 'LIMIT '.$limit : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
         // eliminating whitespace and line changes when the conditions aren't needed.
         $limitandoffset = '';
         if ($limit && $offset) {
-            $limitandoffset = "\n" . $limit . "\n" . $offset;
+            $limitandoffset = "\n".$limit."\n".$offset;
         } elseif ($limit) {
-            $limitandoffset = "\n" . $limit;
+            $limitandoffset = "\n".$limit;
         } elseif ($offset) {
-            $limitandoffset = "\n" . $offset;
+            $limitandoffset = "\n".$offset;
         }
 
         return $limitandoffset;
@@ -923,14 +923,14 @@ 
         // if search language and UI/display language differ, must also consider case where there is no prefLabel in
         // the display language; in that case, should use the label with the same language as the matched label
         $labelcondFallback = ($searchLang != $lang) ?
-          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n" .
+          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n".
           "?s skos:prefLabel ?label . FILTER (LANGMATCHES(LANG(?label), LANG(?match))) }" : "";
           
         //  Including the labels if there is no query term given.
         if ($rawterm === '') {
           $labelClause = "?s skos:prefLabel ?label .";
-          $labelClause = ($lang) ? $labelClause . " FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause . "";
-          return $labelClause . " BIND(?label AS ?match)";
+          $labelClause = ($lang) ? $labelClause." FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause."";
+          return $labelClause." BIND(?label AS ?match)";
         }
 
         /*
@@ -994,20 +994,20 @@ 
         $schemecond = '';
         if (!empty($schemes)) {
             $conditions = array();
-            foreach($schemes as $scheme) {
+            foreach ($schemes as $scheme) {
                 $conditions[] = "{?s skos:inScheme <$scheme>}";
             }
-            $schemecond = '{'.implode(" UNION ",$conditions).'}';
+            $schemecond = '{'.implode(" UNION ", $conditions).'}';
         }
-        $filterDeprecated="";
+        $filterDeprecated = "";
         //show or hide deprecated concepts
-        if(!$showDeprecated){
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
+        if (!$showDeprecated) {
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
         }
         // extra conditions for parent and group, if specified
-        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <" . $params->getParentLimit() . "> ." : "";
-        $groupcond = ($params->getGroupLimit()) ? "<" . $params->getGroupLimit() . "> skos:member ?s ." : "";
-        $pgcond = $parentcond . $groupcond;
+        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <".$params->getParentLimit()."> ." : "";
+        $groupcond = ($params->getGroupLimit()) ? "<".$params->getGroupLimit()."> skos:member ?s ." : "";
+        $pgcond = $parentcond.$groupcond;
 
         $orderextra = $this->isDefaultEndpoint() ? $this->graph : '';
 
@@ -1080,9 +1080,9 @@ 
             $hit['type'][] = $this->shortenUri($typeuri);
         }
 
-        if(!empty($fields)) {
+        if (!empty($fields)) {
             foreach ($fields as $prop) {
-                $propname = $prop . 's';
+                $propname = $prop.'s';
                 if (isset($row->$propname)) {
                     foreach (explode("\n", $row->$propname->getValue()) as $line) {
                         $rdata = str_getcsv($line, ',', '"', '"');
@@ -1097,7 +1097,7 @@ 
                             $propvals = $rdata[2];
                         }
 
-                        $hit['skos:' . $prop][] = $propvals;
+                        $hit['skos:'.$prop][] = $propvals;
                     }
                 }
             }
@@ -1173,7 +1173,7 @@ 
      * @return array query result object
      */
     public function queryConcepts($vocabs, $fields = null, $unique = false, $params, $showDeprecated = false) {
-        $query = $this->generateConceptSearchQuery($fields, $unique, $params,$showDeprecated);
+        $query = $this->generateConceptSearchQuery($fields, $unique, $params, $showDeprecated);
         $results = $this->query($query);
         return $this->transformConceptSearchResults($results, $vocabs, $fields);
     }
@@ -1227,9 +1227,9 @@ 
         $conditions = $this->formatFilterConditions($letter, $lang);
         $filtercondLabel = $conditions['filterpref'];
         $filtercondALabel = $conditions['filteralt'];
-        $filterDeprecated="";
-        if(!$showDeprecated){
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
+        $filterDeprecated = "";
+        if (!$showDeprecated) {
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
         }
         $query = <<<EOQ
 SELECT DISTINCT ?s ?label ?alabel $fcl
@@ -1305,8 +1305,8 @@ 
      * @param array $classes
      * @param boolean $showDeprecated whether to include deprecated concepts in the result (default: false)
      */
-    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null,$showDeprecated = false) {
-        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes,$showDeprecated);
+    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null, $showDeprecated = false) {
+        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes, $showDeprecated);
         $results = $this->query($query);
         return $this->transformAlphabeticalListResults($results);
     }
@@ -1640,7 +1640,7 @@ 
                 if (!isset($row->label) || $row->label->getLang() === $lang) {
                     $ret[$row->object->getUri()] = $val;
                 } elseif ($row->label->getLang() === $fallbacklang) {
-                    $val['label'] .= ' (' . $row->label->getLang() . ')';
+                    $val['label'] .= ' ('.$row->label->getLang().')';
                     $ret[$row->object->getUri()] = $val;
                 }
             }
@@ -1736,10 +1736,10 @@ 
 
             $label = null;
             if (isset($row->label)) {
-                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
+                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
                     $label = $row->label->getValue();
                 } else {
-                    $label = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                    $label = $row->label->getValue()." (".$row->label->getLang().")";
                 }
 
             }
@@ -1815,8 +1815,8 @@ 
         foreach ($result as $row) {
             if (isset($row->top) && isset($row->label)) {
                 $label = $row->label->getValue();
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
-                    $label .= ' (' . $row->label->getLang() . ')';
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
+                    $label .= ' ('.$row->label->getLang().')';
                 }
                 $top = array('uri' => $row->top->getUri(), 'topConceptOf' => $row->topuri->getUri(), 'label' => $label, 'hasChildren' => filter_var($row->children->getValue(), FILTER_VALIDATE_BOOLEAN));
                 if (isset($row->notation)) {
@@ -1909,7 +1909,7 @@ 
                 $ret[$uri]['exact'] = $row->exact->getUri();
             }
             if (isset($row->tops)) {
-               $topConceptsList=explode(" ", $row->tops->getValue());
+               $topConceptsList = explode(" ", $row->tops->getValue());
                // sort to garantee an alphabetical ordering of the URI
                sort($topConceptsList);
                $ret[$uri]['tops'] = $topConceptsList;
@@ -1922,8 +1922,8 @@ 
                 $label = null;
                 if (isset($row->childlabel)) {
                     $label = $row->childlabel->getValue();
-                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang . "-") !== 0) {
-                        $label .= " (" . $row->childlabel->getLang() . ")";
+                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang."-") !== 0) {
+                        $label .= " (".$row->childlabel->getLang().")";
                     }
 
                 }
@@ -1944,8 +1944,8 @@ 
             }
             if (isset($row->label)) {
                 $preflabel = $row->label->getValue();
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
-                    $preflabel .= ' (' . $row->label->getLang() . ')';
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
+                    $preflabel .= ' ('.$row->label->getLang().')';
                 }
 
                 $ret[$uri]['prefLabel'] = $preflabel;
@@ -2066,9 +2066,9 @@ 
      */
     private function generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated = false) {
         $fcl = $this->generateFromClause();
-        $filterDeprecated="";
-        if(!$showDeprecated){
-            $filterDeprecated="  FILTER NOT EXISTS { ?conc owl:deprecated true }";
+        $filterDeprecated = "";
+        if (!$showDeprecated) {
+            $filterDeprecated = "  FILTER NOT EXISTS { ?conc owl:deprecated true }";
         }
         $query = <<<EOQ
 SELECT ?conc ?super ?label ?members ?type ?notation $fcl
@@ -2107,10 +2107,10 @@ 
                     'type' => array($row->type->shorten()),
                 );
                 if (isset($row->label)) {
-                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
+                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
                         $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue();
                     } else {
-                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue()." (".$row->label->getLang().")";
                     }
 
                 }
@@ -2138,8 +2138,8 @@ 
      * @param boolean $showDeprecated whether to include deprecated concepts in search results
      * @return array Result array with concept URI as key and concept label as value
      */
-    public function listConceptGroupContents($groupClass, $group, $lang,$showDeprecated = false) {
-        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang,$showDeprecated);
+    public function listConceptGroupContents($groupClass, $group, $lang, $showDeprecated = false) {
+        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated);
         $result = $this->query($query);
         return $this->transformConceptGroupContentsResults($result, $lang);
     }
@@ -2152,7 +2152,7 @@ 
      */
     private function generateChangeListQuery($lang, $offset, $prop) {
         $fcl = $this->generateFromClause();
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
 
         $query = <<<EOQ
 SELECT DISTINCT ?concept ?date ?label $fcl