From 2eb21a98c8fa8b13fbd221af6235ea2cda2d877c Mon Sep 17 00:00:00 2001
From: franciscoarocas <54645175+franciscoarocas@users.noreply.github.com>
Date: Wed, 10 Feb 2021 21:24:55 +0100
Subject: [PATCH] Fixed entry tpls (PHP 8.0) and sceditor

---
 admin/admin.tpl                              |  4 +-
 admin/main.php                               |  2 +
 admin/panels/entry/admin.entry.cats.tpl      |  2 +-
 admin/panels/entry/admin.entry.write.tpl     | 55 ++++++++++----------
 fp-interface/lang/en-us/lang.admin.entry.php |  3 +-
 5 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/admin/admin.tpl b/admin/admin.tpl
index 44ea5c0..7f24f74 100644
--- a/admin/admin.tpl
+++ b/admin/admin.tpl
@@ -20,7 +20,7 @@
 	<nav class="navbar navbar-dark flex-md-nowrap top-nav top-color">
 	<div class="container-fluid">
 		<div class="row master-row top-row mobile_menu_hide">
-			<div class="col-lg-6"><a href="#" onclick="mobile_open_button()"><span class="ti-menu mobile-menu" style="color: #fff;"></span></a><h3><span class="ti-arrow-circle-right"></span> {$panelstrings.head}</h3></div>
+<div class="col-lg-6"><a href="#" onclick="mobile_open_button()"><span class="ti-menu mobile-menu" style="color: #fff;"></span></a><h3><span class="ti-arrow-circle-right"></span> {if isset($panelstrings.head)}{$panelstrings.head}{/if}</h3></div>
 			<div class="col-lg-6 top-right-bar">
 			    <ul class="navbar-nav ml-auto">
 					<li class="nav-item">
@@ -71,7 +71,7 @@
 						{if isset($submenu)}
 						<ul class="nav flex-column submenu">
 							{foreach from=$submenu key=subtab item=item}
-							{if isset($item)}
+							{if isset($item) && $item}
 							<li id="admin-{$panel}-{$subtab}" class="nav-item">
 								<a class="nav-link{if isset($action) && isset($subtab) && $action == $subtab} sub-active{/if}"
 									href="{$smarty.const.BLOG_BASEURL}admin.php?p={$panel}&amp;action={$subtab}">
diff --git a/admin/main.php b/admin/main.php
index 4c4e66b..afa6879 100755
--- a/admin/main.php
+++ b/admin/main.php
@@ -209,6 +209,8 @@
 	$smarty->assign("blog", $lang['admin']['general']['blog']);
 	$smarty->assign("footer", $lang['admin']['general']['footer']);
 
