nextcloud / server

apps/workflowengine/lib/AppInfo/Application.php

Indentation +71 added lines, -71 removed lines

@@ -43,84 +43,84 @@
 use OCP\WorkflowEngine\IOperationCompat;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'workflowengine';
+    public const APP_ID = 'workflowengine';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerServiceAlias('RequestTimeController', RequestTime::class);
-		$context->registerEventListener(
-			LoadSettingsScriptsEvent::class,
-			LoadAdditionalSettingsScriptsListener::class,
-			-100
-		);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerServiceAlias('RequestTimeController', RequestTime::class);
+        $context->registerEventListener(
+            LoadSettingsScriptsEvent::class,
+            LoadAdditionalSettingsScriptsListener::class,
+            -100
+        );
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerRuleListeners']));
-	}
+    public function boot(IBootContext $context): void {
+        $context->injectFn(Closure::fromCallable([$this, 'registerRuleListeners']));
+    }
 
-	private function registerRuleListeners(IEventDispatcher $dispatcher,
-										   IServerContainer $container,
-										   ILogger $logger): void {
-		$manager = $container->query(Manager::class);
-		$configuredEvents = $manager->getAllConfiguredEvents();
+    private function registerRuleListeners(IEventDispatcher $dispatcher,
+                                            IServerContainer $container,
+                                            ILogger $logger): void {
+        $manager = $container->query(Manager::class);
+        $configuredEvents = $manager->getAllConfiguredEvents();
 
-		foreach ($configuredEvents as $operationClass => $events) {
-			foreach ($events as $entityClass => $eventNames) {
-				array_map(function (string $eventName) use ($manager, $container, $dispatcher, $logger, $operationClass, $entityClass) {
-					$dispatcher->addListener(
-						$eventName,
-						function ($event) use ($manager, $container, $eventName, $logger, $operationClass, $entityClass) {
-							$ruleMatcher = $manager->getRuleMatcher();
-							try {
-								/** @var IEntity $entity */
-								$entity = $container->query($entityClass);
-								/** @var IOperation $operation */
-								$operation = $container->query($operationClass);
+        foreach ($configuredEvents as $operationClass => $events) {
+            foreach ($events as $entityClass => $eventNames) {
+                array_map(function (string $eventName) use ($manager, $container, $dispatcher, $logger, $operationClass, $entityClass) {
+                    $dispatcher->addListener(
+                        $eventName,
+                        function ($event) use ($manager, $container, $eventName, $logger, $operationClass, $entityClass) {
+                            $ruleMatcher = $manager->getRuleMatcher();
+                            try {
+                                /** @var IEntity $entity */
+                                $entity = $container->query($entityClass);
+                                /** @var IOperation $operation */
+                                $operation = $container->query($operationClass);
 
-								$ruleMatcher->setEntity($entity);
-								$ruleMatcher->setOperation($operation);
+                                $ruleMatcher->setEntity($entity);
+                                $ruleMatcher->setOperation($operation);
 
-								$ctx = new LogContext();
-								$ctx
-									->setOperation($operation)
-									->setEntity($entity)
-									->setEventName($eventName);
+                                $ctx = new LogContext();
+                                $ctx
+                                    ->setOperation($operation)
+                                    ->setEntity($entity)
+                                    ->setEventName($eventName);
 
-								/** @var Logger $flowLogger */
-								$flowLogger = $container->query(Logger::class);
-								$flowLogger->logEventInit($ctx);
+                                /** @var Logger $flowLogger */
+                                $flowLogger = $container->query(Logger::class);
+                                $flowLogger->logEventInit($ctx);
 
-								if ($event instanceof Event) {
-									$entity->prepareRuleMatcher($ruleMatcher, $eventName, $event);
-									$operation->onEvent($eventName, $event, $ruleMatcher);
-								} elseif ($entity instanceof IEntityCompat && $operation instanceof IOperationCompat) {
-									// TODO: Remove this block (and the compat classes) in the first major release in 2023
-									$entity->prepareRuleMatcherCompat($ruleMatcher, $eventName, $event);
-									$operation->onEventCompat($eventName, $event, $ruleMatcher);
-								} else {
-									$logger->debug(
-										'Cannot handle event {name} of {event} against entity {entity} and operation {operation}',
-										[
-											'app' => self::APP_ID,
-											'name' => $eventName,
-											'event' => get_class($event),
-											'entity' => $entityClass,
-											'operation' => $operationClass,
-										]
-									);
-								}
-								$flowLogger->logEventDone($ctx);
-							} catch (QueryException $e) {
-								// Ignore query exceptions since they might occur when an entity/operation were setup before by an app that is disabled now
-							}
-						}
-					);
-				}, $eventNames ?? []);
-			}
-		}
-	}
+                                if ($event instanceof Event) {
+                                    $entity->prepareRuleMatcher($ruleMatcher, $eventName, $event);
+                                    $operation->onEvent($eventName, $event, $ruleMatcher);
+                                } elseif ($entity instanceof IEntityCompat && $operation instanceof IOperationCompat) {
+                                    // TODO: Remove this block (and the compat classes) in the first major release in 2023
+                                    $entity->prepareRuleMatcherCompat($ruleMatcher, $eventName, $event);
+                                    $operation->onEventCompat($eventName, $event, $ruleMatcher);
+                                } else {
+                                    $logger->debug(
+                                        'Cannot handle event {name} of {event} against entity {entity} and operation {operation}',
+                                        [
+                                            'app' => self::APP_ID,
+                                            'name' => $eventName,
+                                            'event' => get_class($event),
+                                            'entity' => $entityClass,
+                                            'operation' => $operationClass,
+                                        ]
+                                    );
+                                }
+                                $flowLogger->logEventDone($ctx);
+                            } catch (QueryException $e) {
+                                // Ignore query exceptions since they might occur when an entity/operation were setup before by an app that is disabled now
+                            }
+                        }
+                    );
+                }, $eventNames ?? []);
+            }
+        }
+    }
 }

