X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/68acff62101e1c302e55befa6d526c46f15da464..6adf9d299fe0f6079b1caab7bc461d59ca4898ca:/mail/index.php

diff --git a/mail/index.php b/mail/index.php
index d8195f6..2b6e600 100644
--- a/mail/index.php
+++ b/mail/index.php
@@ -2,6 +2,7 @@
 $mailbox = 'mail/inbox';
 @list ($msgid) = explode('/', ltrim($Page->path, '/'));
 
+if (!function_exists('parsemailhead')) {
 function parsemailhead($headerdata)
 {
 	$headlist = iconv_mime_decode_headers($headerdata, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
@@ -12,9 +13,14 @@ function parsemailhead($headerdata)
 	});
 	return $headlist;
 }
+}
 
 if ($msgid) {
 	$filename = "$mailbox/$msgid";
+	if (!is_readable($filename)) {
+		return TRUE;
+	}
+
 	list ($headerdata, $rawbody) = explode("\n\n", file_get_contents($filename), 2);
 	$head = parsemailhead($headerdata);
 	$head['date']->setTimezone(new DateTimeZone(date_default_timezone_get()));
@@ -49,6 +55,9 @@ if ($msgid) {
 	return;
 }
 
+if (!$User) {
+	return;
+}
 if (!$User->admin('user')) {
 	http_response_code(403);
 	$Page->place['warn'] = "Geen gebruikersrechten om e-mails in te zien.";
@@ -93,8 +102,6 @@ foreach (array_reverse($rows) as $filename) {
 }
 print "</ul>\n";
 
-print $Page->widget('nav', [
-	"start=$nav[start]", "n=$nav[n]", "total=$nav[total]",
-]);
+print $Page->widget('nav', $nav);
 
 $Page->place['maillist'] = ob_get_clean();