From c539c2bb7e656df9787c3784da1461b96f0a67a4 Mon Sep 17 00:00:00 2001
From: azett <githubregistrierung@azett.com>
Date: Fri, 1 Jan 2021 13:25:03 +0100
Subject: [PATCH] Fixed more template errors in order to get everything running
 with PHP 8.0. Also: Removed some unneeded code.

---
 admin/panels/config/admin.config.tpl          | 63 ++++++++++++++++---
 fp-includes/core/core.plugins.php             |  3 +-
 fp-interface/sharedtpls/comment-form.tpl      | 28 +++++++--
 .../bbcode/tpls/admin.plugin.bbcode.tpl       |  6 --
 4 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/admin/panels/config/admin.config.tpl b/admin/panels/config/admin.config.tpl
index 690deee..2a58348 100755
--- a/admin/panels/config/admin.config.tpl
+++ b/admin/panels/config/admin.config.tpl
@@ -12,7 +12,12 @@
 
 	<dl class="option-list">
 	<dt><label for="title"> {$panelstrings.blogtitle} </label></dt>
-	<dd><input type="text" name="title" id="title" class="textinput{$error.title|notempty:' field-error'}" 
+	{if isset($error) && isset($error.title) && !empty($error.title)}
+		{assign var=class value=" field-error"}
+	{else}
+		{assign var=class value=""}
+	{/if}
+	<dd><input type="text" name="title" id="title" class="textinput {$class}" 
 	value="{$flatpress.TITLE|escape:"html"}" />
 	</dd>
 	
@@ -28,12 +33,22 @@
 	
 	
 	<dt><label for="www"> {$panelstrings.blogurl} </label></dt>
-	<dd><input type="text" name="www" id="www" class="textinput{$error.www|notempty:" field-error"}"
+	{if isset($error) && isset($error.www) && !empty($error.www)}
+		{assign var=class value=" field-error"}
+	{else}
+		{assign var=class value=""}
+	{/if}
+	<dd><input type="text" name="www" id="www" class="textinput {$class}"
 			value="{$flatpress.www|escape:"html"}" /></dd>
 	
 	
 	<dt><label for="email"> {$panelstrings.blogemail} </label></dt>
-	<dd><input type="text" name="email" id="email" class="textinput{$error.email|notempty:" field-error"}" 
+	{if isset($error) && isset($error.email) && !empty($error.email)}
+		{assign var=class value=" field-error"}
+	{else}
+		{assign var=class value=""}
+	{/if}
+	<dd><input type="text" name="email" id="email" class="textinput {$class}" 
 	value="{$flatpress.email}" /></dd>
 	
 	<dt> {$panelstrings.notifications} </dt>
@@ -58,8 +73,13 @@
 	</dd>
 	
 	<dt><label for="maxentries"> {$panelstrings.blogmaxentries} </label></dt>
+	{if isset($error) && isset($error.maxentries) && !empty($error.maxentries)}
+		{assign var=class value=" field-error"}
+	{else}
+		{assign var=class value=""}
+	{/if}
 	<dd><input type="text" name="maxentries" id="maxentries" 
-	class="smalltextinput{$error.maxentries|notempty:" field-error"}" value="{$flatpress.maxentries}" /></dd>
+	class="smalltextinput {$class}" value="{$flatpress.maxentries}" /></dd>
 	
 	
 	</dl>
@@ -76,29 +96,49 @@
 		<dd> <code> {"r"|date:$smarty.now} </code> </dd>
 		
 		<dt><label for="timeoffset"> {$panelstrings.timeoffset} </label></dt>
+		{if isset($error) && isset($error.timeoffset) && !empty($error.timeoffset)}
+			{assign var=class value=" field-error"}
+		{else}
+			{assign var=class value=""}
+		{/if}
 		<dd><input type="text" name="timeoffset" id="timeoffset" 
-			class="smalltextinput{$error.timeoffset|notempty:" field-error"}" 
+			class="smalltextinput {$class}" 
 			value="{$fp_config.locale.timeoffset}" /> {$panelstrings.hours} 
 		</dd>
 
 
 		<dt><label for="dateformat"> {$panelstrings.dateformat} </label></dt>
+		{if isset($error) && isset($error.dateformat) && !empty($error.dateformat)}
+			{assign var=class value=" field-error"}
+		{else}
+			{assign var=class value=""}
+		{/if}
 		<dd>	<p> <input type="text" name="dateformat" id="dateformat" 
-			class="textinput{$error.dateformat|notempty:" field-error"}" 
+			class="textinput {$class}" 
 			value="{$fp_config.locale.dateformat}" /> </p>
 			<p> {$panelstrings.output}:   {$smarty.now|date_format:$fp_config.locale.dateformat}  </p>
 		</dd>
 
 		<dt><label for="dateformatshort"> {$panelstrings.dateformatshort} </label></dt>
+		{if isset($error) && isset($error.dateformatshort) && !empty($error.dateformatshort)}
+			{assign var=class value=" field-error"}
+		{else}
+			{assign var=class value=""}
+		{/if}
 		<dd>	<p> <input type="text" name="dateformatshort" id="dateformatshort" 
-			class="textinput{$error.dateformatshort|notempty:" field-error"}" 
+			class="textinput {$class}" 
 			value="{$fp_config.locale.dateformatshort}" /> </p>
 			<p> {$panelstrings.output}:   {$smarty.now|date_format:$fp_config.locale.dateformatshort}  </p>
 		</dd>
 
 		<dt><label for="timeformat"> {$panelstrings.timeformat} </label></dt>
