use Friendica\Content\Feature;
use Friendica\Content\ForumManager;
use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
use Friendica\Core\Addon;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
use Friendica\Util\Temporal;
require_once 'include/dba.php';
$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
if (!DBA::isResult($user) && empty($profiledata)) {
- logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+ Logger::log('profile error: ' . $a->query_string, Logger::DEBUG);
notice(L10n::t('Requested account is not available.') . EOL);
$a->error = 404;
return;
$pdata = self::getByNickname($nickname, $user['uid'], $profile);
if (empty($pdata) && empty($profiledata)) {
- logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+ Logger::log('profile error: ' . $a->query_string, Logger::DEBUG);
notice(L10n::t('Requested profile is not available.') . EOL);
$a->error = 404;
return;
* load/reload current theme info
*/
- $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
+ Renderer::setActiveTemplateEngine(); // reset the template engine to the default in case the user's theme doesn't specify one
$theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php';
if (file_exists($theme_info_file)) {
}
if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
- $a->page['aside'] .= replace_macros(
- get_markup_template('profile_edlink.tpl'),
+ $a->page['aside'] .= Renderer::replaceMacros(
+ Renderer::getMarkupTemplate('profile_edlink.tpl'),
[
'$editprofile' => L10n::t('Edit profile'),
'$profid' => $a->profile['id']
$updated = '';
$contacts = 0;
if (!$block) {
- $contact_block = contact_block();
+ $contact_block = HTML::contactBlock();
if (is_array($a->profile) && !$a->profile['hide-friends']) {
$r = q(
$p['url'] = Contact::magicLink(defaults($p, 'url', $profile_url));
- $tpl = get_markup_template('profile_vcard.tpl');
- $o .= replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('profile_vcard.tpl');
+ $o .= Renderer::replaceMacros($tpl, [
'$profile' => $p,
'$xmpp' => $xmpp,
'$connect' => $connect,
);
if (DBA::isResult($s)) {
$r = DBA::toArray($s);
- Cache::set($cachekey, $r, CACHE_HOUR);
+ Cache::set($cachekey, $r, Cache::HOUR);
}
}
$rr['link'] = Contact::magicLink($rr['url']);
$rr['title'] = $rr['name'];
- $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
+ $rr['date'] = L10n::getDay(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
$rr['startime'] = null;
$rr['today'] = $today;
}
}
}
- $tpl = get_markup_template('birthdays_reminder.tpl');
- return replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl');
+ return Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(),
'$classtoday' => $classtoday,
'$count' => $total,
$rr['title'] = $title;
$rr['description'] = $description;
- $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
+ $rr['date'] = L10n::getDay(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
$rr['startime'] = $strt;
$rr['today'] = $today;
DBA::close($s);
$classtoday = (($istoday) ? 'event-today' : '');
}
- $tpl = get_markup_template('events_reminder.tpl');
- return replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('events_reminder.tpl');
+ return Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(),
'$classtoday' => $classtoday,
'$count' => count($r),
$o = '';
$uid = $a->profile['uid'];
- $o .= replace_macros(
- get_markup_template('section_title.tpl'),
+ $o .= Renderer::replaceMacros(
+ Renderer::getMarkupTemplate('section_title.tpl'),
['$title' => L10n::t('Profile')]
);
if ($a->profile['name']) {
- $tpl = get_markup_template('profile_advanced.tpl');
+ $tpl = Renderer::getMarkupTemplate('profile_advanced.tpl');
$profile = [];
$year_bd_format = L10n::t('j F, Y');
$short_bd_format = L10n::t('j F');
- $val = day_translate(
+ $val = L10n::getDay(
intval($a->profile['dob']) ?
DateTimeFormat::utc($a->profile['dob'] . ' 00:00 +00:00', $year_bd_format)
: DateTimeFormat::utc('2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)
$profile['marital']['with'] = $a->profile['with'];
}
- if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
+ if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= DBA::NULL_DATETIME) {
$profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
}
}
if ($a->profile['homepage']) {
- $profile['homepage'] = [L10n::t('Homepage:'), linkify($a->profile['homepage'])];
+ $profile['homepage'] = [L10n::t('Homepage:'), HTML::toLink($a->profile['homepage'])];
}
if ($a->profile['hometown']) {
- $profile['hometown'] = [L10n::t('Hometown:'), linkify($a->profile['hometown'])];
+ $profile['hometown'] = [L10n::t('Hometown:'), HTML::toLink($a->profile['hometown'])];
}
if ($a->profile['pub_keywords']) {
$profile['edit'] = [System::baseUrl() . '/profiles/' . $a->profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')];
}
- return replace_macros($tpl, [
+ return Renderer::replaceMacros($tpl, [
'$title' => L10n::t('Profile'),
'$basic' => L10n::t('Basic'),
'$advanced' => L10n::t('Advanced'),
$tab = false;
if (x($_GET, 'tab')) {
- $tab = notags(trim($_GET['tab']));
+ $tab = Strings::removeTags(trim($_GET['tab']));
}
$url = System::baseUrl() . '/profile/' . $nickname;
$arr = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $tab, 'tabs' => $tabs];
Addon::callHooks('profile_tabs', $arr);
- $tpl = get_markup_template('common_tabs.tpl');
+ $tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
- return replace_macros($tpl, ['$tabs' => $arr['tabs']]);
+ return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]);
}
/**
$my_url = self::getMyURL();
$my_url = Network::isUrlValid($my_url);
- if ($my_url) {
- if (!local_user()) {
- // Is it a DDoS attempt?
- // The check fetches the cached value from gprobe to reduce the load for this system
- $urlparts = parse_url($my_url);
+ if (empty($my_url) || local_user()) {
+ return;
+ }
- $result = Cache::get('gprobe:' . $urlparts['host']);
- if ((!is_null($result)) && (in_array($result['network'], [Protocol::FEED, Protocol::PHANTOM]))) {
- logger('DDoS attempt detected for ' . $urlparts['host'] . ' by ' . $_SERVER['REMOTE_ADDR'] . '. server data: ' . print_r($_SERVER, true), LOGGER_DEBUG);
- return;
- }
+ $arr = ['zrl' => $my_url, 'url' => $a->cmd];
+ Addon::callHooks('zrl_init', $arr);
- Worker::add(PRIORITY_LOW, 'GProbe', $my_url);
- $arr = ['zrl' => $my_url, 'url' => $a->cmd];
- Addon::callHooks('zrl_init', $arr);
+ // 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);
+ return;
+ }
- // Try to find the public contact entry of the visitor.
- $cid = Contact::getIdForURL($my_url);
- if (!$cid) {
- logger('No contact record found for ' . $my_url, LOGGER_DEBUG);
- return;
- }
+ $contact = DBA::selectFirst('contact',['id', 'url'], ['id' => $cid]);
- $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);
+ return;
+ }
- if (DBA::isResult($contact) && remote_user() && remote_user() == $contact['id']) {
- // The visitor is already authenticated.
- return;
- }
+ // Avoid endless loops
+ $cachekey = 'zrlInit:' . $my_url;
+ if (Cache::get($cachekey)) {
+ Logger::log('URL ' . $my_url . ' already tried to authenticate.', Logger::DEBUG);
+ return;
+ } else {
+ Cache::set($cachekey, true, Cache::MINUTE);
+ }
- logger('Not authenticated. Invoking reverse magic-auth for ' . $my_url, LOGGER_DEBUG);
+ Logger::log('Not authenticated. Invoking reverse magic-auth for ' . $my_url, Logger::DEBUG);
- // Try to avoid recursion - but send them home to do a proper magic auth.
- $query = str_replace(array('?zrl=', '&zid='), array('?rzrl=', '&rzrl='), $a->query_string);
- // The other instance needs to know where to redirect.
- $dest = urlencode(System::baseUrl() . '/' . $query);
+ Worker::add(PRIORITY_LOW, 'GProbe', $my_url);
- // We need to extract the basebath from the profile url
- // to redirect the visitors '/magic' module.
- // Note: We should have the basepath of a contact also in the contact table.
- $urlarr = explode('/profile/', $contact['url']);
- $basepath = $urlarr[0];
+ // Try to avoid recursion - but send them home to do a proper magic auth.
+ $query = str_replace(array('?zrl=', '&zid='), array('?rzrl=', '&rzrl='), $a->query_string);
+ // The other instance needs to know where to redirect.
+ $dest = urlencode($a->getBaseURL() . '/' . $query);
- if ($basepath != System::baseUrl() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
- $magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest;
- $serverret = Network::curl($magic_path);
- if (!empty($serverret['success'])) {
- goaway($magic_path);
- }
- }
+ // We need to extract the basebath from the profile url
+ // to redirect the visitors '/magic' module.
+ // Note: We should have the basepath of a contact also in the contact table.
+ $urlarr = explode('/profile/', $contact['url']);
+ $basepath = $urlarr[0];
+
+ if ($basepath != $a->getBaseURL() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
+ $magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest;
+
+ // We have to check if the remote server does understand /magic without invoking something
+ $serverret = Network::curl($basepath . '/magic');
+ if ($serverret->isSuccess()) {
+ Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG);
+ System::externalRedirect($magic_path);
}
}
}
// Try to find the public contact entry of the visitor.
$cid = Contact::getIdForURL($visitor_handle);
if(!$cid) {
- logger('owt: unable to finger ' . $visitor_handle, LOGGER_DEBUG);
+ Logger::log('owt: unable to finger ' . $visitor_handle, Logger::DEBUG);
return;
}
$a->contact = $arr['visitor'];
- info(L10n::t('OpenWebAuth: %1$s welcomes %2$s', $a->get_hostname(), $visitor['name']));
+ info(L10n::t('OpenWebAuth: %1$s welcomes %2$s', $a->getHostName(), $visitor['name']));
- logger('OpenWebAuth: auth success from ' . $visitor['addr'], LOGGER_DEBUG);
+ Logger::log('OpenWebAuth: auth success from ' . $visitor['addr'], Logger::DEBUG);
}
public static function zrl($s, $force = false)
projects / friendica.git / blobdiff