From 47c293b4366f3339bac578b44fe8491843064ebe Mon Sep 17 00:00:00 2001
From: Sebijk <git@sebijk.net>
Date: Fri, 9 Dec 2022 09:49:08 +0100
Subject: [PATCH] fix a lot of undefined variable and index

---
 src/admin/templates/login.tpl                 |  4 +-
 src/admin/templates/page.tpl                  |  2 +-
 src/admin/templates/users.create.tpl          | 36 ++++++------
 src/admin/templates/users.edit.tpl            |  6 +-
 src/admin/templates/users.list.tpl            |  2 +-
 src/admin/templates/welcome.tpl               |  2 +-
 src/index.php                                 |  3 +
 src/m/calendar.php                            |  1 +
 src/m/contacts.php                            |  1 +
 src/m/email.php                               |  1 +
 src/m/index.php                               |  5 ++
 src/m/tasks.php                               |  1 +
 src/m/webdisk.php                             |  1 +
 src/templates/modern/li/email.folder.tpl      |  2 +-
 src/templates/modern/li/email.toolbar.tpl     |  2 +-
 src/templates/modern/li/index.tpl             |  6 +-
 .../modern/li/organizer.addressbook.edit.tpl  | 58 +++++++++----------
 .../li/organizer.addressbook.editgroup.tpl    |  2 +-
 .../modern/li/organizer.notes.edit.tpl        | 14 ++---
 src/templates/modern/li/organizer.notes.tpl   |  2 +-
 .../modern/li/organizer.todo.edit.tpl         | 12 ++--
 src/templates/modern/li/prefs.contact.tpl     |  4 +-
 src/templates/modern/li/prefs.membership.tpl  |  2 +-
 src/templates/modern/li/prefs.sidebar.tpl     |  2 +-
 .../modern/li/prefs.signatures.edit.tpl       |  6 +-
 src/templates/modern/li/prefs.start.tpl       |  4 +-
 src/templates/modern/li/search.results.tpl    |  2 +-
 src/templates/modern/li/start.page.tpl        |  2 +-
 src/templates/modern/m/login.tpl              |  6 +-
 src/templates/modern/nli/imprint.tpl          | 14 ++---
 src/templates/modern/nli/index.tpl            |  2 +-
 src/webdisk.php                               |  1 +
 32 files changed, 111 insertions(+), 97 deletions(-)
diff --git a/src/admin/templates/login.tpl b/src/admin/templates/login.tpl
index 6083e12..46b4f23 100644
--- a/src/admin/templates/login.tpl
+++ b/src/admin/templates/login.tpl
@@ -20,13 +20,13 @@
 <body onload="EBID('username').focus();" id="loginBody">
 	
 	<form action="index.php?action=login" method="post" autocomplete="off">
-		{if $jump}<input type="hidden" id="jump" name="jump" value="{text value=$jump allowEmpty=true}" />{/if}
+		{if isset($jump)}<input type="hidden" id="jump" name="jump" value="{text value=$jump allowEmpty=true}" />{/if}
 		<input type="hidden" name="timezone" id="timezone" value="{$timezone}" />
 		
 		<div id="loginBox1">
 			<div id="loginBox2">
 				<div id="loginBox3">
-					{if $error}<div class="loginError">{$error}</div>{/if}
+					{if isset($error)}<div class="loginError">{$error}</div>{/if}
 				
 					<div id="loginLogo">
 						<img src="templates/images/logo_letter.png" style="width:90px;height:53px;" border="0" alt="" />
diff --git a/src/admin/templates/page.tpl b/src/admin/templates/page.tpl
index 118dfb9..cbcbc44 100644
--- a/src/admin/templates/page.tpl
+++ b/src/admin/templates/page.tpl
@@ -75,7 +75,7 @@
 							<li><a href="prefs.countries.php?sid={$sid}"><img src="./templates/images/country.png" />{lng p="countries"}</a></li>
 							<li><a href="prefs.widgetlayouts.php?sid={$sid}"><img src="./templates/images/wlayout_add.png" />{lng p="widgetlayouts"}</a></li>
 							<li><a href="prefs.payments.php?sid={$sid}"><img src="./templates/images/ico_prefs_payments.png" />{lng p="payments"}</a></li>
-							{if $toolbox_serverurl!=''}<li><a href="toolbox.php?sid={$sid}"><img src="./templates/images/toolbox.png" />{lng p="toolbox"}</a></li>{/if}
+							{if !empty($toolbox_serverurl)}<li><a href="toolbox.php?sid={$sid}"><img src="./templates/images/toolbox.png" />{lng p="toolbox"}</a></li>{/if}
 						</ul>
 					</li>
 					{/if}
diff --git a/src/admin/templates/users.create.tpl b/src/admin/templates/users.create.tpl
index b90951c..699fcb0 100644
--- a/src/admin/templates/users.create.tpl
+++ b/src/admin/templates/users.create.tpl
@@ -8,7 +8,7 @@
 					<table width="100%">
 						<tr>
 							<td class="td1" width="115">{lng p="email"}:</td>
-							<td class="td2"><input type="text" name="email" value="{text value=$user.email allowEmpty=true}" style="width:40%;" />
+							<td class="td2"><input type="text" name="email" value="{if isset($user.email)}{text value=$user.email allowEmpty=true}{/if}" style="width:40%;" />
 											<select name="emailDomain">
 											{foreach from=$domainList item=domain}
 												<option value="{$domain}">@{domain value=$domain}</option>
@@ -25,21 +25,21 @@
 						</tr>
 						<tr>
 							<td class="td1">{lng p="firstname"}:</td>
-							<td class="td2"><input type="text" name="vorname" value="{text value=$user.vorname allowEmpty=true}" style="width:85%;" /></td>
+							<td class="td2"><input type="text" name="vorname" value="{if isset($user.vorname)}{text value=$user.vorname allowEmpty=true}{/if}" style="width:85%;" /></td>
 						</tr>
 						<tr>
 							<td class="td1">{lng p="lastname"}:</td>
-							<td class="td2"><input type="text" name="nachname" value="{text value=$user.nachname allowEmpty=true}" style="width:85%;" /></td>
+							<td class="td2"><input type="text" name="nachname" value="{if isset($user.nachname)}{text value=$user.nachname allowEmpty=true}{/if}" style="width:85%;" /></td>
 						</tr>
 						<tr>
 							<td class="td1">{lng p="streetno"}:</td>
-							<td class="td2"><input type="text" name="strasse" value="{text value=$user.strasse allowEmpty=true}" style="width:55%;" />
-											<input type="text" name="hnr" value="{text value=$user.hnr allowEmpty=true}" style="width:15%;" /></td>
+							<td class="td2"><input type="text" name="strasse" value="{if isset($user.strasse)}{text value=$user.strasse allowEmpty=true}{/if}" style="width:55%;" />
+											<input type="text" name="hnr" value="{if isset($user.hnr)}{text value=$user.hnr allowEmpty=true}{/if}" style="width:15%;" /></td>
 						</tr>
 						<tr>
 							<td class="td1">{lng p="zipcity"}:</td>
