<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
+use Friendica\Network\HTTPClient\Client\HttpClient;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity;
use Friendica\Protocol\Diaspora;
{
$profile = User::getOwnerDataByNick($nickname);
if (empty($profile)) {
- Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
+ Logger::info('profile error: ' . DI::args()->getQueryString());
return [];
}
}
// Fetch the account type
- $account_type = Contact::getAccountType($profile);
+ $account_type = Contact::getAccountType($profile['account-type']);
if (!empty($profile['address']) || !empty($profile['location'])) {
$location = DI::l10n()->t('Location:');
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()) {
- return $o;
+ return '';
}
/*
* return $o;
*/
- $bd_format = DI::l10n()->t('g A l F d'); // 8 AM Friday January 18
$bd_short = DI::l10n()->t('F d');
- $cachekey = 'get_birthdays:' . local_user();
- $r = DI::cache()->get($cachekey);
- if (is_null($r)) {
- $s = DBA::p(
+ $cacheKey = 'get_birthdays:' . local_user();
+ $events = DI::cache()->get($cacheKey);
+ if (is_null($events)) {
+ $result = DBA::p(
"SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
INNER JOIN `contact`
ON `contact`.`id` = `event`.`cid`
AND NOT `contact`.`archive`
AND NOT `contact`.`deleted`
WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
- ORDER BY `start` ASC ",
+ ORDER BY `start`",
Contact::SHARING,
Contact::FRIEND,
local_user(),
DateTimeFormat::utc('now + 6 days'),
DateTimeFormat::utcNow()
);
- if (DBA::isResult($s)) {
- $r = DBA::toArray($s);
- DI::cache()->set($cachekey, $r, Duration::HOUR);
+ if (DBA::isResult($result)) {
+ $events = DBA::toArray($result);
+ DI::cache()->set($cacheKey, $events, Duration::HOUR);
}
}
- $total = 0;
- $classtoday = '';
- if (DBA::isResult($r)) {
- $now = strtotime('now');
+ $total = 0;
+ $classToday = '';
+ $tpl_events = [];
+ if (DBA::isResult($events)) {
+ $now = strtotime('now');
$cids = [];
- $istoday = false;
- foreach ($r as $rr) {
- if (strlen($rr['name'])) {
- $total ++;
+ $isToday = false;
+ foreach ($events as $event) {
+ if (strlen($event['name'])) {
+ $total++;
}
- if ((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) {
- $istoday = true;
+ if ((strtotime($event['start'] . ' +00:00') < $now) && (strtotime($event['finish'] . ' +00:00') > $now)) {
+ $isToday = true;
}
}
- $classtoday = $istoday ? ' birthday-today ' : '';
+ $classToday = $isToday ? ' birthday-today ' : '';
if ($total) {
- foreach ($r as &$rr) {
- if (!strlen($rr['name'])) {
+ foreach ($events as $event) {
+ if (!strlen($event['name'])) {
continue;
}
// avoid duplicates
-
- if (in_array($rr['cid'], $cids)) {
+ if (in_array($event['cid'], $cids)) {
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']);
- $rr['title'] = $rr['name'];
- $rr['date'] = DI::l10n()->getDay(DateTimeFormat::local($rr['start'], $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '');
- $rr['startime'] = null;
- $rr['today'] = $today;
+ $tpl_events[] = [
+ 'id' => $event['id'],
+ 'link' => Contact::magicLinkById($event['cid']),
+ 'title' => $event['name'],
+ 'date' => DI::l10n()->getDay(DateTimeFormat::local($event['start'], $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '')
+ ];
}
}
}
$tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl');
return Renderer::replaceMacros($tpl, [
- '$classtoday' => $classtoday,
- '$count' => $total,
+ '$classtoday' => $classToday,
+ '$count' => $total,
'$event_reminders' => DI::l10n()->t('Birthday Reminders'),
- '$event_title' => DI::l10n()->t('Birthdays this week:'),
- '$events' => $r,
- '$lbr' => '{', // raw brackets mess up if/endif macro processing
- '$rbr' => '}'
+ '$event_title' => DI::l10n()->t('Birthdays this week:'),
+ '$events' => $tpl_events,
+ '$lbr' => '{', // raw brackets mess up if/endif macro processing
+ '$rbr' => '}'
]);
}
// Try to find the public contact entry of the visitor.
$cid = Contact::getIdForURL($my_url);
if (!$cid) {
- Logger::log('No contact record found for ' . $my_url, Logger::DEBUG);
+ Logger::info('No contact record found for ' . $my_url);
return;
}
$contact = DBA::selectFirst('contact',['id', 'url'], ['id' => $cid]);
if (DBA::isResult($contact) && remote_user() && remote_user() == $contact['id']) {
- Logger::log('The visitor ' . $my_url . ' is already authenticated', Logger::DEBUG);
+ Logger::info('The visitor ' . $my_url . ' is already authenticated');
return;
}
// Avoid endless loops
$cachekey = 'zrlInit:' . $my_url;
if (DI::cache()->get($cachekey)) {
- Logger::log('URL ' . $my_url . ' already tried to authenticate.', Logger::DEBUG);
+ Logger::info('URL ' . $my_url . ' already tried to authenticate.');
return;
} else {
DI::cache()->set($cachekey, true, Duration::MINUTE);
}
- Logger::log('Not authenticated. Invoking reverse magic-auth for ' . $my_url, Logger::DEBUG);
+ Logger::info('Not authenticated. Invoking reverse magic-auth for ' . $my_url);
// Remove the "addr" parameter from the destination. It is later added as separate parameter again.
$addr_request = 'addr=' . urlencode($addr);
$magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
// We have to check if the remote server does understand /magic without invoking something
- $serverret = DI::httpClient()->get($basepath . '/magic');
+ $serverret = DI::httpClient()->head($basepath . '/magic', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_HTML]);
if ($serverret->isSuccess()) {
- Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG);
+ Logger::info('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path);
System::externalRedirect($magic_path);
}
}
info(DI::l10n()->t('OpenWebAuth: %1$s welcomes %2$s', DI::baseUrl()->getHostname(), $visitor['name']));
- Logger::log('OpenWebAuth: auth success from ' . $visitor['addr'], Logger::DEBUG);
+ Logger::info('OpenWebAuth: auth success from ' . $visitor['addr']);
}
public static function zrl($s, $force = false)
projects / friendica.git / blobdiff