From 5c3b89a68b045b7251c0600411fe5e81f41af594 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 3 Oct 2021 17:48:00 +0000 Subject: mod locs: do not show drop icon for local clones and get rid of redundant for loop --- Zotlabs/Module/Locs.php | 8 ++------ view/tpl/locmanage.tpl | 10 +++++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php index 59b872982..1ece47231 100644 --- a/Zotlabs/Module/Locs.php +++ b/Zotlabs/Module/Locs.php @@ -116,11 +116,6 @@ class Locs extends Controller { return; } - for($x = 0; $x < count($r); $x ++) { - $r[$x]['primary'] = (intval($r[$x]['hubloc_primary']) ? true : false); - $r[$x]['deleted'] = (intval($r[$x]['hubloc_deleted']) ? true : false); - } - $o = replace_macros(get_markup_template('locmanage.tpl'), array( '$header' => t('Manage Channel Locations'), '$loc' => t('Location'), @@ -132,7 +127,8 @@ class Locs extends Controller { '$sync_text' => t('Please wait several minutes between consecutive operations.'), '$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'), '$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'), - '$hubs' => $r + '$hubs' => $r, + '$base_url' => z_root() )); return $o; diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index 9b988c9c5..b4d986a1c 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -27,12 +27,16 @@ {{$drop}} {{foreach $hubs as $hub}} - {{if ! $hub.deleted }} + {{if ! $hub.hubloc_deleted }} {{$hub.hubloc_addr}} {{$hub.hubloc_url}} - {{if $hub.primary}}{{else}}{{/if}} - + {{if $hub.hubloc_primary}}{{else}}{{/if}} + + {{if $hub.hubloc_url != $base_url}} + + {{/if}} + {{/if}} {{/foreach}} -- cgit v1.2.3