-							<td class="td2"><input type="text" name="plz" value="{text value=$user.plz allowEmpty=true}" style="width:20%;" />
-											<input type="text" name="ort" value="{text value=$user.ort allowEmpty=true}" style="width:50%;" /></td>
+							<td class="td2"><input type="text" name="plz" value="{if isset($user.plz)}{text value=$user.plz allowEmpty=true}{/if}" style="width:20%;" />
+											<input type="text" name="ort" value="{if isset($user.ort)}{text value=$user.ort allowEmpty=true}{/if}" style="width:50%;" /></td>
 						</tr>
 						<tr>
 							<td class="td1">{lng p="country"}:</td>
@@ -51,19 +51,19 @@
 						</tr>
 						<tr>
 							<td class="td1">{lng p="tel"}:</td>
-							<td class="td2"><input type="text" name="tel" value="{text value=$user.tel allowEmpty=true}" style="width:85%;" /></td>
+							<td class="td2"><input type="text" name="tel" value="{if isset($user.tel)}{text value=$user.tel allowEmpty=true}{/if}" style="width:85%;" /></td>
 						</tr>
 						<tr>
 							<td class="td1">{lng p="fax"}:</td>
-							<td class="td2"><input type="text" name="fax" value="{text value=$user.fax allowEmpty=true}" style="width:85%;" /></td>
+							<td class="td2"><input type="text" name="fax" value="{if isset($user.fax)}{text value=$user.fax allowEmpty=true}{/if}" style="width:85%;" /></td>
 						</tr>
 						<tr>
 							<td class="td1">{lng p="cellphone"}:</td>
-							<td class="td2"><input type="text" name="mail2sms_nummer" value="{text value=$user.mail2sms_nummer allowEmpty=true}" style="width:85%;" /></td>
+							<td class="td2"><input type="text" name="mail2sms_nummer" value="{if isset($user.mail2sms_nummer)}{text value=$user.mail2sms_nummer allowEmpty=true}{/if}" style="width:85%;" /></td>
 						</tr>
 						<tr>
 							<td class="td1">{lng p="altmail"}:</td>
-							<td class="td2"><input type="text" name="altmail" value="{text value=$user.altmail allowEmpty=true}" style="width:85%;" /></td>
+							<td class="td2"><input type="text" name="altmail" value="{if isset($user.altmail)}{text value=$user.altmail allowEmpty=true}{/if}" style="width:85%;" /></td>
 						</tr>
 						
 						{foreach from=$profileFields item=profileField}
@@ -72,9 +72,9 @@
 							<td class="td1">{$profileField.title}:</td>
 							<td class="td2">
 								{if $profileField.type==1}
-									<input type="text" name="field_{$profileField.id}" value="{text value=$profileField.value allowEmpty=true}" style="width:85%;" />
+									<input type="text" name="field_{$profileField.id}" value="{if isset($profileField.value)}{text value=$profileField.value allowEmpty=true}{/if}" style="width:85%;" />
 								{elseif $profileField.type==2}
-									<input type="checkbox" name="field_{$profileField.id}"{if $profileField.value} checked="checked"{/if} />
+									<input type="checkbox" name="field_{$profileField.id}"{if isset($profileField.value)} checked="checked"{/if} />
 								{elseif $profileField.type==4}
 									<select name="field_{$profileField.id}">
 									{foreach from=$profileField.extra item=item}
@@ -112,10 +112,10 @@
 						<tr>
 							<td class="td1">{lng p="status"}:</td>
 							<td class="td2"><select name="gesperrt">
-								<option value="no"{if $user.gesperrt=='no'} selected="selected"{/if}>{lng p="active"}</option>
-								<option value="yes"{if $user.gesperrt=='yes'} selected="selected"{/if}>{lng p="locked"}</option>
-								<option value="locked"{if $user.gesperrt=='locked'} selected="selected"{/if}>{lng p="notactivated"}</option>
-								<option value="delete"{if $user.gesperrt=='delete'} selected="selected"{/if}>{lng p="deleted"}</option>
+								<option value="no"{if isset($user.gesperrt) && $user.gesperrt=='no'} selected="selected"{/if}>{lng p="active"}</option>
+								<option value="yes"{if isset($user.gesperrt) && $user.gesperrt=='yes'} selected="selected"{/if}>{lng p="locked"}</option>
+								<option value="locked"{if isset($user.gesperrt) && $user.gesperrt=='locked'} selected="selected"{/if}>{lng p="notactivated"}</option>
+								<option value="delete"{if isset($user.gesperrt) && $user.gesperrt=='delete'} selected="selected"{/if}>{lng p="deleted"}</option>
 							</select></td>
 						</tr>
 						<tr>
@@ -127,7 +127,7 @@
 				
 				<fieldset>
 					<legend>{lng p="notes"}</legend>
-					<textarea style="width:100%;height:80px;" name="notes">{text value=$user.notes allowEmpty=true}</textarea>
+					<textarea style="width:100%;height:80px;" name="notes">{if isset($user.notes)}{text value=$user.notes allowEmpty=true}{/if}</textarea>
 				</fieldset>
 			</td>
 		</tr>
diff --git a/src/admin/templates/users.edit.tpl b/src/admin/templates/users.edit.tpl
index fba4a60..3cea104 100644
--- a/src/admin/templates/users.edit.tpl
+++ b/src/admin/templates/users.edit.tpl
@@ -1,6 +1,6 @@
 <form method="post" action="users.php?do=edit&id={$user.id}&save=true&sid={$sid}" onsubmit="spin(this)">
 
-{if $msg}
+{if isset($msg)}
 <center style="margin:1em;">
 	<div class="note">
 		{$msg}
@@ -318,7 +318,7 @@
 				</div>
 			</fieldset>
 
-			<fieldset class="{if $showAliases}un{/if}collapsed">
+			<fieldset class="{if isset($showAliases)}un{/if}collapsed">
 				<legend><a href="javascript:;" onclick="toggleFieldset(this)">{lng p="aliases"}</a></legend>
 				<div class="content">
 					<table class="list">
@@ -342,7 +342,7 @@
 				</div>
 			</fieldset>
 
-			<fieldset class="{if $showPayments}un{/if}collapsed">
+			<fieldset class="{if isset($showPayments)}un{/if}collapsed">
 				<legend><a href="javascript:;" onclick="toggleFieldset(this)">{lng p="payments"}</a> ({lng p="max"} 15)</legend>
 				<div class="content">
 					<table class="list">
diff --git a/src/admin/templates/users.list.tpl b/src/admin/templates/users.list.tpl
index a877ed2..79333af 100644
--- a/src/admin/templates/users.list.tpl
+++ b/src/admin/templates/users.list.tpl
@@ -6,7 +6,7 @@
 <input type="hidden" name="singleID" id="singleID" value="" />
 {if $queryString}<input type="hidden" name="query" id="query" value="{text value=$queryString}" />{/if}
 
-{if $searchQuery}
+{if isset($searchQuery)}
 <fieldset>
 	<legend>{lng p="search"}</legend>
 
