nextcloud / server

apps/admin_audit/lib/AppInfo/Application.php

Indentation +210 added lines, -210 removed lines

@@ -71,221 +71,221 @@
 
 class Application extends App implements IBootstrap {
 
-	/** @var LoggerInterface */
-	protected $logger;
+    /** @var LoggerInterface */
+    protected $logger;
 
-	public function __construct() {
-		parent::__construct('admin_audit');
-	}
+    public function __construct() {
+        parent::__construct('admin_audit');
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class);
+    }
 
-	public function boot(IBootContext $context): void {
-		/** @var LoggerInterface $logger */
-		$logger = $context->injectFn(
-			Closure::fromCallable([$this, 'getLogger'])
-		);
+    public function boot(IBootContext $context): void {
+        /** @var LoggerInterface $logger */
+        $logger = $context->injectFn(
+            Closure::fromCallable([$this, 'getLogger'])
+        );
 
-		/*
+        /*
 		 * TODO: once the hooks are migrated to lazy events, this should be done
 		 *       in \OCA\AdminAudit\AppInfo\Application::register
 		 */
-		$this->registerHooks($logger, $context->getServerContainer());
-	}
-
-	private function getLogger(IConfig $config,
-							   ILogFactory $logFactory): LoggerInterface {
-		$auditType = $config->getSystemValueString('log_type_audit', 'file');
-		$defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud');
-		$auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag);
-		$logFile = $config->getSystemValueString('logfile_audit', '');
-
-		if ($auditType === 'file' && !$logFile) {
-			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-			// Legacy way was appconfig, now it's paralleled with the normal log config
-			$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
-		}
-
-		return $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
-	}
-
-	/**
-	 * Register hooks in order to log them
-	 */
-	private function registerHooks(LoggerInterface $logger,
-									 IServerContainer $serverContainer): void {
-		$this->userManagementHooks($logger, $serverContainer->get(IUserSession::class));
-		$this->groupHooks($logger, $serverContainer->get(IGroupManager::class));
-		$this->authHooks($logger);
-
-		/** @var EventDispatcherInterface $eventDispatcher */
-		$eventDispatcher = $serverContainer->get(EventDispatcherInterface::class);
-		$this->consoleHooks($logger, $eventDispatcher);
-		$this->appHooks($logger, $eventDispatcher);
-
-		$this->sharingHooks($logger);
-
-		$this->fileHooks($logger, $eventDispatcher);
-		$this->trashbinHooks($logger);
-		$this->versionsHooks($logger);
-
-		$this->securityHooks($logger, $eventDispatcher);
-	}
-
-	private function userManagementHooks(LoggerInterface $logger,
-										 IUserSession $userSession): void {
-		$userActions = new UserManagement($logger);
-
-		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
-		Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
-		Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
-
-		assert($userSession instanceof UserSession);
-		$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
-		$userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
-		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
-	}
-
-	private function groupHooks(LoggerInterface $logger,
-								IGroupManager $groupManager): void {
-		$groupActions = new GroupManagement($logger);
-
-		assert($groupManager instanceof GroupManager);
-		$groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
-		$groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
-		$groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
-		$groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
-	}
-
-	private function sharingHooks(LoggerInterface $logger): void {
-		$shareActions = new Sharing($logger);
-
-		Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
-		Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
-		Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare');
-		Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
-		Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
-		Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
-		Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
-	}
-
-	private function authHooks(LoggerInterface $logger): void {
-		$authActions = new Auth($logger);
-
-		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
-		Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
-		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
-	}
-
-	private function appHooks(LoggerInterface $logger,
-							  EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->enableApp($event->getAppID());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->disableApp($event->getAppID());
-		});
-	}
-
-	private function consoleHooks(LoggerInterface $logger,
-								  EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
-			$appActions = new Console($logger);
-			$appActions->runCommand($event->getArguments());
-		});
-	}
-
-	private function fileHooks(LoggerInterface $logger,
-							   EventDispatcherInterface $eventDispatcher): void {
-		$fileActions = new Files($logger);
-		$eventDispatcher->addListener(
-			IPreview::EVENT,
-			function (GenericEvent $event) use ($fileActions) {
-				/** @var File $file */
-				$file = $event->getSubject();
-				$fileActions->preview([
-					'path' => mb_substr($file->getInternalPath(), 5),
-					'width' => $event->getArguments()['width'],
-					'height' => $event->getArguments()['height'],
-					'crop' => $event->getArguments()['crop'],
-					'mode' => $event->getArguments()['mode']
-				]);
-			}
-		);
-
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_rename,
-			$fileActions,
-			'rename'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_create,
-			$fileActions,
-			'create'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_copy,
-			$fileActions,
-			'copy'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_write,
-			$fileActions,
-			'write'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_update,
-			$fileActions,
-			'update'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_read,
-			$fileActions,
-			'read'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_delete,
-			$fileActions,
-			'delete'
-		);
-	}
-
-	private function versionsHooks(LoggerInterface $logger): void {
-		$versionsActions = new Versions($logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
-	}
-
-	private function trashbinHooks(LoggerInterface $logger): void {
-		$trashActions = new Trashbin($logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
-	}
-
-	private function securityHooks(LoggerInterface $logger,
-								   EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
-			$security = new Security($logger);
-			$security->twofactorSuccess($event->getSubject(), $event->getArguments());
-		});
-		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
-			$security = new Security($logger);
-			$security->twofactorFailed($event->getSubject(), $event->getArguments());
-		});
-	}
+        $this->registerHooks($logger, $context->getServerContainer());
+    }
+
+    private function getLogger(IConfig $config,
+                                ILogFactory $logFactory): LoggerInterface {
+        $auditType = $config->getSystemValueString('log_type_audit', 'file');
+        $defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud');
+        $auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag);
+        $logFile = $config->getSystemValueString('logfile_audit', '');
+
+        if ($auditType === 'file' && !$logFile) {
+            $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+            // Legacy way was appconfig, now it's paralleled with the normal log config
+            $logFile = $config->getAppValue('admin_audit', 'logfile', $default);
+        }
+
+        return $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
+    }
+
+    /**
+     * Register hooks in order to log them
+     */
+    private function registerHooks(LoggerInterface $logger,
+                                        IServerContainer $serverContainer): void {
+        $this->userManagementHooks($logger, $serverContainer->get(IUserSession::class));
+        $this->groupHooks($logger, $serverContainer->get(IGroupManager::class));
+        $this->authHooks($logger);
+
+        /** @var EventDispatcherInterface $eventDispatcher */
+        $eventDispatcher = $serverContainer->get(EventDispatcherInterface::class);
+        $this->consoleHooks($logger, $eventDispatcher);
+        $this->appHooks($logger, $eventDispatcher);
+
+        $this->sharingHooks($logger);
+
+        $this->fileHooks($logger, $eventDispatcher);
+        $this->trashbinHooks($logger);
+        $this->versionsHooks($logger);
+
+        $this->securityHooks($logger, $eventDispatcher);
+    }
+
+    private function userManagementHooks(LoggerInterface $logger,
+                                            IUserSession $userSession): void {
+        $userActions = new UserManagement($logger);
+
+        Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
+        Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
+        Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
+
+        assert($userSession instanceof UserSession);
+        $userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
+        $userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
+        $userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
+    }
+
+    private function groupHooks(LoggerInterface $logger,
+                                IGroupManager $groupManager): void {
+        $groupActions = new GroupManagement($logger);
+
+        assert($groupManager instanceof GroupManager);
+        $groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
+        $groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
+        $groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
+        $groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
+    }
+
+    private function sharingHooks(LoggerInterface $logger): void {
+        $shareActions = new Sharing($logger);
+
+        Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
+        Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
+        Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare');
+        Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
+        Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
+        Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+        Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
+    }
+
+    private function authHooks(LoggerInterface $logger): void {
+        $authActions = new Auth($logger);
+
+        Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
+        Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
+        Util::connectHook('OC_User', 'logout', $authActions, 'logout');
+    }
+
+    private function appHooks(LoggerInterface $logger,
+                                EventDispatcherInterface $eventDispatcher): void {
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->enableApp($event->getAppID());
+        });
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
+        });
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->disableApp($event->getAppID());
+        });
+    }
+
+    private function consoleHooks(LoggerInterface $logger,
+                                    EventDispatcherInterface $eventDispatcher): void {
+        $eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
+            $appActions = new Console($logger);
+            $appActions->runCommand($event->getArguments());
+        });
+    }
+
+    private function fileHooks(LoggerInterface $logger,
+                                EventDispatcherInterface $eventDispatcher): void {
+        $fileActions = new Files($logger);
+        $eventDispatcher->addListener(
+            IPreview::EVENT,
+            function (GenericEvent $event) use ($fileActions) {
+                /** @var File $file */
+                $file = $event->getSubject();
+                $fileActions->preview([
+                    'path' => mb_substr($file->getInternalPath(), 5),
+                    'width' => $event->getArguments()['width'],
+                    'height' => $event->getArguments()['height'],
+                    'crop' => $event->getArguments()['crop'],
+                    'mode' => $event->getArguments()['mode']
+                ]);
+            }
+        );
+
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_rename,
+            $fileActions,
+            'rename'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_create,
+            $fileActions,
+            'create'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_copy,
+            $fileActions,
+            'copy'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_write,
+            $fileActions,
+            'write'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_update,
+            $fileActions,
+            'update'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_read,
+            $fileActions,
+            'read'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_delete,
+            $fileActions,
+            'delete'
+        );
+    }
+
+    private function versionsHooks(LoggerInterface $logger): void {
+        $versionsActions = new Versions($logger);
+        Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
+        Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
+    }
+
+    private function trashbinHooks(LoggerInterface $logger): void {
+        $trashActions = new Trashbin($logger);
+        Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
+        Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+    }
+
+    private function securityHooks(LoggerInterface $logger,
+                                    EventDispatcherInterface $eventDispatcher): void {
+        $eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
+            $security = new Security($logger);
+            $security->twofactorSuccess($event->getSubject(), $event->getArguments());
+        });
+        $eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
+            $security = new Security($logger);
+            $security->twofactorFailed($event->getSubject(), $event->getArguments());
+        });
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -103,7 +103,7 @@ 
 		$logFile = $config->getSystemValueString('logfile_audit', '');
 
 		if ($auditType === 'file' && !$logFile) {
-			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/audit.log';
 			// Legacy way was appconfig, now it's paralleled with the normal log config
 			$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
 		}
