X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact.php;h=230ad4b57bd008938c0a273846609c734424a4c8;hb=f3da5b3a2f98883e4a06c345dfe2880394f7d21d;hp=0eb912e00a7b962d5c5f13bfcedc623d643f4f19;hpb=389685e09944e3823effd2e820ab2fd95d8b4b32;p=friendica.git

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 0eb912e00a..230ad4b57b 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -6,11 +6,14 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
-use Friendica\Core\Addon;
+use Friendica\Core\ACL;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -18,8 +21,7 @@ use Friendica\Model;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Core\ACL;
-use Friendica\Module\Login;
+use Friendica\Util\Strings;
 
 /**
  *  Manages and show Contacts and their content
@@ -37,11 +39,8 @@ class Contact extends BaseModule
 		}
 
 		$nets = defaults($_GET, 'nets', '');
-		if ($nets == 'all') {
-			$nets = '';
-		}
 
-		if (!x($a->page, 'aside')) {
+		if (empty($a->page['aside'])) {
 			$a->page['aside'] = '';
 		}
 
@@ -51,10 +50,10 @@ class Contact extends BaseModule
 			|| $a->argc == 3 && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])
 		) {
 			$contact_id = intval($a->argv[1]);
-			$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+			$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
 
 			if (!DBA::isResult($contact)) {
-				$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0]);
+				$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0, 'deleted' => false]);
 			}
 
 			// Don't display contacts that are about to be deleted
@@ -66,27 +65,26 @@ class Contact extends BaseModule
 		if (DBA::isResult($contact)) {
 			if ($contact['self']) {
 				if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
-					goaway('profile/' . $contact['nick']);
+					$a->internalRedirect('profile/' . $contact['nick']);
 				} else {
-					goaway('profile/' . $contact['nick'] . '?tab=profile');
+					$a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile');
 				}
 			}
 
 			$a->data['contact'] = $contact;
 
 			if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) {
-				$networkname = format_network_name($contact['network'], $contact['url']);
+				$network_link = Strings::formatNetworkName($contact['network'], $contact['url']);
 			} else {
-				$networkname = '';
+				$network_link = '';
 			}
 
-			/// @TODO Add nice spaces
-			$vcard_widget = replace_macros(get_markup_template('vcard-widget.tpl'), [
-				'$name'         => htmlentities($contact['name']),
+			$vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('vcard-widget.tpl'), [
+				'$name'         => $contact['name'],
 				'$photo'        => $contact['photo'],
 				'$url'          => Model\Contact::MagicLink($contact['url']),
 				'$addr'         => defaults($contact, 'addr', ''),
-				'$network_name' => $networkname,
+				'$network_link' => $network_link,
 				'$network'      => L10n::t('Network:'),
 				'$account_type' => Model\Contact::getAccountType($contact)
 			]);
@@ -112,7 +110,7 @@ class Contact extends BaseModule
 			$groups_widget = null;
 		}
 
-		$a->page['aside'] .= replace_macros(get_markup_template('contacts-widget-sidebar.tpl'), [
+		$a->page['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contacts-widget-sidebar.tpl'), [
 			'$vcard_widget'      => $vcard_widget,
 			'$findpeople_widget' => $findpeople_widget,
 			'$follow_widget'     => $follow_widget,
@@ -121,8 +119,8 @@ class Contact extends BaseModule
 		]);
 
 		$base = $a->getBaseURL();
-		$tpl = get_markup_template('contacts-head.tpl');
-		$a->page['htmlhead'] .= replace_macros($tpl, [
+		$tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
+		$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$base' => $base
 		]);
@@ -136,7 +134,7 @@ class Contact extends BaseModule
 
 		$contacts_id = $_POST['contact_batch'];
 
-		$stmt = DBA::select('contact', ['id'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false]);
+		$stmt = DBA::select('contact', ['id', 'archive'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false, 'deleted' => false]);
 		$orig_records = DBA::toArray($stmt);
 
 		$count_actions = 0;
@@ -168,7 +166,7 @@ class Contact extends BaseModule
 			info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
 		}
 
-		goaway('contact');
+		$a->internalRedirect('contact');
 	}
 
 	public static function post()
@@ -189,13 +187,13 @@ class Contact extends BaseModule
 			return;
 		}
 
-		if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
+		if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false])) {
 			notice(L10n::t('Could not access contact record.') . EOL);
-			goaway('contact');
+			$a->internalRedirect('contact');
 			return; // NOTREACHED
 		}
 
-		Addon::callHooks('contact_edit_post', $_POST);
+		Hook::callAll('contact_edit_post', $_POST);
 
 		$profile_id = intval(defaults($_POST, 'profile-assign', 0));
 		if ($profile_id) {
@@ -211,14 +209,14 @@ class Contact extends BaseModule
 
 		$fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
 
-		$ffi_keyword_blacklist = escape_tags(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
+		$ffi_keyword_blacklist = Strings::escapeHtml(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
 
 		$priority = intval(defaults($_POST, 'poll', 0));
 		if ($priority > 5 || $priority < 0) {
 			$priority = 0;
 		}
 
-		$info = escape_tags(trim($_POST['info']));
+		$info = Strings::escapeHtml(trim(defaults($_POST, 'info', '')));
 
 		$r = DBA::update('contact', [
 			'profile-id' => $profile_id,
@@ -237,7 +235,7 @@ class Contact extends BaseModule
 			notice(L10n::t('Failed to update contact record.') . EOL);
 		}
 
-		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
 		if (DBA::isResult($contact)) {
 			$a->data['contact'] = $contact;
 		}
@@ -249,7 +247,7 @@ class Contact extends BaseModule
 
 	private static function updateContactFromPoll($contact_id)
 	{
-		$contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
 		if (!DBA::isResult($contact)) {
 			return;
 		}
@@ -270,7 +268,7 @@ class Contact extends BaseModule
 
 	private static function updateContactFromProbe($contact_id)
 	{
-		$contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
 		if (!DBA::isResult($contact)) {
 			return;
 		}
@@ -301,7 +299,7 @@ class Contact extends BaseModule
 			}
 		}
 
-		$fields['nurl'] = normalise_link($data['url']);
+		$fields['nurl'] = Strings::normaliseLink($data['url']);
 
 		if (!empty($data['priority'])) {
 			$fields['priority'] = intval($data['priority']);
@@ -311,7 +309,7 @@ class Contact extends BaseModule
 			return;
 		}
 
-		$r = DBA::update('contact', $fields, ['id' => $contact_id, 'uid' => local_user()]);
+		DBA::update('contact', $fields, ['id' => $contact_id, 'uid' => local_user()]);
 
 		// Update the entry in the contact table
 		Model\Contact::updateAvatar($data['photo'], local_user(), $contact_id, true);
@@ -334,7 +332,7 @@ class Contact extends BaseModule
 
 	private static function archiveContact($contact_id, $orig_record)
 	{
-		$archived = (($orig_record['archive']) ? 0 : 1);
+		$archived = (defaults($orig_record, 'archive', '') ? 0 : 1);
 		$r = DBA::update('contact', ['archive' => $archived], ['id' => $contact_id, 'uid' => local_user()]);
 
 		return DBA::isResult($r);
@@ -371,22 +369,22 @@ class Contact extends BaseModule
 
 			$cmd = $a->argv[2];
 
-			$orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]);
+			$orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false, 'deleted' => false]);
 			if (!DBA::isResult($orig_record)) {
 				notice(L10n::t('Could not access contact record.') . EOL);
-				goaway('contact');
+				$a->internalRedirect('contact');
 				return; // NOTREACHED
 			}
 
 			if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromPoll($contact_id);
-				goaway('contact/' . $contact_id);
+				$a->internalRedirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
 			if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromProbe($contact_id);
-				goaway('crepair/' . $contact_id);
+				$a->internalRedirect('crepair/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -396,7 +394,7 @@ class Contact extends BaseModule
 				$blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
 				info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
 
-				goaway('contact/' . $contact_id);
+				$a->internalRedirect('contact/' . $contact_id);
 				return; // NOTREACHED
 			}
 
@@ -406,7 +404,7 @@ class Contact extends BaseModule
 				$ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
 				info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
 
-				goaway('contact/' . $contact_id);
+				$a->internalRedirect('contact/' . $contact_id);
 				return; // NOTREACHED
 			}
 
@@ -417,7 +415,7 @@ class Contact extends BaseModule
 					info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
 				}
 
-				goaway('contact/' . $contact_id);
+				$a->internalRedirect('contact/' . $contact_id);
 				return; // NOTREACHED
 			}
 
@@ -437,7 +435,7 @@ class Contact extends BaseModule
 
 					$a->page['aside'] = '';
 
-					return replace_macros(get_markup_template('contact_drop_confirm.tpl'), [
+					return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
 						'$header' => L10n::t('Drop contact'),
 						'$contact' => self::getContactTemplateVars($orig_record),
 						'$method' => 'get',
@@ -451,13 +449,13 @@ class Contact extends BaseModule
 				}
 				// Now check how the user responded to the confirmation query
 				if (!empty($_REQUEST['canceled'])) {
-					goaway('contact');
+					$a->internalRedirect('contact');
 				}
 
 				self::dropContact($orig_record);
 				info(L10n::t('Contact has been removed.') . EOL);
 
-				goaway('contact');
+				$a->internalRedirect('contact');
 				return; // NOTREACHED
 			}
 			if ($cmd === 'posts') {
@@ -468,13 +466,12 @@ class Contact extends BaseModule
 			}
 		}
 
-		$_SESSION['return_url'] = $a->query_string;
+		$_SESSION['return_path'] = $a->query_string;
 
 		if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
-			$contact_id = $a->data['contact']['id'];
 			$contact = $a->data['contact'];
 
-			$a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), [
+			$a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
 				'$baseurl' => $a->getBaseURL(true),
 			]);
 
@@ -511,7 +508,7 @@ class Contact extends BaseModule
 				$relation_text = '';
 			}
 
-			$relation_text = sprintf($relation_text, htmlentities($contact['name']));
+			$relation_text = sprintf($relation_text, $contact['name']);
 
 			$url = Model\Contact::magicLink($contact['url']);
 			if (strpos($url, 'redir/') === 0) {
@@ -522,9 +519,9 @@ class Contact extends BaseModule
 
 			$insecure = L10n::t('Private communications are not available for this contact.');
 
-			$last_update = (($contact['last-update'] <= NULL_DATE) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
+			$last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
 
-			if ($contact['last-update'] > NULL_DATE) {
+			if ($contact['last-update'] > DBA::NULL_DATETIME) {
 				$last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t('(Update was successful)') : L10n::t('(Update was not successful)'));
 			}
 			$lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
@@ -536,7 +533,7 @@ class Contact extends BaseModule
 			// tabs
 			$tab_str = self::getTabsHTML($a, $contact, 3);
 
-			$lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
+			$lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
 
 			$fetch_further_information = null;
 			if ($contact['network'] == Protocol::FEED) {
@@ -567,12 +564,12 @@ class Contact extends BaseModule
 			/// @todo Only show the following link with DFRN when the remote version supports it
 			$follow = '';
 			$follow_text = '';
-			if (in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
+			if ($contact['uid'] && in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
 				if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 					$follow = $a->getBaseURL(true) . '/unfollow?url=' . urlencode($contact['url']);
 					$follow_text = L10n::t('Disconnect/Unfollow');
 				}
-			} else {
+			} elseif(!$contact['pending']) {
 				$follow = $a->getBaseURL(true) . '/follow?url=' . urlencode($contact['url']);
 				$follow_text = L10n::t('Connect/Follow');
 			}
@@ -590,8 +587,8 @@ class Contact extends BaseModule
 				$contact_settings_label = null;
 			}
 
-			$tpl = get_markup_template('contact_edit.tpl');
-			$o .= replace_macros($tpl, [
+			$tpl = Renderer::getMarkupTemplate('contact_edit.tpl');
+			$o .= Renderer::replaceMacros($tpl, [
 				'$header'         => L10n::t('Contact'),
 				'$tab_str'        => $tab_str,
 				'$submit'         => L10n::t('Submit'),
@@ -599,7 +596,7 @@ class Contact extends BaseModule
 				'$lbl_vis2'       => L10n::t('Please choose the profile you would like to display to %s when viewing your profile securely.', $contact['name']),
 				'$lbl_info1'      => $lbl_info1,
 				'$lbl_info2'      => L10n::t('Their personal note'),
-				'$reason'         => trim(notags($contact['reason'])),
+				'$reason'         => trim(Strings::escapeTags($contact['reason'])),
 				'$infedit'        => L10n::t('Edit contact notes'),
 				'$common_link'    => 'common/loc/' . local_user() . '/' . $contact['id'],
 				'$relation_text'  => $relation_text,
@@ -633,10 +630,9 @@ class Contact extends BaseModule
 				'$hidden'         => ['hidden', L10n::t('Hide this contact from others'), ($contact['hidden'] == 1), L10n::t('Replies/likes to your public posts <strong>may</strong> still be visible')],
 				'$notify'         => ['notify', L10n::t('Notification for new posts'), ($contact['notify_new_posts'] == 1), L10n::t('Send a notification of every new post of this contact')],
 				'$fetch_further_information' => $fetch_further_information,
-				'$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'],
 				'$ffi_keyword_blacklist' => ['ffi_keyword_blacklist', L10n::t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], L10n::t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')],
 				'$photo'          => $contact['photo'],
-				'$name'           => htmlentities($contact['name']),
+				'$name'           => $contact['name'],
 				'$dir_icon'       => $dir_icon,
 				'$sparkle'        => $sparkle,
 				'$url'            => $url,
@@ -660,7 +656,7 @@ class Contact extends BaseModule
 
 			$arr = ['contact' => $contact, 'output' => $o];
 
-			Addon::callHooks('contact_edit', $arr);
+			Hook::callAll('contact_edit', $arr);
 
 			return $arr['output'];
 		}
@@ -692,8 +688,8 @@ class Contact extends BaseModule
 
 		$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
 
-		$search = notags(trim(defaults($_GET, 'search', '')));
-		$nets   = notags(trim(defaults($_GET, 'nets'  , '')));
+		$search = Strings::escapeTags(trim(defaults($_GET, 'search', '')));
+		$nets   = Strings::escapeTags(trim(defaults($_GET, 'nets'  , '')));
 
 		$tabs = [
 			[
@@ -752,10 +748,18 @@ class Contact extends BaseModule
 				'id'    => 'showhidden-tab',
 				'accesskey' => 'h',
 			],
+			[
+				'label' => L10n::t('Groups'),
+				'url'   => 'group',
+				'sel'   => ($hidden) ? 'active' : '',
+				'title' => L10n::t('Organize your contact groups'),
+				'id'    => 'contactgroups-tab',
+				'accesskey' => 'e',
+			],
 		];
 
-		$tab_tpl = get_markup_template('common_tabs.tpl');
-		$t = replace_macros($tab_tpl, ['$tabs' => $tabs]);
+		$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+		$t = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
 		$total = 0;
 		$searching = false;
@@ -763,7 +767,7 @@ class Contact extends BaseModule
 		if ($search) {
 			$searching = true;
 			$search_hdr = $search;
-			$search_txt = DBA::escape(protect_sprintf(preg_quote($search)));
+			$search_txt = DBA::escape(Strings::protectSprintf(preg_quote($search)));
 			$sql_extra .= " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt'  OR nick REGEXP '$search_txt') ";
 		}
 
@@ -771,6 +775,8 @@ class Contact extends BaseModule
 			$sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
 		}
 
+		$sql_extra .=  " AND NOT `deleted` ";
+
 		$sql_extra2 = ((($sort_type > 0) && ($sort_type <= Model\Contact::FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : '');
 
 		$r = q("SELECT COUNT(*) AS `total` FROM `contact`
@@ -778,9 +784,9 @@ class Contact extends BaseModule
 			intval($_SESSION['uid'])
 		);
 		if (DBA::isResult($r)) {
-			$a->setPagerTotal($r[0]['total']);
 			$total = $r[0]['total'];
 		}
+		$pager = new Pager($a->query_string);
 
 		$sql_extra3 = Widget::unavailableNetworks();
 
@@ -788,8 +794,8 @@ class Contact extends BaseModule
 
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ",
 			intval($_SESSION['uid']),
-			intval($a->pager['start']),
-			intval($a->pager['itemspage'])
+			$pager->getStart(),
+			$pager->getItemsPerPage()
 		);
 		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
@@ -799,8 +805,8 @@ class Contact extends BaseModule
 			}
 		}
 
-		$tpl = get_markup_template('contacts-template.tpl');
-		$o .= replace_macros($tpl, [
+		$tpl = Renderer::getMarkupTemplate('contacts-template.tpl');
+		$o .= Renderer::replaceMacros($tpl, [
 			'$baseurl'    => System::baseUrl(),
 			'$header'     => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''),
 			'$tabs'       => $t,
@@ -821,7 +827,7 @@ class Contact extends BaseModule
 				'contacts_batch_drop'    => L10n::t('Delete'),
 			],
 			'$h_batch_actions' => L10n::t('Batch Actions'),
-			'$paginate'   => paginate($a),
+			'$paginate'   => $pager->renderFull($total),
 		]);
 
 		return $o;
@@ -832,12 +838,12 @@ class Contact extends BaseModule
 	 *
 	 * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends'
 	 *
-	 * @param App $a
-	 * @param array $contact The contact array
-	 * @param int $active_tab 1 if tab should be marked as active
+	 * @param App   $a
+	 * @param array $contact    The contact array
+	 * @param int   $active_tab 1 if tab should be marked as active
 	 *
-	 * @return string | HTML string of the contact page tabs buttons.
-
+	 * @return string HTML string of the contact page tabs buttons.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getTabsHTML($a, $contact, $active_tab)
 	{
@@ -902,8 +908,8 @@ class Contact extends BaseModule
 			];
 		}
 
-		$tab_tpl = get_markup_template('common_tabs.tpl');
-		$tab_str = replace_macros($tab_tpl, ['$tabs' => $tabs]);
+		$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+		$tab_str = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
 		return $tab_str;
 	}
@@ -930,7 +936,7 @@ class Contact extends BaseModule
 			}
 		}
 
-		$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
+		$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
 
 		if (!$update) {
 			$o .= self::getTabsHTML($a, $contact, 1);
@@ -954,7 +960,7 @@ class Contact extends BaseModule
 
 	private static function getPostsHTML($a, $contact_id)
 	{
-		$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
+		$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
 
 		$o = self::getTabsHTML($a, $contact, 2);
 
@@ -1022,14 +1028,14 @@ class Contact extends BaseModule
 			'alt_text'  => $alt_text,
 			'dir_icon'  => $dir_icon,
 			'thumb'     => ProxyUtils::proxifyUrl($rr['thumb'], false, ProxyUtils::SIZE_THUMB),
-			'name'      => htmlentities($rr['name']),
-			'username'  => htmlentities($rr['name']),
+			'name'      => $rr['name'],
+			'username'  => $rr['name'],
 			'account_type' => Model\Contact::getAccountType($rr),
 			'sparkle'   => $sparkle,
 			'itemurl'   => defaults($rr, 'addr', $rr['url']),
 			'url'       => $url,
 			'network'   => ContactSelector::networkToName($rr['network'], $rr['url']),
-			'nick'      => htmlentities($rr['nick']),
+			'nick'      => $rr['nick'],
 		];
 	}