use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
$a->profile_uid = $pdata['profile_uid'];
$a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme');
- $a->profile['network'] = NETWORK_DFRN;
+ $a->profile['network'] = Protocol::DFRN;
$a->page['title'] = $a->profile['name'] . ' @ ' . Config::get('config', 'sitename');
$profile['picdate'] = urlencode(defaults($profile, 'picdate', ''));
- if (($profile['network'] != '') && ($profile['network'] != NETWORK_DFRN)) {
+ if (($profile['network'] != '') && ($profile['network'] != Protocol::DFRN)) {
$profile['network_name'] = format_network_name($profile['network'], $profile['url']);
} else {
$profile['network_name'] = '';
}
}
- if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect'])) {
+ if ($connect && ($profile['network'] != Protocol::DFRN) && !isset($profile['remoteconnect'])) {
$connect = false;
}
$remoteconnect = $profile['remoteconnect'];
}
- if ($connect && ($profile['network'] == NETWORK_DFRN) && !isset($remoteconnect)) {
+ if ($connect && ($profile['network'] == Protocol::DFRN) && !isset($remoteconnect)) {
$subscribe_feed = L10n::t('Atom feed');
} else {
$subscribe_feed = false;
}
+ $wallmessage = false;
+ $wallmessage_link = false;
+
+ // See issue https://github.com/friendica/friendica/issues/3838
+ // Either we remove the message link for remote users or we enable creating messages from remote users
if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) {
$wallmessage = L10n::t('Message');
- $wallmessage_link = 'wallmessage/' . $profile['nickname'];
if (remote_user()) {
$r = q(
$remote_url = $r[0]['url'];
$message_path = preg_replace('=(.*)/profile/(.*)=ism', '$1/message/new/', $remote_url);
$wallmessage_link = $message_path . base64_encode($profile['addr']);
+ } else if (!empty($profile['nickname'])) {
+ $wallmessage_link = 'wallmessage/' . $profile['nickname'];
}
- } else {
- $wallmessage = false;
- $wallmessage_link = false;
}
// show edit profile to yourself
AND NOT `hidden` AND NOT `archive`
AND `network` IN ('%s', '%s', '%s', '')",
intval($profile['uid']),
- DBA::escape(NETWORK_DFRN),
- DBA::escape(NETWORK_DIASPORA),
- DBA::escape(NETWORK_OSTATUS)
+ DBA::escape(Protocol::DFRN),
+ DBA::escape(Protocol::DIASPORA),
+ DBA::escape(Protocol::OSTATUS)
);
if (DBA::isResult($r)) {
$contacts = intval($r[0]['total']);
$istoday = false;
while ($rr = DBA::fetch($s)) {
- if (strlen($rr['name'])) {
+ if (strlen($rr['summary'])) {
$total ++;
}
- $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
+ $strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
if ($strt === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
$istoday = true;
}
$description = L10n::t('[No description]');
}
- $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC');
+ $strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC');
if (substr($strt, 0, 10) < DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
continue;
$urlparts = parse_url($my_url);
$result = Cache::get('gprobe:' . $urlparts['host']);
- if ((!is_null($result)) && (in_array($result['network'], [NETWORK_FEED, NETWORK_PHANTOM]))) {
+ 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;
}
$basepath = $urlarr[0];
if ($basepath != System::baseUrl() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
- goaway($basepath . '/magic' . '?f=&owa=1&dest=' . $dest);
+ $magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest;
+ $serverret = Network::curl($magic_path);
+ if (!empty($serverret['success'])) {
+ goaway($magic_path);
+ }
}
}
}