]> git.mxchange.org Git - friendica.git/commitdiff
Renaming functions and class
authorJonny Tischbein <jonny_tischbein@systemli.org>
Sat, 13 Oct 2018 09:23:52 +0000 (11:23 +0200)
committerJonny Tischbein <jonny_tischbein@systemli.org>
Sat, 13 Oct 2018 09:23:52 +0000 (11:23 +0200)
mod/allfriends.php
mod/common.php
mod/contacts.php [deleted file]
mod/crepair.php
mod/dirfind.php
mod/group.php
src/Module/Contacts.php
view/theme/frio/theme.php

index 190ab12a66643183e2087ce360e181c6d1998c3b..aa5fb0a679430dadddae06deb58e5bc67826e8de 100644 (file)
@@ -8,11 +8,10 @@ use Friendica\Content\ContactSelector;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\GContact;
-use Friendica\Model\Profile;
+use Friendica\Model;\
+use Friendica\Module\Contact;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Module\Contacts;
+
 
 require_once 'include/dba.php';
 
@@ -42,13 +41,13 @@ function allfriends_content(App $a)
        }
 
        $a->page['aside'] = "";
-       Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+       Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
 
-       $total = GContact::countAllFriends(local_user(), $cid);
+       $total = Model\GContact::countAllFriends(local_user(), $cid);
 
        $a->setPagerTotal($total);
 
-       $r = GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
+       $r = Model\GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
        if (!DBA::isResult($r)) {
                $o .= L10n::t('No friends to display.');
                return $o;
@@ -59,7 +58,7 @@ function allfriends_content(App $a)
        $entries = [];
        foreach ($r as $rr) {
                //get further details of the contact
-               $contact_details = Contact::getDetailsByURL($rr['url'], $uid, $rr);
+               $contact_details = Model\Contact::getDetailsByURL($rr['url'], $uid, $rr);
 
                $photo_menu = '';
 
@@ -68,11 +67,11 @@ function allfriends_content(App $a)
                // If the contact is not common to the user, Connect/Follow' will be added to the photo menu
                if ($rr['cid']) {
                        $rr['id'] = $rr['cid'];
-                       $photo_menu = Contact::photoMenu($rr);
+                       $photo_menu = Model\Contact::photoMenu($rr);
                } else {
                        $connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
                        $photo_menu = [
-                               'profile' => [L10n::t("View Profile"), Contact::magicLink($rr['url'])],
+                               'profile' => [L10n::t("View Profile"), Model\Contact::magicLink($rr['url'])],
                                'follow' => [L10n::t("Connect/Follow"), $connlnk]
                        ];
                }
@@ -86,7 +85,7 @@ function allfriends_content(App $a)
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],
                        'about'        => $contact_details['about'],
-                       'account_type' => Contact::getAccountType($contact_details),
+                       'account_type' => Model\Contact::getAccountType($contact_details),
                        'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
                        'photo_menu'   => $photo_menu,
                        'conntxt'      => L10n::t('Connect'),
@@ -96,7 +95,7 @@ function allfriends_content(App $a)
                $entries[] = $entry;
        }
 
-       $tab_str = Contacts::contacts_tab($a, $contact, 4);
+       $tab_str = Contact::getTabsHTML($a, $contact, 4);
 
        $tpl = get_markup_template('viewcontact_template.tpl');
 
index 13e5bf0927c5119fade32abbed7aec6a49093938..c011c6d38ae73eb5dd04eee63e790267b439433f 100644 (file)
@@ -7,11 +7,10 @@ use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\GContact;
-use Friendica\Model\Profile;
+use Friendica\Model;
+use Friendica\Module\Contact;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Module\Contacts;
+
 
 require_once 'include/dba.php';
 
@@ -42,7 +41,7 @@ function common_content(App $a)
 
                if (DBA::isResult($contact)) {
                        $a->page['aside'] = "";
-                       Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+                       Model\Profile::load($a, "", 0,Model\Contact::getDetailsByURL($contact["url"]));
                }
        } else {
                $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
@@ -65,12 +64,12 @@ function common_content(App $a)
                return;
        }
 
-       if (!$cid && Profile::getMyURL()) {
-               $contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $uid]);
+       if (!$cid &&Model\Profile::getMyURL()) {
+               $contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Model\Profile::getMyURL()), 'uid' => $uid]);
                if (DBA::isResult($contact)) {
                        $cid = $contact['id'];
                } else {
-                       $gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+                       $gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Model\Profile::getMyURL())]);
                        if (DBA::isResult($gcontact)) {
                                $zcid = $gcontact['id'];
                        }
