bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #11140 from nupplaphil/friendica-11138

Browse source 
Fix getBirthdays() method
This commit is contained in:
Hypolite Petovan 2022-01-05 10:28:49 +01:00 committed by GitHub
parent 2b74e41312 cf18f059a1
commit ff83c170a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 225 additions and 219 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
src/Model/Profile.php
View file

@ -477,13 +477,19 @@ class Profile
return $o; return $o;
} }
public static function getBirthdays() /**
* Returns the upcoming birthdays of contacts of the current user as HTML content
*
* @return string The upcoming birthdays (HTML)
*
* @throws HTTPException\InternalServerErrorException
* @throws HTTPException\ServiceUnavailableException
* @throws \ImagickException
*/
public static function getBirthdays(): string
{ {
$a = DI::app();
$o = '';
if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) { if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) {
return $o; return '';
} }
/* /*
@ -493,13 +499,12 @@ class Profile
* return $o; * return $o;
*/ */
$bd_format = DI::l10n()->t('g A l F d'); // 8 AM Friday January 18
$bd_short = DI::l10n()->t('F d'); $bd_short = DI::l10n()->t('F d');
$cachekey = 'get_birthdays:' . local_user(); $cacheKey = 'get_birthdays:' . local_user();
$r = DI::cache()->get($cachekey); $events = DI::cache()->get($cacheKey);
if (is_null($r)) { if (is_null($events)) {
$s = DBA::p( $result = DBA::p(
"SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` "SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
INNER JOIN `contact` INNER JOIN `contact`
ON `contact`.`id` = `event`.`cid` ON `contact`.`id` = `event`.`cid`
@ -510,67 +515,68 @@ class Profile
AND NOT `contact`.`archive` AND NOT `contact`.`archive`
AND NOT `contact`.`deleted` AND NOT `contact`.`deleted`
WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ? WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
ORDER BY `start` ASC ", ORDER BY `start`",
Contact::SHARING, Contact::SHARING,
Contact::FRIEND, Contact::FRIEND,
local_user(), local_user(),
DateTimeFormat::utc('now + 6 days'), DateTimeFormat::utc('now + 6 days'),
DateTimeFormat::utcNow() DateTimeFormat::utcNow()
); );
if (DBA::isResult($s)) { if (DBA::isResult($result)) {
$r = DBA::toArray($s); $events = DBA::toArray($result);
DI::cache()->set($cachekey, $r, Duration::HOUR); DI::cache()->set($cacheKey, $events, Duration::HOUR);
} }
} }
$total = 0; $total = 0;
$classtoday = ''; $classToday = '';
if (DBA::isResult($r)) { $tpl_events = [];
$now = strtotime('now'); if (DBA::isResult($events)) {
$now = strtotime('now');
$cids = []; $cids = [];
$istoday = false; $isToday = false;
foreach ($r as $rr) { foreach ($events as $event) {
if (strlen($rr['name'])) { if (strlen($event['name'])) {
$total ++; $total++;
} }
if ((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) { if ((strtotime($event['start'] . ' +00:00') < $now) && (strtotime($event['finish'] . ' +00:00') > $now)) {
$istoday = true; $isToday = true;
} }
} }
$classtoday = $istoday ? ' birthday-today ' : ''; $classToday = $isToday ? ' birthday-today ' : '';
if ($total) { if ($total) {
foreach ($r as &$rr) { foreach ($events as $event) {
if (!strlen($rr['name'])) { if (!strlen($event['name'])) {
continue; continue;
} }
// avoid duplicates // avoid duplicates
if (in_array($event['cid'], $cids)) {
if (in_array($rr['cid'], $cids)) {
continue; continue;
} }
$cids[] = $rr['cid']; $cids[] = $event['cid'];
$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); $today = (strtotime($event['start'] . ' +00:00') < $now) && (strtotime($event['finish'] . ' +00:00') > $now);
$rr['link'] = Contact::magicLinkById($rr['cid']); $tpl_events[] = [
$rr['title'] = $rr['name']; 'id' => $event['id'],
$rr['date'] = DI::l10n()->getDay(DateTimeFormat::local($rr['start'], $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : ''); 'link' => Contact::magicLinkById($event['cid']),
$rr['startime'] = null; 'title' => $event['name'],
$rr['today'] = $today; 'date' => DI::l10n()->getDay(DateTimeFormat::local($event['start'], $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '')
];
} }
} }
} }
$tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl'); $tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl');
return Renderer::replaceMacros($tpl, [ return Renderer::replaceMacros($tpl, [
'$classtoday' => $classtoday, '$classtoday' => $classToday,
'$count' => $total, '$count' => $total,
'$event_reminders' => DI::l10n()->t('Birthday Reminders'), '$event_reminders' => DI::l10n()->t('Birthday Reminders'),
'$event_title' => DI::l10n()->t('Birthdays this week:'), '$event_title' => DI::l10n()->t('Birthdays this week:'),
'$events' => $r, '$events' => $tpl_events,
'$lbr' => '{', // raw brackets mess up if/endif macro processing '$lbr' => '{', // raw brackets mess up if/endif macro processing
'$rbr' => '}' '$rbr' => '}'
]); ]);
} }

354
view/lang/C/messages.po
View file

File diff suppressed because it is too large Load diff