]> git.mxchange.org Git - friendica.git/blobdiff - src/Module/Contact.php
Show the relations of Twitter contacts
[friendica.git] / src / Module / Contact.php
index eb21b3b3e17e1ef8bb41d0a2d57b7eba465fb9dd..84420afaad9129476e6fe27831e4a0ff76932421 100644 (file)
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
@@ -6,130 +25,30 @@ 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\L10n;
+use Friendica\Core\ACL;
+use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
+use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\GContact;
-use Friendica\Model\Group;
-use Friendica\Model\Profile;
-use Friendica\Network\Probe;
+use Friendica\DI;
+use Friendica\Model;
+use Friendica\Module\Security\Login;
+use Friendica\Network\HTTPException\BadRequestException;
+use Friendica\Network\HTTPException\NotFoundException;
 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
- *
- *  @brief manages contacts
  */
-class Contact extends BaseModule 
+class Contact extends BaseModule
 {
-       public static function init()
-       {
-               $a = self::getApp();
-
-               if (!local_user()) {
-                       return;
-               }
-
-               $nets = defaults($_GET, 'nets', '');
-               if ($nets == "all") {
-                       $nets = "";
-               }
-
-               if (!x($a->page, 'aside')) {
-                       $a->page['aside'] = '';
-               }
-
-               $contact_id = null;
-               $contact = null;
-               if ((($a->argc == 2) && intval($a->argv[1])) || (($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()]);
-
-                       if (!DBA::isResult($contact)) {
-                               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0]);
-                       }
-
-                       // Don't display contacts that are about to be deleted
-                       if ($contact['network'] == Protocol::PHANTOM) {
-                               $contact = false;
-                       }
-               }
-
-               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']);
-                               } else {
-                                       goaway('profile/' . $contact['nick'] . '?tab=profile');
-                               }
-                       }
-
-                       $a->data['contact'] = $contact;
-
-                       if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != Protocol::DFRN)) {
-                               $networkname = format_network_name($a->data['contact']['network'], $a->data['contact']['url']);
-                       } else {
-                               $networkname = '';
-                       }
-
-                       /// @TODO Add nice spaces
-                       $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
-                               '$name' => htmlentities($a->data['contact']['name']),
-                               '$photo' => $a->data['contact']['photo'],
-                               '$url' => Contact::MagicLink($a->data['contact']['url']),
-                               '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
-                               '$network_name' => $networkname,
-                               '$network' => L10n::t('Network:'),
-                               '$account_type' => Contact::getAccountType($a->data['contact'])
-                       ]);
-
-                       $findpeople_widget = '';
-                       $follow_widget = '';
-                       $networks_widget = '';
-               } else {
-                       $vcard_widget = '';
-                       $networks_widget = Widget::networks('contacts', $nets);
-                       if (isset($_GET['add'])) {
-                               $follow_widget = Widget::follow($_GET['add']);
-                       } else {
-                               $follow_widget = Widget::follow();
-                       }
-
-                       $findpeople_widget = Widget::findPeople();
-               }
-
-               if ($contact['uid'] != 0) {
-                       $groups_widget = Group::sidebarWidget('contacts', 'group', 'full', 'everyone', $contact_id);
-               } else {
-                       $groups_widget = null;
-               }
-
-               $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"), [
-                       '$vcard_widget' => $vcard_widget,
-                       '$findpeople_widget' => $findpeople_widget,
-                       '$follow_widget' => $follow_widget,
-                       '$groups_widget' => $groups_widget,
-                       '$networks_widget' => $networks_widget
-               ]);
-
-               $base = System::baseUrl();
-               $tpl = get_markup_template("contacts-head.tpl");
-               $a->page['htmlhead'] .= replace_macros($tpl, [
-                       '$baseurl' => System::baseUrl(true),
-                       '$base' => $base
-               ]);
-       }
-
-       private static function batchActions(App $a)
+       private static function batchActions()
        {
                if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
                        return;
@@ -137,113 +56,101 @@ class Contact extends BaseModule
 
                $contacts_id = $_POST['contact_batch'];
 
-               $orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0",
-                       implode(",", $contacts_id),
-                       intval(local_user())
-               );
+               $stmt = DBA::select('contact', ['id', 'archive'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false, 'deleted' => false]);
+               $orig_records = DBA::toArray($stmt);
 
                $count_actions = 0;
                foreach ($orig_records as $orig_record) {
                        $contact_id = $orig_record['id'];
-                       if (x($_POST, 'contacts_batch_update')) {
+                       if (!empty($_POST['contacts_batch_update'])) {
                                self::updateContactFromPoll($contact_id);
                                $count_actions++;
                        }
-                       if (x($_POST, 'contacts_batch_block')) {
+                       if (!empty($_POST['contacts_batch_block'])) {
                                self::blockContact($contact_id);
                                $count_actions++;
                        }
-                       if (x($_POST, 'contacts_batch_ignore')) {
+                       if (!empty($_POST['contacts_batch_ignore'])) {
                                self::ignoreContact($contact_id);
                                $count_actions++;
                        }
-                       if (x($_POST, 'contacts_batch_archive')) {
-                               $r = self::archiveContact($contact_id, $orig_record);
-                               if ($r) {
-                                       $count_actions++;
-                               }
+                       if (!empty($_POST['contacts_batch_archive'])
+                               && self::archiveContact($contact_id, $orig_record)
+                       ) {
+                               $count_actions++;
                        }
-                       if (x($_POST, 'contacts_batch_drop')) {
+                       if (!empty($_POST['contacts_batch_drop'])) {
                                self::dropContact($orig_record);
                                $count_actions++;
                        }
                }
                if ($count_actions > 0) {
-                       info(L10n::tt("%d contact edited.", "%d contacts edited.", $count_actions));
+                       info(DI::l10n()->tt('%d contact edited.', '%d contacts edited.', $count_actions));
                }
 
-               goaway('contacts');
+               DI::baseUrl()->redirect('contact');
        }
 
-       public static function post()
+       public static function post(array $parameters = [])
        {
-               $a = self::getApp();
+               $a = DI::app();
 
                if (!local_user()) {
                        return;
                }
 
-               if ($a->argv[1] === "batch") {
-                       self::batchActions($a);
+               // @TODO: Replace with parameter from router
+               if ($a->argv[1] === 'batch') {
+                       self::batchActions();
                        return;
                }
 
+               // @TODO: Replace with parameter from router
                $contact_id = intval($a->argv[1]);
                if (!$contact_id) {
                        return;
                }
 
-               if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
-                       notice(L10n::t('Could not access contact record.') . EOL);
-                       goaway('contacts');
+               if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false])) {
+                       notice(DI::l10n()->t('Could not access contact record.') . EOL);
+                       DI::baseUrl()->redirect('contact');
                        return; // NOTREACHED
                }
 
-               Addon::callHooks('contact_edit_post', $_POST);
-
-               $profile_id = intval(defaults($_POST, 'profile-assign', 0));
-               if ($profile_id) {
-                       if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
-                               notice(L10n::t('Could not locate selected profile.') . EOL);
-                               return;
-                       }
-               }
+               Hook::callAll('contact_edit_post', $_POST);
 
-               $hidden = intval($_POST['hidden']);
+               $hidden = !empty($_POST['hidden']);
 
-               $notify = intval($_POST['notify']);
+               $notify = !empty($_POST['notify']);
 
-               $fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
+               $fetch_further_information = intval($_POST['fetch_further_information'] ?? 0);
 
-               $ffi_keyword_blacklist = escape_tags(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
+               $ffi_keyword_blacklist = Strings::escapeHtml(trim($_POST['ffi_keyword_blacklist'] ?? ''));
 
-               $priority = intval(defaults($_POST, 'poll', 0));
+               $priority = intval($_POST['poll'] ?? 0);
                if ($priority > 5 || $priority < 0) {
                        $priority = 0;
                }
 
-               $info = escape_tags(trim($_POST['info']));
-
-               $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s',
-                       `hidden` = %d, `notify_new_posts` = %d, `fetch_further_information` = %d,
-                       `ffi_keyword_blacklist` = '%s' WHERE `id` = %d AND `uid` = %d",
-                       intval($profile_id),
-                       intval($priority),
-                       DBA::escape($info),
-                       intval($hidden),
-                       intval($notify),
-                       intval($fetch_further_information),
-                       DBA::escape($ffi_keyword_blacklist),
-                       intval($contact_id),
-                       intval(local_user())
+               $info = Strings::escapeHtml(trim($_POST['info'] ?? ''));
+
+               $r = DBA::update('contact', [
+                       'priority'   => $priority,
+                       'info'       => $info,
+                       'hidden'     => $hidden,
+                       'notify_new_posts' => $notify,
+                       'fetch_further_information' => $fetch_further_information,
+                       'ffi_keyword_blacklist'     => $ffi_keyword_blacklist],
+                       ['id' => $contact_id, 'uid' => local_user()]
                );
+
                if (DBA::isResult($r)) {
-                       info(L10n::t('Contact updated.') . EOL);
+                       info(DI::l10n()->t('Contact updated.') . EOL);
                } else {
-                       notice(L10n::t('Failed to update contact record.') . EOL);
+                       notice(DI::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;
                }
@@ -255,206 +162,278 @@ 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;
                }
 
-               $uid = $contact["uid"];
+               $uid = $contact['uid'];
 
-               if ($contact["network"] == Protocol::OSTATUS) {
-                       $result = Contact::createFromProbe($uid, $contact["url"], false, $contact["network"]);
+               if ($contact['network'] == Protocol::OSTATUS) {
+                       $result = Model\Contact::createFromProbe($uid, $contact['url'], false, $contact['network']);
 
                        if ($result['success']) {
-                               q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", intval($contact_id));
+                               DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
                        }
                } else {
                        // pull feed and consume it, which should subscribe to the hub.
-                       Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
+                       Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
                }
        }
 
        private static function updateContactFromProbe($contact_id)
        {
-               $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
+               $contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
                if (!DBA::isResult($contact)) {
                        return;
                }
 
-               $uid = $contact["uid"];
+               // Update the entry in the contact table
+               Model\Contact::updateFromProbe($contact_id, '', true);
 
-               $data = Probe::uri($contact["url"], "", 0, false);
+               // Update the entry in the gcontact table
+               Model\GContact::updateFromProbe($contact['url']);
+       }
 
-               // "Feed" or "Unknown" is mostly a sign of communication problems
-               if ((in_array($data["network"], [Protocol::FEED, Protocol::PHANTOM])) && ($data["network"] != $contact["network"])) {
-                       return;
-               }
+       /**
+        * Toggles the blocked status of a contact identified by id.
+        *
+        * @param $contact_id
+        * @throws \Exception
+        */
+       private static function blockContact($contact_id)
+       {
+               $blocked = !Model\Contact::isBlockedByUser($contact_id, local_user());
+               Model\Contact::setBlockedForUser($contact_id, local_user(), $blocked);
+       }
 
-               $updatefields = ["name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
-                       "poco", "network", "alias"];
-               $update = [];
+       /**
+        * Toggles the ignored status of a contact identified by id.
+        *
+        * @param $contact_id
+        * @throws \Exception
+        */
+       private static function ignoreContact($contact_id)
+       {
+               $ignored = !Model\Contact::isIgnoredByUser($contact_id, local_user());
+               Model\Contact::setIgnoredForUser($contact_id, local_user(), $ignored);
+       }
 
-               if ($data["network"] == Protocol::OSTATUS) {
-                       $result = Contact::createFromProbe($uid, $data["url"], false);
+       /**
+        * Toggles the archived status of a contact identified by id.
+        * If the current status isn't provided, this will always archive the contact.
+        *
+        * @param $contact_id
+        * @param $orig_record
+        * @return bool
+        * @throws \Exception
+        */
+       private static function archiveContact($contact_id, $orig_record)
+       {
+               $archived = empty($orig_record['archive']);
+               $r = DBA::update('contact', ['archive' => $archived], ['id' => $contact_id, 'uid' => local_user()]);
 
-                       if ($result['success']) {
-                               $update["subhub"] = true;
-                       }
+               return DBA::isResult($r);
+       }
+
+       private static function dropContact($orig_record)
+       {
+               $owner = Model\User::getOwnerDataById(local_user());
+               if (!DBA::isResult($owner)) {
+                       return;
                }
 
-               foreach ($updatefields AS $field) {
-                       if (isset($data[$field]) && ($data[$field] != "")) {
-                               $update[$field] = $data[$field];
-                       }
+               Model\Contact::terminateFriendship($owner, $orig_record, true);
+               Model\Contact::remove($orig_record['id']);
+       }
+
+       public static function content(array $parameters = [], $update = 0)
+       {
+               if (!local_user()) {
+                       return Login::form($_SERVER['REQUEST_URI']);
                }
 
-               $update["nurl"] = normalise_link($data["url"]);
+               $a = DI::app();
 
-               $query = "";
+               $search = Strings::escapeTags(trim($_GET['search'] ?? ''));
+               $nets   = Strings::escapeTags(trim($_GET['nets']   ?? ''));
+               $rel    = Strings::escapeTags(trim($_GET['rel']    ?? ''));
+               $group  = Strings::escapeTags(trim($_GET['group']  ?? ''));
 
-               if (isset($data["priority"]) && ($data["priority"] != 0)) {
-                       $query = "`priority` = " . intval($data["priority"]);
+               if (empty(DI::page()['aside'])) {
+                       DI::page()['aside'] = '';
                }
 
-               foreach ($update AS $key => $value) {
-                       if ($query != "") {
-                               $query .= ", ";
+               $contact_id = null;
+               $contact = null;
+               // @TODO: Replace with parameter from router
+               if ($a->argc == 2 && intval($a->argv[1])
+                       || $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(), 'deleted' => false]);
+
+                       if (!DBA::isResult($contact)) {
+                               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0, 'deleted' => false]);
                        }
 
-                       $query .= "`" . $key . "` = '" . DBA::escape($value) . "'";
+                       // Don't display contacts that are about to be deleted
+                       if ($contact['network'] == Protocol::PHANTOM) {
+                               $contact = false;
+                       }
                }
 
-               if ($query == "") {
-                       return;
-               }
+               if (DBA::isResult($contact)) {
+                       if ($contact['self']) {
+                               // @TODO: Replace with parameter from router
+                               if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
+                                       DI::baseUrl()->redirect('profile/' . $contact['nick']);
+                               } else {
+                                       DI::baseUrl()->redirect('profile/' . $contact['nick'] . '/profile');
+                               }
+                       }
 
-               $r = q("UPDATE `contact` SET $query WHERE `id` = %d AND `uid` = %d",
-                       intval($contact_id),
-                       intval(local_user())
-               );
+                       $a->data['contact'] = $contact;
 
-               // Update the entry in the contact table
-               Contact::updateAvatar($data['photo'], local_user(), $contact_id, true);
+                       if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) {
+                               $network_link = Strings::formatNetworkName($contact['network'], $contact['url']);
+                       } else {
+                               $network_link = '';
+                       }
 
-               // Update the entry in the gcontact table
-               GContact::updateFromProbe($data["url"]);
-       }
+                       $follow_link = '';
+                       $unfollow_link = '';
+                       if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+                               if ($contact['uid'] && in_array($contact['rel'], [Model\Contact::SHARING, Model\Contact::FRIEND])) {
+                                       $unfollow_link = 'unfollow?url=' . urlencode($contact['url']);
+                               } elseif(!$contact['pending']) {
+                                       $follow_link = 'follow?url=' . urlencode($contact['url']);
+                               }
+                       }
 
-       private static function blockContact($contact_id)
-       {
-               $blocked = !Contact::isBlockedByUser($contact_id, local_user());
-               Contact::setBlockedForUser($contact_id, local_user(), $blocked);
-       }
+                       $wallmessage_link = '';
+                       if ($contact['uid'] && Model\Contact::canReceivePrivateMessages($contact)) {
+                               $wallmessage_link = 'message/new/' . $contact['id'];
+                       }
 
-       private static function ignoreContact($contact_id)
-       {
-               $ignored = !Contact::isIgnoredByUser($contact_id, local_user());
-               Contact::setIgnoredForUser($contact_id, local_user(), $ignored);
-       }
+                       $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
+                               '$name'         => $contact['name'],
+                               '$photo'        => $contact['photo'],
+                               '$url'          => Model\Contact::magicLinkByContact($contact, $contact['url']),
+                               '$addr'         => $contact['addr'] ?? '',
+                               '$network_link' => $network_link,
+                               '$network'      => DI::l10n()->t('Network:'),
+                               '$account_type' => Model\Contact::getAccountType($contact),
+                               '$follow'       => DI::l10n()->t('Follow'),
+                               '$follow_link'   => $follow_link,
+                               '$unfollow'     => DI::l10n()->t('Unfollow'),
+                               '$unfollow_link' => $unfollow_link,
+                               '$wallmessage'  => DI::l10n()->t('Message'),
+                               '$wallmessage_link' => $wallmessage_link,
+                       ]);
 
