Unneeded logging removed

[friendica.git] / src / App / Page.php

diff --git a/src/App/Page.php b/src/App/Page.php
index 6252d9a88aea17af5656df43f9f75294eb3c8146..71f75df15763666b8f98fabe7cba0ac22e805eac 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -36,9 +36,11 @@ use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
+use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -244,10 +246,12 @@ class Page implements ArrayAccess
                 */
                $this->page['htmlhead'] = Renderer::replaceMacros($tpl, [
                        '$l10n' => [
-                               'delitem'        => $l10n->t('Delete this item?'),
-                               'blockAuthor'    => $l10n->t('Block this author? They won\'t be able to follow you nor see your public posts, and you won\'t be able to see their posts and their notifications.'),
-                               'ignoreAuthor'   => $l10n->t('Ignore this author? You won\'t be able to see their posts and their notifications.'),
-                               'collapseAuthor' => $l10n->t('Collapse this author\'s posts?'),
+                               'delitem'          => $l10n->t('Delete this item?'),
+                               'blockAuthor'      => $l10n->t("Block this author? They won't be able to follow you nor see your public posts, and you won't be able to see their posts and their notifications."),
+                               'ignoreAuthor'     => $l10n->t("Ignore this author? You won't be able to see their posts and their notifications."),
+                               'collapseAuthor'   => $l10n->t("Collapse this author's posts?"),
+                               'ignoreServer'     => $l10n->t("Ignore this author's server?"),
+                               'ignoreServerDesc' => $l10n->t("You won't see any content from this server including reshares in your Network page, the community pages and individual conversations."),
 
                                'likeError'     => $l10n->t('Like not successful'),
                                'dislikeError'  => $l10n->t('Dislike not successful'),
@@ -279,7 +283,7 @@ class Page implements ArrayAccess
                        '$stylesheets'     => $this->stylesheets,
 
                        // Dropzone
-                       '$max_imagesize' => round(\Friendica\Util\Strings::getBytesFromShorthand($config->get('system', 'maximagesize')) / 1000000, 1),
+                       '$max_imagesize' => round(Images::getMaxUploadBytes() / 1000000, 0),
 
                ]) . $this->page['htmlhead'];
        }
@@ -398,36 +402,6 @@ class Page implements ArrayAccess
                $this->footerScripts[] = trim($url, '/');
        }
 
-       /**
-        * Directly exit with the current response (include setting all headers)
-        *
-        * @param ResponseInterface $response
-        */
-       public function exit(ResponseInterface $response)
-       {
-               header(sprintf("HTTP/%s %s %s",
-                       $response->getProtocolVersion(),
-                       $response->getStatusCode(),
-                       $response->getReasonPhrase())
-               );
-
-               foreach ($response->getHeaders() as $key => $header) {
-                       if (is_array($header)) {
-                               $header_str = implode(',', $header);
-                       } else {
-                               $header_str = $header;
-                       }
-
-                       if (empty($key)) {
-                               header($header_str);
-                       } else {
-                               header("$key: $header_str");
-                       }
-               }
-
-               echo $response->getBody();
-       }
-
        /**
         * Executes the creation of the current page and prints it to the screen
         *
@@ -499,20 +473,6 @@ class Page implements ArrayAccess
                        $this->page['nav']      = $nav->getHtml();
                }
 
-               foreach ($response->getHeaders() as $key => $header) {
-                       if (is_array($header)) {
-                               $header_str = implode(',', $header);
-                       } else {
-                               $header_str = $header;
-                       }
-
-                       if (empty($key)) {
-                               header($header_str);
-                       } else {
-                               header("$key: $header_str");
-                       }
-               }
-
                // Build the page - now that we have all the components
                if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
                        $doc = new DOMDocument();
@@ -537,7 +497,9 @@ class Page implements ArrayAccess
                        }
 
                        if ($_GET["mode"] == "raw") {
-                               System::httpExit(substr($target->saveHTML(), 6, -8), Response::TYPE_HTML);
+                               $response->withBody(Utils::streamFor($target->saveHTML()));
+                               System::echoResponse($response);
+                               System::exit();
                        }
                }
 
@@ -583,6 +545,10 @@ class Page implements ArrayAccess
                // Used as is in view/php/default.php
                $lang = $l10n->getCurrentLang();
 
+               ob_start();
                require_once $template;
+               $body = ob_get_clean();
+
+               return $response->withBody(Utils::streamFor($body));
        }
 }