diff --git a/src/admin/templates/welcome.tpl b/src/admin/templates/welcome.tpl
index f767b72..0e2bf36 100644
--- a/src/admin/templates/welcome.tpl
+++ b/src/admin/templates/welcome.tpl
@@ -135,7 +135,7 @@
 		<tr>
 			<td width="20" valign="top"><img src="{$tpldir}images/{$notice.type}.png" width="16" height="16" border="0" alt="" align="absmiddle" /></td>
 			<td valign="top">{$notice.text}</td>
-			<td align="right" valign="top" width="20">{if $notice.link}<a href="{$notice.link}sid={$sid}"><img src="{$tpldir}images/go.png" border="0" alt="" width="16" height="16" /></a>{else}&nbsp;{/if}</td>
+			<td align="right" valign="top" width="20">{if isset($notice.link)}<a href="{$notice.link}sid={$sid}"><img src="{$tpldir}images/go.png" border="0" alt="" width="16" height="16" /></a>{else}&nbsp;{/if}</td>
 		</tr>
 	{/foreach}
 	</table>
diff --git a/src/index.php b/src/index.php
index 4b7bde0..195fc2a 100644
--- a/src/index.php
+++ b/src/index.php
@@ -1477,5 +1477,8 @@ if(isset($_COOKIE['bm_savedUser']))
 	header('Cache-Control: no-cache');
 	$tpl->assign('welcomeBack', sprintf($lang_user['welcomeback'], $_COOKIE['bm_savedUser']));
 }
+else {
+	$tpl->assign('welcomeBack', FALSE);
+}
 
 $tpl->display('nli/index.tpl');
diff --git a/src/m/calendar.php b/src/m/calendar.php
index 79ece65..30ac569 100644
--- a/src/m/calendar.php
+++ b/src/m/calendar.php
@@ -35,6 +35,7 @@ $calendar = _new('BMCalendar', array($userRow['id']));
  * assign
  */
 $tpl->assign('activeTab', 	'calendar');
+$tpl->assign('isDialog',  false);
 
 /**
  * default action
diff --git a/src/m/contacts.php b/src/m/contacts.php
index 40c8051..8b91a3d 100644
--- a/src/m/contacts.php
+++ b/src/m/contacts.php
@@ -33,6 +33,7 @@ $book = _new('BMAddressbook', array($userRow['id']));
  * assign
  */
 $tpl->assign('activeTab', 	'contacts');
+$tpl->assign('isDialog',  false);
 
 /**
  * default action
diff --git a/src/m/email.php b/src/m/email.php
index 277b561..ff27fb9 100644
--- a/src/m/email.php
+++ b/src/m/email.php
@@ -36,6 +36,7 @@ $folderList = $mailbox->GetFolderList(true);
  * assign
  */
 $tpl->assign('activeTab', 'email');
+$tpl->assign('isDialog',  false);
 
 /**
  * default action = inbox
diff --git a/src/m/index.php b/src/m/index.php
index 7a3b34d..b604dae 100644
--- a/src/m/index.php
+++ b/src/m/index.php
@@ -29,6 +29,11 @@ if(isset($_COOKIE['noMobileRedirect']))
 	setcookie('noMobileRedirect', false, time()-TIME_ONE_HOUR, '/');
 	unset($_COOKIE['noMobileRedirect']);
 }
+/**
+ * assign
+ */
+$tpl->assign('activeTab', 	false);
+$tpl->assign('isDialog',  false);
 
 /**
  * default action = login
diff --git a/src/m/tasks.php b/src/m/tasks.php
index 4c58265..9d9dd07 100644
--- a/src/m/tasks.php
+++ b/src/m/tasks.php
@@ -33,6 +33,7 @@ $todo = _new('BMTodo', array($userRow['id']));
  * assign
  */
 $tpl->assign('activeTab', 	'tasks');
+$tpl->assign('isDialog',  false);
 
 /**
  * default action = inbox
diff --git a/src/m/webdisk.php b/src/m/webdisk.php
index 4acbd83..03b190f 100644
--- a/src/m/webdisk.php
+++ b/src/m/webdisk.php
@@ -40,6 +40,7 @@ $usedSpace 		= $webdisk->GetUsedSpace();
  */
 $tpl->assign('activeTab', 	'webdisk');
 $tpl->assign('folderID', 	$folderID);
