Merge pull request #8176 from nupplaphil/task/split_emails

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 35cac53d0b660c08fe4907617420dd9230f1fcd6..8be5520138199719fd682c996808608c8dd9f041 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -8,7 +8,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -30,7 +29,7 @@ function display_init(App $a)
                Objects::rawContent();
        }
 
-       if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
+       if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                return;
        }
 
@@ -101,9 +100,9 @@ function display_init(App $a)
                $nickname = str_replace(Strings::normaliseLink(DI::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"]));
 
                if ($nickname != $a->user["nickname"]) {
-                       $profile = DBA::fetchFirst("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+                       $profile = DBA::fetchFirst("SELECT `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",
+                               WHERE `user`.`nickname` = ? AND `contact`.`self` LIMIT 1",
                                $nickname
                        );
                        if (DBA::isResult($profile)) {
@@ -164,7 +163,7 @@ function display_fetchauthor($a, $item)
 
 function display_content(App $a, $update = false, $update_uid = 0)
 {
-       if (Config::get('system','block_public') && !Session::isAuthenticated()) {
+       if (DI::config()->get('system','block_public') && !Session::isAuthenticated()) {
                throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
        }
 
@@ -176,9 +175,9 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $item_id = $_REQUEST['item_id'];
                $item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
                if ($item['uid'] != 0) {
-                       $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+                       $a->profile = ['uid' => intval($item['uid'])];
                } else {
-                       $a->profile = ['uid' => intval($update_uid), 'profile_uid' => intval($update_uid)];
+                       $a->profile = ['uid' => intval($update_uid)];
                }
                $item_parent = $item['parent'];
                $item_parent_uri = $item['parent-uri'];
@@ -250,13 +249,12 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        if (DBA::isResult($parent)) {
                $a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid'];
-               $a->profile['profile_uid'] = ($a->profile['profile_uid'] ?? 0) ?: $parent['uid'];
-               $is_remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
+               $is_remote_contact = Session::getRemoteContactID($a->profile['uid']);
                if ($is_remote_contact) {
                        $item_uid = $parent['uid'];
                }
        } else {
-               $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+               $a->profile = ['uid' => intval($item['uid'])];
        }
 
        $page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
@@ -264,7 +262,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $a->page_contact = $page_contact;
        }
 
-       $is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
+       $is_owner = (local_user() && (in_array($a->profile['uid'], [local_user(), 0])) ? true : false);
 
        if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
                throw new HTTPException\ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.'));
@@ -285,9 +283,9 @@ function display_content(App $a, $update = false, $update_uid = 0)
                ];
                $o .= status_editor($a, $x, 0, true);
        }
-       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid']);
+       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid']);
 
-       if (local_user() && (local_user() == $a->profile['profile_uid'])) {
+       if (local_user() && (local_user() == $a->profile['uid'])) {
                $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
                $unseen = Item::exists($condition);
        } else {
@@ -300,7 +298,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        $condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, $item_uid];
        $fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink', 'author-id', 'owner-id', 'contact-id'];
-       $item = Item::selectFirstForUser($a->profile['profile_uid'], $fields, $condition);
+       $item = Item::selectFirstForUser($a->profile['uid'], $fields, $condition);
 
        if (!DBA::isResult($item)) {
                throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.'));