nextcloud / server

apps/files_external/lib/Command/Import.php

Indentation +183 added lines, -183 removed lines

@@ -39,187 +39,187 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Import extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	private $globalService;
-
-	/**
-	 * @var UserStoragesService
-	 */
-	private $userService;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-
-	/** @var ImportLegacyStoragesService */
-	private $importLegacyStorageService;
-
-	/** @var BackendService */
-	private $backendService;
-
-	function __construct(GlobalStoragesService $globalService,
-						 UserStoragesService $userService,
-						 IUserSession $userSession,
-						 IUserManager $userManager,
-						 ImportLegacyStoragesService $importLegacyStorageService,
-						 BackendService $backendService
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->importLegacyStorageService = $importLegacyStorageService;
-		$this->backendService = $backendService;
-	}
-
-	protected function configure() {
-		$this
-			->setName('files_external:import')
-			->setDescription('Import mount configurations')
-			->addOption(
-				'user',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'user to add the mount configurations for, if not set the mount will be added as system mount'
-			)
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to a json file containing the mounts to import, use "-" to read from stdin'
-			)
-			->addOption(
-				'dry',
-				null,
-				InputOption::VALUE_NONE,
-				'Don\'t save the imported mounts, only list the new mounts'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $input->getOption('user');
-		$path = $input->getArgument('path');
-		if ($path === '-') {
-			$json = file_get_contents('php://stdin');
-		} else {
-			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
-				return 1;
-			}
-			$json = file_get_contents($path);
-		}
-		if (!is_string($json) || strlen($json) < 2) {
-			$output->writeln('<error>Error while reading json</error>');
-			return 1;
-		}
-		$data = json_decode($json, true);
-		if (!is_array($data)) {
-			$output->writeln('<error>Error while parsing json</error>');
-			return 1;
-		}
-
-		$isLegacy = isset($data['user']) || isset($data['group']);
-		if ($isLegacy) {
-			$this->importLegacyStorageService->setData($data);
-			$mounts = $this->importLegacyStorageService->getAllStorages();
-			foreach ($mounts as $mount) {
-				if ($mount->getBackendOption('password') === false) {
-					$output->writeln('<error>Failed to decrypt password</error>');
-					return 1;
-				}
-			}
-		} else {
-			if (!isset($data[0])) { //normalize to an array of mounts
-				$data = [$data];
-			}
-			$mounts = array_map([$this, 'parseData'], $data);
-		}
-
-		if ($user) {
-			// ensure applicables are correct for personal mounts
-			foreach ($mounts as $mount) {
-				$mount->setApplicableGroups([]);
-				$mount->setApplicableUsers([$user]);
-			}
-		}
-
-		$storageService = $this->getStorageService($user);
-
-		$existingMounts = $storageService->getAllStorages();
-
-		foreach ($mounts as $mount) {
-			foreach ($existingMounts as $existingMount) {
-				if (
-					$existingMount->getMountPoint() === $mount->getMountPoint() &&
-					$existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
-					$existingMount->getApplicableUsers() == $mount->getApplicableUsers() &&
-					$existingMount->getBackendOptions() == $mount->getBackendOptions()
-				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
-					return 1;
-				}
-			}
-		}
-
-		if ($input->getOption('dry')) {
-			if (count($mounts) === 0) {
-				$output->writeln('<error>No mounts to be imported</error>');
-				return 1;
-			}
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listInput->setOption('show-password', true);
-			$listCommand->listMounts($user, $mounts, $listInput, $output);
-		} else {
-			foreach ($mounts as $mount) {
-				$storageService->addStorage($mount);
-			}
-		}
-		return 0;
-	}
-
-	private function parseData(array $data) {
-		$mount = new StorageConfig($data['mount_id']);
-		$mount->setMountPoint($data['mount_point']);
-		$mount->setBackend($this->getBackendByClass($data['storage']));
-		$authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
-		$mount->setAuthMechanism($authBackend);
-		$mount->setBackendOptions($data['configuration']);
-		$mount->setMountOptions($data['options']);
-		$mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
-		$mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
-		return $mount;
-	}
-
-	private function getBackendByClass($className) {
-		$backends = $this->backendService->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend->getStorageClass() === $className) {
-				return $backend;
-			}
-		}
-	}
-
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    /**
+     * @var GlobalStoragesService
+     */
+    private $globalService;
+
+    /**
+     * @var UserStoragesService
+     */
+    private $userService;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /** @var ImportLegacyStoragesService */
+    private $importLegacyStorageService;
+
+    /** @var BackendService */
+    private $backendService;
+
+    function __construct(GlobalStoragesService $globalService,
+                            UserStoragesService $userService,
+                            IUserSession $userSession,
+                            IUserManager $userManager,
+                            ImportLegacyStoragesService $importLegacyStorageService,
+                            BackendService $backendService
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->importLegacyStorageService = $importLegacyStorageService;
+        $this->backendService = $backendService;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files_external:import')
+            ->setDescription('Import mount configurations')
+            ->addOption(
+                'user',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'user to add the mount configurations for, if not set the mount will be added as system mount'
+            )
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to a json file containing the mounts to import, use "-" to read from stdin'
+            )
+            ->addOption(
+                'dry',
+                null,
+                InputOption::VALUE_NONE,
+                'Don\'t save the imported mounts, only list the new mounts'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $input->getOption('user');
+        $path = $input->getArgument('path');
+        if ($path === '-') {
+            $json = file_get_contents('php://stdin');
+        } else {
+            if (!file_exists($path)) {
+                $output->writeln('<error>File not found: ' . $path . '</error>');
+                return 1;
+            }
+            $json = file_get_contents($path);
+        }
+        if (!is_string($json) || strlen($json) < 2) {
+            $output->writeln('<error>Error while reading json</error>');
+            return 1;
+        }
+        $data = json_decode($json, true);
+        if (!is_array($data)) {
+            $output->writeln('<error>Error while parsing json</error>');
+            return 1;
+        }
+
+        $isLegacy = isset($data['user']) || isset($data['group']);
+        if ($isLegacy) {
+            $this->importLegacyStorageService->setData($data);
+            $mounts = $this->importLegacyStorageService->getAllStorages();
+            foreach ($mounts as $mount) {
+                if ($mount->getBackendOption('password') === false) {
+                    $output->writeln('<error>Failed to decrypt password</error>');
+                    return 1;
+                }
+            }
+        } else {
+            if (!isset($data[0])) { //normalize to an array of mounts
+                $data = [$data];
+            }
+            $mounts = array_map([$this, 'parseData'], $data);
+        }
+
+        if ($user) {
+            // ensure applicables are correct for personal mounts
+            foreach ($mounts as $mount) {
+                $mount->setApplicableGroups([]);
+                $mount->setApplicableUsers([$user]);
+            }
+        }
+
+        $storageService = $this->getStorageService($user);
+
+        $existingMounts = $storageService->getAllStorages();
+
+        foreach ($mounts as $mount) {
+            foreach ($existingMounts as $existingMount) {
+                if (
+                    $existingMount->getMountPoint() === $mount->getMountPoint() &&
+                    $existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
+                    $existingMount->getApplicableUsers() == $mount->getApplicableUsers() &&
+                    $existingMount->getBackendOptions() == $mount->getBackendOptions()
+                ) {
+                    $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+                    return 1;
+                }
+            }
+        }
+
+        if ($input->getOption('dry')) {
+            if (count($mounts) === 0) {
+                $output->writeln('<error>No mounts to be imported</error>');
+                return 1;
+            }
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listInput->setOption('show-password', true);
+            $listCommand->listMounts($user, $mounts, $listInput, $output);
+        } else {
+            foreach ($mounts as $mount) {
+                $storageService->addStorage($mount);
+            }
+        }
+        return 0;
+    }
+
+    private function parseData(array $data) {
+        $mount = new StorageConfig($data['mount_id']);
+        $mount->setMountPoint($data['mount_point']);
+        $mount->setBackend($this->getBackendByClass($data['storage']));
+        $authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
+        $mount->setAuthMechanism($authBackend);
+        $mount->setBackendOptions($data['configuration']);
+        $mount->setMountOptions($data['options']);
+        $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
+        $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
+        return $mount;
+    }
+
+    private function getBackendByClass($className) {
+        $backends = $this->backendService->getBackends();
+        foreach ($backends as $backend) {
+            if ($backend->getStorageClass() === $className) {
+                return $backend;
+            }
+        }
+    }
+
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