-       private static function archiveContact($contact_id, $orig_record)
-       {
-               $archived = (($orig_record['archive']) ? 0 : 1);
-               $r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d",
-                       intval($archived),
-                       intval($contact_id),
-                       intval(local_user())
-               );
-               return DBA::isResult($r);
-       }
+                       $findpeople_widget = '';
+                       $follow_widget = '';
+                       $networks_widget = '';
+                       $rel_widget = '';
 
-       private static function dropContact($orig_record)
-       {
-               $a = get_app();
+                       if ($contact['uid'] != 0) {
+                               $groups_widget = Model\Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact_id);
+                       } else {
+                               $groups_widget = '';
+                       }
+               } else {
+                       $vcard_widget = '';
+                       $findpeople_widget = Widget::findPeople();
+                       if (isset($_GET['add'])) {
+                               $follow_widget = Widget::follow($_GET['add']);
+                       } else {
+                               $follow_widget = Widget::follow();
+                       }
 
-               $r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
-                       WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
-                       intval($a->user['uid'])
-               );
-               if (!DBA::isResult($r)) {
-                       return;
+                       $networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets);
+                       $rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel);
+                       $groups_widget = Widget::groups($_SERVER['REQUEST_URI'], $group);
                }
 
-               Contact::terminateFriendship($r[0], $orig_record, true);
-               Contact::remove($orig_record['id']);
-       }
+               DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget;
+
+               $tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+                       '$baseurl' => DI::baseUrl()->get(true),
+               ]);
 
