X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact.php;h=e8c9d2241a43a0577c7da637cbcb7dfa20a2c9a9;hb=99284222c1d7fb4adca9077e3057faf3b36f7180;hp=d89e556fcba6eaa540be0c40bfc92eabad5d1960;hpb=621b4216d94badbe7a4797c42e704ce63e8df3c4;p=friendica.git

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index d89e556fcb..e8c9d2241a 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -35,6 +35,7 @@ use Friendica\DI;
 use Friendica\Model;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Network\HTTPException\NotFoundException;
 
 /**
@@ -59,12 +60,12 @@ class Contact extends BaseModule
 
 		self::checkFormSecurityTokenRedirectOnError($redirectUrl, 'contact_batch_actions');
 
-		$orig_records = Model\Contact::selectToArray(['id', 'uid'], ['id' => $_POST['contact_batch'], 'uid' => [0, local_user()], 'self' => false, 'deleted' => false]);
+		$orig_records = Model\Contact::selectToArray(['id', 'uid'], ['id' => $_POST['contact_batch'], 'uid' => [0, DI::userSession()->getLocalUserId()], 'self' => false, 'deleted' => false]);
 
 		$count_actions = 0;
 		foreach ($orig_records as $orig_record) {
-			$cdata = Model\Contact::getPublicAndUserContactID($orig_record['id'], local_user());
-			if (empty($cdata) || public_contact() === $cdata['public']) {
+			$cdata = Model\Contact::getPublicAndUserContactID($orig_record['id'], DI::userSession()->getLocalUserId());
+			if (empty($cdata) || DI::userSession()->getPublicContactId() === $cdata['public']) {
 				// No action available on your own contact
 				continue;
 			}
@@ -75,7 +76,7 @@ class Contact extends BaseModule
 			}
 
 			if (!empty($_POST['contacts_batch_block'])) {
-				self::toggleBlockContact($cdata['public'], local_user());
+				self::toggleBlockContact($cdata['public'], DI::userSession()->getLocalUserId());
 				$count_actions++;
 			}
 
@@ -85,7 +86,7 @@ class Contact extends BaseModule
 			}
 		}
 		if ($count_actions > 0) {
-			info(DI::l10n()->tt('%d contact edited.', '%d contacts edited.', $count_actions));
+			DI::sysmsg()->addInfo(DI::l10n()->tt('%d contact edited.', '%d contacts edited.', $count_actions));
 		}
 
 		DI::baseUrl()->redirect($redirectUrl);
@@ -93,7 +94,7 @@ class Contact extends BaseModule
 
 	protected function post(array $request = [])
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			return;
 		}
 
@@ -113,7 +114,7 @@ class Contact extends BaseModule
 	 */
 	public static function updateContactFromPoll(int $contact_id)
 	{
-		$contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
+		$contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => DI::userSession()->getLocalUserId(), 'deleted' => false]);
 		if (!DBA::isResult($contact)) {
 			return;
 		}
@@ -126,9 +127,9 @@ class Contact extends BaseModule
 			}
 
 			// pull feed and consume it, which should subscribe to the hub.
-			Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
+			Worker::add(Worker::PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
 		} else {
-			Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
+			Worker::add(Worker::PRIORITY_HIGH, 'UpdateContact', $contact_id);
 		}
 	}
 
@@ -153,13 +154,13 @@ class Contact extends BaseModule
 	 */
 	private static function toggleIgnoreContact(int $contact_id)
 	{
-		$ignored = !Model\Contact\User::isIgnored($contact_id, local_user());
-		Model\Contact\User::setIgnored($contact_id, local_user(), $ignored);
+		$ignored = !Model\Contact\User::isIgnored($contact_id, DI::userSession()->getLocalUserId());
+		Model\Contact\User::setIgnored($contact_id, DI::userSession()->getLocalUserId(), $ignored);
 	}
 
 	protected function content(array $request = []): string
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			return Login::form($_SERVER['REQUEST_URI']);
 		}
 
