summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStein Magne Bjorklund2014-10-11 13:15:53 (GMT)
committerStein Magne Bjorklund2014-10-11 13:15:53 (GMT)
commit575bc31a13e09b6b23f8df5208c307d07e3b20a2 (patch)
tree594edfb175ad2101f155956d0f6c0bf8724fb05f
parent5af4246da5c07439f157b52e18cb7732ca5be9d4 (diff)
Issue 2333409 by .john: Avoid browsers blocking content in mixed-mode.
All of Flicker data sources are now https. Embedding content from non https sources on a SSL enabled site will in most modern browsers be blocked (mixed mode blocking).
-rw-r--r--includes/MediaFlickrStreamWrapper.inc2
-rw-r--r--includes/MediaInternetFlickrHandler.inc2
-rw-r--r--media_flickr.module3
-rw-r--r--themes/media-flickr-photoset.tpl.php4
4 files changed, 5 insertions, 6 deletions
diff --git a/includes/MediaFlickrStreamWrapper.inc b/includes/MediaFlickrStreamWrapper.inc
index bd84026..f8d8ee6 100644
--- a/includes/MediaFlickrStreamWrapper.inc
+++ b/includes/MediaFlickrStreamWrapper.inc
@@ -10,7 +10,7 @@
* $flickr = new MediaFlickrStreamWrapper('flickr://u/[user-code]/p/[photo-code]');
*/
class MediaFlickrStreamWrapper extends MediaReadOnlyStreamWrapper {
- protected $base_url = 'http://www.flickr.com/';
+ protected $base_url = 'https://www.flickr.com/';
protected $parameters = array('u' => NULL, 'p' => NULL, 's' => NULL, 'search' => NULL);
function interpolateUrl() {
diff --git a/includes/MediaInternetFlickrHandler.inc b/includes/MediaInternetFlickrHandler.inc
index 22a0223..869639c 100644
--- a/includes/MediaInternetFlickrHandler.inc
+++ b/includes/MediaInternetFlickrHandler.inc
@@ -46,7 +46,7 @@ class MediaInternetFlickrHandler extends MediaInternetBaseHandler {
public function getOEmbed() {
$uri = $this->parse($this->embedCode);
$external_url = drupal_realpath($uri);
- $oembed_url = url('http://www.flickr.com/services/oembed', array('query' => array('url' => $external_url, 'format' => 'json')));
+ $oembed_url = url('https://www.flickr.com/services/oembed', array('query' => array('url' => $external_url, 'format' => 'json')));
$response = drupal_http_request($oembed_url);
if (!isset($response->error)) {
diff --git a/media_flickr.module b/media_flickr.module
index 8eeedb9..39c2cb2 100644
--- a/media_flickr.module
+++ b/media_flickr.module
@@ -7,8 +7,7 @@
*/
define('MEDIA_FLICKR_RESTPOINT', 'https://api.flickr.com/services/rest/');
-define('MEDIA_FLICKR_API_APPLICATION_URL', 'http://www.flickr.com/services/api/keys');
-define('MEDIA_FLICKR_MAIN_URL', 'http://www.flickr.com/');
+define('MEDIA_FLICKR_API_APPLICATION_URL', 'https://www.flickr.com/services/api/keys');
// Load all Flickr file formatters.
require_once dirname(__FILE__) . '/includes/media_flickr.formatters.inc';
diff --git a/themes/media-flickr-photoset.tpl.php b/themes/media-flickr-photoset.tpl.php
index 97782c5..981bc3c 100644
--- a/themes/media-flickr-photoset.tpl.php
+++ b/themes/media-flickr-photoset.tpl.php
@@ -9,11 +9,11 @@
<object width="<?php print $width; ?>" height="<?php print $height; ?>">
<param name="flashvars" value="<?php print $flashvars; ?>"></param>
<param name="movie"
- value="http://www.flickr.com/apps/slideshow/show.swf?v=104087">
+ value="https://www.flickr.com/apps/slideshow/show.swf?v=104087">
</param>
<param name="allowFullScreen" value="true"></param>
<embed type="application/x-shockwave-flash"
- src="http://www.flickr.com/apps/slideshow/show.swf?v=104087"
+ src="https://www.flickr.com/apps/slideshow/show.swf?v=104087"
allowFullScreen="true"
flashvars="<?php print $flashvars; ?>"
width="<?php print $width; ?>"