Remove fallback contact query from Model\Contact::photoMenu

[friendica.git] / src / Module / Special / HTTPException.php

diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php
index 137b72b36e1be692b93d5e24ae9c812a7ff1ff62..0cd7817ed4de05017a3156d0e98d5ecb1805c7a8 100644 (file)
--- a/src/Module/Special/HTTPException.php
+++ b/src/Module/Special/HTTPException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -45,13 +45,13 @@ class HTTPException
        {
                // Explanations are mostly taken from https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
                $vars = [
-                       '$title' => $e->httpdesc ?: 'Error ' . $e->getCode(),
-                       '$message' => $e->getMessage() ?: $e->explanation,
+                       '$title' => $e->getDescription() ?: 'Error ' . $e->getCode(),
+                       '$message' => $e->getMessage() ?: $e->getExplanation(),
                        '$back' => DI::l10n()->t('Go back'),
                        '$stack_trace' => DI::l10n()->t('Stack trace:'),
                ];
 
-               if (is_site_admin()) {
+               if (DI::app()->isSiteAdmin()) {
                        $vars['$thrown'] = DI::l10n()->t('Exception thrown in %s:%d', $e->getFile(), $e->getLine());
                        $vars['$trace'] = $e->getTraceAsString();
                }
@@ -65,16 +65,25 @@ class HTTPException
         * @param \Friendica\Network\HTTPException $e
         * @throws \Exception
         */
-       public static function rawContent(\Friendica\Network\HTTPException $e)
+       public function rawContent(\Friendica\Network\HTTPException $e)
        {
                $content = '';
 
                if ($e->getCode() >= 400) {
-                       $tpl = Renderer::getMarkupTemplate('http_status.tpl');
-                       $content = Renderer::replaceMacros($tpl, self::getVars($e));
+                       $vars = self::getVars($e);
+                       try {
+                               $tpl = Renderer::getMarkupTemplate('http_status.tpl');
+                               $content = Renderer::replaceMacros($tpl, $vars);
+                       } catch (\Exception $e) {
+                               $content = "<h1>{$vars['$title']}</h1><p>{$vars['$message']}</p>";
+                               if (DI::app()->isSiteAdmin()) {
+                                       $content .= "<p>{$vars['$thrown']}</p>";
+                                       $content .= "<pre>{$vars['$trace']}</pre>";
+                               }
+                       }
                }
 
-               System::httpExit($e->getCode(), $e->httpdesc, $content);
+               System::httpError($e->getCode(), $e->getDescription(), $content);
        }
 
        /**
@@ -84,12 +93,12 @@ class HTTPException
         * @return string
         * @throws \Exception
         */
-       public static function content(\Friendica\Network\HTTPException $e)
+       public function content(\Friendica\Network\HTTPException $e): string
        {
-               header($_SERVER["SERVER_PROTOCOL"] . ' ' . $e->getCode() . ' ' . $e->httpdesc);
+               header($_SERVER["SERVER_PROTOCOL"] . ' ' . $e->getCode() . ' ' . $e->getDescription());
 
                if ($e->getCode() >= 400) {
-                       Logger::debug('Exit with error', ['code' => $e->getCode(), 'description' => $e->httpdesc, 'query' => DI::args()->getQueryString(), 'callstack' => System::callstack(20), 'method' => $_SERVER['REQUEST_METHOD'], 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
+                       Logger::debug('Exit with error', ['code' => $e->getCode(), 'description' => $e->getDescription(), 'query' => DI::args()->getQueryString(), 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
                }
 
                $tpl = Renderer::getMarkupTemplate('exception.tpl');