| @@ -10,6 +10,9 @@ | ||
| 10 | 10 | */ | 
| 11 | 11 | class VocabularyCategory extends DataObject | 
| 12 | 12 |  { | 
| 13 | + /** | |
| 14 | + * @param Model $model | |
| 15 | + */ | |
| 13 | 16 | public function __construct($model, $resource) | 
| 14 | 17 |      { | 
| 15 | 18 |          if (!($model instanceof Model)) { | 
| @@ -37,7 +37,7 @@ discard block | ||
| 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 | ||
| 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 | } | 
| @@ -106,7 +106,7 @@ | ||
| 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 | /** | 
| @@ -22,7 +22,7 @@ | ||
| 22 | 22 |      { | 
| 23 | 23 | $label = $this->getLabel(); | 
| 24 | 24 | $notation = $this->getNotation(); | 
| 25 | - return $notation . $label; | |
| 25 | + return $notation.$label; | |
| 26 | 26 | } | 
| 27 | 27 | |
| 28 | 28 | public function getType() | 
| @@ -21,7 +21,7 @@ discard block | ||
| 21 | 21 | $baseurl = $this->getBaseHref(); | 
| 22 | 22 | $vocid = $vocab->getId(); | 
| 23 | 23 |          $query = http_build_query(array('uri'=>$uri, 'format'=>$targetFormat)); | 
| 24 | - $url = $baseurl . "rest/v1/$vocid/data?$query"; | |
| 24 | + $url = $baseurl."rest/v1/$vocid/data?$query"; | |
| 25 | 25 | $this->redirect303($url); | 
| 26 | 26 | } | 
| 27 | 27 | |
| @@ -32,11 +32,11 @@ discard block | ||
| 32 | 32 | $localname = $vocab->getLocalName($uri); | 
| 33 | 33 |          if ($localname !== $uri && $localname === urlencode($localname)) { | 
| 34 | 34 | // the URI can be shortened | 
| 35 | - $url = $baseurl . "$vocid/page/$localname"; | |
| 35 | + $url = $baseurl."$vocid/page/$localname"; | |
| 36 | 36 |          } else { | 
| 37 | 37 | // must use full URI | 
| 38 | 38 |              $query = http_build_query(array('uri'=>$uri)); | 
| 39 | - $url = $baseurl . "$vocid/page/?" . $query; | |
| 39 | + $url = $baseurl."$vocid/page/?".$query; | |
| 40 | 40 | } | 
| 41 | 41 | $this->redirect303($url); | 
| 42 | 42 | } | 
| @@ -56,7 +56,7 @@ discard block | ||
| 56 | 56 | // guess vocabulary based on URI | 
| 57 | 57 | $vocab = $this->model->guessVocabularyFromURI($request->getUri()); | 
| 58 | 58 |              if ($vocab === null) { | 
| 59 | -                return $this->returnError('404', 'Not Found', 'Unrecognized URI ' . $request->getUri()); | |
| 59 | +                return $this->returnError('404', 'Not Found', 'Unrecognized URI '.$request->getUri()); | |
| 60 | 60 | } | 
| 61 | 61 | $request->setVocab($vocab->getId()); | 
| 62 | 62 | } | 
| @@ -23,5 +23,5 @@ | ||
| 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 | } | 
| @@ -14,7 +14,7 @@ discard block | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | } | 
| @@ -32,9 +32,9 @@ discard block | ||
| 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 | ||
| 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 | 
| @@ -55,6 +55,7 @@ | ||
| 55 | 55 | |
| 56 | 56 | /** | 
| 57 | 57 | * Steps back, restoring the previous character or statement read() to the input buffer. | 
| 58 | + * @param string $chars | |
| 58 | 59 | */ | 
| 59 | 60 | protected function unread($chars) | 
| 60 | 61 |      { | 
| @@ -21,7 +21,7 @@ discard block | ||
| 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 | ||
| 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 | } |