]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Profile.php
Merge pull request #8939 from MrPetovan/task/8906-frio-viewas-redesign
[friendica.git] / src / Model / Profile.php
index b77bfa8e1dfc423133a6fb19e25c259dfb4cbb56..0cff8ba287f0923f56657ccb3ef39a0c6d9d0fd5 100644 (file)
@@ -1,14 +1,28 @@
 <?php
 /**
- * @file src/Model/Profile.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Model;
 
 use Friendica\App;
-use Friendica\Content\Feature;
-use Friendica\Content\ForumManager;
 use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
@@ -25,7 +39,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
-use Friendica\Util\Temporal;
 
 class Profile
 {
@@ -39,8 +52,7 @@ class Profile
         */
        public static function getByUID($uid)
        {
-               $profile = DBA::selectFirst('profile', [], ['uid' => $uid, 'is-default' => true]);
-               return $profile;
+               return DBA::selectFirst('profile', [], ['uid' => $uid]);
        }
 
        /**
@@ -126,13 +138,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]);
 
@@ -155,7 +166,7 @@ class Profile
                        }
                }
 
-               $profile = self::getByNickname($nickname, $user['uid'], $profile_id);
+               $profile = self::getByNickname($nickname, $user['uid']);
 
                if (empty($profile) && empty($profiledata)) {
                        Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
@@ -163,17 +174,7 @@ class Profile
                }
 
                if (empty($profile)) {
-                       $profile = ['uid' => 0, 'is-default' => false,'name' => $nickname];
-               }
-
-               // fetch user tags if this isn't the default profile
-
-               if (!$profile['is-default']) {
-                       $condition = ['uid' => $profile['uid'], 'is-default' => true];
-                       $profile_id = DBA::selectFirst('profile', ['pub_keywords'], $condition);
-                       if (DBA::isResult($profile_id)) {
-                               $profile['pub_keywords'] = $profile_id['pub_keywords'];
-                       }
+                       $profile = ['uid' => 0, 'name' => $nickname];
                }
 
                $a->profile = $profile;
@@ -200,16 +201,6 @@ class Profile
                        require_once $theme_info_file;
                }
 
-               if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
-                       DI::page()['aside'] .= Renderer::replaceMacros(
-                               Renderer::getMarkupTemplate('settings/profile/link.tpl'),
-                               [
-                                       '$editprofile' => DI::l10n()->t('Edit profile'),
-                                       '$profid' => $a->profile['id']
-                               ]
-                       );
-               }
-
                $block = ((DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) ? true : false);
 
                /**
@@ -240,45 +231,9 @@ class Profile
         * @return array
         * @throws \Exception
         */
-       public static function getByNickname($nickname, $uid = 0, $profile_id = 0)
+       public static function getByNickname($nickname, $uid = 0)
        {
-               if (!empty(Session::getRemoteContactID($uid))) {
-                       $contact = DBA::selectFirst('contact', ['profile-id'], ['id' => Session::getRemoteContactID($uid)]);
-                       if (DBA::isResult($contact)) {
-                               $profile_id = $contact['profile-id'];
-                       }
-               }
-
-               $profile = null;
-
-               if ($profile_id) {
-                       $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`.*,
-                                       `contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.*
-                               FROM `profile`
-                               INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
-                               INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-                               WHERE `user`.`nickname` = ? AND `profile`.`id` = ? LIMIT 1",
-                               $nickname,
-                               intval($profile_id)
-                       );
-               }
-               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`.*,
-                                       `contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.*
-                               FROM `profile`
-                               INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
-                               INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-                               WHERE `user`.`nickname` = ? AND `profile`.`is-default` LIMIT 1",
-                               $nickname
-                       );
-               }
-
+               $profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname, 'uid' => $uid]);
                return $profile;
        }
 
@@ -303,7 +258,7 @@ class Profile
         * @hooks 'profile_sidebar'
         *      array $arr
         */
