X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FPage.php;h=0f14d9f6e6530106ecbb87b0bd922a894ddcf4e8;hb=2edbd1a3e2b90430b378de32f79a7cbd3537d9de;hp=305b2962b9c70e856ba31c67ab28394e82d1c457;hpb=23e5ae15e3a1b73cd89f65687db5acca122c5124;p=friendica.git

diff --git a/src/App/Page.php b/src/App/Page.php
index 305b2962b9..0f14d9f6e6 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -80,8 +80,9 @@ class Page implements ArrayAccess
 	private $basePath;
 
 	private $timestamp = 0;
-	private $command   = '';
 	private $method    = '';
+	private $module    = '';
+	private $command   = '';
 
 	/**
 	 * @param string $basepath The Page basepath
@@ -92,16 +93,26 @@ class Page implements ArrayAccess
 		$this->basePath = $basepath;
 	}
 
-	public function setLogging(string $command, string $method)
+	public function setLogging(string $method, string $module, string $command)
 	{
-		$this->command = $command;
 		$this->method  = $method;
+		$this->module  = $module;
+		$this->command = $command;
 	}
 
-	public function logRuntime()
+	public function logRuntime(IManageConfigValues $config, string $origin = '')
 	{
-		$runtime = number_format(microtime(true) - $this->timestamp, 3);
-		Logger::debug('Runtime', ['method' => $this->method, 'command' => $this->command, 'runtime' => $runtime]);
+		$ignore = $config->get('system', 'runtime_ignore');
+		if (in_array($this->module, $ignore) || in_array($this->command, $ignore)) {
+			return;
+		}
+
+		$signature = !empty($_SERVER['HTTP_SIGNATURE']);
+		$load      = number_format(System::currentLoad(), 2);
+		$runtime   = number_format(microtime(true) - $this->timestamp, 3);
+		if ($runtime > $config->get('system', 'runtime_loglimit')) {
+			Logger::debug('Runtime', ['method' => $this->method, 'module' => $this->module, 'runtime' => $runtime, 'load' => $load, 'origin' => $origin, 'signature' => $signature, 'request' => $_SERVER['REQUEST_URI'] ?? '']);
+		}
 	}
 
 	/**
@@ -119,7 +130,7 @@ class Page implements ArrayAccess
 	 * The return value will be casted to boolean if non-boolean was returned.
 	 * @since 5.0.0
 	 */
-	public function offsetExists($offset)
+	public function offsetExists($offset): bool
 	{
 		return isset($this->page[$offset]);
 	}
@@ -189,9 +200,9 @@ class Page implements ArrayAccess
 	 * @param string $media
 	 * @see Page::initHead()
 	 */
-	public function registerStylesheet($path, string $media = 'screen')
+	public function registerStylesheet(string $path, string $media = 'screen')
 	{
-		$path = Network::appendQueryParam($path, ['v' => FRIENDICA_VERSION]);
+		$path = Network::appendQueryParam($path, ['v' => App::VERSION]);
 
 		if (mb_strpos($path, $this->basePath . DIRECTORY_SEPARATOR) === 0) {
 			$path = mb_substr($path, mb_strlen($this->basePath . DIRECTORY_SEPARATOR));
@@ -210,17 +221,18 @@ class Page implements ArrayAccess
 	 * - Infinite scroll data
 	 * - head.tpl template
 	 *
-	 * @param App                         $app     The Friendica App instance
-	 * @param Arguments                   $args    The Friendica App Arguments
-	 * @param L10n                        $l10n    The l10n language instance
-	 * @param IManageConfigValues         $config  The Friendica configuration
-	 * @param IManagePersonalConfigValues $pConfig The Friendica personal configuration (for user)
+	 * @param App                         $app      The Friendica App instance
+	 * @param Arguments                   $args     The Friendica App Arguments
+	 * @param L10n                        $l10n     The l10n language instance
+	 * @param IManageConfigValues         $config   The Friendica configuration
+	 * @param IManagePersonalConfigValues $pConfig  The Friendica personal configuration (for user)
+	 * @param int                         $localUID The local user id
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	private function initHead(App $app, Arguments $args, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig)
+	private function initHead(App $app, Arguments $args, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, int $localUID)
 	{
-		$interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000);
+		$interval = ($localUID ? $pConfig->get($localUID, 'system', 'update_interval') : 40000);
 
 		// If the update is 'deactivated' set it to the highest integer number (~24 days)
 		if ($interval < 0) {
@@ -265,8 +277,8 @@ class Page implements ArrayAccess
 		 * being first
 		 */
 		$this->page['htmlhead'] = Renderer::replaceMacros($tpl, [
-			'$local_user'      => local_user(),
-			'$generator'       => 'Friendica' . ' ' . FRIENDICA_VERSION,
+			'$local_user'      => $localUID,
+			'$generator'       => 'Friendica' . ' ' . App::VERSION,
 			'$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.'),
 			'$update_interval' => $interval,
@@ -282,7 +294,7 @@ class Page implements ArrayAccess
 	 *
 	 * Taken from http://webcheatsheet.com/php/get_current_page_url.php
 	 */
-	private function curPageURL()
+	private function curPageURL(): string
 	{
 		$pageURL = 'http';
 		if (!empty($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on")) {
@@ -384,7 +396,7 @@ class Page implements ArrayAccess
 	 */
 	public function registerFooterScript($path)
 	{
-		$path = Network::appendQueryParam($path, ['v' => FRIENDICA_VERSION]);
+		$path = Network::appendQueryParam($path, ['v' => App::VERSION]);
 
 		$url = str_replace($this->basePath . DIRECTORY_SEPARATOR, '', $path);
 
@@ -432,10 +444,11 @@ class Page implements ArrayAccess
 	 * @param L10n                        $l10n     The l10n language class
 	 * @param IManageConfigValues         $config   The Configuration of this node
 	 * @param IManagePersonalConfigValues $pconfig  The personal/user configuration
+	 * @param int                         $localUID The UID of the local user
 	 *
 	 * @throws HTTPException\InternalServerErrorException|HTTPException\ServiceUnavailableException
 	 */
-	public function run(App $app, BaseURL $baseURL, Arguments $args, Mode $mode, ResponseInterface $response, L10n $l10n, Profiler $profiler, IManageConfigValues $config, IManagePersonalConfigValues $pconfig)
+	public function run(App $app, BaseURL $baseURL, Arguments $args, Mode $mode, ResponseInterface $response, L10n $l10n, Profiler $profiler, IManageConfigValues $config, IManagePersonalConfigValues $pconfig, int $localUID)
 	{
 		$moduleName = $args->getModuleName();
 
@@ -469,7 +482,7 @@ class Page implements ArrayAccess
 		 * all the module functions have executed so that all
 		 * theme choices made by the modules can take effect.
 		 */
-		$this->initHead($app, $args, $l10n, $config, $pconfig);
+		$this->initHead($app, $args, $l10n, $config, $pconfig, $localUID);
 
 		/* Build the page ending -- this is stuff that goes right before
 		 * the closing </body> tag
@@ -532,7 +545,7 @@ class Page implements ArrayAccess
 
 		$page    = $this->page;
 
-		header("X-Friendica-Version: " . FRIENDICA_VERSION);
+		header("X-Friendica-Version: " . App::VERSION);
 		header("Content-type: text/html; charset=utf-8");
 
 		if ($config->get('system', 'hsts') && ($baseURL->getSSLPolicy() == BaseURL::SSL_POLICY_FULL)) {