-       public static function content($update = 0)
-       {
-               $a = self::getApp();
-               $sort_type = 0;
                $o = '';
-               Nav::setSelected('contacts');
+               Nav::setSelected('contact');
 
                if (!local_user()) {
-                       notice(L10n::t('Permission denied.') . EOL);
+                       notice(DI::l10n()->t('Permission denied.') . EOL);
                        return Login::form();
                }
 
                if ($a->argc == 3) {
                        $contact_id = intval($a->argv[1]);
                        if (!$contact_id) {
-                               return;
+                               throw new BadRequestException();
                        }
 
+                       // @TODO: Replace with parameter from router
                        $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('contacts');
-                               return; // NOTREACHED
+                               throw new NotFoundException(DI::l10n()->t('Contact not found'));
                        }
 
                        if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
                                self::updateContactFromPoll($contact_id);
-                               goaway('contacts/' . $contact_id);
+                               DI::baseUrl()->redirect('contact/' . $contact_id);
                                // NOTREACHED
                        }
 
                        if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
                                self::updateContactFromProbe($contact_id);
-                               goaway('crepair/' . $contact_id);
+                               DI::baseUrl()->redirect('contact/' . $contact_id . '/advanced/');
                                // NOTREACHED
                        }
 
                        if ($cmd === 'block') {
                                self::blockContact($contact_id);
 
-                               $blocked = Contact::isBlockedByUser($contact_id, local_user());
-                               info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
+                               $blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
+                               info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked')) . EOL);
 
-                               goaway('contacts/' . $contact_id);
-                               return; // NOTREACHED
+                               DI::baseUrl()->redirect('contact/' . $contact_id);
+                               // NOTREACHED
                        }
 
                        if ($cmd === 'ignore') {
                                self::ignoreContact($contact_id);
 
-                               $ignored = Contact::isIgnoredByUser($contact_id, local_user());
-                               info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
+                               $ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
+                               info(($ignored ? DI::l10n()->t('Contact has been ignored') : DI::l10n()->t('Contact has been unignored')) . EOL);
 
-                               goaway('contacts/' . $contact_id);
-                               return; // NOTREACHED
+                               DI::baseUrl()->redirect('contact/' . $contact_id);
+                               // NOTREACHED
                        }
 
                        if ($cmd === 'archive' && ($orig_record['uid'] != 0)) {
                                $r = self::archiveContact($contact_id, $orig_record);
                                if ($r) {
                                        $archived = (($orig_record['archive']) ? 0 : 1);
-                                       info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
+                                       info((($archived) ? DI::l10n()->t('Contact has been archived') : DI::l10n()->t('Contact has been unarchived')) . EOL);
                                }
 
-                               goaway('contacts/' . $contact_id);
-                               return; // NOTREACHED
+                               DI::baseUrl()->redirect('contact/' . $contact_id);
+                               // NOTREACHED
                        }
 
                        if ($cmd === 'drop' && ($orig_record['uid'] != 0)) {
                                // Check if we should do HTML-based delete confirmation
-                               if (x($_REQUEST, 'confirm')) {
-                                       // <form> can't take arguments in its "action" parameter
+                               if (!empty($_REQUEST['confirm'])) {
+                                       // <form> can't take arguments in its 'action' parameter
                                        // so add any arguments as hidden inputs
-                                       $query = explode_querystring($a->query_string);
+                                       $query = explode_querystring(DI::args()->getQueryString());
                                        $inputs = [];
                                        foreach ($query['args'] as $arg) {
                                                if (strpos($arg, 'confirm=') === false) {
@@ -463,30 +442,30 @@ class Contact extends BaseModule
                                                }
                                        }
 
-                                       $a->page['aside'] = '';
+                                       DI::page()['aside'] = '';
 
-                                       return replace_macros(get_markup_template('contact_drop_confirm.tpl'), [
-                                               '$header' => L10n::t('Drop contact'),
+                                       return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
+                                               '$header' => DI::l10n()->t('Drop contact'),
                                                '$contact' => self::getContactTemplateVars($orig_record),
                                                '$method' => 'get',
-                                               '$message' => L10n::t('Do you really want to delete this contact?'),
+                                               '$message' => DI::l10n()->t('Do you really want to delete this contact?'),
                                                '$extra_inputs' => $inputs,
-                                               '$confirm' => L10n::t('Yes'),
+                                               '$confirm' => DI::l10n()->t('Yes'),
                                                '$confirm_url' => $query['base'],
                                                '$confirm_name' => 'confirmed',
-                                               '$cancel' => L10n::t('Cancel'),
+                                               '$cancel' => DI::l10n()->t('Cancel'),
                                        ]);
                                }
                                // Now check how the user responded to the confirmation query
-                               if (x($_REQUEST, 'canceled')) {
-                                       goaway('contacts');
+                               if (!empty($_REQUEST['canceled'])) {
+                                       DI::baseUrl()->redirect('contact');
                                }
 
                                self::dropContact($orig_record);
-                               info(L10n::t('Contact has been removed.') . EOL);
+                               info(DI::l10n()->t('Contact has been removed.') . EOL);
 
-                               goaway('contacts');
-                               return; // NOTREACHED
+                               DI::baseUrl()->redirect('contact');
+                               // NOTREACHED
                        }
                        if ($cmd === 'posts') {
                                return self::getPostsHTML($a, $contact_id);
@@ -496,35 +475,34 @@ class Contact extends BaseModule
                        }
                }
 
-               $_SESSION['return_url'] = $a->query_string;
+               $_SESSION['return_path'] = DI::args()->getQueryString();
 
-               if ((x($a->data, 'contact')) && (is_array($a->data['contact']))) {
-                       $contact_id = $a->data['contact']['id'];
+               if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
                        $contact = $a->data['contact'];
 
-                       $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), [
-                               '$baseurl' => System::baseUrl(true),
+                       DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
+                               '$baseurl' => DI::baseUrl()->get(true),
                        ]);
 
