From 22abda2369a9e17a73782191fab63927553a9ab1 Mon Sep 17 00:00:00 2001
From: azett <githubregistrierung@azett.com>
Date: Fri, 1 Jan 2021 12:57:46 +0100
Subject: [PATCH] Fixed more template errors in order to get everything running
 with PHP 8.0. Also: Change in language files, widget management is no longer
 called "experimental".

---
 admin/panels/static/admin.static.write.tpl     | 11 +++++++----
 admin/panels/uploader/admin.uploader.tpl       |  6 +++---
 admin/panels/widgets/admin.widgets.default.tpl | 18 ++++++++++++++----
 fp-interface/lang/de-de/lang.admin.widgets.php |  4 ++--
 fp-interface/lang/en-us/lang.admin.widgets.php |  2 +-
 fp-interface/lang/fr-fr/lang.admin.widgets.php |  2 +-
 fp-interface/lang/it-it/lang.admin.widgets.php |  2 +-
 fp-interface/lang/pt-br/lang.admin.widgets.php |  2 +-
 8 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/admin/panels/static/admin.static.write.tpl b/admin/panels/static/admin.static.write.tpl
index ccaaa12..8339195 100755
--- a/admin/panels/static/admin.static.write.tpl
+++ b/admin/panels/static/admin.static.write.tpl
@@ -4,14 +4,17 @@
 
 
 	{static_block}
-	{if $preview}
-	<fieldset id="post-preview"><legend>{$panelstrings.preview}</legend>
-	{include file=preview.tpl}
-	</fieldset>
+	{if isset($preview)}
+		<fieldset id="post-preview"><legend>{$panelstrings.preview}</legend>
+		{include file=preview.tpl}
+		</fieldset>
 	{/if}
 
 {html_form}		
 
+	{if !isset($post)}
+		{assign var=post value=""}
+	{/if}
 	{static content=$post alwaysshow=true}
 	
 			<p><label for="subject">{$panelstrings.subject}</label><br />
diff --git a/admin/panels/uploader/admin.uploader.tpl b/admin/panels/uploader/admin.uploader.tpl
index 645b4bf..ddcc60a 100755
--- a/admin/panels/uploader/admin.uploader.tpl
+++ b/admin/panels/uploader/admin.uploader.tpl
@@ -1,4 +1,4 @@
-{if $smarty.request.mod != 'inline'}
+{if !isset($smarty.request.mod) || $smarty.request.mod != 'inline'}
 <h2>{$panelstrings.head}</h2>
 <p>{$panelstrings.descr}</p>
 {/if}
@@ -23,7 +23,7 @@
 {html_form enctype='multipart/form-data'}
 	
 	
-	{if $smarty.request.mod != 'inline'}
+	{if !isset($smarty.request.mod) || $smarty.request.mod != 'inline'}
 	<fieldset><legend>{$panelstrings.fset1}</legend>
 	{/if}
 		<input type="file" name="upload[]" />
@@ -35,7 +35,7 @@
 		<input type="file" name="upload[]" />
 		<input type="file" name="upload[]" />
 	
-	{if $smarty.request.mod != 'inline'}
+	{if !isset($smarty.request.mod) || $smarty.request.mod != 'inline'}
 	</fieldset>
 	{/if}
 	
diff --git a/admin/panels/widgets/admin.widgets.default.tpl b/admin/panels/widgets/admin.widgets.default.tpl
index a636754..2060e3d 100755
--- a/admin/panels/widgets/admin.widgets.default.tpl
+++ b/admin/panels/widgets/admin.widgets.default.tpl
@@ -47,13 +47,23 @@
 		
 		<ul id="widgetsetid-{$widgetset}">
 		{foreach from=$widgetarr item=widget}
-			<li class="widget-instance widget-id-{$widget.id} {$widget.class}">
+			{if isset($widget.class)}
+				{assign var=widgetclass value="$widget.class"}
+			{else}
+				{assign var=widgetclass value=""}
+			{/if}
+			{if isset($widget.params)}
+				{assign var=widgetparams value="$widget.params"}
+			{else}
+				{assign var=widgetparams value=""}
+			{/if}
+			<li class="widget-instance widget-id-{$widget.id} {$widgetclass}">
 				<input class="widget-id" type="hidden" name="widgets[{$widgetset}][]" 
-				value="{$widget.id}{if $widget.params}:{$widget.params}{/if}" />
-				{if $widget.params}
+				value="{$widget.id}{$widgetparams}" />
+				{if !empty($widgetparams)}
 				{* this will be hooked from javascript *}
 				<input class="textinput" style="float:right"  