+$tpl->assign('isDialog',  false);
 if(count($folderPath) > 1)
 {
 	$parentFolder = end(array_slice($folderPath, -2, 1));
diff --git a/src/templates/modern/li/email.folder.tpl b/src/templates/modern/li/email.folder.tpl
index 81dceff..1590d11 100644
--- a/src/templates/modern/li/email.folder.tpl
+++ b/src/templates/modern/li/email.folder.tpl
@@ -1,4 +1,4 @@
-{if $enablePreview}
+{if isset($enablePreview)}
 	{if $narrow}
 		<div id="hSep1">
 			<div id="folderMailArea">
diff --git a/src/templates/modern/li/email.toolbar.tpl b/src/templates/modern/li/email.toolbar.tpl
index 02cf054..4667af3 100644
--- a/src/templates/modern/li/email.toolbar.tpl
+++ b/src/templates/modern/li/email.toolbar.tpl
@@ -7,7 +7,7 @@
 		<td>{progressBar value=$spaceUsed max=$spaceLimit width=100}</td>
 		<td><small>&nbsp; {size bytes=$spaceUsed} / {size bytes=$spaceLimit} {lng p="used"}</small></td>
 		
-		{if $enablePreview}
+		{if isset($enablePreview)}
 		<td width="15">&nbsp;</td>
 		<td><img align="absmiddle" src="{$tpldir}images/li/tb_sep.gif" border="0" alt="" /></td>
 		<td><small>&nbsp; {lng p="preview"}: &nbsp;</small></td>
diff --git a/src/templates/modern/li/index.tpl b/src/templates/modern/li/index.tpl
index ecee441..b8ff66f 100644
--- a/src/templates/modern/li/index.tpl
+++ b/src/templates/modern/li/index.tpl
@@ -2,7 +2,7 @@
 <html lang="{lng p="langCode"}">
 
 <head>
-    <title>{if $pageTitle}{text value=$pageTitle} - {/if}{$service_title}</title>
+    <title>{if isset($pageTitle)}{text value=$pageTitle} - {/if}{$service_title}</title>
 
 	<!-- meta -->
 	<meta http-equiv="content-type" content="text/html; charset={$charset}" />
@@ -73,10 +73,10 @@
 			</div>
 
 			<div class="toolbar">
-				{if $pageToolbarFile}
+				{if isset($pageToolbarFile)}
 				{comment text="including $pageToolbarFile"}
 				{include file="$pageToolbarFile"}
-				{elseif $pageToolbar}
+				{elseif isset($pageToolbar)}
 				{$pageToolbar}
 				{else}
 				&nbsp;
diff --git a/src/templates/modern/li/organizer.addressbook.edit.tpl b/src/templates/modern/li/organizer.addressbook.edit.tpl
index 2d5a491..2375553 100644
--- a/src/templates/modern/li/organizer.addressbook.edit.tpl
+++ b/src/templates/modern/li/organizer.addressbook.edit.tpl
@@ -1,7 +1,7 @@
 <div id="contentHeader">
 	<div class="left">
 		<i class="fa fa-address-book-o" aria-hidden="true"></i>
-		{if $contact}{lng p="editcontact"}{else}{lng p="addcontact"}{/if}
+		{if isset($contact)}{lng p="editcontact"}{else}{lng p="addcontact"}{/if}
 	</div>
 </div>
 
@@ -11,7 +11,7 @@
 	<input type="hidden" id="submitAction" name="submitAction" value="" />
 	<table class="listTable">
 		<tr>
-			<th class="listTableHead" colspan="3"> {if $contact}{lng p="editcontact"}{else}{lng p="addcontact"}{/if}</th>
+			<th class="listTableHead" colspan="3"> {if isset($contact)}{lng p="editcontact"}{else}{lng p="addcontact"}{/if}</th>
 		</tr>
 		<tr>
 			<td class="listTableLeftDesc"><i class="fa fa-address-card-o" aria-hidden="true"></i></td>
@@ -22,7 +22,7 @@
 					<legend>{lng p="userpicture"}</legend>
 					<input type="hidden" name="pictureFile" id="pictureFile" value="" />
 					<input type="hidden" name="pictureMime" id="pictureMime" value="" />
-					<br /><center><div id="pictureDiv" style="background-size: cover; background-position: center center; background-repeat: no-repeat; background-image: url({if !$contact || $contact.picture==''}{$tpldir}images/li/no_picture.png{else}organizer.addressbook.php?action=addressbookPicture&id={$contact.id}&sid={$sid}{/if}); width: 80px; height: 80px;"><a href="javascript:addrUserPicture({if $contact}{$contact.id}{else}-1{/if});"><img src="{$tpldir}images/li/pic_frame.gif" width="80" height="80" border="0" alt="" /></a></div></center>
+					<br /><center><div id="pictureDiv" style="background-size: cover; background-position: center center; background-repeat: no-repeat; background-image: url({if empty($contact.picture)}{$tpldir}images/li/no_picture.png{else}organizer.addressbook.php?action=addressbookPicture&id={$contact.id}&sid={$sid}{/if}); width: 80px; height: 80px;"><a href="javascript:addrUserPicture({if $contact}{$contact.id}{else}-1{/if});"><img src="{$tpldir}images/li/pic_frame.gif" width="80" height="80" border="0" alt="" /></a></div></center>
 					<br /><small>{lng p="changepicbyclick"}</small>
 				</fieldset>
 				<small><br /></small>				
@@ -44,7 +44,7 @@
 				<fieldset>
 					<legend>{lng p="features"}</legend>
 					<div align="left">
-						{if $contact}
+						{if isset($contact)}
 							<a href="javascript:addrFunction('exportVCF');"><i class="fa fa-address-card-o" aria-hidden="true"></i> {lng p="exportvcf"}</a><br />
 							<a href="javascript:addrFunction('selfComplete');"><i class="fa fa-check-square-o" aria-hidden="true"></i> {lng p="complete"}</a><br />
 							<a href="javascript:addrFunction('intelliFolder');"><i class="fa fa-folder" aria-hidden="true"></i> {lng p="convfolder"}</a><br />
@@ -61,7 +61,7 @@
 			<td class="listTableLeft"><label for="anrede">{lng p="salutation"}:</label></td>
 			<td class="listTableRight">
 				<select name="anrede" id="anrede">
-					<option value=""{if $contact.anrede==''} selected="selected"{/if}>&nbsp;</option>
+					<option value=""{if empty($contact.anrede)} selected="selected"{/if}>&nbsp;</option>
 					<option value="frau"{if $contact.anrede=='frau'} selected="selected"{/if}>{lng p="mrs"}</option>
 					<option value="herr"{if $contact.anrede=='herr'} selected="selected"{/if}>{lng p="mr"}</option>
 				</select>
@@ -70,8 +70,8 @@
 		<tr>
 			<td class="listTableLeft"> * <label for="vorname">{lng p="firstname"}</label> / * <label for="nachname">{lng p="surname"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="vorname" id="vorname" value="{text value=$contact.vorname allowEmpty=true}" size="20" />
-				<input type="text" name="nachname" id="nachname" value="{text value=$contact.nachname allowEmpty=true}" size="20" />
+				<input type="text" name="vorname" id="vorname" value="{if isset($contact.vorname)}{text value=$contact.vorname allowEmpty=true}{/if}" size="20" />
+				<input type="text" name="nachname" id="nachname" value="{if isset($contact.nachname)}{text value=$contact.nachname allowEmpty=true}{/if}" size="20" />
 			</td>
 		</tr>
 		
@@ -92,44 +92,44 @@
 		<tr>
 			<td class="listTableLeft"><label for="strassenr">{lng p="streetnr"}</label>:</td>
 			<td class="listTableRight">
-				<input type="text" name="strassenr" id="strassenr" value="{text value=$contact.strassenr allowEmpty=true}" size="30" />
+				<input type="text" name="strassenr" id="strassenr" value="{if isset($contact.strassenr)}{text value=$contact.strassenr allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="plz">{lng p="zipcity"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="plz" id="plz" value="{text value=$contact.plz allowEmpty=true}" size="6" />
-				<input type="text" name="ort" id="ort" value="{text value=$contact.ort allowEmpty=true}" size="20" />
+				<input type="text" name="plz" id="plz" value="{if isset($contact.plz)}{text value=$contact.plz allowEmpty=true}{/if}" size="6" />
+				<input type="text" name="ort" id="ort" value="{if isset($contact.ort)}{text value=$contact.ort allowEmpty=true}{/if}" size="20" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="land">{lng p="country"}:</label></td>
 			<td class="listTableRight">	
-				<input type="text" name="land" id="land" value="{text value=$contact.land allowEmpty=true}" size="30" />
+				<input type="text" name="land" id="land" value="{if isset($contact.land)}{text value=$contact.land allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="email">{lng p="email"}:</label></td>
 			<td class="listTableRight">	
-				<input type="email" name="email" id="email" value="{if $smarty.request.email}{text value=$smarty.request.email}{else}{text value=$contact.email allowEmpty=true}{/if}" size="30" />
+				<input type="email" name="email" id="email" value="{if !empty($smarty.request.email)}{text value=$smarty.request.email}{elseif isset($contact.email)}{text value=$contact.email allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="tel">{lng p="phone"}:</label></td>
 			<td class="listTableRight">	
-				<input type="tel" name="tel" id="tel" value="{text value=$contact.tel allowEmpty=true}" size="30" />
+				<input type="tel" name="tel" id="tel" value="{if isset($contact.tel)}{text value=$contact.tel allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="fax">{lng p="fax"}:</label></td>
 			<td class="listTableRight">	
-				<input type="tel" name="fax" id="fax" value="{text value=$contact.fax allowEmpty=true}" size="30" />
+				<input type="tel" name="fax" id="fax" value="{if isset($contact.fax)}{text value=$contact.fax allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="handy">{lng p="mobile"}:</label></td>
 			<td class="listTableRight">	
-				<input type="tel" name="handy" id="handy" value="{text value=$contact.handy allowEmpty=true}" size="30" />
+				<input type="tel" name="handy" id="handy" value="{if isset($contact.handy)}{text value=$contact.handy allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		
@@ -141,7 +141,7 @@
 						<td>{lng p="work"}</td>
 						<td align="right">
 							<label for="default_work">{lng p="default"}</label>
-							<input type="radio" name="default" id="default_work" value="work"{if $contact.default_address==2} checked="checked"{/if} />
+							<input type="radio" name="default" id="default_work" value="work"{if isset($contact.default_address) && $contact.default_address==2} checked="checked"{/if} />
 						</td>
 					</tr>
 				</table></td>
@@ -149,44 +149,44 @@
 		<tr>
 			<td class="listTableLeft"><label for="work_strassenr">{lng p="streetnr"}</label>:</td>
 			<td class="listTableRight">
-				<input type="text" name="work_strassenr" id="work_strassenr" value="{text value=$contact.work_strassenr allowEmpty=true}" size="30" />
+				<input type="text" name="work_strassenr" id="work_strassenr" value="{if isset($contact.work_strassenr)}{text value=$contact.work_strassenr allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="work_plz">{lng p="zipcity"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="work_plz" id="work_plz" value="{text value=$contact.work_plz allowEmpty=true}" size="6" />
-				<input type="text" name="work_ort" id="work_ort" value="{text value=$contact.work_ort allowEmpty=true}" size="20" />
+				<input type="text" name="work_plz" id="work_plz" value="{if isset($contact.work_plz)}{text value=$contact.work_plz allowEmpty=true}{/if}" size="6" />
+				<input type="text" name="work_ort" id="work_ort" value="{if isset($contact.work_ort)}{text value=$contact.work_ort allowEmpty=true}{/if}" size="20" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="work_land">{lng p="country"}:</label></td>
 			<td class="listTableRight">	
-				<input type="text" name="work_land" id="work_land" value="{text value=$contact.work_land allowEmpty=true}" size="30" />
+				<input type="text" name="work_land" id="work_land" value="{if isset($contact.work_land)}{text value=$contact.work_land allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="work_email">{lng p="email"}:</label></td>
 			<td class="listTableRight">	
-				<input type="email" name="work_email" id="work_email" value="{text value=$contact.work_email allowEmpty=true}" size="30" />
+				<input type="email" name="work_email" id="work_email" value="{if isset($contact.work_email)}{text value=$contact.work_email allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="tel">{lng p="phone"}:</label></td>
 			<td class="listTableRight">	
-				<input type="tel" name="work_tel" id="work_tel" value="{text value=$contact.work_tel allowEmpty=true}" size="30" />
+				<input type="tel" name="work_tel" id="work_tel" value="{if isset($contact.work_tel)}{text value=$contact.work_tel allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="fax">{lng p="fax"}:</label></td>
 			<td class="listTableRight">	
-				<input type="tel" name="work_fax" id="work_fax" value="{text value=$contact.work_fax allowEmpty=true}" size="30" />
+				<input type="tel" name="work_fax" id="work_fax" value="{if isset($contact.work_fax)}{text value=$contact.work_fax allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="work_handy">{lng p="mobile"}:</label></td>
 			<td class="listTableRight">	
-				<input type="tel" name="work_handy" id="work_handy" value="{text value=$contact.work_handy allowEmpty=true}" size="30" />
+				<input type="tel" name="work_handy" id="work_handy" value="{if isset($contact.work_handy)}{text value=$contact.work_handy allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		
@@ -196,24 +196,24 @@
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="firma">{lng p="company"}:</label></td>
-			<td class="listTableRight"><input type="text" name="firma" id="firma" value="{text value=$contact.firma allowEmpty=true}" size="30" /></td>
+			<td class="listTableRight"><input type="text" name="firma" id="firma" value="{if isset($contact.firma)}{text value=$contact.firma allowEmpty=true}{/if}" size="30" /></td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="position">{lng p="position"}</label>:</td>
 			<td class="listTableRight">
-				<input type="text" name="position" id="position" value="{text value=$contact.position allowEmpty=true}" size="30" />
+				<input type="text" name="position" id="position" value="{if isset($contact.position)}{text value=$contact.position allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="web">{lng p="web"}:</label></td>
 			<td class="listTableRight">	
-				<input type="url" name="web" id="web" value="{text value=$contact.web allowEmpty=true}" size="30" />
+				<input type="url" name="web" id="web" value="{if isset($contact.web)}{text value=$contact.web allowEmpty=true}{/if}" size="30" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft">{lng p="birthday"}:</td>
 			<td class="listTableRight">	
-				{if $contact.geburtsdatum}
+				{if isset($contact.geburtsdatum)}
 				{html_select_date time=$contact.geburtsdatum year_empty="---" day_empty="---" month_empty="---" start_year="-120" end_year="+0" prefix="geburtsdatum_" field_order="DMY"}
 				{else}
 				{html_select_date time="---" year_empty="---" day_empty="---" month_empty="---" start_year="-120" end_year="+0" prefix="geburtsdatum_" field_order="DMY"}
@@ -223,7 +223,7 @@
 		<tr>
 			<td class="listTableLeft"><label for="kommentar">{lng p="comment"}:</label></td>
 			<td class="listTableRight">	
-				<textarea class="textInput" name="kommentar" id="kommentar">{text value=$contact.kommentar allowEmpty=true}</textarea>
+				<textarea class="textInput" name="kommentar" id="kommentar">{if isset($contact.kommentar)}{text value=$contact.kommentar allowEmpty=true}{/if}</textarea>
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/organizer.addressbook.editgroup.tpl b/src/templates/modern/li/organizer.addressbook.editgroup.tpl
index 4577c02..52ce713 100644
--- a/src/templates/modern/li/organizer.addressbook.editgroup.tpl
+++ b/src/templates/modern/li/organizer.addressbook.editgroup.tpl
@@ -9,7 +9,7 @@
 		<tr>
 			<td class="listTableLeft">* <label for="title">{lng p="title"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="title" id="title" value="{text value=$group.title allowEmpty=true}" style="width:100%;" />
+				<input type="text" name="title" id="title" value="{if isset($group.title)}{text value=$group.title allowEmpty=true}{/if}" style="width:100%;" />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/organizer.notes.edit.tpl b/src/templates/modern/li/organizer.notes.edit.tpl
index fc58395..8d4e0a0 100644
--- a/src/templates/modern/li/organizer.notes.edit.tpl
+++ b/src/templates/modern/li/organizer.notes.edit.tpl
@@ -1,28 +1,28 @@
 <div id="contentHeader">
 	<div class="left">
 		<i class="fa fa-sticky-note-o" aria-hidden="true"></i>
-		{if $note}{lng p="editnote"}{else}{lng p="addnote"}{/if}
+		{if isset($note)}{lng p="editnote"}{else}{lng p="addnote"}{/if}
 	</div>
 </div>
 
 <div class="scrollContainer"><div class="pad">
-	<form name="f1" method="post" action="organizer.notes.php?action={if $note}saveNote&id={$note.id}{else}createNote{/if}&sid={$sid}" onsubmit="return(checkNoteForm(this));">
+	<form name="f1" method="post" action="organizer.notes.php?action={if isset($note)}saveNote&id={$note.id}{else}createNote{/if}&sid={$sid}" onsubmit="return(checkNoteForm(this));">
 		<table class="listTable">
 			<tr>
-				<th class="listTableHead" colspan="2"> {if $note}{lng p="editnote"}{else}{lng p="addnote"}{/if}</th>
+				<th class="listTableHead" colspan="2"> {if isset($note)}{lng p="editnote"}{else}{lng p="addnote"}{/if}</th>
 			</tr>
 			<tr>
 				<td class="listTableLeft"><label for="priority">{lng p="priority"}:</label></td>
 				<td class="listTableRight"><select name="priority" id="priority">
-					<option value="1"{if $note.priority==-1} selected="selected"{/if}>{lng p="prio_1"}</option>
-					<option value="0"{if !$note.id || $note.priority==0} selected="selected"{/if}>{lng p="prio_0"}</option>
-					<option value="-1"{if $note.priority==-1} selected="selected"{/if}>{lng p="prio_-1"}</option>
+					<option value="1"{if isset($note.priority) && $note.priority==1} selected="selected"{/if}>{lng p="prio_1"}</option>
+					<option value="0"{if empty($note.id) || empty($note.priority)} selected="selected"{/if}>{lng p="prio_0"}</option>
+					<option value="-1"{if isset($note.priority) && $note.priority==-1} selected="selected"{/if}>{lng p="prio_-1"}</option>
 				</select></td>
 			</tr>
 			<tr>
 				<td class="listTableLeft">* <label for="text">{lng p="text"}:</label></td>
 				<td class="listTableRight">
-					<textarea class="textInput" name="text" id="text" style="height:250px;">{text value=$note.text allowEmpty=true}</textarea>
+					<textarea class="textInput" name="text" id="text" style="height:250px;">{if isset($note.text)}{text value=$note.text allowEmpty=true}{/if}</textarea>
 				</td>
 			</tr>
 			<tr>
diff --git a/src/templates/modern/li/organizer.notes.tpl b/src/templates/modern/li/organizer.notes.tpl
index 799dfa0..9499af3 100644
--- a/src/templates/modern/li/organizer.notes.tpl
+++ b/src/templates/modern/li/organizer.notes.tpl
@@ -78,7 +78,7 @@
 <script>
 <!--
 	registerLoadAction('initVSep()');
-{if $showID}
+{if isset($showID)}
 	registerLoadAction('previewNote(\'{$sid}\', \'{$showID}\')');
 {/if}
 //-->
diff --git a/src/templates/modern/li/organizer.todo.edit.tpl b/src/templates/modern/li/organizer.todo.edit.tpl
index 2fb2cc4..60e8bf7 100644
--- a/src/templates/modern/li/organizer.todo.edit.tpl
+++ b/src/templates/modern/li/organizer.todo.edit.tpl
@@ -1,7 +1,7 @@
 <div id="contentHeader">
 	<div class="left">
 		<i class="fa fa-tasks" aria-hidden="true"></i>
-		{if $task}{lng p="edittask"}{else}{lng p="addtask"}{/if}
+		{if isset($task)}{lng p="edittask"}{else}{lng p="addtask"}{/if}
 	</div>
 </div>
 
@@ -51,10 +51,10 @@
 			<td class="listTableLeft"><label for="akt_status">{lng p="status"}:</label></td>
 			<td class="listTableRight">
 				<select name="akt_status" id="akt_status">
-					<option value="16"{if $task && $task.akt_status==16} selected="selected"{/if}>{lng p="taskst_16"}</option>
-					<option value="32"{if $task && $task.akt_status==32} selected="selected"{/if}>{lng p="taskst_32"}</option>
-					<option value="64"{if $task && $task.akt_status==64} selected="selected"{/if}>{lng p="taskst_64"}</option>
-					<option value="128"{if $task && $task.akt_status==128} selected="selected"{/if}>{lng p="taskst_128"}</option>
+					<option value="16"{if isset($task) && $task.akt_status==16} selected="selected"{/if}>{lng p="taskst_16"}</option>
+					<option value="32"{if isset($task) && $task.akt_status==32} selected="selected"{/if}>{lng p="taskst_32"}</option>
+					<option value="64"{if isset($task) && $task.akt_status==64} selected="selected"{/if}>{lng p="taskst_64"}</option>
+					<option value="128"{if isset($task) && $task.akt_status==128} selected="selected"{/if}>{lng p="taskst_128"}</option>
 				</select>
 			</td>
 		</tr>
@@ -71,7 +71,7 @@
 		<tr>
 			<td class="listTableLeft"><label for="comments">{lng p="comment"}:</label></td>
 			<td class="listTableRight">
-				<textarea class="textInput" name="comments" id="comments">{text value=$task.comments allowEmpty=true}</textarea>
+				<textarea class="textInput" name="comments" id="comments">{if isset($task.comments)}{text value=$task.comments allowEmpty=true}{/if}</textarea>
 			</td>
 		</tr>
 		<tr>
diff --git a/src/templates/modern/li/prefs.contact.tpl b/src/templates/modern/li/prefs.contact.tpl
index 51191d8..b8b0b0b 100644
--- a/src/templates/modern/li/prefs.contact.tpl
+++ b/src/templates/modern/li/prefs.contact.tpl
@@ -7,7 +7,7 @@
 
 <div class="scrollContainer"><div class="pad">
 
-{if $errorStep}
+{if isset($errorStep)}
 <div class="note">
 	{$errorInfo}
 </div>
@@ -157,7 +157,7 @@
 	</table>
 </form>
 
-{if $errorStep}
+{if isset($errorStep)}
 <script>
 <!--
 {foreach from=$invalidFields item=field}
diff --git a/src/templates/modern/li/prefs.membership.tpl b/src/templates/modern/li/prefs.membership.tpl
index aeafc54..f8cbd10 100644
--- a/src/templates/modern/li/prefs.membership.tpl
+++ b/src/templates/modern/li/prefs.membership.tpl
@@ -9,7 +9,7 @@
 
 <form action="prefs.php?action=membership&do=changePW&sid={$sid}" method="post">
 <h2>{lng p="changepw"}</h2>
-{if $errorStep}
+{if isset($errorStep)}
 <div class="note">
 	{$errorInfo}
 </div>
diff --git a/src/templates/modern/li/prefs.sidebar.tpl b/src/templates/modern/li/prefs.sidebar.tpl
index ed42167..29d90e1 100644
--- a/src/templates/modern/li/prefs.sidebar.tpl
+++ b/src/templates/modern/li/prefs.sidebar.tpl
@@ -3,7 +3,7 @@
 	<a href="prefs.php?sid={$sid}"><i class="fa fa-tachometer" aria-hidden="true"></i> {lng p="overview"}</a><br />
 	{foreach from=$prefsItems item=null key=item}
 	<a href="prefs.php?action={$item}&sid={$sid}">
-				  {if $prefsIcons[$item]}
+				  {if isset($prefsIcons[$item])}
 					<img src="{$prefsIcons[$item]}" width="16" height="16" style="margin-right: 3px;" border="0" alt="" align="absmiddle" />
 				  {else}
 					<i class="fa {if $item=='autoresponder'}fa-reply{elseif $item=='aliases'}fa-user{elseif $item=='common'}fa-cogs{elseif $item=='antispam'}fa-ban{elseif $item=='antivirus'}fa-bug{elseif $item=='antivirus'}fa-bug{elseif $item=='orders'}fa-shopping-cart{elseif $item=='faq'}fa-question-circle-o{elseif $item=='filters'}fa-filter{elseif $item=='coupons'}fa-id-badge{elseif $item=='membership'}fa-id-card-o{elseif $item=='extpop3'}fa-compress{elseif $item=='keyring'}fa-key{elseif $item=='signatures'}fa-quote-right{elseif $item=='software'}fa-download{elseif $item=='contact'}fa-user-o{else}{$item}{/if}" style="width: 20px;" aria-hidden="true"></i>
diff --git a/src/templates/modern/li/prefs.signatures.edit.tpl b/src/templates/modern/li/prefs.signatures.edit.tpl
index 532c20a..0bb1fc1 100644
--- a/src/templates/modern/li/prefs.signatures.edit.tpl
+++ b/src/templates/modern/li/prefs.signatures.edit.tpl
@@ -15,20 +15,20 @@
 		<tr>
 			<td class="listTableLeft">* <label for="titel">{lng p="title"}:</label></td>
 			<td class="listTableRight">
-				<input type="text" name="titel" id="titel" value="{text value=$signature.titel allowEmpty=true}" style="width:100%;" />
+				<input type="text" name="titel" id="titel" value="{if isset($signature.titel)}{text value=$signature.titel allowEmpty=true}{/if}" style="width:100%;" />
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="text">{lng p="plaintext"}:</label></td>
 			<td class="listTableRight">
-				<textarea name="text" id="text" style="width:100%;height:150px;">{text value=$signature.text allowEmpty=true}</textarea>
+				<textarea name="text" id="text" style="width:100%;height:150px;">{if isset($signature.text)}{text value=$signature.text allowEmpty=true}{/if}</textarea>
 			</td>
 		</tr>
 		<tr>
 			<td class="listTableLeft"><label for="html">{lng p="htmltext"}:</label></td>
 			<td class="listTableRight">
 				<div style="border:1px solid #DDDDDD;">
-					<textarea name="html" id="html" style="width:100%;height:150px;">{if $signature}{text value=$signature.html allowEmpty=true}{/if}</textarea>
+					<textarea name="html" id="html" style="width:100%;height:150px;">{if isset($signature)}{text value=$signature.html allowEmpty=true}{/if}</textarea>
 					<script src="./clientlib/wysiwyg.js?{fileDateSig file="../../clientlib/wysiwyg.js"}"></script>
 					<script type="text/javascript" src="./clientlib/ckeditor/ckeditor.js?{fileDateSig file="../../clientlib/ckeditor/ckeditor.js"}"></script>
 					<script>
diff --git a/src/templates/modern/li/prefs.start.tpl b/src/templates/modern/li/prefs.start.tpl
index c51e993..7e1d01c 100644
--- a/src/templates/modern/li/prefs.start.tpl
+++ b/src/templates/modern/li/prefs.start.tpl
@@ -13,7 +13,7 @@
 	<tr>
 		<td width="55" height="62" valign="top">
 			<a href="prefs.php?action={$item}&sid={$sid}">
-				{if $prefsIcons[$item]}
+				{if isset($prefsIcons[$item])}
 					<img src="{$prefsIcons[$item]}" width="48" height="48" style="margin-right: 3px;" border="0" alt="" align="absmiddle" />
 				{else}
 					<i class="fa {if $item=='autoresponder'}fa-reply{elseif $item=='aliases'}fa-user{elseif $item=='common'}fa-cogs{elseif $item=='antispam'}fa-ban{elseif $item=='antivirus'}fa-bug{elseif $item=='antivirus'}fa-bug{elseif $item=='orders'}fa-shopping-cart{elseif $item=='faq'}fa-question-circle-o{elseif $item=='filters'}fa-filter{elseif $item=='coupons'}fa-id-badge{elseif $item=='membership'}fa-id-card-o{elseif $item=='extpop3'}fa-compress{elseif $item=='keyring'}fa-key{elseif $item=='signatures'}fa-quote-right{elseif $item=='software'}fa-download{elseif $item=='contact'}fa-user-o{else}{$item}{/if} fa-4x" aria-hidden="true"></i>
@@ -46,7 +46,7 @@
 				</tr>
 				<tr>
 					<td class="listTableIconSide">
-						{if $prefsIcons[$item]}
+						{if isset($prefsIcons[$item])}
 							<img src="{$prefsIcons[$item]}" width="48" height="48" style="margin-right: 3px;" border="0" alt="" align="absmiddle" />
 						{else}
 							<i class="fa {if $item=='autoresponder'}fa-reply{elseif $item=='aliases'}fa-user{elseif $item=='common'}fa-cogs{elseif $item=='antispam'}fa-ban{elseif $item=='antivirus'}fa-bug{elseif $item=='antivirus'}fa-bug{elseif $item=='orders'}fa-shopping-cart{elseif $item=='faq'}fa-question-circle-o{elseif $item=='filters'}fa-filter{elseif $item=='coupons'}fa-id-badge{elseif $item=='membership'}fa-id-card-o{elseif $item=='extpop3'}fa-compress{elseif $item=='keyring'}fa-key{elseif $item=='signatures'}fa-quote-right{elseif $item=='software'}fa-download{elseif $item=='contact'}fa-user-o{else}{$item}{/if} fa-4x" aria-hidden="true"></i>
diff --git a/src/templates/modern/li/search.results.tpl b/src/templates/modern/li/search.results.tpl
index 4ba04f9..8c0700b 100644
--- a/src/templates/modern/li/search.results.tpl
+++ b/src/templates/modern/li/search.results.tpl
@@ -1,5 +1,5 @@
 <table width="100%" cellspacing="0" cellpadding="0">
-{if $results}
+{if isset($results)}
 {foreach from=$results item=resultCat}
 {assign var=first value=true}
 {foreach from=$resultCat.results item=result}
diff --git a/src/templates/modern/li/start.page.tpl b/src/templates/modern/li/start.page.tpl
index 31f96fb..d29f36b 100644
--- a/src/templates/modern/li/start.page.tpl
+++ b/src/templates/modern/li/start.page.tpl
@@ -36,6 +36,6 @@
 	dc.order = '{$widgetOrder}';
 	dc.onOrderChanged = startBoardOrderChanged;
 	dc.run();
-	{if $autoSetPreviewPos}autoSetPreviewPos();{/if}
+	{if isset($autoSetPreviewPos)}autoSetPreviewPos();{/if}
 //-->
 </script>
diff --git a/src/templates/modern/m/login.tpl b/src/templates/modern/m/login.tpl
index 551b7c6..331986d 100644
--- a/src/templates/modern/m/login.tpl
+++ b/src/templates/modern/m/login.tpl
@@ -10,18 +10,18 @@
 	
 		<div data-role="fieldcontain">
 			<label for="email">{lng p="email"}:</label>
-			<input type="email" name="email" id="email" value="{text value=$smarty.cookies.bm_msavedUser allowEmpty=true}"  />
+			<input type="email" name="email" id="email" value="{if !empty($smarty.cookies.bm_msavedUser)}{text value=$smarty.cookies.bm_msavedUser allowEmpty=true}{/if}"  />
 		</div>
 
 		<div data-role="fieldcontain">
 			<label for="password">{lng p="password"}:</label>
-			<input type="password" name="password" id="password" value="{text value=$smarty.cookies.bm_msavedPassword allowEmpty=true}"  />
+			<input type="password" name="password" id="password" value="{if !empty($smarty.cookies.bm_msavedUser)}{text value=$smarty.cookies.bm_msavedPassword allowEmpty=true}{/if}"  />
 		</div>
 	
 		<div data-role="fieldcontain" class="ui-hide-label">
 		    <fieldset data-role="controlgroup">
 			   <legend>{lng p="savelogin"}:</legend>
-			   <input type="checkbox" name="savelogin" id="savelogin"{if $smarty.cookies.bm_msavedUser} checked="checked"{/if} />
+			   <input type="checkbox" name="savelogin" id="savelogin"{if !empty($smarty.cookies.bm_msavedUser)} checked="checked"{/if} />
 			   <label for="savelogin">{lng p="savelogin"}</label>
 		    </fieldset>
 		</div>
diff --git a/src/templates/modern/nli/imprint.tpl b/src/templates/modern/nli/imprint.tpl
index 6d57cc1..34fc0ee 100644
--- a/src/templates/modern/nli/imprint.tpl
+++ b/src/templates/modern/nli/imprint.tpl
@@ -18,11 +18,11 @@
 						{lng p="contactform"}
 					</div>
 					<div class="panel-body">
-						{if $success}
+						{if isset($success)}
 						<div class="alert alert-success" role="alert"><strong>{lng p="thankyou"}.</strong> {lng p="cform_sent"}</div>
 						{else}
 					
-						{if $errorMsg}<div class="alert alert-danger" role="alert"><strong>{lng p="error"}:</strong> {$errorMsg}</div>{/if}
+						{if isset($errorMsg)}<div class="alert alert-danger" role="alert"><strong>{lng p="error"}:</strong> {$errorMsg}</div>{/if}
 
 						{if $contactform_name}<div class="form-group">
 							<label class="control-label" for="name">
@@ -31,7 +31,7 @@
 							</label>
 							<div class="input-group">
 								<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
-								<input type="text" class="form-control" required="true" name="name" id="name" value="{text value=$smarty.post.name allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="name" id="name" value="{if isset($smarty.post.name)}{text value=$smarty.post.name allowEmpty=true}{/if}" />
 							</div>
 						</div>{/if}
 						<div class="form-group">
@@ -41,7 +41,7 @@
 							</label>
 							<div class="input-group">
 								<span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>
-								<input type="text" class="form-control" required="true" name="email" id="email" value="{text value=$smarty.post.email allowEmpty=true}" />
+								<input type="text" class="form-control" required="true" name="email" id="email" value="{if isset($smarty.post.email)}{text value=$smarty.post.email allowEmpty=true}{/if}" />
 							</div>
 						</div>
 						{if $contactform_subject}<div class="form-group">
@@ -52,7 +52,7 @@
 							<select class="form-control" id="subject" name="subject">
 								<option value="">--- {lng p="pleasechose"} ---</option>
 								{foreach from=$contactform_subjects item=subject}
-								<option value="{text value=$subject}"{if $smarty.post.subject==$subject} selected="selected"{/if}>{text value=$subject}</option>
+								<option value="{text value=$subject}"{if isset($smarty.post.subject) && $smarty.post.subject==$subject} selected="selected"{/if}>{text value=$subject}</option>
 								{/foreach}
 							</select>
 						</div>{/if}
@@ -61,7 +61,7 @@
 								{lng p="message"}
 								<span class="required">{lng p="required"}</span>
 							</label>
-							<textarea class="form-control" name="text" id="text" rows="6" required="true">{text value=$smarty.post.text allowEmpty=true}</textarea>
+							<textarea class="form-control" name="text" id="text" rows="6" required="true">{if isset($smarty.post.text)}{text value=$smarty.post.text allowEmpty=true}{/if}</textarea>
 						</div>
 						<div class="row">
 							{if $captchaInfo.hasOwnInput}
@@ -95,7 +95,7 @@
 					</div>
 				</div>
 
-				{if $invalidFields}<script>
+				{if isset($invalidFields)}<script>
 				<!--
 					$(document).ready(function() {ldelim}
 					{foreach from=$invalidFields item=field}
diff --git a/src/templates/modern/nli/index.tpl b/src/templates/modern/nli/index.tpl
index 4f2f238..ffd7a3a 100644
--- a/src/templates/modern/nli/index.tpl
+++ b/src/templates/modern/nli/index.tpl
@@ -7,7 +7,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
 	{if isset($robotsNoIndex)}<meta name="robots" content="noindex" />{/if}
 
-	<title>{$service_title}{if $pageTitle} - {text value=$pageTitle}{/if}</title>
+	<title>{$service_title}{if isset($pageTitle)} - {text value=$pageTitle}{/if}</title>
 
 	<link rel="shortcut icon" type="image/png" href="res/favicon.png" />
 
diff --git a/src/webdisk.php b/src/webdisk.php
index fd7049d..d433331 100644
--- a/src/webdisk.php
+++ b/src/webdisk.php
@@ -853,6 +853,7 @@ else if($_REQUEST['action'] == 'dndUpload'
 		$msg = $lang_user['notraffic'];
 	}
 
+	http_response_code(400);
 	echo $msg;
 }
 

{lng p="email"}:	+
{lng p="firstname"}:
{lng p="lastname"}:
{lng p="streetno"}:	-	+
{lng p="zipcity"}:	-	+
{lng p="country"}:
{lng p="tel"}:
{lng p="fax"}:
{lng p="cellphone"}:
{lng p="altmail"}:
{$profileField.title}:	{if $profileField.type==1} - + {elseif $profileField.type==2} - + {elseif $profileField.type==4}
{lng p="status"}:
{if $contact}{lng p="editcontact"}{else}{lng p="addcontact"}{/if}
	{lng p="salutation"}:	@@ -70,8 +70,8 @@
* {lng p="firstname"} / * {lng p="surname"}:	- - + +
{lng p="streetnr"}:	- +
{lng p="zipcity"}:	- - + +
{lng p="country"}:	- +
{lng p="email"}:	- +
{lng p="phone"}:	- +
{lng p="fax"}:	- +
{lng p="mobile"}:	- +
{lng p="work"}	{lng p="default"} - +
{if $note}{lng p="editnote"}{else}{lng p="addnote"}{/if}		{if isset($note)}{lng p="editnote"}{else}{lng p="addnote"}{/if}
{lng p="priority"}:
* {lng p="text"}:	- {text value=$note.text allowEmpty=true} + {if isset($note.text)}{text value=$note.text allowEmpty=true}{/if}