Commit 30a4ad2c authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review

Merge "Using https for flickr request url (Bug #1397068)"

parents 631564b8 4c93b2d3
......@@ -42,7 +42,7 @@ $string['previewwidthdesc'] = 'Set the maximum width to which the photos will be
// Flickr
$string['flickrsettings'] = 'Flickr settings';
$string['flickrapikey'] = 'Flickr API key';
$string['flickrapikeydesc'] = 'To show photo sets from Flickr, you\'ll need a valid Flickr API key. <a href="http://www.flickr.com/services/api/keys/apply/" target="_blank">Apply for your key online</a>.';
$string['flickrapikeydesc'] = 'To show photo sets from Flickr, you\'ll need a valid Flickr API key. <a href="https://www.flickr.com/services/api/keys/apply/" target="_blank">Apply for your key online</a>.';
$string['flickrsets'] = 'Flickr sets';
// Photobucket
......
......@@ -6,7 +6,7 @@
<p>It is possible to embed the following external galleries:
<ul>
<li>Flickr, e.g. http://www.flickr.com/photos/12345678@N01/sets/98765432123456789/</li>
<li>Flickr, e.g. https://www.flickr.com/photos/12345678@N01/sets/98765432123456789/</li>
<li>Picasa, e.g. http://picasaweb.google.com/user.name/AlbumName#</li>
<li>Panoramio, e.g. http://www.panoramio.com/user/123456</li>
<li>Photobucket, e.g. http://s1234.photobucket.com/albums/ee123/username/ or http://s1234.photobucket.com/albums/ee123/username/AlbumName/</li>
......
......@@ -160,7 +160,7 @@ class PluginBlocktypeGallery extends PluginBlocktype {
$width = 75; // Currently only thumbnail size, that Flickr supports
$api_key = get_config_plugin('blocktype', 'gallery', 'flickrapikey');
$URL = 'http://api.flickr.com/services/rest/?method=flickr.photosets.getPhotos&extras=url_sq,url_t&photoset_id=' . $var2 . '&api_key=' . $api_key;
$URL = 'https://api.flickr.com/services/rest/?method=flickr.photosets.getPhotos&extras=url_sq,url_t&photoset_id=' . $var2 . '&api_key=' . $api_key;
$xmlDoc = new DOMDocument('1.0', 'UTF-8');
$config = array(
CURLOPT_URL => $URL,
......@@ -716,7 +716,7 @@ class PluginBlocktypeGallery extends PluginBlocktype {
// Flickr Set (RSS) - for Roy Tanck's widget
array(
'match' => '#.*api.flickr.com.*set=(\d+).*nsid=([a-zA-Z0-9\@]+).*#',
'url' => 'http://api.flickr.com/services/feeds/photoset.gne?set=$1&nsid=$2',
'url' => 'https://api.flickr.com/services/feeds/photoset.gne?set=$1&nsid=$2',
'type' => 'widget',
'var1' => '$2',
'var2' => '$1',
......@@ -724,7 +724,7 @@ class PluginBlocktypeGallery extends PluginBlocktype {
// Flickr Set (direct link)
array(
'match' => '#.*www.flickr.com/photos/([a-zA-Z0-9\_\-\.\@]+).*/sets/([0-9]+).*#',
'url' => 'http://www.flickr.com/photos/$1/sets/$2/',
'url' => 'https://www.flickr.com/photos/$1/sets/$2/',
'type' => 'flickr',
'var1' => '$1',
'var2' => '$2',
......
{if $images}
<object width="{$width}" height="{$height}">
<param name="flashvars" value="offsite=true&page_show_url=%2Fphotos%2F{$images.user}%2Fsets%2F{$images.gallery}%2Fshow%2F&set_id={$images.gallery}"></param>
<param name="movie" value="http://www.flickr.com/apps/slideshow/show.swf?v=71649"></param>
<param name="movie" value="https://www.flickr.com/apps/slideshow/show.swf?v=71649"></param>
<param name="allowFullScreen" value="true"></param>
<embed type="application/x-shockwave-flash" src="http://www.flickr.com/apps/slideshow/show.swf?v=71649" allowFullScreen="true" flashvars="offsite=true&page_show_url=%2Fphotos%2F{$images.user}%2Fsets%2F{$images.gallery}%2Fshow%2F&set_id={$images.gallery}" width="{$width}" height="{$height}"></embed>
<embed type="application/x-shockwave-flash" src="https://www.flickr.com/apps/slideshow/show.swf?v=71649" allowFullScreen="true" flashvars="offsite=true&page_show_url=%2Fphotos%2F{$images.user}%2Fsets%2F{$images.gallery}%2Fshow%2F&set_id={$images.gallery}" width="{$width}" height="{$height}"></embed>
</object>
{else}
{str tag=cannotdisplayslideshow section=blocktype.file/gallery}
......
<a href="http://www.flickr.com/" target="_blank">
<a href="https://www.flickr.com/" target="_blank">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/flickr.png" border="0" width="16" height="16" title="{str tag=flickrsets section=blocktype.file/gallery}">
</a>
<a href="http://picasaweb.google.com/" target="_blank">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment