X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=aacceedb3a9f8876e85850c11f510b4d315f1b68;hb=2b0610eaf5ea67cc6b6a8e59b4f9c08249f90370;hp=36840c17fad4857f584e7ea26190a2a6823eeba6;hpb=5e1ceb57de62e4f2b6af957fa7952eed09c1aedb;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 36840c17fa..aacceedb3a 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -9,9 +9,10 @@ use Friendica\Content\Feature; use Friendica\Content\ForumManager; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Addon; +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; @@ -20,7 +21,6 @@ use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; -use Friendica\Model\Contact; use Friendica\Protocol\Diaspora; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; @@ -36,6 +36,7 @@ class Profile * @param integer User ID * * @return array Profile data + * @throws \Exception */ public static function getByUID($uid) { @@ -102,6 +103,8 @@ class Profile * @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, array $profiledata = [], $show_connect = true) { @@ -206,10 +209,11 @@ 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) { @@ -265,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 @@ -300,7 +306,7 @@ class Profile $profile['network_link'] = ''; } - Addon::callHooks('profile_sidebar_enter', $profile); + Hook::callAll('profile_sidebar_enter', $profile); // don't show connect link to yourself @@ -470,9 +476,9 @@ class Profile $contact_block = ''; $updated = ''; - $contacts = 0; + $contact_count = 0; if (!$block) { - $contact_block = HTML::contactBlock(); + $contact_block = ContactBlock::getHTML($a->profile); if (is_array($a->profile) && !$a->profile['hide-friends']) { $r = q( @@ -483,20 +489,15 @@ class Profile $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']), - DBA::escape(Protocol::DFRN), - DBA::escape(Protocol::DIASPORA), - DBA::escape(Protocol::OSTATUS) - ); - if (DBA::isResult($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], + ]); } } @@ -514,6 +515,10 @@ class Profile $p['address'] = $p['location']; } + if (isset($p['address'])) { + $p['address'] = BBCode::convert($p['address']); + } + if (isset($p['photo'])) { $p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL); } @@ -536,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, @@ -544,7 +549,7 @@ class Profile $arr = ['profile' => &$profile, 'entry' => &$o]; - Addon::callHooks('profile_sidebar', $arr); + Hook::callAll('profile_sidebar', $arr); return $o; } @@ -736,14 +741,8 @@ class Profile public static function getAdvanced(App $a) { - $o = ''; $uid = $a->profile['uid']; - $o .= Renderer::replaceMacros( - Renderer::getMarkupTemplate('section_title.tpl'), - ['$title' => L10n::t('Profile')] - ); - if ($a->profile['name']) { $tpl = Renderer::getMarkupTemplate('profile_advanced.tpl'); @@ -756,7 +755,7 @@ 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 (!empty($a->profile['dob']) && $a->profile['dob'] > DBA::NULL_DATE) { @@ -780,7 +779,7 @@ class Profile } 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? @@ -793,7 +792,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']) { @@ -988,7 +987,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'); @@ -1018,6 +1017,8 @@ class Profile * 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) { @@ -1029,7 +1030,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); @@ -1087,6 +1088,8 @@ class Profile * 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) { @@ -1140,7 +1143,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']; @@ -1172,7 +1175,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. @@ -1180,13 +1183,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(); } @@ -1194,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. @@ -1205,11 +1208,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);