Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Make double-optin page confirmation behaviour (pressing button) configurable.

Kailash Nadh45e85e3fb682
diff --git a/cmd/init.go b/cmd/init.go
index 7b2f7016..1c17daf5 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -85,6 +85,7 @@ type Config struct {
EnablePublicSubPage bool `koanf:"enable_public_subscription_page"`
EnablePublicArchive bool `koanf:"enable_public_archive"`
EnablePublicArchiveRSSContent bool `koanf:"enable_public_archive_rss_content"`
+ ShowOptinPage bool `koanf:"show_optin_page"`
Lang string `koanf:"lang"`
DBBatchSize int `koanf:"batch_size"`
Privacy struct {
diff --git a/cmd/public.go b/cmd/public.go
index 2e4ffc47..2c7e03b3 100644
--- a/cmd/public.go
+++ b/cmd/public.go
@@ -378,26 +378,8 @@ func (a *App) OptinPage(c echo.Context) error {
makeMsgTpl(a.i18n.T("public.noSubTitle"), "", a.i18n.Ts("public.noSubInfo")))
}
- // Confirm.
- if confirm {
- meta := models.JSON{}
- if a.cfg.Privacy.RecordOptinIP {
- if h := c.Request().Header.Get("X-Forwarded-For"); h != "" {
- meta["optin_ip"] = h
- } else if h := c.Request().RemoteAddr; h != "" {
- meta["optin_ip"] = strings.Split(h, ":")[0]
- }
- }
-
- // Confirm subscriptions in the DB.
- if err := a.core.ConfirmOptionSubscription(subUUID, req.ListUUIDs, meta); err != nil {
- a.log.Printf("error unsubscribing: %v", err)
- return c.Render(http.StatusInternalServerError, tplMessage,
- makeMsgTpl(a.i18n.T("public.errorTitle"), "", a.i18n.Ts("public.errorProcessingRequest")))
- }
-
- return c.Render(http.StatusOK, tplMessage,
- makeMsgTpl(a.i18n.T("public.subConfirmedTitle"), "", a.i18n.Ts("public.subConfirmed")))
+ if confirm || !a.cfg.ShowOptinPage {
+ return a.confirmOptinSubscription(c, subUUID, req.ListUUIDs, lists)
}
var out optinTpl
@@ -408,6 +390,33 @@ func (a *App) OptinPage(c echo.Context) error {
return c.Render(http.StatusOK, "optin", out)
}
+func (a *App) confirmOptinSubscription(c echo.Context, subUUID string, listUUIDs []string, lists []models.List) error {
+ if len(listUUIDs) == 0 {
+ listUUIDs = make([]string, 0, len(lists))
+ for _, l := range lists {
+ listUUIDs = append(listUUIDs, l.UUID)
+ }
+ }
+
+ meta := models.JSON{}
+ if a.cfg.Privacy.RecordOptinIP {
+ if h := c.Request().Header.Get("X-Forwarded-For"); h != "" {
+ meta["optin_ip"] = h
+ } else if h := c.Request().RemoteAddr; h != "" {
+ meta["optin_ip"] = strings.Split(h, ":")[0]
+ }
+ }
+
+ if err := a.core.ConfirmOptionSubscription(subUUID, listUUIDs, meta); err != nil {
+ a.log.Printf("error confirming opt-in subscription: %v", err)
+ return c.Render(http.StatusInternalServerError, tplMessage,
+ makeMsgTpl(a.i18n.T("public.errorTitle"), "", a.i18n.Ts("public.errorProcessingRequest")))
+ }
+
+ return c.Render(http.StatusOK, tplMessage,
+ makeMsgTpl(a.i18n.T("public.subConfirmedTitle"), "", a.i18n.Ts("public.subConfirmed")))
+}
+
// SubscriptionFormPage handles subscription requests coming from public
// HTML subscription forms.
func (a *App) SubscriptionFormPage(c echo.Context) error {
diff --git a/frontend/src/views/settings/general.vue b/frontend/src/views/settings/general.vue
index 5bd15dd2..5f882fcc 100644
--- a/frontend/src/views/settings/general.vue
+++ b/frontend/src/views/settings/general.vue
@@ -60,6 +60,11 @@
<b-switch v-model="data['app.send_optin_confirmation']" name="app.send_optin_confirmation" />
</b-field>
</div>
+ <div class="column is-4">
+ <b-field :label="$t('settings.general.showOptinPage')" :message="$t('settings.general.showOptinPageHelp')">
+ <b-switch v-model="data['app.show_optin_page']" name="app.show_optin_page" />
+ </b-field>
+ </div>
</div>
</div>
<hr />
diff --git a/i18n/en.json b/i18n/en.json
index ffe3135b..9c68a61e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -439,6 +439,8 @@
"settings.general.rootURLHelp": "Public URL of the installation (no trailing slash).",
"settings.general.sendOptinConfirm": "Send opt-in confirmation",
"settings.general.sendOptinConfirmHelp": "Send an opt-in confirmation e-mail when subscribers signup via the public form or when they are added by the admin.",
+ "settings.general.showOptinPage": "Ask for double opt-in confirmation",
+ "settings.general.showOptinPageHelp": "Ask subscribers to confirm once they land on the double opt-in page instead of confirming automatically.",
"settings.general.siteName": "Site name",
"settings.invalidMessengerName": "Invalid messenger name.",
"settings.mailserver.authProtocol": "Auth protocol",
diff --git a/internal/migrations/v6.2.0.go b/internal/migrations/v6.2.0.go
index 4ef41a9e..5e3dedc4 100644
--- a/internal/migrations/v6.2.0.go
+++ b/internal/migrations/v6.2.0.go
@@ -40,5 +40,9 @@ func V6_2_0(db *sqlx.DB, fs stuffbin.FileSystem, ko *koanf.Koanf, lo *log.Logger
return err
}
+ if _, err := db.Exec(`INSERT INTO settings (key, value) VALUES ('app.show_optin_page', 'true') ON CONFLICT (key) DO NOTHING `); err != nil {
+ return err
+ }
+
return nil
}
diff --git a/models/settings.go b/models/settings.go
index 74915308..048195c2 100644
--- a/models/settings.go
+++ b/models/settings.go
@@ -13,6 +13,7 @@ type Settings struct {
EnablePublicSubPage bool `json:"app.enable_public_subscription_page"`
EnablePublicArchive bool `json:"app.enable_public_archive"`
EnablePublicArchiveRSSContent bool `json:"app.enable_public_archive_rss_content"`
+ ShowOptinPage bool `json:"app.show_optin_page"`
SendOptinConfirmation bool `json:"app.send_optin_confirmation"`
CheckUpdates bool `json:"app.check_updates"`
AppLang string `json:"app.lang"`
diff --git a/schema.sql b/schema.sql
index a971463c..6c4ab488 100644
--- a/schema.sql
+++ b/schema.sql
@@ -243,6 +243,7 @@ INSERT INTO settings (key, value) VALUES
('app.cache_slow_queries_interval', '"0 3 * * *"'),
('app.enable_public_archive', 'true'),
('app.enable_public_subscription_page', 'true'),
+ ('app.show_optin_page', 'true'),
('app.enable_public_archive_rss_content', 'true'),
('app.send_optin_confirmation', 'true'),
('app.check_updates', 'true'),