From bd55ae15f29465eab49d3feb83bc426b54127529 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sat, 7 May 2022 07:09:31 +0000
Subject: cleanup channel apps

---
 include/nav.php | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'include/nav.php')

diff --git a/include/nav.php b/include/nav.php
index b9b24e34c..090785301 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -499,29 +499,6 @@ function channel_apps($is_owner = false, $nickname = null) {
 		];
 	}
 
-	if ($p['view_pages'] && Apps::system_app_installed($uid, 'Cards')) {
-		$tabs[] = [
-			'label' => t('Cards'),
-			'url'   => z_root() . '/cards/' . $nickname,
-			'sel'   => ((argv(0) == 'cards') ? 'active' : ''),
-			'title' => t('View Cards'),
-			'id'    => 'cards-tab',
-			'icon'  => 'list'
-		];
-	}
-
-	if ($p['view_pages'] && Apps::system_app_installed($uid, 'Articles')) {
-		$tabs[] = [
-			'label' => t('Articles'),
-			'url'   => z_root() . '/articles/' . $nickname,
-			'sel'   => ((argv(0) == 'articles') ? 'active' : ''),
-			'title' => t('View Articles'),
-			'id'    => 'articles-tab',
-			'icon'  => 'file-text-o'
-		];
-	}
-
-
 	if ($has_webpages && Apps::system_app_installed($uid, 'Webpages')) {
 		$tabs[] = [
 			'label' => t('Webpages'),
@@ -533,7 +510,6 @@ function channel_apps($is_owner = false, $nickname = null) {
 		];
 	}
 
-
 	if ($p['view_wiki'] && Apps::system_app_installed($uid, 'Wiki')) {
 		$tabs[] = [
 			'label' => t('Wikis'),
-- 
cgit v1.2.3


From ee3d6fcfee574ac9f1dcbc0d55c296fc4d5c06ac Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 9 May 2022 08:23:55 +0000
Subject: use addr for webfinger and name for the real name in the userinfo
 array

---
 include/nav.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/nav.php')

diff --git a/include/nav.php b/include/nav.php
index 090785301..c2c87232b 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -83,7 +83,8 @@ function nav($template = 'default') {
 	if ($observer) {
 		$userinfo = [
 			'icon' => $observer['xchan_photo_m'] . '?rev=' . strtotime($observer['xchan_photo_date']),
-			'name' => $observer['xchan_addr'],
+			'addr' => $observer['xchan_addr'],
+			'name' => $observer['xchan_name'],
 		];
 	}
 
-- 
cgit v1.2.3