AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-26 15:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the UTF7 to 8 Encoding as it broke Thunderbird email parsing, somehow Roundcube webmail was fine

Browse Source
This commit is contained in:
johnnyq
2024-06-28 17:21:43 -04:00
parent 6bdfe1b713
commit f133981b52
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cron_ticket_email_parser.php
View File

@@ -320,8 +320,7 @@ $client = $clientManager->make([
'validate_cert' => true, 'validate_cert' => true,
'username' => $config_imap_username, 'username' => $config_imap_username,
'password' => $config_imap_password, 'password' => $config_imap_password,
'protocol' => 'imap', 'protocol' => 'imap'
'charset' => 'UTF-8' // Add charset to avoid encoding issues
]); ]);
// Connect to the IMAP server // Connect to the IMAP server
@@ -346,17 +345,11 @@ function getInboxFolder($client, $inboxNames) {
throw new Exception("No inbox folder found."); throw new Exception("No inbox folder found.");
} }
// Function to convert UTF-7 IMAP to UTF-8
function convertToUtf8($text) {
return mb_convert_encoding($text, 'UTF-8', 'UTF7-IMAP');
}
try { try {
$inbox = getInboxFolder($client, $inboxNames); $inbox = getInboxFolder($client, $inboxNames);
$messages = $inbox->query()->unseen()->get(); $messages = $inbox->query()->unseen()->get();
} catch (Exception $e) { } catch (Exception $e) {
echo "Error: " . $e->getMessage(); echo "Error: " . $e->getMessage();
$messages = collect(); // Ensure $messages is defined as an empty collection
} }
if ($messages->count() > 0) { if ($messages->count() > 0) {
@@ -376,11 +369,6 @@ if ($messages->count() > 0) {
$subject = sanitizeInput($message->getSubject() ?? 'No Subject'); $subject = sanitizeInput($message->getSubject() ?? 'No Subject');
$date = sanitizeInput($message->getDate() ?? date('Y-m-d H:i:s')); $date = sanitizeInput($message->getDate() ?? date('Y-m-d H:i:s'));
// Convert message bodies from UTF-7 to UTF-8 if needed
$html_body = convertToUtf8($message->getHtmlBody() ?? '');
$text_body = convertToUtf8($message->getTextBody() ?? '');
$message_body = $message->getHtmlBody() ?? ''; $message_body = $message->getHtmlBody() ?? '';
if (empty($message_body)) { if (empty($message_body)) {
@@ -444,12 +432,10 @@ if ($messages->count() > 0) {
unlink("uploads/tmp/{$original_message_file}"); unlink("uploads/tmp/{$original_message_file}");
} }
} }
} else {
echo "No unseen messages found.";
} }
$client->expunge(); $client->expunge();
$client->disconnect(); $client->disconnect();
// Remove the lock file // Remove the lock file
unlink($lock_file_path); unlink($lock_file_path);