@@ -181,15 +181,15 @@ 
 
 	private function appHooks(LoggerInterface $logger,
 							  EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function(ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->enableApp($event->getAppID());
 		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function(ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
 		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function(ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->disableApp($event->getAppID());
 		});
@@ -197,7 +197,7 @@ 
 
 	private function consoleHooks(LoggerInterface $logger,
 								  EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function(ConsoleEvent $event) use ($logger) {
 			$appActions = new Console($logger);
 			$appActions->runCommand($event->getArguments());
 		});
@@ -208,7 +208,7 @@ 
 		$fileActions = new Files($logger);
 		$eventDispatcher->addListener(
 			IPreview::EVENT,
-			function (GenericEvent $event) use ($fileActions) {
+			function(GenericEvent $event) use ($fileActions) {
 				/** @var File $file */
 				$file = $event->getSubject();
 				$fileActions->preview([
@@ -279,11 +279,11 @@ 
 
 	private function securityHooks(LoggerInterface $logger,
 								   EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
+		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function(GenericEvent $event) use ($logger) {
 			$security = new Security($logger);
 			$security->twofactorSuccess($event->getSubject(), $event->getArguments());
 		});
-		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
+		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function(GenericEvent $event) use ($logger) {
 			$security = new Security($logger);
 			$security->twofactorFailed($event->getSubject(), $event->getArguments());
 		});

lib/private/Log/Errorlog.php

Indentation +14 added lines, -14 removed lines

@@ -29,20 +29,20 @@
 
 class Errorlog implements IWriter {
 
-	/** @var string */
-	protected $tag;
+    /** @var string */
+    protected $tag;
 
-	public function __construct(string $tag = 'owncloud') {
-		$this->tag = $tag;
-	}
+    public function __construct(string $tag = 'owncloud') {
+        $this->tag = $tag;
+    }
 
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public function write(string $app, $message, int $level) {
-		error_log('[' . $this->tag . ']['.$app.']['.$level.'] '.$message);
-	}
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     */
+    public function write(string $app, $message, int $level) {
+        error_log('[' . $this->tag . ']['.$app.']['.$level.'] '.$message);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
 	 * @param int $level
 	 */
 	public function write(string $app, $message, int $level) {
-		error_log('[' . $this->tag . ']['.$app.']['.$level.'] '.$message);
+		error_log('['.$this->tag.']['.$app.']['.$level.'] '.$message);
 	}
 }

lib/private/Log/Systemdlog.php

Indentation +32 added lines, -32 removed lines

@@ -46,39 +46,39 @@
 //     Syslog compatibility fields
 
 class Systemdlog extends LogDetails implements IWriter {
-	protected $levels = [
-		ILogger::DEBUG => 7,
-		ILogger::INFO => 6,
-		ILogger::WARN => 4,
-		ILogger::ERROR => 3,
-		ILogger::FATAL => 2,
-	];
+    protected $levels = [
+        ILogger::DEBUG => 7,
+        ILogger::INFO => 6,
+        ILogger::WARN => 4,
+        ILogger::ERROR => 3,
+        ILogger::FATAL => 2,
+    ];
 
-	protected $syslogId;
+    protected $syslogId;
 
-	public function __construct(SystemConfig $config, ?string $tag = null) {
-		parent::__construct($config);
-		if (!function_exists('sd_journal_send')) {
-			throw new HintException(
-				'PHP extension php-systemd is not available.',
-				'Please install and enable PHP extension systemd if you wish to log to the Systemd journal.');
-		}
-		if ($tag === null) {
-			$tag = $config->getValue('syslog_tag', 'Nextcloud');
-		}
-		$this->syslogId = $tag;
-	}
+    public function __construct(SystemConfig $config, ?string $tag = null) {
+        parent::__construct($config);
+        if (!function_exists('sd_journal_send')) {
+            throw new HintException(
+                'PHP extension php-systemd is not available.',
+                'Please install and enable PHP extension systemd if you wish to log to the Systemd journal.');
+        }
+        if ($tag === null) {
+            $tag = $config->getValue('syslog_tag', 'Nextcloud');
+        }
+        $this->syslogId = $tag;
+    }
 
-	/**
-	 * Write a message to the log.
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public function write(string $app, $message, int $level) {
-		$journal_level = $this->levels[$level];
-		sd_journal_send('PRIORITY='.$journal_level,
-				'SYSLOG_IDENTIFIER='.$this->syslogId,
-				'MESSAGE=' . $this->logDetailsAsJSON($app, $message, $level));
-	}
+    /**
+     * Write a message to the log.
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     */
+    public function write(string $app, $message, int $level) {
+        $journal_level = $this->levels[$level];
+        sd_journal_send('PRIORITY='.$journal_level,
+                'SYSLOG_IDENTIFIER='.$this->syslogId,
+                'MESSAGE=' . $this->logDetailsAsJSON($app, $message, $level));
+    }
 }

lib/private/Log/LogFactory.php

Indentation +61 added lines, -61 removed lines

@@ -33,73 +33,73 @@
 use Psr\Log\LoggerInterface;
 
 class LogFactory implements ILogFactory {
-	/** @var IServerContainer */
-	private $c;
-	/** @var SystemConfig */
-	private $systemConfig;
+    /** @var IServerContainer */
+    private $c;
+    /** @var SystemConfig */
+    private $systemConfig;
 
-	public function __construct(IServerContainer $c, SystemConfig $systemConfig) {
-		$this->c = $c;
-		$this->systemConfig = $systemConfig;
-	}
+    public function __construct(IServerContainer $c, SystemConfig $systemConfig) {
+        $this->c = $c;
+        $this->systemConfig = $systemConfig;
+    }
 
-	/**
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function get(string $type):IWriter {
-		switch (strtolower($type)) {
-			case 'errorlog':
-				return new Errorlog();
-			case 'syslog':
-				return $this->c->resolve(Syslog::class);
-			case 'systemd':
-				return $this->c->resolve(Systemdlog::class);
-			case 'file':
-				return $this->buildLogFile();
+    /**
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function get(string $type):IWriter {
+        switch (strtolower($type)) {
+            case 'errorlog':
+                return new Errorlog();
+            case 'syslog':
+                return $this->c->resolve(Syslog::class);
+            case 'systemd':
+                return $this->c->resolve(Systemdlog::class);
+            case 'file':
+                return $this->buildLogFile();
 
-			// Backwards compatibility for old and fallback for unknown log types
-			case 'owncloud':
-			case 'nextcloud':
-			default:
-				return $this->buildLogFile();
-		}
-	}
+            // Backwards compatibility for old and fallback for unknown log types
+            case 'owncloud':
+            case 'nextcloud':
+            default:
+                return $this->buildLogFile();
+        }
+    }
 
-	public function getCustomLogger(string $path):ILogger {
-		$log = $this->buildLogFile($path);
-		return new Log($log, $this->systemConfig);
-	}
+    public function getCustomLogger(string $path):ILogger {
+        $log = $this->buildLogFile($path);
+        return new Log($log, $this->systemConfig);
+    }
 
-	protected function createNewLogger(string $type, string $tag, string $path): IWriter {
-		switch (strtolower($type)) {
-			case 'errorlog':
-				return new Errorlog($tag);
-			case 'syslog':
-				return new Syslog($this->systemConfig, $tag);
-			case 'systemd':
-				return new Systemdlog($this->systemConfig, $tag);
-			case 'file':
-			case 'owncloud':
-			case 'nextcloud':
-			default:
-				return $this->buildLogFile($path);
-		}
-	}
+    protected function createNewLogger(string $type, string $tag, string $path): IWriter {
+        switch (strtolower($type)) {
+            case 'errorlog':
+                return new Errorlog($tag);
+            case 'syslog':
+                return new Syslog($this->systemConfig, $tag);
+            case 'systemd':
+                return new Systemdlog($this->systemConfig, $tag);
+            case 'file':
+            case 'owncloud':
+            case 'nextcloud':
+            default:
+                return $this->buildLogFile($path);
+        }
+    }
 
-	public function getCustomPsrLogger(string $path, string $type = 'file', string $tag = 'Nextcloud'): LoggerInterface {
-		$log = $this->createNewLogger($type, $tag, $path);
-		return new PsrLoggerAdapter(
-			new Log($log, $this->systemConfig)
-		);
-	}
+    public function getCustomPsrLogger(string $path, string $type = 'file', string $tag = 'Nextcloud'): LoggerInterface {
+        $log = $this->createNewLogger($type, $tag, $path);
+        return new PsrLoggerAdapter(
+            new Log($log, $this->systemConfig)
+        );
+    }
 
-	protected function buildLogFile(string $logFile = ''):File {
-		$defaultLogFile = $this->systemConfig->getValue('datadirectory', \OC::$SERVERROOT.'/data').'/nextcloud.log';
-		if ($logFile === '') {
-			$logFile = $this->systemConfig->getValue('logfile', $defaultLogFile);
-		}
-		$fallback = $defaultLogFile !== $logFile ? $defaultLogFile : '';
+    protected function buildLogFile(string $logFile = ''):File {
+        $defaultLogFile = $this->systemConfig->getValue('datadirectory', \OC::$SERVERROOT.'/data').'/nextcloud.log';
+        if ($logFile === '') {
+            $logFile = $this->systemConfig->getValue('logfile', $defaultLogFile);
+        }
+        $fallback = $defaultLogFile !== $logFile ? $defaultLogFile : '';
 
-		return new File($logFile, $fallback, $this->systemConfig);
-	}
+        return new File($logFile, $fallback, $this->systemConfig);
+    }
 }

lib/private/Log/Syslog.php

Indentation +27 added lines, -27 removed lines

@@ -30,34 +30,34 @@
 use OCP\Log\IWriter;
 
 class Syslog extends LogDetails implements IWriter {
-	protected $levels = [
-		ILogger::DEBUG => LOG_DEBUG,
-		ILogger::INFO => LOG_INFO,
-		ILogger::WARN => LOG_WARNING,
-		ILogger::ERROR => LOG_ERR,
-		ILogger::FATAL => LOG_CRIT,
-	];
+    protected $levels = [
+        ILogger::DEBUG => LOG_DEBUG,
+        ILogger::INFO => LOG_INFO,
+        ILogger::WARN => LOG_WARNING,
+        ILogger::ERROR => LOG_ERR,
+        ILogger::FATAL => LOG_CRIT,
+    ];
 
-	public function __construct(SystemConfig $config, ?string $tag = null) {
-		parent::__construct($config);
-		if ($tag === null) {
-			$tag = $config->getValue('syslog_tag', 'Nextcloud');
-		}
-		openlog($tag, LOG_PID | LOG_CONS, LOG_USER);
-	}
+    public function __construct(SystemConfig $config, ?string $tag = null) {
+        parent::__construct($config);
+        if ($tag === null) {
+            $tag = $config->getValue('syslog_tag', 'Nextcloud');
+        }
+        openlog($tag, LOG_PID | LOG_CONS, LOG_USER);
+    }
 
-	public function __destruct() {
-		closelog();
-	}
+    public function __destruct() {
+        closelog();
+    }
 
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public function write(string $app, $message, int $level) {
-		$syslog_level = $this->levels[$level];
-		syslog($syslog_level, $this->logDetailsAsJSON($app, $message, $level));
-	}
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     */
+    public function write(string $app, $message, int $level) {
+        $syslog_level = $this->levels[$level];
+        syslog($syslog_level, $this->logDetailsAsJSON($app, $message, $level));
+    }
 }

lib/public/Log/ILogFactory.php

Indentation +22 added lines, -22 removed lines

@@ -33,28 +33,28 @@
  * @since 14.0.0
  */
 interface ILogFactory {
-	/**
-	 * @param string $type - one of: file, errorlog, syslog, systemd
-	 * @return IWriter
-	 * @since 14.0.0
-	 */
-	public function get(string $type): IWriter;
+    /**
+     * @param string $type - one of: file, errorlog, syslog, systemd
+     * @return IWriter
+     * @since 14.0.0
+     */
+    public function get(string $type): IWriter;
 
-	/**
-	 * @param string $path
-	 * @return ILogger
-	 * @since 14.0.0
-	 * @deprecated use \OCP\Log\ILogFactory::getCustomPsrLogger
-	 * @see \OCP\Log\ILogFactory::getCustomPsrLogger
-	 */
-	public function getCustomLogger(string $path): ILogger;
+    /**
+     * @param string $path
+     * @return ILogger
+     * @since 14.0.0
+     * @deprecated use \OCP\Log\ILogFactory::getCustomPsrLogger
+     * @see \OCP\Log\ILogFactory::getCustomPsrLogger
+     */
+    public function getCustomLogger(string $path): ILogger;
 
-	/**
-	 * @param string $path
-	 * @param string $type
-	 * @param string $tag
-	 * @return LoggerInterface
-	 * @since 22.0.0 - Parameters $type and $tag were added in 24.0.0
-	 */
-	public function getCustomPsrLogger(string $path, string $type = 'file', string $tag = 'Nextcloud'): LoggerInterface;
+    /**
+     * @param string $path
+     * @param string $type
+     * @param string $tag
+     * @return LoggerInterface
+     * @since 22.0.0 - Parameters $type and $tag were added in 24.0.0
+     */
+    public function getCustomPsrLogger(string $path, string $type = 'file', string $tag = 'Nextcloud'): LoggerInterface;
 }