X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Ffontyourface%2Fmodules%2Fgoogle_fonts_api%2Fgoogle_fonts_api.module;fp=web%2Fmodules%2Fcontrib%2Ffontyourface%2Fmodules%2Fgoogle_fonts_api%2Fgoogle_fonts_api.module;h=3dffde89f31bc1374dc421fc724e94318b043f91;hp=73d75cd49df3955c947e51a96ab6f8dd98681259;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hpb=680c79a86e3ed402f263faeac92e89fb6d9edcc0

diff --git a/web/modules/contrib/fontyourface/modules/google_fonts_api/google_fonts_api.module b/web/modules/contrib/fontyourface/modules/google_fonts_api/google_fonts_api.module
index 73d75cd49..3dffde89f 100644
--- a/web/modules/contrib/fontyourface/modules/google_fonts_api/google_fonts_api.module
+++ b/web/modules/contrib/fontyourface/modules/google_fonts_api/google_fonts_api.module
@@ -5,6 +5,8 @@
  * Google Fonts module file.
  */
 
+use Drupal\Core\Link;
+
 /**
  * Implements hook_fontyourface_api().
  */
@@ -15,6 +17,18 @@ function google_fonts_api_fontyourface_api() {
   ];
 }
 
+/**
+ * Implements hook_modules_installed().
+ *
+ * Use this hook instead of hook_install, because the route "font.settings" is
+ * not defined otherwise.
+ */
+function google_fonts_api_modules_installed($modules) {
+  if (in_array('google_fonts_api', $modules)) {
+    drupal_set_message(t('Due to the number of fonts, automated import from install for Google Fonts is disabled. Please use @link to import Google Fonts.', ['@link' => Link::createFromRoute('@font-your-face settings', 'font.settings')->toString()]));
+  }
+}
+
 /**
  * Implements hook_page_attachments().
  */
@@ -82,11 +96,7 @@ function google_fonts_api_generate_font_family_css(array $fonts) {
       $families[$family] = urlencode($family) . ':' . implode(',', $variants);
     }
 
-    $base = 'http://fonts.googleapis.com/css?family=';
-
-    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
-      $base = 'https://fonts.googleapis.com/css?family=';
-    }
+    $base = 'https://fonts.googleapis.com/css?family=';
 
     $url = $base . implode('|', $families) . '&subset=' . implode(',', $all_subsets);
 
@@ -202,7 +212,7 @@ function _google_fonts_api_convert_api_results(array $json_font_list) {
 
         $fonts[$font_id] = new stdClass();
         $fonts[$font_id]->name = $font_id;
-        $fonts[$font_id]->url = 'http://www.google.com/webfonts/family?family=' . $json_font->family . '&subset=' . $json_font_subset . '#' . $json_font_variant;
+        $fonts[$font_id]->url = 'https://www.google.com/webfonts/family?family=' . $json_font->family . '&subset=' . $json_font_subset . '#' . $json_font_variant;
         $fonts[$font_id]->provider = 'google_fonts_api';
         $fonts[$font_id]->css_family = $json_font->family;
         $fonts[$font_id]->css_style = $css_style;