From 7458dc7fae6a6f3e766c498ee889bbfe7d90cde9 Mon Sep 17 00:00:00 2001
From: Sebijk <git@sebijk.net>
Date: Sat, 11 Feb 2023 23:50:17 +0100
Subject: [PATCH] fix undefined array key

---
 src/admin/templates/optimize.db.tpl               |  2 +-
 .../modern/li/email.folder.contents.narrow.tpl    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/admin/templates/optimize.db.tpl b/src/admin/templates/optimize.db.tpl
index 611ec36..c58f0ed 100644
--- a/src/admin/templates/optimize.db.tpl
+++ b/src/admin/templates/optimize.db.tpl
@@ -1,7 +1,7 @@
 <fieldset>
 	<legend>{lng p="db"}</legend>
 	
-	{if $execute}
+	{if isset($execute)}
 		<table class="list">
 		<tr>
 			<th>&nbsp;</th>
diff --git a/src/templates/modern/li/email.folder.contents.narrow.tpl b/src/templates/modern/li/email.folder.contents.narrow.tpl
index ab0d55b..b206745 100644
--- a/src/templates/modern/li/email.folder.contents.narrow.tpl
+++ b/src/templates/modern/li/email.folder.contents.narrow.tpl
@@ -1,4 +1,4 @@
-{if !$smarty.get.tableOnly}<form name="f1" action="email.php?do=action&{$folderString}&sid={$sid}" onsubmit="transferSelectedMailIDs()" method="post">
+{if empty($smarty.get.tableOnly)}<form name="f1" action="email.php?do=action&{$folderString}&sid={$sid}" onsubmit="transferSelectedMailIDs()" method="post">
 <input type="hidden" name="selectedMailIDs" id="selectedMailIDs" value="" />
 
 <div id="contentHeader">
@@ -8,7 +8,7 @@
 	</div>
 
 	<div class="right">
-		{if $folderInfo.type!='intellifolder'&&!$folderInfo.readonly}
+		{if isset($folderInfo.type)&&$folderInfo.type!='intellifolder'&&empty($folderInfo.readonly)}
 		<button onclick="showFolderMenu(event);" type="button">
 			<i class="fa fa-gears fa-lg"></i>
 		</button>
@@ -18,7 +18,7 @@
 			<i class="fa fa-refresh fa-lg"></i>
 		</button>
 
-		{if !$folderInfo.readonly}<button onclick="folderViewOptions({$folderID});" type="button">
+		{if empty($folderInfo.readonly)}<button onclick="folderViewOptions({$folderID});" type="button">
 			<i class="fa fa-desktop fa-lg"></i>
 		</button>{/if}
 	</div>
@@ -39,7 +39,8 @@
 	{if $mailList}
 	{assign var=first value=true}
 	{foreach from=$mailList key=mailID item=mail}
-	{assign var=mailGroupID value=$mail.groupID}
+	{if isset($mail.groupID)}{assign var=mailGroupID value=$mail.groupID}
+	{else}{assign var=mailGroupID value=0}{/if}
 	{cycle values="listTableTR,listTableTR2" assign="class"}
 
 	{if $mailID<0}
@@ -90,7 +91,7 @@
 	{/if}
 
 </table>
-{if !$smarty.get.tableOnly}
+{if empty($smarty.get.tableOnly)}
 
 </div>
 
@@ -100,13 +101,13 @@
 			<option value="-">------ {lng p="selaction"} ------</option>
 
 			<optgroup label="{lng p="actions"}">
-			{if !$folderInfo.readonly}<option value="delete">{lng p="delete"}</option>{/if}
+			{if empty($folderInfo.readonly)}<option value="delete">{lng p="delete"}</option>{/if}
 				<option value="forward">{lng p="forward"}</option>
 				<option value="download">{lng p="download"}</option>
 				{hook id="email.folder.tpl:mailSelect.actions"}
 			</optgroup>
 
-			{if !$folderInfo.readonly}<optgroup label="{lng p="flags"}">
+			{if empty($folderInfo.readonly)}<optgroup label="{lng p="flags"}">
 				<option value="markread">{lng p="markread"}</option>
 				<option value="markunread">{lng p="markunread"}</option>
 				<option value="mark">{lng p="mark"}</option>