Merge pull request #12707 from MrPetovan/bug/contact-page
Fix connection acknowledgement not appearing on contact page
This commit is contained in:
		
				commit
				
					
						62a6a5614d
					
				
			
		
					 5 changed files with 152 additions and 267 deletions
				
			
		| 
						 | 
				
			
			@ -243,15 +243,13 @@ class Contact
 | 
			
		|||
	 * @throws \Exception
 | 
			
		||||
	 * @todo Let's get rid of boolean type of $old_fields
 | 
			
		||||
	 */
 | 
			
		||||
	public static function update(array $fields, array $condition, $old_fields = [])
 | 
			
		||||
	public static function update(array $fields, array $condition, $old_fields = []): bool
 | 
			
		||||
	{
 | 
			
		||||
		$fields = DI::dbaDefinition()->truncateFieldsForTable('contact', $fields);
 | 
			
		||||
		$ret = DBA::update('contact', $fields, $condition, $old_fields);
 | 
			
		||||
 | 
			
		||||
		// Apply changes to the "user-contact" table on dedicated fields
 | 
			
		||||
		Contact\User::updateByContactUpdate($fields, $condition);
 | 
			
		||||
 | 
			
		||||
		return $ret;
 | 
			
		||||
		$fields = DI::dbaDefinition()->truncateFieldsForTable('contact', $fields);
 | 
			
		||||
		return DBA::update('contact', $fields, $condition, $old_fields);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
| 
						 | 
				
			
			@ -2970,7 +2968,7 @@ class Contact
 | 
			
		|||
		}
 | 
			
		||||
 | 
			
		||||
		// check if we already have a contact
 | 
			
		||||
		$condition = ['uid' => $uid, 'nurl' => Strings::normaliseLink($ret['url'])];
 | 
			
		||||
		$condition = ['uid' => $uid, 'nurl' => Strings::normaliseLink($ret['url']), 'deleted' => false];
 | 
			
		||||
		$contact = DBA::selectFirst('contact', ['id', 'rel', 'url', 'pending', 'hub-verify'], $condition);
 | 
			
		||||
 | 
			
		||||
		$protocol = self::getProtocol($ret['url'], $ret['network']);
 | 
			
		||||
| 
						 | 
				
			
			@ -3293,7 +3291,7 @@ class Contact
 | 
			
		|||
		if ($contact['rel'] == self::SHARING || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
 | 
			
		||||
			self::remove($contact['id']);
 | 
			
		||||
		} else {
 | 
			
		||||
			self::update(['rel' => self::FOLLOWER], ['id' => $contact['id']]);
 | 
			
		||||
			self::update(['rel' => self::FOLLOWER, 'pending' => false], ['id' => $contact['id']]);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		Worker::add(Worker::PRIORITY_LOW, 'ContactDiscoveryForUser', $contact['uid']);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -197,7 +197,7 @@ class Profile extends BaseModule
 | 
			
		|||
					Contact\User::setIgnored($contact['id'], DI::userSession()->getLocalUserId(), true);
 | 
			
		||||
					$message = $this->t('Contact has been ignored');
 | 
			
		||||
				}
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
				// @TODO: add $this->localRelationship->save($localRelationship);
 | 
			
		||||
				DI::sysmsg()->addInfo($message);
 | 
			
		||||
			}
 | 
			
		||||
| 
						 | 
				
			
			@ -213,7 +213,7 @@ class Profile extends BaseModule
 | 
			
		|||
					Contact\User::setCollapsed($contact['id'], DI::userSession()->getLocalUserId(), true);
 | 
			
		||||
					$message = $this->t('Contact has been collapsed');
 | 
			
		||||
				}
 | 
			
		||||
					
 | 
			
		||||
 | 
			
		||||
				// @TODO: add $this->localRelationship->save($localRelationship);
 | 
			
		||||
				DI::sysmsg()->addInfo($message);
 | 
			
		||||
			}
 | 
			
		||||