apps/workflowengine/lib/Settings/ASettings.php

Indentation +149 added lines, -149 removed lines

@@ -42,153 +42,153 @@
 use OCP\WorkflowEngine\ISpecificOperation;
 
 abstract class ASettings implements ISettings {
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var string */
-	private $appName;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var Manager */
-	protected $manager;
-
-	/** @var IInitialStateService */
-	private $initialStateService;
-
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(
-		string $appName,
-		IL10N $l,
-		IEventDispatcher $eventDispatcher,
-		Manager $manager,
-		IInitialStateService $initialStateService,
-		IConfig $config
-	) {
-		$this->appName = $appName;
-		$this->l10n = $l;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->manager = $manager;
-		$this->initialStateService = $initialStateService;
-		$this->config = $config;
-	}
-
-	abstract public function getScope(): int;
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		// @deprecated in 20.0.0: retire this one in favor of the typed event
-		$this->eventDispatcher->dispatch(
-			'OCP\WorkflowEngine::loadAdditionalSettingScripts',
-			new LoadSettingsScriptsEvent()
-		);
-		$this->eventDispatcher->dispatchTyped(new LoadSettingsScriptsEvent());
-
-		$entities = $this->manager->getEntitiesList();
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'entities',
-			$this->entitiesToArray($entities)
-		);
-
-		$operators = $this->manager->getOperatorList();
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'operators',
-			$this->operatorsToArray($operators)
-		);
-
-		$checks = $this->manager->getCheckList();
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'checks',
-			$this->checksToArray($checks)
-		);
-
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'scope',
-			$this->getScope()
-		);
-
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'appstoreenabled',
-			$this->config->getSystemValueBool('appstoreenabled', true)
-		);
-
-		return new TemplateResponse(Application::APP_ID, 'settings', [], 'blank');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'workflow';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 0;
-	}
-
-	private function entitiesToArray(array $entities) {
-		return array_map(function (IEntity $entity) {
-			$events = array_map(function (IEntityEvent $entityEvent) {
-				return [
-					'eventName' => $entityEvent->getEventName(),
-					'displayName' => $entityEvent->getDisplayName()
-				];
-			}, $entity->getEvents());
-
-			return [
-				'id' => get_class($entity),
-				'icon' => $entity->getIcon(),
-				'name' => $entity->getName(),
-				'events' => $events,
-			];
-		}, $entities);
-	}
-
-	private function operatorsToArray(array $operators) {
-		$operators = array_filter($operators, function (IOperation $operator) {
-			return $operator->isAvailableForScope($this->getScope());
-		});
-
-		return array_map(function (IOperation $operator) {
-			return [
-				'id' => get_class($operator),
-				'icon' => $operator->getIcon(),
-				'name' => $operator->getDisplayName(),
-				'description' => $operator->getDescription(),
-				'fixedEntity' => $operator instanceof ISpecificOperation ? $operator->getEntityId() : '',
-				'isComplex' => $operator instanceof IComplexOperation,
-				'triggerHint' => $operator instanceof IComplexOperation ? $operator->getTriggerHint() : '',
-			];
-		}, $operators);
-	}
-
-	private function checksToArray(array $checks) {
-		$checks = array_filter($checks, function (ICheck $check) {
-			return $check->isAvailableForScope($this->getScope());
-		});
-
-		return array_map(function (ICheck $check) {
-			return [
-				'id' => get_class($check),
-				'supportedEntities' => $check->supportedEntities(),
-			];
-		}, $checks);
-	}
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var string */
+    private $appName;
+
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
+
+    /** @var Manager */
+    protected $manager;
+
+    /** @var IInitialStateService */
+    private $initialStateService;
+
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(
+        string $appName,
+        IL10N $l,
+        IEventDispatcher $eventDispatcher,
+        Manager $manager,
+        IInitialStateService $initialStateService,
+        IConfig $config
+    ) {
+        $this->appName = $appName;
+        $this->l10n = $l;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->manager = $manager;
+        $this->initialStateService = $initialStateService;
+        $this->config = $config;
+    }
+
+    abstract public function getScope(): int;
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        // @deprecated in 20.0.0: retire this one in favor of the typed event
+        $this->eventDispatcher->dispatch(
+            'OCP\WorkflowEngine::loadAdditionalSettingScripts',
+            new LoadSettingsScriptsEvent()
+        );
+        $this->eventDispatcher->dispatchTyped(new LoadSettingsScriptsEvent());
+
+        $entities = $this->manager->getEntitiesList();
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'entities',
+            $this->entitiesToArray($entities)
+        );
+
+        $operators = $this->manager->getOperatorList();
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'operators',
+            $this->operatorsToArray($operators)
+        );
+
+        $checks = $this->manager->getCheckList();
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'checks',
+            $this->checksToArray($checks)
+        );
+
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'scope',
+            $this->getScope()
+        );
+
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'appstoreenabled',
+            $this->config->getSystemValueBool('appstoreenabled', true)
+        );
+
+        return new TemplateResponse(Application::APP_ID, 'settings', [], 'blank');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'workflow';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 0;
+    }
+
+    private function entitiesToArray(array $entities) {
+        return array_map(function (IEntity $entity) {
+            $events = array_map(function (IEntityEvent $entityEvent) {
+                return [
+                    'eventName' => $entityEvent->getEventName(),
+                    'displayName' => $entityEvent->getDisplayName()
+                ];
+            }, $entity->getEvents());
+
+            return [
+                'id' => get_class($entity),
+                'icon' => $entity->getIcon(),
+                'name' => $entity->getName(),
+                'events' => $events,
+            ];
+        }, $entities);
+    }
+
+    private function operatorsToArray(array $operators) {
+        $operators = array_filter($operators, function (IOperation $operator) {
+            return $operator->isAvailableForScope($this->getScope());
+        });
+
+        return array_map(function (IOperation $operator) {
+            return [
+                'id' => get_class($operator),
+                'icon' => $operator->getIcon(),
+                'name' => $operator->getDisplayName(),
+                'description' => $operator->getDescription(),
+                'fixedEntity' => $operator instanceof ISpecificOperation ? $operator->getEntityId() : '',
+                'isComplex' => $operator instanceof IComplexOperation,
+                'triggerHint' => $operator instanceof IComplexOperation ? $operator->getTriggerHint() : '',
+            ];
+        }, $operators);
+    }
+
+    private function checksToArray(array $checks) {
+        $checks = array_filter($checks, function (ICheck $check) {
+            return $check->isAvailableForScope($this->getScope());
+        });
+
+        return array_map(function (ICheck $check) {
+            return [
+                'id' => get_class($check),
+                'supportedEntities' => $check->supportedEntities(),
+            ];
+        }, $checks);
+    }
 }

