Upload via GUI (360 Dateien)
This commit is contained in:
@@ -94,6 +94,7 @@ function send_mail_now(string $to, string $subject, string $htmlBody, ?string $f
|
||||
}
|
||||
|
||||
$headers = "MIME-Version: 1.0\r\n";
|
||||
$headers .= "X-DeskHub-Mail: 1\r\n"; // erkennt der E-Mail-Abruf wieder und macht daraus kein Ticket
|
||||
$headers .= "Content-type: text/html; charset=UTF-8\r\n";
|
||||
$headers .= "From: {$fromHeader}\r\n";
|
||||
|
||||
@@ -456,7 +457,7 @@ function notify_staff_new_ticket(array $ticket): void
|
||||
|
||||
if ($deptId) {
|
||||
$stmt = $pdo->prepare(
|
||||
"SELECT DISTINCT email FROM staff WHERE is_active = 1 AND (
|
||||
"SELECT DISTINCT id FROM staff WHERE is_active = 1 AND (
|
||||
role = 'admin'
|
||||
OR department_id = ?
|
||||
OR id IN (SELECT staff_id FROM staff_department WHERE department_id = ? AND notify = 1)
|
||||
@@ -464,9 +465,10 @@ function notify_staff_new_ticket(array $ticket): void
|
||||
);
|
||||
$stmt->execute([$deptId, $deptId]);
|
||||
} else {
|
||||
$stmt = $pdo->query("SELECT email FROM staff WHERE is_active = 1 AND role = 'admin'");
|
||||
$stmt = $pdo->query("SELECT id FROM staff WHERE is_active = 1 AND role = 'admin'");
|
||||
}
|
||||
$recipients = $stmt->fetchAll(PDO::FETCH_COLUMN);
|
||||
// Mitarbeiter im Urlaub: stattdessen bekommt ihre Vertretung die Mail
|
||||
$recipients = staff_emails_by_ids($pdo, vacation_expand_ids($pdo, $stmt->fetchAll(PDO::FETCH_COLUMN)));
|
||||
if (!$recipients) return;
|
||||
|
||||
[$subject, $body] = render_email_template('new_ticket_department', [
|
||||
@@ -487,7 +489,8 @@ function notify_staff_new_ticket(array $ticket): void
|
||||
/** Benachrichtigt alle aktiven Admins per E-Mail, wenn ein Ticket neu als überfällig erkannt wurde */
|
||||
function notify_admins_overdue_ticket(array $ticket): void
|
||||
{
|
||||
$admins = get_db()->query("SELECT email FROM staff WHERE is_active = 1 AND role = 'admin'")->fetchAll(PDO::FETCH_COLUMN);
|
||||
$pdo = get_db();
|
||||
$admins = staff_emails_by_ids($pdo, vacation_expand_ids($pdo, $pdo->query("SELECT id FROM staff WHERE is_active = 1 AND role = 'admin'")->fetchAll(PDO::FETCH_COLUMN)));
|
||||
if (!$admins) return;
|
||||
|
||||
[$subject, $body] = render_email_template('ticket_overdue', [
|
||||
@@ -502,3 +505,92 @@ function notify_admins_overdue_ticket(array $ticket): void
|
||||
email_send_and_log($email, $subject, $body, null, 'Ticket-überfällig-Mail', $ticket['ticket_number']);
|
||||
}
|
||||
}
|
||||
|
||||
// ── SLA-Überschreitung: nur an Betroffene ─────────────────────────────────────
|
||||
|
||||
/**
|
||||
* Wer bei einer SLA-Überschreitung eine Mail bekommt: der Bearbeiter des Tickets (ist er im Urlaub, seine Vertretung), sonst die
|
||||
* Mitarbeiter der Abteilung (Hauptabteilung oder zusätzliche Abteilung mit Benachrichtigung), ohne zugewiesenes Ticket und ohne Abteilungs-
|
||||
* Mitarbeiter die aktiven Administratoren. Nie die Postfach-Adresse der Abteilung: Sie wird vom E-Mail-Abruf gelesen und würde Tickets erzeugen.
|
||||
* @return list<string> E-Mail-Adressen
|
||||
*/
|
||||
function sla_overdue_recipients(PDO $pdo, array $ticket): array
|
||||
{
|
||||
$emails = [];
|
||||
$assignee = (int) ($ticket['assigned_staff_id'] ?? 0);
|
||||
if ($assignee > 0) {
|
||||
// Im Urlaub: an die Vertretung; ohne nutzbare Vertretung gar nicht an den Abwesenden (dann gehen die Abteilung bzw. die Administratoren vor)
|
||||
$target = staff_is_on_vacation($assignee) ? vacation_target($pdo, $assignee) : $assignee;
|
||||
if ($target !== null) {
|
||||
$q = $pdo->prepare('SELECT email FROM staff WHERE id = ? AND is_active = 1 AND is_on_vacation = 0');
|
||||
$q->execute([$target]);
|
||||
$e = $q->fetchColumn();
|
||||
if ($e) $emails[] = (string) $e;
|
||||
}
|
||||
}
|
||||
if (!$emails && !empty($ticket['department_id'])) {
|
||||
$q = $pdo->prepare(
|
||||
"SELECT DISTINCT id FROM staff WHERE is_active = 1 AND (department_id = ?
|
||||
OR id IN (SELECT staff_id FROM staff_department WHERE department_id = ? AND notify = 1))"
|
||||
);
|
||||
$q->execute([(int) $ticket['department_id'], (int) $ticket['department_id']]);
|
||||
$emails = staff_emails_by_ids($pdo, vacation_expand_ids($pdo, $q->fetchAll(PDO::FETCH_COLUMN)));
|
||||
}
|
||||
if (!$emails) {
|
||||
$emails = staff_emails_by_ids($pdo, vacation_expand_ids($pdo, $pdo->query("SELECT id FROM staff WHERE is_active = 1 AND role = 'admin'")->fetchAll(PDO::FETCH_COLUMN)));
|
||||
}
|
||||
$own = mail_own_system_addresses($pdo);
|
||||
$out = [];
|
||||
foreach ($emails as $e) {
|
||||
$e = trim($e);
|
||||
if ($e !== '' && filter_var($e, FILTER_VALIDATE_EMAIL) && !in_array(strtolower($e), $own, true)) $out[strtolower($e)] = $e;
|
||||
}
|
||||
return array_values($out);
|
||||
}
|
||||
|
||||
/** Sendet die SLA-Mail (Vorlage „ticket_overdue“) an die Betroffenen. Liefert die Zahl der Empfänger. */
|
||||
function notify_overdue_ticket_staff(array $ticket): int
|
||||
{
|
||||
$pdo = get_db();
|
||||
$recipients = sla_overdue_recipients($pdo, $ticket);
|
||||
if (!$recipients) return 0;
|
||||
[$subject, $body] = render_email_template('ticket_overdue', [
|
||||
'ticket_number' => $ticket['ticket_number'],
|
||||
'subject' => e($ticket['subject']),
|
||||
'department_name' => e($ticket['department_name'] ?? ''),
|
||||
'ticket_url' => base_url() . '/staff/ticket_view.php?n=' . urlencode($ticket['ticket_number']),
|
||||
], "SLA überschritten: Ticket #{ticket_number}", email_ticket_overdue_default_body());
|
||||
$body = email_wrap($body);
|
||||
foreach ($recipients as $email) email_send_and_log($email, $subject, $body, null, 'SLA-überschritten-Mail', $ticket['ticket_number']);
|
||||
return count($recipients);
|
||||
}
|
||||
|
||||
// ── Schutz vor Mail-Schleifen ────────────────────────────────────────────────
|
||||
|
||||
/** Adressen (klein geschrieben), von denen DeskHub selbst Mails verschickt: Standard-Absender und Absender-/Abteilungsadressen. */
|
||||
function mail_own_system_addresses(PDO $pdo): array
|
||||
{
|
||||
$out = [];
|
||||
$add = function ($a) use (&$out) {
|
||||
$a = strtolower(trim((string) $a));
|
||||
if ($a !== '' && str_contains($a, '@')) $out[$a] = true;
|
||||
};
|
||||
$add(get_setting('smtp_from_email', config()['mail']['from_email'] ?? ''));
|
||||
$add(config()['mail']['from_email'] ?? '');
|
||||
try {
|
||||
foreach ($pdo->query('SELECT email FROM email_addresses')->fetchAll(PDO::FETCH_COLUMN) as $a) $add($a);
|
||||
foreach ($pdo->query('SELECT email FROM departments')->fetchAll(PDO::FETCH_COLUMN) as $a) $add($a);
|
||||
} catch (Throwable $e) {
|
||||
}
|
||||
return array_keys($out);
|
||||
}
|
||||
|
||||
/**
|
||||
* Ist das eine Mail, die DeskHub selbst verschickt hat (und die über ein abgerufenes Postfach zurückkommt)? Daraus darf kein Ticket werden.
|
||||
* Erkennung: unsere Kopfzeile X-DeskHub-Mail oder ein Absender, der eine unserer eigenen Systemadressen ist.
|
||||
*/
|
||||
function mail_is_own_system_mail(PDO $pdo, string $fromEmail, string $rawHeader = ''): bool
|
||||
{
|
||||
if ($rawHeader !== '' && preg_match('/^X-DeskHub-Mail:/mi', $rawHeader)) return true;
|
||||
return in_array(strtolower(trim($fromEmail)), mail_own_system_addresses($pdo), true);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user