| 
						 | 
				
			
			@ -239,9 +239,6 @@ class Profile extends BaseModule
 | 
			
		|||
			'$baseurl' => $this->baseUrl->get(true),
 | 
			
		||||
		]);
 | 
			
		||||
 | 
			
		||||
		$contact['blocked']  = Contact\User::isBlocked($contact['id'], DI::userSession()->getLocalUserId());
 | 
			
		||||
		$contact['readonly'] = Contact\User::isIgnored($contact['id'], DI::userSession()->getLocalUserId());
 | 
			
		||||
 | 
			
		||||
		switch ($localRelationship->rel) {
 | 
			
		||||
			case Contact::FRIEND:   $relation_text = $this->t('You are mutual friends with %s', $contact['name']); break;
 | 
			
		||||
			case Contact::FOLLOWER:	$relation_text = $this->t('You are sharing with %s', $contact['name']); break;
 | 
			
		||||
| 
						 | 
				
			
			@ -361,16 +358,13 @@ class Profile extends BaseModule
 | 
			
		|||
			'$last_update'               => $last_update,
 | 
			
		||||
			'$udnow'                     => $this->t('Update now'),
 | 
			
		||||
			'$contact_id'                => $contact['id'],
 | 
			
		||||
			'$block_text'                => ($contact['blocked'] ? $this->t('Unblock') : $this->t('Block')),
 | 
			
		||||
			'$ignore_text'               => ($contact['readonly'] ? $this->t('Unignore') : $this->t('Ignore')),
 | 
			
		||||
			'$insecure'                  => (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]) ? '' : $insecure),
 | 
			
		||||
			'$info'                      => $localRelationship->info,
 | 
			
		||||
			'$cinfo'                     => ['info', '', $localRelationship->info, ''],
 | 
			
		||||
			'$blocked'                   => ($contact['blocked'] ? $this->t('Currently blocked') : ''),
 | 
			
		||||
			'$ignored'                   => ($contact['readonly'] ? $this->t('Currently ignored') : ''),
 | 
			
		||||
			'$collapsed'                 => (Contact\User::isCollapsed($contact['id'], DI::userSession()->getLocalUserId()) ? $this->t('Currently collapsed') : ''),
 | 
			
		||||
			'$pending'                   => $localRelationship->pending   ? $this->t('Awaiting connection acknowledge') : '',
 | 
			
		||||
			'$blocked'                   => $localRelationship->blocked   ? $this->t('Currently blocked') : '',
 | 
			
		||||
			'$ignored'                   => $localRelationship->ignored   ? $this->t('Currently ignored') : '',
 | 
			
		||||
			'$collapsed'                 => $localRelationship->collapsed ? $this->t('Currently collapsed') : '',
 | 
			
		||||
			'$archived'                  => ($contact['archive'] ? $this->t('Currently archived') : ''),
 | 
			
		||||
			'$pending'                   => ($contact['pending'] ? $this->t('Awaiting connection acknowledge') : ''),
 | 
			
		||||
			'$insecure'                  => (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]) ? '' : $insecure),
 | 
			
		||||
			'$cinfo'                     => ['info', '', $localRelationship->info, ''],
 | 
			
		||||
			'$hidden'                    => ['hidden', $this->t('Hide this contact from others'), $localRelationship->hidden, $this->t('Replies/likes to your public posts <strong>may</strong> still be visible')],
 | 
			
		||||
			'$notify_new_posts'          => ['notify_new_posts', $this->t('Notification for new posts'), ($localRelationship->notifyNewPosts), $this->t('Send a notification of every new post of this contact')],
 | 
			
		||||
			'$fetch_further_information' => $fetch_further_information,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@ msgid ""
 | 
			
		|||
msgstr ""
 | 
			
		||||
"Project-Id-Version: 2023.03-dev\n"
 | 
			
		||||
"Report-Msgid-Bugs-To: \n"
 | 
			
		||||
"POT-Creation-Date: 2023-01-18 20:40-0500\n"
 | 
			
		||||
"POT-Creation-Date: 2023-01-21 09:22-0500\n"
 | 
			
		||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 | 
			
		||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 | 
			
		||||
"Language-Team: LANGUAGE <LL@li.org>\n"
 | 
			
		||||
| 
						 | 
				
			
			@ -302,7 +302,7 @@ msgstr ""
 | 
			
		|||
#: mod/photos.php:819 mod/photos.php:1097 mod/photos.php:1138
 | 
			
		||||
#: mod/photos.php:1194 mod/photos.php:1268
 | 
			
		||||
#: src/Module/Calendar/Event/Form.php:250 src/Module/Contact/Advanced.php:132
 | 
			
		||||
#: src/Module/Contact/Profile.php:343
 | 
			
		||||
#: src/Module/Contact/Profile.php:340
 | 
			
		||||
#: src/Module/Debug/ActivityPubConversion.php:140
 | 
			
		||||
#: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
 | 
			
		||||
#: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51
 | 
			
		||||
| 
						 | 
				
			
			@ -1544,36 +1544,36 @@ msgstr ""
 | 
			
		|||
msgid "Follow Thread"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:420 src/Model/Contact.php:1206
 | 
			
		||||
#: src/Content/Item.php:420 src/Model/Contact.php:1204
 | 
			
		||||
msgid "View Status"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:421 src/Content/Item.php:440 src/Model/Contact.php:1150
 | 
			
		||||
#: src/Model/Contact.php:1198 src/Model/Contact.php:1207
 | 
			
		||||
#: src/Content/Item.php:421 src/Content/Item.php:440 src/Model/Contact.php:1148
 | 
			
		||||
#: src/Model/Contact.php:1196 src/Model/Contact.php:1205
 | 
			
		||||
#: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:234
 | 
			
		||||
msgid "View Profile"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:422 src/Model/Contact.php:1208
 | 
			
		||||
#: src/Content/Item.php:422 src/Model/Contact.php:1206
 | 
			
		||||
msgid "View Photos"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:423 src/Model/Contact.php:1199
 | 
			
		||||
#: src/Model/Contact.php:1209
 | 
			
		||||
#: src/Content/Item.php:423 src/Model/Contact.php:1197
 | 
			
		||||
#: src/Model/Contact.php:1207
 | 
			
		||||
msgid "Network Posts"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:424 src/Model/Contact.php:1200
 | 
			
		||||
#: src/Model/Contact.php:1210
 | 
			
		||||
#: src/Content/Item.php:424 src/Model/Contact.php:1198
 | 
			
		||||
#: src/Model/Contact.php:1208
 | 
			
		||||
msgid "View Contact"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:425 src/Model/Contact.php:1211
 | 
			
		||||
#: src/Content/Item.php:425 src/Model/Contact.php:1209
 | 
			
		||||
msgid "Send PM"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:426 src/Module/Contact.php:440
 | 
			
		||||
#: src/Module/Contact/Profile.php:364 src/Module/Contact/Profile.php:484
 | 
			
		||||
#: src/Module/Contact/Profile.php:478
 | 
			
		||||
#: src/Module/Moderation/Blocklist/Contact.php:116
 | 
			
		||||
#: src/Module/Moderation/Users/Active.php:137
 | 
			
		||||
#: src/Module/Moderation/Users/Index.php:152
 | 
			
		||||
