Skip to content

Commit 43b674e

Browse files
committed
fix(frontend/backend): do not show a 'save settings' link in the notice shown when a server is added while the save page is disabled
1 parent 247993a commit 43b674e

File tree

4 files changed

+32
-7
lines changed

4 files changed

+32
-7
lines changed

modules/core/functions.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,3 +780,8 @@ function getSettingsSectionOutput($section, $sectionLabel, $sectionIcon, $settin
780780
return $res;
781781
}
782782

783+
function isPageConfigured($page) {
784+
$pages = array_keys(Hm_Handler_Modules::dump());
785+
return in_array($page, $pages);
786+
}
787+

modules/core/handler_modules.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,11 @@ public function process() {
11791179
$this->out('imap_service_name', $provider);
11801180
}
11811181
$this->out('just_saved_credentials', true);
1182-
Hm_Msgs::add("Server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
1182+
if (isPageConfigured('save')) {
1183+
Hm_Msgs::add("Server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
1184+
} else {
1185+
Hm_Msgs::add("Server saved.");
1186+
}
11831187
}
11841188

11851189
if ($createProfile && $this->smtp_server_id && ($this->imap_server_id || $this->jmap_server_id)) {

modules/imap/handler_modules.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,8 +1456,12 @@ public function process() {
14561456
'type' => 'jmap',
14571457
'port' => false,
14581458
'tls' => false));
1459-
Hm_Msgs::add("Added server!. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
1460-
$this->session->record_unsaved('JMAP server added');
1459+
if (isPageConfigured('save')) {
1460+
Hm_Msgs::add("Added server!. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
1461+
$this->session->record_unsaved('JMAP server added');
1462+
} else {
1463+
Hm_Msgs::add('Added server!');
1464+
}
14611465
}
14621466
else {
14631467
Hm_Msgs::add('Could not access supplied URL', 'warning');
@@ -1613,8 +1617,12 @@ public function process() {
16131617
];
16141618
$this->user_config->set('special_imap_folders', $specials);
16151619
}
1616-
Hm_Msgs::add("EWS server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
1617-
$this->session->record_unsaved('EWS server added');
1620+
if (isPageConfigured('save')) {
1621+
Hm_Msgs::add("EWS server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
1622+
$this->session->record_unsaved('EWS server added');
1623+
} else {
1624+
Hm_Msgs::add('EWS server saved.');
1625+
}
16181626
$this->session->secure_cookie($this->request, 'hm_reload_folders', '1');
16191627
}
16201628
}

modules/nux/modules.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,11 @@ public function process() {
140140
));
141141
$this->session->record_unsaved('SMTP server added');
142142
}
143-
Hm_Msgs::add("E-mail account successfully added, To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
143+
if (isPageConfigured('save')) {
144+
Hm_Msgs::add("E-mail account successfully added, To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
145+
} else {
146+
Hm_Msgs::add("E-mail account successfully added.");
147+
}
144148
Hm_IMAP_List::clean_up();
145149
$this->session->del('nux_add_service_details');
146150
$this->session->record_unsaved('IMAP server added');
@@ -214,7 +218,11 @@ public function process() {
214218
$this->session->record_unsaved('IMAP server added');
215219
$this->session->record_unsaved('SMTP server added');
216220
$this->session->secure_cookie($this->request, 'hm_reload_folders', '1');
217-
Hm_Msgs::add("E-mail account successfully added, To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
221+
if (isPageConfigured('save')) {
222+
Hm_Msgs::add("E-mail account successfully added, To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
223+
} else {
224+
Hm_Msgs::add("E-mail account successfully added.");
225+
}
218226
$this->session->close_early();
219227
$this->out('nux_account_added', true);
220228
if ($this->module_is_supported('imap_folders')) {

0 commit comments

Comments
 (0)