X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact.php;h=769bb82b3160f071bba899514e142c9217c39ec3;hb=6cbfa5b862ce7a241fd4339129749f87dc19760c;hp=ded5ffbe2343ec2e15161e1425b9263aca27241a;hpb=8c03bdada92845974ecadeecb9e673c7ffac22b4;p=friendica.git

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index ded5ffbe23..769bb82b31 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -14,13 +14,13 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
@@ -32,7 +32,7 @@ use Friendica\Util\Strings;
  */
 class Contact extends BaseModule
 {
-	private static function batchActions(App $a)
+	private static function batchActions()
 	{
 		if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
 			return;
@@ -72,12 +72,12 @@ class Contact extends BaseModule
 			info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
 		}
 
-		$a->internalRedirect('contact');
+		DI::baseUrl()->redirect('contact');
 	}
 
 	public static function post(array $parameters = [])
 	{
-		$a = self::getApp();
+		$a = DI::app();
 
 		if (!local_user()) {
 			return;
@@ -85,7 +85,7 @@ class Contact extends BaseModule
 
 		// @TODO: Replace with parameter from router
 		if ($a->argv[1] === 'batch') {
-			self::batchActions($a);
+			self::batchActions();
 			return;
 		}
 
@@ -97,7 +97,7 @@ class Contact extends BaseModule
 
 		if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false])) {
 			notice(L10n::t('Could not access contact record.') . EOL);
-			$a->internalRedirect('contact');
+			DI::baseUrl()->redirect('contact');
 			return; // NOTREACHED
 		}
 
@@ -246,13 +246,13 @@ class Contact extends BaseModule
 			return Login::form($_SERVER['REQUEST_URI']);
 		}
 
-		$a = self::getApp();
+		$a = DI::app();
 
 		$nets = $_GET['nets'] ?? '';
 		$rel  = $_GET['rel']  ?? '';
 
-		if (empty($a->page['aside'])) {
-			$a->page['aside'] = '';
+		if (empty(DI::page()['aside'])) {
+			DI::page()['aside'] = '';
 		}
 
 		$contact_id = null;
@@ -278,9 +278,9 @@ class Contact extends BaseModule
 			if ($contact['self']) {
 				// @TODO: Replace with parameter from router
 				if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
-					$a->internalRedirect('profile/' . $contact['nick']);
+					DI::baseUrl()->redirect('profile/' . $contact['nick']);
 				} else {
-					$a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile');
+					DI::baseUrl()->redirect('profile/' . $contact['nick'] . '?tab=profile');
 				}
 			}
 
@@ -346,11 +346,11 @@ class Contact extends BaseModule
 			$groups_widget = null;
 		}
 
-		$a->page['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget;
+		DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget;
 
 		$tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
-		$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
-			'$baseurl' => $a->getBaseURL(true),
+		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+			'$baseurl' => DI::baseUrl()->get(true),
 		]);
 
 		$sort_type = 0;
@@ -378,13 +378,13 @@ class Contact extends BaseModule
 
 			if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromPoll($contact_id);
-				$a->internalRedirect('contact/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
 			if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromProbe($contact_id);
-				$a->internalRedirect('crepair/' . $contact_id);
+				DI::baseUrl()->redirect('crepair/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -394,7 +394,7 @@ class Contact extends BaseModule
 				$blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
 				info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
 
-				$a->internalRedirect('contact/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -404,7 +404,7 @@ class Contact extends BaseModule
 				$ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
 				info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
 
-				$a->internalRedirect('contact/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -415,7 +415,7 @@ class Contact extends BaseModule
 					info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
 				}
 
-				$a->internalRedirect('contact/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -424,7 +424,7 @@ class Contact extends BaseModule
 				if (!empty($_REQUEST['confirm'])) {
 					// <form> can't take arguments in its 'action' parameter
 					// so add any arguments as hidden inputs
-					$query = explode_querystring($a->query_string);
+					$query = explode_querystring(DI::args()->getQueryString());
 					$inputs = [];
 					foreach ($query['args'] as $arg) {
 						if (strpos($arg, 'confirm=') === false) {
@@ -433,7 +433,7 @@ class Contact extends BaseModule
 						}
 					}
 
-					$a->page['aside'] = '';
+					DI::page()['aside'] = '';
 
 					return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
 						'$header' => L10n::t('Drop contact'),
@@ -449,13 +449,13 @@ class Contact extends BaseModule
 				}
 				// Now check how the user responded to the confirmation query
 				if (!empty($_REQUEST['canceled'])) {
-					$a->internalRedirect('contact');
+					DI::baseUrl()->redirect('contact');
 				}
 
 				self::dropContact($orig_record);
 				info(L10n::t('Contact has been removed.') . EOL);
 
-				$a->internalRedirect('contact');
+				DI::baseUrl()->redirect('contact');
 				// NOTREACHED
 			}
 			if ($cmd === 'posts') {
@@ -466,13 +466,13 @@ class Contact extends BaseModule
 			}
 		}
 
-		$_SESSION['return_path'] = $a->query_string;
+		$_SESSION['return_path'] = DI::args()->getQueryString();
 
 		if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
 			$contact = $a->data['contact'];
 
-			$a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
-				'$baseurl' => $a->getBaseURL(true),
+			DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
+				'$baseurl' => DI::baseUrl()->get(true),
 			]);
 
 			$contact['blocked']  = Model\Contact::isBlockedByUser($contact['id'], local_user());
