]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Profile.php
Remove deprecated code
[friendica.git] / src / Model / Profile.php
index 86fb1a94cbb22aeb48ecef35492eb423bd4a12fe..caf0b0869d3fa1aab60312bfdeb782cbbd83577d 100644 (file)
@@ -121,13 +121,12 @@ class Profile
         *
         * @param App     $a
         * @param string  $nickname     string
-        * @param int     $profile_id   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_id = 0, array $profiledata = [], $show_connect = true)
+       public static function load(App $a, $nickname, array $profiledata = [], $show_connect = true)
        {
                $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
 
@@ -371,7 +370,6 @@ class Profile
                }
 
                $gender   = !empty($profile['gender'])   ? DI::l10n()->t('Gender:')   : false;
-               $marital  = !empty($profile['marital'])  ? DI::l10n()->t('Status:')   : false;
                $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;
@@ -450,10 +448,6 @@ class Profile
                        $p['gender'] = DI::l10n()->t($p['gender']);
                }
 
-               if (isset($p['marital'])) {
-                       $p['marital'] = DI::l10n()->t($p['marital']);
-               }
-
                if (isset($p['photo'])) {
                        $p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
                }
@@ -475,7 +469,6 @@ class Profile
                        '$account_type' => $account_type,
                        '$location' => $location,
                        '$gender' => $gender,
-                       '$marital' => $marital,
                        '$homepage' => $homepage,
                        '$about' => $about,
                        '$network' => DI::l10n()->t('Network:'),
@@ -675,121 +668,6 @@ class Profile
                ]);
        }
 
-    /**
-     * @param App    $a
-     * @param string $current
-     * @param bool   $is_owner
-     * @param string $nickname
-     * @return string
-     * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-     */
-       public static function getTabs(App $a, string $current, bool $is_owner, string $nickname = null)
-       {
-               if (is_null($nickname)) {
-                       $nickname = $a->user['nickname'];
-               }
-
-               $baseProfileUrl = DI::baseUrl() . '/profile/' . $nickname;
-
-               $tabs = [
-                       [
-                               'label' => DI::l10n()->t('Profile'),
-                               'url'   => $baseProfileUrl,
-                               'sel'   => $current == 'profile' ? 'active' : '',
-                               'title' => DI::l10n()->t('Profile Details'),
-                               'id'    => 'profile-tab',
-                               'accesskey' => 'r',
-                       ],
-                       [
-                               'label' => DI::l10n()->t('Status'),
-                               'url'   => $baseProfileUrl . '/status',
-                               'sel'   => $current == 'status' ? 'active' : '',
-                               'title' => DI::l10n()->t('Status Messages and Posts'),
-                               'id'    => 'status-tab',
-                               'accesskey' => 'm',
-                       ],
-                       [
-                               'label' => DI::l10n()->t('Photos'),
-                               'url'   => DI::baseUrl() . '/photos/' . $nickname,
-                               'sel'   => $current == 'photos' ? 'active' : '',
-                               'title' => DI::l10n()->t('Photo Albums'),
-                               'id'    => 'photo-tab',
-                               'accesskey' => 'h',
-                       ],
-                       [
-                               'label' => DI::l10n()->t('Videos'),
-                               'url'   => DI::baseUrl() . '/videos/' . $nickname,
-                               'sel'   => $current == 'videos' ? 'active' : '',
-                               'title' => DI::l10n()->t('Videos'),
-                               'id'    => 'video-tab',
-                               'accesskey' => 'v',
-                       ],
-               ];
-
-               // the calendar link for the full featured events calendar
-               if ($is_owner && $a->theme_events_in_profile) {
-                       $tabs[] = [
-                               'label' => DI::l10n()->t('Events'),
-                               'url'   => DI::baseUrl() . '/events',
-                               'sel'   => $current == 'events' ? 'active' : '',
-                               'title' => DI::l10n()->t('Events and Calendar'),
-                               'id'    => 'events-tab',
-                               'accesskey' => 'e',
-                       ];
-                       // if the user is not the owner of the calendar we only show a calendar
-                       // with the public events of the calendar owner
-               } elseif (!$is_owner) {
-                       $tabs[] = [
-                               'label' => DI::l10n()->t('Events'),
-                               'url'   => DI::baseUrl() . '/cal/' . $nickname,
-                               'sel'   => $current == 'cal' ? 'active' : '',
-                               'title' => DI::l10n()->t('Events and Calendar'),
-                               'id'    => 'events-tab',
-                               'accesskey' => 'e',
-                       ];
-               }
-
-               if ($is_owner) {
-                       $tabs[] = [
-                               'label' => DI::l10n()->t('Personal Notes'),
-                               'url'   => DI::baseUrl() . '/notes',
-                               'sel'   => $current == 'notes' ? 'active' : '',
-                               'title' => DI::l10n()->t('Only You Can See This'),
-                               'id'    => 'notes-tab',
-                               'accesskey' => 't',
-                       ];
-               }
-
-               if (empty($a->profile['hide-friends'])) {
-                       $tabs[] = [
-                               'label' => DI::l10n()->t('Contacts'),
-                               'url'   => $baseProfileUrl . '/contacts',
-                               'sel'   => $current == 'contacts' ? 'active' : '',
-                               'title' => DI::l10n()->t('Contacts'),
-                               'id'    => 'viewcontacts-tab',
-                               'accesskey' => 'k',
-                       ];
-               }
-
-               if (!empty($_SESSION['new_member']) && $is_owner) {
-                       $tabs[] = [
-                               'label' => DI::l10n()->t('Tips for New Members'),
-                               'url'   => DI::baseUrl() . '/newmember',
-                               'sel'   => false,
-                               'title' => DI::l10n()->t('Tips for New Members'),
-                               'id'    => 'newmember-tab',
-                       ];
-               }
-
-               $arr = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $current, 'tabs' => $tabs];
-
-               Hook::callAll('profile_tabs', $arr);
-
-               $tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
-
-               return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]);
-       }
-
        /**
         * Retrieves the my_url session variable
         *
@@ -1035,13 +913,6 @@ class Profile
                                (`profile`.`locality` LIKE ?) OR
                                (`profile`.`region` LIKE ?) OR
                                (`profile`.`country-name` LIKE ?) OR
-                               (`profile`.`gender` LIKE ?) OR
-                               (`profile`.`marital` LIKE ?) OR
-                               (`profile`.`sexual` LIKE ?) OR
-                               (`profile`.`about` LIKE ?) OR
-                               (`profile`.`romance` LIKE ?) OR
-                               (`profile`.`work` LIKE ?) OR
-                               (`profile`.`education` LIKE ?) OR
                                (`profile`.`pub_keywords` LIKE ?) OR
                                (`profile`.`prv_keywords` LIKE ?))",
                                $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
@@ -1077,13 +948,6 @@ class Profile
                                (`profile`.`locality` LIKE ?) OR
                                (`profile`.`region` LIKE ?) OR
                                (`profile`.`country-name` LIKE ?) OR
-                               (`profile`.`gender` LIKE ?) OR
-                               (`profile`.`marital` LIKE ?) OR
-                               (`profile`.`sexual` LIKE ?) OR
-                               (`profile`.`about` LIKE ?) OR
-                               (`profile`.`romance` LIKE ?) OR
-                               (`profile`.`work` LIKE ?) OR
-                               (`profile`.`education` LIKE ?) OR
                                (`profile`.`pub_keywords` LIKE ?) OR
                                (`profile`.`prv_keywords` LIKE ?))
                        $order LIMIT ?,?",