apps/files_external/lib/Settings/Section.php

Indentation +46 added lines, -46 removed lines

@@ -28,55 +28,55 @@
 use OCP\Settings\IIconSection;
 
 class Section implements IIconSection {
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $url;
+    /** @var IL10N */
+    private $l;
+    /** @var IURLGenerator */
+    private $url;
 
-	/**
-	 * @param IURLGenerator $url
-	 * @param IL10N $l
-	 */
-	public function __construct(IURLGenerator $url, IL10N $l) {
-		$this->url = $url;
-		$this->l = $l;
-	}
+    /**
+     * @param IURLGenerator $url
+     * @param IL10N $l
+     */
+    public function __construct(IURLGenerator $url, IL10N $l) {
+        $this->url = $url;
+        $this->l = $l;
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 */
-	public function getID() {
-		return 'externalstorages';
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     */
+    public function getID() {
+        return 'externalstorages';
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->l->t('External storages');
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->l->t('External storages');
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 10;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 10;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getIcon() {
-		return $this->url->imagePath('files_external', 'app-dark.svg');
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getIcon() {
+        return $this->url->imagePath('files_external', 'app-dark.svg');
+    }
 }

apps/files_external/lib/Settings/Admin.php

Indentation +52 added lines, -52 removed lines

@@ -32,65 +32,65 @@
 
 class Admin implements ISettings {
 
-	/** @var IManager */
-	private $encryptionManager;
+    /** @var IManager */
+    private $encryptionManager;
 
-	/** @var GlobalStoragesService */
-	private $globalStoragesService;
+    /** @var GlobalStoragesService */
+    private $globalStoragesService;
 
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	/** @var GlobalAuth	 */
-	private $globalAuth;
+    /** @var GlobalAuth	 */
+    private $globalAuth;
 
-	public function __construct(
-		IManager $encryptionManager,
-		GlobalStoragesService $globalStoragesService,
-		BackendService $backendService,
-		GlobalAuth $globalAuth
-	) {
-		$this->encryptionManager = $encryptionManager;
-		$this->globalStoragesService = $globalStoragesService;
-		$this->backendService = $backendService;
-		$this->globalAuth = $globalAuth;
-	}
+    public function __construct(
+        IManager $encryptionManager,
+        GlobalStoragesService $globalStoragesService,
+        BackendService $backendService,
+        GlobalAuth $globalAuth
+    ) {
+        $this->encryptionManager = $encryptionManager;
+        $this->globalStoragesService = $globalStoragesService;
+        $this->backendService = $backendService;
+        $this->globalAuth = $globalAuth;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
-			'visibilityType'       => BackendService::VISIBILITY_ADMIN,
-			'storages'             => $this->globalStoragesService->getStorages(),
-			'backends'             => $this->backendService->getAvailableBackends(),
-			'authMechanisms'       => $this->backendService->getAuthMechanisms(),
-			'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
-			'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
-			'globalCredentials'    => $this->globalAuth->getAuth(''),
-			'globalCredentialsUid' => '',
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
+            'visibilityType'       => BackendService::VISIBILITY_ADMIN,
+            'storages'             => $this->globalStoragesService->getStorages(),
+            'backends'             => $this->backendService->getAvailableBackends(),
+            'authMechanisms'       => $this->backendService->getAuthMechanisms(),
+            'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
+            'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
+            'globalCredentials'    => $this->globalAuth->getAuth(''),
+            'globalCredentialsUid' => '',
+        ];
 
-		return new TemplateResponse('files_external', 'settings', $parameters, '');
-	}
+        return new TemplateResponse('files_external', 'settings', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'externalstorages';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'externalstorages';
+    }
 
-	/**
-	 * @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 40;
-	}
+    /**
+     * @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 40;
+    }
 
 }

apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php

Indentation +34 added lines, -34 removed lines

@@ -29,43 +29,43 @@
  */
 trait LegacyDependencyCheckPolyfill {
 
-	/**
-	 * @return string
-	 */
-	abstract public function getStorageClass();
+    /**
+     * @return string
+     */
+    abstract public function getStorageClass();
 
-	/**
-	 * Check if object is valid for use
-	 *
-	 * @return MissingDependency[] Unsatisfied dependencies
-	 */
-	public function checkDependencies() {
-		$ret = [];
+    /**
+     * Check if object is valid for use
+     *
+     * @return MissingDependency[] Unsatisfied dependencies
+     */
+    public function checkDependencies() {
+        $ret = [];
 
-		$result = call_user_func([$this->getStorageClass(), 'checkDependencies']);
-		if ($result !== true) {
-			if (!is_array($result)) {
-				$result = [$result];
-			}
-			foreach ($result as $key => $value) {
-				if (!($value instanceof MissingDependency)) {
-					$module = null;
-					$message = null;
-					if (is_numeric($key)) {
-						$module = $value;
-					} else {
-						$module = $key;
-						$message = $value;
-					}
-					$value = new MissingDependency($module, $this);
-					$value->setMessage($message);
-				}
-				$ret[] = $value;
-			}
-		}
+        $result = call_user_func([$this->getStorageClass(), 'checkDependencies']);
+        if ($result !== true) {
+            if (!is_array($result)) {
+                $result = [$result];
+            }
+            foreach ($result as $key => $value) {
+                if (!($value instanceof MissingDependency)) {
+                    $module = null;
+                    $message = null;
+                    if (is_numeric($key)) {
+                        $module = $value;
+                    } else {
+                        $module = $key;
+                        $message = $value;
+                    }
+                    $value = new MissingDependency($module, $this);
+                    $value->setMessage($message);
+                }
+                $ret[] = $value;
+            }
+        }
 
-		return $ret;
-	}
+        return $ret;
+    }
 
 }
 

apps/files_external/lib/Lib/VisibilityTrait.php

Indentation +97 added lines, -97 removed lines

@@ -36,102 +36,102 @@
  */
 trait VisibilityTrait {
 
-	/** @var int visibility */
-	protected $visibility = BackendService::VISIBILITY_DEFAULT;
-
-	/** @var int allowed visibilities */
-	protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
-
-	/**
-	 * @return int
-	 */
-	public function getVisibility() {
-		return $this->visibility;
-	}
-
-	/**
-	 * Check if the backend is visible for a user type
-	 *
-	 * @param int $visibility
-	 * @return bool
-	 */
-	public function isVisibleFor($visibility) {
-		if ($this->visibility & $visibility) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function setVisibility($visibility) {
-		$this->visibility = $visibility;
-		$this->allowedVisibility |= $visibility;
-		return $this;
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function addVisibility($visibility) {
-		return $this->setVisibility($this->visibility | $visibility);
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function removeVisibility($visibility) {
-		return $this->setVisibility($this->visibility & ~$visibility);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getAllowedVisibility() {
-		return $this->allowedVisibility;
-	}
-
-	/**
-	 * Check if the backend is allowed to be visible for a user type
-	 *
-	 * @param int $allowedVisibility
-	 * @return bool
-	 */
-	public function isAllowedVisibleFor($allowedVisibility) {
-		if ($this->allowedVisibility & $allowedVisibility) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function setAllowedVisibility($allowedVisibility) {
-		$this->allowedVisibility = $allowedVisibility;
-		$this->visibility &= $allowedVisibility;
-		return $this;
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function addAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function removeAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
-	}
+    /** @var int visibility */
+    protected $visibility = BackendService::VISIBILITY_DEFAULT;
+
+    /** @var int allowed visibilities */
+    protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
+
+    /**
+     * @return int
+     */
+    public function getVisibility() {
+        return $this->visibility;
+    }
+
+    /**
+     * Check if the backend is visible for a user type
+     *
+     * @param int $visibility
+     * @return bool
+     */
+    public function isVisibleFor($visibility) {
+        if ($this->visibility & $visibility) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param int $visibility
+     * @return self
+     */
+    public function setVisibility($visibility) {
+        $this->visibility = $visibility;
+        $this->allowedVisibility |= $visibility;
+        return $this;
+    }
+
+    /**
+     * @param int $visibility
+     * @return self
+     */
+    public function addVisibility($visibility) {
+        return $this->setVisibility($this->visibility | $visibility);
+    }
+
+    /**
+     * @param int $visibility
+     * @return self
+     */
+    public function removeVisibility($visibility) {
+        return $this->setVisibility($this->visibility & ~$visibility);
+    }
+
+    /**
+     * @return int
+     */
+    public function getAllowedVisibility() {
+        return $this->allowedVisibility;
+    }
+
+    /**
+     * Check if the backend is allowed to be visible for a user type
+     *
+     * @param int $allowedVisibility
+     * @return bool
+     */
+    public function isAllowedVisibleFor($allowedVisibility) {
+        if ($this->allowedVisibility & $allowedVisibility) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param int $allowedVisibility
+     * @return self
+     */
+    public function setAllowedVisibility($allowedVisibility) {
+        $this->allowedVisibility = $allowedVisibility;
+        $this->visibility &= $allowedVisibility;
+        return $this;
+    }
+
+    /**
+     * @param int $allowedVisibility
+     * @return self
+     */
+    public function addAllowedVisibility($allowedVisibility) {
+        return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
+    }
+
+    /**
+     * @param int $allowedVisibility
+     * @return self
+     */
+    public function removeAllowedVisibility($allowedVisibility) {
+        return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
+    }
 
 }

apps/files_external/lib/Lib/DefinitionParameter.php

Indentation +163 added lines, -163 removed lines

@@ -28,167 +28,167 @@
  */
 class DefinitionParameter implements \JsonSerializable {
 
-	/** Value constants */
-	const VALUE_TEXT = 0;
-	const VALUE_BOOLEAN = 1;
-	const VALUE_PASSWORD = 2;
-	const VALUE_HIDDEN = 3;
-
-	/** Flag constants */
-	const FLAG_NONE = 0;
-	const FLAG_OPTIONAL = 1;
-	const FLAG_USER_PROVIDED = 2;
-
-	/** @var string name of parameter */
-	private $name;
-
-	/** @var string human-readable parameter text */
-	private $text;
-
-	/** @var int value type, see self::VALUE_* constants */
-	private $type = self::VALUE_TEXT;
-
-	/** @var int flags, see self::FLAG_* constants */
-	private $flags = self::FLAG_NONE;
-
-	/**
-	 * @param string $name
-	 * @param string $text
-	 */
-	public function __construct($name, $text) {
-		$this->name = $name;
-		$this->text = $text;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getText() {
-		return $this->text;
-	}
-
-	/**
-	 * Get value type
-	 *
-	 * @return int
-	 */
-	public function getType() {
-		return $this->type;
-	}
-
-	/**
-	 * Set value type
-	 *
-	 * @param int $type
-	 * @return self
-	 */
-	public function setType($type) {
-		$this->type = $type;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getTypeName() {
-		switch ($this->type) {
-			case self::VALUE_BOOLEAN:
-				return 'boolean';
-			case self::VALUE_TEXT:
-				return 'text';
-			case self::VALUE_PASSWORD:
-				return 'password';
-			default:
-				return 'unknown';
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getFlags() {
-		return $this->flags;
-	}
-
-	/**
-	 * @param int $flags
-	 * @return self
-	 */
-	public function setFlags($flags) {
-		$this->flags = $flags;
-		return $this;
-	}
-
-	/**
-	 * @param int $flag
-	 * @return self
-	 */
-	public function setFlag($flag) {
-		$this->flags |= $flag;
-		return $this;
-	}
-
-	/**
-	 * @param int $flag
-	 * @return bool
-	 */
-	public function isFlagSet($flag) {
-		return (bool)($this->flags & $flag);
-	}
-
-	/**
-	 * Serialize into JSON for client-side JS
-	 *
-	 * @return string
-	 */
-	public function jsonSerialize() {
-		return [
-			'value' => $this->getText(),
-			'flags' => $this->getFlags(),
-			'type' => $this->getType()
-		];
-	}
-
-	public function isOptional() {
-		return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED);
-	}
-
-	/**
-	 * Validate a parameter value against this
-	 * Convert type as necessary
-	 *
-	 * @param mixed $value Value to check
-	 * @return bool success
-	 */
-	public function validateValue(&$value) {
-		switch ($this->getType()) {
-			case self::VALUE_BOOLEAN:
-				if (!is_bool($value)) {
-					switch ($value) {
-						case 'true':
-							$value = true;
-							break;
-						case 'false':
-							$value = false;
-							break;
-						default:
-							return false;
-					}
-				}
-				break;
-			default:
-				if (!$value && !$this->isOptional()) {
-					return false;
-				}
-				break;
-		}
-		return true;
-	}
+    /** Value constants */
+    const VALUE_TEXT = 0;
+    const VALUE_BOOLEAN = 1;
+    const VALUE_PASSWORD = 2;
+    const VALUE_HIDDEN = 3;
+
+    /** Flag constants */
+    const FLAG_NONE = 0;
+    const FLAG_OPTIONAL = 1;
+    const FLAG_USER_PROVIDED = 2;
+
+    /** @var string name of parameter */
+    private $name;
+
+    /** @var string human-readable parameter text */
+    private $text;
+
+    /** @var int value type, see self::VALUE_* constants */
+    private $type = self::VALUE_TEXT;
+
+    /** @var int flags, see self::FLAG_* constants */
+    private $flags = self::FLAG_NONE;
+
+    /**
+     * @param string $name
+     * @param string $text
+     */
+    public function __construct($name, $text) {
+        $this->name = $name;
+        $this->text = $text;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getText() {
+        return $this->text;
+    }
+
+    /**
+     * Get value type
+     *
+     * @return int
+     */
+    public function getType() {
+        return $this->type;
+    }
+
+    /**
+     * Set value type
+     *
+     * @param int $type
+     * @return self
+     */
+    public function setType($type) {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTypeName() {
+        switch ($this->type) {
+            case self::VALUE_BOOLEAN:
+                return 'boolean';
+            case self::VALUE_TEXT:
+                return 'text';
+            case self::VALUE_PASSWORD:
+                return 'password';
+            default:
+                return 'unknown';
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function getFlags() {
+        return $this->flags;
+    }
+
+    /**
+     * @param int $flags
+     * @return self
+     */
+    public function setFlags($flags) {
+        $this->flags = $flags;
+        return $this;
+    }
+
+    /**
+     * @param int $flag
+     * @return self
+     */
+    public function setFlag($flag) {
+        $this->flags |= $flag;
+        return $this;
+    }
+
+    /**
+     * @param int $flag
+     * @return bool
+     */
+    public function isFlagSet($flag) {
+        return (bool)($this->flags & $flag);
+    }
+
+    /**
+     * Serialize into JSON for client-side JS
+     *
+     * @return string
+     */
+    public function jsonSerialize() {
+        return [
+            'value' => $this->getText(),
+            'flags' => $this->getFlags(),
+            'type' => $this->getType()
+        ];
+    }
+
+    public function isOptional() {
+        return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED);
+    }
+
+    /**
+     * Validate a parameter value against this
+     * Convert type as necessary
+     *
+     * @param mixed $value Value to check
+     * @return bool success
+     */
+    public function validateValue(&$value) {
+        switch ($this->getType()) {
+            case self::VALUE_BOOLEAN:
+                if (!is_bool($value)) {
+                    switch ($value) {
+                        case 'true':
+                            $value = true;
+                            break;
+                        case 'false':
+                            $value = false;
+                            break;
+                        default:
+                            return false;
+                    }
+                }
+                break;
+            default:
+                if (!$value && !$this->isOptional()) {
+                    return false;
+                }
+                break;
+        }
+        return true;
+    }
 }

apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php

Indentation +12 added lines, -12 removed lines

@@ -31,18 +31,18 @@
  */
 class AccessKey extends AuthMechanism {
 
-	const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey';
+    const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey';
 
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('amazons3::accesskey')
-			->setScheme(self::SCHEME_AMAZONS3_ACCESSKEY)
-			->setText($l->t('Access key'))
-			->addParameters([
-				(new DefinitionParameter('key', $l->t('Access key'))),
-				(new DefinitionParameter('secret', $l->t('Secret key')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-			]);
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('amazons3::accesskey')
+            ->setScheme(self::SCHEME_AMAZONS3_ACCESSKEY)
+            ->setText($l->t('Access key'))
+            ->addParameters([
+                (new DefinitionParameter('key', $l->t('Access key'))),
+                (new DefinitionParameter('secret', $l->t('Secret key')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+            ]);
+    }
 
 }

apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php

Indentation +21 added lines, -21 removed lines

@@ -39,31 +39,31 @@
  */
 class SessionCredentials extends AuthMechanism {
 
-	/** @var CredentialsStore */
-	private $credentialsStore;
+    /** @var CredentialsStore */
+    private $credentialsStore;
 
-	public function __construct(IL10N $l, CredentialsStore $credentialsStore) {
-		$this->credentialsStore = $credentialsStore;
+    public function __construct(IL10N $l, CredentialsStore $credentialsStore) {
+        $this->credentialsStore = $credentialsStore;
 
-		$this->setIdentifier('password::sessioncredentials')
-			->setScheme(self::SCHEME_PASSWORD)
-			->setText($l->t('Log-in credentials, save in session'))
-			->addParameters([]);
-	}
+        $this->setIdentifier('password::sessioncredentials')
+            ->setScheme(self::SCHEME_PASSWORD)
+            ->setText($l->t('Log-in credentials, save in session'))
+            ->addParameters([]);
+    }
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		try {
-			$credentials = $this->credentialsStore->getLoginCredentials();
-		} catch (CredentialsUnavailableException $e) {
-			throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved');
-		}
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        try {
+            $credentials = $this->credentialsStore->getLoginCredentials();
+        } catch (CredentialsUnavailableException $e) {
+            throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved');
+        }
 
-		$storage->setBackendOption('user', $credentials->getLoginName());
-		$storage->setBackendOption('password', $credentials->getPassword());
-	}
+        $storage->setBackendOption('user', $credentials->getLoginName());
+        $storage->setBackendOption('password', $credentials->getPassword());
+    }
 
-	public function wrapStorage(Storage $storage) {
-		return new SessionStorageWrapper(['storage' => $storage]);
-	}
+    public function wrapStorage(Storage $storage) {
+        return new SessionStorageWrapper(['storage' => $storage]);
+    }
 
 }

apps/files_external/lib/Lib/Auth/Password/Password.php

Indentation +11 added lines, -11 removed lines

@@ -31,16 +31,16 @@
  */
 class Password extends AuthMechanism {
 
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('password::password')
-			->setScheme(self::SCHEME_PASSWORD)
-			->setText($l->t('Username and password'))
-			->addParameters([
-				(new DefinitionParameter('user', $l->t('Username'))),
-				(new DefinitionParameter('password', $l->t('Password')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-			]);
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('password::password')
+            ->setScheme(self::SCHEME_PASSWORD)
+            ->setText($l->t('Username and password'))
+            ->addParameters([
+                (new DefinitionParameter('user', $l->t('Username'))),
+                (new DefinitionParameter('password', $l->t('Password')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+            ]);
+    }
 
 }