-       private static function sidebar(App $a, $profile, $block = 0, $show_connect = true)
+       private static function sidebar(App $a, array $profile, $block = 0, $show_connect = true)
        {
                $o = '';
                $location = false;
@@ -311,7 +266,8 @@ class Profile
                // This function can also use contact information in $profile
                $is_contact = !empty($profile['cid']);
 
-               if (!is_array($profile) && !count($profile)) {
+               if (empty($profile['nickname'])) {
+                       Logger::warning('Received profile with no nickname', ['profile' => $profile, 'callstack' => System::callstack(10)]);
                        return $o;
                }
 
@@ -336,8 +292,6 @@ class Profile
                $subscribe_feed_link = null;
                $wallmessage_link = null;
 
-
-
                $visitor_contact = [];
                if (!empty($profile['uid']) && self::getMyURL()) {
                        $visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]);
@@ -362,8 +316,9 @@ class Profile
 
                if (!$local_user_is_self && $show_connect) {
                        if (!$visitor_is_authenticated) {
-                               if (!empty($profile['nickname'])) {
-                                       $follow_link = 'dfrn_request/' . $profile['nickname'];
+                               // Remote follow is only available for local profiles
+                               if (!empty($profile['nickname']) && strpos($profile_url, DI::baseUrl()->get()) === 0) {
+                                       $follow_link = 'remote_follow/' . $profile['nickname'];
                                }
                        } elseif ($profile_is_native) {
                                if ($visitor_is_following) {
@@ -409,14 +364,12 @@ class Profile
                        $location = DI::l10n()->t('Location:');
                }
 
-               $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;
 
                if ((!empty($profile['hidewall']) || $block) && !Session::isAuthenticated()) {
-                       $location = $gender = $marital = $homepage = $about = false;
+                       $location = $homepage = $about = false;
                }
 
                $split_name = Diaspora::splitName($profile['name']);
@@ -427,14 +380,14 @@ class Profile
                        $diaspora = [
                                'guid' => $profile['guid'],
                                'podloc' => DI::baseUrl(),
-                               'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false'),
+                               'searchable' => ($profile['net-publish'] ? 'true' : 'false'),
                                'nickname' => $profile['nickname'],
                                'fullname' => $profile['name'],
                                'firstname' => $firstname,
                                'lastname' => $lastname,
-                               'photo300' => $profile['contact_photo'] ?? '',
-                               'photo100' => $profile['contact_thumb'] ?? '',
-                               'photo50' => $profile['contact_micro'] ?? '',
+                               'photo300' => $profile['photo'] ?? '',
+                               'photo100' => $profile['thumb'] ?? '',
+                               'photo50' => $profile['micro'] ?? '',
                        ];
                } else {
                        $diaspora = false;
@@ -443,18 +396,15 @@ class Profile
                $contact_block = '';
                $updated = '';
                $contact_count = 0;
+
+               if (!empty($profile['last-item'])) {
+                       $updated = date('c', strtotime($profile['last-item']));
+               }
+
                if (!$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 (DBA::isResult($r)) {
-                                       $updated = date('c', strtotime($r[0]['updated']));
-                               }
-
                                $contact_count = DBA::count('contact', [
                                        'uid' => $profile['uid'],
                                        'self' => false,
@@ -485,14 +435,6 @@ class Profile
                        $p['address'] = BBCode::convert($p['address']);
                }
 
-               if (isset($p['gender'])) {
-                       $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);
                }
@@ -513,8 +455,6 @@ class Profile
                        '$wallmessage_link' => $wallmessage_link,
                        '$account_type' => $account_type,
                        '$location' => $location,
-                       '$gender' => $gender,
-                       '$marital' => $marital,
                        '$homepage' => $homepage,
                        '$about' => $about,
                        '$network' => DI::l10n()->t('Network:'),
@@ -659,7 +599,7 @@ class Profile
 
                        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)],
+                                       'vid' => [Verb::getID(Activity::ATTEND), Verb::getID(Activity::ATTENDMAYBE)],
                                        'visible' => true, 'deleted' => false];
                                if (!Item::exists($condition)) {
                                        continue;
@@ -714,264 +654,6 @@ class Profile
                ]);
        }
 