| 
						 | 
				
			
			@ -1581,7 +1581,7 @@ msgid "Block"
 | 
			
		|||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:427 src/Module/Contact.php:441
 | 
			
		||||
#: src/Module/Contact/Profile.php:365 src/Module/Contact/Profile.php:492
 | 
			
		||||
#: src/Module/Contact/Profile.php:486
 | 
			
		||||
#: src/Module/Notifications/Introductions.php:134
 | 
			
		||||
#: src/Module/Notifications/Introductions.php:206
 | 
			
		||||
#: src/Module/Notifications/Notification.php:89
 | 
			
		||||
| 
						 | 
				
			
			@ -1589,7 +1589,7 @@ msgid "Ignore"
 | 
			
		|||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:428 src/Module/Contact.php:442
 | 
			
		||||
#: src/Module/Contact/Profile.php:500
 | 
			
		||||
#: src/Module/Contact/Profile.php:494
 | 
			
		||||
msgid "Collapse"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1598,7 +1598,7 @@ msgid "Languages"
 | 
			
		|||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Item.php:437 src/Content/Widget.php:80
 | 
			
		||||
#: src/Model/Contact.php:1201 src/Model/Contact.php:1212
 | 
			
		||||
#: src/Model/Contact.php:1199 src/Model/Contact.php:1210
 | 
			
		||||
#: src/Module/Contact/Follow.php:166 view/theme/vier/theme.php:196
 | 
			
		||||
msgid "Connect/Follow"
 | 
			
		||||
msgstr ""
 | 
			
		||||
| 
						 | 
				
			
			@ -1651,7 +1651,7 @@ msgstr ""
 | 
			
		|||
 | 
			
		||||
#: src/Content/Nav.php:230 src/Module/BaseProfile.php:49
 | 
			
		||||
#: src/Module/BaseSettings.php:100 src/Module/Contact.php:476
 | 
			
		||||
#: src/Module/Contact/Profile.php:399 src/Module/Profile/Profile.php:268
 | 
			
		||||
#: src/Module/Contact/Profile.php:393 src/Module/Profile/Profile.php:268
 | 
			
		||||
#: src/Module/Welcome.php:57 view/theme/frio/theme.php:230
 | 
			
		||||
msgid "Profile"
 | 
			
		||||
msgstr ""
 | 
			
		||||
| 
						 | 
				
			
			@ -1970,7 +1970,7 @@ msgid "The end"
 | 
			
		|||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Text/HTML.php:884 src/Content/Widget/VCard.php:109
 | 
			
		||||
#: src/Model/Profile.php:463 src/Module/Contact/Profile.php:444
 | 
			
		||||
#: src/Model/Profile.php:463 src/Module/Contact/Profile.php:438
 | 
			
		||||
msgid "Follow"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -2097,7 +2097,7 @@ msgstr ""
 | 
			
		|||
msgid "Organisations"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Widget.php:523 src/Model/Contact.php:1658
 | 
			
		||||
#: src/Content/Widget.php:523 src/Model/Contact.php:1656
 | 
			
		||||
msgid "News"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -2156,18 +2156,18 @@ msgid "More Trending Tags"
 | 
			
		|||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Widget/VCard.php:102 src/Model/Profile.php:378
 | 
			
		||||
#: src/Module/Contact/Profile.php:388 src/Module/Profile/Profile.php:199
 | 
			
		||||
#: src/Module/Contact/Profile.php:382 src/Module/Profile/Profile.php:199
 | 
			
		||||
msgid "XMPP:"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Widget/VCard.php:103 src/Model/Profile.php:379
 | 
			
		||||
#: src/Module/Contact/Profile.php:390 src/Module/Profile/Profile.php:203
 | 
			
		||||
#: src/Module/Contact/Profile.php:384 src/Module/Profile/Profile.php:203
 | 
			
		||||
msgid "Matrix:"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Widget/VCard.php:104 src/Model/Event.php:82
 | 
			
		||||
#: src/Model/Event.php:109 src/Model/Event.php:473 src/Model/Event.php:958
 | 
			
		||||
#: src/Model/Profile.php:373 src/Module/Contact/Profile.php:386
 | 
			
		||||
#: src/Model/Profile.php:373 src/Module/Contact/Profile.php:380
 | 
			
		||||
#: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187
 | 
			
		||||
#: src/Module/Profile/Profile.php:221
 | 
			
		||||
msgid "Location:"
 | 
			
		||||
| 
						 | 
				
			
			@ -2178,9 +2178,9 @@ msgstr ""
 | 
			
		|||
msgid "Network:"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1202
 | 
			
		||||
#: src/Model/Contact.php:1213 src/Model/Profile.php:465
 | 
			
		||||
#: src/Module/Contact/Profile.php:436
 | 
			
		||||
#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1200
 | 
			
		||||
#: src/Model/Contact.php:1211 src/Model/Profile.php:465
 | 
			
		||||
#: src/Module/Contact/Profile.php:430
 | 
			
		||||
msgid "Unfollow"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -2882,82 +2882,82 @@ msgstr ""
 | 
			
		|||
msgid "Legacy module file not found: %s"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:1219 src/Module/Moderation/Users/Pending.php:102
 | 
			
		||||
#: src/Model/Contact.php:1217 src/Module/Moderation/Users/Pending.php:102
 | 
			
		||||
#: src/Module/Notifications/Introductions.php:132
 | 
			
		||||
#: src/Module/Notifications/Introductions.php:204
 | 
			
		||||
msgid "Approve"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:1654
 | 
			
		||||
#: src/Model/Contact.php:1652
 | 
			
		||||
msgid "Organisation"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:1662
 | 
			
		||||
#: src/Model/Contact.php:1660
 | 
			
		||||
