Merge branch 'develop' of https://github.com/friendica/friendica into develop

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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index b6400a596cc5e5784d646c3a1b41723be06cfcb8..f6e116fa79867b94a9cbb58d5bc0541446898155 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -124,12 +124,10 @@ class Profile
                // fetch user tags if this isn't the default profile
 
                if (!$pdata['is-default']) {
-                       $x = q(
-                               "SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
-                               intval($pdata['profile_uid'])
-                       );
-                       if ($x && count($x)) {
-                               $pdata['pub_keywords'] = $x[0]['pub_keywords'];
+                       $condition = ['uid' => $pdata['profile_uid'], 'is-default' => true];
+                       $profile = DBA::selectFirst('profile', ['pub_keywords'], $condition);
+                       if (DBA::isResult($profile)) {
+                               $pdata['pub_keywords'] = $profile['pub_keywords'];
                        }
                }
 
@@ -641,37 +639,26 @@ class Profile
                $bd_format = L10n::t('g A l F d'); // 8 AM Friday January 18
                $classtoday = '';
 
-               $s = DBA::p(
-                       "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'),
-                       public_contact(),
-                       ACTIVITY_ATTEND,
-                       ACTIVITY_ATTENDMAYBE
-               );
+               $condition = ["`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?",
+                       local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utc('now - 1 days')];
+               $s = DBA::select('event', [], $condition, ['order' => ['start']]);
 
                $r = [];
 
                if (DBA::isResult($s)) {
                        $istoday = false;
+                       $total = 0;
 
                        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)],
+                                       'visible' => true, 'deleted' => false];
+                               if (!Item::exists($condition)) {
+                                       continue;
+                               }
+
                                if (strlen($rr['summary'])) {
-                                       $total ++;
+                                       $total++;
                                }
 
                                $strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');