diff --git a/access.info.yml b/access.info.yml index 96d71c2c..33887bce 100644 --- a/access.info.yml +++ b/access.info.yml @@ -1,7 +1,7 @@ name: Access description: 'Access' type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 | ^11 package: Custom dependencies: - access:access_llm diff --git a/modules/access_affinitygroup/access_affinitygroup.info.yml b/modules/access_affinitygroup/access_affinitygroup.info.yml index c62ca068..62ea0b10 100644 --- a/modules/access_affinitygroup/access_affinitygroup.info.yml +++ b/modules/access_affinitygroup/access_affinitygroup.info.yml @@ -1,7 +1,7 @@ name: Access Affinity Group description: 'Custom functionality for Affinity Groups' type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 | ^11 package: Custom dependencies: - access diff --git a/modules/access_affinitygroup/src/Plugin/EmailWrapper.php b/modules/access_affinitygroup/src/Plugin/EmailWrapper.php index c470515c..d55fecf3 100644 --- a/modules/access_affinitygroup/src/Plugin/EmailWrapper.php +++ b/modules/access_affinitygroup/src/Plugin/EmailWrapper.php @@ -811,7 +811,7 @@ private function ccNewsCommonHTML($newsBody, $topExtra) { $fbIcon = $this->imageUrl('circleIconFacebook.png'); $bsIcon = $this->imageUrl('circleIconBluesky.png'); $ytIcon = $this->imageUrl('circleIconYoutube.png'); - $nsfLogo = ACCESS_SUPPORT_URL . '/themes/custom/accesstheme/assets/NSF_4-Color_bitmap_Logo_350x350.png'; + $nsfLogo = ACCESS_SUPPORT_URL . '/themes/contrib/asp-theme/assets/NSF_4-Color_bitmap_Logo_350x350.png'; $emailText = << diff --git a/modules/access_cilink/access_cilink.info.yml b/modules/access_cilink/access_cilink.info.yml index 89b0e33c..b2aa3f7d 100644 --- a/modules/access_cilink/access_cilink.info.yml +++ b/modules/access_cilink/access_cilink.info.yml @@ -1,7 +1,7 @@ name: Access CI Link description: 'CI Link customizations' type: module -core_version_requirement: ^9.3 || ^10 +core_version_requirement: ^9.3 || ^10 | ^11 package: Custom dependencies: - access diff --git a/modules/access_llm/access_llm.info.yml b/modules/access_llm/access_llm.info.yml index f4bca1f9..83288c92 100644 --- a/modules/access_llm/access_llm.info.yml +++ b/modules/access_llm/access_llm.info.yml @@ -1,4 +1,4 @@ name: Access LLM type: module description: Adding in LLM functions. -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 | ^11 diff --git a/modules/access_match_engagement/access_match_engagement.info.yml b/modules/access_match_engagement/access_match_engagement.info.yml index 6fb6ce52..2ebfaedd 100644 --- a/modules/access_match_engagement/access_match_engagement.info.yml +++ b/modules/access_match_engagement/access_match_engagement.info.yml @@ -1,7 +1,7 @@ name: Access Match Engagement description: 'Custom functionality for the Match Engagement node type' type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 | ^11 package: Custom dependencies: - access diff --git a/modules/access_misc/access_misc.info.yml b/modules/access_misc/access_misc.info.yml index 4e99ec9d..90427b81 100644 --- a/modules/access_misc/access_misc.info.yml +++ b/modules/access_misc/access_misc.info.yml @@ -1,7 +1,7 @@ name: Access Misc description: "Snippets for small changes or re-usable code" type: module -core_version_requirement: ^9.3 || ^10 +core_version_requirement: ^9.3 || ^10 | ^11 package: Custom dependencies: - access diff --git a/modules/access_news/access_news.info.yml b/modules/access_news/access_news.info.yml index 54a0132c..b908af2b 100644 --- a/modules/access_news/access_news.info.yml +++ b/modules/access_news/access_news.info.yml @@ -1,7 +1,7 @@ name: Access News description: 'Custom functionality for ACCESS News' type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 | ^11 package: Custom dependencies: - access diff --git a/modules/access_outages/access_outages.info.yml b/modules/access_outages/access_outages.info.yml index b140597d..9d37a68f 100644 --- a/modules/access_outages/access_outages.info.yml +++ b/modules/access_outages/access_outages.info.yml @@ -2,7 +2,7 @@ name: ACCESS Outages description: ACCESS Outages module package: Custom type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 | ^11 version: 1.0 dependencies: - access diff --git a/modules/access_shortcodes/access_shortcodes.info.yml b/modules/access_shortcodes/access_shortcodes.info.yml index cf89744c..a527e565 100644 --- a/modules/access_shortcodes/access_shortcodes.info.yml +++ b/modules/access_shortcodes/access_shortcodes.info.yml @@ -1,7 +1,7 @@ name: ACCESS Shortcodes description: 'Shortcodes for the ACCESS theme' type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 | ^11 package: Custom dependencies: - access diff --git a/modules/ccmnet/ccmnet.info.yml b/modules/ccmnet/ccmnet.info.yml index 4d37d1cf..f65e9f40 100644 --- a/modules/ccmnet/ccmnet.info.yml +++ b/modules/ccmnet/ccmnet.info.yml @@ -1,7 +1,7 @@ name: ccmnet description: 'Custom functionality for the ccmnet' type: module -core_version_requirement: ^10 +core_version_requirement: ^10 | ^11 package: Custom dependencies: - access diff --git a/modules/cssn/cssn.info.yml b/modules/cssn/cssn.info.yml index a01001ef..a54b2de0 100644 --- a/modules/cssn/cssn.info.yml +++ b/modules/cssn/cssn.info.yml @@ -1,7 +1,7 @@ name: CSSN description: 'Computational Science and Support Network' type: module -core_version_requirement: ^9.4 || ^10 +core_version_requirement: ^9.4 || ^10 | ^11 package: Custom dependencies: - access diff --git a/modules/ondemand/ondemand.info.yml b/modules/ondemand/ondemand.info.yml index fe96599b..8b849b3f 100644 --- a/modules/ondemand/ondemand.info.yml +++ b/modules/ondemand/ondemand.info.yml @@ -1,7 +1,7 @@ name: ondemand description: 'Custom functionality for OnDemand' type: module -core_version_requirement: ^10 +core_version_requirement: ^10 | ^11 package: Custom dependencies: - access diff --git a/modules/ticketing/src/Plugin/WebformHandler/AccountSupportHandler.php b/modules/ticketing/src/Plugin/WebformHandler/AccountSupportHandler.php index dc9b8d0d..67e36322 100644 --- a/modules/ticketing/src/Plugin/WebformHandler/AccountSupportHandler.php +++ b/modules/ticketing/src/Plugin/WebformHandler/AccountSupportHandler.php @@ -69,16 +69,14 @@ public function postSave(WebformSubmissionInterface $webformSubmission, $update public function getXMailMessageBody($data) { $ticketing_module_path = \Drupal::service('extension.list.module')->getPath('ticketing'); - return twig_render_template( - $ticketing_module_path . '/templates/account-support-mail.html.twig', - [ - 'theme_hook_original' => 'not-applicable', - 'name' => $data['your_name'], - 'email' => $data['email'], - 'access_id' => $data['access_id'], - 'comment' => $data['comment'], - ] - ); + /** @var \Twig\Environment $twig */ + $twig = \Drupal::service('twig'); + return (string) $twig->load($ticketing_module_path . '/templates/account-support-mail.html.twig')->render([ + 'name' => $data['your_name'], + 'email' => $data['email'], + 'access_id' => $data['access_id'], + 'comment' => $data['comment'], + ]); } } diff --git a/modules/ticketing/src/Plugin/WebformHandler/RequestOrgsListAddHandler.php b/modules/ticketing/src/Plugin/WebformHandler/RequestOrgsListAddHandler.php index 95d936bf..2daedbb3 100644 --- a/modules/ticketing/src/Plugin/WebformHandler/RequestOrgsListAddHandler.php +++ b/modules/ticketing/src/Plugin/WebformHandler/RequestOrgsListAddHandler.php @@ -72,22 +72,20 @@ public function postSave(WebformSubmissionInterface $webformSubmission, $update */ public function getMailMessageBody($data) { $ticketing_module_path = \Drupal::service('extension.list.module')->getPath('ticketing'); - return twig_render_template( - $ticketing_module_path . '/templates/request-orgs-list-add-mail.html.twig', - [ - 'theme_hook_original' => 'not-applicable', - 'name' => $data['your_name'], - 'email' => $data['your_email'], - 'organization' => $data['your_organization'], - 'address_line_1' => $data['address_line_1'] ?? '', - 'address_line_2' => $data['address_line_2'] ?? '', - 'city' => $data['city'] ?? '', - 'state_province_region' => $data['state_province_region'] ?? '', - 'zip_postal_code' => $data['zip_postal_code'] ?? '', - 'country' => $data['country'] ?? '', - 'organization_webpage' => $data['organization_webpage'] ?? '', - ] - ); + /** @var \Twig\Environment $twig */ + $twig = \Drupal::service('twig'); + return (string) $twig->load($ticketing_module_path . '/templates/request-orgs-list-add-mail.html.twig')->render([ + 'name' => $data['your_name'], + 'email' => $data['your_email'], + 'organization' => $data['your_organization'], + 'address_line_1' => $data['address_line_1'] ?? '', + 'address_line_2' => $data['address_line_2'] ?? '', + 'city' => $data['city'] ?? '', + 'state_province_region' => $data['state_province_region'] ?? '', + 'zip_postal_code' => $data['zip_postal_code'] ?? '', + 'country' => $data['country'] ?? '', + 'organization_webpage' => $data['organization_webpage'] ?? '', + ]); } } diff --git a/modules/ticketing/src/Plugin/WebformHandler/TicketingSendEmailHandler.php b/modules/ticketing/src/Plugin/WebformHandler/TicketingSendEmailHandler.php index f10c05f3..e572eaed 100644 --- a/modules/ticketing/src/Plugin/WebformHandler/TicketingSendEmailHandler.php +++ b/modules/ticketing/src/Plugin/WebformHandler/TicketingSendEmailHandler.php @@ -195,16 +195,14 @@ public function postSave(WebformSubmissionInterface $webformSubmission, $update public function getXMailMessageBody($description, $tags, $suggested_tag, $from_email) { $ticketing_module_path = \Drupal::service('extension.list.module')->getPath('ticketing'); - return twig_render_template( - $ticketing_module_path . '/templates/ticketing-mail.html.twig', - [ - 'theme_hook_original' => 'not-applicable', - 'problem_description' => $description, - 'tags' => $tags, - 'suggested_tag' => $suggested_tag, - 'email' => $from_email, - ] - ); + /** @var \Twig\Environment $twig */ + $twig = \Drupal::service('twig'); + return (string) $twig->load($ticketing_module_path . '/templates/ticketing-mail.html.twig')->render([ + 'problem_description' => $description, + 'tags' => $tags, + 'suggested_tag' => $suggested_tag, + 'email' => $from_email, + ]); } } diff --git a/modules/ticketing/ticketing.info.yml b/modules/ticketing/ticketing.info.yml index fefd0775..32164b8b 100644 --- a/modules/ticketing/ticketing.info.yml +++ b/modules/ticketing/ticketing.info.yml @@ -2,7 +2,7 @@ name: Ticketing description: Ticketing Module package: Custom type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 | ^11 version: 1.0 dependencies: - access diff --git a/modules/user_profiles/user_profiles.info.yml b/modules/user_profiles/user_profiles.info.yml index ec13e4bb..251dbf20 100644 --- a/modules/user_profiles/user_profiles.info.yml +++ b/modules/user_profiles/user_profiles.info.yml @@ -2,7 +2,7 @@ name: User Profiles description: User Profiles Module package: Custom type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 | ^11 version: 1.0 dependencies: - access