msgid "Forum"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2931
 | 
			
		||||
#: src/Model/Contact.php:2929
 | 
			
		||||
msgid "Disallowed profile URL."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2936 src/Module/Friendica.php:83
 | 
			
		||||
#: src/Model/Contact.php:2934 src/Module/Friendica.php:83
 | 
			
		||||
msgid "Blocked domain"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2941
 | 
			
		||||
#: src/Model/Contact.php:2939
 | 
			
		||||
msgid "Connect URL missing."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2950
 | 
			
		||||
#: src/Model/Contact.php:2948
 | 
			
		||||
msgid ""
 | 
			
		||||
"The contact could not be added. Please check the relevant network "
 | 
			
		||||
"credentials in your Settings -> Social Networks page."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2968
 | 
			
		||||
#: src/Model/Contact.php:2966
 | 
			
		||||
#, php-format
 | 
			
		||||
msgid "Expected network %s does not match actual network %s"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2985
 | 
			
		||||
#: src/Model/Contact.php:2983
 | 
			
		||||
msgid "The profile address specified does not provide adequate information."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2987
 | 
			
		||||
#: src/Model/Contact.php:2985
 | 
			
		||||
msgid "No compatible communication protocols or feeds were discovered."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2990
 | 
			
		||||
#: src/Model/Contact.php:2988
 | 
			
		||||
msgid "An author or name was not found."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2993
 | 
			
		||||
#: src/Model/Contact.php:2991
 | 
			
		||||
msgid "No browser URL could be matched to this address."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2996
 | 
			
		||||
#: src/Model/Contact.php:2994
 | 
			
		||||
msgid ""
 | 
			
		||||
"Unable to match @-style Identity Address with a known protocol or email "
 | 
			
		||||
"contact."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:2997
 | 
			
		||||
#: src/Model/Contact.php:2995
 | 
			
		||||
msgid "Use mailto: in front of address to force email check."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:3003
 | 
			
		||||
#: src/Model/Contact.php:3001
 | 
			
		||||
msgid ""
 | 
			
		||||
"The profile address specified belongs to a network which has been disabled "
 | 
			
		||||
"on this site."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:3008
 | 
			
		||||
#: src/Model/Contact.php:3006
 | 
			
		||||
msgid ""
 | 
			
		||||
"Limited profile. This person will be unable to receive direct/personal "
 | 
			
		||||
"notifications from you."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Contact.php:3073
 | 
			
		||||
#: src/Model/Contact.php:3071
 | 
			
		||||
msgid "Unable to retrieve contact information."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -3206,7 +3206,7 @@ msgstr ""
 | 
			
		|||
msgid "Homepage:"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Model/Profile.php:377 src/Module/Contact/Profile.php:392
 | 
			
		||||
#: src/Model/Profile.php:377 src/Module/Contact/Profile.php:386
 | 
			
		||||
#: src/Module/Notifications/Introductions.php:189
 | 
			
		||||
msgid "About:"
 | 
			
		||||
msgstr ""
 | 
			
		||||
| 
						 | 
				
			
			@ -4917,7 +4917,7 @@ msgid ""
 | 
			
		|||
"received."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Admin/Site.php:551 src/Module/Contact/Profile.php:290
 | 
			
		||||
#: src/Module/Admin/Site.php:551 src/Module/Contact/Profile.php:287
 | 
			
		||||
#: src/Module/Settings/TwoFactor/Index.php:125
 | 
			
		||||
msgid "Disabled"
 | 
			
		||||
msgstr ""
 | 
			
		||||
| 
						 | 
				
			
			@ -5695,20 +5695,18 @@ msgstr ""
 | 
			
		|||
msgid "Update"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact.php:440 src/Module/Contact/Profile.php:364
 | 
			
		||||
#: src/Module/Contact/Profile.php:484
 | 
			
		||||
#: src/Module/Contact.php:440 src/Module/Contact/Profile.php:478
 | 
			
		||||
#: src/Module/Moderation/Blocklist/Contact.php:117
 | 
			
		||||
#: src/Module/Moderation/Users/Blocked.php:138
 | 
			
		||||
#: src/Module/Moderation/Users/Index.php:154
 | 
			
		||||
msgid "Unblock"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact.php:441 src/Module/Contact/Profile.php:365
 | 
			
		||||
#: src/Module/Contact/Profile.php:492
 | 
			
		||||
#: src/Module/Contact.php:441 src/Module/Contact/Profile.php:486
 | 
			
		||||
msgid "Unignore"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact.php:442 src/Module/Contact/Profile.php:500
 | 
			
		||||
#: src/Module/Contact.php:442 src/Module/Contact/Profile.php:494
 | 
			
		||||
msgid "Uncollapse"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -5760,7 +5758,7 @@ msgstr ""
 | 
			
		|||
msgid "Pending incoming contact request"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact.php:597 src/Module/Contact/Profile.php:350
 | 
			
		||||
#: src/Module/Contact.php:597 src/Module/Contact/Profile.php:347
 | 
			
		||||
#, php-format
 | 
			
		||||
msgid "Visit %s's profile [%s]"
 | 
			
		||||
msgstr ""
 | 
			
		||||
| 
						 | 
				
			
			@ -5913,7 +5911,7 @@ msgstr ""
 | 
			
		|||
msgid "Your Identity Address:"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Follow.php:169 src/Module/Contact/Profile.php:382
 | 
			
		||||
#: src/Module/Contact/Follow.php:169 src/Module/Contact/Profile.php:376
 | 
			
		||||
#: src/Module/Contact/Unfollow.php:129
 | 
			
		||||
#: src/Module/Moderation/Blocklist/Contact.php:133
 | 
			
		||||