-                       $contact['blocked'] Contact::isBlockedByUser($contact['id'], local_user());
-                       $contact['readonly'] = Contact::isIgnoredByUser($contact['id'], local_user());
+                       $contact['blocked']  = Model\Contact::isBlockedByUser($contact['id'], local_user());
+                       $contact['readonly'] = Model\Contact::isIgnoredByUser($contact['id'], local_user());
 
                        $dir_icon = '';
                        $relation_text = '';
                        switch ($contact['rel']) {
-                               case Contact::FRIEND:
+                               case Model\Contact::FRIEND:
                                        $dir_icon = 'images/lrarrow.gif';
-                                       $relation_text = L10n::t('You are mutual friends with %s');
+                                       $relation_text = DI::l10n()->t('You are mutual friends with %s');
                                        break;
 
-                               case Contact::FOLLOWER;
+                               case Model\Contact::FOLLOWER;
                                        $dir_icon = 'images/larrow.gif';
-                                       $relation_text = L10n::t('You are sharing with %s');
+                                       $relation_text = DI::l10n()->t('You are sharing with %s');
                                        break;
 
-                               case Contact::SHARING;
+                               case Model\Contact::SHARING;
                                        $dir_icon = 'images/rarrow.gif';
-                                       $relation_text = L10n::t('%s is sharing with you');
+                                       $relation_text = DI::l10n()->t('%s is sharing with you');
                                        break;
 
                                default:
@@ -535,401 +513,431 @@ class Contact extends BaseModule
                                $relation_text = '';
                        }
 
-                       if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
-                               $relation_text = "";
+                       if (!in_array($contact['network'], array_merge(Protocol::FEDERATED, [Protocol::TWITTER]))) {
+                               $relation_text = '';
                        }
 
-                       $relation_text = sprintf($relation_text, htmlentities($contact['name']));
+                       $relation_text = sprintf($relation_text, $contact['name']);
 
-                       $url = Contact::magicLink($contact['url']);
+                       $url = Model\Contact::magicLink($contact['url']);
                        if (strpos($url, 'redir/') === 0) {
                                $sparkle = ' class="sparkle" ';
                        } else {
                                $sparkle = '';
                        }
 
-                       $insecure = L10n::t('Private communications are not available for this contact.');
+                       $insecure = DI::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) ? DI::l10n()->t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
 
-                       if ($contact['last-update'] > NULL_DATE) {
-                               $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t("\x28Update was successful\x29") : L10n::t("\x28Update was not successful\x29"));
+                       if ($contact['last-update'] > DBA::NULL_DATETIME) {
+                               $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? DI::l10n()->t('(Update was successful)') : DI::l10n()->t('(Update was not successful)'));
                        }
-                       $lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
+                       $lblsuggest = (($contact['network'] === Protocol::DFRN) ? DI::l10n()->t('Suggest friends') : '');
 
                        $poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
 
-                       $nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact["url"]));
+                       $nettype = DI::l10n()->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
 
                        // 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()) ? DI::l10n()->t('Communications lost with this contact!') : '');
 
                        $fetch_further_information = null;
                        if ($contact['network'] == Protocol::FEED) {
                                $fetch_further_information = [
                                        'fetch_further_information',
-                                       L10n::t('Fetch further information for feeds'),
+                                       DI::l10n()->t('Fetch further information for feeds'),
                                        $contact['fetch_further_information'],
-                                       L10n::t("Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn't contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags."),
-                                       ['0' => L10n::t('Disabled'),
-                                               '1' => L10n::t('Fetch information'),
-                                               '3' => L10n::t('Fetch keywords'),
-                                               '2' => L10n::t('Fetch information and keywords')
+                                       DI::l10n()->t('Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn\'t contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags.'),
+                                       [
+                                               '0' => DI::l10n()->t('Disabled'),
+                                               '1' => DI::l10n()->t('Fetch information'),
+                                               '3' => DI::l10n()->t('Fetch keywords'),
+                                               '2' => DI::l10n()->t('Fetch information and keywords')
                                        ]
                                ];
                        }
 
                        $poll_interval = null;
                        if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
-                               $poll_interval = ContactSelector::pollInterval($contact['priority'], (!$poll_enabled));
-                       }
-
-                       $profile_select = null;
-                       if ($contact['network'] == Protocol::DFRN) {
-                               $profile_select = ContactSelector::profileAssign($contact['profile-id'], (($contact['network'] !== Protocol::DFRN) ? true : false));
-                       }
-
-                       /// @todo Only show the following link with DFRN when the remote version supports it
-                       $follow = '';
-                       $follow_text = '';
-                       if (in_array($contact['rel'], [Contact::FRIEND, Contact::SHARING])) {
-                               if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-                                       $follow = System::baseUrl(true) . "/unfollow?url=" . urlencode($contact["url"]);
-                                       $follow_text = L10n::t("Disconnect/Unfollow");
-                               }
-                       } else {
-                               $follow = System::baseUrl(true) . "/follow?url=" . urlencode($contact["url"]);
-                               $follow_text = L10n::t("Connect/Follow");
+                               $poll_interval = ContactSelector::pollInterval($contact['priority'], !$poll_enabled);
                        }
 
                        // Load contactact related actions like hide, suggest, delete and others
                        $contact_actions = self::getContactActions($contact);
 
                        if ($contact['uid'] != 0) {
-                               $lbl_vis1 = L10n::t('Profile Visibility');
-                               $lbl_info1 = L10n::t('Contact Information / Notes');
-                               $contact_settings_label = L10n::t('Contact Settings');
+                               $lbl_info1 = DI::l10n()->t('Contact Information / Notes');
+                               $contact_settings_label = DI::l10n()->t('Contact Settings');
                        } else {
-                               $lbl_vis1 = null;
                                $lbl_info1 = null;
                                $contact_settings_label = null;
                        }
 
