Merge branch '6.2RC'6.2

8 files changed, 72 insertions, 62 deletions

diff --git a/include/attach.php b/include/attach.php
index 56fb936e7..ef3d6e242 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -684,7 +684,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	$pathname = '';
 
-	if($is_photo) {
+	if($source === 'photos') {
 		if($newalbum) {
 			$pathname = filepath_macro($newalbum);
 		}
@@ -698,6 +698,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 	elseif(array_key_exists('folder',$arr)) {
 		$pathname = find_path_by_hash($channel['channel_id'], $arr['folder']);
 	}
+
 	if(! $pathname) {
 		$pathname = filepath_macro($upload_path);
 	}
diff --git a/include/bbcode.php b/include/bbcode.php
index 87a7e6af6..42790aaca 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -308,7 +308,7 @@ function bb_parse_app($match) {
 
 	$app = Zotlabs\Lib\Apps::app_decode($match[1]);
 	if ($app)
-		return Zotlabs\Lib\Apps::app_render($app);
+		return preg_replace('/[[:cntrl:]]/', '', Zotlabs\Lib\Apps::app_render($app, 'inline'));
 }
 
 function bb_svg($match) {
@@ -1351,12 +1351,18 @@ function bbcode($Text, $options = []) {
 	if (strpos($Text,'[/color]') !== false) {
 		$Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism", "<span style=\"color: $1;\">$2</span>", $Text);
 	}
-	// Check for colored text
+
+	// @DEPRECATED: Check for colored text (deprecated in favor of mark which is a html5 standard)
 	if (strpos($Text,'[/hl]') !== false) {
-        $Text = preg_replace("(\[hl\](.*?)\[\/hl\])ism", "<span class=\"default-highlight\">$1</span>", $Text);
+		$Text = preg_replace("(\[hl\](.*?)\[\/hl\])ism", "<span class=\"default-highlight\">$1</span>", $Text);
 		$Text = preg_replace("(\[hl=(.*?)\](.*?)\[\/hl\])ism", "<span style=\"background-color: $1;\">$2</span>", $Text);
 	}
 
+	if (strpos($Text,'[/mark]') !== false) {
+		$Text = preg_replace("(\[mark\](.*?)\[\/mark\])ism", "<mark class=\"mark\">$1</mark>", $Text);
+		$Text = preg_replace("(\[mark=(.*?)\](.*?)\[\/mark\])ism", "<mark style=\"background-color: $1;\">$2</mark>", $Text);
+	}
+
 	// Check for sized text
 	// [size=50] --> font-size: 50px (with the unit).
 	if (strpos($Text,'[/size]') !== false) {
diff --git a/include/channel.php b/include/channel.php
index c9391c0d0..ed46904e7 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2796,7 +2796,6 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
 	q("DELETE FROM pgrp WHERE uid = %d", intval($channel_id));
 	q("DELETE FROM pgrp_member WHERE uid = %d", intval($channel_id));
 	q("DELETE FROM event WHERE uid = %d", intval($channel_id));
-	q("DELETE FROM mail WHERE channel_id = %d", intval($channel_id));
 	q("DELETE FROM menu WHERE menu_channel_id = %d", intval($channel_id));
 	q("DELETE FROM menu_item WHERE mitem_channel_id = %d", intval($channel_id));
 
@@ -2956,7 +2955,7 @@ function anon_identity_init($reqvars) {
 	}
 
 	if(! validate_email($anon_email)) {
-		logger('enonymous email not valid');
+		logger('anonymous email not valid');
 		return false;
 	}
 
diff --git a/include/connections.php b/include/connections.php
index a1b27e301..59020051c 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -294,21 +294,15 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) {
 				drop_item($rr,false);
 			}
 		}
+
 		$r = q("delete from event where event_xchan = '%s'",
 			dbesc($xchan)
 		);
+
 		$r = q("delete from pgrp_member where xchan = '%s'",
 			dbesc($xchan)
 		);
 
-		// Cannot delete just one side of the conversation since we do not allow
-		// you to block private mail replies. This would leave open a gateway for abuse.
-		// Both participants are owners of the conversation and both can remove it.
-
-		$r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' )",
-			dbesc($xchan),
-			dbesc($xchan)
-		);
 		$r = q("delete from xlink where ( xlink_xchan = '%s' or xlink_link = '%s' )",
 			dbesc($xchan),
 			dbesc($xchan)
@@ -318,7 +312,6 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) {
 			dbesc($xchan)
 		);
 
-
 		if($dirmode === false || $dirmode == DIRECTORY_MODE_NORMAL) {
 
 			$r = q("delete from xchan where xchan_hash = '%s'",
@@ -440,12 +433,6 @@ function contact_remove($channel_id, $abook_id) {
 		intval($channel_id)
 	);
 
-	$r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' ) and channel_id = %d ",
-		dbesc($abook['abook_xchan']),
-		dbesc($abook['abook_xchan']),
-		intval($channel_id)
-	);
-
 	$r = q("delete from abconfig where chan = %d and xchan = '%s'",
 		intval($channel_id),
 		dbesc($abook['abook_xchan'])
diff --git a/include/conversation.php b/include/conversation.php
index c5a0df79a..a7dfa6b73 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1223,7 +1223,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 			if(! $item['thr_parent'])
 				$item['thr_parent'] = $item['parent_mid'];
 
-			$conv_responses[$mode]['mids'][$item['thr_parent']][] = 'b64.' . base64url_encode($item['mid']);
+			$conv_responses[$mode]['mids'][$item['thr_parent']][] = gen_link_id($item['mid']);
 
 			if($item['obj_type'] === 'Answer')
 				continue;
diff --git a/include/nav.php b/include/nav.php
index 994f7e0c0..7cc64ab1b 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -18,14 +18,11 @@ function nav($template = 'default') {
 	App::$page['htmlhead'] = 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 = '';
+	$observer = App::get_observer();
 
 	if (local_channel()) {
-		$channel  = App::get_channel();
-		$observer = App::get_observer();
-
-		$prof     = q("select id from profile where uid = %d and is_default = 1",
+		$channel = App::get_channel();
+		$prof = q("select id from profile where uid = %d and is_default = 1",
 			intval($channel['channel_id'])
 		);
 
@@ -34,10 +31,10 @@ function nav($template = 'default') {
 				intval(get_account_id())
 			);
 		}
+
 		$sitelocation = (($is_owner) ? '' : App::$profile['reddress']);
 	}
-	elseif (remote_channel()) {
-		$observer     = App::get_observer();
+	else {
 		$sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname());
 	}
 
@@ -47,9 +44,9 @@ function nav($template = 'default') {
 	$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']);
-
+	}
 
 	/**
 	 *
@@ -98,7 +95,7 @@ function nav($template = 'default') {
 	if (local_channel()) {
 
 		if (empty($_SESSION['delegate'])) {
-			$nav['manage'] = ['manage', t('Channel Manager'), "", t('Manage your channels'), 'manage_nav_btn'];
+			$nav['manage'] = ['manage', t('Channels'), "", 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'];
@@ -164,8 +161,9 @@ function nav($template = 'default') {
 		];
 	}
 
-	if (((get_config('system', 'register_policy') == REGISTER_OPEN) || (get_config('system', 'register_policy') == REGISTER_APPROVE)) && (empty($_SESSION['authenticated'])))
+	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;
@@ -204,10 +202,6 @@ function nav($template = 'default') {
 
 	call_hooks('nav', $x);
 
-	// Not sure the best place to put this on the page. So I'm implementing it but leaving it
-	// turned off until somebody discovers this and figures out a good location for it.
-	$powered_by = '';
-
 	$url          = '';
 	$settings_url = '';
 
@@ -253,6 +247,7 @@ function nav($template = 'default') {
 				$pinned_list[] = Apps::app_encode($li);
 			}
 		}
+
 		Apps::translate_system_apps($pinned_list);
 
 		usort($pinned_list, 'Zotlabs\\Lib\\Apps::app_name_compare');
@@ -266,6 +261,7 @@ function nav($template = 'default') {
 				$syslist[] = Apps::app_encode($li);
 			}
 		}
+
 		Apps::translate_system_apps($syslist);
 
 	}
@@ -293,12 +289,13 @@ function nav($template = 'default') {
 
 	if ($syslist) {
 		foreach ($syslist as $app) {
-			if (isset(App::$nav_sel['name']) && App::$nav_sel['name'] == $app['name'])
+			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');
 			}
-			elseif (!$is_owner && (!isset($app['requires']) || (isset($app['requires']) && strpos($app['requires'], 'local_channel') === false))) {
+			elseif (!isset($app['requires']) || (isset($app['requires']) && strpos($app['requires'], 'local_channel') === false)) {
 				$nav_apps[] = Apps::app_render($app, 'nav');
 			}
 		}
@@ -326,19 +323,23 @@ function nav($template = 'default') {
 		'$localuser'          => local_channel(),
 		'$is_owner'           => $is_owner,
 		'$sel'                => App::$nav_sel,
-		'$powered_by'         => $powered_by,
-		'$help'               => t('@name, !forum, #tag, ?doc, content'),
+		'$help'               => t('@name, #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'),
+		'$addapps'            => t('Apps'),
+		'$channelapps'        => t('Channel Apps'),
+		'$sysapps'            => t('System Apps'),
+		'$pinned_apps'        => t('Pinned Apps'),
+		'$featured_apps'      => t('Featured Apps'),
 		'$url'                => (($url) ? $url : z_root() . '/' . App::$cmd),
-		'$settings_url'       => $settings_url
+		'$settings_url'       => $settings_url,
+		'$name'               => ((!$is_owner) ? App::$profile['fullname'] : ''),
+		'$thumb'              => ((!$is_owner) ? App::$profile['thumb'] : ''),
+		'$form_security_token' => get_form_security_token('pconfig')
 	]);
 
 	if (x($_SESSION, 'reload_avatar') && $observer) {
@@ -368,29 +369,33 @@ 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;
+	}
 }
 
 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)
-		return '';
+	if (App::$is_sys) {
+		return EMPTY_STR;
+	}
 
 	$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 EMPTY_STR;
+	}
 
 	if ($uid == local_channel()) {
-		return;
+		return EMPTY_STR;
 	}
 	else {
 		$cal_link = '/cal/' . $nickname;
@@ -549,8 +554,6 @@ function channel_apps($is_owner = false, $nickname = null) {
 	return replace_macros(get_markup_template('profile_tabs.tpl'),
 		[
 			'$tabs'  => $arr['tabs'],
-			'$name'  => App::$profile['channel_name'],
-			'$thumb' => App::$profile['thumb'],
 		]
 	);
 }
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 256369c69..b7ace4f37 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -247,7 +247,6 @@ function import_xchan_photo($photo, $xchan, $thing = false, $force = false) {
 			$result = z_fetch_url($photo, true, 0, [ 'headers' => $h ]);
 		}
 
-
 		if(isset($result)) {
 			$hdrs = [];
 			$h = explode("\n", $result['header']);
diff --git a/include/text.php b/include/text.php
index 841abdbd3..bd2df45aa 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1610,7 +1610,7 @@ function format_hashtags(&$item) {
 			if($s)
 				$s .= ' ';
 
-			$s .= '<span class="badge badge-pill badge-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
+			$s .= '<span class="badge rounded-pill bg-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
 		}
 	}
 
@@ -1633,7 +1633,7 @@ function format_mentions(&$item) {
 				continue;
 			if($s)
 				$s .= ' ';
-			$s .= '<span class="badge badge-pill badge-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
+			$s .= '<span class="badge rounded-pill bg-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
 		}
 	}
 
@@ -2156,12 +2156,12 @@ function base64url_encode($s, $strip_padding = true) {
 	return $s;
 }
 
-function base64url_decode($s) {
+function base64url_decode($s, $strict = false) {
 	if(is_array($s)) {
 		logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true));
 		return $s;
 	}
-	return base64_decode(strtr($s,'-_','+/'));
+	return base64_decode(strtr($s,'-_','+/'), $strict);
 }
 
 
@@ -2175,12 +2175,12 @@ function base64special_encode($s, $strip_padding = true) {
 	return $s;
 }
 
-function base64special_decode($s) {
+function base64special_decode($s, $strict = false) {
 	if(is_array($s)) {
 		logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true));
 		return $s;
 	}
-	return base64_decode(strtr($s,',.','+/'));
+	return base64_decode(strtr($s,',.','+/'), $strict);
 }
 
 /**
@@ -3589,6 +3589,21 @@ function gen_link_id($mid) {
 	return $mid;
 }
 
+/**
+ * @brief check if the provided string starts with 'b64.' and try to decode it if so.
+ * If it could be decoded return the decoded string or false if decoding failed.
+ * If the string does not start with 'b64.', return the string as is.
+ *
+ * @param string $mid
+ * @return string|boolean false
+ */
+function unpack_link_id($mid) {
+	if (is_string($mid) && strpos($mid, 'b64.') === 0) {
+		$mid = @base64url_decode(substr($mid, 4), true);
+		return $mid;
+	}
+	return $mid;
+}
 
 // callback for array_walk