Merge pull request #9397 from vinzv/9238-red-color-unread-messages-faded

[friendica.git] / src / Module / HoverCard.php

diff --git a/src/Module/HoverCard.php b/src/Module/HoverCard.php
index e8570d73d22ba4abd89e30c22d9ca3db1184809d..ae107ca17229e3bfdef7fea1263f96a53d60be47 100644 (file)
--- a/src/Module/HoverCard.php
+++ b/src/Module/HoverCard.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
@@ -7,7 +26,7 @@ use Friendica\Core\Session;
 use Friendica\DI;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Network\HTTPException;
 
 /**
  * Loads a profile for the HoverCard view
@@ -16,21 +35,23 @@ class HoverCard extends BaseModule
 {
        public static function rawContent(array $parameters = [])
        {
-               $a = self::getApp();
+               $a = DI::app();
 
                if ((local_user()) && ($parameters['action'] ?? '') === 'view') {
                        // A logged in user views a profile of a user
                        $nickname = $a->user['nickname'];
-                       $profile  = $parameters['profile'];
                } elseif (empty($parameters['action'])) {
                        // Show the profile hovercard
                        $nickname = $parameters['profile'];
-                       $profile  = 0;
                } else {
-                       throw new NotFoundException(DI::l10n()->t('No profile'));
+                       throw new HTTPException\NotFoundException(DI::l10n()->t('No profile'));
                }
 
-               Profile::load($a, $nickname, $profile);
+               Profile::load($a, $nickname);
+
+               if (empty($a->profile)) {
+                       throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+               }
 
                $page = DI::page();
 
@@ -58,7 +79,7 @@ class HoverCard extends BaseModule
 
                $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $baseUrl->getHostname() . ($baseUrl->getUrlPath() ? '/' . $baseUrl->getUrlPath() : ''));
 
-               $page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n";
+               $page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . ($a->profile['net-publish'] ? 'true' : 'false') . '" />' . "\r\n";
                $page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $baseUrl->get() . '/dfrn_poll/' . $nickname . '" />' . "\r\n";
                $page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $baseUrl->get() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
                header('Link: <' . $baseUrl->get() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);