Merge pull request 'Bluesky: Fix adding a new account' (#1442) from heluecht/friendic...

[friendica-addons.git] / rendertime / rendertime.php

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index f433c3a4ab81dcf68ee235c7bc5ba1dd7aca6cfc..731cf0037741fd618cda3f9fefde71751fedd95b 100644 (file)
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -7,6 +7,7 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -16,15 +17,18 @@ function rendertime_install() {
        DI::config()->set('system', 'profiler', true);
 }
 
-function rendertime_uninstall() {
+function rendertime_uninstall()
+{
        DI::config()->delete('system', 'profiler');
 }
 
-function rendertime_init_1(&$a) {
+function rendertime_init_1()
+{
 }
 
-function rendertime_addon_admin(&$a, &$o) {
-       $t = Renderer::getMarkupTemplate("admin.tpl", "addon/rendertime/");
+function rendertime_addon_admin(string &$o)
+{
+       $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/rendertime/');
 
        $o = Renderer::replaceMacros($t, [
                '$submit' => DI::l10n()->t('Save Settings'),
@@ -33,26 +37,28 @@ function rendertime_addon_admin(&$a, &$o) {
        ]);
 }
 
-function rendertime_addon_admin_post(&$a) {
+function rendertime_addon_admin_post()
+{
        DI::config()->set('rendertime', 'callstack', $_POST['callstack'] ?? false);
        DI::config()->set('rendertime', 'minimal_time', $_POST['minimal_time'] ?? 0);
 }
 
 /**
- * @param Friendica\App $a
  * @param string $o
  */
-function rendertime_page_end(Friendica\App $a, &$o)
+function rendertime_page_end(string &$o)
 {
-
        $profiler = DI::profiler();
 
        $duration = microtime(true) - $profiler->get('start');
 
-       $ignored_modules = ["fbrowser"];
-       $ignored = in_array(DI::args()->getModuleName(), $ignored_modules);
+       $ignored_modules = [
+               \Friendica\Module\Media\Photo\Browser::class,
+               \Friendica\Module\Media\Attachment\Browser::class,
+       ];
+       $ignored = in_array(DI::router()->getModuleClass(), $ignored_modules);
 
-       if ($a->isSiteAdmin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) {
+       if (DI::userSession()->isSiteAdmin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) {
 
                $o = $o . '<div class="renderinfo">' . DI::l10n()->t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
                                round($profiler->get('database') - $profiler->get('database_write'), 3),
@@ -82,7 +88,7 @@ function rendertime_page_end(Friendica\App $a, &$o)
 
                if ($profiler->isRendertime()) {
                        $o .= '<pre>';
-                       $o .= $profiler->getRendertimeString(DI::config()->get('rendertime', 'minimal_time', 0));
+                       $o .= $profiler->getRendertimeString(floatval(DI::config()->get('rendertime', 'minimal_time', 0)));
                        $o .= '</pre>';
                }
        }