diff --git a/DeskHub-Webseite/api/staff/v1/mail_fetch.php b/DeskHub-Webseite/api/staff/v1/mail_fetch.php new file mode 100644 index 00000000..826f7bdc --- /dev/null +++ b/DeskHub-Webseite/api/staff/v1/mail_fetch.php @@ -0,0 +1,24 @@ + $r['ok'], + 'level' => $r['level'], + 'message' => $r['message'], + 'processed' => $r['processed'], + 'newTickets' => $r['new_tickets'], + 'replies' => $r['replies'], + 'errors' => $r['errors'], + 'available' => mail_fetch_available($pdo), +]); diff --git a/DeskHub-Webseite/api/staff/v1/ticket.php b/DeskHub-Webseite/api/staff/v1/ticket.php index 0dcc0fcc..a5099e61 100644 --- a/DeskHub-Webseite/api/staff/v1/ticket.php +++ b/DeskHub-Webseite/api/staff/v1/ticket.php @@ -40,8 +40,9 @@ $threadStmt = $pdo->prepare( ORDER BY tt.created_at ASC, tt.id ASC' ); $threadStmt->execute([$ticket['id']]); +// Eingebettete Bilder einer Mail (Logos, Fotos im Text) gehören zur Darstellung der Nachricht und sind keine Anhänge $attachmentStmt = $pdo->prepare( - 'SELECT id, original_name, filesize FROM ticket_attachments WHERE thread_id = ? ORDER BY id' + 'SELECT id, original_name, filesize FROM ticket_attachments WHERE thread_id = ?' . (ticket_mail_html_ready($pdo) ? ' AND COALESCE(is_inline, 0) = 0' : '') . ' ORDER BY id' ); $commentStmt = $pdo->prepare( 'SELECT tc.id, tc.message, tc.created_at, s.id AS staff_id, s.name AS staff_name @@ -88,6 +89,8 @@ if ($ticket['source'] === 'chat' && $ticket['status'] !== 'closed') { } } +ticket_ack($pdo, (int) $ticket['id'], (int) $staff['id']); // gesehen: verschwindet aus dem Zähler der Apps + $summary = api_ticket_summary($ticket); $summary['source'] = $ticket['source']; $summary['firstResponseDueAt'] = $ticket['first_response_due_at']; diff --git a/DeskHub-Webseite/api/staff/v1/ticket_mail_reload.php b/DeskHub-Webseite/api/staff/v1/ticket_mail_reload.php new file mode 100644 index 00000000..ffa77233 --- /dev/null +++ b/DeskHub-Webseite/api/staff/v1/ticket_mail_reload.php @@ -0,0 +1,28 @@ + $r['added'], + 'inlineImages' => $r['inline'], + 'formatting' => $r['html'] > 0, + 'skipped' => $r['skipped'], + 'alreadyThere' => $r['existing'], + 'failed' => $r['failed'], +]);