X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FProfile.php;h=cb710b10ba97bee752cc13cd3dcf7aab7156603c;hb=5f80180b47679a81433e084448b9df7d96648506;hp=9bc52af7a98535ec3cef3c5bcddc4bfa4c79a546;hpb=b9ab6137776f39db3d01481cb6a7d5f6a1634be5;p=friendica.git
diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 9bc52af7a9..cb710b10ba 100644
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -48,8 +48,6 @@ class Profile extends BaseModule
if (local_user() && $a->argc > 2 && $a->argv[2] === 'view') {
self::$which = $a->user['nickname'];
self::$profile = filter_var($a->argv[1], FILTER_SANITIZE_NUMBER_INT);
- } else {
- DFRN::autoRedir($a, self::$which);
}
}
@@ -57,21 +55,22 @@ class Profile extends BaseModule
{
if (ActivityPub::isRequest()) {
$user = DBA::selectFirst('user', ['uid'], ['nickname' => self::$which]);
- $data = [];
if (DBA::isResult($user)) {
+ // The function returns an empty array when the account is removed, expired or blocked
$data = ActivityPub\Transmitter::getProfile($user['uid']);
+ if (!empty($data)) {
+ System::jsonExit($data, 'application/activity+json');
+ }
}
- if (!empty($data)) {
- System::jsonExit($data, 'application/activity+json');
- } elseif (DBA::exists('userd', ['username' => self::$which])) {
+ if (DBA::exists('userd', ['username' => self::$which])) {
// Known deleted user
$data = ActivityPub\Transmitter::getDeletedUser(self::$which);
System::jsonError(410, $data);
} else {
// Any other case (unknown, blocked, unverified, expired, no profile, no self contact)
- System::jsonError(404, $data);
+ System::jsonError(404, []);
}
}
}
@@ -83,11 +82,13 @@ class Profile extends BaseModule
if (!$update) {
ProfileModel::load($a, self::$which, self::$profile);
- $blocked = !local_user() && !remote_user() && Config::get('system', 'block_public');
- $userblock = !local_user() && !remote_user() && $a->profile['hidewall'];
+ $a->page['htmlhead'] .= "\n";
+
+ $blocked = !local_user() && !Session::getRemoteContactID($a->profile['profile_uid']) && Config::get('system', 'block_public');
+ $userblock = !local_user() && !Session::getRemoteContactID($a->profile['profile_uid']) && $a->profile['hidewall'];
if (!empty($a->profile['page-flags']) && $a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY) {
- $a->page['htmlhead'] .= '';
+ $a->page['htmlhead'] .= '' . "\n";
}
if (!empty($a->profile['openidserver'])) {
@@ -108,6 +109,11 @@ class Profile extends BaseModule
}
$a->page['htmlhead'] .= '' . "\n";
+
+ if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
+ $a->page['htmlhead'] .= '' . "\n";
+ }
+
$a->page['htmlhead'] .= '' . "\n";
$a->page['htmlhead'] .= '' . "\n";
$a->page['htmlhead'] .= '' . "\n";
@@ -145,13 +151,10 @@ class Profile extends BaseModule
$hashtags = defaults($_GET, 'tag', '');
- if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+ if (Config::get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->profile['profile_uid'])) {
return Login::form();
}
- $groups = [];
- $remote_cid = null;
-
$o = '';
if ($update) {
@@ -161,17 +164,9 @@ class Profile extends BaseModule
Nav::setSelected('home');
}
- $remote_contact = ContactModel::isFollower(remote_user(), $a->profile['profile_uid']);
+ $remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
$is_owner = local_user() == $a->profile['profile_uid'];
- $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
-
- if ($remote_contact) {
- $cdata = ContactModel::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
- if (!empty($cdata['user'])) {
- $groups = Group::getIdsByContactId($cdata['user']);
- $remote_cid = $cdata['user'];
- }
- }
+ $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . $remote_contact;
if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
notice(L10n::t('Access to this profile has been restricted.') . EOL);
@@ -221,7 +216,7 @@ class Profile extends BaseModule
}
// Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
- $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid'], $remote_contact, $groups, $remote_cid);
+ $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid']);
$sql_extra2 = '';
$last_updated_array = Session::get('last_updated', []);
@@ -252,7 +247,7 @@ class Profile extends BaseModule
AND `item`.`wall`
$sql_extra4
$sql_extra
- ORDER BY `item`.`created` DESC",
+ ORDER BY `item`.`received` DESC",
$a->profile['profile_uid'],
GRAVITY_ACTIVITY
);
@@ -276,10 +271,10 @@ class Profile extends BaseModule
}
if (!empty($datequery)) {
- $sql_extra2 .= Strings::protectSprintf(sprintf(" AND `thread`.`created` <= '%s' ", DBA::escape(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
+ $sql_extra2 .= Strings::protectSprintf(sprintf(" AND `thread`.`received` <= '%s' ", DBA::escape(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
}
if (!empty($datequery2)) {
- $sql_extra2 .= Strings::protectSprintf(sprintf(" AND `thread`.`created` >= '%s' ", DBA::escape(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
+ $sql_extra2 .= Strings::protectSprintf(sprintf(" AND `thread`.`received` >= '%s' ", DBA::escape(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
}
// Does the profile page belong to a forum?
@@ -326,7 +321,7 @@ class Profile extends BaseModule
$sql_extra3
$sql_extra
$sql_extra2
- ORDER BY `thread`.`created` DESC
+ ORDER BY `thread`.`received` DESC
$pager_sql",
$a->profile['profile_uid']
);
@@ -351,7 +346,7 @@ class Profile extends BaseModule
$items = DBA::toArray($items_stmt);
- $o .= conversation($a, $items, $pager, 'profile', $update, false, 'created', $a->profile['profile_uid']);
+ $o .= conversation($a, $items, $pager, 'profile', $update, false, 'received', $a->profile['profile_uid']);
if (!$update) {
$o .= $pager->renderMinimal(count($items));