Completed
Pull Request — master (#899)
by Dan Michael O.
01:48
created
rest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     } elseif ($parts[1] == 'data') {
38 38
         $controller->data($request);
39 39
     } elseif (sizeof($parts) == 2) {
40
-        header("Location: " . $parts[1] . "/");
40
+        header("Location: ".$parts[1]."/");
41 41
     } else {
42 42
         $vocab = $parts[1];
43 43
         try {
@@ -93,5 +93,5 @@  discard block
 block discarded – undo
93 93
     }
94 94
 } catch (Exception $e) {
95 95
     header("HTTP/1.0 500 Internal Server Error");
96
-    echo('ERROR: ' . $e->getMessage());
96
+    echo('ERROR: '.$e->getMessage());
97 97
 }
Please login to merge, or discard this patch.
model/Request.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 
107 107
     public function getRequestUri()
108 108
     {
109
-        return $this->getServerConstant('HTTP_HOST') . $this->getServerConstant('REQUEST_URI');
109
+        return $this->getServerConstant('HTTP_HOST').$this->getServerConstant('REQUEST_URI');
110 110
     }
111 111
     
112 112
     /**
Please login to merge, or discard this patch.
entity.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,5 +23,5 @@
 block discarded – undo
23 23
 
24 24
 } catch (Exception $e) {
25 25
     header("HTTP/1.0 500 Internal Server Error");
26
-    echo('ERROR: ' . $e->getMessage());
26
+    echo('ERROR: '.$e->getMessage());
27 27
 }
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
     }
15 15
     require_once 'vendor/autoload.php';
16 16
 } catch (Exception $e) {
17
-    echo "Error: " . $e->getMessage();
17
+    echo "Error: ".$e->getMessage();
18 18
     return;
19 19
 }
20 20
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
     // if language code missing, redirect to guessed language
33 33
     // in any case, redirect to <lang>/
34 34
     $lang = sizeof($parts) == 2 && $parts[1] !== '' ? $parts[1] : $controller->guessLanguage();
35
-    header("Location: " . $lang . "/");
35
+    header("Location: ".$lang."/");
36 36
 } else {
37 37
   if (array_key_exists($parts[1], $config->getLanguages())) { // global pages
38 38
         $request->setLang($parts[1]);
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
         }
62 62
         if (sizeof($parts) == 3) { // language code missing
63 63
             $lang = $controller->guessLanguage();
64
-            $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/";
65
-            header("Location: " . $newurl);
64
+            $newurl = $controller->getBaseHref().$vocab."/".$lang."/";
65
+            header("Location: ".$newurl);
66 66
         } else {
67 67
             if (array_key_exists($parts[2], $config->getLanguages())) {
68 68
                 $lang = $parts[2];
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
                 }
104 104
             } else { // language code missing, redirect to some language version
105 105
                 $lang = $controller->guessLanguage($vocab);
106
-                $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/" . implode('/', array_slice($parts, 2));
106
+                $newurl = $controller->getBaseHref().$vocab."/".$lang."/".implode('/', array_slice($parts, 2));
107 107
                 $qs = $request->getServerConstant('QUERY_STRING');
108 108
                 if ($qs) {
109
-                    $newurl .= "?" . $qs;
109
+                    $newurl .= "?".$qs;
110 110
                 }
111 111
                 header("Location: $newurl");
112 112
             }
Please login to merge, or discard this patch.
controller/Honeypot.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
     {
33 33
         // Encrypt the current time
34 34
         $honey_time_encrypted = $this->getEncryptedTime();
35
-        $html = '<div id="' . $honey_name . '_wrap" style="display:none;">' . "\r\n" .
36
-                    '<input name="' . $honey_name . '" type="text" value="" id="' . $honey_name . '"/>' . "\r\n" .
37
-                    '<input name="' . $honey_time . '" type="text" value="' . $honey_time_encrypted . '"/>' . "\r\n" .
35
+        $html = '<div id="'.$honey_name.'_wrap" style="display:none;">'."\r\n".
36
+                    '<input name="'.$honey_name.'" type="text" value="" id="'.$honey_name.'"/>'."\r\n".
37
+                    '<input name="'.$honey_time.'" type="text" value="'.$honey_time_encrypted.'"/>'."\r\n".
38 38
                 '</div>';
39 39
         return $html;
40 40
     }
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         // Get the decrypted time
68 68
         $value = $this->decryptTime($value);
69 69
         // The current time should be greater than the time the form was built + the speed option
70
-        return ( is_numeric($value) && time() > ($value + $parameters[0]) );
70
+        return (is_numeric($value) && time() > ($value + $parameters[0]));
71 71
     }
72 72
     /**
73 73
      * Get encrypted time
Please login to merge, or discard this patch.
model/SkosmosTurtleParser.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
      */
