X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=d07631dced8c592512e8898364476eecd221530b;hb=0e01568ccd5b5ce081eff83e2ed0b888e0b6db55;hp=c2167b3bd64857021ba3ada088d1e27964689da1;hpb=a6fb3568f989f72164b435baafc63a174397b542;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index c2167b3bd6..d07631dced 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -5,24 +5,31 @@
use Friendica\App;
use Friendica\Content\Nav;
+use Friendica\Content\Pager;
use Friendica\Content\Widget;
use Friendica\Core\ACL;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Module\Login;
+use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\DFRN;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Security;
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
function profile_init(App $a)
{
- if (!x($a->page, 'aside')) {
+ if (empty($a->page['aside'])) {
$a->page['aside'] = '';
}
@@ -31,9 +38,9 @@ function profile_init(App $a)
} else {
$r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1");
if (DBA::isResult($r)) {
- goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
+ $a->internalRedirect('profile/' . $r[0]['nickname']);
} else {
- logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
+ Logger::log('profile error: mod_profile ' . $a->query_string, Logger::DEBUG);
notice(L10n::t('Requested profile is not available.') . EOL);
$a->error = 404;
return;
@@ -48,20 +55,30 @@ function profile_init(App $a)
DFRN::autoRedir($a, $which);
}
+ if (ActivityPub::isRequest()) {
+ $user = DBA::selectFirst('user', ['uid'], ['nickname' => $which]);
+ if (DBA::isResult($user)) {
+ $data = ActivityPub\Transmitter::getProfile($user['uid']);
+ echo json_encode($data);
+ header('Content-Type: application/activity+json');
+ exit();
+ }
+ }
+
Profile::load($a, $which, $profile);
$blocked = !local_user() && !remote_user() && Config::get('system', 'block_public');
$userblock = !local_user() && !remote_user() && $a->profile['hidewall'];
- if (x($a->profile, 'page-flags') && $a->profile['page-flags'] == PAGE_COMMUNITY) {
+ if (!empty($a->profile['page-flags']) && $a->profile['page-flags'] == Contact::PAGE_COMMUNITY) {
$a->page['htmlhead'] .= '';
}
- if (x($a->profile, 'openidserver')) {
+ if (!empty($a->profile['openidserver'])) {
$a->page['htmlhead'] .= '' . "\r\n";
}
- if (x($a->profile, 'openid')) {
+ if (!empty($a->profile['openid'])) {
$delegate = strstr($a->profile['openid'], '://') ? $a->profile['openid'] : 'https://' . $a->profile['openid'];
$a->page['htmlhead'] .= '' . "\r\n";
}
@@ -79,7 +96,7 @@ function profile_init(App $a)
$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->urlpath ? '/' . $a->urlpath : ''));
+ $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''));
$a->page['htmlhead'] .= '' . "\r\n";
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
@@ -98,9 +115,9 @@ function profile_content(App $a, $update = 0)
for ($x = 2; $x < $a->argc; $x ++) {
if (is_a_date_arg($a->argv[$x])) {
if ($datequery) {
- $datequery2 = escape_tags($a->argv[$x]);
+ $datequery2 = Strings::escapeTags($a->argv[$x]);
} else {
- $datequery = escape_tags($a->argv[$x]);
+ $datequery = Strings::escapeTags($a->argv[$x]);
}
} else {
$category = $a->argv[$x];
@@ -108,7 +125,7 @@ function profile_content(App $a, $update = 0)
}
}
- if (!x($category)) {
+ if (empty($category)) {
$category = defaults($_GET, 'category', '');
}
@@ -118,7 +135,6 @@ function profile_content(App $a, $update = 0)
return Login::form();
}
- require_once 'include/security.php';
require_once 'include/conversation.php';
require_once 'include/items.php';
@@ -139,7 +155,7 @@ function profile_content(App $a, $update = 0)
$contact_id = 0;
- if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
+ if (!empty($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $v) {
if ($v['uid'] == $a->profile['profile_uid']) {
$contact_id = $v['cid'];
@@ -170,15 +186,15 @@ function profile_content(App $a, $update = 0)
$is_owner = local_user() == $a->profile['profile_uid'];
$last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
- if (x($a->profile, 'hidewall') && !$is_owner && !$remote_contact) {
+ if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
notice(L10n::t('Access to this profile has been restricted.') . EOL);
return;
}
if (!$update) {
$tab = false;
- if (x($_GET, 'tab')) {
- $tab = notags(trim($_GET['tab']));
+ if (!empty($_GET['tab'])) {
+ $tab = Strings::removeTags(trim($_GET['tab']));
}
$o .= Profile::getTabs($a, $is_owner, $a->profile['nickname']);
@@ -191,14 +207,14 @@ function profile_content(App $a, $update = 0)
$o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
- $commpage = $a->profile['page-flags'] == PAGE_COMMUNITY;
+ $commpage = $a->profile['page-flags'] == Contact::PAGE_COMMUNITY;
$commvisitor = $commpage && $remote_contact;
$a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'], true);
- $a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (x($category) ? xmlify($category) : ''));
+ $a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (!empty($category) ? XML::escape($category) : ''));
$a->page['aside'] .= Widget::tagCloud();
- if (can_write_wall($a->profile['profile_uid'])) {
+ if (Security::canWriteToUserWall($a->profile['profile_uid'])) {
$x = [
'is_owner' => $is_owner,
'allow_location' => ($is_owner || $commvisitor) && $a->profile['allow_location'],
@@ -222,11 +238,11 @@ function profile_content(App $a, $update = 0)
// 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_permissions_sql($a->profile['profile_uid'], $remote_contact, $groups);
+ $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid'], $remote_contact, $groups);
$sql_extra2 = '';
if ($update) {
- $last_updated = (x($_SESSION['last_updated'], $last_updated_key) ? $_SESSION['last_updated'][$last_updated_key] : 0);
+ $last_updated = (!empty($_SESSION['last_updated'][$last_updated_key]) ? $_SESSION['last_updated'][$last_updated_key] : 0);
// If the page user is the owner of the page we should query for unseen
// items. Otherwise use a timestamp of the last succesful update request.
@@ -237,7 +253,7 @@ function profile_content(App $a, $update = 0)
$sql_extra4 = " AND `item`.`received` > '" . $gmupdate . "'";
}
- $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created`
+ $items = q("SELECT DISTINCT(`parent-uri`) AS `uri`
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
WHERE `item`.`uid` = %d AND `item`.`visible` AND
@@ -249,38 +265,33 @@ function profile_content(App $a, $update = 0)
intval($a->profile['profile_uid']), intval(GRAVITY_ACTIVITY)
);
- if (!DBA::isResult($r)) {
+ if (!DBA::isResult($items)) {
return '';
}
} else {
$sql_post_table = "";
- if (x($category)) {
+ if (!empty($category)) {
$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
DBA::escape(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($a->profile['profile_uid']));
}
- if (x($hashtags)) {
+ if (!empty($hashtags)) {
$sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
DBA::escape(protect_sprintf($hashtags)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval($a->profile['profile_uid']));
}
- if ($datequery) {
+ if (!empty($datequery)) {
$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", DBA::escape(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
}
- if ($datequery2) {
+ if (!empty($datequery2)) {
$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", DBA::escape(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
}
- // Belongs the profile page to a forum?
+ // Does the profile page belong to a forum?
// If not then we can improve the performance with an additional condition
- $r = q("SELECT `uid` FROM `user` WHERE `uid` = %d AND `page-flags` IN (%d, %d)",
- intval($a->profile['profile_uid']),
- intval(PAGE_COMMUNITY),
- intval(PAGE_PRVGROUP)
- );
-
- if (!DBA::isResult($r)) {
+ $condition = ['uid' => $a->profile['profile_uid'], 'page-flags' => [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP]];
+ if (!DBA::exists('user', $condition)) {
$sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
} else {
$sql_extra3 = "";
@@ -300,11 +311,11 @@ function profile_content(App $a, $update = 0)
$itemspage_network = $a->force_max_items;
}
- $a->set_pager_itemspage($itemspage_network);
+ $pager = new Pager($a->query_string, $itemspage_network);
- $pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
+ $pager_sql = sprintf(" LIMIT %d, %d ", $pager->getStart(), $pager->getItemsPerPage());
- $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`
+ $items = q("SELECT `item`.`uri`
FROM `thread`
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
$sql_post_table
@@ -320,43 +331,27 @@ function profile_content(App $a, $update = 0)
);
}
- $parents_arr = [];
- $parents_str = '';
-
// Set a time stamp for this page. We will make use of it when we
// search for new items (update routine)
$_SESSION['last_updated'][$last_updated_key] = time();
- if (DBA::isResult($r)) {
- foreach ($r as $rr) {
- $parents_arr[] = $rr['item_id'];
- }
-
- $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 = [];
- }
-
if ($is_owner && !$update && !Config::get('theme', 'hide_eventlist')) {
$o .= Profile::getBirthdays();
$o .= Profile::getEventsReminderHTML();
}
-
if ($is_owner) {
- $unseen = DBA::exists('item', ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
+ $unseen = Item::exists(['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, false, 'commented', local_user());
+ $o .= conversation($a, $items, $pager, 'profile', $update, false, 'created', local_user());
if (!$update) {
- $o .= alt_pager($a, count($items));
+ $o .= $pager->renderMinimal(count($items));
}
return $o;