apps/files/lib/Controller/ViewController.php

Indentation +287 added lines, -287 removed lines

@@ -62,291 +62,291 @@
  * @package OCA\Files\Controller
  */
 class ViewController extends Controller {
-	/** @var string */
-	protected $appName;
-	/** @var IRequest */
-	protected $request;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var IConfig */
-	protected $config;
-	/** @var IEventDispatcher */
-	protected $eventDispatcher;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IAppManager */
-	protected $appManager;
-	/** @var IRootFolder */
-	protected $rootFolder;
-	/** @var Helper */
-	protected $activityHelper;
-
-	public function __construct(string $appName,
-		IRequest $request,
-		IURLGenerator $urlGenerator,
-		IL10N $l10n,
-		IConfig $config,
-		IEventDispatcher $eventDispatcher,
-		IUserSession $userSession,
-		IAppManager $appManager,
-		IRootFolder $rootFolder,
-		Helper $activityHelper
-	) {
-		parent::__construct($appName, $request);
-		$this->appName         = $appName;
-		$this->request         = $request;
-		$this->urlGenerator    = $urlGenerator;
-		$this->l10n            = $l10n;
-		$this->config          = $config;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->userSession     = $userSession;
-		$this->appManager      = $appManager;
-		$this->rootFolder      = $rootFolder;
-		$this->activityHelper  = $activityHelper;
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string $scriptName
-	 * @return string
-	 */
-	protected function renderScript($appName, $scriptName) {
-		$content    = '';
-		$appPath    = \OC_App::getAppPath($appName);
-		$scriptPath = $appPath . '/' . $scriptName;
-		if (file_exists($scriptPath)) {
-			// TODO: sanitize path / script name ?
-			ob_start();
-			include $scriptPath;
-			$content = ob_get_contents();
-			@ob_end_clean();
-		}
-
-		return $content;
-	}
-
-	/**
-	 * FIXME: Replace with non static code
-	 *
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	protected function getStorageInfo() {
-		$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
-
-		return \OC_Helper::getStorageInfo('/', $dirInfo);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $fileid
-	 * @return TemplateResponse|RedirectResponse
-	 * @throws NotFoundException
-	 */
-	public function showFile(string $fileid = null): Response {
-		// This is the entry point from the `/f/{fileid}` URL which is hardcoded in the server.
-		try {
-			return $this->redirectToFile($fileid);
-		} catch (NotFoundException $e) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
-		}
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $dir
-	 * @param string $view
-	 * @param string $fileid
-	 * @param bool $fileNotFound
-	 * @return TemplateResponse|RedirectResponse
-	 * @throws NotFoundException
-	 */
-	public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
-		if ($fileid !== null) {
-			try {
-				return $this->redirectToFile($fileid);
-			} catch (NotFoundException $e) {
-				return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
-			}
-		}
-
-		$nav = new \OCP\Template('files', 'appnavigation', '');
-
-		// Load the files we need
-		\OCP\Util::addStyle('files', 'merged');
-		\OCP\Util::addScript('files', 'merged-index');
-
-		// mostly for the home storage's free space
-		// FIXME: Make non static
-		$storageInfo = $this->getStorageInfo();
-
-		$user = $this->userSession->getUser()->getUID();
-
-		// Get all the user favorites to create a submenu
-		try {
-			$favElements = $this->activityHelper->getFavoriteFilePaths($this->userSession->getUser()->getUID());
-		} catch (\RuntimeException $e) {
-			$favElements['folders'] = [];
-		}
-
-		$collapseClasses = '';
-		if (count($favElements['folders']) > 0) {
-			$collapseClasses = 'collapsible';
-		}
-
-		$favoritesSublistArray = [];
-
-		$navBarPositionPosition = 6;
-		$currentCount           = 0;
-		foreach ($favElements['folders'] as $dir) {
-			$link         = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']);
-			$sortingValue = ++$currentCount;
-			$element      = [
-				'id'                 => str_replace('/', '-', $dir),
-				'view'               => 'files',
-				'href'               => $link,
-				'dir'                => $dir,
-				'order'              => $navBarPositionPosition,
-				'folderPosition'     => $sortingValue,
-				'name'               => basename($dir),
-				'icon'               => 'files',
-				'quickaccesselement' => 'true'
-			];
-
-			array_push($favoritesSublistArray, $element);
-			$navBarPositionPosition++;
-		}
-
-		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
-
-		// add the favorites entry in menu
-		$navItems['favorites']['sublist'] = $favoritesSublistArray;
-		$navItems['favorites']['classes'] = $collapseClasses;
-
-		// parse every menu and add the expandedState user value
-		foreach ($navItems as $key => $item) {
-			if (isset($item['expandedState'])) {
-				$navItems[$key]['defaultExpandedState'] = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', $item['expandedState'], '0') === '1';
-			}
-		}
-
-		$nav->assign('navigationItems', $navItems);
-
-		$nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
-		if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			$totalSpace = $this->l10n->t('Unlimited');
-		} else {
-			$totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
-		}
-		$nav->assign('total_space', $totalSpace);
-		$nav->assign('quota', $storageInfo['quota']);
-		$nav->assign('usage_relative', $storageInfo['relative']);
-
-		$nav->assign('webdav_url', \OCP\Util::linkToRemote('dav/files/' . $user));
-
-		$contentItems = [];
-
-		// render the container content for every navigation item
-		foreach ($navItems as $item) {
-			$content = '';
-			if (isset($item['script'])) {
-				$content = $this->renderScript($item['appname'], $item['script']);
-			}
-			// parse submenus
-			if (isset($item['sublist'])) {
-				foreach ($item['sublist'] as $subitem) {
-					$subcontent = '';
-					if (isset($subitem['script'])) {
-						$subcontent = $this->renderScript($subitem['appname'], $subitem['script']);
-					}
-					$contentItems[$subitem['id']] = [
-						'id'      => $subitem['id'],
-						'content' => $subcontent
-					];
-				}
-			}
-			$contentItems[$item['id']] = [
-				'id'      => $item['id'],
-				'content' => $content
-			];
-		}
-
-		$event = new LoadAdditionalScriptsEvent();
-		$this->eventDispatcher->dispatchTyped($event);
-		$this->eventDispatcher->dispatchTyped(new LoadSidebar());
-		// Load Viewer scripts
-		if (class_exists(LoadViewer::class)) {
-			$this->eventDispatcher->dispatchTyped(new LoadViewer());
-		}
-
-		$params                                = [];
-		$params['usedSpacePercent']            = (int) $storageInfo['relative'];
-		$params['owner']                       = $storageInfo['owner'] ?? '';
-		$params['ownerDisplayName']            = $storageInfo['ownerDisplayName'] ?? '';
-		$params['isPublic']                    = false;
-		$params['allowShareWithLink']          = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
-		$params['defaultFileSorting']          = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
-		$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
-		$params['showgridview']				   = $this->config->getUserValue($user, 'files', 'show_grid', false);
-		$params['isIE']						   = \OCP\Util::isIE();
-		$showHidden                            = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
-		$params['showHiddenFiles']             = $showHidden ? 1 : 0;
-		$params['fileNotFound']                = $fileNotFound ? 1 : 0;
-		$params['appNavigation']               = $nav;
-		$params['appContents']                 = $contentItems;
-		$params['hiddenFields']                = $event->getHiddenFields();
-
-		$response = new TemplateResponse(
-			$this->appName,
-			'index',
-			$params
-		);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedFrameDomain('\'self\'');
-		$response->setContentSecurityPolicy($policy);
-
-		return $response;
-	}
-
-	/**
-	 * Redirects to the file list and highlight the given file id
-	 *
-	 * @param string $fileId file id to show
-	 * @return RedirectResponse redirect response or not found response
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function redirectToFile($fileId) {
-		$uid        = $this->userSession->getUser()->getUID();
-		$baseFolder = $this->rootFolder->getUserFolder($uid);
-		$files      = $baseFolder->getById($fileId);
-		$params     = [];
-
-		if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
-			$baseFolder     = $this->rootFolder->get($uid . '/files_trashbin/files/');
-			$files          = $baseFolder->getById($fileId);
-			$params['view'] = 'trashbin';
-		}
-
-		if (!empty($files)) {
-			$file = current($files);
-			if ($file instanceof Folder) {
-				// set the full path to enter the folder
-				$params['dir'] = $baseFolder->getRelativePath($file->getPath());
-			} else {
-				// set parent path as dir
-				$params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
-				// and scroll to the entry
-				$params['scrollto'] = $file->getName();
-			}
-
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
-		}
-		throw new \OCP\Files\NotFoundException();
-	}
+    /** @var string */
+    protected $appName;
+    /** @var IRequest */
+    protected $request;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var IConfig */
+    protected $config;
+    /** @var IEventDispatcher */
+    protected $eventDispatcher;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var IAppManager */
+    protected $appManager;
+    /** @var IRootFolder */
+    protected $rootFolder;
+    /** @var Helper */
+    protected $activityHelper;
+
+    public function __construct(string $appName,
+        IRequest $request,
+        IURLGenerator $urlGenerator,
+        IL10N $l10n,
+        IConfig $config,
+        IEventDispatcher $eventDispatcher,
+        IUserSession $userSession,
+        IAppManager $appManager,
+        IRootFolder $rootFolder,
+        Helper $activityHelper
+    ) {
+        parent::__construct($appName, $request);
+        $this->appName         = $appName;
+        $this->request         = $request;
+        $this->urlGenerator    = $urlGenerator;
+        $this->l10n            = $l10n;
+        $this->config          = $config;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->userSession     = $userSession;
+        $this->appManager      = $appManager;
+        $this->rootFolder      = $rootFolder;
+        $this->activityHelper  = $activityHelper;
+    }
+
+    /**
+     * @param string $appName
+     * @param string $scriptName
+     * @return string
+     */
+    protected function renderScript($appName, $scriptName) {
+        $content    = '';
+        $appPath    = \OC_App::getAppPath($appName);
+        $scriptPath = $appPath . '/' . $scriptName;
+        if (file_exists($scriptPath)) {
+            // TODO: sanitize path / script name ?
+            ob_start();
+            include $scriptPath;
+            $content = ob_get_contents();
+            @ob_end_clean();
+        }
+
+        return $content;
+    }
+
+    /**
+     * FIXME: Replace with non static code
+     *
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    protected function getStorageInfo() {
+        $dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
+
+        return \OC_Helper::getStorageInfo('/', $dirInfo);
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     *
+     * @param string $fileid
+     * @return TemplateResponse|RedirectResponse
+     * @throws NotFoundException
+     */
+    public function showFile(string $fileid = null): Response {
+        // This is the entry point from the `/f/{fileid}` URL which is hardcoded in the server.
+        try {
+            return $this->redirectToFile($fileid);
+        } catch (NotFoundException $e) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
+        }
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     *
+     * @param string $dir
+     * @param string $view
+     * @param string $fileid
+     * @param bool $fileNotFound
+     * @return TemplateResponse|RedirectResponse
+     * @throws NotFoundException
+     */
+    public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
+        if ($fileid !== null) {
+            try {
+                return $this->redirectToFile($fileid);
+            } catch (NotFoundException $e) {
+                return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
+            }
+        }
+
+        $nav = new \OCP\Template('files', 'appnavigation', '');
+
+        // Load the files we need
+        \OCP\Util::addStyle('files', 'merged');
+        \OCP\Util::addScript('files', 'merged-index');
+
+        // mostly for the home storage's free space
+        // FIXME: Make non static
+        $storageInfo = $this->getStorageInfo();
+
+        $user = $this->userSession->getUser()->getUID();
+
+        // Get all the user favorites to create a submenu
+        try {
+            $favElements = $this->activityHelper->getFavoriteFilePaths($this->userSession->getUser()->getUID());
+        } catch (\RuntimeException $e) {
+            $favElements['folders'] = [];
+        }
+
+        $collapseClasses = '';
+        if (count($favElements['folders']) > 0) {
+            $collapseClasses = 'collapsible';
+        }
+
+        $favoritesSublistArray = [];
+
+        $navBarPositionPosition = 6;
+        $currentCount           = 0;
+        foreach ($favElements['folders'] as $dir) {
+            $link         = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']);
+            $sortingValue = ++$currentCount;
+            $element      = [
+                'id'                 => str_replace('/', '-', $dir),
+                'view'               => 'files',
+                'href'               => $link,
+                'dir'                => $dir,
+                'order'              => $navBarPositionPosition,
+                'folderPosition'     => $sortingValue,
+                'name'               => basename($dir),
+                'icon'               => 'files',
+                'quickaccesselement' => 'true'
+            ];
+
+            array_push($favoritesSublistArray, $element);
+            $navBarPositionPosition++;
+        }
+
+        $navItems = \OCA\Files\App::getNavigationManager()->getAll();
+
+        // add the favorites entry in menu
+        $navItems['favorites']['sublist'] = $favoritesSublistArray;
+        $navItems['favorites']['classes'] = $collapseClasses;
+
+        // parse every menu and add the expandedState user value
+        foreach ($navItems as $key => $item) {
+            if (isset($item['expandedState'])) {
+                $navItems[$key]['defaultExpandedState'] = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', $item['expandedState'], '0') === '1';
+            }
+        }
+
+        $nav->assign('navigationItems', $navItems);
+
+        $nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
+        if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+            $totalSpace = $this->l10n->t('Unlimited');
+        } else {
+            $totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
+        }
+        $nav->assign('total_space', $totalSpace);
+        $nav->assign('quota', $storageInfo['quota']);
+        $nav->assign('usage_relative', $storageInfo['relative']);
+
+        $nav->assign('webdav_url', \OCP\Util::linkToRemote('dav/files/' . $user));
+
+        $contentItems = [];
+
+        // render the container content for every navigation item
+        foreach ($navItems as $item) {
+            $content = '';
+            if (isset($item['script'])) {
+                $content = $this->renderScript($item['appname'], $item['script']);
+            }
+            // parse submenus
+            if (isset($item['sublist'])) {
+                foreach ($item['sublist'] as $subitem) {
+                    $subcontent = '';
+                    if (isset($subitem['script'])) {
+                        $subcontent = $this->renderScript($subitem['appname'], $subitem['script']);
+                    }
+                    $contentItems[$subitem['id']] = [
+                        'id'      => $subitem['id'],
+                        'content' => $subcontent
+                    ];
+                }
+            }
+            $contentItems[$item['id']] = [
+                'id'      => $item['id'],
+                'content' => $content
+            ];
+        }
+
+        $event = new LoadAdditionalScriptsEvent();
+        $this->eventDispatcher->dispatchTyped($event);
+        $this->eventDispatcher->dispatchTyped(new LoadSidebar());
+        // Load Viewer scripts
+        if (class_exists(LoadViewer::class)) {
+            $this->eventDispatcher->dispatchTyped(new LoadViewer());
+        }
+
+        $params                                = [];
+        $params['usedSpacePercent']            = (int) $storageInfo['relative'];
+        $params['owner']                       = $storageInfo['owner'] ?? '';
+        $params['ownerDisplayName']            = $storageInfo['ownerDisplayName'] ?? '';
+        $params['isPublic']                    = false;
+        $params['allowShareWithLink']          = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
+        $params['defaultFileSorting']          = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
+        $params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
+        $params['showgridview']				   = $this->config->getUserValue($user, 'files', 'show_grid', false);
+        $params['isIE']						   = \OCP\Util::isIE();
+        $showHidden                            = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
+        $params['showHiddenFiles']             = $showHidden ? 1 : 0;
+        $params['fileNotFound']                = $fileNotFound ? 1 : 0;
+        $params['appNavigation']               = $nav;
+        $params['appContents']                 = $contentItems;
+        $params['hiddenFields']                = $event->getHiddenFields();
+
+        $response = new TemplateResponse(
+            $this->appName,
+            'index',
+            $params
+        );
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedFrameDomain('\'self\'');
+        $response->setContentSecurityPolicy($policy);
+
+        return $response;
+    }
+
+    /**
+     * Redirects to the file list and highlight the given file id
+     *
+     * @param string $fileId file id to show
+     * @return RedirectResponse redirect response or not found response
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function redirectToFile($fileId) {
+        $uid        = $this->userSession->getUser()->getUID();
+        $baseFolder = $this->rootFolder->getUserFolder($uid);
+        $files      = $baseFolder->getById($fileId);
+        $params     = [];
+
+        if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
+            $baseFolder     = $this->rootFolder->get($uid . '/files_trashbin/files/');
+            $files          = $baseFolder->getById($fileId);
+            $params['view'] = 'trashbin';
+        }
+
+        if (!empty($files)) {
+            $file = current($files);
+            if ($file instanceof Folder) {
+                // set the full path to enter the folder
+                $params['dir'] = $baseFolder->getRelativePath($file->getPath());
+            } else {
+                // set parent path as dir
+                $params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
+                // and scroll to the entry
+                $params['scrollto'] = $file->getName();
+            }
+
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
+        }
+        throw new \OCP\Files\NotFoundException();
+    }
 }

lib/private/Security/FeaturePolicy/FeaturePolicyManager.php

Indentation +37 added lines, -37 removed lines

@@ -31,48 +31,48 @@
 use OCP\Security\FeaturePolicy\AddFeaturePolicyEvent;
 
 class FeaturePolicyManager {
-	/** @var EmptyFeaturePolicy[] */
-	private $policies = [];
+    /** @var EmptyFeaturePolicy[] */
+    private $policies = [];
 
