php8 warnings

4 files changed, 165 insertions, 169 deletions

diff --git a/boot.php b/boot.php
index 1bd829997..737148948 100644
--- a/boot.php
+++ b/boot.php
@@ -2065,12 +2065,10 @@ function is_site_admin() {
 	if(! session_id())
 		return false;
 
-	if($_SESSION['delegate'])
+	if(isset($_SESSION['delegate']))
 		return false;
 
-	if((intval($_SESSION['authenticated']))
-		&& (is_array(App::$account))
-		&& (App::$account['account_roles'] & ACCOUNT_ROLE_ADMIN))
+	if(isset($_SESSION['authenticated']) && is_array(App::$account) && (App::$account['account_roles'] & ACCOUNT_ROLE_ADMIN))
 		return true;
 
 	return false;
diff --git a/include/help.php b/include/help.php
index ebf1ccc08..38facb04a 100644
--- a/include/help.php
+++ b/include/help.php
@@ -285,6 +285,7 @@ function load_context_help() {
 	$path = App::$cmd;
 	$args = App::$argv;
 	$lang = App::$language;
+	$context_help = '';
 
 	if(! isset($lang) || !is_dir('doc/context/' . $lang . '/')) {
 		$lang = 'en';
diff --git a/include/nav.php b/include/nav.php
index aed7438cf..ee0e1bda6 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -14,42 +14,40 @@ function nav($template = 'default') {
 	 *
 	 */
 
-	if(!(x(App::$page,'nav')))
-		App::$page['nav'] = '';
-
-	if(! isset(App::$page['htmlhead']))
-		App::$page['htmlhead'] = '';
-
+	App::$page['nav'] = isset(App::$page['nav']) ?? '';
+	App::$page['htmlhead'] = isset(App::$page['htmlhead']) ?? '';
 	App::$page['htmlhead'] .= '<script>$(document).ready(function() { $("#nav-search-text").search_autocomplete(\'' . z_root() . '/acl' . '\');});</script>';
-
 	$is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false);
+	$observer = [];
+	$sitelocation = '';
 
-	if(local_channel()) {
-		$channel = App::get_channel();
+	if (local_channel()) {
+		$channel  = App::get_channel();
 		$observer = App::get_observer();
-		$prof = q("select id from profile where uid = %d and is_default = 1",
+
+		$prof     = q("select id from profile where uid = %d and is_default = 1",
 			intval($channel['channel_id'])
 		);
 
-		if(! $_SESSION['delegate']) {
+		if (empty($_SESSION['delegate'])) {
 			$chans = q("select channel_name, channel_id from channel where channel_account_id = %d and channel_removed = 0 order by channel_name ",
 				intval(get_account_id())
 			);
 		}
 		$sitelocation = (($is_owner) ? '' : App::$profile['reddress']);
 	}
-	elseif(remote_channel()) {
-		$observer = App::get_observer();
+	elseif (remote_channel()) {
+		$observer     = App::get_observer();
 		$sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname());
 	}
 
 	require_once('include/conversation.php');
 
-	$nav_apps = [];
-	$navbar_apps = [];
+	$nav_apps     = [];
+	$navbar_apps  = [];
 	$channel_apps = [];
 
-	if(isset(App::$profile['channel_address']))
+	if (isset(App::$profile['channel_address']))
 		$channel_apps[] = channel_apps($is_owner, App::$profile['channel_address']);
 
 
@@ -59,117 +57,121 @@ function nav($template = 'default') {
 	 *
 	 */
 
-	$banner = get_config('system','banner');
+	$banner = get_config('system', 'banner');
 
-	if($banner === false)
-		$banner = get_config('system','sitename');
+	if ($banner === false)
+		$banner = get_config('system', 'sitename');
 
-	call_hooks('get_banner',$banner);
+	call_hooks('get_banner', $banner);
 
-	App::$page['header'] .= replace_macros(get_markup_template('hdr.tpl'), array(
+	App::$page['header'] = isset(App::$page['header']) ?? '';
+	App::$page['header'] .= replace_macros(get_markup_template('hdr.tpl'), [
 		//we could additionally use this to display important system notifications e.g. for updates
-	));
+	]);
 
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
 	$nav = [];
 
-	if(can_view_public_stream())
+	if (can_view_public_stream())
 		$nav['pubs'] = true;
 
 	/**
 	 * Display login or logout
 	 */
 
-	$nav['usermenu'] = [];
-	$userinfo = null;
+	$nav['usermenu']  = [];
 	$nav['loginmenu'] = [];
+	$userinfo         = [];
 
-	if($observer) {
+	if ($observer) {
 		$userinfo = [
-			'icon' => $observer['xchan_photo_m'].'?rev='.strtotime($observer['xchan_photo_date']),
+			'icon' => $observer['xchan_photo_m'] . '?rev=' . strtotime($observer['xchan_photo_date']),
 			'name' => $observer['xchan_addr'],
 		];
 	}
 
-	elseif(! $_SESSION['authenticated']) {
+	elseif (empty($_SESSION['authenticated'])) {
 		$nav['remote_login'] = remote_login();
-		$nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn');
+		$nav['loginmenu'][]  = ['rmagic', t('Remote authentication'), '', t('Click to authenticate to your home hub'), 'rmagic_nav_btn'];
 	}
 
-	if(local_channel()) {
+	if (local_channel()) {
 
- 		if(! $_SESSION['delegate']) {
-			$nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage your channels'),'manage_nav_btn');
- 		}
-		if(Apps::system_app_installed(local_channel(), 'Privacy Groups'))
-			$nav['group'] = array('group', t('Privacy Groups'),"", t('Manage your privacy groups'),'group_nav_btn');
+		if (empty($_SESSION['delegate'])) {
+			$nav['manage'] = ['manage', t('Channel Manager'), "", t('Manage your channels'), 'manage_nav_btn'];
+		}
+		if (Apps::system_app_installed(local_channel(), 'Privacy Groups'))
+			$nav['group'] = ['group', t('Privacy Groups'), "", t('Manage your privacy groups'), 'group_nav_btn'];
 
- 		$nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn');
+		$nav['settings'] = ['settings', t('Settings'), "", t('Account/Channel Settings'), 'settings_nav_btn'];
 
 
-		if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select'))
+		if ($chans && count($chans) > 1 && feature_enabled(local_channel(), 'nav_channel_select'))
 			$nav['channels'] = $chans;
 
-		$nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn'];
+		$nav['logout'] = ['logout', t('Logout'), "", t('End this session'), 'logout_nav_btn'];
 
 		// user menu
-		$nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((App::$nav_sel['raw_name'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn'];
+		$nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((App::$nav_sel['raw_name'] == 'Profile') ? 'active' : ''), t('Your profile page'), 'profile_nav_btn'];
 
-		if(feature_enabled(local_channel(),'multi_profiles'))
-			$nav['usermenu'][]   = ['profiles', t('Edit Profiles'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn'];
+		if (feature_enabled(local_channel(), 'multi_profiles'))
+			$nav['usermenu'][] = ['profiles', t('Edit Profiles'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : ''), t('Manage/Edit profiles'), 'profiles_nav_btn'];
 		else
-			$nav['usermenu'][]   = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn'];
+			$nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : ''), t('Edit your profile'), 'profiles_nav_btn'];
 
 	}
 	else {
-		if(! get_account_id())  {
-			if(App::$module === 'channel') {
-				$nav['login'] = login(true,'main-login',false,false);
-				$nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),''];
+		if (!get_account_id()) {
+			if (App::$module === 'channel') {
+				$nav['login']       = login(true, 'main-login', false, false);
+				$nav['loginmenu'][] = ['login', t('Login'), '', t('Sign in'), ''];
 			}
 			else {
-				$nav['login'] = login(true,'main-login',false,false);
-				$nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'login_nav_btn'];
+				$nav['login']         = login(true, 'main-login', false, false);
+				$nav['loginmenu'][]   = ['login', t('Login'), '', t('Sign in'), 'login_nav_btn'];
+
 				App::$page['content'] .= replace_macros(get_markup_template('nav_login.tpl'),
 					[
-						'$nav' => $nav,
+						'$nav'     => $nav,
 						'userinfo' => $userinfo
 					]
 				);
 			}
 		}
 		else
-			$nav['alogout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn'];
+			$nav['alogout'] = ['logout', t('Logout'), "", t('End this session'), 'logout_nav_btn'];
 
 
 	}
 
 	$my_url = get_my_url();
-	if(! $my_url) {
+	if (!$my_url) {
 		$observer = App::get_observer();
-		$my_url = (($observer) ? $observer['xchan_url'] : '');
+		$my_url   = (($observer) ? $observer['xchan_url'] : '');
 	}
 
 	$homelink_arr = parse_url($my_url);
-	$homelink = $homelink_arr['scheme'] . '://' . $homelink_arr['host'];
+	$scheme       = isset($homelink_arr['scheme']) ?? '';
+	$host         = isset($homelink_arr['host']) ?? '';
+	$homelink = $scheme . '://' . $host;
 
-	if(! $is_owner) {
-		$nav['rusermenu'] = array(
+	if (!$is_owner) {
+		$nav['rusermenu'] = [
 			$homelink,
 			t('Take me home'),
 			'logout',
 			((local_channel()) ? t('Logout') : t('Log me out of this site'))
-		);
+		];
 	}
 
-	if(((get_config('system','register_policy') == REGISTER_OPEN) || (get_config('system','register_policy') == REGISTER_APPROVE)) && (! $_SESSION['authenticated']))
-		$nav['register'] = ['register',t('Register'), "", t('Create an account'),'register_nav_btn'];
+	if (((get_config('system', 'register_policy') == REGISTER_OPEN) || (get_config('system', 'register_policy') == REGISTER_APPROVE)) && (empty($_SESSION['authenticated'])))
+		$nav['register'] = ['register', t('Register'), "", t('Create an account'), 'register_nav_btn'];
 
-	if(! get_config('system','hide_help')) {
-		$help_url = z_root() . '/help?f=&cmd=' . App::$cmd;
-		$context_help = '';
-		$enable_context_help = ((intval(get_config('system','enable_context_help')) === 1 || get_config('system','enable_context_help') === false) ? true : false);
-		if($enable_context_help === true) {
+	if (!get_config('system', 'hide_help')) {
+		$help_url            = z_root() . '/help?f=&cmd=' . App::$cmd;
+		$context_help        = '';
+		$enable_context_help = ((intval(get_config('system', 'enable_context_help')) === 1 || get_config('system', 'enable_context_help') === false) ? true : false);
+		if ($enable_context_help === true) {
 			require_once('include/help.php');
 			$context_help = load_context_help();
 			//point directly to /help if $context_help is empty - this can be removed once we have context help for all modules
@@ -178,7 +180,7 @@ function nav($template = 'default') {
 		$nav['help'] = [$help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help];
 	}
 
-	switch(App::$module) {
+	switch (App::$module) {
 		case 'network':
 			$search_form_action = 'network';
 			break;
@@ -194,11 +196,11 @@ function nav($template = 'default') {
 	/**
 	 * Admin page
 	 */
-	 if (is_site_admin()) {
-		 $nav['admin'] = array('admin/', t('Admin'), "", t('Site Setup and Configuration'),'admin_nav_btn');
-	 }
+	if (is_site_admin()) {
+		$nav['admin'] = ['admin/', t('Admin'), "", t('Site Setup and Configuration'), 'admin_nav_btn'];
+	}
 
-	$x = array('nav' => $nav, 'usermenu' => $userinfo );
+	$x = ['nav' => $nav, 'usermenu' => $userinfo];
 
 	call_hooks('nav', $x);
 
@@ -206,20 +208,20 @@ function nav($template = 'default') {
 	// turned off until somebody discovers this and figures out a good location for it.
 	$powered_by = '';
 
-	$url = '';
+	$url          = '';
 	$settings_url = '';
 
-	if(App::$profile_uid && App::$nav_sel['raw_name']) {
+	if (App::$profile_uid && App::$nav_sel['raw_name']) {
 		$active_app = q("SELECT app_url FROM app WHERE app_channel = %d AND app_name = '%s' LIMIT 1",
 			intval(App::$profile_uid),
 			dbesc(App::$nav_sel['raw_name'])
 		);
 
-		if($active_app) {
-			if(strpos($active_app[0]['app_url'], ',')) {
+		if ($active_app) {
+			if (strpos($active_app[0]['app_url'], ',')) {
 				$urls = explode(',', $active_app[0]['app_url']);
-				$url = trim($urls[0]);
-				if($is_owner)
+				$url  = trim($urls[0]);
+				if ($is_owner)
 					$settings_url = trim($urls[1]);
 			}
 			else {
@@ -228,42 +230,39 @@ function nav($template = 'default') {
 		}
 	}
 
-	if(! $settings_url && isset(App::$nav_sel['settings_url']))
+	if (!$settings_url && isset(App::$nav_sel['settings_url']))
 		$settings_url = App::$nav_sel['settings_url'];
 
 	$pinned_list = [];
-	$syslist = [];
 
 	//app bin
-	if($is_owner) {
-		if(get_pconfig(local_channel(), 'system','import_system_apps') !== datetime_convert('UTC','UTC','now','Y-m-d')) {
+	if ($is_owner) {
+		if (get_pconfig(local_channel(), 'system', 'import_system_apps') !== datetime_convert('UTC', 'UTC', 'now', 'Y-m-d')) {
 			Apps::import_system_apps();
-			set_pconfig(local_channel(), 'system','import_system_apps', datetime_convert('UTC','UTC','now','Y-m-d'));
+			set_pconfig(local_channel(), 'system', 'import_system_apps', datetime_convert('UTC', 'UTC', 'now', 'Y-m-d'));
 		}
 
-		if(get_pconfig(local_channel(), 'system','force_import_system_apps') !== STD_VERSION) {
+		if (get_pconfig(local_channel(), 'system', 'force_import_system_apps') !== STD_VERSION) {
 			Apps::import_system_apps();
-			set_pconfig(local_channel(), 'system','force_import_system_apps', STD_VERSION);
+			set_pconfig(local_channel(), 'system', 'force_import_system_apps', STD_VERSION);
 		}
 
-		$list = Apps::app_list(local_channel(), false, [ 'nav_pinned_app' ]);
-		if($list) {
-			foreach($list as $li) {
+		$list = Apps::app_list(local_channel(), false, ['nav_pinned_app']);
+		if ($list) {
+			foreach ($list as $li) {
 				$pinned_list[] = Apps::app_encode($li);
 			}
 		}
 		Apps::translate_system_apps($pinned_list);
 
-		usort($pinned_list,'Zotlabs\\Lib\\Apps::app_name_compare');
-
-		$pinned_list = Apps::app_order(local_channel(),$pinned_list, 'nav_pinned_app');
-
+		usort($pinned_list, 'Zotlabs\\Lib\\Apps::app_name_compare');
 
+		$pinned_list = Apps::app_order(local_channel(), $pinned_list, 'nav_pinned_app');
 		$syslist = [];
-		$list = Apps::app_list(local_channel(), false, [ 'nav_featured_app' ]);
+		$list    = Apps::app_list(local_channel(), false, ['nav_featured_app']);
 
-		if($list) {
-			foreach($list as $li) {
+		if ($list) {
+			foreach ($list as $li) {
 				$syslist[] = Apps::app_encode($li);
 			}
 		}
@@ -274,85 +273,83 @@ function nav($template = 'default') {
 		$syslist = Apps::get_system_apps(true);
 	}
 
-	usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
+	usort($syslist, 'Zotlabs\\Lib\\Apps::app_name_compare');
 
-	$syslist = Apps::app_order(local_channel(),$syslist, 'nav_featured_app');
+	$syslist = Apps::app_order(local_channel(), $syslist, 'nav_featured_app');
 
-
-	if($pinned_list) {
-		foreach($pinned_list as $app) {
-			if(\App::$nav_sel['name'] == $app['name'])
+	if ($pinned_list) {
+		foreach ($pinned_list as $app) {
+			if (App::$nav_sel['name'] == $app['name'])
 				$app['active'] = true;
 
-			if($is_owner) {
-				$navbar_apps[] = Apps::app_render($app,'navbar');
+			if ($is_owner) {
+				$navbar_apps[] = Apps::app_render($app, 'navbar');
 			}
-			elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false) {
-				$navbar_apps[] = Apps::app_render($app,'navbar');
+			elseif (!$is_owner && strpos($app['requires'], 'local_channel') === false) {
+				$navbar_apps[] = Apps::app_render($app, 'navbar');
 			}
 		}
 	}
 
-
-	if($syslist) {
-		foreach($syslist as $app) {
-			if(\App::$nav_sel['name'] == $app['name'])
+	if ($syslist) {
+		foreach ($syslist as $app) {
+			if (isset(App::$nav_sel['name']) && App::$nav_sel['name'] == $app['name'])
 				$app['active'] = true;
 
-			if($is_owner) {
-				$nav_apps[] = Apps::app_render($app,'nav');
+			if ($is_owner) {
+				$nav_apps[] = Apps::app_render($app, 'nav');
 			}
-			elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false) {
-				$nav_apps[] = Apps::app_render($app,'nav');
+			elseif (!$is_owner && isset($app['requires']) && strpos($app['requires'], 'local_channel') === false) {
+				$nav_apps[] = Apps::app_render($app, 'nav');
 			}
 		}
 	}
 
-	$c = theme_include('navbar_' . purify_filename($template) . '.css');
+	$c   = theme_include('navbar_' . purify_filename($template) . '.css');
 	$tpl = get_markup_template('navbar_' . purify_filename($template) . '.tpl');
 
-	if($c && $tpl) {
+	if ($c && $tpl) {
 		head_add_css('navbar_' . $template . '.css');
 	}
 
-	if(! $tpl) {
+	if (!$tpl) {
 		$tpl = get_markup_template('navbar_default.tpl');
 	}
 
-	App::$page['nav'] .= replace_macros($tpl, array(
-		'$baseurl' => z_root(),
-		'$fulldocs' => t('Help'),
-		'$sitelocation' => $sitelocation,
-		'$nav' => $x['nav'],
-		'$banner' =>  $banner,
+	App::$page['nav'] .= replace_macros($tpl, [
+		'$baseurl'            => z_root(),
+		'$fulldocs'           => t('Help'),
+		'$sitelocation'       => $sitelocation,
+		'$nav'                => $x['nav'],
+		'$banner'             => $banner,
 		'$emptynotifications' => t('Loading'),
-		'$userinfo' => $x['usermenu'],
-		'$localuser' => local_channel(),
-		'$is_owner' => $is_owner,
-		'$sel' => App::$nav_sel,
-		'$powered_by' => $powered_by,
-		'$help' => t('@name, !forum, #tag, ?doc, content'),
-		'$pleasewait' => t('Please wait...'),
-		'$nav_apps' => $nav_apps,
-		'$navbar_apps' => $navbar_apps,
-		'$channel_menu' => get_pconfig(App::$profile_uid,'system','channel_menu',get_config('system','channel_menu')),
-		'$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''),
-		'$channel_apps' => $channel_apps,
-		'$addapps' => t('Add Apps'),
-		'$orderapps' => t('Arrange Apps'),
-		'$sysapps_toggle' => t('Toggle System Apps'),
-		'$url' => (($url) ? $url : z_root() . '/' . App::$cmd),
-		'$settings_url' => $settings_url
-	));
-
-	if(x($_SESSION, 'reload_avatar') && $observer) {
+		'$userinfo'           => $x['usermenu'],
+		'$localuser'          => local_channel(),
+		'$is_owner'           => $is_owner,
+		'$sel'                => App::$nav_sel,
+		'$powered_by'         => $powered_by,
+		'$help'               => t('@name, !forum, #tag, ?doc, content'),
+		'$pleasewait'         => t('Please wait...'),
+		'$nav_apps'           => $nav_apps,
+		'$navbar_apps'        => $navbar_apps,
+		'$channel_menu'       => get_pconfig(App::$profile_uid, 'system', 'channel_menu', get_config('system', 'channel_menu')),
+		'$channel_thumb'      => ((App::$profile) ? App::$profile['thumb'] : ''),
+		'$channel_apps'       => $channel_apps,
+		'$addapps'            => t('Add Apps'),
+		'$orderapps'          => t('Arrange Apps'),
+		'$sysapps_toggle'     => t('Toggle System Apps'),
+		'$url'                => (($url) ? $url : z_root() . '/' . App::$cmd),
+		'$settings_url'       => $settings_url
+	]);
+
+	if (x($_SESSION, 'reload_avatar') && $observer) {
 		// The avatar has been changed on the server but the browser doesn't know that,
 		// force the browser to reload the image from the server instead of its cache.
 		$tpl = get_markup_template('force_image_reload.tpl');
 
-		App::$page['nav'] .= replace_macros($tpl, array(
+		App::$page['nav'] .= replace_macros($tpl, [
 			'$imgUrl' => $observer['xchan_photo_m']
-		));
+		]);
 		unset($_SESSION['reload_avatar']);
 	}
 
@@ -364,7 +361,7 @@ function nav($template = 'default') {
  * Set a menu item in navbar as selected
  *
  */
-function nav_set_selected($raw_name, $settings_url = ''){
+function nav_set_selected($raw_name, $settings_url = '') {
 	App::$nav_sel['raw_name'] = $raw_name;
 
 	$item = ['name' => $raw_name];
@@ -372,7 +369,7 @@ function nav_set_selected($raw_name, $settings_url = ''){
 
 	App::$nav_sel['name'] = $item['name'];
 
-	if($settings_url)
+	if ($settings_url)
 		App::$nav_sel['settings_url'] = z_root() . '/' . $settings_url;
 }
 
@@ -380,20 +377,20 @@ function channel_apps($is_owner = false, $nickname = null) {
 
 	// Don't provide any channel apps if we're running as the sys channel
 
-	if(App::$is_sys)
+	if (App::$is_sys)
 		return '';
 
 	$channel = App::get_channel();
 
-	if($channel && is_null($nickname))
+	if ($channel && is_null($nickname))
 		$nickname = $channel['channel_address'];
 
 	$uid = ((isset(App::$profile['profile_uid'])) ? App::$profile['profile_uid'] : local_channel());
 
-	if(! get_pconfig($uid, 'system', 'channelapps','1'))
-	    return;
+	if (!get_pconfig($uid, 'system', 'channelapps', '1'))
+		return;
 
-	if($uid == local_channel()) {
+	if ($uid == local_channel()) {
 		return;
 	}
 	else {
@@ -414,7 +411,7 @@ function channel_apps($is_owner = false, $nickname = null) {
 
 	$has_webpages = (($r) ? true : false);
 
-	if(x($_GET, 'tab'))
+	if (x($_GET, 'tab'))
 		$tab = notags(trim($_GET['tab']));
 
 	$url = z_root() . '/channel/' . $nickname;
@@ -431,7 +428,7 @@ function channel_apps($is_owner = false, $nickname = null) {
 		],
 	];
 
-	$p = get_all_perms($uid,get_observer_hash());
+	$p = get_all_perms($uid, get_observer_hash());
 
 	if ($p['view_profile']) {
 		$tabs[] = [
@@ -462,7 +459,7 @@ function channel_apps($is_owner = false, $nickname = null) {
 		];
 	}
 
-	if($p['view_stream'] && $cal_link) {
+	if ($p['view_stream'] && $cal_link) {
 		$tabs[] = [
 			'label' => t('Calendar'),
 			'url'   => z_root() . $cal_link,
@@ -474,13 +471,13 @@ function channel_apps($is_owner = false, $nickname = null) {
 	}
 
 
-	if ($p['chat'] && Apps::system_app_installed($uid,'Chatrooms')) {
+	if ($p['chat'] && Apps::system_app_installed($uid, 'Chatrooms')) {
 		$has_chats = Chatroom::list_count($uid);
 		if ($has_chats) {
 			$tabs[] = [
 				'label' => t('Chatrooms'),
 				'url'   => z_root() . '/chat/' . $nickname,
-				'sel'   => ((argv(0) == 'chat') ? 'active' : '' ),
+				'sel'   => ((argv(0) == 'chat') ? 'active' : ''),
 				'title' => t('Chatrooms'),
 				'id'    => 'chat-tab',
 				'icon'  => 'comments-o'
@@ -488,7 +485,7 @@ function channel_apps($is_owner = false, $nickname = null) {
 		}
 	}
 
-	$has_bookmarks = menu_list_count(local_channel(),'',MENU_BOOKMARK) + menu_list_count(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK);
+	$has_bookmarks = menu_list_count(local_channel(), '', MENU_BOOKMARK) + menu_list_count(local_channel(), '', MENU_SYSTEM | MENU_BOOKMARK);
 	if ($is_owner && $has_bookmarks) {
 		$tabs[] = [
 			'label' => t('Bookmarks'),
@@ -500,10 +497,10 @@ function channel_apps($is_owner = false, $nickname = null) {
 		];
 	}
 
-	if($p['view_pages'] && Apps::system_app_installed($uid, 'Cards')) {
+	if ($p['view_pages'] && Apps::system_app_installed($uid, 'Cards')) {
 		$tabs[] = [
 			'label' => t('Cards'),
-			'url'   => z_root() . '/cards/' . $nickname ,
+			'url'   => z_root() . '/cards/' . $nickname,
 			'sel'   => ((argv(0) == 'cards') ? 'active' : ''),
 			'title' => t('View Cards'),
 			'id'    => 'cards-tab',
@@ -511,10 +508,10 @@ function channel_apps($is_owner = false, $nickname = null) {
 		];
 	}
 
-	if($p['view_pages'] && Apps::system_app_installed($uid, 'Articles')) {
+	if ($p['view_pages'] && Apps::system_app_installed($uid, 'Articles')) {
 		$tabs[] = [
 			'label' => t('Articles'),
-			'url'   => z_root() . '/articles/' . $nickname ,
+			'url'   => z_root() . '/articles/' . $nickname,
 			'sel'   => ((argv(0) == 'articles') ? 'active' : ''),
 			'title' => t('View Articles'),
 			'id'    => 'articles-tab',
@@ -523,7 +520,7 @@ function channel_apps($is_owner = false, $nickname = null) {
 	}
 
 
-	if($has_webpages && Apps::system_app_installed($uid, 'Webpages')) {
+	if ($has_webpages && Apps::system_app_installed($uid, 'Webpages')) {
 		$tabs[] = [
 			'label' => t('Webpages'),
 			'url'   => z_root() . '/page/' . $nickname . '/home',
@@ -546,7 +543,7 @@ function channel_apps($is_owner = false, $nickname = null) {
 		];
 	}
 
-	$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
+	$arr = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs];
 
 	call_hooks('channel_apps', $arr);
 
diff --git a/include/zid.php b/include/zid.php
index e24b0035d..75414a691 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -58,7 +58,7 @@ function zid($s, $address = '') {
 	$mine_parsed = parse_url($mine);
 	$s_parsed = parse_url($s);
 
-	if($mine_parsed['host'] === $s_parsed['host'])
+	if(isset($mine_parsed['host']) && isset($s_parsed['host']) && $mine_parsed['host'] === $s_parsed['host'])
 		$url_match = true;
 
 	if ($mine && $myaddr && (! $url_match))
@@ -209,21 +209,21 @@ function red_zrl_callback($matches) {
     // Catch and exclude trailing punctuation
     preg_match("/[.,;:!?)]*$/i", $matches[2], $pts);
     $matches[2] = substr($matches[2], 0, strlen($matches[2])-strlen($pts[0]));
-        
+
     $zrl = is_matrix_url($matches[2]);
-    
+
     $t = strip_zids($matches[2]);
     if($t !== $matches[2]) {
         $zrl = true;
         $matches[2] = $t;
     }
-    
+
     if($matches[1] === '#^')
         $matches[1] = '';
-        
+
     if($zrl)
         return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]' . $pts[0];
-        
+
     return $matches[1] . '#^[url=' . $matches[2] . ']' . $matches[2] . '[/url]' . $pts[0];
 }