-					type="text" value="{$widget.params}"/>
+					type="text" value="{$widgetparams}"/>
 				{/if} 
 				<p> {$widget.name} </p>  
 			</li> 
diff --git a/fp-interface/lang/de-de/lang.admin.widgets.php b/fp-interface/lang/de-de/lang.admin.widgets.php
index a642020..4aefbe2 100644
--- a/fp-interface/lang/de-de/lang.admin.widgets.php
+++ b/fp-interface/lang/de-de/lang.admin.widgets.php
@@ -6,9 +6,9 @@
 	/* default action */
 	
 	$lang['admin']['widgets']['default'] = array(
-		'head'		=> 'Verwaltung Widgets (<em>experimentell</em>)',
+		'head'		=> 'Widget-Verwaltung',
 		
-		'descr'		=> 'Flatpress hat verschiedene Widgets mit an Bord, wie zum Beispiel die Login- oder die Suchefunktion. Ein <a class="hint" '.
+		'descr'		=> 'Flatpress hat verschiedene Widgets mit an Bord, wie zum Beispiel die Login- oder die Suchfunktion. Ein <a class="hint" '.
 						'href="http://wiki.flatpress.org/doc:plugins" title="What is a Widget?">'.
 						'Widget</a> ist ein dynamisches Steuerelement eines <a class="hint" '.
 						'href="http://wiki.flatpress.org/doc:plugins" title="What is a plugin?">'.
diff --git a/fp-interface/lang/en-us/lang.admin.widgets.php b/fp-interface/lang/en-us/lang.admin.widgets.php
index 68993e7..d2cb189 100644
--- a/fp-interface/lang/en-us/lang.admin.widgets.php
+++ b/fp-interface/lang/en-us/lang.admin.widgets.php
@@ -6,7 +6,7 @@
 	/* default action */
 	
 	$lang['admin']['widgets']['default'] = array(
-		'head'		=> 'Manage Widgets (<em>experimental</em>)',
+		'head'		=> 'Manage Widgets',
 		
 		'descr'		=> 	'A <a class="hint" '.
 						'href="http://wiki.flatpress.org/doc:widgets" title="What is a Widget?">'.
diff --git a/fp-interface/lang/fr-fr/lang.admin.widgets.php b/fp-interface/lang/fr-fr/lang.admin.widgets.php
index 81c1b0a..df230f6 100644
--- a/fp-interface/lang/fr-fr/lang.admin.widgets.php
+++ b/fp-interface/lang/fr-fr/lang.admin.widgets.php
@@ -6,7 +6,7 @@
 	/* default action */
 	
 	$lang['admin']['widgets']['default'] = array(
-		'head'		=> 'G&eacute;rer les Widgets (<em>exp&eacute;rimental</em>)',
+		'head'		=> 'G&eacute;rer les Widgets',
 		
 		'descr'		=> 	'Un <a class="hint" '.
 						'href="http://wiki.flatpress.org/doc:widgets" title="C\'est quoi un Widget?">'.
diff --git a/fp-interface/lang/it-it/lang.admin.widgets.php b/fp-interface/lang/it-it/lang.admin.widgets.php
index 71a6698..955086f 100644
--- a/fp-interface/lang/it-it/lang.admin.widgets.php
+++ b/fp-interface/lang/it-it/lang.admin.widgets.php
@@ -6,7 +6,7 @@
 	/* default action */
 	
 	$lang['admin']['widgets']['default'] = array(
-		'head'		=> 'Gestione Widget (<em>experimental</em>)',
+		'head'		=> 'Gestione Widget',
 		
 		'descr'		=> 	'Un <a class="hint" '.
 						'href="http://wiki.flatpress.org/doc:widgets" title="What is a Widget?">'.
diff --git a/fp-interface/lang/pt-br/lang.admin.widgets.php b/fp-interface/lang/pt-br/lang.admin.widgets.php
index 60045e3..8105f41 100644
--- a/fp-interface/lang/pt-br/lang.admin.widgets.php
+++ b/fp-interface/lang/pt-br/lang.admin.widgets.php
@@ -7,7 +7,7 @@
 	/* default action */
 	
 	$lang['admin']['widgets']['default'] = array(
-		'head'		=> 'Administre Widgets (<em>experimental</em>)',
+		'head'		=> 'Administre Widgets',
 		
 		'descr'		=> 	'Um <a class="hint" '.
 						'href="http://wiki.flatpress.org/doc:widgets" title="O que é um Widget?">'.