-                       $tpl = get_markup_template("contact_edit.tpl");
-                       $o .= replace_macros($tpl, [
-                               '$header' => L10n::t("Contact"),
-                               '$tab_str' => $tab_str,
-                               '$submit' => L10n::t('Submit'),
-                               '$lbl_vis1' => $lbl_vis1,
-                               '$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'])),
-                               '$infedit' => L10n::t('Edit contact notes'),
-                               '$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'],
-                               '$relation_text' => $relation_text,
-                               '$visit' => L10n::t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
-                               '$blockunblock' => L10n::t('Block/Unblock contact'),
-                               '$ignorecont' => L10n::t('Ignore contact'),
-                               '$lblcrepair' => L10n::t("Repair URL settings"),
-                               '$lblrecent' => L10n::t('View conversations'),
-                               '$lblsuggest' => $lblsuggest,
-                               '$nettype' => $nettype,
-                               '$poll_interval' => $poll_interval,
-                               '$poll_enabled' => $poll_enabled,
-                               '$lastupdtext' => L10n::t('Last update:'),
-                               '$lost_contact' => $lost_contact,
-                               '$updpub' => L10n::t('Update public posts'),
-                               '$last_update' => $last_update,
-                               '$udnow' => L10n::t('Update now'),
-                               '$follow' => $follow,
-                               '$follow_text' => $follow_text,
-                               '$profile_select' => $profile_select,
-                               '$contact_id' => $contact['id'],
-                               '$block_text' => ($contact['blocked'] ? L10n::t('Unblock') : L10n::t('Block')),
-                               '$ignore_text' => ($contact['readonly'] ? L10n::t('Unignore') : L10n::t('Ignore')),
-                               '$insecure' => (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]) ? '' : $insecure),
-                               '$info' => $contact['info'],
-                               '$cinfo' => ['info', '', $contact['info'], ''],
-                               '$blocked' => ($contact['blocked'] ? L10n::t('Currently blocked') : ''),
-                               '$ignored' => ($contact['readonly'] ? L10n::t('Currently ignored') : ''),
-                               '$archived' => ($contact['archive'] ? L10n::t('Currently archived') : ''),
-                               '$pending' => ($contact['pending'] ? L10n::t('Awaiting connection acknowledge') : ''),
-                               '$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')],
+                       $tpl = Renderer::getMarkupTemplate('contact_edit.tpl');
+                       $o .= Renderer::replaceMacros($tpl, [
+                               '$header'         => DI::l10n()->t('Contact'),
+                               '$tab_str'        => $tab_str,
+                               '$submit'         => DI::l10n()->t('Submit'),
+                               '$lbl_info1'      => $lbl_info1,
+                               '$lbl_info2'      => DI::l10n()->t('Their personal note'),
+                               '$reason'         => trim(Strings::escapeTags($contact['reason'])),
+                               '$infedit'        => DI::l10n()->t('Edit contact notes'),
+                               '$common_link'    => 'common/loc/' . local_user() . '/' . $contact['id'],
+                               '$relation_text'  => $relation_text,
+                               '$visit'          => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
+                               '$blockunblock'   => DI::l10n()->t('Block/Unblock contact'),
+                               '$ignorecont'     => DI::l10n()->t('Ignore contact'),
+                               '$lblrecent'      => DI::l10n()->t('View conversations'),
+                               '$lblsuggest'     => $lblsuggest,
+                               '$nettype'        => $nettype,
+                               '$poll_interval'  => $poll_interval,
+                               '$poll_enabled'   => $poll_enabled,
+                               '$lastupdtext'    => DI::l10n()->t('Last update:'),
+                               '$lost_contact'   => $lost_contact,
+                               '$updpub'         => DI::l10n()->t('Update public posts'),
+                               '$last_update'    => $last_update,
+                               '$udnow'          => DI::l10n()->t('Update now'),
+                               '$contact_id'     => $contact['id'],
+                               '$block_text'     => ($contact['blocked'] ? DI::l10n()->t('Unblock') : DI::l10n()->t('Block')),
+                               '$ignore_text'    => ($contact['readonly'] ? DI::l10n()->t('Unignore') : DI::l10n()->t('Ignore')),
+                               '$insecure'       => (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]) ? '' : $insecure),
+                               '$info'           => $contact['info'],
+                               '$cinfo'          => ['info', '', $contact['info'], ''],
+                               '$blocked'        => ($contact['blocked'] ? DI::l10n()->t('Currently blocked') : ''),
+                               '$ignored'        => ($contact['readonly'] ? DI::l10n()->t('Currently ignored') : ''),
+                               '$archived'       => ($contact['archive'] ? DI::l10n()->t('Currently archived') : ''),
+                               '$pending'        => ($contact['pending'] ? DI::l10n()->t('Awaiting connection acknowledge') : ''),
+                               '$hidden'         => ['hidden', DI::l10n()->t('Hide this contact from others'), ($contact['hidden'] == 1), DI::l10n()->t('Replies/likes to your public posts <strong>may</strong> still be visible')],
+                               '$notify'         => ['notify', DI::l10n()->t('Notification for new posts'), ($contact['notify_new_posts'] == 1), DI::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']),
-                               '$dir_icon' => $dir_icon,
-                               '$sparkle' => $sparkle,
-                               '$url' => $url,
-                               '$profileurllabel' => L10n::t('Profile URL'),
-                               '$profileurl' => $contact['url'],
-                               '$account_type' => Contact::getAccountType($contact),
-                               '$location' => BBCode::convert($contact["location"]),
-                               '$location_label' => L10n::t("Location:"),
-                               '$xmpp' => BBCode::convert($contact["xmpp"]),
-                               '$xmpp_label' => L10n::t("XMPP:"),
-                               '$about' => BBCode::convert($contact["about"], false),
-                               '$about_label' => L10n::t("About:"),
-                               '$keywords' => $contact["keywords"],
-                               '$keywords_label' => L10n::t("Tags:"),
-                               '$contact_action_button' => L10n::t("Actions"),
-                               '$contact_actions' => $contact_actions,
-                               '$contact_status' => L10n::t("Status"),
+                               '$ffi_keyword_blacklist' => ['ffi_keyword_blacklist', DI::l10n()->t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], DI::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'           => $contact['name'],
+                               '$dir_icon'       => $dir_icon,
+                               '$sparkle'        => $sparkle,
+                               '$url'            => $url,
+                               '$profileurllabel'=> DI::l10n()->t('Profile URL'),
+                               '$profileurl'     => $contact['url'],
+                               '$account_type'   => Model\Contact::getAccountType($contact),
+                               '$location'       => BBCode::convert($contact['location']),
+                               '$location_label' => DI::l10n()->t('Location:'),
+                               '$xmpp'           => BBCode::convert($contact['xmpp']),
+                               '$xmpp_label'     => DI::l10n()->t('XMPP:'),
+                               '$about'          => BBCode::convert($contact['about'], false),
+                               '$about_label'    => DI::l10n()->t('About:'),
+                               '$keywords'       => $contact['keywords'],
+                               '$keywords_label' => DI::l10n()->t('Tags:'),
+                               '$contact_action_button' => DI::l10n()->t('Actions'),
+                               '$contact_actions'=> $contact_actions,
+                               '$contact_status' => DI::l10n()->t('Status'),
                                '$contact_settings_label' => $contact_settings_label,
-                               '$contact_profile_label' => L10n::t("Profile"),
+                               '$contact_profile_label' => DI::l10n()->t('Profile'),
                        ]);
 
                        $arr = ['contact' => $contact, 'output' => $o];
 
-                       Addon::callHooks('contact_edit', $arr);
+                       Hook::callAll('contact_edit', $arr);
 
                        return $arr['output'];
                }
 
-               $blocked = false;
-               $hidden = false;
-               $ignored = false;
-               $archived = false;
-               $all = false;
-
-               if (($a->argc == 2) && ($a->argv[1] === 'all')) {
-                       $sql_extra = '';
-                       $all = true;
-               } elseif (($a->argc == 2) && ($a->argv[1] === 'blocked')) {
-                       $sql_extra = " AND `blocked` = 1 ";
-                       $blocked = true;
-               } elseif (($a->argc == 2) && ($a->argv[1] === 'hidden')) {
-                       $sql_extra = " AND `hidden` = 1 ";
-                       $hidden = true;
-               } elseif (($a->argc == 2) && ($a->argv[1] === 'ignored')) {
-                       $sql_extra = " AND `readonly` = 1 ";
-                       $ignored = true;
-               } elseif (($a->argc == 2) && ($a->argv[1] === 'archived')) {
-                       $sql_extra = " AND `archive` = 1 ";
-                       $archived = true;
-               } else {
-                       $sql_extra = " AND `blocked` = 0 ";
+               $sql_values = [local_user()];
+
+               // @TODO: Replace with parameter from router
+               $type = $a->argv[1] ?? '';
+
+               switch ($type) {
+                       case 'blocked':
+                               $sql_extra = " AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = ? and `user-contact`.`blocked`)";
+                               // This makes the query look for contact.uid = 0
+                               array_unshift($sql_values, 0);
+                               break;
+                       case 'hidden':
+                               $sql_extra = " AND `hidden` AND NOT `blocked` AND NOT `pending`";
+                               break;
+                       case 'ignored':
+                               $sql_extra = " AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = ? and `user-contact`.`ignored`)";
+                               // This makes the query look for contact.uid = 0
+                               array_unshift($sql_values, 0);
+                               break;
+                       case 'archived':
+                               $sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
+                               break;
+                       case 'pending':
+                               $sql_extra = " AND `pending` AND NOT `archive` AND ((`rel` = ?)
+                                       OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))";
+                               $sql_values[] = Model\Contact::SHARING;
+                               break;
+                       default:
+                               $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
+                               break;
+               }
+
+               $searching = false;
+               $search_hdr = null;
+               if ($search) {
+                       $searching = true;
+                       $search_hdr = $search;
+                       $search_txt = preg_quote($search);
+                       $sql_extra .= " AND (name REGEXP ? OR url REGEXP ? OR nick REGEXP ?)";
+                       $sql_values[] = $search_txt;
+                       $sql_values[] = $search_txt;
+                       $sql_values[] = $search_txt;
+               }
+
+               if ($nets) {
+                       $sql_extra .= " AND network = ? ";
+                       $sql_values[] = $nets;
                }
 
