Just a crude merging of the PHP7 code base with the PHP8.4 version

1 files changed, 20 insertions, 40 deletions

diff --git a/templates/list.tpl b/templates/list.tpl
index 8bf772b..430ad80 100644..100755
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -11,25 +11,15 @@
 
 		{include file="bitpackage:contact/display_list_header.tpl"}
 	<div class="table-responsive">
-		<table class="table data clear">
+		<table class="col-xs-12">
 			<caption>{tr}Available Content{/tr} <span class="total">[ {$listInfo.total_records} ]</span></caption>
 			<tr>
-				<th class="width2p">{booticon ipackage="icons" iname="icon-link" iexplain="sort by"}</th>
-				<th>{smartlink ititle="Contract" isort="xkey" ihash=$listInfo.ihash}</th>
-	{*			{if $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
-					<th>{smartlink ititle="Forename" isort="forename" ihash=$listInfo.ihash}</th>
-					<th>{smartlink ititle="Surname" isort="surname" ihash=$listInfo.ihash}</th>
-				{/if}	*}
-				<th>{smartlink ititle="Title" isort="title" idefault=1 iorder=desc ihash=$listInfo.ihash}</th>
-				{if $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
-					<th>{smartlink ititle="Address" isort="street" ihash=$listInfo.ihash}</th>
-					<th>{smartlink ititle="Town" isort="town" ihash=$listInfo.ihash}</th>
-				{/if}
-				<th>{smartlink ititle="Location" isort="location" ihash=$listInfo.ihash}</th>
-				<th>{smartlink ititle="Postcode" isort="postcode" ihash=$listInfo.ihash}</th>
+				<th class="width2p">{smartlink ititle="Contract" isort="xkey" ihash=$listInfo.ihash|default:''}</th>
+				<th>{smartlink ititle="Title" isort="title" idefault=1 iorder=desc ihash=$listInfo.ihash|default:''}</th>
+				<th>{smartlink ititle="Address" isort="street" ihash=$listInfo.ihash|default:''}</th>
 			</tr>
 			{section name=content loop=$listcontacts}
-				<tr class="{cycle values='odd,even'}">
+				<tr class="first">
 					<td class="alignright">
 						<a href="display_contact.php?content_id={$listcontacts[content].content_id}" title="ci_{$listcontacts[content].content_id}">
 						   {$listcontacts[content].xkey}
@@ -40,33 +30,23 @@
 							{$listcontacts[content].title}
 						</a>
 					</td>
-						<td>{$item.content_status_name}</td>
-						{if $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
-							<td>{if isset($listcontacts[content].house) && ($listcontacts[content].house <> '') }
-								{$listcontacts[content].house},&nbsp;{/if}
-								{if isset($listcontacts[content].add1) && ($listcontacts[content].add1 <> '') }
-									{$listcontacts[content].add1},&nbsp;{/if}
-								{if isset($listcontacts[content].add2) && ($listcontacts[content].add2 <> '') }
-									{$listcontacts[content].add2},&nbsp;{/if}
-								{if isset($listcontacts[content].add3) && ($listcontacts[content].add3 <> '') }
-									{$listcontacts[content].add3},&nbsp;{/if}
-								{if isset($listcontacts[content].add4) && ($listcontacts[content].add4 <> '') }
-									{$listcontacts[content].add4},&nbsp;{/if}</td>
-						{/if}
-						<td>{if isset($listcontacts[content].town) && ($listcontacts[content].town <> '') }
-							{$listcontacts[content].town}{/if}</td>
-						<td>{if isset($listcontacts[content].grideast) }
-							&lt;{$listcontacts[content].grideast|escape}&nbsp;,&nbsp;{$listcontacts[content].gridnorth|escape}&gt;&nbsp;{/if}
-						{if $listcontacts[content].y_coordinate and $listcontacts[content].x_coordinate }
-								&nbsp;Exact Cords:&lt;{$listcontacts[content].y_coordinate|escape}&nbsp;,&nbsp;{$listcontacts[content].x_coordinate|escape}&gt;&nbsp;
-						{/if}
-						</td>	
-						<td>{$listcontacts[content].postcode}</td>
+					<td>{if isset($listcontacts[content].house) && ($listcontacts[content].house <> '') }
+						{$listcontacts[content].house},&nbsp;{/if}
+						{if isset($listcontacts[content].add1) && ($listcontacts[content].add1 <> '') }
+							{$listcontacts[content].add1},&nbsp;{/if}
+						{if isset($listcontacts[content].add2) && ($listcontacts[content].add2 <> '') }
+							{$listcontacts[content].add2},&nbsp;{/if}
+						{if isset($listcontacts[content].add3) && ($listcontacts[content].add3 <> '') }
+							{$listcontacts[content].add3},&nbsp;{/if}
+						{if isset($listcontacts[content].add4) && ($listcontacts[content].add4 <> '') }
+							{$listcontacts[content].add4},&nbsp;{/if}
+						{if isset($listcontacts[content].town) && ($listcontacts[content].town <> '') }
+							{$listcontacts[content].town},&nbsp;{/if}
+						{$listcontacts[content].postcode}</td>
 				</tr>
 				<tr class="second">
-					<td>{$item.display_link}</td>
-					<td>{if isset($listcontacts[content].organisation) && ($listcontacts[content].organisation <> '') }Company: {$listcontacts[content].organisation}&nbsp;&nbsp;{/if}</td>
-					<td>{assign var=content_type_guid value=$item.content_type_guid}{$gLibertySystem->getContentTypeName($content_type_guid)}</td>
+					<td>{$item.display_link|default:'Not Set'}</td>
+					<td>{assign var=content_type_guid value=$item.content_type_guid|default:'bitpage'}{$gLibertySystem->getContentTypeName($content_type_guid|default:'bitpage')}</td>
 					<td>
 						{tr}Refs{/tr}: {$listcontacts[content].refs|default:0}&nbsp;&nbsp;
 						{tr}Tasks{/tr}: {$listcontacts[content].tasks|default:0}&nbsp;&nbsp;