diff --git a/webroot/sites/all/modules/media_youtube/media_youtube.module b/webroot/sites/all/modules/media_youtube/media_youtube.module index 505ec9d..ae4cfcd 100644 --- a/webroot/sites/all/modules/media_youtube/media_youtube.module +++ b/webroot/sites/all/modules/media_youtube/media_youtube.module @@ -252,9 +252,9 @@ function media_youtube_media_mover($op = NULL, $action = NULL, $configuration = function media_youtube_video_url($id) { if (strpos($id, 'PLAYLIST_') === 0) { // This is a youtube playlist. - return 'http://youtube.com/p/'. substr($id, 9); + return 'https://youtube.com/p/'. substr($id, 9); } - return url('http://www.youtube.com/watch', array('query' => 'v='. $id)); + return url('https://www.youtube.com/watch', array('query' => 'v='. $id)); } /** @@ -546,12 +546,12 @@ function media_youtube_emfield_data($video_id) { // Get info from a youtube playlist. if (strpos($video_id, 'PLAYLIST_') === 0) { $playlist_id = substr($video_id, 9); - $url = 'http://youtube.com/p/'. $playlist_id; + $url = 'https://youtube.com/p/'. $playlist_id; $data['playlist'] = 1; // Get the large thumbnail of the first video. // Use the Youtube Google API to get this data. - $api_url = 'http://gdata.youtube.com/feeds/api/playlists/' . $playlist_id; + $api_url = 'https://gdata.youtube.com/feeds/api/playlists/' . $playlist_id; $result = drupal_http_request($api_url); if ($result->code == 200) { $parser = drupal_xml_parser_create($result->data); @@ -571,10 +571,10 @@ function media_youtube_emfield_data($video_id) { } // Get info from a single video. else { - $url = 'http://youtube.com/v/'. $video_id; + $url = 'https://youtube.com/v/'. $video_id; $data['playlist'] = 0; // Get the large thumbnail. - $data['thumbnail']['url'] = 'http://img.youtube.com/vi/'. $video_id .'/0.jpg'; + $data['thumbnail']['url'] = 'https://img.youtube.com/vi/'. $video_id .'/0.jpg'; } $response = emfield_request_header('youtube', $url); diff --git a/webroot/sites/all/modules/media_youtube/themes/media_youtube.theme.inc b/webroot/sites/all/modules/media_youtube/themes/media_youtube.theme.inc index 02b2801..41d57e8 100644 --- a/webroot/sites/all/modules/media_youtube/themes/media_youtube.theme.inc +++ b/webroot/sites/all/modules/media_youtube/themes/media_youtube.theme.inc @@ -35,7 +35,7 @@ function template_preprocess_media_youtube_html5(&$variables) { $variables = array_merge($variables, $variables['variables']); $video_id = $variables['video_id']; - $variables['url'] = isset($variables['url']) ? $variables['url'] : "http://www.youtube.com/v/$video_id"; + $variables['url'] = isset($variables['url']) ? $variables['url'] : "https://www.youtube.com/v/$video_id"; $variables['url'] = check_plain($variables['url']); $variables['width'] = check_plain($variables['width']); $variables['height'] = check_plain($variables['height']); @@ -51,7 +51,7 @@ function template_preprocess_media_youtube_default_external(&$variables) { $variables['flashvars'] = drupal_query_string_encode(array('playerMode' => 'embedded')); $video_id = $variables['video_id']; - $variables['url'] = isset($variables['url']) ? $variables['url'] : "http://www.youtube.com/v/$video_id"; + $variables['url'] = isset($variables['url']) ? $variables['url'] : "https://www.youtube.com/v/$video_id"; $variables['url'] = check_plain($variables['url']); $variables['width'] = check_plain($variables['width']); $variables['height'] = check_plain($variables['height']); @@ -164,12 +164,12 @@ function template_preprocess_media_youtube_flash(&$variables) { // Create a URL from our options. if ($variables['item']['data']['playlist']) { $video_id = substr($video_id, 9); - $url = check_plain("http://www.youtube.com/p/$video_id&$related$autoplay_value$colors$border$high_quality$display_info$enablejsapi$fs"); + $url = check_plain("https://www.youtube.com/p/$video_id&$related$autoplay_value$colors$border$high_quality$display_info$enablejsapi$fs"); // FLV Player doesn't support playlists, so we need to fall back. $variables['use_flv'] = FALSE; } else { - $url = check_plain("http://www.youtube.com/v/$video_id&$related$autoplay_value$colors$border$high_quality$display_info$enablejsapi$fs"); + $url = check_plain("https://www.youtube.com/v/$video_id&$related$autoplay_value$colors$border$high_quality$display_info$enablejsapi$fs"); } // Find the path to the JW FLV Media Player.