22 22
     protected function peek()
23 23
     {
24
-        if(!$this->dataLength) { $this->dataLength = strlen($this->data); }
24
+        if (!$this->dataLength) { $this->dataLength = strlen($this->data); }
25 25
         if ($this->dataLength > $this->bytePos) {
26 26
             $slice = substr($this->data, $this->bytePos, 4);
27 27
             return mb_substr($slice, 0, 1, "UTF-8");
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
     {
79 79
         if ($this->bytePos - 4 > 0) {
80 80
             $slice = substr($this->data, $this->bytePos - 4, 4);
81
-            while($slice != '') {
81
+            while ($slice != '') {
82 82
                 if (!self::isWhitespace(mb_substr($slice, -1, 1, "UTF-8"))) {
83 83
                     return;
84 84
                 }
Please login to merge, or discard this patch.
model/Vocabulary.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
             return $lname;
93 93
         }
94 94
         // already a full URI
95
-        return $this->getUriSpace() . $lname;
95
+        return $this->getUriSpace().$lname;
96 96
     }
97 97
 
98 98
     /**
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
                 foreach ($conceptscheme->allLiterals($prop, null) as $val) {
154 154
                     $prop = (substr($prop, 0, 5) == 'dc11:') ? str_replace('dc11:', 'dc:', $prop) : $prop;
155 155
                     if ($val->getValue() instanceof DateTime) {
156
-                        $val = Punic\Calendar::formatDate($val->getValue(), 'full', $lang) . ' ' . Punic\Calendar::format($val->getValue(), 'HH:mm:ss', $lang);
156
+                        $val = Punic\Calendar::formatDate($val->getValue(), 'full', $lang).' '.Punic\Calendar::format($val->getValue(), 'HH:mm:ss', $lang);
157 157
                     }
158 158
                     $ret[$prop][] = $val;
159 159
                 }
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
         }
265 265
         // don't know how to parse
266 266
         $rev = $parts[2];
267
-        $datestr = $parts[3] . ' ' . $parts[4];
267
+        $datestr = $parts[3].' '.$parts[4];
268 268
 
269 269
         return "$datestr (r$rev)";
270 270
     }
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
      * Counts the statistics of the vocabulary.
274 274
      * @return array of the concept/group counts
275 275
      */
276
-    public function getStatistics($lang = '', $array=null, $group=null)
276
+    public function getStatistics($lang = '', $array = null, $group = null)
277 277
     {
278 278
         $sparql = $this->getSparql();
279 279
         // find the number of concepts
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
      */
483 483
     public function searchConceptsAlphabetical($letter, $limit = null, $offset = null, $clang = null)
484 484
     {
485
-        return $this->getSparql()->queryConceptsAlphabetical($letter, $clang, $limit, $offset, $this->config->getIndexClasses(),$this->config->getShowDeprecated());
485
+        return $this->getSparql()->queryConceptsAlphabetical($letter, $clang, $limit, $offset, $this->config->getIndexClasses(), $this->config->getShowDeprecated());
486 486
     }
487 487
 
488 488
     /**
@@ -591,14 +591,14 @@  discard block
 block discarded – undo
591 591
     {
592 592
       $changelist = $this->getSparql()->queryChangeList($clang, $offset, $prop);
593 593
       $bydate = array();
594
-      foreach($changelist as $concept) {
594
+      foreach ($changelist as $concept) {
595 595
         $concept['datestring'] = Punic\Calendar::formatDate($concept['date'], 'medium', $lang);
596
-        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true) . Punic\Calendar::format($concept['date'], ' y', $lang) ][strtolower($concept['prefLabel'])] = $concept;
596
+        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true).Punic\Calendar::format($concept['date'], ' y', $lang)][strtolower($concept['prefLabel'])] = $concept;
597 597
       }
598 598
       return $bydate;
599 599
     }
600 600
 
601
-    public function getTitle($lang=null) {
601
+    public function getTitle($lang = null) {
602 602
       return $this->config->getTitle($lang);
603 603
     }
604 604
     
Please login to merge, or discard this patch.
model/sparql/JenaTextSparql.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         // 1. Ensure characters with special meaning in Lucene are escaped
41 41
         $lucenemap = array();
42 42
         foreach (str_split(self::LUCENE_ESCAPE_CHARS) as $char) {
43
-            $lucenemap[$char] = '\\' . $char; // escape with a backslash
43
+            $lucenemap[$char] = '\\'.$char; // escape with a backslash
44 44
         }
45 45
         $term = strtr($term, $lucenemap);
46 46
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
      * @return string sparql order by clause
83 83
      */
84 84
     private function formatOrderBy($expression, $lang) {
85
-        if(!$this->model->getConfig()->getCollationEnabled()) {
85
+        if (!$this->model->getConfig()->getCollationEnabled()) {
86 86
             return $expression;
87 87
         }
88 88
         $orderby = sprintf('arq:collation(\'%2$s\', %1$s)', $expression, $lang);
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
 
115 115
         # make text query clause
116 116
         $lcletter = mb_strtolower($letter, 'UTF-8'); // convert to lower case, UTF-8 safe
117
-        $textcondPref = $this->createTextQueryCondition($letter . '*', 'skos:prefLabel', $lang);
118
-        $textcondAlt = $this->createTextQueryCondition($letter . '*', 'skos:altLabel', $lang);
117
+        $textcondPref = $this->createTextQueryCondition($letter.'*', 'skos:prefLabel', $lang);
118
+        $textcondAlt = $this->createTextQueryCondition($letter.'*', 'skos:altLabel', $lang);
119 119
         $orderbyclause = $this->formatOrderBy("LCASE(?match)", $lang);
120 120
 
121
-        $filterDeprecated="";
122
-        if(!$showDeprecated){
123
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
121
+        $filterDeprecated = "";
122
+        if (!$showDeprecated) {
123
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
124 124
         }
125 125
         
126 126
         $query = <<<EOQ
Please login to merge, or discard this patch.
model/ConceptPropertyValueLiteral.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
                 return Punic\Calendar::formatDate($val, 'short');
50 50
             } catch (Exception $e) {
51 51
                 trigger_error($e->getMessage(), E_USER_WARNING);
52
-                return (string) $this->literal;
52
+                return (string)$this->literal;
53 53
             }
54 54
         }
55 55
         return $this->literal->getValue();
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
         $resources = $graph->resourcesMatching('skosxl:literalForm', $this->literal);
81 81
         foreach ($resources as $xlres) {
82 82
             foreach ($xlres->properties() as $prop) {
83
-                foreach($graph->allLiterals($xlres, $prop) as $val) {
83
+                foreach ($graph->allLiterals($xlres, $prop) as $val) {
84 84
                     if ($prop !== 'rdf:type') {
85 85
                         $ret[$prop] = $val;
86 86
                     }
Please login to merge, or discard this patch.