Https-Unterstützung auch für XHTML

Neuer Link zum Routenplaner
magicsepp · Jun 25, 2014 · 69f2230 · 69f2230
1 parent 0d4dafc
commit 69f2230
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/templates/elements/dlh_marker.html5 b/templates/elements/dlh_marker.html5
@@ -46,7 +46,7 @@
     <?php if($this->element['markerAction'] == 'INFO') : ?>
         <?php if($this->element['useRouting']) {
             $routingPoint = ($this->element['routingAddress'] ? $this->element['routingAddress'] : $this->element['singleCoords']);
-            $routingLink = '<div class="routinglink">' . str_replace('?','<a href="http://maps.google.com/maps?saddr=&daddr=' . urlencode($routingPoint) . '&ie=UTF8&hl=' . $GLOBALS['TL_LANGUAGE'] . '" onclick="window.open(this.href); return false;">' . str_replace(' ','[nbsp]',$this->element['labels']['routingLink']) . '</a>', str_replace(' ','[nbsp]',$this->element['labels']['routingLabel'])) . '<br><form action="http://maps.google.com/maps" method="get" target="_new"><input type="hidden" name="daddr" value="' . $routingPoint . '"><input type="hidden" name="ie" value="UTF8"><input type="hidden" name="hl" value="' . $GLOBALS['TL_LANGUAGE'] . '"><input type="text" class="text" name="saddr" /><input type="submit" class="submit" value="' . $this->element['labels']['routingSubmit'] . '" /></form></div>';
+            $routingLink = '<div class="routinglink">' . str_replace('?','<a href="https://www.google.com/maps/preview?saddr=&daddr=' . urlencode($routingPoint) . '&ie=UTF8&hl=' . $GLOBALS['TL_LANGUAGE'] . '" onclick="window.open(this.href); return false;">' . str_replace(' ','[nbsp]',$this->element['labels']['routingLink']) . '</a>', str_replace(' ','[nbsp]',$this->element['labels']['routingLabel'])) . '<br><form action="http://maps.google.com/maps" method="get" target="_new"><input type="hidden" name="daddr" value="' . $routingPoint . '"><input type="hidden" name="ie" value="UTF8"><input type="hidden" name="hl" value="' . $GLOBALS['TL_LANGUAGE'] . '"><input type="text" class="text" name="saddr" /><input type="submit" class="submit" value="' . $this->element['labels']['routingSubmit'] . '" /></form></div>';
         } else {
             $routingLink = '';
         } ?>

diff --git a/templates/elements/dlh_marker.xhtml b/templates/elements/dlh_marker.xhtml
@@ -22,11 +22,11 @@
         )
         <?php endif; ?>
         <?php elseif($this->element['fillColor']): ?>
-        , icon: new google.maps.MarkerImage('http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|<?php echo $this->element['fillColor']; ?>'
+        , icon: new google.maps.MarkerImage(<?php echo (\Environment::get('ssl') ? 'https://chart.googleapis.com' : 'http://chart.apis.google.com'); ?>'/chart?chst=d_map_pin_letter&chld=%E2%80%A2|<?php echo $this->element['fillColor']; ?>'
         , new google.maps.Size(21,34)
         , new google.maps.Point(0,0)
         , new google.maps.Point(10,34))
-        , shadow: new google.maps.MarkerImage('http://chart.apis.google.com/chart?chst=d_map_pin_shadow'
+        , shadow: new google.maps.MarkerImage(<?php echo (\Environment::get('ssl') ? 'https://chart.googleapis.com' : 'http://chart.apis.google.com'); ?>'/chart?chst=d_map_pin_shadow'
         , new google.maps.Size(40,37)
         , new google.maps.Point(0,0)
         , new google.maps.Point(12,35))
@@ -46,7 +46,7 @@
         <?php if($this->element['markerAction'] == 'INFO') : ?>
         <?php if($this->element['useRouting']) {
                 $routingPoint = ($this->element['routingAddress'] ? $this->element['routingAddress'] : $this->element['singleCoords']);
-                $routingLink = '<div class="routinglink">' . str_replace('?','<a href="http://maps.google.com/maps?saddr=&daddr=' . urlencode($routingPoint) . '&ie=UTF8&hl=' . $GLOBALS['TL_LANGUAGE'] . '" onclick="window.open(this.href); return false;">' . str_replace(' ','[nbsp]',$this->element['labels']['routingLink']) . '</a>', str_replace(' ','[nbsp]',$this->element['labels']['routingLabel'])) . '<br /><form action="http://maps.google.com/maps" method="get" target="_new"><input type="hidden" name="daddr" value="' . $routingPoint . '" /><input type="hidden" name="ie" value="UTF8" /><input type="hidden" name="hl" value="' . $GLOBALS['TL_LANGUAGE'] . '" /><input type="text" class="text" name="saddr" /><input type="submit" class="submit" value="' . $this->element['labels']['routingSubmit'] . '" /></form></div>';
+                $routingLink = '<div class="routinglink">' . str_replace('?','<a href="https://www.google.com/maps/preview?saddr=&daddr=' . urlencode($routingPoint) . '&ie=UTF8&hl=' . $GLOBALS['TL_LANGUAGE'] . '" onclick="window.open(this.href); return false;">' . str_replace(' ','[nbsp]',$this->element['labels']['routingLink']) . '</a>', str_replace(' ','[nbsp]',$this->element['labels']['routingLabel'])) . '<br /><form action="http://maps.google.com/maps" method="get" target="_new"><input type="hidden" name="daddr" value="' . $routingPoint . '" /><input type="hidden" name="ie" value="UTF8" /><input type="hidden" name="hl" value="' . $GLOBALS['TL_LANGUAGE'] . '" /><input type="text" class="text" name="saddr" /><input type="submit" class="submit" value="' . $this->element['labels']['routingSubmit'] . '" /></form></div>';
                 } else {
                 $routingLink = '';
                 } ?>