+	$smarty->assign("sceditor_display", "bbcode");
+
 	if (isset($_GET['mod'])) {
 
 	switch ($_GET['mod']) {
diff --git a/admin/panels/entry/admin.entry.cats.tpl b/admin/panels/entry/admin.entry.cats.tpl
index 1851c9c..cef745d 100644
--- a/admin/panels/entry/admin.entry.cats.tpl
+++ b/admin/panels/entry/admin.entry.cats.tpl
@@ -9,7 +9,7 @@
 					<div class="card-body">
 						{html_form}
 								<p>
-									<textarea name="content" id="content" class="form-control cat-textarea" rows="20" cols="74">{$catdefs|escape}</textarea>
+									<textarea name="content" id="content" class="form-control cat-textarea" rows="20" cols="74">{if isset($catdefs)}{$catdefs|escape}{/if}</textarea>
 								</p>
 							<div class="buttonbar text-center">
 							{html_submit name="save" id="save" class="btn btn-primary" value=$panelstrings.submit}
diff --git a/admin/panels/entry/admin.entry.write.tpl b/admin/panels/entry/admin.entry.write.tpl
index 8f85e60..e264e79 100644
--- a/admin/panels/entry/admin.entry.write.tpl
+++ b/admin/panels/entry/admin.entry.write.tpl
@@ -1,6 +1,6 @@
 	{include file='shared:admin_errorlist.tpl'}
 	{entry_block}
-	{if $preview}
+	{if isset($preview)}
 	<div class="row">
 		<div class="col-xl-12 col-lg-12">
 			<div class="card shadow mb-4">
@@ -16,7 +16,9 @@
 	{/if}
 		
 {html_form}	
-	
+	{if !isset($post)}
+		{assign var="post" value=""}
+	{/if}
 	{entry content=$post alwaysshow=true}
 
 		<div class="row">
@@ -27,15 +29,15 @@
                 </div>
                 <div class="card-body">
 					<div id="admin-editor">
-						<input type="text" {$error.subject|notempty:'class="field-error form-control input_gray input-max-width"'} 
+						<input type="text" {if isset($error)}{$error.subject|notempty:'class="field-error form-control input_gray input-max-width"'}{/if} 
 							name="subject" id="subject" 
 							value="{$subject|default:$smarty.request.subject|wp_specialchars:1}" placeholder="{$panelstrings.subject}"/ class="form-control input_gray input-max-width"><br />
 						<input type="hidden" name="timestamp" value="{$date}" />
 						<input type="hidden" name="entry" value="{$id}" />
 						<p>
-						<textarea name="content" class="{$error.content|notempty:'field-error'} form-control" 
+						<textarea name="content" class="{if isset($error)}{$error.content|notempty:'field-error'}{/if} form-control" 
 						id="content_textarea" placeholder="{$panelstrings.content}">{$content|default:$smarty.request.content|htmlspecialchars}</textarea><br />
-						{if $sceditor_display!='disable'}
+						{if isset($sceditor_display) && $sceditor_display != 'disable'}
 						<script src="{$smarty.const.BLOG_BASEURL}/fp-includes/bootstrap/js/bootstrap.min.js"></script>
 						
 						<!-- Here is the SCEditor -->
@@ -104,21 +106,25 @@
 					{list_categories type=form selected=$categories}
                 </div>
               </div>
-			 <div class="card shadow mb-4 other_options">
-                <div class="card-header">
-                  <h6 class="m-0 font-weight-bold text-primary">{$panelstrings.otheropts}</h6>
-                </div>
-				 	<p>
-						<ul>
-							{if !$draft}
-							<li><a href="admin.php?p=entry&amp;entry={$smarty.get.entry}&amp;action=commentlist">
-								{$panelstrings.commmsg}</a></li>
-							{/if}
-							<li><a href="admin.php?p=entry&amp;entry={$smarty.get.entry}&amp;action=delete">
-								{$panelstrings.delmsg}</a></li>
-						</ul>
-				 	</p>
-              </div>
+			{if isset($draft) && !$draft || isset($entry)}
+				<div class="card shadow mb-4 other_options">
+					<div class="card-header">
+					<h6 class="m-0 font-weight-bold text-primary">{$panelstrings.otheropts}</h6>
+					</div>
+						<p>
+							<ul>
+								{if isset($draft) && !$draft}
+								<li><a href="admin.php?p=entry&amp;entry={$smarty.get.entry}&amp;action=commentlist">
+									{$panelstrings.commmsg}</a></li>
+								{/if}
+								{if isset($entry)}
+								<li><a href="admin.php?p=entry&amp;entry={$smarty.get.entry}&amp;action=delete">
+									{$panelstrings.delmsg}</a></li>
+								{/if}
+							</ul>
+						</p>
+				</div>
+			{/if}
 			<div class="card shadow mb-4 plugin_options">
 				<div class="card-header">
 				  <h6 class="m-0 font-weight-bold text-primary">Plugins Options</h6>
@@ -179,11 +185,4 @@
       </div>
     </div>
   </div>
-</div>
-
-{if $smarty.get.entry }
-
-{/if}
-
-
-
+</div>
\ No newline at end of file
diff --git a/fp-interface/lang/en-us/lang.admin.entry.php b/fp-interface/lang/en-us/lang.admin.entry.php
index 53d5705..a999a91 100755
--- a/fp-interface/lang/en-us/lang.admin.entry.php
+++ b/fp-interface/lang/en-us/lang.admin.entry.php
@@ -174,7 +174,8 @@ Technology :6
 	
 		'fset1'		=> 'Editor',
 		'fset2'		=> 'Apply Changes',
-		'submit'	=> 'Save'
+		'submit'	=> 'Save',
+		'cats_info' => 'Categories information'
 	);
 	
 	$lang['admin']['entry']['cats']['msgs'] = array(