-               $sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
+               switch ($rel) {
+                       case 'followers':
+                               $sql_extra .= " AND `rel` IN (?, ?)";
+                               $sql_values[] = Model\Contact::FOLLOWER;
+                               $sql_values[] = Model\Contact::FRIEND;
+                               break;
+                       case 'following':
+                               $sql_extra .= " AND `rel` IN (?, ?)";
+                               $sql_values[] = Model\Contact::SHARING;
+                               $sql_values[] = Model\Contact::FRIEND;
+                               break;
+                       case 'mutuals':
+                               $sql_extra .= " AND `rel` = ?";
+                               $sql_values[] = Model\Contact::FRIEND;
+                               break;
+               }
+
+               if ($group) {
+                       $sql_extra = " AND EXISTS(SELECT `id` FROM `group_member` WHERE `gid` = ? AND `contact`.`id` = `contact-id`)";
+                       $sql_values[] = $group;
+               }
+
+               $sql_extra .= Widget::unavailableNetworks();
+
+               $total = 0;
+               $stmt = DBA::p("SELECT COUNT(*) AS `total`
+                       FROM `contact`
+                       WHERE `uid` = ?
+                       AND `self` = 0
+                       AND NOT `deleted`
+                       $sql_extra",
+                       $sql_values
+               );
+               if (DBA::isResult($stmt)) {
+                       $total = DBA::fetch($stmt)['total'];
+               }
+               DBA::close($stmt);
+
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
-               $search = x($_GET, 'search') ? notags(trim($_GET['search'])) : '';
-               $nets   = x($_GET, 'nets'  ) ? notags(trim($_GET['nets']))   : '';
+               $sql_values[] = $pager->getStart();
+               $sql_values[] = $pager->getItemsPerPage();
+
+               $contacts = [];
+
+               $stmt = DBA::p("SELECT *
+                       FROM `contact`
+                       WHERE `uid` = ?
+                       AND `self` = 0
+                       AND NOT `deleted`
+                       $sql_extra
+                       ORDER BY `name` ASC
+                       LIMIT ?, ?",
+                       $sql_values
+               );
+               while ($contact = DBA::fetch($stmt)) {
+                       $contact['blocked'] = Model\Contact::isBlockedByUser($contact['id'], local_user());
+                       $contact['readonly'] = Model\Contact::isIgnoredByUser($contact['id'], local_user());
+                       $contacts[] = self::getContactTemplateVars($contact);
+               }
+               DBA::close($stmt);
 
                $tabs = [
                        [
-                               'label' => L10n::t('Suggestions'),
-                               'url'   => 'suggest',
-                               'sel'   => '',
-                               'title' => L10n::t('Suggest potential friends'),
-                               'id'    => 'suggestions-tab',
-                               'accesskey' => 'g',
-                       ],
-                       [
-                               'label' => L10n::t('All Contacts'),
-                               'url'   => 'contacts/all',
-                               'sel'   => ($all) ? 'active' : '',
-                               'title' => L10n::t('Show all contacts'),
+                               'label' => DI::l10n()->t('All Contacts'),
+                               'url'   => 'contact',
+                               'sel'   => !$type ? 'active' : '',
+                               'title' => DI::l10n()->t('Show all contacts'),
                                'id'    => 'showall-tab',
                                'accesskey' => 'l',
                        ],
                        [
-                               'label' => L10n::t('Unblocked'),
-                               'url'   => 'contacts',
-                               'sel'   => ((!$all) && (!$blocked) && (!$hidden) && (!$search) && (!$nets) && (!$ignored) && (!$archived)) ? 'active' : '',
-                               'title' => L10n::t('Only show unblocked contacts'),
-                               'id'    => 'showunblocked-tab',
-                               'accesskey' => 'o',
+                               'label' => DI::l10n()->t('Pending'),
+                               'url'   => 'contact/pending',
+                               'sel'   => $type == 'pending' ? 'active' : '',
+                               'title' => DI::l10n()->t('Only show pending contacts'),
+                               'id'    => 'showpending-tab',
+                               'accesskey' => 'p',
                        ],
                        [
-                               'label' => L10n::t('Blocked'),
-                               'url'   => 'contacts/blocked',
-                               'sel'   => ($blocked) ? 'active' : '',
-                               'title' => L10n::t('Only show blocked contacts'),
+                               'label' => DI::l10n()->t('Blocked'),
+                               'url'   => 'contact/blocked',
+                               'sel'   => $type == 'blocked' ? 'active' : '',
+                               'title' => DI::l10n()->t('Only show blocked contacts'),
                                'id'    => 'showblocked-tab',
                                'accesskey' => 'b',
                        ],
                        [
-                               'label' => L10n::t('Ignored'),
-                               'url'   => 'contacts/ignored',
-                               'sel'   => ($ignored) ? 'active' : '',
-                               'title' => L10n::t('Only show ignored contacts'),
+                               'label' => DI::l10n()->t('Ignored'),
+                               'url'   => 'contact/ignored',
+                               'sel'   => $type == 'ignored' ? 'active' : '',
+                               'title' => DI::l10n()->t('Only show ignored contacts'),
                                'id'    => 'showignored-tab',
                                'accesskey' => 'i',
                        ],
                        [
-                               'label' => L10n::t('Archived'),
-                               'url'   => 'contacts/archived',
-                               'sel'   => ($archived) ? 'active' : '',
-                               'title' => L10n::t('Only show archived contacts'),
+                               'label' => DI::l10n()->t('Archived'),
+                               'url'   => 'contact/archived',
+                               'sel'   => $type == 'archived' ? 'active' : '',
+                               'title' => DI::l10n()->t('Only show archived contacts'),
                                'id'    => 'showarchived-tab',
                                'accesskey' => 'y',
                        ],
                        [
-                               'label' => L10n::t('Hidden'),
-                               'url'   => 'contacts/hidden',
-                               'sel'   => ($hidden) ? 'active' : '',
-                               'title' => L10n::t('Only show hidden contacts'),
+                               'label' => DI::l10n()->t('Hidden'),
+                               'url'   => 'contact/hidden',
+                               'sel'   => $type == 'hidden' ? 'active' : '',
+                               'title' => DI::l10n()->t('Only show hidden contacts'),
                                'id'    => 'showhidden-tab',
                                'accesskey' => 'h',
                        ],
+                       [
+                               'label' => DI::l10n()->t('Groups'),
+                               'url'   => 'group',
+                               'sel'   => '',
+                               'title' => DI::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]);
+               $tabs_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+               $tabs_html = Renderer::replaceMacros($tabs_tpl, ['$tabs' => $tabs]);
 
