Merge branch 'dev' into air

14 files changed, 172 insertions, 154 deletions

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index a513523a7..ab5000b9a 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -27,8 +27,8 @@ class Channel extends Controller {
 
 	function init() {
 
-		if (in_array(substr($_GET['search'], 0, 1), ['@', '!', '?']) || strpos($_GET['search'], 'https://') === 0)
-			goaway('search' . '?f=&search=' . $_GET['search']);
+		if (array_key_exists('search', $_GET) && (in_array(substr($_GET['search'], 0, 1), ['@', '!', '?']) || strpos($_GET['search'], 'https://') === 0))
+			goaway(z_root() . '/search?f=&search=' . $_GET['search']);
 
 		$which = null;
 		if (argc() > 1)
@@ -155,7 +155,7 @@ class Channel extends Controller {
 				intval($channel['channel_id'])
 			);
 
-		opengraph_add_meta($r ? $r[0] : [], $channel);
+		opengraph_add_meta((isset($r) && count($r) ? $r[0] : []), $channel);
 	}
 
 	function get($update = 0, $load = false) {
@@ -168,7 +168,7 @@ class Channel extends Controller {
 
 		if (strpos($mid, 'b64.') === 0)
 			$decoded = @base64url_decode(substr($mid, 4));
-		if ($decoded)
+		if (isset($decoded))
 			$mid = $decoded;
 
 		$datequery  = ((x($_GET, 'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
@@ -328,6 +328,7 @@ class Channel extends Controller {
 		}
 		else {
 
+			$sql_extra2 = '';
 			if (x($category)) {
 				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
 			}
@@ -419,7 +420,7 @@ class Channel extends Controller {
 
 		if ((!$update) && (!$load)) {
 
-			if ($decoded)
+			if (isset($decoded))
 				$mid = 'b64.' . base64url_encode($mid);
 
 			// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
@@ -485,7 +486,7 @@ class Channel extends Controller {
 
 			$o .= conversation($items, $mode, $update, $page_mode);
 
-			if ($mid && $items[0]['title'])
+			if ($mid && count($items) > 0 && isset($items[0]['title']))
 				App::$page['title'] = $items[0]['title'] . " - " . App::$page['title'];
 
 		}
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index ac1545644..26c6aaf40 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -116,7 +116,7 @@ class Channel_calendar extends Controller {
 
 		if ($results) {
 			// Set permissions based on tag replacements
-			set_linkified_perms($results, $str_contact_allow, $str_group_allow, $uid, false, $private);
+			set_linkified_perms($results, $str_contact_allow, $str_group_allow, $uid, $private);
 
 			foreach ($results as $result) {
 				$success = $result['success'];
diff --git a/Zotlabs/Module/Connect.php b/Zotlabs/Module/Connect.php
index 31da42035..b934cb963 100644
--- a/Zotlabs/Module/Connect.php
+++ b/Zotlabs/Module/Connect.php
@@ -18,11 +18,11 @@ class Connect extends Controller {
 			App::$error = 404;
 			return;
 		}
-	
+
 		$r = q("select * from channel where channel_address = '%s' limit 1",
 			dbesc($which)
 		);
-	
+
 		if($r)
 			App::$data['channel'] = $r[0];
 
@@ -30,36 +30,36 @@ class Connect extends Controller {
 
 		profile_load($which,'');
 	}
-	
+
 	function post() {
-	
+
 		if(! array_key_exists('channel', App::$data))
 			return;
 
 		$channel_id = App::$data['channel']['channel_id'];
 
 		$edit = ((local_channel() && (local_channel() == $channel_id)) ? true : false);
-	
+
 		if($edit) {
 			$has_premium = ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0);
 			$premium = (($_POST['premium']) ? intval($_POST['premium']) : 0);
 			$text = escape_tags($_POST['text']);
-			
+
 			if($has_premium != $premium) {
 				$r = q("update channel set channel_pageflags = ( channel_pageflags %s %d ) where channel_id = %d",
 					db_getfunc('^'),
 					intval(PAGE_PREMIUM),
-					intval(local_channel()) 
+					intval(local_channel())
 				);
-				
+
 				\Zotlabs\Daemon\Master::Summon(array('Notifier','refresh_all',$channel_id));
 			}
 			set_pconfig($channel_id,'system','selltext',$text);
 			// reload the page completely to get fresh data
 			goaway(z_root() . '/' . App::$query_string);
-	
+
 		}
-	
+
 		$url = '';
 		$observer = App::get_observer();
 		if(($observer) && ($_POST['submit'] === t('Continue'))) {
@@ -70,18 +70,18 @@ class Connect extends Controller {
 					dbesc($observer['xchan_hash'])
 				);
 				if($r)
-					$url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(channel_reddress(App::$data['channel']));
+					$url = $r[0]['hubloc_url'] . '/follow?f=&interactive=1&url=' . urlencode(channel_reddress(App::$data['channel']));
 			}
 		}
 		if($url)
 			goaway($url . '&confirm=1');
 		else
 			notice('Unable to connect to your home hub location.');
-	
+
 	}
-	
-	
-	
+
+
+
 	function get() {
 
 		if(! array_key_exists('channel', App::$data))
@@ -90,11 +90,11 @@ class Connect extends Controller {
 		$channel_id = App::$data['channel']['channel_id'];
 
 		$edit = ((local_channel() && (local_channel() == $channel_id)) ? true : false);
-	
+
 		$text = get_pconfig($channel_id,'system','selltext');
-	
+
 		if($edit) {
-	
+
 			$o = replace_macros(get_markup_template('sellpage_edit.tpl'),array(
 				'$header' => t('Premium Channel Setup'),
 				'$address' => App::$data['channel']['channel_address'],
@@ -105,36 +105,36 @@ class Connect extends Controller {
 				'$lbl2' => t('Potential connections will then see the following text before proceeding:'),
 				'$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
 				'$submit' => t('Submit'),
-	
-	
+
+
 			));
 			return $o;
 		}
 		else {
 			if(! $text)
 				$text = t('(No specific instructions have been provided by the channel owner.)');
-	
+
 			$submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array(
-				'$continue' => t('Continue'),			
+				'$continue' => t('Continue'),
 				'$address' => App::$data['channel']['channel_address']
 			));
-	
+
 			$o = replace_macros(get_markup_template('sellpage_view.tpl'),array(
 				'$header' => t('Restricted or Premium Channel'),
 				'$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'),
-				'$text' => prepare_text($text), 
-	
+				'$text' => prepare_text($text),
+
 				'$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
 				'$submit' => $submit,
-	
+
 			));
-	
+
 			$arr = array('channel' => App::$data['channel'],'observer' => App::get_observer(), 'sellpage' => $o, 'submit' => $submit);
 			call_hooks('connect_premium', $arr);
 			$o = $arr['sellpage'];
-	
+
 		}
-	
+
 		return $o;
 	}
 }
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 7295f3099..e1555fc2d 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -245,7 +245,7 @@ class Directory extends Controller {
 							$profile_link = chanlink_url($rr['url']);
 
 							$pdesc = (($rr['description']) ? $rr['description'] . '<br />' : '');
-							$connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : '');
+							$connect_link = ((local_channel()) ? z_root() . '/follow?f=&interactive=1&url=' . urlencode($rr['address']) : '');
 
 							// Checking status is disabled ATM until someone checks the performance impact more carefully
 							//$online = remote_online_status($rr['address']);
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 2aa4f6548..15dfb0dc9 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -243,7 +243,7 @@ class Display extends \Zotlabs\Web\Controller {
 		$item_normal = item_normal();
 		$item_normal_update = item_normal_update();
 
-		$sql_extra = public_permissions_sql($observer_hash);
+		$sql_extra = ((local_channel()) ? EMPTY_STR : item_permissions_sql(0, $observer_hash));
 
 		if($noscript_content || $load) {
 
@@ -260,8 +260,7 @@ class Display extends \Zotlabs\Web\Controller {
 				);
 			}
 
-			if(! $r) {
-
+			if($r === null) {
 				// in case somebody turned off public access to sys channel content using permissions
 				// make that content unsearchable by ensuring the owner uid can't match
 
@@ -269,20 +268,18 @@ class Display extends \Zotlabs\Web\Controller {
 					$sysid = 0;
 
 				$r = q("SELECT item.id as item_id from item
-					WHERE ( (mid = '%s'
+					WHERE ((mid = '%s'
 					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = ''
 					AND item.deny_gid  = '' AND item_private = 0 )
 					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
-					OR uid = %d ) ) ) OR
-					(mid = '%s' $sql_extra ) )
+					OR uid = %d ))) OR
+					(mid = '%s' $sql_extra ))
 					$item_normal
 					limit 1",
 					dbesc($target_item['parent_mid']),
 					intval($sysid),
 					dbesc($target_item['parent_mid'])
 				);
-
-
 			}
 		}
 
@@ -306,20 +303,22 @@ class Display extends \Zotlabs\Web\Controller {
 			if($r === null) {
 				// in case somebody turned off public access to sys channel content using permissions
 				// make that content unsearchable by ensuring the owner_xchan can't match
+
 				if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))
 					$sysid = 0;
-				$r = q("SELECT item.parent AS item_id from item
-					WHERE parent_mid = '%s'
+
+				$r = q("SELECT item.id as item_id from item
+					WHERE ((parent_mid = '%s'
 					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = ''
 					AND item.deny_gid  = '' AND item_private = 0 )
 					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
-					OR uid = %d )
-					$sql_extra )
-					$item_normal_update
-					$simple_update
+					OR uid = %d ))) OR
+					(parent_mid = '%s' $sql_extra ))
+					$item_normal
 					limit 1",
 					dbesc($target_item['parent_mid']),
-					intval($sysid)
+					intval($sysid),
+					dbesc($target_item['parent_mid'])
 				);
 			}
 		}
diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php
index 11febd8fc..4fe20f56b 100644
--- a/Zotlabs/Module/Follow.php
+++ b/Zotlabs/Module/Follow.php
@@ -14,7 +14,7 @@ use Zotlabs\Daemon\Master;
 class Follow extends Controller {
 
 	function init() {
-	
+
 		if (ActivityStreams::is_as_request() && argc() == 2) {
 
 			$abook_id = intval(argv(1));
@@ -73,11 +73,11 @@ class Follow extends Controller {
 		$url = notags(trim(punify($_REQUEST['url'])));
 		$return_url = $_SESSION['return_url'];
 		$confirm = intval($_REQUEST['confirm']);
-		$interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);	
+		$interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);
 		$channel = App::get_channel();
 
 		$result = Connect::connect($channel,$url);
-		
+
 		if ($result['success'] == false) {
 			if ($result['message']) {
 				notice($result['message']);
@@ -89,9 +89,9 @@ class Follow extends Controller {
 				json_return_and_die($result);
 			}
 		}
-	
+
 		info( t('Connection added.') . EOL);
-	
+
 		$clone = array();
 		foreach ($result['abook'] as $k => $v) {
 			if (strpos($k,'abook_') === 0) {
@@ -101,30 +101,30 @@ class Follow extends Controller {
 		unset($clone['abook_id']);
 		unset($clone['abook_account']);
 		unset($clone['abook_channel']);
-	
+
 		$abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']);
 		if ($abconfig) {
 			$clone['abconfig'] = $abconfig;
 		}
 		Libsync::build_sync_packet(0, [ 'abook' => [ $clone ] ], true);
-	
+
 		$can_view_stream = their_perms_contains($channel['channel_id'],$clone['abook_xchan'],'view_stream');
-	
+
 		// If we can view their stream, pull in some posts
-	
+
 		if (($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) {
 			Master::Summon([ 'Onepoll', $result['abook']['abook_id'] ]);
 		}
-	
+
 		if ($interactive) {
 			goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?follow=1');
 		}
 		else {
 			json_return_and_die([ 'success' => true ]);
 		}
-	
+
 	}
-	
+
 	function get() {
 		if (! local_channel()) {
 			return login();
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index bc35ac452..32c146bce 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -821,18 +821,16 @@ class Item extends Controller {
 			// and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
 			// we may need virtual or template classes to implement the possible alternatives
 
-			$summary = cleanup_bbcode($summary);
 			$body = cleanup_bbcode($body);
 
 			// Look for tags and linkify them
 
-			$results = linkify_tags($summary, ($uid) ? $uid : $profile_uid);
 			$results = linkify_tags($body, ($uid) ? $uid : $profile_uid);
 
 			if($results) {
 
 				// Set permissions based on tag replacements
-				set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private);
+				set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $private, $parent_item);
 
 				foreach($results as $result) {
 					$success = $result['success'];
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 84c2463d6..ee6ff3619 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -20,13 +20,15 @@ class Network extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']) || strpos($_GET['search'], 'https://') === 0)
-			goaway('search' . '?f=&search=' . $_GET['search']);
+		$search = $_GET['search'] ?? '';
+
+		if(in_array(substr($search, 0, 1),[ '@', '!', '?']) || strpos($search, 'https://') === 0)
+			goaway(z_root() . '/search?f=&search=' . $search);
 
 		if(count($_GET) < 2) {
 			$network_options = get_pconfig(local_channel(),'system','network_page_default');
 			if($network_options)
-				goaway('network' . '?f=&' . $network_options);
+				goaway(z_root() . '/network?f=&' . $network_options);
 		}
 
 		$channel = App::get_channel();
@@ -80,7 +82,7 @@ class Network extends \Zotlabs\Web\Controller {
 				break;
 		}
 
-		$search = (($_GET['search']) ? $_GET['search'] : '');
+		$search = $_GET['search'] ?? '';
 		if($search) {
 			if(strpos($search,'#') === 0) {
 				$hashtags = substr($search,1);
@@ -128,17 +130,19 @@ class Network extends \Zotlabs\Web\Controller {
 		$pf       = ((x($_GET,'pf'))    ? $_GET['pf']            : '');
 		$unseen   = ((x($_GET,'unseen'))    ? $_GET['unseen']            : '');
 
-                if (Apps::system_app_installed(local_channel(),'Affinity Tool')) {
+		if (Apps::system_app_installed(local_channel(),'Affinity Tool')) {
 			$affinity_locked = intval(get_pconfig(local_channel(),'affinity','lock',1));
 			if ($affinity_locked) {
-                        	set_pconfig(local_channel(),'affinity','cmin',$cmin);
-                        	set_pconfig(local_channel(),'affinity','cmax',$cmax);
+				set_pconfig(local_channel(),'affinity','cmin',$cmin);
+				set_pconfig(local_channel(),'affinity','cmax',$cmax);
 			}
-                }
+		}
 
 		if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category || $conv || $unseen)
 			$nouveau = true;
 
+		$cid_r = [];
+
 		if($cid) {
 			$cid_r = q("SELECT abook.abook_xchan, xchan.xchan_addr, xchan.xchan_name, xchan.xchan_url, xchan.xchan_photo_s, xchan.xchan_pubforum from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d and abook_blocked = 0 limit 1",
 				intval($cid),
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index ee360dac5..87697f5a7 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -180,7 +180,7 @@ class Photo extends \Zotlabs\Web\Controller {
 				$channel = channelx_by_n($r[0]['uid']);
 
 				// Now we'll see if we can access the photo
-				$e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
+				$e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
 					dbesc($photo),
 					intval($resolution)
 				);
diff --git a/Zotlabs/Module/Profile.php b/Zotlabs/Module/Profile.php
index 118f11f64..bcc7ad930 100644
--- a/Zotlabs/Module/Profile.php
+++ b/Zotlabs/Module/Profile.php
@@ -29,26 +29,28 @@ class Profile extends Controller {
 			return;
 		}
 
-		$profile = '';
-		$channel = App::get_channel();
-
-		if (!$channel)
-			http_status_exit(404, 'Not found');
-
 		if (ActivityStreams::is_as_request()) {
+			$channel = channelx_by_nick($which);
+			if (!$channel) {
+				http_status_exit(404, 'Not found');
+			}
+
 			$p = Activity::encode_person($channel, true);
 			as_return_and_die(['type' => 'Profile', 'describes' => $p], $channel);
 		}
 
-		nav_set_selected('Profile');
+		$profile = '';
 
 		if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+			$channel = App::get_channel();
 			$which   = $channel['channel_address'];
 			$profile = argv(1);
-			$r       = q("select profile_guid from profile where id = %d and uid = %d limit 1",
+
+			$r = q("select profile_guid from profile where id = %d and uid = %d limit 1",
 				intval($profile),
 				intval(local_channel())
 			);
+
 			if (!$r)
 				$profile = '';
 			$profile = $r[0]['profile_guid'];
@@ -80,7 +82,6 @@ class Profile extends Controller {
 
 		profile_load($which, $profile);
 
-
 	}
 
 	function get() {
@@ -89,11 +90,10 @@ class Profile extends Controller {
 			return login();
 		}
 
-		$groups = [];
-
+		nav_set_selected('Profile');
 
-		$tab = 'profile';
-		$o   = '';
+		$groups = [];
+		$o      = '';
 
 		if (!(perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_profile'))) {
 			notice(t('Permission denied.') . EOL);
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index eeeff9613..8a87d98f7 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -14,7 +14,6 @@ class Search extends Controller {
 			App::$data['search'] = escape_tags($_REQUEST['search']);
 	}
 
-
 	function get($update = 0, $load = false) {
 
 		if ((get_config('system', 'block_public')) || (get_config('system', 'block_public_search'))) {
@@ -194,7 +193,7 @@ class Search extends Controller {
 
 				if (local_channel()) {
 					$r = q("SELECT mid, MAX(id) as item_id from item
-						WHERE ((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = '' AND item.deny_gid  = '' AND item_private = 0 ) 
+						WHERE ((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = '' AND item.deny_gid  = '' AND item_private = 0 )
 						OR ( item.uid = %d )) OR item.owner_xchan = '%s' )
 						$item_normal
 						$sql_extra
@@ -210,7 +209,7 @@ class Search extends Controller {
 						and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK | PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
 							$pub_sql ) OR owner_xchan = '%s')
 						$item_normal
-						$sql_extra 
+						$sql_extra
 						group by mid, created order by created desc $pager_sql",
 						dbesc($sys['xchan_hash'])
 					);
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 541e4fa21..ca8c19600 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -63,15 +63,15 @@ class Setup extends \Zotlabs\Web\Controller {
 				return;
 				// implied break;
 			case 3:
-				$dbhost = trim($_POST['dbhost']);
-				$dbport = intval(trim($_POST['dbport']));
-				$dbuser = trim($_POST['dbuser']);
-				$dbpass = trim($_POST['dbpass']);
-				$dbdata = trim($_POST['dbdata']);
-				$dbtype = intval(trim($_POST['dbtype']));
-				$phpath = trim($_POST['phpath']);
-				$adminmail = trim($_POST['adminmail']);
-				$siteurl = trim($_POST['siteurl']);
+				$dbhost = ((isset($_POST['dbhost'])) ? trim($_POST['dbhost']) : '');
+				$dbuser = ((isset($_POST['dbuser'])) ? trim($_POST['dbuser']) : '');
+				$dbport = ((isset($_POST['dbport'])) ? intval(trim($_POST['dbport'])) : 0);
+				$dbpass = ((isset($_POST['dbpass'])) ? trim($_POST['dbpass']) : '');
+				$dbdata = ((isset($_POST['dbdata'])) ? trim($_POST['dbdata']) : '');
+				$dbtype = ((isset($_POST['dbtype'])) ? intval(trim($_POST['dbtype'])) : 0);
+				$phpath = ((isset($_POST['phpath'])) ? trim($_POST['phpath']) : '');
+				$adminmail = ((isset($_POST['adminmail'])) ? trim($_POST['adminmail']) : '');
+				$siteurl = ((isset($_POST['siteurl'])) ? trim($_POST['siteurl']) : '');
 
 				// $siteurl should not have a trailing slash
 
@@ -88,16 +88,16 @@ class Setup extends \Zotlabs\Web\Controller {
 				return;
 				// implied break;
 			case 4:
-				$dbhost = trim($_POST['dbhost']);
-				$dbport = intval(trim($_POST['dbport']));
-				$dbuser = trim($_POST['dbuser']);
-				$dbpass = trim($_POST['dbpass']);
-				$dbdata = trim($_POST['dbdata']);
-				$dbtype = intval(trim($_POST['dbtype']));
-				$phpath = trim($_POST['phpath']);
-				$timezone = trim($_POST['timezone']);
-				$adminmail = trim($_POST['adminmail']);
-				$siteurl = trim($_POST['siteurl']);
+				$dbhost = ((isset($_POST['dbhost'])) ? trim($_POST['dbhost']) : '');
+				$dbuser = ((isset($_POST['dbuser'])) ? trim($_POST['dbuser']) : '');
+				$dbport = ((isset($_POST['dbport'])) ? intval(trim($_POST['dbport'])) : 0);
+				$dbpass = ((isset($_POST['dbpass'])) ? trim($_POST['dbpass']) : '');
+				$dbdata = ((isset($_POST['dbdata'])) ? trim($_POST['dbdata']) : '');
+				$dbtype = ((isset($_POST['dbtype'])) ? intval(trim($_POST['dbtype'])) : 0);
+				$phpath = ((isset($_POST['phpath'])) ? trim($_POST['phpath']) : '');
+				$timezone = ((isset($_POST['timezone'])) ? trim($_POST['timezone']) : '');
+				$adminmail = ((isset($_POST['adminmail'])) ? trim($_POST['adminmail']) : '');
+				$siteurl = ((isset($_POST['siteurl'])) ? trim($_POST['siteurl']) : '');
 
 				if($siteurl != z_root()) {
 					$test = z_fetch_url($siteurl."/setup/testrewrite");
@@ -108,12 +108,14 @@ class Setup extends \Zotlabs\Web\Controller {
 					}
 				}
 
-				if(! \DBA::$dba->connected) {
+				$db = null;
+
+				if(! isset(\DBA::$dba->connected)) {
 					// connect to db
 					$db = \DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true);
 				}
 
-				if(! \DBA::$dba->connected) {
+				if(! isset(\DBA::$dba->connected)) {
 					echo 'CRITICAL: DB not connected.';
 					killme();
 				}
@@ -126,7 +128,7 @@ class Setup extends \Zotlabs\Web\Controller {
 					'$dbpass'      => $dbpass,
 					'$dbdata'      => $dbdata,
 					'$dbtype'      => $dbtype,
-					'$server_role' => 'pro',
+					'$server_role' => '',
 					'$timezone'    => $timezone,
 					'$siteurl'     => $siteurl,
 					'$site_id'     => random_string(),
@@ -267,14 +269,14 @@ class Setup extends \Zotlabs\Web\Controller {
 
 			case 2: { // Database config
 
-				$dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
-				$dbuser = trim($_POST['dbuser']);
-				$dbport = intval(trim($_POST['dbport']));
-				$dbpass = trim($_POST['dbpass']);
-				$dbdata = trim($_POST['dbdata']);
-				$dbtype = intval(trim($_POST['dbtype']));
-				$phpath = trim($_POST['phpath']);
-				$adminmail = trim($_POST['adminmail']);
+				$dbhost = ((isset($_POST['dbhost'])) ? trim($_POST['dbhost']) : '127.0.0.1');
+				$dbuser = ((isset($_POST['dbuser'])) ? trim($_POST['dbuser']) : '');
+				$dbport = ((isset($_POST['dbport'])) ? intval(trim($_POST['dbport'])) : 0);
+				$dbpass = ((isset($_POST['dbpass'])) ? trim($_POST['dbpass']) : '');
+				$dbdata = ((isset($_POST['dbdata'])) ? trim($_POST['dbdata']) : '');
+				$dbtype = ((isset($_POST['dbtype'])) ? intval(trim($_POST['dbtype'])) : 0);
+				$phpath = ((isset($_POST['phpath'])) ? trim($_POST['phpath']) : '');
+				$adminmail = ((isset($_POST['adminmail'])) ? trim($_POST['adminmail']) : '');
 
 				$tpl = get_markup_template('install_db.tpl');
 				$o .= replace_macros($tpl, array(
@@ -307,17 +309,17 @@ class Setup extends \Zotlabs\Web\Controller {
 			}; break;
 			case 3: { // Site settings
 				require_once('include/datetime.php');
-				$dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
-				$dbport = intval(trim($_POST['dbuser']));
-				$dbuser = trim($_POST['dbuser']);
-				$dbpass = trim($_POST['dbpass']);
-				$dbdata = trim($_POST['dbdata']);
-				$dbtype = intval(trim($_POST['dbtype']));
-				$phpath = trim($_POST['phpath']);
-
-				$adminmail = trim($_POST['adminmail']);
-				$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
 
+				$dbhost = ((isset($_POST['dbhost'])) ? trim($_POST['dbhost']) : '127.0.0.1');
+				$dbuser = ((isset($_POST['dbuser'])) ? trim($_POST['dbuser']) : '');
+				$dbport = ((isset($_POST['dbport'])) ? intval(trim($_POST['dbport'])) : 0);
+				$dbpass = ((isset($_POST['dbpass'])) ? trim($_POST['dbpass']) : '');
+				$dbdata = ((isset($_POST['dbdata'])) ? trim($_POST['dbdata']) : '');
+				$dbtype = ((isset($_POST['dbtype'])) ? intval(trim($_POST['dbtype'])) : 0);
+				$phpath = ((isset($_POST['phpath'])) ? trim($_POST['phpath']) : '');
+				$timezone = ((isset($_POST['timezone'])) ? trim($_POST['timezone']) : 'America/Los_Angeles');
+				$adminmail = ((isset($_POST['adminmail'])) ? trim($_POST['adminmail']) : '');
+				$siteurl = ((isset($_POST['siteurl'])) ? trim($_POST['siteurl']) : '');
 
 				$tpl = get_markup_template('install_settings.tpl');
 				$o .= replace_macros($tpl, array(
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 396e07001..3b39d5b49 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -181,7 +181,10 @@ class Sse_bs extends Controller {
 				$result['network']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
 				xchan_query($items);
 				foreach($items as $item) {
-					$result['network']['notifications'][] = Enotify::format($item);
+					$parsed = Enotify::format($item);
+					if($parsed) {
+						$result['network']['notifications'][] = $parsed;
+					}
 				}
 			}
 			else {
@@ -250,7 +253,10 @@ class Sse_bs extends Controller {
 				$result['dm']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
 				xchan_query($items);
 				foreach($items as $item) {
-					$result['dm']['notifications'][] = Enotify::format($item);
+					$parsed = Enotify::format($item);
+					if($parsed) {
+						$result['dm']['notifications'][] = $parsed;
+					}
 				}
 			}
 			else {
@@ -319,7 +325,10 @@ class Sse_bs extends Controller {
 				$result['home']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
 				xchan_query($items);
 				foreach($items as $item) {
-					$result['home']['notifications'][] = Enotify::format($item);
+					$parsed = Enotify::format($item);
+					if($parsed) {
+						$result['home']['notifications'][] = $parsed;
+					}
 				}
 			}
 			else {
@@ -400,7 +409,10 @@ class Sse_bs extends Controller {
 				$result['pubs']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
 				xchan_query($items);
 				foreach($items as $item) {
-					$result['pubs']['notifications'][] = Enotify::format($item);
+					$parsed = Enotify::format($item);
+					if($parsed) {
+						$result['pubs']['notifications'][] = $parsed;
+					}
 				}
 			}
 			else {
@@ -592,7 +604,10 @@ class Sse_bs extends Controller {
 		if($r) {
 			xchan_query($r);
 			foreach($r as $rr) {
-				$result['files']['notifications'][] = Enotify::format($rr);
+					$parsed = Enotify::format($rr);
+					if($parsed) {
+						$result['files']['notifications'][] = $parsed;
+					}
 			}
 			$result['files']['count'] = count($r);
 		}
diff --git a/Zotlabs/Module/Suggest.php b/Zotlabs/Module/Suggest.php
index 18961214e..0ed6ea8d7 100644
--- a/Zotlabs/Module/Suggest.php
+++ b/Zotlabs/Module/Suggest.php
@@ -15,17 +15,17 @@ class Suggest extends \Zotlabs\Web\Controller {
 
 		if(! Apps::system_app_installed(local_channel(), 'Suggest Channels'))
 			return;
-	
+
 		if(x($_GET,'ignore')) {
 			q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ",
 				intval(local_channel()),
 				dbesc($_GET['ignore'])
 			);
 		}
-	
+
 	}
-			
-	
+
+
 	function get() {
 
 		if(! local_channel()) {
@@ -45,22 +45,22 @@ class Suggest extends \Zotlabs\Web\Controller {
 		$o = '';
 
 		nav_set_selected('Suggest Channels');
-	
+
 		$_SESSION['return_url'] = z_root() . '/' . \App::$cmd;
-	
+
 		$r = suggestion_query(local_channel(),get_observer_hash());
-	
+
 		if(! $r) {
 			info( t('No suggestions available. If this is a new site, please try again in 24 hours.'));
 			return;
 		}
-	
+
 		$arr = array();
-	
+
 		foreach($r as $rr) {
-	
-			$connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr'];
-	
+
+			$connlnk = z_root() . '/follow?f=&url=' . $rr['xchan_addr'];
+
 			$arr[] = array(
 				'url' => chanlink_url($rr['xchan_url']),
 				'common' => $rr['total'],
@@ -73,15 +73,15 @@ class Suggest extends \Zotlabs\Web\Controller {
 				'ignore' => t('Ignore/Hide')
 			);
 		}
-	
-	
+
+
 		$o = replace_macros(get_markup_template('suggest_page.tpl'),array(
 			'$title' => t('Channel Suggestions'),
 			'$entries' => $arr
 		));
-	
+
 		return $o;
-	
+
 	}
-	
+
 }