@@ -186,12 +187,12 @@ class Contact extends BaseModule
 			$follow_widget = Widget::follow();
 		}
 
-		$account_widget = Widget::accounttypes($_SERVER['REQUEST_URI'], $accounttype);
+		$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 . $account_widget . $groups_widget . $networks_widget . $rel_widget;
+		DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $rel_widget . $groups_widget . $networks_widget . $account_widget;
 
 		$tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
 		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
@@ -203,14 +204,14 @@ class Contact extends BaseModule
 
 		$_SESSION['return_path'] = DI::args()->getQueryString();
 
-		$sql_values = [local_user()];
+		$sql_values = [DI::userSession()->getLocalUserId()];
 
 		// @TODO: Replace with parameter from router
 		$type = DI::args()->getArgv()[1] ?? '';
 
 		switch ($type) {
 			case 'blocked':
-				$sql_extra = " AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = ? and `user-contact`.`blocked`)";
+				$sql_extra = " AND `id` IN (SELECT `cid` FROM `user-contact` WHERE `user-contact`.`uid` = ? AND `user-contact`.`blocked`)";
 				// This makes the query look for contact.uid = 0
 				array_unshift($sql_values, 0);
 				break;
@@ -218,7 +219,7 @@ class Contact extends BaseModule
 				$sql_extra = " AND `hidden` AND NOT `blocked` AND NOT `pending`";
 				break;
 			case 'ignored':
-				$sql_extra = " AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = ? and `user-contact`.`ignored`)";
+				$sql_extra = " AND `id` IN (SELECT `cid` FROM `user-contact` WHERE `user-contact`.`uid` = ? AND `user-contact`.`ignored`)";
 				// This makes the query look for contact.uid = 0
 				array_unshift($sql_values, 0);
 				break;
@@ -227,8 +228,9 @@ class Contact extends BaseModule
 				break;
 			case 'pending':
 				$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`))";
+					OR `id` IN (SELECT `contact-id` FROM `intro` WHERE `intro`.`uid` = ? AND NOT `ignore`))";
 				$sql_values[] = Model\Contact::SHARING;
+				$sql_values[] = DI::userSession()->getLocalUserId();
 				break;
 			default:
 				$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
@@ -245,8 +247,10 @@ class Contact extends BaseModule
 		if ($search) {
 			$searching = true;
 			$search_hdr = $search;
-			$search_txt = preg_quote($search);
-			$sql_extra .= " AND (name REGEXP ? OR url REGEXP ? OR nick REGEXP ?)";
+			$search_txt = preg_quote(trim($search, ' @!'));
+			$sql_extra .= " AND (`name` REGEXP ? OR `url` REGEXP ? OR `nick` REGEXP ? OR `addr` REGEXP ? OR `alias` REGEXP ?)";
+			$sql_values[] = $search_txt;
+			$sql_values[] = $search_txt;
 			$sql_values[] = $search_txt;
 			$sql_values[] = $search_txt;
 			$sql_values[] = $search_txt;
@@ -275,7 +279,7 @@ class Contact extends BaseModule
 		}
 
 		if ($group) {
-			$sql_extra .= " AND EXISTS(SELECT `id` FROM `group_member` WHERE `gid` = ? AND `contact`.`id` = `contact-id`)";
+			$sql_extra .= " AND `id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)";
 			$sql_values[] = $group;
 		}
 