-	/** @var IEventDispatcher */
-	private $dispatcher;
+    /** @var IEventDispatcher */
+    private $dispatcher;
 
-	public function __construct(IEventDispatcher $dispatcher) {
-		$this->dispatcher = $dispatcher;
-	}
+    public function __construct(IEventDispatcher $dispatcher) {
+        $this->dispatcher = $dispatcher;
+    }
 
-	public function addDefaultPolicy(EmptyFeaturePolicy $policy): void {
-		$this->policies[] = $policy;
-	}
+    public function addDefaultPolicy(EmptyFeaturePolicy $policy): void {
+        $this->policies[] = $policy;
+    }
 
-	public function getDefaultPolicy(): FeaturePolicy {
-		$event = new AddFeaturePolicyEvent($this);
-		$this->dispatcher->dispatchTyped($event);
+    public function getDefaultPolicy(): FeaturePolicy {
+        $event = new AddFeaturePolicyEvent($this);
+        $this->dispatcher->dispatchTyped($event);
 
-		$defaultPolicy = new FeaturePolicy();
-		foreach ($this->policies as $policy) {
-			$defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
-		}
-		return $defaultPolicy;
-	}
+        $defaultPolicy = new FeaturePolicy();
+        foreach ($this->policies as $policy) {
+            $defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
+        }
+        return $defaultPolicy;
+    }
 
