X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=rendertime%2Frendertime.php;h=627c8cd9a8e2a2f2210817469f03abd38e733f1f;hb=46de1b8b89980513d50275d9d8c78681dff82b56;hp=50c0ad5a947df8dd400a10cebcca29f3075b1b51;hpb=0d2481408602b659c1c6e71d847032e73d9a4080;p=friendica-addons.git

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 50c0ad5a..627c8cd9 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -8,18 +8,12 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
+use Friendica\DI;
 
 function rendertime_install() {
 	Hook::register('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
 }
 
-
-function rendertime_uninstall() {
-	Hook::unregister('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1');
-	Hook::unregister('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
-}
-
 function rendertime_init_1(&$a) {
 }
 
@@ -27,19 +21,19 @@ function rendertime_init_1(&$a) {
  * @param Friendica\App $a
  * @param string $o
  */
-function rendertime_page_end(Friendica\App &$a, &$o)
+function rendertime_page_end(Friendica\App $a, &$o)
 {
 
-	$profiler = $a->getProfiler();
+	$profiler = DI::profiler();
 
 	$duration = microtime(true) - $profiler->get('start');
 
 	$ignored_modules = ["fbrowser"];
-	$ignored = in_array($a->module, $ignored_modules);
+	$ignored = in_array(DI::module()->getName(), $ignored_modules);
 
-	if (is_site_admin() && (defaults($_GET, "mode", '') != "minimal") && !$a->is_mobile && !$a->is_tablet && !$ignored) {
+	if (is_site_admin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) {
 
-		$o = $o . '<div class="renderinfo">' . L10n::t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
+		$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),
 				round($profiler->get('database_write'), 3),
 				round($profiler->get('network'), 2),
@@ -54,9 +48,20 @@ function rendertime_page_end(Friendica\App &$a, &$o)
 			//round($profiler->get('plugin'), 3)
 			) . '</div>';
 
+			$total = microtime(true) - $profiler->get('start');
+			$rest = $total - ($profiler->get('ready') - $profiler->get('start')) - $profiler->get('init') - $profiler->get('content');
+			$o = $o . '<div class="renderinfo">' . DI::l10n()->t("Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s",
+				round($profiler->get('classinit') - $profiler->get('start'), 3),
+				round($profiler->get('ready') - $profiler->get('classinit'), 3),
+				round($profiler->get('init'), 3),
+				round($profiler->get('content'), 3),
+				round($rest, 3),
+				round($total, 3)
+				) . '</div>';
+
 		if ($profiler->isRendertime()) {
 			$o .= '<pre>';
-			$o .= $profiler->getRendertimeString();
+			$o .= $profiler->getRendertimeString(DI::config()->get('rendertime', 'minimal_time', 0));
 			$o .= '</pre>';
 		}
 	}