@@ -295,8 +299,8 @@ class Contact extends BaseModule
 		$stmt = DBA::select('contact', [], $condition, ['order' => ['name'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]);
 
 		while ($contact = DBA::fetch($stmt)) {
-			$contact['blocked'] = Model\Contact\User::isBlocked($contact['id'], local_user());
-			$contact['readonly'] = Model\Contact\User::isIgnored($contact['id'], local_user());
+			$contact['blocked'] = Model\Contact\User::isBlocked($contact['id'], DI::userSession()->getLocalUserId());
+			$contact['readonly'] = Model\Contact\User::isIgnored($contact['id'], DI::userSession()->getLocalUserId());
 			$contacts[] = self::getContactTemplateVars($contact);
 		}
 		DBA::close($stmt);
@@ -420,7 +424,7 @@ class Contact extends BaseModule
 	public static function getTabsHTML(array $contact, int $active_tab)
 	{
 		$cid = $pcid = $contact['id'];
-		$data = Model\Contact::getPublicAndUserContactID($contact['id'], local_user());
+		$data = Model\Contact::getPublicAndUserContactID($contact['id'], DI::userSession()->getLocalUserId());
 		if (!empty($data['user']) && ($contact['id'] == $data['public'])) {
 			$cid = $data['user'];
 		} elseif (!empty($data['public'])) {
@@ -491,21 +495,23 @@ class Contact extends BaseModule
 	 *
 	 * @param array $contact Contact array
 	 * @return array Template fields
+	 * @throws InternalServerErrorException
+	 * @throws \ImagickException
 	 */
-	public static function getContactTemplateVars(array $contact)
+	public static function getContactTemplateVars(array $contact): array
 	{
 		$alt_text = '';
 
-		if (!empty($contact['url']) && isset($contact['uid']) && ($contact['uid'] == 0) && local_user()) {
-			$personal = Model\Contact::getByURL($contact['url'], false, ['uid', 'rel', 'self'], local_user());
+		if (!empty($contact['url']) && isset($contact['uid']) && ($contact['uid'] == 0) && DI::userSession()->getLocalUserId()) {
+			$personal = Model\Contact::getByURL($contact['url'], false, ['uid', 'rel', 'self'], DI::userSession()->getLocalUserId());
 			if (!empty($personal)) {
-				$contact['uid'] = $personal['uid'];
-				$contact['rel'] = $personal['rel'];
+				$contact['uid']  = $personal['uid'];
+				$contact['rel']  = $personal['rel'];
 				$contact['self'] = $personal['self'];
 			}
 		}
 
-		if (!empty($contact['uid']) && !empty($contact['rel']) && local_user() == $contact['uid']) {
+		if (!empty($contact['uid']) && !empty($contact['rel']) && DI::userSession()->getLocalUserId() == $contact['uid']) {
 			switch ($contact['rel']) {
 				case Model\Contact::FRIEND:
 					$alt_text = DI::l10n()->t('Mutual Friendship');
@@ -526,7 +532,7 @@ class Contact extends BaseModule
 
 		$url = Model\Contact::magicLinkByContact($contact);
 
-		if (strpos($url, 'redir/') === 0) {
+		if (strpos($url, 'contact/redir/') === 0) {
 			$sparkle = ' class="sparkle" ';
 		} else {
 			$sparkle = '';
@@ -542,15 +548,15 @@ class Contact extends BaseModule
 
 		if ($contact['self']) {
 			$alt_text = DI::l10n()->t('This is you');
-			$url = $contact['url'];
-			$sparkle = '';
+			$url      = $contact['url'];
+			$sparkle  = '';
 		}
 
 		return [
 			'id'           => $contact['id'],
 			'url'          => $url,
 			'img_hover'    => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
-			'photo_menu'   => Model\Contact::photoMenu($contact),
+			'photo_menu'   => Model\Contact::photoMenu($contact, DI::userSession()->getLocalUserId()),
 			'thumb'        => Model\Contact::getThumb($contact, true),
 			'alt_text'     => $alt_text,
 			'name'         => $contact['name'],
@@ -558,7 +564,7 @@ class Contact extends BaseModule
 			'details'      => $contact['location'],
 			'tags'         => $contact['keywords'],
 			'about'        => $contact['about'],
-			'account_type' => Model\Contact::getAccountType($contact),
+			'account_type' => Model\Contact::getAccountType($contact['contact-type']),
 			'sparkle'      => $sparkle,
 			'itemurl'      => ($contact['addr'] ?? '') ?: $contact['url'],
 			'network'      => ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol'], $contact['gsid']),