keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Remove redundant code

Browse source 
- Rename some variables
- Add method description
This commit is contained in:
Philipp 2022-01-04 22:07:49 +01:00
parent 7b3515e706
commit d2229006fc
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
1 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/Model/Profile.php
View file

@ -477,12 +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
{ {
$o = '';
if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) { if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) {
return $o; return '';
} }
/* /*
@ -494,8 +501,8 @@ class Profile
$bd_short = DI::l10n()->t('F d'); $bd_short = DI::l10n()->t('F d');
$cachekey = 'get_birthdays:' . local_user(); $cacheKey = 'get_birthdays:' . local_user();
$events = DI::cache()->get($cachekey); $events = DI::cache()->get($cacheKey);
if (is_null($events)) { if (is_null($events)) {
$result = DBA::p( $result = DBA::p(
"SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` "SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
@ -517,53 +524,53 @@ class Profile
); );
if (DBA::isResult($result)) { if (DBA::isResult($result)) {
$events = DBA::toArray($result); $events = DBA::toArray($result);
DI::cache()->set($cachekey, $events, Duration::HOUR); DI::cache()->set($cacheKey, $events, Duration::HOUR);
} }
} }
$total = 0; $total = 0;
$classtoday = ''; $classToday = '';
$tpl_events = []; $tpl_events = [];
if (DBA::isResult($events)) { if (DBA::isResult($events)) {
$now = strtotime('now'); $now = strtotime('now');
$cids = []; $cids = [];
$istoday = false; $isToday = false;
foreach ($events 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 ($events as $rr) { foreach ($events as $event) {
if (!strlen($rr['name'])) { if (!strlen($event['name'])) {
continue; continue;
} }
// avoid duplicates // avoid duplicates
if (in_array($rr['cid'], $cids)) { if (in_array($event['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);
$tpl_events[] = [ $tpl_events[] = [
'id' => $rr['id'], 'id' => $event['id'],
'link' => Contact::magicLinkById($rr['cid']), 'link' => Contact::magicLinkById($event['cid']),
'title' => $rr['name'], 'title' => $event['name'],
'date' => DI::l10n()->getDay(DateTimeFormat::local($rr['start'], $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[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:'),