#: src/Module/Notifications/Introductions.php:129
 | 
			
		||||
| 
						 | 
				
			
			@ -5921,7 +5919,7 @@ msgstr ""
 | 
			
		|||
msgid "Profile URL"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Follow.php:170 src/Module/Contact/Profile.php:394
 | 
			
		||||
#: src/Module/Contact/Follow.php:170 src/Module/Contact/Profile.php:388
 | 
			
		||||
#: src/Module/Notifications/Introductions.php:191
 | 
			
		||||
#: src/Module/Profile/Profile.php:234
 | 
			
		||||
msgid "Tags:"
 | 
			
		||||
| 
						 | 
				
			
			@ -5988,220 +5986,220 @@ msgstr ""
 | 
			
		|||
msgid "Contact has been collapsed"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:246
 | 
			
		||||
#: src/Module/Contact/Profile.php:243
 | 
			
		||||
#, php-format
 | 
			
		||||
msgid "You are mutual friends with %s"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:247
 | 
			
		||||
#: src/Module/Contact/Profile.php:244
 | 
			
		||||
#, php-format
 | 
			
		||||
msgid "You are sharing with %s"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:248
 | 
			
		||||
#: src/Module/Contact/Profile.php:245
 | 
			
		||||
#, php-format
 | 
			
		||||
msgid "%s is sharing with you"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:264
 | 
			
		||||
#: src/Module/Contact/Profile.php:261
 | 
			
		||||
msgid "Private communications are not available for this contact."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:266
 | 
			
		||||
#: src/Module/Contact/Profile.php:263
 | 
			
		||||
msgid "Never"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:269
 | 
			
		||||
#: src/Module/Contact/Profile.php:266
 | 
			
		||||
msgid "(Update was not successful)"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:269
 | 
			
		||||
#: src/Module/Contact/Profile.php:266
 | 
			
		||||
msgid "(Update was successful)"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:271 src/Module/Contact/Profile.php:455
 | 
			
		||||
#: src/Module/Contact/Profile.php:268 src/Module/Contact/Profile.php:449
 | 
			
		||||
msgid "Suggest friends"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:275
 | 
			
		||||
#: src/Module/Contact/Profile.php:272
 | 
			
		||||
#, php-format
 | 
			
		||||
msgid "Network type: %s"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:280
 | 
			
		||||
#: src/Module/Contact/Profile.php:277
 | 
			
		||||
msgid "Communications lost with this contact!"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:286
 | 
			
		||||
#: src/Module/Contact/Profile.php:283
 | 
			
		||||
msgid "Fetch further information for feeds"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:288
 | 
			
		||||
#: src/Module/Contact/Profile.php:285
 | 
			
		||||
msgid ""
 | 
			
		||||
"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."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:291
 | 
			
		||||
#: src/Module/Contact/Profile.php:288
 | 
			
		||||
msgid "Fetch information"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:292
 | 
			
		||||
#: src/Module/Contact/Profile.php:289
 | 
			
		||||
msgid "Fetch keywords"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:293
 | 
			
		||||
#: src/Module/Contact/Profile.php:290
 | 
			
		||||
msgid "Fetch information and keywords"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:303 src/Module/Contact/Profile.php:308
 | 
			
		||||
#: src/Module/Contact/Profile.php:313 src/Module/Contact/Profile.php:319
 | 
			
		||||
#: src/Module/Contact/Profile.php:300 src/Module/Contact/Profile.php:305
 | 
			
		||||
#: src/Module/Contact/Profile.php:310 src/Module/Contact/Profile.php:316
 | 
			
		||||
msgid "No mirroring"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:304 src/Module/Contact/Profile.php:314
 | 
			
		||||
#: src/Module/Contact/Profile.php:320
 | 
			
		||||
#: src/Module/Contact/Profile.php:301 src/Module/Contact/Profile.php:311
 | 
			
		||||
#: src/Module/Contact/Profile.php:317
 | 
			
		||||
msgid "Mirror as my own posting"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:309 src/Module/Contact/Profile.php:315
 | 
			
		||||
#: src/Module/Contact/Profile.php:306 src/Module/Contact/Profile.php:312
 | 
			
		||||
msgid "Native reshare"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:332
 | 
			
		||||
#: src/Module/Contact/Profile.php:329
 | 
			
		||||
msgid "Contact Information / Notes"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:333
 | 
			
		||||
#: src/Module/Contact/Profile.php:330
 | 
			
		||||
msgid "Contact Settings"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:341
 | 
			
		||||
#: src/Module/Contact/Profile.php:338
 | 
			
		||||
msgid "Contact"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:345
 | 
			
		||||
#: src/Module/Contact/Profile.php:342
 | 
			
		||||
msgid "Their personal note"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:347
 | 
			
		||||
#: src/Module/Contact/Profile.php:344
 | 
			
		||||
msgid "Edit contact notes"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:351
 | 
			
		||||
#: src/Module/Contact/Profile.php:348
 | 
			
		||||
msgid "Block/Unblock contact"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:352
 | 
			
		||||
#: src/Module/Contact/Profile.php:349
 | 
			
		||||
msgid "Ignore contact"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:353
 | 
			
		||||
#: src/Module/Contact/Profile.php:350
 | 
			
		||||
msgid "View conversations"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:358
 | 
			
		||||
#: src/Module/Contact/Profile.php:355
 | 
			
		||||
msgid "Last update:"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:360
 | 
			
		||||
#: src/Module/Contact/Profile.php:357
 | 
			
		||||
msgid "Update public posts"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:362 src/Module/Contact/Profile.php:465
 | 
			
		||||