-       public static function getAdvanced(App $a)
-       {
-               $uid = intval($a->profile['uid']);
-
-               if ($a->profile['name']) {
-                       $profile = [];
-
-                       $profile['fullname'] = [DI::l10n()->t('Full Name:'), $a->profile['name']];
-
-                       if (Feature::isEnabled($uid, 'profile_membersince')) {
-                               $profile['membersince'] = [DI::l10n()->t('Member since:'), DateTimeFormat::local($a->profile['register_date'])];
-                       }
-
-                       if ($a->profile['gender']) {
-                               $profile['gender'] = [DI::l10n()->t('Gender:'), DI::l10n()->t($a->profile['gender'])];
-                       }
-
-                       if (!empty($a->profile['dob']) && $a->profile['dob'] > DBA::NULL_DATE) {
-                               $year_bd_format = DI::l10n()->t('j F, Y');
-                               $short_bd_format = DI::l10n()->t('j F');
-
-                               $val = DI::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)
-                               );
-
-                               $profile['birthday'] = [DI::l10n()->t('Birthday:'), $val];
-                       }
-
-                       if (!empty($a->profile['dob'])
-                               && $a->profile['dob'] > DBA::NULL_DATE
-                               && $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'])
-                       ) {
-                               $profile['age'] = [DI::l10n()->t('Age: ') , DI::l10n()->tt('%d year old', '%d years old', $age)];
-                       }
-
-                       if ($a->profile['marital']) {
-                               $profile['marital'] = [DI::l10n()->t('Status:'), DI::l10n()->t($a->profile['marital'])];
-                       }
-
-                       /// @TODO Maybe use x() here, plus below?
-                       if ($a->profile['with']) {
-                               $profile['marital']['with'] = $a->profile['with'];
-                       }
-
-                       if (strlen($a->profile['howlong']) && $a->profile['howlong'] > DBA::NULL_DATETIME) {
-                               $profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], DI::l10n()->t('for %1$d %2$s'));
-                       }
-
-                       if ($a->profile['sexual']) {
-                               $profile['sexual'] = [DI::l10n()->t('Sexual Preference:'), DI::l10n()->t($a->profile['sexual'])];
-                       }
-
-                       if ($a->profile['homepage']) {
-                               $profile['homepage'] = [DI::l10n()->t('Homepage:'), HTML::toLink($a->profile['homepage'])];
-                       }
-
-                       if ($a->profile['hometown']) {
-                               $profile['hometown'] = [DI::l10n()->t('Hometown:'), HTML::toLink($a->profile['hometown'])];
-                       }
-
-                       if ($a->profile['pub_keywords']) {
-                               $profile['pub_keywords'] = [DI::l10n()->t('Tags:'), $a->profile['pub_keywords']];
-                       }
-
-                       if ($a->profile['politic']) {
-                               $profile['politic'] = [DI::l10n()->t('Political Views:'), $a->profile['politic']];
-                       }
-
-                       if ($a->profile['religion']) {
-                               $profile['religion'] = [DI::l10n()->t('Religion:'), $a->profile['religion']];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['about'])) {
-                               $profile['about'] = [DI::l10n()->t('About:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['interest'])) {
-                               $profile['interest'] = [DI::l10n()->t('Hobbies/Interests:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['likes'])) {
-                               $profile['likes'] = [DI::l10n()->t('Likes:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['dislikes'])) {
-                               $profile['dislikes'] = [DI::l10n()->t('Dislikes:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['contact'])) {
-                               $profile['contact'] = [DI::l10n()->t('Contact information and Social Networks:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['music'])) {
-                               $profile['music'] = [DI::l10n()->t('Musical interests:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['book'])) {
-                               $profile['book'] = [DI::l10n()->t('Books, literature:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['tv'])) {
-                               $profile['tv'] = [DI::l10n()->t('Television:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['film'])) {
-                               $profile['film'] = [DI::l10n()->t('Film/dance/culture/entertainment:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['romance'])) {
-                               $profile['romance'] = [DI::l10n()->t('Love/Romance:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['work'])) {
-                               $profile['work'] = [DI::l10n()->t('Work/employment:'), $txt];
-                       }
-
-                       if ($txt = BBCode::convert($a->profile['education'])) {
-                               $profile['education'] = [DI::l10n()->t('School/education:'), $txt];
-                       }
-
-                       //show subcribed forum if it is enabled in the usersettings
-                       if (Feature::isEnabled($uid, 'forumlist_profile')) {
-                               $profile['forumlist'] = [DI::l10n()->t('Forums:'), ForumManager::profileAdvanced($uid)];
-                       }
-
-                       if ($a->profile['uid'] == local_user()) {
-                               $profile['edit'] = [DI::baseUrl() . '/settings/profile', DI::l10n()->t('Edit profile'), '', DI::l10n()->t('Edit profile')];
-                       }
-
-                       $tpl = Renderer::getMarkupTemplate('profile/advanced.tpl');
-                       return Renderer::replaceMacros($tpl, [
-                               '$title' => DI::l10n()->t('Profile'),
-                               '$basic' => DI::l10n()->t('Basic'),
-                               '$advanced' => DI::l10n()->t('Advanced'),
-                               '$profile' => $profile
-                       ]);
-               }
-
-               return '';
-       }
-
-    /**
-     * @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
         *
@@ -1055,7 +737,7 @@ class Profile
                        $magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
 
                        // We have to check if the remote server does understand /magic without invoking something
-                       $serverret = Network::curl($basepath . '/magic');
+                       $serverret = DI::httpRequest()->get($basepath . '/magic');
                        if ($serverret->isSuccess()) {
                                Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG);
                                System::externalRedirect($magic_path);
@@ -1088,6 +770,7 @@ class Profile
                $_SESSION['visitor_handle'] = $visitor['addr'];
                $_SESSION['visitor_home'] = $visitor['url'];
                $_SESSION['my_url'] = $visitor['url'];
+               $_SESSION['remote_comment'] = $visitor['subscribe'];
 
                Session::setVisitorsContacts();
 
@@ -1202,101 +885,37 @@ class Profile
         */
        public static function searchProfiles($start = 0, $count = 100, $search = null)
        {
-               $publish = (DI::config()->get('system', 'publish_all') ? '' : " AND `publish` = 1 ");
-               $total = 0;
-
                if (!empty($search)) {
+                       $publish = (DI::config()->get('system', 'publish_all') ? '' : "AND `publish` ");
                        $searchTerm = '%' . $search . '%';
-                       $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
-                               FROM `profile`
-                               LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
-                               AND ((`profile`.`name` LIKE ?) OR
-                               (`user`.`nickname` LIKE ?) OR
-                               (`profile`.`pdesc` LIKE ?) OR
-                               (`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,
-                               $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm);
+                       $condition = ["NOT `blocked` AND NOT `account_removed`
+                               $publish
+                               AND ((`name` LIKE ?) OR
+                               (`nickname` LIKE ?) OR
+                               (`about` LIKE ?) OR
+                               (`locality` LIKE ?) OR
+                               (`region` LIKE ?) OR
+                               (`country-name` LIKE ?) OR
+                               (`pub_keywords` LIKE ?) OR
+                               (`prv_keywords` LIKE ?))",
+                               $searchTerm, $searchTerm, $searchTerm, $searchTerm,
+                               $searchTerm, $searchTerm, $searchTerm, $searchTerm];
                } else {
-                       $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
-                               FROM `profile`
-                               LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`");
-               }
-
-               if (DBA::isResult($cnt)) {
-                       $total = $cnt['total'];
+                       $condition = ['blocked' => false, 'account_removed' => false];
+                       if (!DI::config()->get('system', 'publish_all')) {
+                               $condition['publish'] = true;
+                       }
                }
 
-               $order = " ORDER BY `name` ASC ";
-               $profiles = [];
+               $total = DBA::count('owner-view', $condition);
 
                // If nothing found, don't try to select details
                if ($total > 0) {
-                       if (!empty($search)) {
-                               $searchTerm = '%' . $search . '%';
-
-                               $profiles = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
-                       `contact`.`addr`, `contact`.`url` AS `profile_url`
-                       FROM `profile`
-                       LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                       LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-                       WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
-                       AND ((`profile`.`name` LIKE ?) OR
-                               (`user`.`nickname` LIKE ?) OR
-                               (`profile`.`pdesc` LIKE ?) OR
-                               (`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 ?,?",
-                                       $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
-                                       $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
-                                       $start, $count
-                               );
-                       } else {
-                               $profiles = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
-                       `contact`.`addr`, `contact`.`url` AS `profile_url`
-                       FROM `profile`
-                       LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                       LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-                       WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
-                       $order LIMIT ?,?",
-                                       $start, $count
-                               );
-                       }
-               }
-
-               if (DBA::isResult($profiles) && $total > 0) {
-                       return [
-                               'total'   => $total,
-                               'entries' => DBA::toArray($profiles),
-                       ];
-
+                       $profiles = DBA::selectToArray('owner-view', [], $condition, ['order' => ['name'], 'limit' => [$start, $count]]);
                } else {
-                       return [
-                               'total'   => $total,
-                               'entries' => [],
-                       ];
+                       $profiles = [];
                }
+
+               return ['total' => $total, 'entries' => $profiles];
        }
 }