fixex conflict

This commit is contained in:
Torsten Schulz
2023-07-03 11:31:27 +02:00

View File

@@ -6,11 +6,11 @@ class Emailinbox extends Renderer {
private string $folder = 'INBOX'; private string $folder = 'INBOX';
public function __construct(?string $templateName = null) { public function __construct(?string $templateName = null) {
parent::__construct(); parent::__construct();
$this->folder = utf8_encode(urldecode(filter_input(INPUT_GET, 'folder'))) ?? 'INBOX'; $this->folder = utf8_encode(urldecode(filter_input(INPUT_GET, 'folder'))) ?? 'INBOX';
if (!$this->connectToImap($this->folder)) { if (!$this->connectToImap($this->folder)) {
$this->templateName = 'imaperror'; $this->templateName = 'imaperror';
} }
} }
protected function readEmailHeaders(): array { protected function readEmailHeaders(): array {
@@ -73,12 +73,9 @@ class Emailinbox extends Renderer {
$folders = $this->mbox->getMailboxes("*"); $folders = $this->mbox->getMailboxes("*");
$folderItems = []; $folderItems = [];
foreach ($folders as $folder) { foreach ($folders as $folder) {
$this->connectToImap();
$status = $this->mbox->statusMailbox($folder['fullpath']);
var_dump($status);
$item = '<li><a href="/emailinbox?folder=' . urlencode($folder['shortpath']) . '"' . $item = '<li><a href="/emailinbox?folder=' . urlencode($folder['shortpath']) . '"' .
(utf8_encode($folder['shortpath']) === $this->folder ? ' class="active-folder"' : '') . '>' . (utf8_encode($folder['shortpath']) === $this->folder ? ' class="active-folder"' : '') . '>' .
utf8_encode($folder['shortpath']) . '</a> (Neu: ' . $status->unseen . ')</li>'; utf8_encode($folder['shortpath']) . '</a></li>';
$folderItems[] = $item; $folderItems[] = $item;
} }
$this->content['folders'] = implode('', $folderItems); $this->content['folders'] = implode('', $folderItems);