' . AppContext::e($title) . '
' . AppContext::e($monthLabel) . '
' .
+ return '
' . AppContext::e($title) . '
' . AppContext::e($monthLabel) . '
' .
'
' . render_weekday_headers($ctx) . '
' . $days . '
' .
'
' . AppContext::e($ctx->t('Selected')) . ': ' . AppContext::e($selectedDate) . '
' .
- '
' . AppContext::e($ctx->t('Time')) . '
' . $timeControl . '' .
+ '
' . $timeControl . '
' .
'
';
}
@@ -196,7 +417,7 @@ function render_calendar_days(string $name, string $selectedDate, DateTimeImmuta
continue;
}
$date = $monthStart->setDate((int)$monthStart->format('Y'), (int)$monthStart->format('m'), $day)->format('Y-m-d');
- if ($date < $minDate) {
+ if ($minDate !== '' && $date < $minDate) {
$html .= '
' . $day . ' | ';
$day++;
continue;
diff --git a/exec/handlers/create.php b/exec/handlers/create.php
index f44f77e..bdd2e70 100644
--- a/exec/handlers/create.php
+++ b/exec/handlers/create.php
@@ -3,24 +3,84 @@ declare(strict_types=1);
return static function (AppContext $ctx): void {
$errors = [];
+ $formRule = null;
+ $modal = '';
if (Http::isPost()) {
try {
$ctx->requireCsrf('create');
$input = normalize_rule_post($_POST);
$rule = attach_rule_scope($ctx, RuleValidator::validate($input, $ctx->settings));
- enforce_rule_backend_constraints($ctx, null, $rule);
- $created = $ctx->rules->create($ctx->daUser->username(), $rule);
- try {
- $ctx->syncActiveBackend();
- } catch (Throwable $syncError) {
- $ctx->rules->delete($ctx->daUser->username(), (string)$created['id']);
- throw $syncError;
+ $formRule = $rule;
+ $conflict = !empty($rule['enabled']) ? find_active_rule_conflict($ctx, null) : null;
+ $conflictAction = $ctx->post('conflict_action');
+ $conflictRuleId = $ctx->post('conflict_rule_id');
+
+ if ($conflict !== null && ($conflictAction !== 'replace' || $conflictRuleId !== (string)($conflict['id'] ?? ''))) {
+ $modal = render_create_conflict_modal($ctx, $rule, $conflict);
+ } else {
+ if (!empty($rule['enabled'])) {
+ $nativeAction = $ctx->post('native_conflict_action');
+ if ($nativeAction === 'disable_native') {
+ delete_untracked_native_da_vacations($ctx);
+ } else {
+ $nativeEntries = list_untracked_native_da_vacations($ctx);
+ if ($nativeEntries !== []) {
+ $extra = [];
+ if ($conflict !== null) {
+ $extra = [
+ 'conflict_action' => 'replace',
+ 'conflict_rule_id' => (string)($conflict['id'] ?? ''),
+ ];
+ }
+ $modal = render_native_vacation_conflict_modal($ctx, $rule, $nativeEntries, $extra);
+ $ctx->render('Add autoresponder', render_rule_form($ctx, 'create', $formRule) . $modal, [], $errors);
+ return;
+ }
+ }
+ }
+ if ($conflict !== null) {
+ create_rule_replacing_active($ctx, $rule, $conflict);
+ } else {
+ create_rule_with_sync($ctx, $rule);
+ }
+ Http::redirect($ctx->url('index.html', ['status' => 'created']));
}
- Http::redirect($ctx->url('index.html', ['status' => 'created']));
} catch (Throwable $e) {
PluginLogger::exception($e, 'CREATE');
$errors[] = $e->getMessage();
}
}
- $ctx->render('Add autoresponder', render_rule_form($ctx, 'create', null), [], $errors);
+ $ctx->render('Add autoresponder', render_rule_form($ctx, 'create', $formRule) . $modal, [], $errors);
};
+
+/** @param array
$rule */
+function create_rule_with_sync(AppContext $ctx, array $rule): array
+{
+ $created = $ctx->rules->create($ctx->daUser->username(), $rule);
+ try {
+ $ctx->syncDirectAdminVacations();
+ } catch (Throwable $syncError) {
+ $ctx->rules->delete($ctx->daUser->username(), (string)$created['id']);
+ throw $syncError;
+ }
+ return $created;
+}
+
+/** @param array $rule @param array $active */
+function create_rule_replacing_active(AppContext $ctx, array $rule, array $active): array
+{
+ $activeId = (string)($active['id'] ?? '');
+ if ($activeId === '') {
+ throw new RuntimeException($ctx->t('Rule not found'));
+ }
+ $ctx->rules->update($ctx->daUser->username(), $activeId, ['enabled' => false]);
+ $created = $ctx->rules->create($ctx->daUser->username(), $rule);
+ try {
+ $ctx->syncDirectAdminVacations();
+ } catch (Throwable $syncError) {
+ $ctx->rules->delete($ctx->daUser->username(), (string)$created['id']);
+ $ctx->rules->update($ctx->daUser->username(), $activeId, ['enabled' => true]);
+ throw $syncError;
+ }
+ return $created;
+}
diff --git a/exec/handlers/delete.php b/exec/handlers/delete.php
index c2a3516..37c480f 100644
--- a/exec/handlers/delete.php
+++ b/exec/handlers/delete.php
@@ -11,19 +11,16 @@ return static function (AppContext $ctx): void {
if (Http::isPost()) {
try {
$ctx->requireCsrf('delete:' . $id);
+ $deletedName = display_rule_name($ctx, $rule);
$ctx->rules->delete($ctx->daUser->username(), $id);
- $ctx->syncActiveBackend();
+ $ctx->syncDirectAdminVacations();
$ctx->audit->record('delete', $ctx->daUser->username(), ['rule_id' => $id, 'subject_prefix' => (string)($rule['subject_prefix'] ?? $rule['subject'] ?? '')]);
- Http::redirect($ctx->url('index.html', ['status' => 'deleted']));
+ Http::redirect($ctx->url('index.html', ['status' => 'deleted', 'name' => $deletedName]));
} catch (Throwable $e) {
PluginLogger::exception($e, 'DELETE');
$ctx->render('Confirm deletion', '' . AppContext::e($e->getMessage()) . '
');
return;
}
}
- $body = '' . AppContext::e($ctx->t('Preview autoresponder')) . '
' . render_preview_box($ctx, $rule) . '' .
- '
' . AppContext::e($ctx->t('Confirm deletion')) . '
' . AppContext::e($ctx->t('Deleting this rule will disable the automatic reply created by this rule for covered mailboxes.')) . '
' .
- '
' . AppContext::e($ctx->t('No global autoresponders')) . '
' .
- '
' . AppContext::e($ctx->t('All valid POP/IMAP mailboxes in this account')) . '
| ' . AppContext::e($ctx->t($enabled ? 'Enabled' : 'Disabled')) . ' | ';
- $rows .= '' . AppContext::e($subjectPrefix) . '
' . date('Y-m-d H:i', (int)($rule['updated_at'] ?? time())) . ' | ';
- $rows .= '' . AppContext::e(date('Y-m-d H:i', (int)$rule['start_ts'])) . '
' . AppContext::e($ctx->t('To')) . ' ' . AppContext::e(date('Y-m-d H:i', (int)$rule['end_ts'])) . ' | ';
- $rows .= '';
- $rows .= '' . AppContext::e($ctx->t('Edit')) . '';
- $rows .= '' . AppContext::e($ctx->t('Preview')) . '';
- $rows .= '';
- $rows .= '' . AppContext::e($ctx->t('Delete')) . '';
- $rows .= ' |
';
- }
-
- $body = '' . AppContext::e($ctx->t('Global autoresponders')) . '
' . AppContext::e($ctx->t('All valid POP/IMAP mailboxes in this account')) . '
' .
- '
| ' . AppContext::e($ctx->t('Status')) . ' | ' . AppContext::e($ctx->t('Subject prefix')) . ' | ' . AppContext::e($ctx->t('Sending period')) . ' | ' . AppContext::e($ctx->t('Actions')) . ' |
|---|
' . $rows . '
' . self::e($this->t('Dashboard')) . ' > ' . self::e($this->t('Global autoresponders')) . '
';
- echo '
';
+ echo '
' . self::e($this->t($title)) . '
';
echo '
';
echo '