ProPeace/de.propeace.mailinglistsync
6
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: ProPeace:main
Branches Tags
ProPeace:main
ProPeace:dev
ProPeace:1.0.0-beta6
ProPeace:1.0.0-beta5
ProPeace:1.0.0-beta4
ProPeace:1.0.0-beta3
ProPeace:1.0.0-beta2
ProPeace:1.0.0-beta1
..
compare: ProPeace:1.0.0-beta2
Branches Tags
ProPeace:main
ProPeace:dev
ProPeace:1.0.0-beta6
ProPeace:1.0.0-beta5
ProPeace:1.0.0-beta4
ProPeace:1.0.0-beta3
ProPeace:1.0.0-beta2
ProPeace:1.0.0-beta1

No commits in common. "main" and "1.0.0-beta2" have entirely different histories.
main ... 1.0.0-beta

6 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Civi/Mailinglistsync/BaseMailingList.php
View file

@ -95,7 +95,7 @@ abstract class BaseMailingList
*/
static protected function getCustomFields(): array
{
return CustomField::get(FALSE)
return CustomField::get()
->addSelect('*')
->addWhere('custom_group_id:name', '=', static::CUSTOM_GROUP_NAME)
->execute()

4
Civi/Mailinglistsync/EventMailingList.php
View file

@ -53,7 +53,7 @@ class EventMailingList extends BaseMailingList {
->addJoin('Participant AS participant', 'INNER',
['id', '=', 'participant.contact_id'],
['participant.event_id', '=', $this->event['id']],
['participant.status_id', 'IN', self::getEnabledParticipantStatus()],
['participant.status', 'IN', self::getEnabledParticipantStatus()],
)
->addGroupBy('id')
->execute()
@ -93,6 +93,6 @@ class EventMailingList extends BaseMailingList {
* @return ?array
*/
public static function getEnabledParticipantStatus(): ?array {
return MailingListSettings::get('participant_status');
return MailingListSettings::get(E::SHORT_NAME . '_participant_status');
}
}

14
Civi/Mailinglistsync/QueueHelper.php
View file

@ -29,21 +29,21 @@ class QueueHelper {
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$this->eventQueue = \Civi::queue(
'propeace-mailinglist-event-queue', [
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$this->emailQueue = \Civi::queue(
'propeace-mailinglist-email-queue', [
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$this->groups = [];
@ -106,14 +106,12 @@ class QueueHelper {
* Stores an email address in the queue helper singleton.
*
* @param \CRM_Queue_TaskContext $context
* @param string|null $email
* @param string $email
*
* @return bool
*/
public static function storeEmail(\CRM_Queue_TaskContext $context, ?string $email): bool {
if (!empty($email)) {
self::getInstance()->addToEmails($email);
}
public static function storeEmail(\CRM_Queue_TaskContext $context, string $email): bool {
self::getInstance()->addToEmails($email);
return TRUE;
}

2
LICENSE.txt
View file

@ -1,5 +1,5 @@
Package: de.propeace.mailinglistsync
Copyright (C) 2025, Pro Peace <info@propeace.de>
Copyright (C) 2025, FIXME <FIXME>
Licensed under the GNU Affero Public License 3.0 (below).
-------------------------------------------------------------------------------

4
info.xml
View file

@ -7,12 +7,12 @@
<authors>
<author>
<name>Marc Koch</name>
<email>marc.koch@propeace.de</email>
<email>koch@forumZFD.de</email>
<role>Maintainer</role>
</author>
</authors>
<urls>
<url desc="Main Extension Page">https://git.propeace.de/ProPeace/de.propeace.mailinglistsync</url>-->
<!-- <url desc="Main Extension Page">https://FIXME</url>-->
<!-- <url desc="Documentation">https://FIXME</url>-->
<!-- <url desc="Support">https://FIXME</url>-->
<url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>

22
mailinglistsync.php
View file

@ -129,7 +129,7 @@ function mailinglistsync_civicrm_validateForm($formName, &$fields, &$files, &$fo
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$queue->createItem(new CRM_Queue_Task(
// callback
@ -145,7 +145,7 @@ function mailinglistsync_civicrm_validateForm($formName, &$fields, &$files, &$fo
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$queue->createItem(new CRM_Queue_Task(
// callback
@ -225,10 +225,8 @@ function mailinglistsync_civicrm_post(string $op, string $objectName, int $objec
->first()['event_id'];
$mailingList = new EventMailingList($eventId);
// Check permission to alter event mailing list if it is not a deletion
if ($op !== 'delete'
&& $mailingList->isEnabled()
&& !CRM_Core_Permission::check('manage_event_mailinglists')) {
// Check permission to alter event mailing list
if ($mailingList->isEnabled() && !CRM_Core_Permission::check('manage_event_mailinglists')) {
CRM_Core_Session::setStatus(
E::ts('You do not have permission to manage event mailing lists.'),
E::ts('Permission Denied'),
@ -326,7 +324,7 @@ function mailinglistsync_civicrm_postCommit(string $op, string $objectName, int
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$queue->createItem(new CRM_Queue_Task(
// callback
@ -347,7 +345,7 @@ function mailinglistsync_civicrm_postCommit(string $op, string $objectName, int
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$queue->createItem(new CRM_Queue_Task(
// callback
@ -374,7 +372,7 @@ function mailinglistsync_civicrm_postCommit(string $op, string $objectName, int
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$queue->createItem(new CRM_Queue_Task(
// callback
@ -395,7 +393,7 @@ function mailinglistsync_civicrm_postCommit(string $op, string $objectName, int
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$queue->createItem(new CRM_Queue_Task(
// callback
@ -416,7 +414,7 @@ function mailinglistsync_civicrm_postCommit(string $op, string $objectName, int
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$queue->createItem(new CRM_Queue_Task(
// callback
@ -451,7 +449,7 @@ function mailinglistsync_civicrm_postCommit(string $op, string $objectName, int
'type' => 'SqlParallel',
'is_autorun' => FALSE,
'reset' => FALSE,
'error' => 'abort',
'error' => 'drop',
]);
$queue->createItem(new CRM_Queue_Task(
// callback