@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | */ |
185 | 185 | public static function encodeFileSystemToUtf8($string){ |
186 | 186 | if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') { |
187 | - return iconv('cp1252', 'utf-8//IGNORE',$string); |
|
187 | + return iconv('cp1252', 'utf-8//IGNORE',$string); |
|
188 | 188 | } |
189 | 189 | return $string; |
190 | 190 | } |
@@ -249,20 +249,20 @@ discard block |
||
249 | 249 | * @return boolean|string Is supported? |
250 | 250 | */ |
251 | 251 | public static function isImageTypeSupported($reqtype) { |
252 | - $supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png'); |
|
253 | - $reqtype = strtolower($reqtype); |
|
252 | + $supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png'); |
|
253 | + $reqtype = strtolower($reqtype); |
|
254 | 254 | |
255 | - if (empty($supportByGD[$reqtype])) { |
|
256 | - return false; |
|
257 | - } |
|
255 | + if (empty($supportByGD[$reqtype])) { |
|
256 | + return false; |
|
257 | + } |
|
258 | 258 | |
259 | - $type = $supportByGD[$reqtype]; |
|
259 | + $type = $supportByGD[$reqtype]; |
|
260 | 260 | |
261 | - if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) { |
|
262 | - return $type; |
|
263 | - } |
|
261 | + if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) { |
|
262 | + return $type; |
|
263 | + } |
|
264 | 264 | |
265 | - return false; |
|
265 | + return false; |
|
266 | 266 | } |
267 | 267 | |
268 | 268 | } |
@@ -108,16 +108,18 @@ discard block |
||
108 | 108 | $len_chars = count($chars); |
109 | 109 | $token = ''; |
110 | 110 | |
111 | - for ($i = 0; $i < $length; $i++) |
|
112 | - $token .= $chars[ mt_rand(0, $len_chars - 1) ]; |
|
111 | + for ($i = 0; $i < $length; $i++) { |
|
112 | + $token .= $chars[ mt_rand(0, $len_chars - 1) ]; |
|
113 | + } |
|
113 | 114 | |
114 | 115 | # Number of 32 char chunks |
115 | 116 | $chunks = ceil( strlen($token) / 32 ); |
116 | 117 | $md5token = ''; |
117 | 118 | |
118 | 119 | # Run each chunk through md5 |
119 | - for ( $i=1; $i<=$chunks; $i++ ) |
|
120 | - $md5token .= md5( substr($token, $i * 32 - 32, 32) ); |
|
120 | + for ( $i=1; $i<=$chunks; $i++ ) { |
|
121 | + $md5token .= md5( substr($token, $i * 32 - 32, 32) ); |
|
122 | + } |
|
121 | 123 | |
122 | 124 | # Trim the token |
123 | 125 | return substr($md5token, 0, $length); |
@@ -157,7 +159,9 @@ discard block |
||
157 | 159 | * @return boolean True if path valid |
158 | 160 | */ |
159 | 161 | public static function isValidPath($filename, $acceptfolder = FALSE) { |
160 | - if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true; |
|
162 | + if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) { |
|
163 | + return true; |
|
164 | + } |
|
161 | 165 | return false; |
162 | 166 | } |
163 | 167 |
@@ -67,7 +67,7 @@ |
||
67 | 67 | if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) { |
68 | 68 | switch ($style) { |
69 | 69 | case 10: |
70 | - return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>'; |
|
70 | + return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>'; |
|
71 | 71 | default: |
72 | 72 | return $this->gedcomrecord->formatFirstMajorFact($facts, $style); |
73 | 73 | } |
@@ -19,10 +19,10 @@ |
||
19 | 19 | */ |
20 | 20 | interface ModulePlaceMapperProviderInterface |
21 | 21 | { |
22 | - /** |
|
23 | - * List place mappers provided by the module as an array. |
|
24 | - * |
|
25 | - * @return string[] List of tasks |
|
26 | - */ |
|
27 | - public function listPlaceMappers(): array; |
|
22 | + /** |
|
23 | + * List place mappers provided by the module as an array. |
|
24 | + * |
|
25 | + * @return string[] List of tasks |
|
26 | + */ |
|
27 | + public function listPlaceMappers(): array; |
|
28 | 28 | } |
@@ -21,47 +21,47 @@ |
||
21 | 21 | */ |
22 | 22 | interface PlaceMapperInterface |
23 | 23 | { |
24 | - /** |
|
25 | - * Boot the Place mapper |
|
26 | - */ |
|
27 | - function boot(): void; |
|
24 | + /** |
|
25 | + * Boot the Place mapper |
|
26 | + */ |
|
27 | + function boot(): void; |
|
28 | 28 | |
29 | - /** |
|
30 | - * Get the configuration associated to the mapper |
|
31 | - * |
|
32 | - * @return PlaceMapperConfigInterface |
|
33 | - */ |
|
34 | - function config(): PlaceMapperConfigInterface; |
|
29 | + /** |
|
30 | + * Get the configuration associated to the mapper |
|
31 | + * |
|
32 | + * @return PlaceMapperConfigInterface |
|
33 | + */ |
|
34 | + function config(): PlaceMapperConfigInterface; |
|
35 | 35 | |
36 | - /** |
|
37 | - * Set the configured associated to the mapper |
|
38 | - * |
|
39 | - * @param PlaceMapperConfigInterface $config |
|
40 | - */ |
|
41 | - function setConfig(PlaceMapperConfigInterface $config): void; |
|
36 | + /** |
|
37 | + * Set the configured associated to the mapper |
|
38 | + * |
|
39 | + * @param PlaceMapperConfigInterface $config |
|
40 | + */ |
|
41 | + function setConfig(PlaceMapperConfigInterface $config): void; |
|
42 | 42 | |
43 | - /** |
|
44 | - * Get the data associated to the mapper, for a specific key |
|
45 | - * |
|
46 | - * @param string $key |
|
47 | - * @return null|mixed |
|
48 | - */ |
|
49 | - function data(string $key); |
|
43 | + /** |
|
44 | + * Get the data associated to the mapper, for a specific key |
|
45 | + * |
|
46 | + * @param string $key |
|
47 | + * @return null|mixed |
|
48 | + */ |
|
49 | + function data(string $key); |
|
50 | 50 | |
51 | - /** |
|
52 | - * Set the data associated to the mapper, for a specific key |
|
53 | - * |
|
54 | - * @param string $key |
|
55 | - * @param mixed $data |
|
56 | - */ |
|
57 | - function setData(string $key, $data): void; |
|
51 | + /** |
|
52 | + * Set the data associated to the mapper, for a specific key |
|
53 | + * |
|
54 | + * @param string $key |
|
55 | + * @param mixed $data |
|
56 | + */ |
|
57 | + function setData(string $key, $data): void; |
|
58 | 58 | |
59 | - /** |
|
60 | - * Return the property value of the feature identifying a place in a GeoJson map. |
|
61 | - * |
|
62 | - * @param Place $place |
|
63 | - * @param string $feature_property |
|
64 | - * @return string|NULL |
|
65 | - */ |
|
66 | - function map(Place $place, string $feature_property) : ?string; |
|
59 | + /** |
|
60 | + * Return the property value of the feature identifying a place in a GeoJson map. |
|
61 | + * |
|
62 | + * @param Place $place |
|
63 | + * @param string $feature_property |
|
64 | + * @return string|NULL |
|
65 | + */ |
|
66 | + function map(Place $place, string $feature_property) : ?string; |
|
67 | 67 | } |
68 | 68 | \ No newline at end of file |
@@ -19,10 +19,10 @@ |
||
19 | 19 | */ |
20 | 20 | interface ModuleMapDefinitionProviderInterface |
21 | 21 | { |
22 | - /** |
|
23 | - * List map definitions provided by the module as an array. |
|
24 | - * |
|
25 | - * @return MapDefinitionInterface[] List of map definitions |
|
26 | - */ |
|
27 | - public function listMapDefinition(): array; |
|
22 | + /** |
|
23 | + * List map definitions provided by the module as an array. |
|
24 | + * |
|
25 | + * @return MapDefinitionInterface[] List of map definitions |
|
26 | + */ |
|
27 | + public function listMapDefinition(): array; |
|
28 | 28 | } |
@@ -20,28 +20,28 @@ |
||
20 | 20 | */ |
21 | 21 | interface PlaceMapperConfigInterface extends JsonSerializable |
22 | 22 | { |
23 | - /** |
|
24 | - * Deserialise the mapper configuration from a string or an array |
|
25 | - * |
|
26 | - * @param mixed $config |
|
27 | - * @return self |
|
28 | - */ |
|
29 | - function jsonDeserialize($config): self; |
|
23 | + /** |
|
24 | + * Deserialise the mapper configuration from a string or an array |
|
25 | + * |
|
26 | + * @param mixed $config |
|
27 | + * @return self |
|
28 | + */ |
|
29 | + function jsonDeserialize($config): self; |
|
30 | 30 | |
31 | - /** |
|
32 | - * Check if the configuration contains a specific key |
|
33 | - * |
|
34 | - * @param string $key |
|
35 | - * @return bool |
|
36 | - */ |
|
37 | - function has(string $key): bool; |
|
31 | + /** |
|
32 | + * Check if the configuration contains a specific key |
|
33 | + * |
|
34 | + * @param string $key |
|
35 | + * @return bool |
|
36 | + */ |
|
37 | + function has(string $key): bool; |
|
38 | 38 | |
39 | - /** |
|
40 | - * Return the configuration associated with a key, or a default value if none found. |
|
41 | - * |
|
42 | - * @param string $key |
|
43 | - * @param mixed|null $default |
|
44 | - * @return mixed|null |
|
45 | - */ |
|
46 | - function get(string $key, $default = null); |
|
39 | + /** |
|
40 | + * Return the configuration associated with a key, or a default value if none found. |
|
41 | + * |
|
42 | + * @param string $key |
|
43 | + * @param mixed|null $default |
|
44 | + * @return mixed|null |
|
45 | + */ |
|
46 | + function get(string $key, $default = null); |
|
47 | 47 | } |
48 | 48 | \ No newline at end of file |
@@ -20,10 +20,10 @@ |
||
20 | 20 | interface ModuleGeoAnalysisProviderInterface |
21 | 21 | { |
22 | 22 | |
23 | - /** |
|
24 | - * List geographical analyses provided by the module as an array. |
|
25 | - * |
|
26 | - * @return string[] List of tasks |
|
27 | - */ |
|
28 | - public function listGeoAnalyses(): array; |
|
23 | + /** |
|
24 | + * List geographical analyses provided by the module as an array. |
|
25 | + * |
|
26 | + * @return string[] List of tasks |
|
27 | + */ |
|
28 | + public function listGeoAnalyses(): array; |
|
29 | 29 | } |
@@ -21,26 +21,26 @@ |
||
21 | 21 | */ |
22 | 22 | interface GeoAnalysisInterface |
23 | 23 | { |
24 | - /** |
|
25 | - * Get the geographical dispersion analysis title |
|
26 | - * |
|
27 | - * @return string |
|
28 | - */ |
|
29 | - function title(): string; |
|
24 | + /** |
|
25 | + * Get the geographical dispersion analysis title |
|
26 | + * |
|
27 | + * @return string |
|
28 | + */ |
|
29 | + function title(): string; |
|
30 | 30 | |
31 | - /** |
|
32 | - * Gets the function to translate |
|
33 | - * |
|
34 | - * @return callable(int $count): string |
|
35 | - */ |
|
36 | - function itemsDescription(): callable; |
|
31 | + /** |
|
32 | + * Gets the function to translate |
|
33 | + * |
|
34 | + * @return callable(int $count): string |
|
35 | + */ |
|
36 | + function itemsDescription(): callable; |
|
37 | 37 | |
38 | - /** |
|
39 | - * Get the results of the geographical dispersion analysis |
|
40 | - * |
|
41 | - * @param Tree $tree |
|
42 | - * @param int $depth |
|
43 | - * @return GeoAnalysisResults |
|
44 | - */ |
|
45 | - function results(Tree $tree, int $depth): GeoAnalysisResults; |
|
38 | + /** |
|
39 | + * Get the results of the geographical dispersion analysis |
|
40 | + * |
|
41 | + * @param Tree $tree |
|
42 | + * @param int $depth |
|
43 | + * @return GeoAnalysisResults |
|
44 | + */ |
|
45 | + function results(Tree $tree, int $depth): GeoAnalysisResults; |
|
46 | 46 | } |
47 | 47 | \ No newline at end of file |
@@ -18,24 +18,24 @@ |
||
18 | 18 | */ |
19 | 19 | interface MapDefinitionInterface |
20 | 20 | { |
21 | - /** |
|
22 | - * Get the map ID |
|
23 | - * |
|
24 | - * @return string |
|
25 | - */ |
|
26 | - function id(): string; |
|
21 | + /** |
|
22 | + * Get the map ID |
|
23 | + * |
|
24 | + * @return string |
|
25 | + */ |
|
26 | + function id(): string; |
|
27 | 27 | |
28 | - /** |
|
29 | - * Get the map title |
|
30 | - * |
|
31 | - * @return string |
|
32 | - */ |
|
33 | - function title(): string; |
|
28 | + /** |
|
29 | + * Get the map title |
|
30 | + * |
|
31 | + * @return string |
|
32 | + */ |
|
33 | + function title(): string; |
|
34 | 34 | |
35 | - /** |
|
36 | - * Get the features in the map |
|
37 | - * |
|
38 | - * @return \Brick\Geo\IO\GeoJSON\Feature[] |
|
39 | - */ |
|
40 | - function features(): array; |
|
35 | + /** |
|
36 | + * Get the features in the map |
|
37 | + * |
|
38 | + * @return \Brick\Geo\IO\GeoJSON\Feature[] |
|
39 | + */ |
|
40 | + function features(): array; |
|
41 | 41 | } |
42 | 42 | \ No newline at end of file |