From 893bc0033c8ddd2794a6978cb6381a4432291d4c Mon Sep 17 00:00:00 2001
From: lolandese <lolandese@210402.no-reply.drupal.org>
Date: Sat, 8 Mar 2014 16:07:50 +0100
Subject:  lolandese: Generated with Drush iq

---
 cc-icons.ttf             |  Bin 0 -> 6104 bytes
 field/flickrfield.module |    2 +-
 flickr.admin.inc         |    2 +-
 flickr.css               |    2 +-
 flickr.inc               |    6 +++---
 flickr.module            |   16 ++++++++--------
 6 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 cc-icons.ttf

diff --git a/cc-icons.ttf b/cc-icons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..086821bfffdad06d549c958afe71390d55214ab5
GIT binary patch
literal 6104
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
Vfb%B{M`(ND&?m`4d;FoH{{+!o4g3HA

literal 0
HcmV?d00001

diff --git a/field/flickrfield.module b/field/flickrfield.module
index 43ceae3..d8661c2 100644
--- a/field/flickrfield.module
+++ b/field/flickrfield.module
@@ -399,7 +399,7 @@ function theme_flickrfield_formatter_photoset_flickrcomslideshow($variables) {
     return;
   }
   $set_id = $variables['#item']['flickrid'];
-  $src = 'http://www.flickr.com/slideShow/index.gne?set_id=' . $set_id;
+  $src = 'https://www.flickr.com/slideShow/index.gne?set_id=' . $set_id;
   return '<div class="flickr-photoset-slideshow">'
     . '<iframe align="center" src="' . $src . '" frameBorder="0" width="500" scrolling="no" height="500"></iframe>'
     . '</div>';
diff --git a/flickr.admin.inc b/flickr.admin.inc
index 96661b0..97de2d9 100644
--- a/flickr.admin.inc
+++ b/flickr.admin.inc
@@ -97,7 +97,7 @@ function flickr_admin_settings() {
     '#title' => t('Minimum image width to display a title caption'),
     '#required' => TRUE,
     '#default_value' => variable_get('flickr_title_suppress_on_small', '100'),
-    '#description' => t('Small images have liitle space for a title caption. Replace it with the text "Flickr" that links to the photo page on Flickr to comply with their <a href="http://www.flickr.com/guidelines.gne" title="Flickr Community Guidelines">Guidelines</a>.<br />After saving the configuration <a href="?q=admin/config/development/performance">clear the cache</a>.'),
+    '#description' => t('Small images have liitle space for a title caption. Replace it with the text "Flickr" that links to the photo page on Flickr to comply with their <a href="https://www.flickr.com/guidelines.gne" title="Flickr Community Guidelines">Guidelines</a>.<br />After saving the configuration <a href="?q=admin/config/development/performance">clear the cache</a>.'),
     '#field_suffix' => t('px'),
     '#size' => 3,
     '#maxlength' => 3,
diff --git a/flickr.css b/flickr.css
index 1b4946a..7ed9af7 100644
--- a/flickr.css
+++ b/flickr.css
@@ -39,7 +39,7 @@ span.flickr-credit {
     font-family: 'CC-ICONS';
     font-style: normal;
     font-weight: normal;
-    src: url('http://mirrors.creativecommons.org/presskit/cc-icons.ttf') format('truetype');
+    src: url('cc-icons.ttf') format('truetype');
   }
   span.flickr-cc {
     /*Creative commons icon font*/
diff --git a/flickr.inc b/flickr.inc
index 02674db..34d1d24 100644
--- a/flickr.inc
+++ b/flickr.inc
@@ -4,7 +4,7 @@
  * The Flickr API functions.
  */
 
-define('FLICKR_REST_ENDPOINT', 'http://api.flickr.com/services/rest/');
+define('FLICKR_REST_ENDPOINT', 'https://api.flickr.com/services/rest/');
 require_once(drupal_get_path('module', 'flickr') . '/flickr.api.inc');
 
 /**
@@ -289,7 +289,7 @@ function flickr_photo_page_url($owner, $id = NULL) {
     return $person['photosurl']['_content'] . $id;
   }
   else {
-    return "http://flickr.com/photos/$nsid/$id";
+    return "https://flickr.com/photos/$nsid/$id";
   }
 }
 
@@ -310,7 +310,7 @@ function flickr_photoset_page_url($owner, $id = NULL) {
     return $person['photosurl']['_content'] . 'sets/' . $id;
   }
   else {
-    return "http://flickr.com/photos/$nsid/sets/$id";
+    return "https://flickr.com/photos/$nsid/sets/$id";
   }
 }
 
diff --git a/flickr.module b/flickr.module
index 82dc0c9..fedb587 100644
--- a/flickr.module
+++ b/flickr.module
@@ -336,7 +336,7 @@ function theme_flickr_photo($variables) {
   // Use title if description does not exist, else sanitize the description.
   $description = !empty($info['description']['_content']) ? str_replace('"', "'", htmlspecialchars_decode(strip_tags($info['description']['_content']))) : $title;
   // Real name if it exists or go with the username. Link to Flickr user page.
-  $username = !empty($info['owner']['realname']) ? l($info['owner']['realname'], 'http://www.flickr.com/photos/' . $info['owner']['nsid'], array('attributes' => array('title' => t('View user on Flickr.'), 'target' => '_blank'))) : l($info['owner']['username'], 'http://www.flickr.com/photos/' . $info['owner']['nsid'], array('attributes' => array('title' => t('View user on Flickr.'), 'target' => '_blank')));
+  $username = !empty($info['owner']['realname']) ? l($info['owner']['realname'], 'https://www.flickr.com/photos/' . $info['owner']['nsid'], array('attributes' => array('title' => t('View user on Flickr.'), 'target' => '_blank'))) : l($info['owner']['username'], 'https://www.flickr.com/photos/' . $info['owner']['nsid'], array('attributes' => array('title' => t('View user on Flickr.'), 'target' => '_blank')));
   // The date an image was taken formatted as 'time ago'.
   $taken = isset($info['dates']['taken']) ? format_interval(time() - strtotime($info['dates']['taken']), 1) . ' ' . t('ago') : '';
   // A bunch of geo data.
@@ -352,37 +352,37 @@ function theme_flickr_photo($variables) {
       break;
 
     case '1':
-      $license = ' <a href="http://creativecommons.org/licenses/by-nc-sa/2.0/" title="' . t('Creative Commons — Attribution-NonCommercial-ShareAlike 2.0 Generic — CC BY-NC-SA 2.0') . '" target="_blank"><span class="flickr-cc">cna</span></a>';
+      $license = ' <a href="https://creativecommons.org/licenses/by-nc-sa/2.0/" title="' . t('Creative Commons — Attribution-NonCommercial-ShareAlike 2.0 Generic — CC BY-NC-SA 2.0') . '" target="_blank"><span class="flickr-cc">cna</span></a>';
       $licenselong = t('Creative Commons, Attribution, Non Commercial, ShareAlike');
       break;
 
     case '2':
-      $license = ' <a href="http://creativecommons.org/licenses/by-nc/2.0/" title="' . t('Creative Commons — Attribution-NonCommercial 2.0 Generic — CC BY-NC 2.0') . '" target="_blank"><span class="flickr-cc">cn</span></a>';
+      $license = ' <a href="https://creativecommons.org/licenses/by-nc/2.0/" title="' . t('Creative Commons — Attribution-NonCommercial 2.0 Generic — CC BY-NC 2.0') . '" target="_blank"><span class="flickr-cc">cn</span></a>';
       $licenselong = t('Creative Commons, Attribution, Non Commercial');
       break;
 
     case '3':
-      $license = ' <a href="http://creativecommons.org/licenses/by-nc-nd/2.0/" title="' . t('Creative Commons — Attribution-NonCommercial-NoDerivs 2.0 Generic — CC BY-NC-ND 2.0') . '" target="_blank"><span class="flickr-cc">cnd</span></a>';
+      $license = ' <a href="https://creativecommons.org/licenses/by-nc-nd/2.0/" title="' . t('Creative Commons — Attribution-NonCommercial-NoDerivs 2.0 Generic — CC BY-NC-ND 2.0') . '" target="_blank"><span class="flickr-cc">cnd</span></a>';
       $licenselong = t('Creative Commons, Attribution, Non Commercial, No Derivs');
       break;
 
     case '4':
-      $license = ' <a href="http://creativecommons.org/licenses/by/2.0/" title="' . t('Creative Commons — Attribution 2.0 Generic — CC BY 2.0') . '" target="_blank"><span class="flickr-cc">c</span></a>';
+      $license = ' <a href="https://creativecommons.org/licenses/by/2.0/" title="' . t('Creative Commons — Attribution 2.0 Generic — CC BY 2.0') . '" target="_blank"><span class="flickr-cc">c</span></a>';
       $licenselong = t('Creative Commons, Attribution');
       break;
 
     case '5':
-      $license = ' <a href="http://creativecommons.org/licenses/by-sa/2.0/" title="' . t('Creative Commons — Attribution-ShareAlike 2.0 Generic — CC BY-SA 2.0') . '" target="_blank"><span class="flickr-cc">cs</span></a>';
+      $license = ' <a href="https://creativecommons.org/licenses/by-sa/2.0/" title="' . t('Creative Commons — Attribution-ShareAlike 2.0 Generic — CC BY-SA 2.0') . '" target="_blank"><span class="flickr-cc">cs</span></a>';
       $licenselong = t('Creative Commons, Attribution, Share Alike');
       break;
 
     case '6':
-      $license = ' <a href="http://creativecommons.org/licenses/by-nd/2.0/" title="' . t('Creative Commons — Attribution-NoDerivs 2.0 Generic — CC BY-ND 2.0') . '" target="_blank"><span class="flickr-cc">cd</span></a>';
+      $license = ' <a href="https://creativecommons.org/licenses/by-nd/2.0/" title="' . t('Creative Commons — Attribution-NoDerivs 2.0 Generic — CC BY-ND 2.0') . '" target="_blank"><span class="flickr-cc">cd</span></a>';
       $licenselong = t('Creative Commons, Attribution, No Derivs');
       break;
 
     case '7':
-      $license = '<br /><a href="http://flickr.com/commons/usage/" title="' . t('Flickr: The Commons') . '" target="_blank">No known copyright restrictions</a>';
+      $license = '<br /><a href="https://flickr.com/commons/usage/" title="' . t('Flickr: The Commons') . '" target="_blank">No known copyright restrictions</a>';
       $licenselong = t('No known copyright restrictions');
       break;
 
-- 
1.7.9.5