// Does the local user have this item?
if (local_user()) {
- $r = q("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid` FROM `item`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ $r = q("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
+ WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
if (count($r)) {
$nick = $a->user["nickname"];
// Or is it anywhere on the server?
if ($nick == "") {
$r = q("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`,
- `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`body`
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
- AND `item`.`private` = 0 AND NOT `user`.`hidewall`
+ AND NOT `item`.`private` AND NOT `user`.`hidewall`
AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
- // AND `item`.`private` = 0 AND `item`.`wall` = 1
+ // AND NOT `item`.`private` AND `item`.`wall`
if (count($r)) {
$nick = $r[0]["nickname"];
$itemuid = $r[0]["uid"];
// Is it an item with uid=0?
if ($nick == "") {
- $r = q("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`,
- `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`body`
- FROM `item` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ $r = q("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
+ `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
+ FROM `item` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
- AND `item`.`private` = 0 AND `item`.`uid` = 0
+ AND NOT `item`.`private` AND `item`.`uid` = 0
AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
- // AND `item`.`private` = 0 AND `item`.`wall` = 1
+ // AND NOT `item`.`private` AND `item`.`wall`
}
if (count($r)) {
if ($r[0]["id"] != $r[0]["parent"])
- $r = q("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid` FROM `item`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ $r = q("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
+ WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `id` = %d", $r[0]["parent"]);
+ if (($itemuid != local_user()) AND local_user()) {
+ // Do we know this contact but we haven't got this item?
+ // Copy the wohle thread to our local storage so that we can interact.
+ // We really should change this need for the future since it scales very bad.
+ $contactid = get_contact($r[0]['owner-link'], local_user());
+ if ($contactid) {
+ $items = q("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id`", intval($r[0]["id"]));
+ foreach ($items AS $item) {
+ $itemcontactid = get_contact($item['owner-link'], local_user());
+ if (!$itemcontactid)
+ $itemcontactid = $contactid;
+
+ unset($item['id']);
+ $item['uid'] = local_user();
+ $item['origin'] = 0;
+ $item['contact-id'] = $itemcontactid;
+ $local_copy = item_store($item, false, false, true);
+ logger("Stored local copy for post ".$item['guid']." under id ".$local_copy, LOGGER_DEBUG);
+ }
+ }
+ }
+
$profiledata = display_fetchauthor($a, $r[0]);
if (strstr(normalise_link($profiledata["url"]), normalise_link($a->get_baseurl()))) {
if (($nickname != $a->user["nickname"])) {
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
- WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
+ WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
dbesc($nickname)
);
if (count($r))
}
function display_fetchauthor($a, $item) {
- require_once("mod/proxy.php");
- require_once("include/bbcode.php");
$profiledata = array();
$profiledata["uid"] = -1;
$profiledata["nickname"] = $item["author-name"];
$profiledata["name"] = $item["author-name"];
$profiledata["picdate"] = "";
- $profiledata["photo"] = proxy_url($item["author-avatar"]);
+ $profiledata["photo"] = $item["author-avatar"];
$profiledata["url"] = $item["author-link"];
$profiledata["network"] = $item["network"];
}
if (!$skip) {
- $author = "";
- preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ $author = "";
+ preg_match("/author='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
- preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ preg_match('/author="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
- $profile = "";
- preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ $profile = "";
+ preg_match("/profile='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
$profiledata["url"] = $matches[1];
- preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ preg_match('/profile="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
$profiledata["url"] = $matches[1];
- $avatar = "";
- preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ $avatar = "";
+ preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
$profiledata["photo"] = $matches[1];
preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
$profiledata["about"] = "";
}
- // Fetching further contact data from the contact table
- $r = q("SELECT `uid`, `network`, `photo`, `nick`, `location`, `about` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `network` = '%s'",
- dbesc(normalise_link($profiledata["url"])), intval($item["uid"]), dbesc($item["network"]));
-
- if (!count($r))
- $r = q("SELECT `uid`, `network`, `photo`, `nick`, `location`, `about` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
- dbesc(normalise_link($profiledata["url"])), intval($item["uid"]));
+ // Don't show details from Diaspora contacts if you don't follow the contact
+ $showdetails = ($profiledata["network"] != NETWORK_DIASPORA);
+ // Fetching further contact data from the contact table
+ $r = q("SELECT `uid`, `network`, `name`, `photo`, `nick`, `addr`, `location`, `about`, `gender`, `keywords`
+ FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)",
+ dbesc(normalise_link($profiledata["url"])), intval(local_user()), dbesc($item["network"]),
+ intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
if (!count($r))
- $r = q("SELECT `uid`, `network`, `photo`, `nick`, `location`, `about` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
- dbesc(normalise_link($profiledata["url"])));
+ $r = q("SELECT `uid`, `network`, `name`, `photo`, `nick`, `addr`, `location`, `about`, `gender`, `keywords`
+ FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `rel` IN (%d, %d)",
+ dbesc(normalise_link($profiledata["url"])), intval(local_user()),
+ intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
if (count($r)) {
- if ((($r[0]["uid"] != local_user()) OR !local_user()) AND ($profiledata["network"] == NETWORK_DIASPORA)) {
- $r[0]["location"] = "";
- $r[0]["about"] = "";
+ $profiledata["name"] = $r[0]["name"];
+ $profiledata["photo"] = $r[0]["photo"];
+ $profiledata["nickname"] = $r[0]["nick"];
+ $profiledata["addr"] = $r[0]["addr"];
+ $profiledata["keywords"] = $r[0]["keywords"];
+ $profiledata["network"] = $r[0]["network"];
+
+ if (local_user() OR $showdetails) {
+ $showdetails = true;
+ $profiledata["address"] = $r[0]["location"];
+ $profiledata["about"] = $r[0]["about"];
+ $profiledata["gender"] = $r[0]["gender"];
}
-
- $profiledata["photo"] = proxy_url($r[0]["photo"]);
- $profiledata["address"] = bbcode($r[0]["location"]);
- $profiledata["about"] = bbcode($r[0]["about"]);
- if ($r[0]["nick"] != "")
- $profiledata["nickname"] = $r[0]["nick"];
}
- // Fetching profile data from unique contacts
- $r = q("SELECT `avatar`, `nick`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'", dbesc(normalise_link($profiledata["url"])));
- if (count($r)) {
- if ($profiledata["photo"] == "")
- $profiledata["photo"] = proxy_url($r[0]["avatar"]);
- if (($profiledata["address"] == "") AND ($profiledata["network"] != NETWORK_DIASPORA))
- $profiledata["address"] = bbcode($r[0]["location"]);
- if (($profiledata["about"] == "") AND ($profiledata["network"] != NETWORK_DIASPORA))
- $profiledata["about"] = bbcode($r[0]["about"]);
- if (($profiledata["nickname"] == "") AND ($r[0]["nick"] != ""))
+ // Fetching profile data from global contacts
+ if ($profiledata["network"] != NETWORK_FEED) {
+ $r = q("SELECT `name`, `photo`, `nick`, `addr`, `location`, `about`, `gender`, `keywords`, `network` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profiledata["url"])));
+ if (count($r)) {
+ $profiledata["name"] = $r[0]["name"];
+ $profiledata["photo"] = $r[0]["photo"];
$profiledata["nickname"] = $r[0]["nick"];
+ $profiledata["addr"] = $r[0]["addr"];
+ $profiledata["network"] = $r[0]["network"];
+
+ if ($r[0]["keywords"])
+ $profiledata["keywords"] = $r[0]["keywords"];
+
+ if ($showdetails) {
+ if ($r[0]["location"])
+ $profiledata["address"] = $r[0]["location"];
+
+ if ($r[0]["about"])
+ $profiledata["about"] = $r[0]["about"];
+
+ if ($r[0]["gender"])
+ $profiledata["gender"] = $r[0]["gender"];
+ }
+ }
}
if (local_user()) {
return;
}
- require_once("include/bbcode.php");
require_once('include/security.php');
require_once('include/conversation.php');
require_once('include/acl_selectors.php');
if (local_user()) {
$r = q("SELECT `id` FROM `item`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
if (count($r)) {
$item_id = $r[0]["id"];
if ($nick == "") {
$r = q("SELECT `user`.`nickname`, `item`.`id` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
- AND `item`.`private` = 0 AND NOT `user`.`hidewall`
+ AND NOT `item`.`private` AND NOT `user`.`hidewall`
AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
- // AND `item`.`private` = 0 AND `item`.`wall` = 1
+ // AND NOT `item`.`private` AND `item`.`wall`
if (count($r)) {
$item_id = $r[0]["id"];
$nick = $r[0]["nickname"];
}
if ($nick == "") {
$r = q("SELECT `item`.`id` FROM `item`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
- AND `item`.`private` = 0 AND `item`.`uid` = 0
+ AND NOT `item`.`private` AND `item`.`uid` = 0
AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
- // AND `item`.`private` = 0 AND `item`.`wall` = 1
+ // AND NOT `item`.`private` AND `item`.`wall`
if (count($r)) {
$item_id = $r[0]["id"];
}
}
}
- if(! $item_id) {
+ if ($item_id AND !is_numeric($item_id)) {
+ $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($item_id), intval($a->profile['uid']));
+ if ($r)
+ $item_id = $r[0]["id"];
+ else
+ $item_id = false;
+ }
+
+ if (!$item_id) {
$a->error = 404;
- notice( t('Item not found.') . EOL);
+ notice(t('Item not found.').EOL);
return;
}
+
$groups = array();
$contact = null;
}
}
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval($a->profile['uid'])
);
if(count($r))
return;
}
+ // We need the editor here to be able to reshare an item.
+
if ($is_owner) {
$x = array(
'is_owner' => true,
$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
- // AND `item`.`parent` = ( SELECT `parent` FROM `item` FORCE INDEX (PRIMARY, `uri`) WHERE ( `id` = '%s' OR `uri` = '%s' ))
-
if($update) {
- $r = q("SELECT id FROM item WHERE item.uid = %d
- AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE (`id` = '%s' OR `uri` = '%s'))
- $sql_extra AND unseen = 1",
- intval($a->profile['uid']),
- dbesc($item_id),
- dbesc($item_id)
+ $r = q("SELECT `id` FROM `item` WHERE `item`.`uid` = %d
+ AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
+ $sql_extra AND `unseen`",
+ intval($a->profile['uid']),
+ intval($item_id)
);
if(!$r)
return '';
}
- // AND `item`.`parent` = ( SELECT `parent` FROM `item` FORCE INDEX (PRIMARY, `uri`) WHERE ( `id` = '%s' OR `uri` = '%s' )
-
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
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
- and `item`.`moderated` = 0
- AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE (`id` = '%s' OR `uri` = '%s')
- AND uid = %d)
+ AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
+ AND NOT `item`.`moderated`
+ AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
$sql_extra
ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
intval($a->profile['uid']),
- dbesc($item_id),
- dbesc($item_id),
- intval($a->profile['uid'])
+ intval($item_id)
);
if(!$r && local_user()) {
// Check if this is another person's link to a post that we have
$r = q("SELECT `item`.uri FROM `item`
- WHERE (`item`.`id` = '%s' OR `item`.`uri` = '%s' )
+ WHERE (`item`.`id` = %d OR `item`.`uri` = '%s')
LIMIT 1",
- dbesc($item_id),
+ intval($item_id),
dbesc($item_id)
);
if($r) {
$item_uri = $r[0]['uri'];
- // AND `item`.`parent` = ( SELECT `parent` FROM `item` FORCE INDEX (PRIMARY, `uri`) WHERE `uri` = '%s' AND uid = %d )
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
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
- and `item`.`moderated` = 0
+ AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
+ AND NOT `item`.`moderated`
AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = '%s' AND uid = %d)
ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
intval(local_user()),
if($r) {
if((local_user()) && (local_user() == $a->profile['uid'])) {
- q("UPDATE `item` SET `unseen` = 0
- WHERE `parent` = %d AND `unseen` = 1",
- intval($r[0]['parent'])
- );
+ $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `parent` = %d",
+ intval($r[0]['parent']));
+
+ if ($unseen)
+ q("UPDATE `item` SET `unseen` = 0
+ WHERE `parent` = %d AND `unseen`",
+ intval($r[0]['parent'])
+ );
}
$items = conv_sort($r,"`commented`");
projects / friendica.git / blobdiff