Tagged output with 'nowiki' to prevent further processing.

[philipp/winterrodeln/mediawiki_extensions/wrmap.git] / wrmap.body.php

diff --git a/wrmap.body.php b/wrmap.body.php
index 753d5cd3d263846ddeb3a43f62c84a2f491d9058..278333f9816ce4ac6d34df1709864821b311867c 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -53,6 +53,10 @@ function sledruns_to_json_features() {
 function xml_to_json_features($input) {
        libxml_use_internal_errors(true); // without that, we get PHP Warnings if the $input is not well-formed
        $xml = new SimpleXMLElement($input); // input
+       $whitespace = (string) $xml; // everything between <wrmap> and </wrmap> that's not a sub-element
+       if (strlen($whitespace) > 0 && !ctype_space($whitespace)) { // there must not be anythin except sub-elements or whitespace
+               throw new Exception('Die Landkarte enthält folgenden ungültigen Text: "' . trim($xml) . '".');
+       }
        $json_features = array(); // output
        $point_types = array('gasthaus', 'haltestelle', 'parkplatz', 'achtung', 'punkt');
        $line_types = array('rodelbahn', 'gehweg', 'alternative', 'lift', 'anfahrt', 'linie');
@@ -64,7 +68,7 @@ function xml_to_json_features($input) {
                $is_point = in_array($feature->getName(), $point_types);
                $is_line = in_array($feature->getName(), $line_types);
                if (!$is_point && !$is_line) {
-                       throw new Exception('Unbekanntes Element <' . $feature->getName() . '>. Erlaubt sind: <' . implode('>, <', array_keys(array_merge($point_type, $line_type))) . '>.');
+                       throw new Exception('Unbekanntes Element <' . $feature->getName() . '>. Erlaubt sind: <' . implode('>, <', array_merge($point_types, $line_types)) . '>.');
                }
 
                // point
@@ -177,15 +181,11 @@ class WrBaseMap {
 
                // Create <div/> element where the map is placed in
                global $wgExtensionAssetsPath;
-               $width_s = (isset($properties['width'])) ? (string) $properties['width'] . 'px' : '100%';
-               $height_s = (isset($properties['height']) ? (string) $properties['height'] : 450) . 'px';
-               $output = "<div class=\"wrmap\" style=\"width: $width_s; height: $height_s; border-style:none;\" data-img-path=\"$wgExtensionAssetsPath/wrmap/openlayers/img/\">";
-               $output .= "<script type=\"application/json\">";
+               $output = "<div class=\"wrmap\" style=\"border-style:none;\" data-img-path=\"$wgExtensionAssetsPath/wrmap/openlayers/img/\">";
                $output .= htmlspecialchars($json_string, ENT_NOQUOTES);
-               $output .= "</script>";
                $output .= "</div>\n";
                
-               return $output;
+               return array($output, 'markerType' => 'nowiki');
        }
 }