Bugfix: Prevent "Uncaught TypeError: Argument 1 passed to Friendica\Model\Event:...

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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 3522bab8efc4bb5385a9a9e06ac550c38ae79b3b..e493d82d53cfb36c4be9234bd093113211860909 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
@@ -487,13 +487,13 @@ 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'])) {
@@ -565,8 +565,10 @@ class Profile
                                Cache::set($cachekey, $r, CACHE_HOUR);
                        }
                }
+
+               $total = 0;
+               $classtoday = '';
                if (DBM::is_result($r)) {
-                       $total = 0;
                        $now = strtotime('now');
                        $cids = [];
 
@@ -620,11 +622,10 @@ class Profile
                ]);
        }
 
-       public static function getEvents()
+       public static function getEventsReminderHTML()
        {
-               require_once 'include/bbcode.php';
-
                $a = get_app();
+               $o = '';
 
                if (!local_user() || $a->is_mobile || $a->is_tablet) {
                        return $o;
@@ -641,12 +642,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 *
+                       FROM `event`
+                       WHERE `event`.`uid` = ?
+                       AND  `event`.`type` != 'birthday'
+                       AND  `event`.`start` < ?
+                       AND  `event`.`start` >= ?
+                       AND NOT EXISTS (
+                               SELECT `id`
+                               FROM `item`
+                               WHERE `item`.`uid` = `event`.`uid`
+                               AND `item`.`parent-uri` = `event`.`uri`
+                               AND `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'),
+                       ACTIVITY_ATTENDNO
                );
 
                $r = [];
@@ -664,13 +679,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]');
                                }
@@ -722,6 +737,10 @@ class Profile
 
                        $profile['fullname'] = [L10n::t('Full Name:'), $a->profile['name']];
 
+                       if (Feature::isEnabled($uid, 'profile_membersince')) {
+                               $profile['membersince'] = [L10n::t('Member since:'), DateTimeFormat::local($a->profile['register_date'])];
+                       }
+
                        if ($a->profile['gender']) {
                                $profile['gender'] = [L10n::t('Gender:'), $a->profile['gender']];
                        }