@@ -82,9 +81,9 @@ function common_content(App $a)
        }
 
        if ($cid) {
-               $t = GContact::countCommonFriends($uid, $cid);
+               $t =Model\GContact::countCommonFriends($uid, $cid);
        } else {
-               $t = GContact::countCommonFriendsZcid($uid, $zcid);
+               $t =Model\GContact::countCommonFriendsZcid($uid, $zcid);
        }
 
        if ($t > 0) {
@@ -95,9 +94,9 @@ function common_content(App $a)
        }
 
        if ($cid) {
-               $r = GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
+               $r =Model\GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
        } else {
-               $r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
+               $r =Model\GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
        }
 
        if (!DBA::isResult($r)) {
@@ -109,13 +108,13 @@ function common_content(App $a)
        $entries = [];
        foreach ($r as $rr) {
                //get further details of the contact
-               $contact_details = Contact::getDetailsByURL($rr['url'], $uid);
+               $contact_details =Model\Contact::getDetailsByURL($rr['url'], $uid);
 
                // $rr['id'] is needed to use contact_photo_menu()
                /// @TODO Adding '/" here avoids E_NOTICE on missing constants
                $rr['id'] = $rr['cid'];
 
-               $photo_menu = Contact::photoMenu($rr);
+               $photo_menu =Model\Contact::photoMenu($rr);
 
                $entry = [
                        'url'          => $rr['url'],
@@ -126,7 +125,7 @@ function common_content(App $a)
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],
                        'about'        => $contact_details['about'],
-                       'account_type' => Contact::getAccountType($contact_details),
+                       'account_type' =>Model\Contact::getAccountType($contact_details),
                        'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
                        'photo_menu'   => $photo_menu,
                        'id'           => ++$id,
@@ -137,7 +136,7 @@ function common_content(App $a)
        $title = '';
        $tab_str = '';
        if ($cmd === 'loc' && $cid && local_user() == $uid) {
-               $tab_str = Contacts::contacts_tab($a, $contact, 4);
+               $tab_str = Contact::getTabsHTML($a, $contact, 4);
        } else {
                $title = L10n::t('Common Friends');
        }
diff --git a/mod/contacts.php b/mod/contacts.php
deleted file mode 100644 (file)
index 4e149ab..0000000
+++ /dev/null
@@ -1,1123 +0,0 @@
-<?php
-/**
- * @file mod/contacts.php
- */
-
-use Friendica\App;
-use Friendica\Content\ContactSelector;
-use Friendica\Content\Nav;
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Widget;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\Protocol;
-use Friendica\Core\System;
-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\Util\DateTimeFormat;
-use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Core\ACL;
-use Friendica\Module\Login;
-
-function contacts_init(App $a)
-{
-       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
-       ]);
-}
-
-function contacts_batch_actions(App $a)
-{
-       if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
-               return;
-       }
-
-       $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())
-       );
-
-       $count_actions = 0;
-       foreach ($orig_records as $orig_record) {
-               $contact_id = $orig_record['id'];
-               if (x($_POST, 'contacts_batch_update')) {
-                       _contact_update($contact_id);
-                       $count_actions++;
-               }
-               if (x($_POST, 'contacts_batch_block')) {
-                       _contact_block($contact_id);
-                       $count_actions++;
-               }
-               if (x($_POST, 'contacts_batch_ignore')) {
-                       _contact_ignore($contact_id);
-                       $count_actions++;
-               }
-               if (x($_POST, 'contacts_batch_archive')) {
-                       $r = _contact_archive($contact_id, $orig_record);
-                       if ($r) {
-                               $count_actions++;
-                       }
-               }
-               if (x($_POST, 'contacts_batch_drop')) {
-                       _contact_drop($orig_record);
-                       $count_actions++;
-               }
-       }
-       if ($count_actions > 0) {
-               info(L10n::tt("%d contact edited.", "%d contacts edited.", $count_actions));
-       }
-
-       goaway('contacts');
-}
-
-function contacts_post(App $a)
-{
-       if (!local_user()) {
-               return;
-       }
-
-       if ($a->argv[1] === "batch") {
-               contacts_batch_actions($a);
-               return;
-       }
-
-       $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');
-               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;
-               }
-       }
-
-       $hidden = intval($_POST['hidden']);
-
-       $notify = intval($_POST['notify']);
-
-       $fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
-
-       $ffi_keyword_blacklist = escape_tags(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
-
-       $priority = intval(defaults($_POST, 'poll', 0));
-       if ($priority > 5 || $priority < 0) {
-               $priority = 0;
-       }
-
-       $info = escape_tags(trim($_POST['info']));
-
-       $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())
-       );
-       if (DBA::isResult($r)) {
-               info(L10n::t('Contact updated.') . EOL);
-       } else {
-               notice(L10n::t('Failed to update contact record.') . EOL);
-       }
-
-       $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
-       if (DBA::isResult($contact)) {
-               $a->data['contact'] = $contact;
-       }
-
-       return;
-}
-
-/* contact actions */
-
-function _contact_update($contact_id)
-{
-       $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
-       if (!DBA::isResult($contact)) {
-               return;
-       }
-
-       $uid = $contact["uid"];
-
-       if ($contact["network"] == Protocol::OSTATUS) {
-               $result = Contact::createFromProbe($uid, $contact["url"], false, $contact["network"]);
-
-               if ($result['success']) {
-                       q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", intval($contact_id));
-               }
-       } else {
-               // pull feed and consume it, which should subscribe to the hub.
-               Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
-       }
-}
-
-function _contact_update_profile($contact_id)
-{
-       $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
-       if (!DBA::isResult($contact)) {
-               return;
-       }
-
-       $uid = $contact["uid"];
-
-       $data = Probe::uri($contact["url"], "", 0, false);
-
-       // "Feed" or "Unknown" is mostly a sign of communication problems
-       if ((in_array($data["network"], [Protocol::FEED, Protocol::PHANTOM])) && ($data["network"] != $contact["network"])) {
-               return;
-       }
-
-       $updatefields = ["name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
-               "poco", "network", "alias"];
-       $update = [];
-
-       if ($data["network"] == Protocol::OSTATUS) {
-               $result = Contact::createFromProbe($uid, $data["url"], false);
-
-               if ($result['success']) {
-                       $update["subhub"] = true;
-               }
-       }
-
-       foreach ($updatefields AS $field) {
-               if (isset($data[$field]) && ($data[$field] != "")) {
-                       $update[$field] = $data[$field];
-               }
-       }
-
-       $update["nurl"] = normalise_link($data["url"]);
-
-       $query = "";
-
-       if (isset($data["priority"]) && ($data["priority"] != 0)) {
-               $query = "`priority` = " . intval($data["priority"]);
-       }
-
-       foreach ($update AS $key => $value) {
-               if ($query != "") {
-                       $query .= ", ";
-               }
-
-               $query .= "`" . $key . "` = '" . DBA::escape($value) . "'";
-       }
-
-       if ($query == "") {
-               return;
-       }
-
-       $r = q("UPDATE `contact` SET $query WHERE `id` = %d AND `uid` = %d",
-               intval($contact_id),
-               intval(local_user())
-       );
-
-       // Update the entry in the contact table
-       Contact::updateAvatar($data['photo'], local_user(), $contact_id, true);
-
-       // Update the entry in the gcontact table
-       GContact::updateFromProbe($data["url"]);
-}
-
-function _contact_block($contact_id)
-{
-       $blocked = !Contact::isBlockedByUser($contact_id, local_user());
-       Contact::setBlockedForUser($contact_id, local_user(), $blocked);
-}
-
-function _contact_ignore($contact_id)
-{
-       $ignored = !Contact::isIgnoredByUser($contact_id, local_user());
-       Contact::setIgnoredForUser($contact_id, local_user(), $ignored);
-}
-
-function _contact_archive($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);
-}
-
-function _contact_drop($orig_record)
-{
-       $a = get_app();
-
-       $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;
-       }
-
-       Contact::terminateFriendship($r[0], $orig_record, true);
-       Contact::remove($orig_record['id']);
-}
-
-function contacts_content(App $a, $update = 0)
-{
-       $sort_type = 0;
-       $o = '';
-       Nav::setSelected('contacts');
-
-       if (!local_user()) {
-               notice(L10n::t('Permission denied.') . EOL);
-               return Login::form();
-       }
-
-       if ($a->argc == 3) {
-               $contact_id = intval($a->argv[1]);
-               if (!$contact_id) {
-                       return;
-               }
-
-               $cmd = $a->argv[2];
-
-               $orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]);
-               if (!DBA::isResult($orig_record)) {
-                       notice(L10n::t('Could not access contact record.') . EOL);
-                       goaway('contacts');
-                       return; // NOTREACHED
-               }
-
-               if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
-                       _contact_update($contact_id);
-                       goaway('contacts/' . $contact_id);
-                       // NOTREACHED
-               }
-
-               if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
-                       _contact_update_profile($contact_id);
-                       goaway('crepair/' . $contact_id);
-                       // NOTREACHED
-               }
-
-               if ($cmd === 'block') {
-                       _contact_block($contact_id);
-
-                       $blocked = Contact::isBlockedByUser($contact_id, local_user());
-                       info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
-
-                       goaway('contacts/' . $contact_id);
-                       return; // NOTREACHED
-               }
-
-               if ($cmd === 'ignore') {
-                       _contact_ignore($contact_id);
-
-                       $ignored = Contact::isIgnoredByUser($contact_id, local_user());
-                       info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
-
-                       goaway('contacts/' . $contact_id);
-                       return; // NOTREACHED
-               }
-
-               if ($cmd === 'archive' && ($orig_record['uid'] != 0)) {
-                       $r = _contact_archive($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);
-                       }
-
-                       goaway('contacts/' . $contact_id);
-                       return; // 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
-                               // so add any arguments as hidden inputs
-                               $query = explode_querystring($a->query_string);
-                               $inputs = [];
-                               foreach ($query['args'] as $arg) {
-                                       if (strpos($arg, 'confirm=') === false) {
-                                               $arg_parts = explode('=', $arg);
-                                               $inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
-                                       }
-                               }
-
-                               $a->page['aside'] = '';
-
-                               return replace_macros(get_markup_template('contact_drop_confirm.tpl'), [
-                                       '$header' => L10n::t('Drop contact'),
-                                       '$contact' => _contact_detail_for_template($orig_record),
-                                       '$method' => 'get',
-                                       '$message' => L10n::t('Do you really want to delete this contact?'),
-                                       '$extra_inputs' => $inputs,
-                                       '$confirm' => L10n::t('Yes'),
-                                       '$confirm_url' => $query['base'],
-                                       '$confirm_name' => 'confirmed',
-                                       '$cancel' => L10n::t('Cancel'),
-                               ]);
-                       }
-                       // Now check how the user responded to the confirmation query
-                       if (x($_REQUEST, 'canceled')) {
-                               goaway('contacts');
-                       }
-
-                       _contact_drop($orig_record);
-                       info(L10n::t('Contact has been removed.') . EOL);
-
-                       goaway('contacts');
-                       return; // NOTREACHED
-               }
-               if ($cmd === 'posts') {
-                       return contact_posts($a, $contact_id);
-               }
-               if ($cmd === 'conversations') {
-                       return contact_conversations($a, $contact_id, $update);
-               }
-       }
-
-       $_SESSION['return_url'] = $a->query_string;
-
-       if ((x($a->data, 'contact')) && (is_array($a->data['contact']))) {
-               $contact_id = $a->data['contact']['id'];
-               $contact = $a->data['contact'];
-
-               $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), [
-                       '$baseurl' => System::baseUrl(true),
-               ]);
-
-               $contact['blocked'] = Contact::isBlockedByUser($contact['id'], local_user());
-               $contact['readonly'] = Contact::isIgnoredByUser($contact['id'], local_user());
-
-               $dir_icon = '';
-               $relation_text = '';
-               switch ($contact['rel']) {
-                       case Contact::FRIEND:
-                               $dir_icon = 'images/lrarrow.gif';
-                               $relation_text = L10n::t('You are mutual friends with %s');
-                               break;
-
-                       case Contact::FOLLOWER;
-                               $dir_icon = 'images/larrow.gif';
-                               $relation_text = L10n::t('You are sharing with %s');
-                               break;
-
-                       case Contact::SHARING;
-                               $dir_icon = 'images/rarrow.gif';
-                               $relation_text = L10n::t('%s is sharing with you');
-                               break;
-
-                       default:
-                               break;
-               }
-
-               if ($contact['uid'] == 0) {
-                       $relation_text = '';
-               }
-
-               if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
-                       $relation_text = "";
-               }
-
-               $relation_text = sprintf($relation_text, htmlentities($contact['name']));
-
-               $url = 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.');
-
-               $last_update = (($contact['last-update'] <= NULL_DATE) ? 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"));
-               }
-               $lblsuggest = (($contact['network'] === Protocol::DFRN) ? 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"]));
-
-               // tabs
-               $tab_str = contacts_tab($a, $contact, 3);
-
-               $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < DateTimeFormat::utcNow()) ? 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'),
-                               $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')
-                               ]
-                       ];
-               }
-
-               $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");
-               }
-
-               // Load contactact related actions like hide, suggest, delete and others
-               $contact_actions = contact_actions($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');
-               } 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')],
-                       '$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"),
-                       '$contact_settings_label' => $contact_settings_label,
-                       '$contact_profile_label' => L10n::t("Profile"),
-               ]);
-
-               $arr = ['contact' => $contact, 'output' => $o];
-
-               Addon::callHooks('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_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
-
-       $search = x($_GET, 'search') ? notags(trim($_GET['search'])) : '';
-       $nets   = x($_GET, 'nets'  ) ? notags(trim($_GET['nets']))   : '';
-
-       $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'),
-                       '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' => L10n::t('Blocked'),
-                       'url'   => 'contacts/blocked',
-                       'sel'   => ($blocked) ? 'active' : '',
-                       'title' => 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'),
-                       'id'    => 'showignored-tab',
-                       'accesskey' => 'i',
-               ],
-               [
-                       'label' => L10n::t('Archived'),
-                       'url'   => 'contacts/archived',
-                       'sel'   => ($archived) ? 'active' : '',
-                       'title' => 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'),
-                       'id'    => 'showhidden-tab',
-                       'accesskey' => 'h',
-               ],
-       ];
-
-       $tab_tpl = get_markup_template('common_tabs.tpl');
-       $t = replace_macros($tab_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') ";
-       }
-
-       if ($nets) {
-               $sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
-       }
-
-       $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[] = _contact_detail_for_template($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?'),
-               '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'),
-               ],
-               '$h_batch_actions' => L10n::t('Batch Actions'),
-               '$paginate' => paginate($a),
-       ]);
-
-       return $o;
-}
-
-/**
- * @brief 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
- *
- * @return string
- */
-function contacts_tab($a, $contact, $active_tab)
-{
-       // tabs
-       $tabs = [
-               [
-                       'label' => L10n::t('Status'),
-                       'url'   => "contacts/" . $contact['id'] . "/conversations",
-                       'sel'   => (($active_tab == 1) ? 'active' : ''),
-                       'title' => L10n::t('Conversations started by this contact'),
-                       'id'    => 'status-tab',
-                       'accesskey' => 'm',
-               ],
-               [
-                       'label' => L10n::t('Posts and Comments'),
-                       'url'   => "contacts/" . $contact['id'] . "/posts",
-                       'sel'   => (($active_tab == 2) ? 'active' : ''),
-                       'title' => L10n::t('Status Messages and Posts'),
-                       'id'    => 'posts-tab',
-                       'accesskey' => 'p',
-               ],
-               [
-                       'label' => L10n::t('Profile'),
-                       'url'   => "contacts/" . $contact['id'],
-                       'sel'   => (($active_tab == 3) ? 'active' : ''),
-                       'title' => 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']);
-       if ($x) {
-               $tabs[] = ['label' => L10n::t('Contacts'),
-                       'url'   => "allfriends/" . $contact['id'],
-                       'sel'   => (($active_tab == 4) ? 'active' : ''),
-                       'title' => 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']);
-       if ($common) {
-               $tabs[] = ['label' => L10n::t('Common Friends'),
-                       'url'   => "common/loc/" . local_user() . "/" . $contact['id'],
-                       'sel'   => (($active_tab == 5) ? 'active' : ''),
-                       'title' => 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'],
-                       'sel'   => (($active_tab == 6) ? 'active' : ''),
-                       'title' => 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]);
-
-       return $tab_str;
-}
-
-function contact_conversations(App $a, $contact_id, $update)
-{
-       $o = '';
-
-       if (!$update) {
-               // We need the editor here to be able to reshare an item.
-               if (local_user()) {
-                       $x = [
-                               'is_owner' => true,
-                               'allow_location' => $a->user['allow_location'],
-                               '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),
-                               'bang' => '',
-                               'visitor' => 'block',
-                               'profile_uid' => local_user(),
-                       ];
-                       $o = status_editor($a, $x, 0, true);
-               }
-       }
-
-       $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
-
-       if (!$update) {
-               $o .= contacts_tab($a, $contact, 1);
-       }
-
-       if (DBA::isResult($contact)) {
-               $a->page['aside'] = "";
-
-               $profiledata = 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"]);
-                       }
-               }
-
-               Profile::load($a, "", 0, $profiledata, true);
-               $o .= Contact::getPostsFromUrl($contact["url"], true, $update);
-       }
-
-       return $o;
-}
-
-function contact_posts(App $a, $contact_id)
-{
-       $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
-
-       $o = contacts_tab($a, $contact, 2);
-
-       if (DBA::isResult($contact)) {
-               $a->page['aside'] = "";
-
-               $profiledata = 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"]);
-                       }
-               }
-
-               Profile::load($a, "", 0, $profiledata, true);
-               $o .= Contact::getPostsFromUrl($contact["url"]);
-       }
-
-       return $o;
-}
-
-function _contact_detail_for_template(array $rr)
-{
-       $dir_icon = '';
-       $alt_text = '';
-
-       switch ($rr['rel']) {
-               case Contact::FRIEND:
-                       $dir_icon = 'images/lrarrow.gif';
-                       $alt_text = L10n::t('Mutual Friendship');
-                       break;
-
-               case Contact::FOLLOWER;
-                       $dir_icon = 'images/larrow.gif';
-                       $alt_text = 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;
-
-               default:
-                       break;
-       }
-
-       $url = Contact::magicLink($rr['url']);
-
-       if (strpos($url, 'redir/') === 0) {
-               $sparkle = ' class="sparkle" ';
-       } else {
-               $sparkle = '';
-       }
-
-       if ($rr['self']) {
-               $dir_icon = 'images/larrow.gif';
-               $alt_text = 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']),
-       ];
-}
-
-/**
- * @brief Gives a array with actions which can performed to a given contact
- *
- * This includes actions like e.g. 'block', 'hide', 'archive', 'delete' and others
- *
- * @param array $contact Data about the Contact
- * @return array with contact related actions
- */
-function contact_actions($contact)
-{
-       $poll_enabled = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
-       $contact_actions = [];
-
-       // Provide friend suggestion only for Friendica contacts
-       if ($contact['network'] === Protocol::DFRN) {
-               $contact_actions['suggest'] = [
-                       'label' => L10n::t('Suggest friends'),
-                       'url'   => 'fsuggest/' . $contact['id'],
-                       'title' => '',
-                       'sel'   => '',
-                       'id'    => 'suggest',
-               ];
-       }
-
-       if ($poll_enabled) {
-               $contact_actions['update'] = [
-                       'label' => L10n::t('Update now'),
-                       'url'   => 'contacts/' . $contact['id'] . '/update',
-                       'title' => '',
-                       'sel'   => '',
-                       'id'    => 'update',
-               ];
-       }
-
-       $contact_actions['block'] = [
-               'label' => (intval($contact['blocked']) ? L10n::t('Unblock') : L10n::t('Block')),
-               'url'   => 'contacts/' . $contact['id'] . '/block',
-               'title' => 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'),
-               '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'),
-                       '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'),
-                       'sel'   => '',
-                       'id'    => 'delete',
-               ];
-       }
-
-       return $contact_actions;
-}
index 99aee1357876c586c840a2152fd3ac914f1faa5a..e5fb1e3347721f3dcd633e2c4bd1f8b641880669 100644 (file)
@@ -8,9 +8,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\Profile;
-use Friendica\Module\Contacts;
+use Friendica\Model;
+use Friendica\Module\Contact;
 
 require_once 'mod/contacts.php';
 
