Skip to content

Commit

Permalink
use https for embedded videos and maps (if supported)
Browse files Browse the repository at this point in the history
  • Loading branch information
pinhead84 committed May 9, 2017
1 parent d84cfbf commit 0951300
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/include/class.map_google.php
Expand Up @@ -50,8 +50,8 @@ function getBodyContent(&$object, &$translations, $lang) {
//$lat += (rand(1,999)/rand(1,999));
//$lon -= (rand(1,999)/rand(1,999));
// Links erzeugen
$iframeSrc = 'http://maps.google.com/?ie=UTF8&t=m&ll=' . $lat . ',' . $lon . '&z=' . $this->zoom . '&output=embed';
$directLink = 'http://maps.google.com/?ie=UTF8&t=m&ll=' . $lat . ',' . $lon . '&z=' . $this->zoom;
$iframeSrc = 'https://maps.google.com/?ie=UTF8&t=m&ll=' . $lat . ',' . $lon . '&z=' . $this->zoom . '&output=embed';
$directLink = 'https://maps.google.com/?ie=UTF8&t=m&ll=' . $lat . ',' . $lon . '&z=' . $this->zoom;

// Ausgabe erzeugen
$output = '<iframe' .
Expand Down
4 changes: 2 additions & 2 deletions src/include/class.map_osm.php
Expand Up @@ -56,8 +56,8 @@ function getBodyContent(&$object, &$translations, $lang) {
$bbox = ($lon2 - $diff) . ',' . ($lat2 - $diff) . ',' . ($lon2 + $diff) . ',' . ($lat2 + $diff);

// Links erzeugen
$iframeSrc = 'http://www.openstreetmap.org/export/embed.html?bbox=' . $bbox . '&amp;layer=mapnik';
$directLink = 'http://www.openstreetmap.org/?lat=' . $lat . '&amp;lon=' . $lon . '&amp;zoom=12&amp;layers=M';
$iframeSrc = 'https://www.openstreetmap.org/export/embed.html?bbox=' . $bbox . '&amp;layer=mapnik';
$directLink = 'https://www.openstreetmap.org/?lat=' . $lat . '&amp;lon=' . $lon . '&amp;zoom=12&amp;layers=M';
if ($this->showPositionMarker === true) {
$iframeSrc .= '&amp;marker=' . $lat . ',' . $lon;
$directLink .= '&amp;mlat=' . $lat . '&amp;mlon=' . $lon;
Expand Down
16 changes: 8 additions & 8 deletions src/include/class.video_default.php
Expand Up @@ -130,7 +130,7 @@ function embed_dailymotion_com($linkId, $linkTitle, $linkUrl, $width = 0, $heigh

// IFrame
. '<div class="video_container" style="width:' . $width . 'px; height:' . $height . 'px;">'
. '<iframe src="http://www.dailymotion.com/embed/video/' . $linkId . '"'
. '<iframe src="https://www.dailymotion.com/embed/video/' . $linkId . '"'
. ' width="' . $width . '"'
. ' height="' . $height . '"'
. ' align="left"'
Expand All @@ -145,7 +145,7 @@ function embed_dailymotion_com($linkId, $linkTitle, $linkUrl, $width = 0, $heigh
// Provider-Link
. '<div class="video_provider" style="text-align:right;">'
. '<a href="' . htmlspecialchars($linkUrl) . '" target="_blank">' . htmlspecialchars($linkTitle) . '</a>'
. ' @ <a href="http://www.dailymotion.com/" target="_blank">dailymotion.com</a>'
. ' @ <a href="https://www.dailymotion.com/" target="_blank">dailymotion.com</a>'
. '</div>'
. "\n"
. '</div>';
Expand All @@ -168,7 +168,7 @@ function embed_myvideo_de($linkId, $linkTitle, $linkUrl, $width = 0, $height = 0

// IFrame
. '<div class="video_container" style="width:' . $width . 'px; height:' . $height . 'px;">'
. '<iframe src="http://www.myvideo.de/embed/' . $linkId . '"'
. '<iframe src="https://www.myvideo.de/embed/' . $linkId . '"'
. ' width="' . $width . '"'
. ' height="' . $height . '"'
. ' align="left"'
Expand All @@ -183,7 +183,7 @@ function embed_myvideo_de($linkId, $linkTitle, $linkUrl, $width = 0, $height = 0
// Provider-Link
. '<div class="video_provider" style="text-align:right;">'
. '<a href="' . htmlspecialchars($linkUrl) . '" target="_blank">' . htmlspecialchars($linkTitle) . '</a>'
. ' @ <a href="http://www.myvideo.de/" target="_blank">myvideo.de</a>'
. ' @ <a href="https://www.myvideo.de/" target="_blank">myvideo.de</a>'
. '</div>'
. "\n"
. '</div>';
Expand Down Expand Up @@ -325,7 +325,7 @@ function embed_vimeo_com($linkId, $linkTitle, $linkUrl, $width = 0, $height = 0)

// IFrame
. '<div class="video_container" style="width:' . $width . 'px; height:' . $height . 'px;">'
. '<iframe src="http://player.vimeo.com/video/' . $linkId . '?title=0&amp;byline=0&amp;portrait=0"'
. '<iframe src="https://player.vimeo.com/video/' . $linkId . '?title=0&amp;byline=0&amp;portrait=0"'
. ' width="' . $width . '"'
. ' height="' . $height . '"'
. ' align="left"'
Expand All @@ -340,7 +340,7 @@ function embed_vimeo_com($linkId, $linkTitle, $linkUrl, $width = 0, $height = 0)
// Provider-Link
. '<div class="video_provider" style="text-align:right;">'
. '<a href="' . htmlspecialchars($linkUrl) . '" target="_blank">' . htmlspecialchars($linkTitle) . '</a>'
. ' @ <a href="http://vimeo.com/" target="_blank">vimeo.com</a>'
. ' @ <a href="https://vimeo.com/" target="_blank">vimeo.com</a>'
. '</div>'
. "\n"
. '</div>';
Expand All @@ -363,7 +363,7 @@ function embed_youtube_com($linkId, $linkTitle, $linkUrl, $width = 0, $height =

// IFrame
. '<div class="video_container" style="width:' . $width . 'px; height:' . $height . 'px;">'
. '<iframe src="http://www.youtube-nocookie.com/embed/' . $linkId . '?rel=0"'
. '<iframe src="https://www.youtube-nocookie.com/embed/' . $linkId . '?rel=0"'
. ' width="' . $width . '"'
. ' height="' . $height . '"'
. ' align="left"'
Expand All @@ -378,7 +378,7 @@ function embed_youtube_com($linkId, $linkTitle, $linkUrl, $width = 0, $height =
// Provider-Link
. '<div class="video_provider" style="text-align:right;">'
. '<a href="' . htmlspecialchars($linkUrl) . '" target="_blank">' . htmlspecialchars($linkTitle) . '</a>'
. ' @ <a href="http://www.youtube.com/" target="_blank">youtube.com</a>'
. ' @ <a href="https://www.youtube.com/" target="_blank">youtube.com</a>'
. '</div>'
. "\n"
. '</div>';
Expand Down

0 comments on commit 0951300

Please sign in to comment.