Extra Template changes to cover uninitialized variables and style changes for PHP8.4

4 files changed, 54 insertions, 5 deletions

diff --git a/templates/display_structure.tpl b/templates/display_structure.tpl
new file mode 100755
index 0000000..f7e6f8e
--- /dev/null
+++ b/templates/display_structure.tpl
@@ -0,0 +1,49 @@
+{strip}
+{if !empty($structureInfo.structure_path)}
+	<div class="structurebar">
+		{if $gBitSystem->isFeatureActive( 'wiki_book_show_path' )}
+			<div class="path">
+				{section loop=$structureInfo.structure_path name=ix}
+					{if $structureInfo.structure_path[ix].parent_id} &raquo; {/if}
+					<a href="index.php?content_id={$structureInfo.structure_path[ix].content_id}">
+						{if $structureInfo.structure_path[ix].page_alias}
+							{$structureInfo.structure_path[ix].page_alias|escape}
+						{else}
+							{$structureInfo.structure_path[ix].title|escape}
+						{/if}
+					</a>
+				{/section}
+			</div>
+		{/if}
+
+		{if $gBitSystem->isFeatureActive( 'wiki_book_show_navigation' )}
+			<div class="navigation">
+				<span class="left">
+					{if $structureInfo.prev and $structureInfo.prev.structure_id}
+						<a href="index.php?structure_id={$structureInfo.prev.structure_id}">
+							{if $wikibook_use_icons eq 'y'}
+								{booticon iname="icon-arrow-left"  ipackage="icons"  iexplain=Previous}
+							{else}
+								&laquo;&nbsp;{$structureInfo.prev.title|escape}
+							{/if}
+						</a>
+					{else}&nbsp;{/if}
+				</span>
+
+				<span class="right">
+					{if $structureInfo.next and $structureInfo.next.structure_id}
+						<a href="index.php?structure_id={$structureInfo.next.structure_id}">
+							{if $wikibook_use_icons eq 'y'}
+								{biticon ipackage="icons" iname="go-next" iexplain=Next}
+							{else}
+								{$structureInfo.next.title|escape}&nbsp;&raquo;
+							{/if}
+						</a>
+					{else}&nbsp;{/if}
+				</span>
+			</div><!-- end .navigation -->
+		{/if}
+		<div class="clear"></div>
+	</div><!-- end .structure -->
+{/if} {* end structure *}
+{/strip}
diff --git a/templates/mime/default/view.tpl b/templates/mime/default/view.tpl
index e10f938..839c7b3 100644
--- a/templates/mime/default/view.tpl
+++ b/templates/mime/default/view.tpl
@@ -2,7 +2,7 @@
 <div class="form-group aligncenter">
 	{assign var=size value=$smarty.request.size|default:medium}
 	{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
-		{if $attachment.original}
+		{if !empty($attachment.original)}
 			<a href="{$attachment.source_url|escape}">
 		{else}
 			<a href="{$attachment.thumbnail_url.large}">
@@ -14,13 +14,13 @@
 	{/if}
 </div>
 
-{if !$attachment.thumbnail_is_mime}
+{if !$attachment.thumbnail_is_mime|default:false}
 	<div class="pagination clear">
 		{tr}View other sizes{/tr} {foreach name=size key=size from=$attachment.thumbnail_url item=url}
 			<a rel="nofollow" href="{$attachment.display_url|escape}{if strpos($attachment.display_url,'?')}&amp;{else}?{/if}size={$size}">{tr}{$size}{/tr}</a>
 			{if !$smarty.foreach.size.last} &bull; {/if}
 		{/foreach}
-		{if $attachment.original} &bull; <a rel="nofollow" href="{$attachment.source_url|escape}">{tr}Original File{/tr}</a> {/if}
+		{if !empty($attachment.original)} &bull; <a rel="nofollow" href="{$attachment.source_url|escape}">{tr}Original File{/tr}</a> {/if}
 	</div>
 {/if}
 {include file="bitpackage:liberty/mime_meta_inc.tpl"}
diff --git a/templates/mime/image/view.tpl b/templates/mime/image/view.tpl
index 9e01e30..f95c1b7 100644
--- a/templates/mime/image/view.tpl
+++ b/templates/mime/image/view.tpl
@@ -1,4 +1,4 @@
-{if $attachment.thumbnail_url.panorama}
+{if $attachment.thumbnail_url.panorama|default:false}
 	{include file="bitpackage:liberty/mime/image/player.tpl"}
 	{include file="bitpackage:liberty/mime_meta_inc.tpl"}
 {else}
diff --git a/templates/mime/pdf/view.tpl b/templates/mime/pdf/view.tpl
index db2b9c2..3113b5f 100644
--- a/templates/mime/pdf/view.tpl
+++ b/templates/mime/pdf/view.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $attachment.media_url}
+{if !empty($attachment.media_url)}
 	<div class="form-group aligncenter">
 		<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" width="800" height="600" id="viewer" align="middle">
 			<param name="allowScriptAccess" value="sameDomain" />