@@ -464,19 +471,20 @@ STYLES;
*
* @param string $introText Custom intro text to display above the form
* @param string $theme Theme to use: 'hero' (default) or 'small'
+ * @param array $listUuids Optional Listmonk list UUIDs for this form (default: uses global config)
* @param string $formId Optional form ID for the section (default: 'newsletter')
* @return string The complete HTML for the newsletter signup section
*/
-function newsletter_signup(string $introText, string $theme = 'hero', string $formId = 'newsletter'): string {
+function newsletter_signup(string $introText, string $theme = 'hero', array $listUuids = [], string $formId = 'newsletter'): string {
$html = newsletterGetStyles();
switch ($theme) {
case 'small':
- $html .= newsletterRenderSmall($introText, $formId);
+ $html .= newsletterRenderSmall($introText, $formId, $listUuids);
break;
case 'hero':
default:
- $html .= newsletterRenderHero($introText, $formId);
+ $html .= newsletterRenderHero($introText, $formId, $listUuids);
break;
}
@@ -522,8 +530,20 @@ function newsletterHandleSubmission(): void {
exit;
}
+ // Parse per-form list UUIDs (if provided)
+ $listUuids = [];
+ if (!empty($_POST['newsletter_list_uuids'])) {
+ $raw = explode(',', $_POST['newsletter_list_uuids']);
+ foreach ($raw as $uuid) {
+ $uuid = trim($uuid);
+ if (preg_match('/^[0-9a-f\-]{36}$/i', $uuid)) {
+ $listUuids[] = $uuid;
+ }
+ }
+ }
+
// Subscribe
- $result = newsletterSubscribe($email, $name);
+ $result = newsletterSubscribe($email, $name, $listUuids);
if ($result['success']) {
$_SESSION['newsletter_last_submit'] = time();
diff --git a/custom/plugins/page/petition-form.php b/custom/plugins/page/petition-form.php
index 67aeec3..1beffa9 100644
--- a/custom/plugins/page/petition-form.php
+++ b/custom/plugins/page/petition-form.php
@@ -46,7 +46,7 @@ function petitionSanitizeCSV(string $value): string {
* Subscribe email to Listmonk newsletter lists via public API
* Listmonk handles double opt-in (sends its own confirmation email)
*/
-function petitionSubscribeToNewsletter(string $email, string $name): bool {
+function petitionSubscribeToNewsletter(string $email, string $name, array $listUuids = []): bool {
$configPath = dirname(__DIR__, 2) . '/listmonk-config.php';
if (!file_exists($configPath)) {
error_log("Listmonk config not found: {$configPath}");
@@ -59,13 +59,15 @@ function petitionSubscribeToNewsletter(string $email, string $name): bool {
return false;
}
+ $uuids = !empty($listUuids) ? $listUuids : $config['list_uuids'];
+
// Log the UUIDs being used
- error_log("Listmonk attempting subscription with UUIDs: " . implode(', ', $config['list_uuids']));
+ error_log("Listmonk attempting subscription with UUIDs: " . implode(', ', $uuids));
$payload = json_encode([
'email' => $email,
'name' => $name,
- 'list_uuids' => $config['list_uuids']
+ 'list_uuids' => $uuids
]);
$url = $config['url'] . '/api/public/subscription';
@@ -1238,6 +1240,9 @@ function petitionGetPageData(?Context $ctx): ?array {
// Use petition_title if set (for subpages), otherwise fall back to page title
$petitionTitle = $metadata['petition_title'] ?? $metadata['title'] ?? $petitionId;
$thankYouPage = $metadata['thank_you_page'] ?? 'takk';
+ $newsletterListUuids = !empty($metadata['newsletter_list_uuids'])
+ ? array_map('trim', explode(',', $metadata['newsletter_list_uuids']))
+ : [];
$formErrors = [];
$formData = ['firstname' => '', 'surname' => '', 'email' => '', 'region' => '', 'display' => 'semi'];
@@ -1472,7 +1477,7 @@ function petitionGetPageData(?Context $ctx): ?array {
error_log("Newsletter checkbox: " . ($newsletterOptIn ? 'checked' : 'not checked'));
if ($newsletterOptIn) {
$fullName = $formData['firstname'] . ' ' . $formData['surname'];
- petitionSubscribeToNewsletter($formData['email'], $fullName);
+ petitionSubscribeToNewsletter($formData['email'], $fullName, $newsletterListUuids);
}
$_SESSION['last_petition_submit'] = time();
diff --git a/docs/newsletter-plugin.md b/docs/newsletter-plugin.md
index a9fa898..fbccd3e 100644
--- a/docs/newsletter-plugin.md
+++ b/docs/newsletter-plugin.md
@@ -17,6 +17,7 @@ Then call from PHP content files:
```php
+
```
## Themes
@@ -29,11 +30,12 @@ Then call from PHP content files:
## Function Signature
```php
-newsletter_signup(string $introText, string $theme = 'hero', string $formId = 'newsletter'): string
+newsletter_signup(string $introText, string $theme = 'hero', array $listUuids = [], string $formId = 'newsletter'): string
```
- `$introText` - Displayed above the form
- `$theme` - `'hero'` or `'small'`
+- `$listUuids` - Listmonk list UUIDs for this form (empty = use global config)
- `$formId` - HTML id for the section (for anchor links)
## How It Works
@@ -58,6 +60,8 @@ return [
Uses Listmonk's **public** subscription API (`/api/public/subscription`). No authentication needed. Listmonk handles its own double opt-in flow.
+Per-form list UUIDs can be passed via `$listUuids` parameter. When empty, falls back to the global config's `list_uuids`.
+
## Anti-Spam
1. **CSRF token** - Separate from petition (`newsletter_csrf_token`)
@@ -71,7 +75,7 @@ All use `newsletter.*` prefix in language files:
- `newsletter.email_label`, `newsletter.email_placeholder`
- `newsletter.notice` (e.g., "We send about 12 emails per year")
- `newsletter.submit_button`
-- `newsletter.success_message`, `newsletter.error_message`
+- `newsletter.success_message`, `newsletter.success_confirm`, `newsletter.error_message`
## Static Resources