Session: Scheduled announcements: Add user extra fields to scheduled announcements editor - refs #4816

Co-authored-by: Juan Cortizas Ponte <124381395+juancpbinario@users.noreply.github.com>

Author: juancpbinario

main/inc/lib/ScheduledAnnouncement.php

@@ -301,6 +301,11 @@ public function sendPendingMessages($urlId = 0)
  $result = $this->get_all();
  $extraFieldValue = new ExtraFieldValue('scheduled_announcement');
 
+ // get user extra fields list (only visible to self and filter-able)
+ $extraField = new ExtraField('user');
+ $extraFields = $extraField->get_all(['filter = ? AND visible_to_self = ?' => [1, 1]]);
+
+
  foreach ($result as $result) {
  if (empty($result['sent'])) {
  if (!empty($result['date']) && $result['date'] < $now) {
@@ -412,6 +417,19 @@ public function sendPendingMessages($urlId = 0)
  '((lp_progress))' => $progress,
  ];
 
+ if (!empty($extraFields)) {
+ $efv = new ExtraFieldValue('user');
+
+ foreach ($extraFields as $extraField) {
+ $valueExtra = $efv->get_values_by_handler_and_field_variable(
+ $user['user_id'],
+ $extraField['variable'],
+ true
+ );
+ $tags['(('.strtolower($extraField['variable']).'))'] = $valueExtra['value'];
+ }
+ }
+
  $message = str_replace(array_keys($tags), $tags, $message);
  $message .= $attachments;
 
@@ -461,6 +479,14 @@ public function getTags()
  '((user_picture))',
  '((lp_progress))',
  ];
+ // get user extra fields list (only visible to self and filter-able)
+ $extraField = new ExtraField('user');
+ $extraFields = $extraField->get_all(['filter = ? AND visible_to_self = ?' => [1, 1]]);
+ if (!empty($extraFields)) {
+ foreach ($extraFields as $extraField) {
+ $tags[] = '(('.strtolower($extraField['variable']).'))';
+ }
+ }
 
  return $tags;
  }