Drupal 9 updates

Author: malcomio

gallerysite.info.yml

@@ -1,5 +1,5 @@
-name: Gallery Guide Updates
+name: Gallery Guide Site Module
 type: module
-description: Site updates for The Gallery Guide
-core: 8.x
+description: Site tweaks and updates for The Gallery Guide
+core_version_requirement: ^8.8 || ^9
 package: The Gallery Guide

gallerysite.install

@@ -1,8 +1,10 @@
 <?php
 
+use Drupal\Core\Messenger\MessengerInterface as MessengerInterface;
+
 function _gallerysite_replace_internal_url($table, $column, $field, $entity_type) {
   // Get all websites where the URL starts with a slash.
-  $db = \Drupal\Core\Database\Database::getConnection();
+  $db = \Drupal::database();
   $query = $db->select($table, 'fw')
     ->fields('fw', array('entity_id', $column));
   $query->condition($column, "%" . $query->escapeLike('internal') . "%", 'LIKE');
@@ -41,9 +43,10 @@ function gallerysite_update_8002() {
  * Delete tags with no related content.
  */
 function gallerysite_update_8003() {
-  $result = $query = db_query("SELECT tid, name FROM {taxonomy_term_field_data} WHERE vid = 'tags'
- AND tid NOT IN (SELECT tid FROM {taxonomy_index}) 
- AND tid NOT IN (SELECT field_tags_target_id FROM {taxonomy_term__field_tags}) 
+  $connection = \Drupal::database();
+  $result = $query = $connection->query("SELECT tid, name FROM {taxonomy_term_field_data} WHERE vid = 'tags'
+ AND tid NOT IN (SELECT tid FROM {taxonomy_index})
+ AND tid NOT IN (SELECT field_tags_target_id FROM {taxonomy_term__field_tags})
  AND tid NOT IN (SELECT field_tags_target_id FROM {node__field_tags})");
 
   $count = 0;
@@ -55,6 +58,6 @@ function gallerysite_update_8003() {
     $message = 'Term ' . $row->tid . ' - ' . $row->name . ' deleted';
     \Drupal::logger('gallerysite')->notice($message);
   }
-  
-  drupal_set_message($count . ' tags deleted');
+
+  \Drupal::messenger()->addMessage($count . ' tags deleted');
 }

gallerysite.module

@@ -1,6 +1,7 @@
 <?php
 
 use Drupal\Core\Link;
+use Drupal\Core\Messenger\MessengerInterface;
 
 /**
  * Implements hook_form_FORM_ID_alter().
@@ -40,9 +41,11 @@ function gallerysite_term_submit(&$form, \Drupal\Core\Form\FormStateInterface $f
  * Implements hook_form_FORM_ID_alter().
  */
 function gallerysite_form_node_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+  $user = \Drupal::currentUser();
+
   $form['artists']['widget']['add_more']['#value'] = t('Add another artist');
   $form['tags']['widget']['add_more']['#value'] = t('Add another tag');
-  
+
   // Hide revision log fields
   $form['revision']['#access'] = FALSE;
   $form['revision_log']['#access'] = FALSE;
@@ -52,29 +55,79 @@ function gallerysite_form_node_form_alter(&$form, \Drupal\Core\Form\FormStateInt
 
   // Remove votes open/closed.
   $form['field_rating']['#access'] = FALSE;
-  
+
   // Restrict access to metatag.
-  $form['field_metatags']['#access'] = \Drupal::currentUser()->hasPermission('administer meta tags');
+  $form['field_metatags']['#access'] = $user->hasPermission('administer meta tags');
 
   // Add a class if the address has no default value.
   if (!empty($form['field_address']) && empty($form['field_address']['widget'][0]['address']['#default_value']['locality'])) {
     $form['field_address']['#attributes']['class'][] = 'field--widget-address-blank';
   }
+
+  // If the user already has published content, set the node as published by default.
+  if (gallerysite_has_content($user)) {
+    $form['status']['widget']['value']['#default_value'] = TRUE;
+  }
+
+}
+
+/**
+ * Check if a user has published content.
+ *
+ * @param \Drupal\Core\Session\AccountProxy $user
+ *   The user.
+ *
+ * @return bool
+ *   TRUE if the user has published content.
+ */
+function gallerysite_has_content($user) {
+  $ids = \Drupal::entityQuery('node')
+    ->condition('uid', $user->id())
+    ->condition('status', 1)
+    ->execute();
+  return !empty($ids);
 }
 
 /**
  * Implements hook_form_FORM_ID_alter().
  */
 function gallerysite_form_node_gallery_delete_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
-  // TODO: Prevent deletion if the gallery has any exhibitions.
+  // Does this gallery have any exhibitions?
+  $build_info = $form_state->getBuildInfo();
+  $gallery = $build_info['callback_object']->getEntity();
+  $exhibitions = gallerysite_get_exhibitions($gallery);
+  if (!empty($exhibitions)) {
+    // Prevent deletion.
+    $form['actions']['submit']['#access'] = FALSE;
+    $form['description']['#access'] = FALSE;
+    \Drupal::messenger()->addError(t('Galleries with exhibitions cannot be deleted.'));
+  }
+}
 
+/**
+ * Get exhibitions for a gallery.
+ *
+ * @param \Drupal\node\Entity\Node $gallery
+ *   The gallery node.
+ *
+ * @return array
+ *   The node IDs of exhibitions at this gallery.
+ */
+function gallerysite_get_exhibitions($gallery) {
+  return \Drupal::entityQuery('node')
+    ->condition('type', 'exhibition')
+    ->condition('field_exhib_gallery', $gallery->id())
+    ->execute();
 }
 
 /**
  * Implements hook_ENTITY_TYPE_insert().
  */
 function gallerysite_node_insert(Drupal\Core\Entity\EntityInterface $entity) {
-  drupal_set_message(t('Your listing has been created, and is awaiting moderation. Our team will publish it as soon as possible.'));
+  $published = $entity->isPublished();
+  if (!$published) {
+    \Drupal::messenger()->addMessage(t('Your listing has been created, and is awaiting moderation. Our team will publish it as soon as possible.'));
+  }
 }
 
 /**
@@ -99,7 +152,7 @@ function gallerysite_form_user_form_alter(&$form, \Drupal\Core\Form\FormStateInt
 function gallerysite_form_user_register_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
   // Hide the content form options.
   $form['contact']['#access'] = FALSE;
-  
+
   $link_options = ['absolute' => TRUE];
 
   $terms_nid = 6345;
@@ -114,43 +167,43 @@ function gallerysite_form_user_register_form_alter(&$form, \Drupal\Core\Form\For
 function gallerysite_default_image() {
 
   $connection = Database::getConnection();
-  
+
   $query = $connection->select('file_managed', 'fm')
     ->condition('uri', 'public://imagefield_default_images/anon_large.gif')
     ->fields('fm', array('fid', 'uuid'))
     ->execute();
-  
+
 //  $connection->update('file_managed', 'fm')
 //    ->condition('fid')
 
-  
+
 }
 
 /**
  * Implements hook_cron().
  */
 function gallerysite_cron() {
   // Get all promoted exhibitions which have already finished.
-  $date = date('Y-m-d', REQUEST_TIME);
+  $date = date('Y-m-d', \Drupal::time()->getRequestTime());
   $query = \Drupal::entityQuery('node')
     ->condition('type', 'exhibition')
     ->condition('status', 1)
     ->condition('promote', 1)
     ->condition('field_date_to.value', $date, '<');
-  
+
   $nids = $query->execute();
-  
+
   // Unpromote the nodes.
   $nodes = \Drupal\node\Entity\Node::loadMultiple($nids);
   foreach ($nodes as $node) {
     $node->set('promote', 0);
     $node->save();
   }
-  
+
   // Truncate tables that grow too large.
   $connection = \Drupal::database();
   $tables = array(
-    'cache_render', 
+    'cache_render',
     'cache_dynamic_page_cache',
   );
   foreach ($tables as $table) {
@@ -202,7 +255,7 @@ function _recursively_alter_query_conditions(&$conditions) {
 
 /**
  * Actually alter the condition if relevant.
- */ 
+ */
 function _alter_query_condition(&$condition) {
   if (isset($condition['field']) && ($condition['field'] === 'SUBSTRING(node_field_data.title, 1, 1) = :node_field_data_title')) {
     $condition['field'] = "SUBSTRING(views_natural_sort.content, 1, 1) = :node_field_data_title";

gallerysite.services.yml

@@ -1,6 +1,6 @@
 services:
   theme.negotiator.galledit_theme:
     class: Drupal\gallerysite\Theme\GalleryThemeNegotiator
-    arguments: ['@current_user', '@config.factory', '@entity.manager', '@router.admin_context']
+    arguments: ['@current_user', '@config.factory', '@entity_type.manager', '@router.admin_context']
     tags:
       - { name: theme_negotiator, priority: 1000 }

src/Theme/GalleryThemeNegotiator.php

@@ -14,7 +14,7 @@ class GalleryThemeNegotiator implements ThemeNegotiatorInterface {
    * {@inheritdoc}
    */
   public function applies(RouteMatchInterface $route_match) {
-    
+
     // Use this theme on a certain route.
     $edit_routes = array(
       'node.add',