The color format is checked now.
authorphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Sat, 14 Sep 2013 19:57:39 +0000 (19:57 +0000)
committerphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Sat, 14 Sep 2013 19:57:39 +0000 (19:57 +0000)
git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/mediawiki_extensions/wrmap/trunk@1581 7aebc617-e5e2-0310-91dc-80fb5f6d2477

wrmap.body.php

index 1f2b4b0fd3da7d01bacf6550b98d21c9d2a9110c..ea26cf8eb368fef3c655353e49c43b39b25d0231 100644 (file)
@@ -99,7 +99,12 @@ function xml_to_json_features($input) {
                        $allowed_properties = array('farbe', 'dicke');
                        $wrong_properties = array_diff($given_properties, $allowed_properties);
                        if (count($wrong_properties) > 0) throw new Exception("Das Attribut '" . reset($wrong_properties) . "' ist nicht erlaubt bei <" . $feature->getName() . ">. Erlaubt sind: '" . implode("', '", $allowed_properties) . "'.");
-                       if (isset($feature['farbe'])) $properties['strokeColor'] = (string) $feature['farbe']; // e.g. #a200b7 // TODO: Check
+                       if (isset($feature['farbe'])) {
+                               $color = (string) $feature['farbe']; // e.g. #a200b7
+                               if (preg_match('/^#[0-9a-f]{6}$/i', $color) != 1) 
+                                       throw new Exception('Die Farbangabe der Linie hat ein falsches Format. Sie muss z.B. so aussehen: #a200b7.');
+                               $properties['strokeColor'] = $color;
+                       }
                        if (isset($feature['dicke'])) $properties['strokeWidth'] = (int) $feature['dicke']; // e.g. 6 // TODO: Check
                        $json_feature = array(
                                'type' => 'feature',