@@ -528,7 +528,7 @@ class Contact extends BaseModule
 
 			$poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
 
-			$nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url']));
+			$nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
 
 			// tabs
 			$tab_str = self::getTabsHTML($a, $contact, 3);
@@ -646,21 +646,25 @@ class Contact extends BaseModule
 			return $arr['output'];
 		}
 
+		$select_uid = local_user();
+
 		// @TODO: Replace with parameter from router
 		$type = $a->argv[1] ?? '';
 
 		switch ($type) {
 			case 'blocked':
-				$sql_extra = " AND `blocked`";
+				$sql_extra = sprintf(" AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = %d and `user-contact`.`blocked`)", intval(local_user()));
+				$select_uid = 0;
 				break;
 			case 'hidden':
-				$sql_extra = " AND `hidden` AND NOT `blocked`";
+				$sql_extra = " AND `hidden` AND NOT `blocked` AND NOT `pending`";
 				break;
 			case 'ignored':
-				$sql_extra = " AND `readonly` AND NOT `blocked`";
+				$sql_extra = sprintf(" AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = %d and `user-contact`.`ignored`)", intval(local_user()));
+				$select_uid = 0;
 				break;
 			case 'archived':
-				$sql_extra = " AND `archive` AND NOT `blocked`";
+				$sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
 				break;
 			case 'pending':
 				$sql_extra = sprintf(" AND `pending` AND NOT `archive` AND ((`rel` = %d)
@@ -762,21 +766,21 @@ class Contact extends BaseModule
 
 		$sql_extra2 = ((($sort_type > 0) && ($sort_type <= Model\Contact::FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : '');
 
+		$sql_extra3 = Widget::unavailableNetworks();
+
 		$r = q("SELECT COUNT(*) AS `total` FROM `contact`
-			WHERE `uid` = %d AND `self` = 0 $sql_extra $sql_extra2 ",
-			intval($_SESSION['uid'])
+			WHERE `uid` = %d AND `self` = 0 $sql_extra $sql_extra2 $sql_extra3",
+			intval($select_uid)
 		);
 		if (DBA::isResult($r)) {
 			$total = $r[0]['total'];
 		}
-		$pager = new Pager($a->query_string);
-
-		$sql_extra3 = Widget::unavailableNetworks();
+		$pager = new Pager(DI::args()->getQueryString());
 
 		$contacts = [];
 
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ",
-			intval($_SESSION['uid']),
+			intval($select_uid),
 			$pager->getStart(),
 			$pager->getItemsPerPage()
 		);
@@ -814,7 +818,7 @@ class Contact extends BaseModule
 			'$desc'       => L10n::t('Search your contacts'),
 			'$finding'    => $searching ? L10n::t('Results for: %s', $search) : '',
 			'$submit'     => L10n::t('Find'),
-			'$cmd'        => $a->cmd,
+			'$cmd'        => DI::args()->getCommand(),
 			'$contacts'   => $contacts,
 			'$contact_drop_confirm' => L10n::t('Do you really want to delete this contact?'),
 			'multiselect' => 1,
@@ -926,7 +930,7 @@ class Contact extends BaseModule
 					'default_location' => $a->user['default-location'],
 					'nickname' => $a->user['nickname'],
 					'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-					'acl' => ACL::getFullSelectorHTML($a->user, true),
+					'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
 					'bang' => '',
 					'visitor' => 'block',
 					'profile_uid' => local_user(),
@@ -942,7 +946,7 @@ class Contact extends BaseModule
 		}
 
 		if (DBA::isResult($contact)) {
-			$a->page['aside'] = '';
+			DI::page()['aside'] = '';
 
 			$profiledata = Model\Contact::getDetailsByURL($contact['url']);
 
@@ -960,12 +964,12 @@ class Contact extends BaseModule
 		$o = self::getTabsHTML($a, $contact, 2);
 
 		if (DBA::isResult($contact)) {
-			$a->page['aside'] = '';
+			DI::page()['aside'] = '';
 
 			$profiledata = Model\Contact::getDetailsByURL($contact['url']);
 
 			if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
-				$profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
+				$profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
 			}
 
 			Model\Profile::load($a, '', 0, $profiledata, true);
@@ -1039,7 +1043,7 @@ class Contact extends BaseModule
 			'sparkle'   => $sparkle,
 			'itemurl'   => ($rr['addr'] ?? '') ?: $rr['url'],
 			'url'       => $url,
-			'network'   => ContactSelector::networkToName($rr['network'], $rr['url']),
+			'network'   => ContactSelector::networkToName($rr['network'], $rr['url'], $rr['protocol']),
 			'nick'      => $rr['nick'],
 		];
 	}