+		{if isset($error) && isset($error.timeformat) && !empty($error.timeformat)}
+			{assign var=class value=" field-error"}
+		{else}
+			{assign var=class value=""}
+		{/if}
 		<dd>	<p> <input type="text" name="timeformat" id="timeformat" 
-			class="textinput{$error.timeformat|notempty:" field-error"}" 
+			class="textinput {$class}" 
 			value="{$fp_config.locale.timeformat}" /> </p>
 			<p> {$panelstrings.output}:  {$smarty.now|date_format:$fp_config.locale.timeformat}  </p>
 		</dd>
@@ -117,8 +157,13 @@
 		</dd>
 		
 		<dt> <label for="charset"> {$panelstrings.charset} </label></dt>
+		{if isset($error) && isset($error.charset) && !empty($error.charset)}
+			{assign var=class value=" field-error"}
+		{else}
+			{assign var=class value=""}
+		{/if}
 		<dd> <p><input type="text" name="charset" id="charset" 
-			class="smalltextinput{$error.charset|notempty:" field-error"}" 
+			class="smalltextinput {$class}" 
 			value="{$fp_config.locale.charset}" /></p>
 			<p>{$panelstrings.charsettip}</p>
 		</dd>
diff --git a/fp-includes/core/core.plugins.php b/fp-includes/core/core.plugins.php
index 29e452c..af67741 100644
--- a/fp-includes/core/core.plugins.php
+++ b/fp-includes/core/core.plugins.php
@@ -243,8 +243,7 @@
         			  'title' => $plugin, 
         			  'description' => $description, 
         			  'author' => $author, 
-        			  'version' => $version, 
-        			  'template' => $template[1]
+        			  'version' => $version
         			  )
         	);
 
diff --git a/fp-interface/sharedtpls/comment-form.tpl b/fp-interface/sharedtpls/comment-form.tpl
index ff23f62..2585148 100644
--- a/fp-interface/sharedtpls/comment-form.tpl
+++ b/fp-interface/sharedtpls/comment-form.tpl
@@ -22,7 +22,12 @@
 		{else}
 			{assign var=class value=""}
 		{/if}
-		<input type="text" class="{$class}" name="name" id="name" value="{$values.name|wp_specialchars:1|default:$cookie.name}" />
+		{if isset($values) && isset($values.name) && !empty($values.name)}
+			{assign var=namevalue value=$values.name}
+		{else}
+			{assign var=namevalue value=""}
+		{/if}
+		<input type="text" class="{$class}" name="name" id="name" value="{$namevalue|wp_specialchars:1|default:$cookie.name}" />
 		<label class="textlabel" for="name">{$lang.comments.name}</label>
 		</p>
 		
@@ -32,7 +37,12 @@
 		{else}
 			{assign var=class value=""}
 		{/if}
-		<input type="text" class="{$class}" name="email" id="email" value="{$values.email|wp_specialchars:1|default:$cookie.email}" />
+		{if isset($values) && isset($values.email) && !empty($values.email)}
+			{assign var=emailvalue value=$values.email}
+		{else}
+			{assign var=emailvalue value=""}
+		{/if}
+		<input type="text" class="{$class}" name="email" id="email" value="{$emailvalue|wp_specialchars:1|default:$cookie.email}" />
 		<label class="textlabel" for="email">{$lang.comments.email}</label>
 		</p>
 		
@@ -42,7 +52,12 @@
 		{else}
 			{assign var=class value=""}
 		{/if}
-		<input type="text" class="{$class}" name="url" id="url" value="{$values.url|wp_specialchars:1|default:$cookie.url}" />
+		{if isset($values) && isset($values.url) && !empty($values.url)}
+			{assign var=urlvalue value=$values.url}
+		{else}
+			{assign var=urlvalue value=""}
+		{/if}
+		<input type="text" class="{$class}" name="url" id="url" value="{$urlvalue|wp_specialchars:1|default:$cookie.url}" />
 		<label class="textlabel" for="url">{$lang.comments.www}</label>
 		</p>
 		
@@ -60,8 +75,13 @@
 			{else}
 				{assign var=class value=""}
 			{/if}
+			{if isset($values) && isset($values.content) && !empty($values.content)}
+				{assign var=contentvalue value=$values.content}
+			{else}
+				{assign var=contentvalue value=""}
+			{/if}
 			<p><textarea name="content" class="{$class}" 
-			id="content" rows="10" cols="74">{$values.content|wp_specialchars:1}</textarea></p>
+			id="content" rows="10" cols="74">{$contentvalue|wp_specialchars:1}</textarea></p>
 			{*here will go a plugin hook*}
 	</div>
 	
diff --git a/fp-plugins/bbcode/tpls/admin.plugin.bbcode.tpl b/fp-plugins/bbcode/tpls/admin.plugin.bbcode.tpl
index 7eaab41..944823d 100644
--- a/fp-plugins/bbcode/tpls/admin.plugin.bbcode.tpl
+++ b/fp-plugins/bbcode/tpls/admin.plugin.bbcode.tpl
@@ -47,13 +47,7 @@
 	</dd>
 
 </dl>
-		
 
-	<label>
-		{$plang.opn4pre}
-		
-		{$plang.opn4post}
-	</label>
 <p class="buttonbar">
 	<input type="submit" name="bb-conf" value="{$plang.submit}"/>
 </p>