Merge pull request #4962 from astifter/fix_cropped_find_button

[friendica.git] / src / Model / Profile.php

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index f31c83c857f5cb4be4c3d14f15765946b0a26408..8bb519448e32d18a2fd179f7fe881b0668ab86c4 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -7,6 +7,7 @@ namespace Friendica\Model;
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
@@ -23,7 +24,6 @@ use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
-require_once 'include/bbcode.php';
 require_once 'mod/proxy.php';
 
 class Profile
@@ -92,14 +92,14 @@ class Profile
        {
                $user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 
-               if (!$user && !count($user) && !count($profiledata)) {
+               if (!DBM::is_result($user) && empty($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
                        notice(L10n::t('Requested account is not available.') . EOL);
                        $a->error = 404;
                        return;
                }
 
-               if (!x($a->page, 'aside')) {
+               if (empty($a->page['aside'])) {
                        $a->page['aside'] = '';
                }
 
@@ -152,15 +152,11 @@ class Profile
 
                $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
 
-               $theme_info_file = 'view/theme/' . current_theme() . '/theme.php';
+               $theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php';
                if (file_exists($theme_info_file)) {
                        require_once $theme_info_file;
                }
 
-               if (!x($a->page, 'aside')) {
-                       $a->page['aside'] = '';
-               }
-
                if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
                        $a->page['aside'] .= replace_macros(
                                get_markup_template('profile_edlink.tpl'),
@@ -487,19 +483,21 @@ class Profile
                }
 
                if (isset($p['about'])) {
-                       $p['about'] = bbcode($p['about']);
+                       $p['about'] = BBCode::convert($p['about']);
                }
 
                if (isset($p['address'])) {
-                       $p['address'] = bbcode($p['address']);
+                       $p['address'] = BBCode::convert($p['address']);
                } else {
-                       $p['address'] = bbcode($p['location']);
+                       $p['address'] = BBCode::convert($p['location']);
                }
 
                if (isset($p['photo'])) {
                        $p['photo'] = proxy_url($p['photo'], false, PROXY_SIZE_SMALL);
                }
 
+               $p['url'] = self::magicLink($p['url']);
+
                $tpl = get_markup_template('profile_vcard.tpl');
                $o .= replace_macros($tpl, [
                        '$profile' => $p,
@@ -622,10 +620,8 @@ class Profile
                ]);
        }
 
-       public static function getEvents()
+       public static function getEventsReminderHTML()
        {
-               require_once 'include/bbcode.php';
-
                $a = get_app();
                $o = '';
 
@@ -644,12 +640,26 @@ class Profile
                $classtoday = '';
 
                $s = dba::p(
-                       "SELECT `event`.* FROM `event`
-                       WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
-                       ORDER BY `start` ASC ",
+                       "SELECT `event`.*
+                       FROM `event`
+                       INNER JOIN `item`
+                               ON `item`.`uid` = `event`.`uid`
+                               AND `item`.`parent-uri` = `event`.`uri`
+                       WHERE `event`.`uid` = ?
+                       AND `event`.`type` != 'birthday'
+                       AND `event`.`start` < ?
+                       AND `event`.`start` >= ?
+                       AND `item`.`author-id` = ?
+                       AND (`item`.`verb` = ? OR `item`.`verb` = ?)
+                       AND `item`.`visible`
+                       AND NOT `item`.`deleted`
+                       ORDER BY  `event`.`start` ASC",
                        local_user(),
                        DateTimeFormat::utc('now + 7 days'),
-                       DateTimeFormat::utc('now - 1 days')
+                       DateTimeFormat::utc('now - 1 days'),
+                       public_contact(),
+                       ACTIVITY_ATTEND,
+                       ACTIVITY_ATTENDMAYBE
                );
 
                $r = [];
@@ -667,13 +677,13 @@ class Profile
                                        $istoday = true;
                                }
 
-                               $title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
+                               $title = strip_tags(html_entity_decode(BBCode::convert($rr['summary']), ENT_QUOTES, 'UTF-8'));
 
                                if (strlen($title) > 35) {
                                        $title = substr($title, 0, 32) . '... ';
                                }
 
-                               $description = substr(strip_tags(bbcode($rr['desc'])), 0, 32) . '... ';
+                               $description = substr(strip_tags(BBCode::convert($rr['desc'])), 0, 32) . '... ';
                                if (!$description) {
                                        $description = L10n::t('[No description]');
                                }
@@ -940,7 +950,7 @@ class Profile
                        ];
                }
 
-               if ((!$is_owner) && ((count($a->profile)) || (!$a->profile['hide-friends']))) {
+               if (!$is_owner && empty($a->profile['hide-friends'])) {
                        $tabs[] = [
                                'label' => L10n::t('Contacts'),
                                'url'   => System::baseUrl() . '/viewcontacts/' . $nickname,
@@ -993,6 +1003,29 @@ class Profile
                }
        }
 
+       /**
+        * @brief Returns a magic link to authenticate remote visitors
+        *
+        * @param string $contact_url The address of the contact profile
+        * @param integer $uid The user id, "local_user" is the default
+        *
+        * @return string with "redir" link
+        */
+       public static function magicLink($contact_url, $uid = -1)
+       {
+               if ($uid == -1) {
+                       $uid = local_user();
+               }
+               $condition = ['pending' => false, 'uid' => $uid,
+                               'nurl' => normalise_link($contact_url),
+                               'network' => NETWORK_DFRN, 'self' => false];
+               $contact = dba::selectFirst('contact', ['id'], $condition);
+               if (DBM::is_result($contact)) {
+                       return System::baseUrl() . '/redir/' . $contact['id'];
+               }
+               return self::zrl($contact_url);
+       }
+
        public static function zrl($s, $force = false)
        {
                if (!strlen($s)) {