@@ -83,7 +82,7 @@ function crepair_post(App $a)
        if ($photo) {
                logger('mod-crepair: updating photo from ' . $photo);
 
-               Contact::updateAvatar($photo, local_user(), $contact['id']);
+               Model\Contact::updateAvatar($photo, local_user(), $contact['id']);
        }
 
        if ($r) {
@@ -136,7 +135,7 @@ function crepair_content(App $a)
 
        $update_profile = in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]);
 
-       $tab_str = Contacts::contacts_tab($a, $contact, 5);
+       $tab_str = Contact::getTabsHTML($a, $contact, 5);
 
        $tpl = get_markup_template('crepair.tpl');
        $o = replace_macros($tpl, [
index e183e6c0293c4e3ebd399581f53d711d48bfc381..8fcf98d4020bc9f6b307103f2ce3df301e4840f1 100644 (file)
@@ -12,13 +12,13 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\GContact;
+use Friendica\Model;
+use Friendica\Module\Contact;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Module\Contacts;
+
 
 function dirfind_init(App $a) {
 
@@ -82,7 +82,7 @@ function dirfind_content(App $a, $prefix = "") {
                        $objresult->tags = "";
                        $objresult->network = $user_data["network"];
 
-                       $contact = Contact::getDetailsByURL($user_data["url"], local_user());
+                       $contact = Model\Contact::getDetailsByURL($user_data["url"], local_user());
                        $objresult->cid = $contact["cid"];
                        $objresult->pcid = $contact["zid"];
 
@@ -90,7 +90,7 @@ function dirfind_content(App $a, $prefix = "") {
 
                        // Add the contact to the global contacts if it isn't already in our system
                        if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) {
-                               GContact::update($user_data);
+                               Model\GContact::update($user_data);
                        }
                } elseif ($local) {
 
@@ -155,7 +155,7 @@ function dirfind_content(App $a, $prefix = "") {
                                        continue;
                                }
 
-                               $result = Contact::getDetailsByURL($result["nurl"], local_user());
+                               $result = Model\Contact::getDetailsByURL($result["nurl"], local_user());
 
                                if ($result["name"] == "") {
                                        $result["name"] = end(explode("/", $urlparts["path"]));
@@ -199,7 +199,7 @@ function dirfind_content(App $a, $prefix = "") {
 
                                $alt_text = "";
 
-                               $contact_details = Contact::getDetailsByURL($jj->url, local_user());
+                               $contact_details = Model\Contact::getDetailsByURL($jj->url, local_user());
 
                                $itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $jj->url);
 
@@ -209,8 +209,8 @@ function dirfind_content(App $a, $prefix = "") {
                                        $conntxt = "";
                                        $contact = DBA::selectFirst('contact', [], ['id' => $jj->cid]);
                                        if (DBA::isResult($contact)) {
-                                               $photo_menu = Contact::photoMenu($contact);
-                                               $details = Contacts::_contact_detail_for_template($contact);
+                                               $photo_menu =Model\Contact::photoMenu($contact);
+                                               $details = Contact::getContactTemplateVars($contact);
                                                $alt_text = $details['alt_text'];
                                        } else {
                                                $photo_menu = [];
@@ -221,7 +221,7 @@ function dirfind_content(App $a, $prefix = "") {
 
                                        $contact = DBA::selectFirst('contact', [], ['id' => $jj->pcid]);
                                        if (DBA::isResult($contact)) {
-                                               $photo_menu = Contact::photoMenu($contact);
+                                               $photo_menu = Model\Contact::photoMenu($contact);
                                        } else {
                                                $photo_menu = [];
                                        }
@@ -234,7 +234,7 @@ function dirfind_content(App $a, $prefix = "") {
 
                                $entry = [
                                        'alt_text' => $alt_text,
-                                       'url' => Contact::magicLink($jj->url),
+                                       'url' => Model\Contact::magicLink($jj->url),
                                        'itemurl' => $itemurl,
                                        'name' => htmlentities($jj->name),
                                        'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
@@ -245,7 +245,7 @@ function dirfind_content(App $a, $prefix = "") {
                                        'details'       => $contact_details['location'],
                                        'tags'          => $contact_details['keywords'],
                                        'about'         => $contact_details['about'],
-                                       'account_type'  => Contact::getAccountType($contact_details),
+                                       'account_type'  => Model\Contact::getAccountType($contact_details),
                                        'network' => ContactSelector::networkToName($jj->network, $jj->url),
                                        'id' => ++$id,
                                ];
index cfcbca4e47ce0e6cf82acf7f41e5a102dc426bcd..ec4ee4da2bc6d14666b127da06e9ae89cbcfeed9 100644 (file)
@@ -11,9 +11,8 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\Group;
-use Friendica\Module\Contacts;
+use Friendica\Model;
+use Friendica\Module\Contact;
 
 function group_init(App $a) {
        if (local_user()) {
@@ -186,7 +185,7 @@ function group_content(App $a) {
                }
 
                $group = $r[0];
-               $members = Contact::getByGroupId($group['id']);
+               $members = Model\Contact::getByGroupId($group['id']);
                $preselected = [];
                $entry = [];
                $id = 0;
@@ -204,7 +203,7 @@ function group_content(App $a) {
                                Group::addMember($group['id'], $change);
                        }
 
-                       $members = Contact::getByGroupId($group['id']);
+                       $members = Model\Contact::getByGroupId($group['id']);
                        $preselected = [];
                        if (count($members)) {
                                foreach ($members as $member) {
@@ -250,7 +249,7 @@ function group_content(App $a) {
        // Format the data of the group members
        foreach ($members as $member) {
                if ($member['url']) {
-                       $entry = Contacts::_contact_detail_for_template($member);
+                       $entry = Contact::getContactTemplateVars($member);
                        $entry['label'] = 'members';
                        $entry['photo_menu'] = '';
                        $entry['change_member'] = [
@@ -267,7 +266,7 @@ function group_content(App $a) {
        }
 
        if ($nogroup) {
-               $r = Contact::getUngroupedList(local_user());
+               $r = Model\Contact::getUngroupedList(local_user());
        } else {
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
                        intval(local_user())
@@ -279,7 +278,7 @@ function group_content(App $a) {
                // Format the data of the contacts who aren't in the contact group
                foreach ($r as $member) {
                        if (!in_array($member['id'], $preselected)) {
-                               $entry = Contacts::_contact_detail_for_template($member);
+                               $entry = Contact::getContactTemplateVars($member);
                                $entry['label'] = 'contacts';
                                if (!$nogroup)
                                        $entry['photo_menu'] = [];
index 8d26b3eb5e73d09f4394cbc72c009b538419f1e4..eb21b3b3e17e1ef8bb41d0a2d57b7eba465fb9dd 100644 (file)
@@ -29,7 +29,7 @@ use Friendica\Module\Login;
  *
  *  @brief manages contacts
  */
-class Contacts extends BaseModule 
+class Contact extends BaseModule 
 {
        public static function init()
        {
@@ -129,7 +129,7 @@ class Contacts extends BaseModule
                ]);
        }
 
-       private static function contacts_batch_actions(App $a)
+       private static function batchActions(App $a)
        {
                if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
                        return;
@@ -146,25 +146,25 @@ class Contacts extends BaseModule
                foreach ($orig_records as $orig_record) {
                        $contact_id = $orig_record['id'];
                        if (x($_POST, 'contacts_batch_update')) {
-                               self::_contact_update($contact_id);
+                               self::updateContactFromPoll($contact_id);
                                $count_actions++;
                        }
                        if (x($_POST, 'contacts_batch_block')) {
-                               self::_contact_block($contact_id);
+                               self::blockContact($contact_id);
                                $count_actions++;
                        }
                        if (x($_POST, 'contacts_batch_ignore')) {
-                               self::_contact_ignore($contact_id);
+                               self::ignoreContact($contact_id);
                                $count_actions++;
                        }
                        if (x($_POST, 'contacts_batch_archive')) {
-                               $r = self::_contact_archive($contact_id, $orig_record);
+                               $r = self::archiveContact($contact_id, $orig_record);
                                if ($r) {
                                        $count_actions++;
                                }
                        }
                        if (x($_POST, 'contacts_batch_drop')) {
-                               self::_contact_drop($orig_record);
+                               self::dropContact($orig_record);
                                $count_actions++;
                        }
                }
@@ -184,7 +184,7 @@ class Contacts extends BaseModule
                }
 
                if ($a->argv[1] === "batch") {
-                       self::contacts_batch_actions($a);
+                       self::batchActions($a);
                        return;
                }
 
@@ -253,7 +253,7 @@ class Contacts extends BaseModule
 
        /* contact actions */
 
-       private static function _contact_update($contact_id)
+       private static function updateContactFromPoll($contact_id)
        {
                $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
                if (!DBA::isResult($contact)) {
@@ -274,7 +274,7 @@ class Contacts extends BaseModule
                }
        }
 
-       private static function _contact_update_profile($contact_id)
+       private static function updateContactFromProbe($contact_id)
        {
                $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
                if (!DBA::isResult($contact)) {
@@ -340,19 +340,19 @@ class Contacts extends BaseModule
                GContact::updateFromProbe($data["url"]);
        }
 
-       private static function _contact_block($contact_id)
+       private static function blockContact($contact_id)
        {
                $blocked = !Contact::isBlockedByUser($contact_id, local_user());
                Contact::setBlockedForUser($contact_id, local_user(), $blocked);
        }
 
-       private static function _contact_ignore($contact_id)
+       private static function ignoreContact($contact_id)
        {
                $ignored = !Contact::isIgnoredByUser($contact_id, local_user());
                Contact::setIgnoredForUser($contact_id, local_user(), $ignored);
        }
 
-       private static function _contact_archive($contact_id, $orig_record)
+       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",
@@ -363,7 +363,7 @@ class Contacts extends BaseModule
                return DBA::isResult($r);
        }
 
-       private static function _contact_drop($orig_record)
+       private static function dropContact($orig_record)
        {
                $a = get_app();
 
@@ -407,19 +407,19 @@ class Contacts extends BaseModule
                        }
 
                        if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
-                               self::_contact_update($contact_id);
+                               self::updateContactFromPoll($contact_id);
                                goaway('contacts/' . $contact_id);
                                // NOTREACHED
                        }
 
                        if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
-                               self::_contact_update_profile($contact_id);
+                               self::updateContactFromProbe($contact_id);
                                goaway('crepair/' . $contact_id);
                                // NOTREACHED
                        }
 
                        if ($cmd === 'block') {
-                               self::_contact_block($contact_id);
+                               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);
@@ -429,7 +429,7 @@ class Contacts extends BaseModule
                        }
 
                        if ($cmd === 'ignore') {
-                               self::_contact_ignore($contact_id);
+                               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);
@@ -439,7 +439,7 @@ class Contacts extends BaseModule
                        }
 
                        if ($cmd === 'archive' && ($orig_record['uid'] != 0)) {
-                               $r = self::_contact_archive($contact_id, $orig_record);
+                               $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);
@@ -467,7 +467,7 @@ class Contacts extends BaseModule
 
                                        return replace_macros(get_markup_template('contact_drop_confirm.tpl'), [
                                                '$header' => L10n::t('Drop contact'),
-                                               '$contact' => self::_contact_detail_for_template($orig_record),
+                                               '$contact' => self::getContactTemplateVars($orig_record),
                                                '$method' => 'get',
                                                '$message' => L10n::t('Do you really want to delete this contact?'),
                                                '$extra_inputs' => $inputs,
@@ -482,17 +482,17 @@ class Contacts extends BaseModule
                                        goaway('contacts');
                                }
 
-                               self::_contact_drop($orig_record);
+                               self::dropContact($orig_record);
                                info(L10n::t('Contact has been removed.') . EOL);
 
                                goaway('contacts');
                                return; // NOTREACHED
                        }
                        if ($cmd === 'posts') {
-                               return self::contact_posts($a, $contact_id);
+                               return self::getPostsHTML($a, $contact_id);
                        }
                        if ($cmd === 'conversations') {
-                               return self::contact_conversations($a, $contact_id, $update);
+                               return self::getConversationsHMTL($a, $contact_id, $update);
                        }
                }
 
@@ -562,7 +562,7 @@ class Contacts extends BaseModule
                        $nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact["url"]));
 
                        // tabs
-                       $tab_str = self::contacts_tab($a, $contact, 3);
+                       $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!') : '');
 
@@ -605,7 +605,7 @@ class Contacts extends BaseModule
                        }
 
                        // Load contactact related actions like hide, suggest, delete and others
-                       $contact_actions = self::contact_actions($contact);
+                       $contact_actions = self::getContactActions($contact);
 
                        if ($contact['uid'] != 0) {
                                $lbl_vis1 = L10n::t('Profile Visibility');
@@ -822,7 +822,7 @@ class Contacts extends BaseModule
                        foreach ($r as $rr) {
                                $rr['blocked'] = Contact::isBlockedByUser($rr['id'], local_user());
                                $rr['readonly'] = Contact::isIgnoredByUser($rr['id'], local_user());
-                               $contacts[] = self::_contact_detail_for_template($rr);
+                               $contacts[] = self::getContactTemplateVars($rr);
                        }
                }
 
@@ -865,7 +865,7 @@ class Contacts extends BaseModule
         *
         * @return string
         */
-       public static function contacts_tab($a, $contact, $active_tab)
+       public static function getTabsHTML($a, $contact, $active_tab)
        {
                // tabs
                $tabs = [
@@ -934,7 +934,7 @@ class Contacts extends BaseModule
                return $tab_str;
        }
 
-       private static function contact_conversations($a, $contact_id, $update)
+       private static function getConversationsHMTL($a, $contact_id, $update)
        {
                $o = '';
 
@@ -959,7 +959,7 @@ class Contacts extends BaseModule
                $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
 
                if (!$update) {
-                       $o .= self::contacts_tab($a, $contact, 1);
+                       $o .= self::getTabsHTML($a, $contact, 1);
                }
 
                if (DBA::isResult($contact)) {
@@ -980,11 +980,11 @@ class Contacts extends BaseModule
                return $o;
        }
 
-       private static function contact_posts($a, $contact_id)
+       private static function getPostsHTML($a, $contact_id)
        {
                $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
 
-               $o = self::contacts_tab($a, $contact, 2);
+               $o = self::getTabsHTML($a, $contact, 2);
 
                if (DBA::isResult($contact)) {
                        $a->page['aside'] = "";
@@ -1004,7 +1004,7 @@ class Contacts extends BaseModule
                return $o;
        }
 
-       public static function _contact_detail_for_template(array $rr)
+       public static function getContactTemplateVars(array $rr)
        {
                $dir_icon = '';
                $alt_text = '';
@@ -1071,7 +1071,7 @@ class Contacts extends BaseModule
         * @param array $contact Data about the Contact
         * @return array with contact related actions
         */
-       private static function contact_actions($contact)
+       private static function getContactActions($contact)
        {
                $poll_enabled = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
                $contact_actions = [];
@@ -1133,5 +1133,4 @@ class Contacts extends BaseModule
 
                return $contact_actions;
        }
-
-}
\ No newline at end of file
+}
index fb9ac95cea7c4d224b722b32d4684b39b467fb2d..98c1b8e7b3b44a5cc9c93ea05102ee37cd5d49cc 100644 (file)
@@ -333,7 +333,7 @@ function frio_acl_lookup(App $a, &$results)
 
        if (DBA::isResult($r)) {
                foreach ($r as $rr) {
-                       $contacts[] = Contacts::_contact_detail_for_template($rr);
+                       $contacts[] = Contacts::getContactTemplateVars($rr);
                }
        }