-	/**
-	 * Merges the first given policy with the second one
-	 *
-	 */
-	public function mergePolicies(FeaturePolicy $defaultPolicy,
-								  EmptyFeaturePolicy $originalPolicy): FeaturePolicy {
-		foreach ((object)(array)$originalPolicy as $name => $value) {
-			$setter = 'set' . ucfirst($name);
-			if (\is_array($value)) {
-				$getter = 'get' . ucfirst($name);
-				$currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
-				$defaultPolicy->$setter(\array_values(\array_unique(\array_merge($currentValues, $value))));
-			} elseif (\is_bool($value)) {
-				$defaultPolicy->$setter($value);
-			}
-		}
+    /**
+     * Merges the first given policy with the second one
+     *
+     */
+    public function mergePolicies(FeaturePolicy $defaultPolicy,
+                                    EmptyFeaturePolicy $originalPolicy): FeaturePolicy {
+        foreach ((object)(array)$originalPolicy as $name => $value) {
+            $setter = 'set' . ucfirst($name);
+            if (\is_array($value)) {
+                $getter = 'get' . ucfirst($name);
+                $currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
+                $defaultPolicy->$setter(\array_values(\array_unique(\array_merge($currentValues, $value))));
+            } elseif (\is_bool($value)) {
+                $defaultPolicy->$setter($value);
+            }
+        }
 
-		return $defaultPolicy;
-	}
+        return $defaultPolicy;
+    }
 }