#: src/Module/Contact/Profile.php:359 src/Module/Contact/Profile.php:459
 | 
			
		||||
msgid "Update now"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:369
 | 
			
		||||
msgid "Currently blocked"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:370
 | 
			
		||||
msgid "Currently ignored"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:371
 | 
			
		||||
msgid "Currently collapsed"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:372
 | 
			
		||||
msgid "Currently archived"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:373
 | 
			
		||||
#: src/Module/Contact/Profile.php:361
 | 
			
		||||
msgid "Awaiting connection acknowledge"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:374
 | 
			
		||||
#: src/Module/Contact/Profile.php:362
 | 
			
		||||
msgid "Currently blocked"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:363
 | 
			
		||||
msgid "Currently ignored"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:364
 | 
			
		||||
msgid "Currently collapsed"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:365
 | 
			
		||||
msgid "Currently archived"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:368
 | 
			
		||||
#: src/Module/Notifications/Introductions.php:192
 | 
			
		||||
msgid "Hide this contact from others"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:374
 | 
			
		||||
#: src/Module/Contact/Profile.php:368
 | 
			
		||||
msgid ""
 | 
			
		||||
"Replies/likes to your public posts <strong>may</strong> still be visible"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:375
 | 
			
		||||
#: src/Module/Contact/Profile.php:369
 | 
			
		||||
msgid "Notification for new posts"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:375
 | 
			
		||||
#: src/Module/Contact/Profile.php:369
 | 
			
		||||
msgid "Send a notification of every new post of this contact"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:377
 | 
			
		||||
#: src/Module/Contact/Profile.php:371
 | 
			
		||||
msgid "Keyword Deny List"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:377
 | 
			
		||||
#: src/Module/Contact/Profile.php:371
 | 
			
		||||
msgid ""
 | 
			
		||||
"Comma separated list of keywords that should not be converted to hashtags, "
 | 
			
		||||
"when \"Fetch information and keywords\" is selected"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:395
 | 
			
		||||
#: src/Module/Contact/Profile.php:389
 | 
			
		||||
#: src/Module/Settings/TwoFactor/Index.php:139
 | 
			
		||||
msgid "Actions"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:397
 | 
			
		||||
#: src/Module/Contact/Profile.php:391
 | 
			
		||||
#: src/Module/Settings/TwoFactor/Index.php:119 view/theme/frio/theme.php:229
 | 
			
		||||
msgid "Status"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:403
 | 
			
		||||
#: src/Module/Contact/Profile.php:397
 | 
			
		||||
msgid "Mirror postings from this contact"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:405
 | 
			
		||||
#: src/Module/Contact/Profile.php:399
 | 
			
		||||
msgid ""
 | 
			
		||||
"Mark this contact as remote_self, this will cause friendica to repost new "
 | 
			
		||||
"entries from this contact."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:475
 | 
			
		||||
#: src/Module/Contact/Profile.php:469
 | 
			
		||||
msgid "Refetch contact data"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:486
 | 
			
		||||
#: src/Module/Contact/Profile.php:480
 | 
			
		||||
msgid "Toggle Blocked status"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:494
 | 
			
		||||
#: src/Module/Contact/Profile.php:488
 | 
			
		||||
msgid "Toggle Ignored status"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:502
 | 
			
		||||
#: src/Module/Contact/Profile.php:496
 | 
			
		||||
msgid "Toggle Collapsed status"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:509 src/Module/Contact/Revoke.php:106
 | 
			
		||||
#: src/Module/Contact/Profile.php:503 src/Module/Contact/Revoke.php:106
 | 
			
		||||
msgid "Revoke Follow"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: src/Module/Contact/Profile.php:511
 | 
			
		||||
#: src/Module/Contact/Profile.php:505
 | 
			
		||||
msgid "Revoke the follow from this contact"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,3 +1,4 @@
 | 
			
		|||
 | 
			
		||||
<div id="contact-edit-wrapper">
 | 
			
		||||
 | 
			
		||||
	{{* Insert Tab-Nav *}}
 | 
			
		||||
