X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=b5e54474b819e3c9daca9d7c8f9f178052a80d7b;hb=4a95ca280d665eda09529f91eb28b517a471e683;hp=41e992aa49b8b2f5f8d475faeec7e4b063d9643f;hpb=33e096434af297743f2aed43aab8fd9f4e68c1e6;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 41e992aa49..b5e54474b8 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; @@ -20,7 +20,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 +35,7 @@ class Profile * @param integer User ID * * @return array Profile data + * @throws \Exception */ public static function getByUID($uid) { @@ -102,6 +102,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 +208,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 +268,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 +305,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 @@ -548,7 +553,7 @@ class Profile $arr = ['profile' => &$profile, 'entry' => &$o]; - Addon::callHooks('profile_sidebar', $arr); + Hook::callAll('profile_sidebar', $arr); return $o; } @@ -740,14 +745,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'); @@ -760,7 +759,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) { @@ -784,7 +783,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? @@ -797,7 +796,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']) { @@ -992,7 +991,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'); @@ -1022,6 +1021,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) { @@ -1033,7 +1034,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); @@ -1091,6 +1092,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) { @@ -1144,7 +1147,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']; @@ -1184,6 +1187,7 @@ class Profile * @brief Get the user ID of the page owner * @return int user ID * + * @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(App $a) @@ -1208,11 +1212,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);