X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=79971cd9998e24045181d4249418220e00e11e68;hb=1b339547f304430b40e3178d9e2a9379ac11cbd1;hp=0bb18e14632dc27db23d56cf4af75973079f687f;hpb=a5550b470223f084c355e1acea173c913c63675d;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 0bb18e1463..79971cd999 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -8,27 +8,42 @@ use Friendica\App; use Friendica\Content\Feature; use Friendica\Content\ForumManager; use Friendica\Content\Text\BBCode; -use Friendica\Core\Addon; +use Friendica\Content\Text\HTML; +use Friendica\Content\Widget\ContactBlock; use Friendica\Core\Cache; use Friendica\Core\Config; +use Friendica\Core\Hook; use Friendica\Core\L10n; +use Friendica\Core\Logger; use Friendica\Core\PConfig; +use Friendica\Core\Protocol; +use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Core\Worker; -use Friendica\Database\DBM; -use Friendica\Model\Contact; -use Friendica\Model\OpenWebAuthToken; +use Friendica\Database\DBA; use Friendica\Protocol\Diaspora; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; +use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; use Friendica\Util\Temporal; -use dba; - -require_once 'include/dba.php'; -require_once 'mod/proxy.php'; class Profile { + /** + * @brief Returns default profile for a given user id + * + * @param integer User ID + * + * @return array Profile data + * @throws \Exception + */ + public static function getByUID($uid) + { + $profile = DBA::selectFirst('profile', [], ['uid' => $uid, 'is-default' => true]); + return $profile; + } + /** * @brief Returns a formatted location string from the given profile array * @@ -40,11 +55,11 @@ class Profile { $location = ''; - if ($profile['locality']) { + if (!empty($profile['locality'])) { $location .= $profile['locality']; } - if ($profile['region'] && ($profile['locality'] != $profile['region'])) { + if (!empty($profile['region']) && (defaults($profile, 'locality', '') != $profile['region'])) { if ($location) { $location .= ', '; } @@ -52,7 +67,7 @@ class Profile $location .= $profile['region']; } - if ($profile['country-name']) { + if (!empty($profile['country-name'])) { if ($location) { $location .= ', '; } @@ -83,53 +98,54 @@ class Profile * load a lot of theme-specific content * * @brief Loads a profile into the page sidebar. - * @param object $a App + * @param App $a * @param string $nickname string * @param int $profile int * @param array $profiledata array * @param boolean $show_connect Show connect link + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function load(App $a, $nickname, $profile = 0, $profiledata = [], $show_connect = true) + public static function load(App $a, $nickname, $profile = 0, array $profiledata = [], $show_connect = true) { - $user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]); + $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]); - if (!DBM::is_result($user) && empty($profiledata)) { - logger('profile error: ' . $a->query_string, LOGGER_DEBUG); + if (!DBA::isResult($user) && empty($profiledata)) { + Logger::log('profile error: ' . $a->query_string, Logger::DEBUG); notice(L10n::t('Requested account is not available.') . EOL); $a->error = 404; return; } - if (empty($a->page['aside'])) { - $a->page['aside'] = ''; - } - - if ($profiledata) { + if (count($profiledata) > 0) { + // Add profile data to sidebar $a->page['aside'] .= self::sidebar($profiledata, true, $show_connect); - if (!DBM::is_result($user)) { + if (!DBA::isResult($user)) { return; } } - $pdata = self::getByNickname($nickname, $user[0]['uid'], $profile); + $pdata = self::getByNickname($nickname, $user['uid'], $profile); if (empty($pdata) && empty($profiledata)) { - logger('profile error: ' . $a->query_string, LOGGER_DEBUG); + Logger::log('profile error: ' . $a->query_string, Logger::DEBUG); notice(L10n::t('Requested profile is not available.') . EOL); $a->error = 404; return; } + if (empty($pdata)) { + $pdata = ['uid' => 0, 'profile_uid' => 0, 'is-default' => false,'name' => $nickname]; + } + // fetch user tags if this isn't the default profile if (!$pdata['is-default']) { - $x = q( - "SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", - intval($pdata['profile_uid']) - ); - if ($x && count($x)) { - $pdata['pub_keywords'] = $x[0]['pub_keywords']; + $condition = ['uid' => $pdata['profile_uid'], 'is-default' => true]; + $profile = DBA::selectFirst('profile', ['pub_keywords'], $condition); + if (DBA::isResult($profile)) { + $pdata['pub_keywords'] = $profile['pub_keywords']; } } @@ -137,9 +153,9 @@ class Profile $a->profile_uid = $pdata['profile_uid']; $a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme'); - $a->profile['network'] = NETWORK_DFRN; + $a->profile['network'] = Protocol::DFRN; - $a->page['title'] = $a->profile['name'] . ' @ ' . $a->config['sitename']; + $a->page['title'] = $a->profile['name'] . ' @ ' . Config::get('config', 'sitename'); if (!$profiledata && !PConfig::get(local_user(), 'system', 'always_my_theme')) { $_SESSION['theme'] = $a->profile['theme']; @@ -151,7 +167,7 @@ class Profile * load/reload current theme info */ - $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one + Renderer::setActiveTemplateEngine(); // reset the template engine to the default in case the user's theme doesn't specify one $theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php'; if (file_exists($theme_info_file)) { @@ -159,8 +175,8 @@ class Profile } if (local_user() && local_user() == $a->profile['uid'] && $profiledata) { - $a->page['aside'] .= replace_macros( - get_markup_template('profile_edlink.tpl'), + $a->page['aside'] .= Renderer::replaceMacros( + Renderer::getMarkupTemplate('profile_edlink.tpl'), [ '$editprofile' => L10n::t('Edit profile'), '$profid' => $a->profile['id'] @@ -193,18 +209,19 @@ class Profile * Includes all available profile data * * @brief Get all profile data of a local user - * @param string $nickname nick - * @param int $uid uid - * @param int $profile_id ID of the profile + * @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_id = 0) { - if (remote_user() && count($_SESSION['remote'])) { + if (remote_user() && !empty($_SESSION['remote'])) { foreach ($_SESSION['remote'] as $visitor) { if ($visitor['uid'] == $uid) { - $contact = dba::selectFirst('contact', ['profile-id'], ['id' => $visitor['cid']]); - if (DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', ['profile-id'], ['id' => $visitor['cid']]); + if (DBA::isResult($contact)) { $profile_id = $contact['profile-id']; } break; @@ -215,7 +232,7 @@ class Profile $profile = null; if ($profile_id) { - $profile = dba::fetch_first( + $profile = DBA::fetchFirst( "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`, `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`, `profile`.`uid` AS `profile_uid`, `profile`.*, @@ -228,8 +245,8 @@ class Profile intval($profile_id) ); } - if (!DBM::is_result($profile)) { - $profile = dba::fetch_first( + if (!DBA::isResult($profile)) { + $profile = DBA::fetchFirst( "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`, `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`, `profile`.`uid` AS `profile_uid`, `profile`.*, @@ -252,13 +269,15 @@ class Profile * because of all the conditional logic. * * @brief Formats a profile for display in the sidebar. - * @param array $profile - * @param int $block + * @param array $profile + * @param int $block * @param boolean $show_connect Show connect link * * @return string HTML sidebar module * - * @note Returns empty string if passed $profile is wrong type or not populated + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + * @note Returns empty string if passed $profile is wrong type or not populated * * @hooks 'profile_sidebar_enter' * array $profile - profile data @@ -267,13 +286,13 @@ class Profile */ private static function sidebar($profile, $block = 0, $show_connect = true) { - $a = get_app(); + $a = \get_app(); $o = ''; $location = false; // This function can also use contact information in $profile - $is_contact = x($profile, 'cid'); + $is_contact = !empty($profile['cid']); if (!is_array($profile) && !count($profile)) { return $o; @@ -281,20 +300,20 @@ class Profile $profile['picdate'] = urlencode(defaults($profile, 'picdate', '')); - if (($profile['network'] != '') && ($profile['network'] != NETWORK_DFRN)) { - $profile['network_name'] = format_network_name($profile['network'], $profile['url']); + if (($profile['network'] != '') && ($profile['network'] != Protocol::DFRN)) { + $profile['network_link'] = Strings::formatNetworkName($profile['network'], $profile['url']); } else { - $profile['network_name'] = ''; + $profile['network_link'] = ''; } - Addon::callHooks('profile_sidebar_enter', $profile); + Hook::callAll('profile_sidebar_enter', $profile); // don't show connect link to yourself $connect = $profile['uid'] != local_user() ? L10n::t('Connect') : false; // don't show connect link to authenticated visitors either - if (remote_user() && count($_SESSION['remote'])) { + if (remote_user() && !empty($_SESSION['remote'])) { foreach ($_SESSION['remote'] as $visitor) { if ($visitor['uid'] == $profile['uid']) { $connect = false; @@ -307,20 +326,27 @@ class Profile $connect = false; } + $profile_url = ''; + // Is the local user already connected to that user? if ($connect && local_user()) { if (isset($profile['url'])) { - $profile_url = normalise_link($profile['url']); + $profile_url = Strings::normaliseLink($profile['url']); } else { - $profile_url = normalise_link(System::baseUrl() . '/profile/' . $profile['nickname']); + $profile_url = Strings::normaliseLink(System::baseUrl() . '/profile/' . $profile['nickname']); } - if (dba::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) { + if (DBA::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) { $connect = false; } } - if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect'])) { + // Is the remote user already connected to that user? + if ($connect && Contact::isFollower(remote_user(), $profile['uid'])) { + $connect = false; + } + + if ($connect && ($profile['network'] != Protocol::DFRN) && !isset($profile['remoteconnect'])) { $connect = false; } @@ -329,39 +355,42 @@ class Profile $remoteconnect = $profile['remoteconnect']; } - if ($connect && ($profile['network'] == NETWORK_DFRN) && !isset($remoteconnect)) { + if ($connect && ($profile['network'] == Protocol::DFRN) && !isset($remoteconnect)) { $subscribe_feed = L10n::t('Atom feed'); } else { $subscribe_feed = false; } - if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) { + $wallmessage = false; + $wallmessage_link = false; + + // See issue https://github.com/friendica/friendica/issues/3838 + // Either we remove the message link for remote users or we enable creating messages from remote users + if (remote_user() || (self::getMyURL() && !empty($profile['unkmail']) && ($profile['uid'] != local_user()))) { $wallmessage = L10n::t('Message'); - $wallmessage_link = 'wallmessage/' . $profile['nickname']; if (remote_user()) { $r = q( "SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d", intval($profile['uid']), intval(remote_user()), - intval(CONTACT_IS_FRIEND) + intval(Contact::FRIEND) ); } else { $r = q( "SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d", intval($profile['uid']), - dbesc(normalise_link(self::getMyURL())), - intval(CONTACT_IS_FRIEND) + DBA::escape(Strings::normaliseLink(self::getMyURL())), + intval(Contact::FRIEND) ); } if ($r) { $remote_url = $r[0]['url']; $message_path = preg_replace('=(.*)/profile/(.*)=ism', '$1/message/new/', $remote_url); - $wallmessage_link = $message_path . base64_encode($profile['addr']); + $wallmessage_link = $message_path . base64_encode(defaults($profile, 'addr', '')); + } else if (!empty($profile['nickname'])) { + $wallmessage_link = 'wallmessage/' . $profile['nickname']; } - } else { - $wallmessage = false; - $wallmessage_link = false; } // show edit profile to yourself @@ -378,7 +407,7 @@ class Profile 'entries' => [], ]; - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { foreach ($r as $rr) { $profile['menu']['entries'][] = [ 'photo' => $rr['thumb'], @@ -404,23 +433,23 @@ class Profile // Fetch the account type $account_type = Contact::getAccountType($profile); - if (x($profile, 'address') - || x($profile, 'location') - || x($profile, 'locality') - || x($profile, 'region') - || x($profile, 'postal-code') - || x($profile, 'country-name') + if (!empty($profile['address']) + || !empty($profile['location']) + || !empty($profile['locality']) + || !empty($profile['region']) + || !empty($profile['postal-code']) + || !empty($profile['country-name']) ) { $location = L10n::t('Location:'); } - $gender = x($profile, 'gender') ? L10n::t('Gender:') : false; - $marital = x($profile, 'marital') ? L10n::t('Status:') : false; - $homepage = x($profile, 'homepage') ? L10n::t('Homepage:') : false; - $about = x($profile, 'about') ? L10n::t('About:') : false; - $xmpp = x($profile, 'xmpp') ? L10n::t('XMPP:') : false; + $gender = !empty($profile['gender']) ? L10n::t('Gender:') : false; + $marital = !empty($profile['marital']) ? L10n::t('Status:') : false; + $homepage = !empty($profile['homepage']) ? L10n::t('Homepage:') : false; + $about = !empty($profile['about']) ? L10n::t('About:') : false; + $xmpp = !empty($profile['xmpp']) ? L10n::t('XMPP:') : false; - if ((x($profile, 'hidewall') || $block) && !local_user() && !remote_user()) { + if ((!empty($profile['hidewall']) || $block) && !local_user() && !remote_user()) { $location = $gender = $marital = $homepage = $about = false; } @@ -428,7 +457,7 @@ class Profile $firstname = $split_name['first']; $lastname = $split_name['last']; - if (x($profile, 'guid')) { + if (!empty($profile['guid'])) { $diaspora = [ 'guid' => $profile['guid'], 'podloc' => System::baseUrl(), @@ -437,9 +466,9 @@ class Profile 'fullname' => $profile['name'], 'firstname' => $firstname, 'lastname' => $lastname, - 'photo300' => $profile['contact_photo'], - 'photo100' => $profile['contact_thumb'], - 'photo50' => $profile['contact_micro'], + 'photo300' => defaults($profile, 'contact_photo', ''), + 'photo100' => defaults($profile, 'contact_thumb', ''), + 'photo50' => defaults($profile, 'contact_micro', ''), ]; } else { $diaspora = false; @@ -447,33 +476,28 @@ class Profile $contact_block = ''; $updated = ''; - $contacts = 0; + $contact_count = 0; if (!$block) { - $contact_block = contact_block(); + $contact_block = ContactBlock::getHTML($a->profile); if (is_array($a->profile) && !$a->profile['hide-friends']) { $r = q( "SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1", intval($a->profile['uid']) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $updated = date('c', strtotime($r[0]['updated'])); } - $r = q( - "SELECT COUNT(*) AS `total` FROM `contact` - WHERE `uid` = %d - AND NOT `self` AND NOT `blocked` AND NOT `pending` - AND NOT `hidden` AND NOT `archive` - AND `network` IN ('%s', '%s', '%s', '')", - intval($profile['uid']), - dbesc(NETWORK_DFRN), - dbesc(NETWORK_DIASPORA), - dbesc(NETWORK_OSTATUS) - ); - if (DBM::is_result($r)) { - $contacts = intval($r[0]['total']); - } + $contact_count = DBA::count('contact', [ + 'uid' => $profile['uid'], + 'self' => false, + 'blocked' => false, + 'pending' => false, + 'hidden' => false, + 'archive' => false, + 'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA], + ]); } } @@ -487,20 +511,22 @@ class Profile $p['about'] = BBCode::convert($p['about']); } + if (empty($p['address']) && !empty($p['location'])) { + $p['address'] = $p['location']; + } + if (isset($p['address'])) { $p['address'] = BBCode::convert($p['address']); - } else { - $p['address'] = BBCode::convert($p['location']); } if (isset($p['photo'])) { - $p['photo'] = proxy_url($p['photo'], false, PROXY_SIZE_SMALL); + $p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL); } - $p['url'] = Contact::magicLink($p['url']); + $p['url'] = Contact::magicLink(defaults($p, 'url', $profile_url)); - $tpl = get_markup_template('profile_vcard.tpl'); - $o .= replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('profile_vcard.tpl'); + $o .= Renderer::replaceMacros($tpl, [ '$profile' => $p, '$xmpp' => $xmpp, '$connect' => $connect, @@ -515,7 +541,7 @@ class Profile '$homepage' => $homepage, '$about' => $about, '$network' => L10n::t('Network:'), - '$contacts' => $contacts, + '$contacts' => $contact_count, '$updated' => $updated, '$diaspora' => $diaspora, '$contact_block' => $contact_block, @@ -523,14 +549,14 @@ class Profile $arr = ['profile' => &$profile, 'entry' => &$o]; - Addon::callHooks('profile_sidebar', $arr); + Hook::callAll('profile_sidebar', $arr); return $o; } public static function getBirthdays() { - $a = get_app(); + $a = \get_app(); $o = ''; if (!local_user() || $a->is_mobile || $a->is_tablet) { @@ -550,24 +576,33 @@ class Profile $cachekey = 'get_birthdays:' . local_user(); $r = Cache::get($cachekey); if (is_null($r)) { - $s = dba::p( + $s = DBA::p( "SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` - INNER JOIN `contact` ON `contact`.`id` = `event`.`cid` + INNER JOIN `contact` + ON `contact`.`id` = `event`.`cid` + AND (`contact`.`rel` = ? OR `contact`.`rel` = ?) + AND NOT `contact`.`pending` + AND NOT `contact`.`hidden` + AND NOT `contact`.`blocked` + AND NOT `contact`.`archive` + AND NOT `contact`.`deleted` WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ? ORDER BY `start` ASC ", + Contact::SHARING, + Contact::FRIEND, local_user(), DateTimeFormat::utc('now + 6 days'), DateTimeFormat::utcNow() ); - if (DBM::is_result($s)) { - $r = dba::inArray($s); - Cache::set($cachekey, $r, CACHE_HOUR); + if (DBA::isResult($s)) { + $r = DBA::toArray($s); + Cache::set($cachekey, $r, Cache::HOUR); } } $total = 0; $classtoday = ''; - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $now = strtotime('now'); $cids = []; @@ -598,14 +633,14 @@ class Profile $rr['link'] = Contact::magicLink($rr['url']); $rr['title'] = $rr['name']; - $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : ''); + $rr['date'] = L10n::getDay(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : ''); $rr['startime'] = null; $rr['today'] = $today; } } } - $tpl = get_markup_template('birthdays_reminder.tpl'); - return replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl'); + return Renderer::replaceMacros($tpl, [ '$baseurl' => System::baseUrl(), '$classtoday' => $classtoday, '$count' => $total, @@ -619,7 +654,7 @@ class Profile public static function getEventsReminderHTML() { - $a = get_app(); + $a = \get_app(); $o = ''; if (!local_user() || $a->is_mobile || $a->is_tablet) { @@ -636,40 +671,29 @@ class Profile $bd_format = L10n::t('g A l F d'); // 8 AM Friday January 18 $classtoday = ''; - $s = dba::p( - "SELECT `event`.* - FROM `event` - INNER JOIN `item` - ON `item`.`uid` = `event`.`uid` - AND `item`.`parent-uri` = `event`.`uri` - WHERE `event`.`uid` = ? - AND `event`.`type` != 'birthday' - AND `event`.`start` < ? - AND `event`.`start` >= ? - AND `item`.`author-id` = ? - AND (`item`.`verb` = ? OR `item`.`verb` = ?) - AND `item`.`visible` - AND NOT `item`.`deleted` - ORDER BY `event`.`start` ASC", - local_user(), - DateTimeFormat::utc('now + 7 days'), - DateTimeFormat::utc('now - 1 days'), - public_contact(), - ACTIVITY_ATTEND, - ACTIVITY_ATTENDMAYBE - ); + $condition = ["`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?", + local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utc('now - 1 days')]; + $s = DBA::select('event', [], $condition, ['order' => ['start']]); $r = []; - if (DBM::is_result($s)) { + if (DBA::isResult($s)) { $istoday = false; + $total = 0; - while ($rr = dba::fetch($s)) { - if (strlen($rr['name'])) { - $total ++; + while ($rr = DBA::fetch($s)) { + $condition = ['parent-uri' => $rr['uri'], 'uid' => $rr['uid'], 'author-id' => public_contact(), + 'activity' => [Item::activityToIndex(ACTIVITY_ATTEND), Item::activityToIndex(ACTIVITY_ATTENDMAYBE)], + 'visible' => true, 'deleted' => false]; + if (!Item::exists($condition)) { + continue; } - $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d'); + if (strlen($rr['summary'])) { + $total++; + } + + $strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d'); if ($strt === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) { $istoday = true; } @@ -685,7 +709,7 @@ class Profile $description = L10n::t('[No description]'); } - $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC'); + $strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC'); if (substr($strt, 0, 10) < DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) { continue; @@ -695,38 +719,32 @@ class Profile $rr['title'] = $title; $rr['description'] = $description; - $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : ''); + $rr['date'] = L10n::getDay(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : ''); $rr['startime'] = $strt; $rr['today'] = $today; $r[] = $rr; } - dba::close($s); + DBA::close($s); $classtoday = (($istoday) ? 'event-today' : ''); } - $tpl = get_markup_template('events_reminder.tpl'); - return replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('events_reminder.tpl'); + return Renderer::replaceMacros($tpl, [ '$baseurl' => System::baseUrl(), '$classtoday' => $classtoday, '$count' => count($r), '$event_reminders' => L10n::t('Event Reminders'), - '$event_title' => L10n::t('Events this week:'), + '$event_title' => L10n::t('Upcoming events the next 7 days:'), '$events' => $r, ]); } public static function getAdvanced(App $a) { - $o = ''; $uid = $a->profile['uid']; - $o .= replace_macros( - get_markup_template('section_title.tpl'), - ['$title' => L10n::t('Profile')] - ); - if ($a->profile['name']) { - $tpl = get_markup_template('profile_advanced.tpl'); + $tpl = Renderer::getMarkupTemplate('profile_advanced.tpl'); $profile = []; @@ -737,14 +755,14 @@ class Profile } if ($a->profile['gender']) { - $profile['gender'] = [L10n::t('Gender:'), $a->profile['gender']]; + $profile['gender'] = [L10n::t('Gender:'), L10n::t($a->profile['gender'])]; } - if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) { + if (!empty($a->profile['dob']) && $a->profile['dob'] > DBA::NULL_DATE) { $year_bd_format = L10n::t('j F, Y'); $short_bd_format = L10n::t('j F'); - $val = day_translate( + $val = L10n::getDay( intval($a->profile['dob']) ? DateTimeFormat::utc($a->profile['dob'] . ' 00:00 +00:00', $year_bd_format) : DateTimeFormat::utc('2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format) @@ -754,14 +772,14 @@ class Profile } if (!empty($a->profile['dob']) - && $a->profile['dob'] > '0001-01-01' + && $a->profile['dob'] > DBA::NULL_DATE && $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'], '') ) { $profile['age'] = [L10n::t('Age:'), $age]; } if ($a->profile['marital']) { - $profile['marital'] = [L10n::t('Status:'), $a->profile['marital']]; + $profile['marital'] = [L10n::t('Status:'), L10n::t($a->profile['marital'])]; } /// @TODO Maybe use x() here, plus below? @@ -769,20 +787,20 @@ class Profile $profile['marital']['with'] = $a->profile['with']; } - if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) { + if (strlen($a->profile['howlong']) && $a->profile['howlong'] > DBA::NULL_DATETIME) { $profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s')); } if ($a->profile['sexual']) { - $profile['sexual'] = [L10n::t('Sexual Preference:'), $a->profile['sexual']]; + $profile['sexual'] = [L10n::t('Sexual Preference:'), L10n::t($a->profile['sexual'])]; } if ($a->profile['homepage']) { - $profile['homepage'] = [L10n::t('Homepage:'), linkify($a->profile['homepage'])]; + $profile['homepage'] = [L10n::t('Homepage:'), HTML::toLink($a->profile['homepage'])]; } if ($a->profile['hometown']) { - $profile['hometown'] = [L10n::t('Hometown:'), linkify($a->profile['hometown'])]; + $profile['hometown'] = [L10n::t('Hometown:'), HTML::toLink($a->profile['hometown'])]; } if ($a->profile['pub_keywords']) { @@ -854,7 +872,7 @@ class Profile $profile['edit'] = [System::baseUrl() . '/profiles/' . $a->profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')]; } - return replace_macros($tpl, [ + return Renderer::replaceMacros($tpl, [ '$title' => L10n::t('Profile'), '$basic' => L10n::t('Basic'), '$advanced' => L10n::t('Advanced'), @@ -872,8 +890,8 @@ class Profile } $tab = false; - if (x($_GET, 'tab')) { - $tab = notags(trim($_GET['tab'])); + if (!empty($_GET['tab'])) { + $tab = Strings::escapeTags(trim($_GET['tab'])); } $url = System::baseUrl() . '/profile/' . $nickname; @@ -947,6 +965,16 @@ class Profile ]; } + if (!empty($_SESSION['new_member']) && $is_owner) { + $tabs[] = [ + 'label' => L10n::t('Tips for New Members'), + 'url' => System::baseUrl() . '/newmember', + 'sel' => false, + 'title' => L10n::t('Tips for New Members'), + 'id' => 'newmember-tab', + ]; + } + if (!$is_owner && empty($a->profile['hide-friends'])) { $tabs[] = [ 'label' => L10n::t('Contacts'), @@ -959,11 +987,11 @@ class Profile } $arr = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $tab, 'tabs' => $tabs]; - Addon::callHooks('profile_tabs', $arr); + Hook::callAll('profile_tabs', $arr); - $tpl = get_markup_template('common_tabs.tpl'); + $tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); - return replace_macros($tpl, ['$tabs' => $arr['tabs']]); + return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]); } /** @@ -973,7 +1001,7 @@ class Profile */ public static function getMyURL() { - if (x($_SESSION, 'my_url')) { + if (!empty($_SESSION['my_url'])) { return $_SESSION['my_url']; } return null; @@ -981,80 +1009,136 @@ class Profile /** * Process the 'zrl' parameter and initiate the remote authentication. - * + * * This method checks if the visitor has a public contact entry and * redirects the visitor to his/her instance to start the magic auth (Authentication) * process. - * + * * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/channel.php - * + * * @param App $a Application instance. + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function zrlInit(App $a) { $my_url = self::getMyURL(); $my_url = Network::isUrlValid($my_url); - if ($my_url) { - if (!local_user()) { - // Is it a DDoS attempt? - // The check fetches the cached value from gprobe to reduce the load for this system - $urlparts = parse_url($my_url); + if (empty($my_url) || local_user()) { + return; + } - $result = Cache::get('gprobe:' . $urlparts['host']); - if ((!is_null($result)) && (in_array($result['network'], [NETWORK_FEED, NETWORK_PHANTOM]))) { - logger('DDoS attempt detected for ' . $urlparts['host'] . ' by ' . $_SERVER['REMOTE_ADDR'] . '. server data: ' . print_r($_SERVER, true), LOGGER_DEBUG); - return; - } + $arr = ['zrl' => $my_url, 'url' => $a->cmd]; + Hook::callAll('zrl_init', $arr); + + // Try to find the public contact entry of the visitor. + $cid = Contact::getIdForURL($my_url); + if (!$cid) { + Logger::log('No contact record found for ' . $my_url, Logger::DEBUG); + return; + } - Worker::add(PRIORITY_LOW, 'GProbe', $my_url); - $arr = ['zrl' => $my_url, 'url' => $a->cmd]; - Addon::callHooks('zrl_init', $arr); + $contact = DBA::selectFirst('contact',['id', 'url'], ['id' => $cid]); - // Try to find the public contact entry of the visitor. - $cid = Contact::getIdForURL($my_url); - if (!$cid) { - logger('No contact record found for ' . $my_url, LOGGER_DEBUG); - return; - } + if (DBA::isResult($contact) && remote_user() && remote_user() == $contact['id']) { + Logger::log('The visitor ' . $my_url . ' is already authenticated', Logger::DEBUG); + return; + } + + // Avoid endless loops + $cachekey = 'zrlInit:' . $my_url; + if (Cache::get($cachekey)) { + Logger::log('URL ' . $my_url . ' already tried to authenticate.', Logger::DEBUG); + return; + } else { + Cache::set($cachekey, true, Cache::MINUTE); + } - $contact = dba::selectFirst('contact',['id', 'url'], ['id' => $cid]); + Logger::log('Not authenticated. Invoking reverse magic-auth for ' . $my_url, Logger::DEBUG); - if (DBM::is_result($contact) && remote_user() && remote_user() === $contact['id']) { - // The visitor is already authenticated. - return; - } + Worker::add(PRIORITY_LOW, 'GProbe', $my_url); - logger('Not authenticated. Invoking reverse magic-auth for ' . $my_url, LOGGER_DEBUG); + // Try to avoid recursion - but send them home to do a proper magic auth. + $query = str_replace(array('?zrl=', '&zid='), array('?rzrl=', '&rzrl='), $a->query_string); + // The other instance needs to know where to redirect. + $dest = urlencode($a->getBaseURL() . '/' . $query); - // Try to avoid recursion - but send them home to do a proper magic auth. - $query = str_replace(array('?zrl=', '&zid='), array('?rzrl=', '&rzrl='), $a->query_string); - // The other instance needs to know where to redirect. - $dest = urlencode(System::baseUrl() . '/' . $query); + // We need to extract the basebath from the profile url + // to redirect the visitors '/magic' module. + // Note: We should have the basepath of a contact also in the contact table. + $urlarr = explode('/profile/', $contact['url']); + $basepath = $urlarr[0]; - // We need to extract the basebath from the profile url - // to redirect the visitors '/magic' module. - // Note: We should have the basepath of a contact also in the contact table. - $urlarr = explode('/profile/', $contact['url']); - $basepath = $urlarr[0]; + if ($basepath != $a->getBaseURL() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) { + $magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest; - if ($basepath != System::baseUrl() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) { - goaway($basepath . '/magic' . '?f=&owa=1&dest=' . $dest); - } + // We have to check if the remote server does understand /magic without invoking something + $serverret = Network::curl($basepath . '/magic'); + if ($serverret->isSuccess()) { + Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG); + System::externalRedirect($magic_path); } } } + /** + * Set the visitor cookies (see remote_user()) for the given handle + * + * @param string $handle Visitor handle + * @return array Visitor contact array + */ + public static function addVisitorCookieForHandle($handle) + { + $a = \get_app(); + + // Try to find the public contact entry of the visitor. + $cid = Contact::getIdForURL($handle); + if (!$cid) { + Logger::log('unable to finger ' . $handle, Logger::DEBUG); + return []; + } + + $visitor = DBA::selectFirst('contact', [], ['id' => $cid]); + + // Authenticate the visitor. + $_SESSION['authenticated'] = 1; + $_SESSION['visitor_id'] = $visitor['id']; + $_SESSION['visitor_handle'] = $visitor['addr']; + $_SESSION['visitor_home'] = $visitor['url']; + $_SESSION['my_url'] = $visitor['url']; + + /// @todo replace this and the query for this variable with some cleaner functionality + $_SESSION['remote'] = []; + + $remote_contacts = DBA::select('contact', ['id', 'uid'], ['nurl' => $visitor['nurl'], 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]); + while ($contact = DBA::fetch($remote_contacts)) { + if (($contact['uid'] == 0) || Contact::isBlockedByUser($visitor['id'], $contact['uid'])) { + continue; + } + + $_SESSION['remote'][] = ['cid' => $contact['id'], 'uid' => $contact['uid'], 'url' => $visitor['url']]; + } + + $a->contact = $visitor; + + Logger::info('Authenticated visitor', ['url' => $visitor['url']]); + + return $visitor; + } + /** * OpenWebAuth authentication. * * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/zid.php - * + * * @param string $token + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function openWebAuthInit($token) { - $a = get_app(); + $a = \get_app(); // Clean old OpenWebAuthToken entries. OpenWebAuthToken::purge('owt', '3 MINUTE'); @@ -1063,25 +1147,15 @@ class Profile // we have stored in the database. $visitor_handle = OpenWebAuthToken::getMeta('owt', 0, $token); - if($visitor_handle === false) { + if ($visitor_handle === false) { return; } - // Try to find the public contact entry of the visitor. - $cid = Contact::getIdForURL($visitor_handle); - if(!$cid) { - logger('owt: unable to finger ' . $visitor_handle, LOGGER_DEBUG); + $visitor = self::addVisitorCookieForHandle($visitor_handle); + if (empty($visitor)) { return; } - $visitor = dba::selectFirst('contact', [], ['id' => $cid]); - - // Authenticate the visitor. - $_SESSION['authenticated'] = 1; - $_SESSION['visitor_id'] = $visitor['id']; - $_SESSION['visitor_handle'] = $visitor['addr']; - $_SESSION['visitor_home'] = $visitor['url']; - $arr = [ 'visitor' => $visitor, 'url' => $a->query_string @@ -1092,13 +1166,13 @@ class Profile * * \e array \b visitor * * \e string \b url */ - Addon::callHooks('magic_auth_success', $arr); + Hook::callAll('magic_auth_success', $arr); $a->contact = $arr['visitor']; - info(L10n::t('OpenWebAuth: %1$s welcomes %2$s', $a->get_hostname(), $visitor['name'])); + info(L10n::t('OpenWebAuth: %1$s welcomes %2$s', $a->getHostName(), $visitor['name'])); - logger('OpenWebAuth: auth success from ' . $visitor['addr'], LOGGER_DEBUG); + Logger::log('OpenWebAuth: auth success from ' . $visitor['addr'], Logger::DEBUG); } public static function zrl($s, $force = false) @@ -1114,7 +1188,7 @@ class Profile } $achar = strpos($s, '?') ? '&' : '?'; $mine = self::getMyURL(); - if ($mine && !link_compare($mine, $s)) { + if ($mine && !Strings::compareLink($mine, $s)) { return $s . $achar . 'zrl=' . urlencode($mine); } return $s; @@ -1124,7 +1198,7 @@ class Profile * Get the user ID of the page owner. * * Used from within PCSS themes to set theme parameters. If there's a - * puid request variable, that is the "page owner" and normally their theme + * profile_uid variable set in App, that is the "page owner" and normally their theme * settings take precedence; unless a local user sets the "always_my_theme" * system pconfig, which means they don't want to see anybody else's theme * settings except their own while on this site. @@ -1132,13 +1206,13 @@ class Profile * @brief Get the user ID of the page owner * @return int user ID * - * @note Returns local_user instead of user ID if "always_my_theme" - * is set to true + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @note Returns local_user instead of user ID if "always_my_theme" is set to true */ - public static function getThemeUid() + public static function getThemeUid(App $a) { - $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0); - if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (!$uid))) { + $uid = !empty($a->profile_uid) ? intval($a->profile_uid) : 0; + if (local_user() && (PConfig::get(local_user(), 'system', 'always_my_theme') || !$uid)) { return local_user(); } @@ -1146,8 +1220,8 @@ class Profile } /** - * Stip zrl parameter from a string. - * + * Strip zrl parameter from a string. + * * @param string $s The input string. * @return string The zrl. */ @@ -1157,11 +1231,12 @@ class Profile } /** - * Stip query parameter from a string. - * - * @param string $s The input string. - * @return string The query parameter. - */ + * Strip query parameter from a string. + * + * @param string $s The input string. + * @param $param + * @return string The query parameter. + */ public static function stripQueryParam($s, $param) { return preg_replace('/[\?&]' . $param . '=(.*?)(&|$)/ism', '$2', $s);