X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact.php;h=08256bcf566093dda03f3b6535b6706352c225f7;hb=b1bc8ebbfa6d978a48c98c278d1b6081cbcd4ea8;hp=6425df8df1e58417def5833a904d852d63d5b02c;hpb=dfa177e9404cc6c34a1d6ba089c7c322ecb56f33;p=friendica.git

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 6425df8df1..08256bcf56 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -21,7 +21,6 @@
 
 namespace Friendica\Module;
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
@@ -32,10 +31,12 @@ use Friendica\Core\ACL;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Theme;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
+use Friendica\Model\User;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\NotFoundException;
@@ -130,6 +131,8 @@ class Contact extends BaseModule
 
 		$fetch_further_information = intval($_POST['fetch_further_information'] ?? 0);
 
+		$remote_self = $_POST['remote_self'] ?? false;
+
 		$ffi_keyword_denylist = Strings::escapeHtml(trim($_POST['ffi_keyword_denylist'] ?? ''));
 
 		$priority = intval($_POST['poll'] ?? 0);
@@ -145,6 +148,7 @@ class Contact extends BaseModule
 			'hidden'     => $hidden,
 			'notify_new_posts' => $notify,
 			'fetch_further_information' => $fetch_further_information,
+			'remote_self' => $remote_self,
 			'ffi_keyword_denylist'     => $ffi_keyword_denylist],
 			['id' => $contact_id, 'uid' => local_user()]
 		);
@@ -259,9 +263,15 @@ class Contact extends BaseModule
 		$rel    = Strings::escapeTags(trim($_GET['rel']    ?? ''));
 		$group  = Strings::escapeTags(trim($_GET['group']  ?? ''));
 
-		if (empty(DI::page()['aside'])) {
-			DI::page()['aside'] = '';
-		}
+		$accounttype = $_GET['accounttype'] ?? '';
+		$accounttypeid = User::getAccountTypeByString($accounttype);
+
+		$page = DI::page();
+
+		$page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
+		$page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
+		$page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
+		$page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
 
 		$contact = null;
 		// @TODO: Replace with parameter from router
@@ -306,9 +316,9 @@ class Contact extends BaseModule
 			$unfollow_link = '';
 			if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 				if ($contact['uid'] && in_array($contact['rel'], [Model\Contact::SHARING, Model\Contact::FRIEND])) {
-					$unfollow_link = 'unfollow?url=' . urlencode($contact['url']);
+					$unfollow_link = 'unfollow?url=' . urlencode($contact['url']) . '&auto=1';
 				} elseif(!$contact['pending']) {
-					$follow_link = 'follow?url=' . urlencode($contact['url']);
+					$follow_link = 'follow?url=' . urlencode($contact['url']) . '&auto=1';
 				}
 			}
 
@@ -335,6 +345,7 @@ class Contact extends BaseModule
 
 			$findpeople_widget = '';
 			$follow_widget = '';
+			$account_widget = '';
 			$networks_widget = '';
 			$rel_widget = '';
 
@@ -352,12 +363,13 @@ class Contact extends BaseModule
 				$follow_widget = Widget::follow();
 			}
 
+			$account_widget = Widget::accounttypes($_SERVER['REQUEST_URI'], $accounttype);
 			$networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets);
 			$rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel);
 			$groups_widget = Widget::groups($_SERVER['REQUEST_URI'], $group);
 		}
 
-		DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget;
+		DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $account_widget . $groups_widget . $networks_widget . $rel_widget;
 
 		$tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
 		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
@@ -432,17 +444,6 @@ class Contact extends BaseModule
 			if ($cmd === 'drop' && ($orig_record['uid'] != 0)) {
 				// Check if we should do HTML-based delete confirmation
 				if (!empty($_REQUEST['confirm'])) {
-					// <form> can't take arguments in its 'action' parameter
-					// so add any arguments as hidden inputs
-					$query = explode_querystring(DI::args()->getQueryString());
-					$inputs = [];
-					foreach ($query['args'] as $arg) {
-						if (strpos($arg, 'confirm=') === false) {
-							$arg_parts = explode('=', $arg);
-							$inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
-						}
-					}
-
 					DI::page()['aside'] = '';
 
 					return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
@@ -450,9 +451,8 @@ class Contact extends BaseModule
 						'$contact' => self::getContactTemplateVars($orig_record),
 						'$method' => 'get',
 						'$message' => DI::l10n()->t('Do you really want to delete this contact?'),
-						'$extra_inputs' => $inputs,
 						'$confirm' => DI::l10n()->t('Yes'),
-						'$confirm_url' => $query['base'],
+						'$confirm_url' => DI::args()->getCommand(),
 						'$confirm_name' => 'confirmed',
 						'$cancel' => DI::l10n()->t('Cancel'),
 					]);