| 
						 | 
				
			
			@ -12,7 +13,7 @@
 | 
			
		|||
 | 
			
		||||
					{{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
 | 
			
		||||
					<div id="contact-edit-actions">
 | 
			
		||||
						<a class="btn" rel="#contact-actions-menu" href="#" id="contact-edit-actions-button">{{$contact_action_button}}</a>
 | 
			
		||||
						<button class="btn" id="contact-edit-actions-button">{{$contact_action_button}}</button>
 | 
			
		||||
 | 
			
		||||
						<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup">
 | 
			
		||||
							{{if $contact_actions.follow}}<li role="menuitem"><a href="{{$contact_actions.follow.url}}" title="{{$contact_actions.follow.title}}">{{$contact_actions.follow.label}}</a></li>{{/if}}
 | 
			
		||||
| 
						 | 
				
			
			@ -23,7 +24,6 @@
 | 
			
		|||
							<li class="divider"></li>
 | 
			
		||||
							<li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
 | 
			
		||||
							<li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
 | 
			
		||||
							<li role="menuitem"><a href="#" title="{{$contact_actions.collapse.title}}" onclick="window.location.href='{{$contact_actions.collapse.url}}'; return false;">{{$contact_actions.collapse.label}}</a></li>
 | 
			
		||||
							{{if $contact_actions.revoke_follow.url}}<li role="menuitem"><a href="{{$contact_actions.revoke_follow.url}}" title="{{$contact_actions.revoke_follow.title}}">{{$contact_actions.revoke_follow.label}}</a></li>{{/if}}
 | 
			
		||||
						</ul>
 | 
			
		||||
					</div>
 | 
			
		||||
| 
						 | 
				
			
			@ -34,9 +34,9 @@
 | 
			
		|||
 | 
			
		||||
						{{if $poll_enabled}}
 | 
			
		||||
							<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
 | 
			
		||||
							{{if $poll_interval}}
 | 
			
		||||
								<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
 | 
			
		||||
							{{/if}}
 | 
			
		||||
								{{if $poll_interval}}
 | 
			
		||||
									<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
 | 
			
		||||
								{{/if}}
 | 
			
		||||
							</li>
 | 
			
		||||
						{{/if}}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -45,13 +45,12 @@
 | 
			
		|||
						{{if $blocked && !$pending}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
 | 
			
		||||
						{{if $pending}}<li><div id="pending-message">{{$pending}}</div></li>{{/if}}
 | 
			
		||||
						{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 | 
			
		||||
						{{if $collapsed}}<li><div id="collapse-message">{{$collapsed}}</div></li>{{/if}}
 | 
			
		||||
						{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 | 
			
		||||
					</ul>
 | 
			
		||||
				</div> {{* End of contact-edit-status-wrapper *}}
 | 
			
		||||
 | 
			
		||||
				{{* Some information about the contact from the profile *}}
 | 
			
		||||
				<dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
 | 
			
		||||
				<dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$profileurl}}">{{$profileurl}}</a></dd></dl>
 | 
			
		||||
				{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location nofilter}}</dd></dl>{{/if}}
 | 
			
		||||
				{{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
 | 
			
		||||
				{{if $matrix}}<dl><dt>{{$matrix_label}}</dt><dd>{{$matrix}}</dd></dl>{{/if}}
 | 
			
		||||
| 
						 | 
				
			
			@ -63,40 +62,39 @@
 | 
			
		|||
 | 
			
		||||
			<hr />
 | 
			
		||||
 | 
			
		||||
			{{if $contact_settings_label}}
 | 
			
		||||
		{{if $contact_settings_label}}
 | 
			
		||||
			<h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4>
 | 
			
		||||
			<div id="contact-edit-settings">
 | 
			
		||||
				<input type="hidden" name="contact_id" value="{{$contact_id}}">
 | 
			
		||||
 | 
			
		||||
					<div id="contact-edit-end"></div>
 | 
			
		||||
					{{include file="field_checkbox.tpl" field=$notify_new_posts}}
 | 
			
		||||
					{{if $fetch_further_information}}
 | 
			
		||||
						{{include file="field_select.tpl" field=$fetch_further_information}}
 | 
			
		||||
						{{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
 | 
			
		||||
					{{/if}}
 | 
			
		||||
					{{if $allow_remote_self}}
 | 
			
		||||
						{{include file="field_select.tpl" field=$remote_self}}
 | 
			
		||||
					{{/if}}
 | 
			
		||||
				<div id="contact-edit-end"></div>
 | 
			
		||||
 | 
			
		||||
					{{include file="field_checkbox.tpl" field=$hidden}}
 | 
			
		||||
				{{include file="field_checkbox.tpl" field=$notify_new_posts}}
 | 
			
		||||
 | 
			
		||||
				<div id="contact-edit-info-wrapper">
 | 
			
		||||
					<h4>{{$lbl_info1}}</h4>
 | 
			
		||||
					<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
 | 
			
		||||
				</div>
 | 
			
		||||
				<div id="contact-edit-info-end"></div>
 | 
			
		||||
			{{if $fetch_further_information}}
 | 
			
		||||
				{{include file="field_select.tpl" field=$fetch_further_information}}
 | 
			
		||||
				{{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
 | 
			
		||||
			{{/if}}
 | 
			
		||||
 | 
			
		||||
				{{if $reason}}
 | 
			
		||||
			{{if $allow_remote_self}}
 | 
			
		||||
				{{include file="field_select.tpl" field=$remote_self}}
 | 
			
		||||
			{{/if}}
 | 
			
		||||
 | 
			
		||||
				{{include file="field_checkbox.tpl" field=$hidden}}
 | 
			
		||||
 | 
			
		||||
				{{include file="field_textarea.tpl" field=$cinfo}}
 | 
			
		||||
 | 
			
		||||
			{{if $reason}}
 | 
			
		||||
				<div id="contact-info-wrapper">
 | 
			
		||||
					<h4>{{$lbl_info2}}</h4>
 | 
			
		||||
					<p>{{$reason}}</p>
 | 
			
		||||
				</div>
 | 
			
		||||
				<div id="contact-info-end"></div>
 | 
			
		||||
				{{/if}}
 | 
			
		||||
			</div>
 | 
			
		||||
 | 
			
		||||
			<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
 | 
			
		||||
			{{/if}}
 | 
			
		||||
			</div>
 | 
			
		||||
			<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
 | 
			
		||||
		{{/if}}
 | 
			
		||||
 | 
			
		||||
			<div class="contact-edit-submit-end clearfix"></div>
 | 
			
		||||
 | 
			
		||||
		</form>{{* End of the form *}}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,103 +0,0 @@
 | 
			
		|||
 | 
			
		||||
<div id="contact-edit-wrapper">
 | 
			
		||||
 | 
			
		||||
	{{* Insert Tab-Nav *}}
 | 
			
		||||
	{{$tab_str nofilter}}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	<div id="contact-edit-nav-wrapper">
 | 
			
		||||
		<form action="contact/{{$contact_id}}" method="post">
 | 
			
		||||
			<div id="contact-edit-links">
 | 
			
		||||
				<div id="contact-edit-status-wrapper">
 | 
			
		||||
					<span id="contact-edit-contact-status">{{$contact_status}}</span>
 | 
			
		||||
 | 
			
		||||
					{{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
 | 
			
		||||
					<div id="contact-edit-actions">
 | 
			
		||||
						<a class="btn" id="contact-edit-actions-button">{{$contact_action_button}}</a>
 | 
			
		||||
 | 
			
		||||
						<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup">
 | 
			
		||||
							{{if $contact_actions.follow}}<li role="menuitem"><a href="{{$contact_actions.follow.url}}" title="{{$contact_actions.follow.title}}">{{$contact_actions.follow.label}}</a></li>{{/if}}
 | 
			
		||||
							{{if $contact_actions.unfollow}}<li role="menuitem"><a href="{{$contact_actions.unfollow.url}}" title="{{$contact_actions.unfollow.title}}">{{$contact_actions.unfollow.label}}</a></li>{{/if}}
 | 
			
		||||
							{{if $lblsuggest}}<li role="menuitem"><a href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
 | 
			
		||||
							{{if $poll_enabled}}<li role="menuitem"><a href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
 | 
			
		||||
							{{if $contact_actions.updateprofile}}<li role="menuitem"><a href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
 | 
			
		||||
							<li class="divider"></li>
 | 
			
		||||
							<li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
 | 
			
		||||
							<li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
 | 
			
		||||
							{{if $contact_actions.revoke_follow.url}}<li role="menuitem"><a href="{{$contact_actions.revoke_follow.url}}" title="{{$contact_actions.revoke_follow.title}}">{{$contact_actions.revoke_follow.label}}</a></li>{{/if}}
 | 
			
		||||
						</ul>
 | 
			
		||||
					</div>
 | 
			
		||||
 | 
			
		||||
					{{* Block with status information about the contact *}}
 | 
			
		||||
					<ul>
 | 
			
		||||
						{{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}}
 | 
			
		||||
 | 
			
		||||
						{{if $poll_enabled}}
 | 
			
		||||
							<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
 | 
			
		||||
							{{if $poll_interval}}
 | 
			
		||||
								<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
 | 
			
		||||
							{{/if}}
 | 
			
		||||
							</li>
 | 
			
		||||
						{{/if}}
 | 
			
		||||
 | 
			
		||||
						{{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
 | 
			
		||||
						{{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li>	{{/if}}
 | 
			
		||||
						{{if $blocked && !$pending}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
 | 
			
		||||
						{{if $pending}}<li><div id="pending-message">{{$pending}}</div></li>{{/if}}
 | 
			
		||||
						{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 | 
			
		||||
						{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 | 
			
		||||
					</ul>
 | 
			
		||||
				</div> {{* End of contact-edit-status-wrapper *}}
 | 
			
		||||
 | 
			
		||||
				{{* Some information about the contact from the profile *}}
 | 
			
		||||
				<dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$profileurl}}">{{$profileurl}}</a></dd></dl>
 | 
			
		||||
				{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location nofilter}}</dd></dl>{{/if}}
 | 
			
		||||
				{{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
 | 
			
		||||
				{{if $matrix}}<dl><dt>{{$matrix_label}}</dt><dd>{{$matrix}}</dd></dl>{{/if}}
 | 
			
		||||
				{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
 | 
			
		||||
				{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
 | 
			
		||||
			</div>{{* End of contact-edit-links *}}
 | 
			
		||||
 | 
			
		||||
			<div id="contact-edit-links-end"></div>
 | 
			
		||||
 | 
			
		||||
			<hr />
 | 
			
		||||
 | 
			
		||||
			{{if $contact_settings_label}}
 | 
			
		||||
			<h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4>
 | 
			
		||||
			<div id="contact-edit-settings">
 | 
			
		||||
				<input type="hidden" name="contact_id" value="{{$contact_id}}">
 | 
			
		||||
 | 
			
		||||
					<div id="contact-edit-end"></div>
 | 
			
		||||
					{{include file="field_checkbox.tpl" field=$notify_new_posts}}
 | 
			
		||||
					{{if $fetch_further_information}}
 | 
			
		||||
						{{include file="field_select.tpl" field=$fetch_further_information}}
 | 
			
		||||
						{{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
 | 
			
		||||
					{{/if}}
 | 
			
		||||
					{{if $allow_remote_self}}
 | 
			
		||||
						{{include file="field_select.tpl" field=$remote_self}}
 | 
			
		||||
					{{/if}}
 | 
			
		||||
 | 
			
		||||
					{{include file="field_checkbox.tpl" field=$hidden}}
 | 
			
		||||
 | 
			
		||||
				<div id="contact-edit-info-wrapper">
 | 
			
		||||
					<h4>{{$lbl_info1}}</h4>
 | 
			
		||||
					<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
 | 
			
		||||
				</div>
 | 
			
		||||
				<div id="contact-edit-info-end"></div>
 | 
			
		||||
 | 
			
		||||
				{{if $reason}}
 | 
			
		||||
				<div id="contact-info-wrapper">
 | 
			
		||||
					<h4>{{$lbl_info2}}</h4>
 | 
			
		||||
					<p>{{$reason}}</p>
 | 
			
		||||
				</div>
 | 
			
		||||
				<div id="contact-info-end"></div>
 | 
			
		||||
				{{/if}}
 | 
			
		||||
			</div>
 | 
			
		||||
			<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
 | 
			
		||||
			{{/if}}
 | 
			
		||||
 | 
			
		||||
			<div class="contact-edit-submit-end clearfix"></div>
 | 
			
		||||
 | 
			
		||||
		</form>{{* End of the form *}}
 | 
			
		||||
	</div>{{* End of contact-edit-nav-wrapper *}}
 | 
			
		||||
</div>
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue