X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=f78f42235938b47495ce8ee26c9cb2a9f52031d1;hb=24d7ffa3fee7e3686589f29f005fb2c419c9985a;hp=b6a7546022c297421d62f10fa4a9431522f433ef;hpb=ffc406d8195871a6580c78f1cc42ff0b7deeba02;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index b6a7546022..f78f422359 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -9,9 +9,9 @@ use Friendica\Content\Feature; use Friendica\Content\ForumManager; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Addon; use Friendica\Core\Cache; use Friendica\Core\Config; +use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; @@ -28,8 +28,6 @@ use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; use Friendica\Util\Temporal; -require_once 'include/dba.php'; - class Profile { /** @@ -99,7 +97,7 @@ 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 @@ -282,13 +280,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; @@ -297,12 +295,12 @@ class Profile $profile['picdate'] = urlencode(defaults($profile, 'picdate', '')); if (($profile['network'] != '') && ($profile['network'] != Protocol::DFRN)) { - $profile['network_name'] = Strings::formatNetworkName($profile['network'], $profile['url']); + $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 @@ -337,6 +335,11 @@ class Profile } } + // 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; } @@ -357,7 +360,7 @@ class Profile // 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() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) { + if (remote_user() || (self::getMyURL() && !empty($profile['unkmail']) && ($profile['uid'] != local_user()))) { $wallmessage = L10n::t('Message'); if (remote_user()) { @@ -424,23 +427,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; } @@ -448,7 +451,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(), @@ -507,10 +510,12 @@ 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']); - } elseif (isset($p['location'])) { - $p['address'] = BBCode::convert($p['location']); } if (isset($p['photo'])) { @@ -543,14 +548,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) { @@ -572,9 +577,18 @@ class Profile if (is_null($r)) { $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() @@ -639,7 +653,7 @@ class Profile public static function getEventsReminderHTML() { - $a = get_app(); + $a = \get_app(); $o = ''; if (!local_user() || $a->is_mobile || $a->is_tablet) { @@ -746,10 +760,10 @@ 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'); @@ -763,14 +777,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? @@ -783,7 +797,7 @@ class Profile } 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']) { @@ -881,8 +895,8 @@ class Profile } $tab = false; - if (x($_GET, 'tab')) { - $tab = Strings::removeTags(trim($_GET['tab'])); + if (!empty($_GET['tab'])) { + $tab = Strings::escapeTags(trim($_GET['tab'])); } $url = System::baseUrl() . '/profile/' . $nickname; @@ -978,7 +992,7 @@ class Profile } $arr = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $tab, 'tabs' => $tabs]; - Addon::callHooks('profile_tabs', $arr); + Hook::callAll('profile_tabs', $arr); $tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); @@ -992,7 +1006,7 @@ class Profile */ public static function getMyURL() { - if (x($_SESSION, 'my_url')) { + if (!empty($_SESSION['my_url'])) { return $_SESSION['my_url']; } return null; @@ -1019,7 +1033,7 @@ class Profile } $arr = ['zrl' => $my_url, 'url' => $a->cmd]; - Addon::callHooks('zrl_init', $arr); + Hook::callAll('zrl_init', $arr); // Try to find the public contact entry of the visitor. $cid = Contact::getIdForURL($my_url); @@ -1080,7 +1094,7 @@ class Profile */ public static function openWebAuthInit($token) { - $a = get_app(); + $a = \get_app(); // Clean old OpenWebAuthToken entries. OpenWebAuthToken::purge('owt', '3 MINUTE'); @@ -1109,6 +1123,17 @@ class Profile $_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']]; + } $arr = [ 'visitor' => $visitor, 'url' => $a->query_string @@ -1119,7 +1144,7 @@ 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']; @@ -1151,7 +1176,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. @@ -1159,13 +1184,12 @@ 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 + * @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(); } @@ -1173,7 +1197,7 @@ class Profile } /** - * Stip zrl parameter from a string. + * Strip zrl parameter from a string. * * @param string $s The input string. * @return string The zrl.