Decrease scope of query in Profile::getEventsReminderHTML

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index c37c4f3d5076ba2a8e40cee4309ea34b6a769524..cd9021c17ec2cd4edde1b6c9b1997f92bb840f89 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -6,6 +6,7 @@
 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;
@@ -44,6 +45,14 @@ function contacts_init(App $a)
        }
 
        if (DBM::is_result($contact)) {
+               if ($contact['self']) {
+                       if (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts")) {
+                               goaway('profile/' . $contact['nick']);
+                       } else {
+                               goaway('profile/' . $contact['nick'] . '?tab=profile');
+                       }
+               }
+
                $a->data['contact'] = $contact;
 
                if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != NETWORK_DFRN)) {
@@ -348,9 +357,6 @@ function _contact_archive($contact_id, $orig_record)
                intval($contact_id),
                intval(local_user())
        );
-       if ($archived) {
-               q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact_id), intval(local_user()));
-       }
        return DBM::is_result($r);
 }
 
@@ -581,9 +587,10 @@ function contacts_content(App $a)
                        $profile_select = ContactSelector::profileAssign($contact['profile-id'], (($contact['network'] !== NETWORK_DFRN) ? true : false));
                }
 
+               /// @todo Only show the following link with DFRN when the remote version supports it
                $follow = '';
                $follow_text = '';
-               if (in_array($contact['network'], [NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+               if (in_array($contact['network'], [NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_DFRN])) {
                        if ($contact['rel'] == CONTACT_IS_FOLLOWER) {
                                $follow = System::baseUrl(true) . "/follow?url=" . urlencode($contact["url"]);
                                $follow_text = L10n::t("Connect/Follow");
@@ -649,11 +656,11 @@ function contacts_content(App $a)
                        '$profileurllabel' => L10n::t('Profile URL'),
                        '$profileurl' => $contact['url'],
                        '$account_type' => Contact::getAccountType($contact),
-                       '$location' => bbcode($contact["location"]),
+                       '$location' => BBCode::convert($contact["location"]),
                        '$location_label' => L10n::t("Location:"),
-                       '$xmpp' => bbcode($contact["xmpp"]),
+                       '$xmpp' => BBCode::convert($contact["xmpp"]),
                        '$xmpp_label' => L10n::t("XMPP:"),
-                       '$about' => bbcode($contact["about"], false, false),
+                       '$about' => BBCode::convert($contact["about"], false),
                        '$about_label' => L10n::t("About:"),
                        '$keywords' => $contact["keywords"],
                        '$keywords_label' => L10n::t("Tags:"),
@@ -941,6 +948,13 @@ function _contact_detail_for_template($rr)
                $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'),