X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=9550fe25e1776f862de48d01644162f0ad3e4525;hb=303aef34f0804f9becc10610ae85985835f9d9bf;hp=5e5988994cbe0965c58060bb1a0f87239d74f908;hpb=29f7ebe307c22b275466390937b82ccb3820fb1c;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index 5e5988994c..9550fe25e1 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -6,11 +6,13 @@
use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Content\Widget;
+use Friendica\Core\ACL;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
+use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Group;
use Friendica\Model\Item;
@@ -74,10 +76,11 @@ function profile_init(App $a)
}
$a->page['htmlhead'] .= '' . "\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n";
$a->page['htmlhead'] .= '' . "\r\n";
$a->page['htmlhead'] .= '' . "\r\n";
$a->page['htmlhead'] .= '' . "\r\n";
- $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''));
+ $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''));
$a->page['htmlhead'] .= '' . "\r\n";
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
@@ -118,7 +121,6 @@ function profile_content(App $a, $update = 0)
require_once 'include/security.php';
require_once 'include/conversation.php';
- require_once 'include/acl_selectors.php';
require_once 'include/items.php';
$groups = [];
@@ -190,10 +192,6 @@ function profile_content(App $a, $update = 0)
$o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
- if (x($_SESSION, 'new_member') && $is_owner) {
- $o .= '' . L10n::t('Tips for New Members') . '' . EOL;
- }
-
$commpage = $a->profile['page-flags'] == PAGE_COMMUNITY;
$commvisitor = $commpage && $remote_contact;
@@ -213,7 +211,7 @@ function profile_content(App $a, $update = 0)
|| strlen($a->user['deny_cid'])
|| strlen($a->user['deny_gid'])
) ? 'lock' : 'unlock',
- 'acl' => $is_owner ? populate_acl($a->user, true) : '',
+ 'acl' => $is_owner ? ACL::getFullSelectorHTML($a->user, true) : '',
'bang' => '',
'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
'profile_uid' => $a->profile['profile_uid'],
@@ -242,17 +240,14 @@ function profile_content(App $a, $update = 0)
$r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created`
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
- (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE . "'
- OR item.verb = '" . ACTIVITY_DISLIKE . "' OR item.verb = '" . ACTIVITY_ATTEND . "'
- OR item.verb = '" . ACTIVITY_ATTENDNO . "' OR item.verb = '" . ACTIVITY_ATTENDMAYBE . "')
- AND `item`.`moderated` = 0
- AND `item`.`wall` = 1
+ AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ WHERE `item`.`uid` = %d AND `item`.`visible` AND
+ (NOT `item`.`deleted` OR `item`.`gravity` = %d)
+ AND NOT `item`.`moderated` AND `item`.`wall`
$sql_extra4
$sql_extra
ORDER BY `item`.`created` DESC",
- intval($a->profile['profile_uid'])
+ intval($a->profile['profile_uid']), intval(GRAVITY_ACTIVITY)
);
if (!DBM::is_result($r)) {
@@ -288,6 +283,8 @@ function profile_content(App $a, $update = 0)
if (!DBM::is_result($r)) {
$sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
+ } else {
+ $sql_extra3 = "";
}
// check if we serve a mobile device and get the user settings
@@ -336,16 +333,9 @@ function profile_content(App $a, $update = 0)
$parents_arr[] = $rr['item_id'];
}
- $parents_str = implode(', ', $parents_arr);
-
- $items = q(item_query() . " AND `item`.`uid` = %d
- AND `item`.`parent` IN (%s)
- $sql_extra ",
- intval($a->profile['profile_uid']),
- dbesc($parents_str)
- );
-
- $items = conv_sort($items, 'created');
+ $condition = ['uid' => $a->profile['profile_uid'], 'parent' => $parents_arr];
+ $result = Item::selectForUser($a->profile['profile_uid'], [], $condition);
+ $items = conv_sort(Item::inArray($result), 'created');
} else {
$items = [];
}
@@ -357,14 +347,14 @@ function profile_content(App $a, $update = 0)
if ($is_owner) {
- $unseen = dba::exists('item', ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
+ $unseen = DBA::exists('item', ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
if ($unseen) {
$r = Item::update(['unseen' => false],
['wall' => true, 'unseen' => true, 'uid' => local_user()]);
}
}
- $o .= conversation($a, $items, 'profile', $update);
+ $o .= conversation($a, $items, 'profile', $update, false, 'commented', local_user());
if (!$update) {
$o .= alt_pager($a, count($items));