]> git.mxchange.org Git - friendica.git/blobdiff - mod/display.php
Updating after post does now work
[friendica.git] / mod / display.php
index e81e654acb5528e2327d9c94a2d5d10c317d01be..012bc5e61a67cdc5732ee18dea3f792bc8d855f5 100644 (file)
@@ -4,7 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
 use Friendica\Protocol\DFRN;
 
 function display_init(App $a) {
@@ -30,10 +30,11 @@ function display_init(App $a) {
                }
        }
 
+       $r = false;
+
        // If there is only one parameter, then check if this parameter could be a guid
        if ($a->argc == 2) {
                $nick = "";
-               $itemuid = 0;
                $r = false;
 
                // Does the local user have this item?
@@ -44,7 +45,6 @@ function display_init(App $a) {
                                        AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user());
                        if (DBM::is_result($r)) {
                                $nick = $a->user["nickname"];
-                               $itemuid = local_user();
                        }
                }
 
@@ -71,42 +71,51 @@ function display_init(App $a) {
                                        AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
                }
 
-               if (DBM::is_result($r)) {
+               if (!DBM::is_result($r)) {
+                       $a->error = 404;
+                       notice(t('Item not found.') . EOL);
+                       return;
+               }
+       } elseif (($a->argc == 3) && ($nick == '_feed_')) {
+               $r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
+                                       `author-avatar`, `network`, `body`, `uid`, `owner-link`
+                       FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
+                               AND `allow_cid` = ''  AND `allow_gid` = ''
+                               AND `deny_cid`  = '' AND `deny_gid`  = ''
+                               AND NOT `private` AND `uid` = 0
+                               AND `id` = ? LIMIT 1", $a->argv[2]);
+       }
 
-                       if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-                               logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
-                               displayShowFeed($r["id"], false);
-                       }
+       if (DBM::is_result($r)) {
+               if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
+                       logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
+                       displayShowFeed($r["id"], false);
+               }
 
-                       if ($r["id"] != $r["parent"]) {
-                               $r = dba::fetch_first("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` = ?", $r["parent"]);
-                       }
+               if ($r["id"] != $r["parent"]) {
+                       $r = dba::fetch_first("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` = ?", $r["parent"]);
+               }
+
+               $profiledata = display_fetchauthor($a, $r);
+
+               if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) {
+                       $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"]));
 
-                       $profiledata = display_fetchauthor($a, $r);
-
-                       if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) {
-                               $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"]));
-
-                               if (($nickname != $a->user["nickname"])) {
-                                       $r = dba::fetch_first("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` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
-                                               $nickname
-                                       );
-                                       if (DBM::is_result($r)) {
-                                               $profiledata = $r;
-                                       }
-                                       $profiledata["network"] = NETWORK_DFRN;
-                               } else {
-                                       $profiledata = array();
+                       if (($nickname != $a->user["nickname"])) {
+                               $r = dba::fetch_first("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` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
+                                       $nickname
+                               );
+                               if (DBM::is_result($r)) {
+                                       $profiledata = $r;
                                }
+                               $profiledata["network"] = NETWORK_DFRN;
+                       } else {
+                               $profiledata = array();
                        }
-               } else {
-                       $a->error = 404;
-                       notice(t('Item not found.') . EOL);
-                       return;
                }
        }
 
@@ -196,9 +205,9 @@ function display_fetchauthor($a, $item) {
        return($profiledata);
 }
 
-function display_content(App $a, $update = 0) {
+function display_content(App $a, $update = false, $update_uid = 0) {
 
-       if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+       if (Config::get('system','block_public') && !local_user() && !remote_user()) {
                notice(t('Public access denied.') . EOL);
                return;
        }
@@ -218,11 +227,13 @@ function display_content(App $a, $update = 0) {
 
        if ($update) {
                $item_id = $_REQUEST['item_id'];
-               $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
+               $item = dba::select('item', ['uid'], ['id' => $item_id], ['limit' => 1]);
+               $a->profile = array('uid' => intval($item['uid']), 'profile_uid' => intval($item['uid']));
        } else {
                $item_id = (($a->argc > 2) ? $a->argv[2] : 0);
 
                if ($a->argc == 2) {
+                       $item_parent = 0;
                        $nick = "";
 
                        if (local_user()) {
@@ -236,29 +247,29 @@ function display_content(App $a, $update = 0) {
                                }
                        }
 
-                       if ($nick == "") {
-                               $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
+                       if ($item_parent == 0) {
+                               $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent` 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 NOT `item`.`private` AND NOT `user`.`hidewall`
+                                               AND NOT `item`.`private` AND `item`.`uid` = 0
                                                AND `item`.`guid` = ?", $a->argv[1]);
                                if (DBM::is_result($r)) {
                                        $item_id = $r["id"];
                                        $item_parent = $r["parent"];
-                                       $nick = $r["nickname"];
                                }
                        }
-                       if ($nick == "") {
-                               $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent` FROM `item`
+                       if ($item_parent == 0) {
+                               $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
                                        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 NOT `item`.`private` AND `item`.`uid` = 0
+                                               AND NOT `item`.`private` AND NOT `user`.`hidewall`
                                                AND `item`.`guid` = ?", $a->argv[1]);
                                if (DBM::is_result($r)) {
                                        $item_id = $r["id"];
                                        $item_parent = $r["parent"];
+                                       $nick = $r["nickname"];
                                }
                        }
                }
@@ -283,6 +294,10 @@ function display_content(App $a, $update = 0) {
        // We are displaying an "alternate" link if that post was public. See issue 2864
        $is_public = dba::exists('item', array('id' => $item_id, 'private' => false));
        if ($is_public) {
+               // For the atom feed the nickname doesn't matter at all, we only need the item id.
+               if ($nick == '') {
+                       $nick = '_feed_';
+               }
                $alternate = System::baseUrl().'/display/'.$nick.'/'.$item_id.'.atom';
                $conversation = System::baseUrl().'/display/'.$nick.'/'.$item_parent.'/conversation.atom';
        } else {
@@ -333,9 +348,9 @@ function display_content(App $a, $update = 0) {
        if (DBM::is_result($r)) {
                $a->page_contact = $r;
        }
-       $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+       $is_owner = (local_user() && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-       if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+       if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
                notice(t('Access to this profile has been restricted.') . EOL);
                return;
        }
@@ -361,10 +376,9 @@ function display_content(App $a, $update = 0) {
        $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
        if ($update) {
-               $r = dba::p("SELECT `id` FROM `item` WHERE `item`.`uid` = ?
-                       AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
+               $r = dba::p("SELECT `id` FROM `item` WHERE
+                       `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
                        $sql_extra AND `unseen`",
-                       $a->profile['uid'],
                        $item_id
                );
 
@@ -415,7 +429,7 @@ function display_content(App $a, $update = 0) {
                if (!$update) {
                        $o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
                }
-               $o .= conversation($a, $items, 'display', $update);
+               $o .= conversation($a, $items, 'display', $update_uid);
 
                // Preparing the meta header
                require_once('include/bbcode.php');