diff --git a/api.php b/api.php
index 1957565..e8037c1 100644
--- a/api.php
+++ b/api.php
@@ -3227,12 +3227,26 @@ switch ($action) {
if (($art['content_type'] ?? '') === 'text/html') {
$body = strip_tags($body, '
- ');
}
+ // Liitteiden metadata
+ $attJson = '';
+ if (!empty($art['attachments'])) {
+ $atts = [];
+ foreach ($art['attachments'] as $att) {
+ $atts[] = [
+ 'id' => $att['id'] ?? 0,
+ 'filename' => $att['filename'] ?? '',
+ 'size' => $att['size'] ?? 0,
+ 'type' => $att['preferences']['Content-Type'] ?? ($att['content_type'] ?? 'application/octet-stream'),
+ ];
+ }
+ $attJson = json_encode($atts);
+ }
_dbExecute(
- "INSERT INTO ticket_messages (id, ticket_id, type, from_email, from_name, body, timestamp, message_id, zammad_article_id)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ "INSERT INTO ticket_messages (id, ticket_id, type, from_email, from_name, body, timestamp, message_id, zammad_article_id, attachments)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
[$msgId, $ticket['id'], $msgType, $art['from'] ?? '', $art['from'] ?? '', $body,
$art['created_at'] ? date('Y-m-d H:i:s', strtotime($art['created_at'])) : date('Y-m-d H:i:s'),
- $art['message_id'] ?? '', $artId]
+ $art['message_id'] ?? '', $artId, $attJson]
);
}
// Tallenna Zammad to-osoite tikettiin
@@ -5410,8 +5424,13 @@ switch ($action) {
try {
$articles = $z->getArticles($zammadId);
+ $toEmail = '';
foreach ($articles as $art) {
if (($art['internal'] ?? false)) continue;
+ // Poimi zammad_to_email ensimmäisestä asiakkaan viestistä
+ if (!$toEmail && ($art['sender'] ?? '') === 'Customer' && !empty($art['to'])) {
+ $toEmail = $art['to'];
+ }
$artId = (int)$art['id'];
$existingMsg = dbGetMessageByZammadArticleId($ticketId, $artId);
if ($existingMsg) continue;
@@ -5423,18 +5442,38 @@ switch ($action) {
$body = strip_tags($body, '
- ');
}
+ // Liitteiden metadata
+ $attJson = '';
+ if (!empty($art['attachments'])) {
+ $atts = [];
+ foreach ($art['attachments'] as $att) {
+ $atts[] = [
+ 'id' => $att['id'] ?? 0,
+ 'filename' => $att['filename'] ?? '',
+ 'size' => $att['size'] ?? 0,
+ 'type' => $att['preferences']['Content-Type'] ?? ($att['content_type'] ?? 'application/octet-stream'),
+ ];
+ }
+ $attJson = json_encode($atts);
+ }
+
_dbExecute(
- "INSERT INTO ticket_messages (id, ticket_id, type, from_email, from_name, body, timestamp, message_id, zammad_article_id)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ "INSERT INTO ticket_messages (id, ticket_id, type, from_email, from_name, body, timestamp, message_id, zammad_article_id, attachments)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
[$msgId, $ticketId, $msgType,
$art['from'] ?? '', $art['from'] ?? '',
$body,
$art['created_at'] ? date('Y-m-d H:i:s', strtotime($art['created_at'])) : date('Y-m-d H:i:s'),
$art['message_id'] ?? '',
- $artId]
+ $artId,
+ $attJson]
);
$messagesAdded++;
}
+ // Tallenna zammad_to_email
+ if ($toEmail) {
+ _dbExecute("UPDATE tickets SET zammad_to_email = ? WHERE id = ?", [$toEmail, $ticketId]);
+ }
} catch (\Throwable $e) {
// Artikkelihaku epäonnistui — jatka silti
error_log("Zammad articles error for ticket $zammadId: " . $e->getMessage());
@@ -5454,6 +5493,65 @@ switch ($action) {
}
break;
+ case 'zammad_attachment':
+ requireAuth();
+ $companyId = requireCompanyOrParam();
+ $ticketId = $_GET['ticket_id'] ?? '';
+ $articleId = (int)($_GET['article_id'] ?? 0);
+ $attachmentId = (int)($_GET['attachment_id'] ?? 0);
+ if (!$ticketId || !$articleId || !$attachmentId) {
+ http_response_code(400);
+ echo json_encode(['error' => 'Puuttuvat parametrit (ticket_id, article_id, attachment_id)']);
+ break;
+ }
+ // Varmista että tiketti kuuluu yritykselle
+ $ticket = _dbFetch("SELECT * FROM tickets WHERE id = ? AND company_id = ?", [$ticketId, $companyId]);
+ if (!$ticket || empty($ticket['zammad_ticket_id'])) {
+ http_response_code(404);
+ echo json_encode(['error' => 'Tikettiä ei löydy']);
+ break;
+ }
+ try {
+ $integ = dbGetIntegration($companyId, 'zammad');
+ if (!$integ || !$integ['enabled']) {
+ http_response_code(400);
+ echo json_encode(['error' => 'Zammad-integraatio ei käytössä']);
+ break;
+ }
+ // Lataa liite Zammad API:sta (binary download)
+ $zUrl = rtrim($integ['config']['url'], '/');
+ if (!preg_match('#^https?://#i', $zUrl)) $zUrl = 'https://' . $zUrl;
+ $zToken = $integ['config']['token'];
+ $url = "{$zUrl}/api/v1/ticket_attachment/{$ticket['zammad_ticket_id']}/{$articleId}/{$attachmentId}";
+ $ch = curl_init($url);
+ curl_setopt_array($ch, [
+ CURLOPT_RETURNTRANSFER => true,
+ CURLOPT_TIMEOUT => 60,
+ CURLOPT_HTTPHEADER => [
+ 'Authorization: Token token=' . $zToken,
+ ],
+ ]);
+ $fileData = curl_exec($ch);
+ $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+ curl_close($ch);
+ if ($httpCode >= 400 || $fileData === false) {
+ http_response_code(502);
+ echo json_encode(['error' => 'Liitteen lataus Zammadista epäonnistui (HTTP ' . $httpCode . ')']);
+ break;
+ }
+ // Hae tiedostonimi metadata:sta
+ $filename = $_GET['filename'] ?? 'attachment';
+ header('Content-Type: ' . ($contentType ?: 'application/octet-stream'));
+ header('Content-Disposition: attachment; filename="' . addslashes($filename) . '"');
+ header('Content-Length: ' . strlen($fileData));
+ echo $fileData;
+ } catch (\Throwable $e) {
+ http_response_code(500);
+ echo json_encode(['error' => $e->getMessage()]);
+ }
+ break;
+
case 'zammad_reply':
$companyId = requireCompany();
$input = json_decode(file_get_contents('php://input'), true);
diff --git a/db.php b/db.php
index 964ec9d..0d5645b 100644
--- a/db.php
+++ b/db.php
@@ -679,6 +679,7 @@ function initDatabase(): void {
"ALTER TABLE availability_queries ADD COLUMN org VARCHAR(255) DEFAULT '' AFTER hostname",
"ALTER TABLE tickets ADD COLUMN to_email VARCHAR(255) DEFAULT '' AFTER from_name",
"ALTER TABLE tickets ADD COLUMN bcc TEXT DEFAULT '' AFTER cc",
+ "ALTER TABLE ticket_messages ADD COLUMN attachments TEXT DEFAULT '' AFTER zammad_article_id",
];
foreach ($alters as $sql) {
try { $db->query($sql); } catch (\Throwable $e) { /* sarake on jo olemassa / jo ajettu */ }
@@ -1406,7 +1407,7 @@ function dbLoadTickets(string $companyId): array {
// Viestit
$msgs = _dbFetchAll("SELECT * FROM ticket_messages WHERE ticket_id = ? ORDER BY timestamp", [$t['id']]);
$t['messages'] = array_map(function($m) {
- return [
+ $msg = [
'id' => $m['id'],
'type' => $m['type'],
'from' => $m['from_email'],
@@ -1415,6 +1416,15 @@ function dbLoadTickets(string $companyId): array {
'timestamp' => $m['timestamp'],
'message_id' => $m['message_id'] ?? '',
];
+ // Liitteiden metadata (JSON)
+ if (!empty($m['attachments'])) {
+ $msg['attachments'] = json_decode($m['attachments'], true) ?: [];
+ }
+ // Zammad article ID (tarvitaan liitteiden lataukseen)
+ if (!empty($m['zammad_article_id'])) {
+ $msg['zammad_article_id'] = (int)$m['zammad_article_id'];
+ }
+ return $msg;
}, $msgs);
// Tagit
diff --git a/index.html b/index.html
index 9a25001..21a21cd 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
Noxus HUB
-
+
@@ -2271,6 +2271,6 @@