-               $total = 0;
-               $searching = false;
-               $search_hdr = null;
-               if ($search) {
-                       $searching = true;
-                       $search_hdr = $search;
-                       $search_txt = DBA::escape(protect_sprintf(preg_quote($search)));
-                       $sql_extra .= " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt'  OR nick REGEXP '$search_txt') ";
+               switch ($rel) {
+                       case 'followers': $header = DI::l10n()->t('Followers'); break;
+                       case 'following': $header = DI::l10n()->t('Following'); break;
+                       case 'mutuals':   $header = DI::l10n()->t('Mutual friends'); break;
+                       default:          $header = DI::l10n()->t('Contacts');
                }
 
-               if ($nets) {
-                       $sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
+               switch ($type) {
+                       case 'pending':  $header .= ' - ' . DI::l10n()->t('Pending'); break;
+                       case 'blocked':  $header .= ' - ' . DI::l10n()->t('Blocked'); break;
+                       case 'hidden':   $header .= ' - ' . DI::l10n()->t('Hidden'); break;
+                       case 'ignored':  $header .= ' - ' . DI::l10n()->t('Ignored'); break;
+                       case 'archived': $header .= ' - ' . DI::l10n()->t('Archived'); break;
                }
 
-               $sql_extra2 = ((($sort_type > 0) && ($sort_type <= Contact::FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : '');
-
-               $r = q("SELECT COUNT(*) AS `total` FROM `contact`
-                       WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
-                       intval($_SESSION['uid'])
-               );
-               if (DBA::isResult($r)) {
-                       $a->setPagerTotal($r[0]['total']);
-                       $total = $r[0]['total'];
-               }
-
-               $sql_extra3 = Widget::unavailableNetworks();
-
-               $contacts = [];
-
-               $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'])
-               );
-               if (DBA::isResult($r)) {
-                       foreach ($r as $rr) {
-                               $rr['blocked'] = Contact::isBlockedByUser($rr['id'], local_user());
-                               $rr['readonly'] = Contact::isIgnoredByUser($rr['id'], local_user());
-                               $contacts[] = self::getContactTemplateVars($rr);
-                       }
-               }
-
-               $tpl = get_markup_template("contacts-template.tpl");
-               $o .= replace_macros($tpl, [
-                       '$baseurl' => System::baseUrl(),
-                       '$header' => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''),
-                       '$tabs' => $t,
-                       '$total' => $total,
-                       '$search' => $search_hdr,
-                       '$desc' => L10n::t('Search your contacts'),
-                       '$finding' => $searching ? L10n::t('Results for: %s', $search) : "",
-                       '$submit' => L10n::t('Find'),
-                       '$cmd' => $a->cmd,
-                       '$contacts' => $contacts,
-                       '$contact_drop_confirm' => L10n::t('Do you really want to delete this contact?'),
+               $header .= $nets ? ' - ' . ContactSelector::networkToName($nets) : '';
+
+               $tpl = Renderer::getMarkupTemplate('contacts-template.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
+                       '$header'     => $header,
+                       '$tabs'       => $tabs_html,
+                       '$total'      => $total,
+                       '$search'     => $search_hdr,
+                       '$desc'       => DI::l10n()->t('Search your contacts'),
+                       '$finding'    => $searching ? DI::l10n()->t('Results for: %s', $search) : '',
+                       '$submit'     => DI::l10n()->t('Find'),
+                       '$cmd'        => DI::args()->getCommand(),
+                       '$contacts'   => $contacts,
+                       '$contact_drop_confirm' => DI::l10n()->t('Do you really want to delete this contact?'),
                        'multiselect' => 1,
                        '$batch_actions' => [
-                               'contacts_batch_update'  => L10n::t('Update'),
-                               'contacts_batch_block'   => L10n::t('Block') . "/" . L10n::t("Unblock"),
-                               "contacts_batch_ignore"  => L10n::t('Ignore') . "/" . L10n::t("Unignore"),
-                               "contacts_batch_archive" => L10n::t('Archive') . "/" . L10n::t("Unarchive"),
-                               "contacts_batch_drop"    => L10n::t('Delete'),
+                               'contacts_batch_update'  => DI::l10n()->t('Update'),
+                               'contacts_batch_block'   => DI::l10n()->t('Block') . '/' . DI::l10n()->t('Unblock'),
+                               'contacts_batch_ignore'  => DI::l10n()->t('Ignore') . '/' . DI::l10n()->t('Unignore'),
+                               'contacts_batch_archive' => DI::l10n()->t('Archive') . '/' . DI::l10n()->t('Unarchive'),
+                               'contacts_batch_drop'    => DI::l10n()->t('Delete'),
                        ],
-                       '$h_batch_actions' => L10n::t('Batch Actions'),
-                       '$paginate' => paginate($a),
+                       '$h_batch_actions' => DI::l10n()->t('Batch Actions'),
+                       '$paginate'   => $pager->renderFull($total),
                ]);
 
                return $o;
        }
 
        /**
-        * @brief List of pages for the Contact TabBar
+        * List of pages for the Contact TabBar
         *
         * 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
+        * @return string HTML string of the contact page tabs buttons.
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function getTabsHTML($a, $contact, $active_tab)
        {
                // tabs
                $tabs = [
                        [
-                               'label' => L10n::t('Status'),
-                               'url'   => "contacts/" . $contact['id'] . "/conversations",
+                               'label' => DI::l10n()->t('Status'),
+                               'url'   => "contact/" . $contact['id'] . "/conversations",
                                'sel'   => (($active_tab == 1) ? 'active' : ''),
-                               'title' => L10n::t('Conversations started by this contact'),
+                               'title' => DI::l10n()->t('Conversations started by this contact'),
                                'id'    => 'status-tab',
                                'accesskey' => 'm',
                        ],
                        [
-                               'label' => L10n::t('Posts and Comments'),
-                               'url'   => "contacts/" . $contact['id'] . "/posts",
+                               'label' => DI::l10n()->t('Posts and Comments'),
+                               'url'   => "contact/" . $contact['id'] . "/posts",
                                'sel'   => (($active_tab == 2) ? 'active' : ''),
-                               'title' => L10n::t('Status Messages and Posts'),
+                               'title' => DI::l10n()->t('Status Messages and Posts'),
                                'id'    => 'posts-tab',
                                'accesskey' => 'p',
                        ],
                        [
-                               'label' => L10n::t('Profile'),
-                               'url'   => "contacts/" . $contact['id'],
+                               'label' => DI::l10n()->t('Profile'),
+                               'url'   => "contact/" . $contact['id'],
                                'sel'   => (($active_tab == 3) ? 'active' : ''),
-                               'title' => L10n::t('Profile Details'),
+                               'title' => DI::l10n()->t('Profile Details'),
                                'id'    => 'profile-tab',
                                'accesskey' => 'o',
                        ]
                ];
 
                // Show this tab only if there is visible friend list
-               $x = GContact::countAllFriends(local_user(), $contact['id']);
+               $x = Model\GContact::countAllFriends(local_user(), $contact['id']);
                if ($x) {
-                       $tabs[] = ['label' => L10n::t('Contacts'),
+                       $tabs[] = ['label' => DI::l10n()->t('Contacts'),
                                'url'   => "allfriends/" . $contact['id'],
                                'sel'   => (($active_tab == 4) ? 'active' : ''),
-                               'title' => L10n::t('View all contacts'),
+                               'title' => DI::l10n()->t('View all contacts'),
                                'id'    => 'allfriends-tab',
                                'accesskey' => 't'];
                }
 
                // Show this tab only if there is visible common friend list
-               $common = GContact::countCommonFriends(local_user(), $contact['id']);
+               $common = Model\GContact::countCommonFriends(local_user(), $contact['id']);
                if ($common) {
-                       $tabs[] = ['label' => L10n::t('Common Friends'),
+                       $tabs[] = ['label' => DI::l10n()->t('Common Friends'),
                                'url'   => "common/loc/" . local_user() . "/" . $contact['id'],
                                'sel'   => (($active_tab == 5) ? 'active' : ''),
-                               'title' => L10n::t('View all common friends'),
+                               'title' => DI::l10n()->t('View all common friends'),
                                'id'    => 'common-loc-tab',
                                'accesskey' => 'd'
                        ];
                }
 
                if (!empty($contact['uid'])) {
-                       $tabs[] = ['label' => L10n::t('Advanced'),
-                               'url'   => 'crepair/' . $contact['id'],
+                       $tabs[] = ['label' => DI::l10n()->t('Advanced'),
+                               'url'   => 'contact/' . $contact['id'] . '/advanced/',
                                'sel'   => (($active_tab == 6) ? 'active' : ''),
-                               'title' => L10n::t('Advanced Contact Settings'),
+                               'title' => DI::l10n()->t('Advanced Contact Settings'),
                                'id'    => 'advanced-tab',
                                'accesskey' => 'r'
                        ];
                }
 
-               $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;
        }
@@ -947,7 +955,7 @@ class Contact extends BaseModule
                                        'default_location' => $a->user['default-location'],
                                        'nickname' => $a->user['nickname'],
                                        'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-                                       'acl' => ACL::getFullSelectorHTML($a->user, true),
+                                       'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
                                        'bang' => '',
                                        'visitor' => 'block',
                                        'profile_uid' => local_user(),
@@ -956,25 +964,19 @@ 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);
                }
 
                if (DBA::isResult($contact)) {
-                       $a->page['aside'] = "";
-
-                       $profiledata = Contact::getDetailsByURL($contact["url"]);
+                       DI::page()['aside'] = '';
 
-                       if (local_user()) {
-                               if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
-                                       $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
-                               }
-                       }
+                       $profiledata = Model\Contact::getDetailsByURL($contact['url']);
 
-                       Profile::load($a, "", 0, $profiledata, true);
-                       $o .= Contact::getPostsFromUrl($contact["url"], true, $update);
+                       Model\Profile::load($a, '', $profiledata, true);
+                       $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
                }
 
                return $o;
@@ -982,23 +984,21 @@ 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);
 
                if (DBA::isResult($contact)) {
-                       $a->page['aside'] = "";
+                       DI::page()['aside'] = '';
 
-                       $profiledata = Contact::getDetailsByURL($contact["url"]);
+                       $profiledata = Model\Contact::getDetailsByURL($contact['url']);
 
-                       if (local_user()) {
-                               if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
-                                       $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
-                               }
+                       if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
+                               $profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
                        }
 
-                       Profile::load($a, "", 0, $profiledata, true);
-                       $o .= Contact::getPostsFromUrl($contact["url"]);
+                       Model\Profile::load($a, '', $profiledata, true);
+                       $o .= Model\Contact::getPostsFromUrl($contact['url']);
                }
 
                return $o;
@@ -1009,27 +1009,29 @@ class Contact extends BaseModule
                $dir_icon = '';
                $alt_text = '';
 
-               switch ($rr['rel']) {
-                       case Contact::FRIEND:
-                               $dir_icon = 'images/lrarrow.gif';
-                               $alt_text = L10n::t('Mutual Friendship');
-                               break;
+               if (!empty($rr['uid']) && !empty($rr['rel'])) {
+                       switch ($rr['rel']) {
+                               case Model\Contact::FRIEND:
+                                       $dir_icon = 'images/lrarrow.gif';
+                                       $alt_text = DI::l10n()->t('Mutual Friendship');
+                                       break;
 
-                       case Contact::FOLLOWER;
-                               $dir_icon = 'images/larrow.gif';
-                               $alt_text = L10n::t('is a fan of yours');
-                               break;
+                               case Model\Contact::FOLLOWER;
+                                       $dir_icon = 'images/larrow.gif';
+                                       $alt_text = DI::l10n()->t('is a fan of yours');
+                                       break;
 
-                       case Contact::SHARING;
-                               $dir_icon = 'images/rarrow.gif';
-                               $alt_text = L10n::t('you are a fan of');
-                               break;
+                               case Model\Contact::SHARING;
+                                       $dir_icon = 'images/rarrow.gif';
+                                       $alt_text = DI::l10n()->t('you are a fan of');
+                                       break;
 
-                       default:
-                               break;
+                               default:
+                                       break;
+                       }
                }
 
-               $url = Contact::magicLink($rr['url']);
+               $url = Model\Contact::magicLink($rr['url']);
 
                if (strpos($url, 'redir/') === 0) {
                        $sparkle = ' class="sparkle" ';
@@ -1037,34 +1039,42 @@ class Contact extends BaseModule
                        $sparkle = '';
                }
 
+               if ($rr['pending']) {
+                       if (in_array($rr['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
+                               $alt_text = DI::l10n()->t('Pending outgoing contact request');
+                       } else {
+                               $alt_text = DI::l10n()->t('Pending incoming contact request');
+                       }
+               }
+
                if ($rr['self']) {
                        $dir_icon = 'images/larrow.gif';
-                       $alt_text = L10n::t('This is you');
+                       $alt_text = DI::l10n()->t('This is you');
                        $url = $rr['url'];
                        $sparkle = '';
                }
 
                return [
-                       'img_hover' => L10n::t('Visit %s\'s profile [%s]', $rr['name'], $rr['url']),
-                       'edit_hover' => L10n::t('Edit contact'),
-                       'photo_menu' => Contact::photoMenu($rr),
-                       'id' => $rr['id'],
-                       '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']),
-                       'account_type' => Contact::getAccountType($rr),
-                       'sparkle' => $sparkle,
-                       'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
-                       'url' => $url,
-                       'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
-                       'nick' => htmlentities($rr['nick']),
+                       'img_hover' => DI::l10n()->t('Visit %s\'s profile [%s]', $rr['name'], $rr['url']),
+                       'edit_hover'=> DI::l10n()->t('Edit contact'),
+                       'photo_menu'=> Model\Contact::photoMenu($rr),
+                       'id'        => $rr['id'],
+                       'alt_text'  => $alt_text,
+                       'dir_icon'  => $dir_icon,
+                       'thumb'     => ProxyUtils::proxifyUrl($rr['thumb'], false, ProxyUtils::SIZE_THUMB),
+                       'name'      => $rr['name'],
+                       'username'  => $rr['name'],
+                       'account_type' => Model\Contact::getAccountType($rr),
+                       'sparkle'   => $sparkle,
+                       'itemurl'   => ($rr['addr'] ?? '') ?: $rr['url'],
+                       'url'       => $url,
+                       'network'   => ContactSelector::networkToName($rr['network'], $rr['url'], $rr['protocol']),
+                       'nick'      => $rr['nick'],
                ];
        }
 
        /**
-        * @brief Gives a array with actions which can performed to a given contact
+        * Gives a array with actions which can performed to a given contact
         *
         * This includes actions like e.g. 'block', 'hide', 'archive', 'delete' and others
         *
@@ -1079,7 +1089,7 @@ class Contact extends BaseModule
                // Provide friend suggestion only for Friendica contacts
                if ($contact['network'] === Protocol::DFRN) {
                        $contact_actions['suggest'] = [
-                               'label' => L10n::t('Suggest friends'),
+                               'label' => DI::l10n()->t('Suggest friends'),
                                'url'   => 'fsuggest/' . $contact['id'],
                                'title' => '',
                                'sel'   => '',
@@ -1089,8 +1099,8 @@ class Contact extends BaseModule
 
                if ($poll_enabled) {
                        $contact_actions['update'] = [
-                               'label' => L10n::t('Update now'),
-                               'url'   => 'contacts/' . $contact['id'] . '/update',
+                               'label' => DI::l10n()->t('Update now'),
+                               'url'   => 'contact/' . $contact['id'] . '/update',
                                'title' => '',
                                'sel'   => '',
                                'id'    => 'update',
@@ -1098,34 +1108,34 @@ class Contact extends BaseModule
                }
 
                $contact_actions['block'] = [
-                       'label' => (intval($contact['blocked']) ? L10n::t('Unblock') : L10n::t('Block')),
-                       'url'   => 'contacts/' . $contact['id'] . '/block',
-                       'title' => L10n::t('Toggle Blocked status'),
+                       'label' => (intval($contact['blocked']) ? DI::l10n()->t('Unblock') : DI::l10n()->t('Block')),
+                       'url'   => 'contact/' . $contact['id'] . '/block',
+                       'title' => DI::l10n()->t('Toggle Blocked status'),
                        'sel'   => (intval($contact['blocked']) ? 'active' : ''),
                        'id'    => 'toggle-block',
                ];
 
                $contact_actions['ignore'] = [
-                       'label' => (intval($contact['readonly']) ? L10n::t('Unignore') : L10n::t('Ignore')),
-                       'url'   => 'contacts/' . $contact['id'] . '/ignore',
-                       'title' => L10n::t('Toggle Ignored status'),
+                       'label' => (intval($contact['readonly']) ? DI::l10n()->t('Unignore') : DI::l10n()->t('Ignore')),
+                       'url'   => 'contact/' . $contact['id'] . '/ignore',
+                       'title' => DI::l10n()->t('Toggle Ignored status'),
                        'sel'   => (intval($contact['readonly']) ? 'active' : ''),
                        'id'    => 'toggle-ignore',
                ];
 
                if ($contact['uid'] != 0) {
                        $contact_actions['archive'] = [
-                               'label' => (intval($contact['archive']) ? L10n::t('Unarchive') : L10n::t('Archive')),
-                               'url'   => 'contacts/' . $contact['id'] . '/archive',
-                               'title' => L10n::t('Toggle Archive status'),
+                               'label' => (intval($contact['archive']) ? DI::l10n()->t('Unarchive') : DI::l10n()->t('Archive')),
+                               'url'   => 'contact/' . $contact['id'] . '/archive',
+                               'title' => DI::l10n()->t('Toggle Archive status'),
                                'sel'   => (intval($contact['archive']) ? 'active' : ''),
                                'id'    => 'toggle-archive',
                        ];
 
                        $contact_actions['delete'] = [
-                               'label' => L10n::t('Delete'),
-                               'url'   => 'contacts/' . $contact['id'] . '/drop',
-                               'title' => L10n::t('Delete contact'),
+                               'label' => DI::l10n()->t('Delete'),
+                               'url'   => 'contact/' . $contact['id'] . '/drop',
+                               'title' => DI::l10n()->t('Delete contact'),
                                'sel'   => '',
                                'id'    => 'delete',
                        ];