lib/private/Security/CSP/ContentSecurityPolicyManager.php

Indentation +47 added lines, -47 removed lines

@@ -34,58 +34,58 @@
 use OCP\Security\IContentSecurityPolicyManager;
 
 class ContentSecurityPolicyManager implements IContentSecurityPolicyManager {
-	/** @var ContentSecurityPolicy[] */
-	private $policies = [];
+    /** @var ContentSecurityPolicy[] */
+    private $policies = [];
 
-	/** @var IEventDispatcher */
-	private $dispatcher;
+    /** @var IEventDispatcher */
+    private $dispatcher;
 
-	public function __construct(IEventDispatcher $dispatcher) {
-		$this->dispatcher = $dispatcher;
-	}
+    public function __construct(IEventDispatcher $dispatcher) {
+        $this->dispatcher = $dispatcher;
+    }
 
-	/** {@inheritdoc} */
-	public function addDefaultPolicy(EmptyContentSecurityPolicy $policy) {
-		$this->policies[] = $policy;
-	}
+    /** {@inheritdoc} */
+    public function addDefaultPolicy(EmptyContentSecurityPolicy $policy) {
+        $this->policies[] = $policy;
+    }
 
-	/**
-	 * Get the configured default policy. This is not in the public namespace
-	 * as it is only supposed to be used by core itself.
-	 *
-	 * @return ContentSecurityPolicy
-	 */
-	public function getDefaultPolicy(): ContentSecurityPolicy {
-		$event = new AddContentSecurityPolicyEvent($this);
-		$this->dispatcher->dispatchTyped($event);
+    /**
+     * Get the configured default policy. This is not in the public namespace
+     * as it is only supposed to be used by core itself.
+     *
+     * @return ContentSecurityPolicy
+     */
+    public function getDefaultPolicy(): ContentSecurityPolicy {
+        $event = new AddContentSecurityPolicyEvent($this);
+        $this->dispatcher->dispatchTyped($event);
 
-		$defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
-		foreach ($this->policies as $policy) {
-			$defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
-		}
-		return $defaultPolicy;
-	}
+        $defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
+        foreach ($this->policies as $policy) {
+            $defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
+        }
+        return $defaultPolicy;
+    }
 
-	/**
-	 * Merges the first given policy with the second one
-	 *
-	 * @param ContentSecurityPolicy $defaultPolicy
-	 * @param EmptyContentSecurityPolicy $originalPolicy
-	 * @return ContentSecurityPolicy
-	 */
-	public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
-								  EmptyContentSecurityPolicy $originalPolicy): ContentSecurityPolicy {
-		foreach ((object)(array)$originalPolicy as $name => $value) {
-			$setter = 'set'.ucfirst($name);
-			if (\is_array($value)) {
-				$getter = 'get'.ucfirst($name);
-				$currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
-				$defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));
-			} elseif (\is_bool($value)) {
-				$defaultPolicy->$setter($value);
-			}
-		}
+    /**
+     * Merges the first given policy with the second one
+     *
+     * @param ContentSecurityPolicy $defaultPolicy
+     * @param EmptyContentSecurityPolicy $originalPolicy
+     * @return ContentSecurityPolicy
+     */
+    public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
+                                    EmptyContentSecurityPolicy $originalPolicy): ContentSecurityPolicy {
+        foreach ((object)(array)$originalPolicy as $name => $value) {
+            $setter = 'set'.ucfirst($name);
+            if (\is_array($value)) {
+                $getter = 'get'.ucfirst($name);
+                $currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
+                $defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));
+            } elseif (\is_bool($value)) {
+                $defaultPolicy->$setter($value);
+            }
+        }
 
-		return $defaultPolicy;
-	}
+        return $defaultPolicy;
+    }
 }