@@ -617,8 +617,9 @@ |
||
| 617 | 617 | . "%2C" . $bbox ['maxlon']; |
| 618 | 618 | $imgUrl .= "&dcl=1"; |
| 619 | 619 | } |
| 620 | - if(strpos($imgUrl, "?") === false) |
|
| 621 | - $imgUrl .= "?"; |
|
| 620 | + if(strpos($imgUrl, "?") === false) { |
|
| 621 | + $imgUrl .= "?"; |
|
| 622 | + } |
|
| 622 | 623 | |
| 623 | 624 | //$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . "," |
| 624 | 625 | // . str_replace ( "px", "", $gmap ['height'] ); |
@@ -351,14 +351,18 @@ discard block |
||
| 351 | 351 | public function makeMap(): void { |
| 352 | 352 | $this->initCoords(); |
| 353 | 353 | $this->createBaseMap(); |
| 354 | - if(!empty ($this->markers)) |
|
| 355 | - $this->placeMarkers(); |
|
| 356 | - if(file_exists($this->kmlFileName)) |
|
| 357 | - $this->drawKML(); |
|
| 358 | - if(file_exists($this->gpxFileName)) |
|
| 359 | - $this->drawGPX(); |
|
| 360 | - if(file_exists($this->geojsonFileName)) |
|
| 361 | - $this->drawGeojson(); |
|
| 354 | + if(!empty ($this->markers)) { |
|
| 355 | + $this->placeMarkers(); |
|
| 356 | + } |
|
| 357 | + if(file_exists($this->kmlFileName)) { |
|
| 358 | + $this->drawKML(); |
|
| 359 | + } |
|
| 360 | + if(file_exists($this->gpxFileName)) { |
|
| 361 | + $this->drawGPX(); |
|
| 362 | + } |
|
| 363 | + if(file_exists($this->geojsonFileName)) { |
|
| 364 | + $this->drawGeojson(); |
|
| 365 | + } |
|
| 362 | 366 | |
| 363 | 367 | $this->drawCopyright(); |
| 364 | 368 | } |
@@ -449,8 +453,9 @@ discard block |
||
| 449 | 453 | * for better proxy handling... |
| 450 | 454 | */ |
| 451 | 455 | public function fetchTile(string $url) { |
| 452 | - if($this->useTileCache && ($cached = $this->checkTileCache($url))) |
|
| 453 | - return $cached; |
|
| 456 | + if($this->useTileCache && ($cached = $this->checkTileCache($url))) { |
|
| 457 | + return $cached; |
|
| 458 | + } |
|
| 454 | 459 | |
| 455 | 460 | $_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; ' . PHP_OS . ')'; |
| 456 | 461 | if(function_exists("curl_init")) { |
@@ -14,15 +14,19 @@ discard block |
||
| 14 | 14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 15 | 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 16 | 16 | */ |
| 17 | -if (! defined ( 'DOKU_INC' )) |
|
| 17 | +if (! defined ( 'DOKU_INC' )) { |
|
| 18 | 18 | die (); |
| 19 | +} |
|
| 19 | 20 | |
| 20 | -if (! defined ( 'DOKU_LF' )) |
|
| 21 | +if (! defined ( 'DOKU_LF' )) { |
|
| 21 | 22 | define ( 'DOKU_LF', "\n" ); |
| 22 | -if (! defined ( 'DOKU_TAB' )) |
|
| 23 | +} |
|
| 24 | +if (! defined ( 'DOKU_TAB' )) { |
|
| 23 | 25 | define ( 'DOKU_TAB', "\t" ); |
| 24 | -if (! defined ( 'DOKU_PLUGIN' )) |
|
| 26 | +} |
|
| 27 | +if (! defined ( 'DOKU_PLUGIN' )) { |
|
| 25 | 28 | define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' ); |
| 29 | +} |
|
| 26 | 30 | |
| 27 | 31 | require_once DOKU_PLUGIN . 'syntax.php'; |
| 28 | 32 | /** |
@@ -108,8 +112,9 @@ discard block |
||
| 108 | 112 | * @see DokuWiki_Syntax_Plugin::render() |
| 109 | 113 | */ |
| 110 | 114 | public function render($mode, Doku_Renderer $renderer, $data) { |
| 111 | - if ($mode != 'xhtml') |
|
| 112 | - return false; |
|
| 115 | + if ($mode != 'xhtml') { |
|
| 116 | + return false; |
|
| 117 | + } |
|
| 113 | 118 | |
| 114 | 119 | static $loadedOLlib = false; |
| 115 | 120 | if (! $loadedOLlib) { |