Merge branch 'master' into 3.4.2

Author: lukdens

culturefeed.helpers.inc

@@ -279,6 +279,18 @@ function culturefeed_acceptance_mode() {
     return TRUE;
   }
 
+  // Check for acc or dev environments that are connected with production
+  else {
+    global $base_root;
+    $dev_ids = array('culturefeed', 'dev.', 'acc.');
+    foreach($dev_ids as $id) {
+      if (stripos($base_root, $id) !== false) {
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+
 }
 
 /**

culturefeed_search/culturefeed_search.module

@@ -13,6 +13,17 @@ define('CULTUREFEED_SEARCH_DEFAULT_PROXIMITY_RANGE', 20);
 
 module_load_include('inc', 'culturefeed_search', 'includes/helpers');
 
+/**
+ * Implements hook_init().
+ */
+function culturefeed_search_init() {
+
+  // Set noindex metatag when Search API location points to acceptance.
+  if (culturefeed_search_acceptance_mode()) {
+    culturefeed_search_set_noindex_metatag();
+  }
+}
+
 /**
  * Implements hook_menu().
  */

culturefeed_search/includes/helpers.inc

@@ -879,3 +879,45 @@ function culturefeed_search_block_ajaxload($config) {
 
   return $block;
 }
+
+/**
+ * Check if we are connected to acceptance API.
+ */
+function culturefeed_search_acceptance_mode() {
+
+  // Get culturefeed_search_api_location
+  $location = variable_get('culturefeed_search_api_location');
+  if (strpos($location,'www') === false) {
+    return TRUE;
+  }
+
+  // Check for acc or dev environments that are connected with production
+  else {
+    global $base_root;
+    $dev_ids = array('culturefeed', 'dev.', 'acc.');
+    foreach($dev_ids as $id) {
+      if (stripos($base_root, $id) !== false) {
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+
+}
+
+/**
+ * Set the "noindex, follow" meta tag when needed.
+ */
+function culturefeed_search_set_noindex_metatag() {
+
+  $element = array(
+    '#tag' => 'meta',
+    '#attributes' => array(
+      'name' => 'robots',
+      'content' => 'noindex, follow',
+    ),
+  );
+
+  drupal_add_html_head($element, 'robots');
+
+}

culturefeed_search/lib/Drupal/Import/CultureFeedDomainImport.php

@@ -88,7 +88,7 @@ private function importTerms($TermsElement, $pids = array()) {
       $termAttributes = $term->attributes();
 
       // Do not import disabled terms
-      if ($termAttributes['enabled'] == 'false') {
+      if ($termAttributes['enabled'] == 'false' && drupal_is_cli()) {
         drush_log('skipped disabled term: ' . $termAttributes['id'], 'warning');
         continue;
       }

culturefeed_search_ui/includes/helpers.inc

@@ -165,7 +165,7 @@ function culturefeed_search_ui_set_noindex_metatag() {
 
   // Add the "noindex, follow" meta tag if needed.
   if ($noindex) {
-    culturefeed_set_noindex_metatag();
+    culturefeed_search_set_noindex_metatag();
   }
 
 }