Don't allow deletion of public posts

[friendica.git] / src / Object / Post.php

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 89f0d47f61e1387e7139e1e6924b27d89c65dacd..a66e48a380b26995c5917d795e69c51d01933592 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -13,7 +13,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 use dba;
@@ -71,7 +70,7 @@ class Post extends BaseObject
                }
 
                $this->writable = $this->getDataValue('writable') || $this->getDataValue('self');
-               $this->redirect_url = 'redir/' . $this->getDataValue('cid');
+               $this->redirect_url = Contact::magicLinkById($this->getDataValue('cid'));
 
                if (!$this->isToplevel()) {
                        $this->threaded = true;
@@ -193,31 +192,30 @@ class Post extends BaseObject
                        '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);
 
+               if ($item['network'] == NETWORK_FEED) {
+                       $item['author-avatar'] = $item['contact-avatar'];
+                       $item['author-name'] = $item['contact-name'];
+                       $item['owner-avatar'] = $item['contact-avatar'];
+                       $item['owner-name'] = $item['contact-name'];
+               }
+
                $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 = $item['author-link'];
                }
 
-               $profile_link = Contact::magicLink($item['author-link']);
+               $profile_link = Contact::magicLinkById($item['author-id']);
                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));
@@ -370,7 +368,7 @@ class Post extends BaseObject
                        '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,
@@ -383,7 +381,7 @@ class Post extends BaseObject
                        '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 : '',
@@ -840,7 +838,7 @@ class Post extends BaseObject
                                        // 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;
@@ -862,14 +860,7 @@ class Post extends BaseObject
                                                $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'));
-                                               }
+                                               $this->owner_url = Contact::magicLinkById($this->getDataValue('owner-id'));
                                        }
                                }
                        }