use Friendica\Core\PConfig;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
-use Friendica\Model\Profile;
+use Friendica\Model\Item;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
use dba;
}
$this->writable = $this->getDataValue('writable') || $this->getDataValue('self');
- $this->redirect_url = 'redir/' . $this->getDataValue('cid');
-
+ $author = ['uid' => 0, 'id' => $this->getDataValue('author-id'),
+ 'network' => $this->getDataValue('author-network'),
+ 'url' => $this->getDataValue('author-link')];
+ $this->redirect_url = Contact::magicLinkbyContact($author);
if (!$this->isToplevel()) {
$this->threaded = true;
}
if (!$origin) {
/// @todo This shouldn't be done as query here, but better during the data creation.
// it is now done here, since during the RC phase we shouldn't make to intense changes.
- $parent = dba::selectFirst('item', ['origin'], ['id' => $item['parent']]);
+ $parent = Item::selectFirst(['origin'], ['id' => $item['parent']]);
if (DBM::is_result($parent)) {
$origin = $parent['origin'];
}
}
// Showing the one or the other text, depending upon if we can only hide it or really delete it.
- $delete = $origin ? L10n::t('Delete') : L10n::t('Remove from your stream');
+ $delete = $origin ? L10n::t('Delete globally') : L10n::t('Remove locally');
$drop = [
'dropping' => $dropping,
'delete' => $delete,
];
- if (!local_user()) {
+ if (!local_user() || ($item['uid'] == 0)) {
$drop = false;
}
$filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? L10n::t("save to folder") : false);
- $diff_author = !link_compare($item['url'], $item['author-link']);
- $profile_name = htmlentities(((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
- if ($item['author-link'] && (!$item['author-name'])) {
+ $profile_name = htmlentities($item['author-name']);
+ if (!empty($item['author-link']) && empty($item['author-name'])) {
$profile_name = $item['author-link'];
}
- $profile_link = Contact::magicLink($item['author-link']);
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $profile_link = Contact::magicLinkbyContact($author);
if (strpos($profile_link, 'redir/') === 0) {
$sparkle = ' sparkle';
}
- if (($item['network'] == NETWORK_FEED) || empty($item['author-thumb'])) {
- $item['author-thumb'] = $item['author-avatar'];
- }
-
- if (($item['network'] == NETWORK_FEED) || empty($item['owner-thumb'])) {
- $item['owner-thumb'] = $item['owner-avatar'];
- }
-
$locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
Addon::callHooks('render_location', $locate);
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
$owner_name_e = $this->getOwnerName();
// Disable features that aren't available in several networks
- if (!in_array($item["item_network"], [NETWORK_DFRN, NETWORK_DIASPORA]) && isset($buttons["dislike"])) {
+ if (!in_array($item["network"], [NETWORK_DFRN, NETWORK_DIASPORA]) && isset($buttons["dislike"])) {
unset($buttons["dislike"]);
$isevent = false;
$tagger = '';
}
- if (($item["item_network"] == NETWORK_FEED) && isset($buttons["like"])) {
+ if (($item["network"] == NETWORK_FEED) && isset($buttons["like"])) {
unset($buttons["like"]);
}
- if (($item["item_network"] == NETWORK_MAIL) && isset($buttons["like"])) {
+ if (($item["network"] == NETWORK_MAIL) && isset($buttons["like"])) {
unset($buttons["like"]);
}
'profile_url' => $profile_link,
'item_photo_menu' => item_photo_menu($item),
'name' => $name_e,
- 'thumb' => $a->remove_baseurl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
+ 'thumb' => $a->remove_baseurl(proxy_url($item['author-avatar'], false, PROXY_SIZE_THUMB)),
'osparkle' => $osparkle,
'sparkle' => $sparkle,
'title' => $title_e,
'indent' => $indent,
'shiny' => $shiny,
'owner_url' => $this->getOwnerUrl(),
- 'owner_photo' => $a->remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
+ 'owner_photo' => $a->remove_baseurl(proxy_url($item['owner-avatar'], false, PROXY_SIZE_THUMB)),
'owner_name' => htmlentities($owner_name_e),
'plink' => get_plink($item),
'edpost' => Feature::isEnabled($conv->getProfileOwner(), 'edit_posts') ? $edpost : '',
'wait' => L10n::t('Please wait'),
'thread_level' => $thread_level,
'edited' => $edited,
- 'network' => $item["item_network"],
- 'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link),
+ 'network' => $item["network"],
+ 'network_name' => ContactSelector::networkToName($item['network'], $profile_link),
'received' => $item['received'],
'commented' => $item['commented'],
'created_date' => $item['created'],
// This will have been stored in $a->page_contact by our calling page.
// Put this person as the wall owner of the wall-to-wall notice.
- $this->owner_url = Profile::zrl($a->page_contact['url']);
+ $this->owner_url = Contact::magicLink($a->page_contact['url']);
$this->owner_photo = $a->page_contact['thumb'];
$this->owner_name = $a->page_contact['name'];
$this->wall_to_wall = true;
$alias_linkmatch = (($this->getDataValue('alias')) && link_compare($this->getDataValue('alias'), $this->getDataValue('author-link')));
$owner_namematch = (($this->getDataValue('owner-name')) && $this->getDataValue('owner-name') == $this->getDataValue('author-name'));
- if ((!$owner_linkmatch) && (!$alias_linkmatch) && (!$owner_namematch)) {
+ if (!$owner_linkmatch && !$alias_linkmatch && !$owner_namematch) {
// The author url doesn't match the owner (typically the contact)
// and also doesn't match the contact alias.
// The name match is a hack to catch several weird cases where URLs are
$this->owner_photo = $this->getDataValue('owner-avatar');
$this->owner_name = $this->getDataValue('owner-name');
$this->wall_to_wall = true;
- // If it is our contact, use a friendly redirect link
- if ($this->getDataValue('network') === NETWORK_DFRN
- && link_compare($this->getDataValue('owner-link'), $this->getDataValue('url'))
- ) {
- $this->owner_url = $this->getRedirectUrl();
- } else {
- $this->owner_url = Profile::zrl($this->getDataValue('owner-link'));
- }
+
+ $owner = ['uid' => 0, 'id' => $this->getDataValue('owner-id'),
+ 'network' => $this->getDataValue('owner-network'),
+ 'url' => $this->getDataValue('owner-link')];
+ $this->owner_url = Contact::magicLinkbyContact($owner);
}
}
}
projects / friendica.git / blobdiff