@@ -557,8 +557,20 @@ class Contact extends BaseModule
 				];
 			}
 
+			// Disable remote self for everything except feeds.
+			// There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter
+			// Problem is, you couldn't reply to both networks.
+			$allow_remote_self = in_array($contact['network'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])
+				&& DI::config()->get('system', 'allow_users_remote_self');
+
+			if ($contact['network'] == Protocol::FEED) {
+				$remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '1' => DI::l10n()->t('Mirror as forwarded posting'), '2' => DI::l10n()->t('Mirror as my own posting')];
+			} else {
+				$remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')];
+			}
+
 			$poll_interval = null;
-			if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
+			if ((($contact['network'] == Protocol::FEED) && !DI::config()->get('system', 'adjust_poll_frequency')) || ($contact['network']== Protocol::MAIL)) {
 				$poll_interval = ContactSelector::pollInterval($contact['priority'], !$poll_enabled);
 			}
 
@@ -631,6 +643,13 @@ class Contact extends BaseModule
 				'$contact_status' => DI::l10n()->t('Status'),
 				'$contact_settings_label' => $contact_settings_label,
 				'$contact_profile_label' => DI::l10n()->t('Profile'),
+				'$allow_remote_self' => $allow_remote_self,
+				'$remote_self'       => ['remote_self',
+					DI::l10n()->t('Mirror postings from this contact'),
+					$contact['remote_self'],
+					DI::l10n()->t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
+					$remote_self_options
+				],	
 			]);
 
 			$arr = ['contact' => $contact, 'output' => $o];
@@ -660,18 +679,23 @@ class Contact extends BaseModule
 				array_unshift($sql_values, 0);
 				break;
 			case 'archived':
-				$sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
+				$sql_extra = " AND (`archive` OR `failed`) AND NOT `blocked` AND NOT `pending`";
 				break;
 			case 'pending':
-				$sql_extra = " AND `pending` AND NOT `archive` AND ((`rel` = ?)
+				$sql_extra = " AND `pending` AND NOT `archive` AND NOT `failed` AND ((`rel` = ?)
 					OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))";
 				$sql_values[] = Model\Contact::SHARING;
 				break;
 			default:
-				$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
+				$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending` AND NOT `failed`";
 				break;
 		}
 
+		if (isset($accounttypeid)) {
+			$sql_extra .= " AND `contact-type` = ?";
+			$sql_values[] = $accounttypeid;
+		}
+
 		$searching = false;
 		$search_hdr = null;
 		if ($search) {
@@ -913,7 +937,7 @@ class Contact extends BaseModule
 			],
 		];
 
-		if ($cid != $pcid) {
+		if (!empty($contact['network']) && in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) && ($cid != $pcid)) {
 			$tabs[] = ['label' => DI::l10n()->t('Advanced'),
 				'url'   => 'contact/' . $cid . '/advanced/',
 				'sel'   => (($active_tab == self::TAB_ADVANCED) ? 'active' : ''),
@@ -929,7 +953,7 @@ class Contact extends BaseModule
 		return $tab_str;
 	}
 
-	private static function getConversationsHMTL($a, $contact_id, $update)
+	public static function getConversationsHMTL($a, $contact_id, $update, $parent = 0)
 	{
 		$o = '';
 
@@ -960,14 +984,15 @@ class Contact extends BaseModule
 		if (DBA::isResult($contact)) {
 			DI::page()['aside'] = '';
 
-			$profiledata = Model\Contact::getByURL($contact['url'], false);
-
-			Model\Profile::load($a, '', $profiledata, true);
+			if (!$update) {
+				$profiledata = Model\Contact::getByURLForUser($contact['url'], local_user());
+				Model\Profile::load($a, '', $profiledata, true);
+			}
 
 			if ($contact['uid'] == 0) {
-				$o .= Model\Contact::getPostsFromId($contact['id'], true, $update);
+				$o .= Model\Contact::getPostsFromId($contact['id'], true, $update, $parent);
 			} else {
-				$o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
+				$o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update, $parent);
 			}
 		}
 
@@ -983,7 +1008,7 @@ class Contact extends BaseModule
 		if (DBA::isResult($contact)) {
 			DI::page()['aside'] = '';
 
-			$profiledata = Model\Contact::getByURL($contact['url'], false);
+			$profiledata = Model\Contact::getByURLForUser($contact['url'], local_user());
 
 			if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
 				$profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);