Make pigeonholes not call LibertyAttachable since it is LibertyContent (for the moment).

Fixup pretty url and extended url support and make sure to force a cononical url for pigeonholes for better SEO.
Make sure stuff in Related Content is actually viewable by the user.

3 files changed, 8 insertions, 4 deletions

diff --git a/templates/menu_pigeonholes.tpl b/templates/menu_pigeonholes.tpl
index abacb65..e69873a 100644
--- a/templates/menu_pigeonholes.tpl
+++ b/templates/menu_pigeonholes.tpl
@@ -7,7 +7,7 @@
 	{if $gBitUser->hasPermission( 'p_pigeonholes_view' )}
 		<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}list.php">{biticon ipackage="icons" iname="format-justify-fill" iexplain="List Categories" iforce="icon"} {tr}List Categories{/tr}</a></li>
 		{if $gContent->mStructureId and $gContent->mType.content_type_guid == $smarty.const.PIGEONHOLES_CONTENT_TYPE_GUID}
-			<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$gContent->mStructureId}">{biticon ipackage=liberty iname=spacer iexplain="" iforce="icon"} {tr}View Category{/tr}</a></li>
+			<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}{if $gBitSystem->isFeatureActive('pretty_urls_extended')}view/strcture/{else}view.php?structure_id={/if}{$gContent->mStructureId}">{biticon ipackage=liberty iname=spacer iexplain="" iforce="icon"} {tr}View Category{/tr}</a></li>
 			{if $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
 				<li><a class="head" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?structure_id={$gContent->mInfo.structure_id}&amp;action=edit">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit Category" iforce="icon"} {tr}Edit Category{/tr}</a></li>
 				<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?structure_id={$gContent->mInfo.root_structure_id}&amp;action=create">{biticon ipackage="icons" iname="insert-object" iexplain="Insert Category" iforce="icon"} {tr}Insert Category{/tr}</a></li>
diff --git a/templates/section_inc.tpl b/templates/section_inc.tpl
index ac8ca92..973b34a 100644
--- a/templates/section_inc.tpl
+++ b/templates/section_inc.tpl
@@ -1,7 +1,7 @@
 {strip}
 {if $gBitSystem->getConfig('pigeonholes_list_style') == "dynamic" && !$no_details}
 
-	<h3 class="highlight"><a href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title|escape}</a></h3>
+	<h3 class="highlight"><a href="{$smarty.const.PIGEONHOLES_PKG_URL}{if $gBitSystem->isFeatureActive('pretty_urls_extended')}view/structure{else}view.php?structure_id={/if}{$subtree[ix].structure_id}">{$subtree[ix].title|escape}</a></h3>
 
 	{foreach from=$pigeonList item=pigeonItem}
 		{if $pigeonItem.structure_id eq $subtree[ix].structure_id}
@@ -63,7 +63,7 @@
 	{/if}
 
 	{if $current}<strong>{/if}
-		<a href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$subtree[ix].structure_id}#members">{$subtree[ix].title|escape}</a>
+		<a href="{$smarty.const.PIGEONHOLES_PKG_URL}{if $gBitSystem->isFeatureActive('pretty_urls_extended')}view/structure/{else}view.php?structure_id={/if}{$subtree[ix].structure_id}#members">{$subtree[ix].title|escape}</a>
 	{if $current}</strong>{/if}
 	{biticon ipackage=liberty iname=spacer iforce=icon}
 
diff --git a/templates/service_view_members_inc.tpl b/templates/service_view_members_inc.tpl
index 234c2ce..31ff57e 100644
--- a/templates/service_view_members_inc.tpl
+++ b/templates/service_view_members_inc.tpl
@@ -43,7 +43,11 @@
 					{/foreach}
 
 					{if $more eq 1}
-						<a href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$pigeonItem.structure_id}">[ &hellip; ]</a>
+						{if $gBitSystem->isFeatureActive('pretty_urls_extended')}
+							<a href="{$smarty.const.PIGEONHOLES_PKG_URL}view/structure/{$pigeonItem.structure_id}">[ &hellip; ]</a>
+						{else}
+							<a href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$pigeonItem.structure_id}">[ &hellip; ]</a>
+						{/if}
 					{/if}
 				</p>
 				{* reset the ctg2 value *}