X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=361f1a7e4b20305fbb73180a010e4dfb352a1577;hb=1d86d79778bb7e2d00bd9031877e566a6037144e;hp=03e35c02b010a6bf91ed95afdda927d6e0d0ae8d;hpb=ead0cf370aa985b895e3db46cd7e3b1dc2bdfff6;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 03e35c02b0..361f1a7e4b 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -35,9 +35,11 @@ use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; +use Friendica\Network\HTTPException; use Friendica\Protocol\Activity; use Friendica\Protocol\Diaspora; use Friendica\Util\DateTimeFormat; +use Friendica\Util\HTTPSignature; use Friendica\Util\Network; use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; @@ -203,58 +205,36 @@ class Profile * the theme is chosen before the _init() function of a theme is run, which will usually * load a lot of theme-specific content * - * @param App $a - * @param string $nickname string - * @param array $profiledata array - * @param boolean $show_connect Show connect link - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @param App $a + * @param string $nickname string + * @param bool $show_contacts + * @return array Profile + * + * @throws HTTPException\NotFoundException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function load(App $a, $nickname, array $profiledata = [], $show_connect = true) + public static function load(App $a, string $nickname, bool $show_contacts = true) { - $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]); - - if (!DBA::isResult($user) && empty($profiledata)) { - Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG); - return; - } - - if (count($profiledata) > 0) { - // Ensure to have a "nickname" field - if (empty($profiledata['nickname']) && !empty($profiledata['nick'])) { - $profiledata['nickname'] = $profiledata['nick']; - } - - // Add profile data to sidebar - DI::page()['aside'] .= self::sidebar($a, $profiledata, true, $show_connect); - - if (!DBA::isResult($user)) { - return; - } - } - - $profile = !empty($user['uid']) ? User::getOwnerDataById($user['uid'], false) : []; - - if (empty($profile) && empty($profiledata)) { + $profile = User::getOwnerDataByNick($nickname); + if (empty($profile)) { Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG); - return; + return []; } - if (empty($profile)) { - $profile = ['uid' => 0, 'name' => $nickname]; + // System user, aborting + if ($profile['uid'] === 0) { + DI::logger()->warning('System user found in Profile::load', ['nickname' => $nickname, 'callstack' => System::callstack(20)]); + throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); } - $a->profile = $profile; - $a->profile_uid = $profile['uid']; - - $a->profile['mobile-theme'] = DI::pConfig()->get($a->profile['uid'], 'system', 'mobile_theme'); - $a->profile['network'] = Protocol::DFRN; + $a->setProfileOwner($profile['uid']); - DI::page()['title'] = $a->profile['name'] . ' @ ' . DI::config()->get('config', 'sitename'); + DI::page()['title'] = $profile['name'] . ' @ ' . DI::config()->get('config', 'sitename'); - if (!$profiledata && !DI::pConfig()->get(local_user(), 'system', 'always_my_theme')) { - $a->setCurrentTheme($a->profile['theme']); - $a->setCurrentMobileTheme($a->profile['mobile-theme']); + if (!DI::pConfig()->get(local_user(), 'system', 'always_my_theme')) { + $a->setCurrentTheme($profile['theme']); + $a->setCurrentMobileTheme(DI::pConfig()->get($a->getProfileOwner(), 'system', 'mobile_theme')); } /* @@ -268,39 +248,15 @@ class Profile require_once $theme_info_file; } - $block = ((DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) ? true : false); + $block = (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()); /** * @todo * By now, the contact block isn't shown, when a different profile is given * But: When this profile was on the same server, then we could display the contacts */ - if (!$profiledata) { - DI::page()['aside'] .= self::sidebar($a, $a->profile, $block, $show_connect); - } + DI::page()['aside'] .= self::getVCardHtml($profile, $block, $show_contacts); - return; - } - - /** - * Get all profile data of a local user - * - * If the viewer is an authenticated remote viewer, the profile displayed is the - * one that has been configured for his/her viewing in the Contact manager. - * Passing a non-zero profile ID can also allow a preview of a selected profile - * by the owner - * - * Includes all available profile data - * - * @param string $nickname nick - * @param int $uid uid - * @param int $profile_id ID of the profile - * @return array - * @throws \Exception - */ - public static function getByNickname($nickname, $uid = 0) - { - $profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname, 'uid' => $uid]); return $profile; } @@ -310,9 +266,9 @@ class Profile * It is very difficult to templatise the HTML completely * because of all the conditional logic. * - * @param array $profile - * @param int $block - * @param boolean $show_connect Show connect link + * @param array $profile Profile array + * @param bool $block Block personal details + * @param bool $show_contacts Show contact block * * @return string HTML sidebar module * @@ -325,50 +281,32 @@ class Profile * @hooks 'profile_sidebar' * array $arr */ - private static function sidebar(App $a, array $profile, $block = 0, $show_connect = true) + public static function getVCardHtml(array $profile, bool $block, bool $show_contacts) { $o = ''; $location = false; - // This function can also use contact information in $profile, but the 'cid' - // value is going to be coming from 'owner-view', which means it's the wrong - // contact ID for the user viewing this page. Use 'nurl' to look up the - // correct contact table entry for the logged-in user. $profile_contact = []; - if (!empty($profile['nurl'] ?? '')) { - if (local_user() && ($profile['uid'] ?? '') != local_user()) { - $profile_contact = Contact::getById(Contact::getIdForURL($profile['nurl'], local_user())); - } - if (!empty($profile['cid']) && self::getMyURL()) { - $profile_contact = Contact::selectFirst(['rel'], ['id' => $profile['cid']]); - } + if (local_user() && ($profile['uid'] ?? 0) != local_user()) { + $profile_contact = Contact::getByURL($profile['nurl'], null, [], local_user()); } - - if (empty($profile['nickname'])) { - Logger::warning('Received profile with no nickname', ['profile' => $profile, 'callstack' => System::callstack(10)]); - return $o; + if (!empty($profile['cid']) && self::getMyURL()) { + $profile_contact = Contact::selectFirst([], ['id' => $profile['cid']]); } - $profile['picdate'] = urlencode($profile['picdate'] ?? ''); + $profile['picdate'] = urlencode($profile['picdate']); - if (($profile['network'] != '') && ($profile['network'] != Protocol::DFRN)) { - $profile['network_link'] = Strings::formatNetworkName($profile['network'], $profile['url']); - } else { - $profile['network_link'] = ''; - } + $profile['network_link'] = ''; Hook::callAll('profile_sidebar_enter', $profile); - if (isset($profile['url'])) { - $profile_url = $profile['url']; - } else { - $profile_url = DI::baseUrl()->get() . '/profile/' . $profile['nickname']; - } + $profile_url = $profile['url']; + + $cid = $profile['id']; $follow_link = null; $unfollow_link = null; - $subscribe_feed_link = null; $wallmessage_link = null; // Who is the logged-in user to this profile? @@ -377,8 +315,6 @@ class Profile $visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]); } - $profile_is_dfrn = $profile['network'] == Protocol::DFRN; - $profile_is_native = in_array($profile['network'], Protocol::NATIVE_SUPPORT); $local_user_is_self = self::getMyURL() && ($profile['url'] == self::getMyURL()); $visitor_is_authenticated = (bool)self::getMyURL(); $visitor_is_following = @@ -389,13 +325,13 @@ class Profile || in_array($profile_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND]); $visitor_base_path = self::getMyURL() ? preg_replace('=/profile/(.*)=ism', '', self::getMyURL()) : ''; - if (!$local_user_is_self && $show_connect) { + if (!$local_user_is_self) { if (!$visitor_is_authenticated) { // Remote follow is only available for local profiles if (!empty($profile['nickname']) && strpos($profile_url, DI::baseUrl()->get()) === 0) { $follow_link = 'remote_follow/' . $profile['nickname']; } - } elseif ($profile_is_native) { + } else { if ($visitor_is_following) { $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url) . '&auto=1'; } else { @@ -403,10 +339,6 @@ class Profile } } - if ($profile_is_dfrn) { - $subscribe_feed_link = 'dfrn_poll/' . $profile['nickname']; - } - if (Contact::canReceivePrivateMessages($profile_contact)) { if ($visitor_is_followed || $visitor_is_following) { $wallmessage_link = $visitor_base_path . '/message/new/' . $profile_contact['id']; @@ -438,6 +370,7 @@ class Profile $homepage = !empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false; $about = !empty($profile['about']) ? DI::l10n()->t('About:') : false; $xmpp = !empty($profile['xmpp']) ? DI::l10n()->t('XMPP:') : false; + $matrix = !empty($profile['matrix']) ? DI::l10n()->t('Matrix:') : false; if ((!empty($profile['hidewall']) || $block) && !Session::isAuthenticated()) { $location = $homepage = $about = false; @@ -472,10 +405,10 @@ class Profile $updated = date('c', strtotime($profile['last-item'])); } - if (!$block) { - $contact_block = ContactBlock::getHTML($a->profile); + if (!$block && $show_contacts) { + $contact_block = ContactBlock::getHTML($profile, local_user()); - if (is_array($a->profile) && !$a->profile['hide-friends']) { + if (is_array($profile) && !$profile['hide-friends']) { $contact_count = DBA::count('contact', [ 'uid' => $profile['uid'], 'self' => false, @@ -501,29 +434,28 @@ class Profile } if (isset($p['about'])) { - $p['about'] = BBCode::convert($p['about']); + $p['about'] = BBCode::convertForUriId($profile['uri-id'] ?? 0, $p['about']); } if (isset($p['address'])) { - $p['address'] = BBCode::convert($p['address']); + $p['address'] = BBCode::convertForUriId($profile['uri-id'] ?? 0, $p['address']); } - if (isset($p['photo'])) { - $p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL); - } + $p['photo'] = Contact::getAvatarUrlForId($cid, ProxyUtils::SIZE_SMALL); - $p['url'] = Contact::magicLink(($p['url'] ?? '') ?: $profile_url); + $p['url'] = Contact::magicLinkById($cid, $profile['url']); $tpl = Renderer::getMarkupTemplate('profile/vcard.tpl'); $o .= Renderer::replaceMacros($tpl, [ '$profile' => $p, '$xmpp' => $xmpp, + '$matrix' => $matrix, '$follow' => DI::l10n()->t('Follow'), '$follow_link' => $follow_link, '$unfollow' => DI::l10n()->t('Unfollow'), '$unfollow_link' => $unfollow_link, '$subscribe_feed' => DI::l10n()->t('Atom feed'), - '$subscribe_feed_link' => $subscribe_feed_link, + '$subscribe_feed_link' => $profile['poll'], '$wallmessage' => DI::l10n()->t('Message'), '$wallmessage_link' => $wallmessage_link, '$account_type' => $account_type, @@ -623,7 +555,7 @@ class Profile $rr['link'] = Contact::magicLinkById($rr['cid']); $rr['title'] = $rr['name']; - $rr['date'] = DI::l10n()->getDay(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : ''); + $rr['date'] = DI::l10n()->getDay(DateTimeFormat::local($rr['start'], $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : ''); $rr['startime'] = null; $rr['today'] = $today; } @@ -682,33 +614,33 @@ class Profile $total++; } - $strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d'); - if ($strt === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) { + $strt = DateTimeFormat::local($rr['start'], 'Y-m-d'); + if ($strt === DateTimeFormat::localNow('Y-m-d')) { $istoday = true; } - $title = strip_tags(html_entity_decode(BBCode::convert($rr['summary']), ENT_QUOTES, 'UTF-8')); + $title = strip_tags(html_entity_decode(BBCode::convertForUriId($rr['uri-id'], $rr['summary']), ENT_QUOTES, 'UTF-8')); if (strlen($title) > 35) { $title = substr($title, 0, 32) . '... '; } - $description = substr(strip_tags(BBCode::convert($rr['desc'])), 0, 32) . '... '; + $description = substr(strip_tags(BBCode::convertForUriId($rr['uri-id'], $rr['desc'])), 0, 32) . '... '; if (!$description) { $description = DI::l10n()->t('[No description]'); } - $strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC'); + $strt = DateTimeFormat::local($rr['start']); - if (substr($strt, 0, 10) < DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) { + if (substr($strt, 0, 10) < DateTimeFormat::localNow('Y-m-d')) { continue; } - $today = ((substr($strt, 0, 10) === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) ? true : false); + $today = substr($strt, 0, 10) === DateTimeFormat::localNow('Y-m-d'); $rr['title'] = $title; $rr['description'] = $description; - $rr['date'] = DI::l10n()->getDay(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . DI::l10n()->t('[today]') : ''); + $rr['date'] = DI::l10n()->getDay(DateTimeFormat::local($rr['start'], $bd_format)) . (($today) ? ' ' . DI::l10n()->t('[today]') : ''); $rr['startime'] = $strt; $rr['today'] = $today; @@ -810,7 +742,7 @@ class Profile $magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request; // We have to check if the remote server does understand /magic without invoking something - $serverret = DI::httpRequest()->get($basepath . '/magic'); + $serverret = DI::httpClient()->get($basepath . '/magic'); if ($serverret->isSuccess()) { Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG); System::externalRedirect($magic_path); @@ -831,11 +763,11 @@ class Profile // Try to find the public contact entry of the visitor. $cid = Contact::getIdForURL($handle); if (!$cid) { - Logger::log('unable to finger ' . $handle, Logger::DEBUG); + Logger::info('Handle not found', ['handle' => $handle]); return []; } - $visitor = DBA::selectFirst('contact', [], ['id' => $cid]); + $visitor = Contact::getById($cid); // Authenticate the visitor. $_SESSION['authenticated'] = 1; @@ -847,13 +779,26 @@ class Profile Session::setVisitorsContacts(); - $a->contact = $visitor; + $a->setContactId($visitor['id']); Logger::info('Authenticated visitor', ['url' => $visitor['url']]); return $visitor; } + /** + * Set the visitor cookies (see remote_user()) for signed HTTP requests + * @return array Visitor contact array + */ + public static function addVisitorCookieForHTTPSigner() + { + $requester = HTTPSignature::getSigner('', $_SERVER); + if (empty($requester)) { + return []; + } + return Profile::addVisitorCookieForHandle($requester); + } + /** * OpenWebAuth authentication. * @@ -895,7 +840,7 @@ class Profile */ Hook::callAll('magic_auth_success', $arr); - $a->contact = $arr['visitor']; + $a->setContactId($arr['visitor']['id']); info(DI::l10n()->t('OpenWebAuth: %1$s welcomes %2$s', DI::baseUrl()->getHostname(), $visitor['name'])); @@ -937,7 +882,7 @@ class Profile */ public static function getThemeUid(App $a) { - $uid = !empty($a->profile_uid) ? intval($a->profile_uid) : 0; + $uid = !empty($a->getProfileOwner()) ? intval($a->getProfileOwner()) : 0; if (local_user() && (DI::pConfig()->get(local_user(), 'system', 'always_my_theme') || !$uid)) { return local_user(); }