nextcloud / server

lib/private/Encryption/File.php

Indentation +90 added lines, -90 removed lines

@@ -31,95 +31,95 @@
 
 class File implements \OCP\Encryption\IFile {
 
-	/** @var Util */
-	protected $util;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IManager */
-	private $shareManager;
-
-	/**
-	 * cache results of already checked folders
-	 *
-	 * @var array
-	 */
-	protected $cache;
-
-	public function __construct(Util $util,
-								IRootFolder $rootFolder,
-								IManager $shareManager) {
-		$this->util = $util;
-		$this->cache = new CappedMemoryCache();
-		$this->rootFolder = $rootFolder;
-		$this->shareManager = $shareManager;
-	}
-
-
-	/**
-	 * get list of users with access to the file
-	 *
-	 * @param string $path to the file
-	 * @return array  ['users' => $uniqueUserIds, 'public' => $public]
-	 */
-	public function getAccessList($path) {
-
-		// Make sure that a share key is generated for the owner too
-		list($owner, $ownerPath) = $this->util->getUidAndFilename($path);
-
-		// always add owner to the list of users with access to the file
-		$userIds = array($owner);
-
-		if (!$this->util->isFile($owner . '/' . $ownerPath)) {
-			return array('users' => $userIds, 'public' => false);
-		}
-
-		$ownerPath = substr($ownerPath, strlen('/files'));
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		try {
-			$file = $userFolder->get($ownerPath);
-		} catch (NotFoundException $e) {
-			$file = null;
-		}
-		$ownerPath = $this->util->stripPartialFileExtension($ownerPath);
-
-		// first get the shares for the parent and cache the result so that we don't
-		// need to check all parents for every file
-		$parent = dirname($ownerPath);
-		$parentNode = $userFolder->get($parent);
-		if (isset($this->cache[$parent])) {
-			$resultForParents = $this->cache[$parent];
-		} else {
-			$resultForParents = $this->shareManager->getAccessList($parentNode);
-			$this->cache[$parent] = $resultForParents;
-		}
-		$userIds = array_merge($userIds, $resultForParents['users']);
-		$public = $resultForParents['public'] || $resultForParents['remote'];
-
-
-		// Find out who, if anyone, is sharing the file
-		if ($file !== null) {
-			$resultForFile = $this->shareManager->getAccessList($file, false);
-			$userIds = array_merge($userIds, $resultForFile['users']);
-			$public = $resultForFile['public'] || $resultForFile['remote'] || $public;
-		}
-
-		// check if it is a group mount
-		if (\OCP\App::isEnabled("files_external")) {
-			$mounts = \OC_Mount_Config::getSystemMountPoints();
-			foreach ($mounts as $mount) {
-				if ($mount['mountpoint'] == substr($ownerPath, 1, strlen($mount['mountpoint']))) {
-					$mountedFor = $this->util->getUserWithAccessToMountPoint($mount['applicable']['users'], $mount['applicable']['groups']);
-					$userIds = array_merge($userIds, $mountedFor);
-				}
-			}
-		}
-
-		// Remove duplicate UIDs
-		$uniqueUserIds = array_unique($userIds);
-
-		return array('users' => $uniqueUserIds, 'public' => $public);
-	}
+    /** @var Util */
+    protected $util;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IManager */
+    private $shareManager;
+
+    /**
+     * cache results of already checked folders
+     *
+     * @var array
+     */
+    protected $cache;
+
+    public function __construct(Util $util,
+                                IRootFolder $rootFolder,
+                                IManager $shareManager) {
+        $this->util = $util;
+        $this->cache = new CappedMemoryCache();
+        $this->rootFolder = $rootFolder;
+        $this->shareManager = $shareManager;
+    }
+
+
+    /**
+     * get list of users with access to the file
+     *
+     * @param string $path to the file
+     * @return array  ['users' => $uniqueUserIds, 'public' => $public]
+     */
+    public function getAccessList($path) {
+
+        // Make sure that a share key is generated for the owner too
+        list($owner, $ownerPath) = $this->util->getUidAndFilename($path);
+
+        // always add owner to the list of users with access to the file
+        $userIds = array($owner);
+
+        if (!$this->util->isFile($owner . '/' . $ownerPath)) {
+            return array('users' => $userIds, 'public' => false);
+        }
+
+        $ownerPath = substr($ownerPath, strlen('/files'));
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        try {
+            $file = $userFolder->get($ownerPath);
+        } catch (NotFoundException $e) {
+            $file = null;
+        }
+        $ownerPath = $this->util->stripPartialFileExtension($ownerPath);
+
+        // first get the shares for the parent and cache the result so that we don't
+        // need to check all parents for every file
+        $parent = dirname($ownerPath);
+        $parentNode = $userFolder->get($parent);
+        if (isset($this->cache[$parent])) {
+            $resultForParents = $this->cache[$parent];
+        } else {
+            $resultForParents = $this->shareManager->getAccessList($parentNode);
+            $this->cache[$parent] = $resultForParents;
+        }
+        $userIds = array_merge($userIds, $resultForParents['users']);
+        $public = $resultForParents['public'] || $resultForParents['remote'];
+
+
+        // Find out who, if anyone, is sharing the file
+        if ($file !== null) {
+            $resultForFile = $this->shareManager->getAccessList($file, false);
+            $userIds = array_merge($userIds, $resultForFile['users']);
+            $public = $resultForFile['public'] || $resultForFile['remote'] || $public;
+        }
+
+        // check if it is a group mount
+        if (\OCP\App::isEnabled("files_external")) {
+            $mounts = \OC_Mount_Config::getSystemMountPoints();
+            foreach ($mounts as $mount) {
+                if ($mount['mountpoint'] == substr($ownerPath, 1, strlen($mount['mountpoint']))) {
+                    $mountedFor = $this->util->getUserWithAccessToMountPoint($mount['applicable']['users'], $mount['applicable']['groups']);
+                    $userIds = array_merge($userIds, $mountedFor);
+                }
+            }
+        }
+
+        // Remove duplicate UIDs
+        $uniqueUserIds = array_unique($userIds);
+
+        return array('users' => $uniqueUserIds, 'public' => $public);
+    }
 
 }

lib/private/Share20/ShareHelper.php

Indentation +183 added lines, -183 removed lines

@@ -31,187 +31,187 @@
 
 class ShareHelper implements IShareHelper {
 
-	/** @var IManager */
-	private $shareManager;
-
-	public function __construct(IManager $shareManager) {
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * @param Node $node
-	 * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
-	 */
-	public function getPathsForAccessList(Node $node) {
-		$result = [
-			'users' => [],
-			'remotes' => [],
-		];
-
-		$accessList = $this->shareManager->getAccessList($node, true, true);
-		if (!empty($accessList['users'])) {
-			$result['users'] = $this->getPathsForUsers($node, $accessList['users']);
-		}
-		if (!empty($accessList['remote'])) {
-			$result['remotes'] = $this->getPathsForRemotes($node, $accessList['remote']);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Sample:
-	 * $users = [
-	 *   'test1' => ['node_id' => 16, 'node_path' => '/foo'],
-	 *   'test2' => ['node_id' => 23, 'node_path' => '/bar'],
-	 *   'test3' => ['node_id' => 42, 'node_path' => '/cat'],
-	 *   'test4' => ['node_id' => 48, 'node_path' => '/dog'],
-	 * ];
-	 *
-	 * Node tree:
-	 * - SixTeen is the parent of TwentyThree
-	 * - TwentyThree is the parent of FortyTwo
-	 * - FortyEight does not exist
-	 *
-	 * $return = [
-	 *   'test1' => '/foo/TwentyThree/FortyTwo',
-	 *   'test2' => '/bar/FortyTwo',
-	 *   'test3' => '/cat',
-	 * ],
-	 *
-	 * @param Node $node
-	 * @param array[] $users
-	 * @return array
-	 */
-	protected function getPathsForUsers(Node $node, array $users) {
-		/** @var array[] $byId */
-		$byId = [];
-		/** @var array[] $results */
-		$results = [];
-
-		foreach ($users as $uid => $info) {
-			if (!isset($byId[$info['node_id']])) {
-				$byId[$info['node_id']] = [];
-			}
-			$byId[$info['node_id']][$uid] = $info['node_path'];
-		}
-
-		try {
-			if (isset($byId[$node->getId()])) {
-				foreach ($byId[$node->getId()] as $uid => $path) {
-					$results[$uid] = $path;
-				}
-				unset($byId[$node->getId()]);
-			}
-		} catch (NotFoundException $e) {
-			return $results;
-		} catch (InvalidPathException $e) {
-			return $results;
-		}
-
-		if (empty($byId)) {
-			return $results;
-		}
-
-		$item = $node;
-		$appendix = '/' . $node->getName();
-		while (!empty($byId)) {
-			try {
-				/** @var Node $item */
-				$item = $item->getParent();
-
-				if (!empty($byId[$item->getId()])) {
-					foreach ($byId[$item->getId()] as $uid => $path) {
-						$results[$uid] = $path . $appendix;
-					}
-					unset($byId[$item->getId()]);
-				}
-
-				$appendix = '/' . $item->getName() . $appendix;
-			} catch (NotFoundException $e) {
-				return $results;
-			} catch (InvalidPathException $e) {
-				return $results;
-			} catch (NotPermittedException $e) {
-				return $results;
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Sample:
-	 * $remotes = [
-	 *   'test1' => ['node_id' => 16, 'token' => 't1'],
-	 *   'test2' => ['node_id' => 23, 'token' => 't2'],
-	 *   'test3' => ['node_id' => 42, 'token' => 't3'],
-	 *   'test4' => ['node_id' => 48, 'token' => 't4'],
-	 * ];
-	 *
-	 * Node tree:
-	 * - SixTeen is the parent of TwentyThree
-	 * - TwentyThree is the parent of FortyTwo
-	 * - FortyEight does not exist
-	 *
-	 * $return = [
-	 *   'test1' => ['token' => 't1', 'node_path' => '/SixTeen'],
-	 *   'test2' => ['token' => 't2', 'node_path' => '/SixTeen/TwentyThree'],
-	 *   'test3' => ['token' => 't3', 'node_path' => '/SixTeen/TwentyThree/FortyTwo'],
-	 * ],
-	 *
-	 * @param Node $node
-	 * @param array[] $remotes
-	 * @return array
-	 */
-	protected function getPathsForRemotes(Node $node, array $remotes) {
-		/** @var array[] $byId */
-		$byId = [];
-		/** @var array[] $results */
-		$results = [];
-
-		foreach ($remotes as $cloudId => $info) {
-			if (!isset($byId[$info['node_id']])) {
-				$byId[$info['node_id']] = [];
-			}
-			$byId[$info['node_id']][$cloudId] = $info['token'];
-		}
-
-		$item = $node;
-		while (!empty($byId)) {
-			try {
-				if (!empty($byId[$item->getId()])) {
-					$path = $this->getMountedPath($item);
-					foreach ($byId[$item->getId()] as $uid => $token) {
-						$results[$uid] = [
-							'node_path' => $path,
-							'token' => $token,
-						];
-					}
-					unset($byId[$item->getId()]);
-				}
-
-				/** @var Node $item */
-				$item = $item->getParent();
-			} catch (NotFoundException $e) {
-				return $results;
-			} catch (InvalidPathException $e) {
-				return $results;
-			} catch (NotPermittedException $e) {
-				return $results;
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * @param Node $node
-	 * @return string
-	 */
-	protected function getMountedPath(Node $node) {
-		$path = $node->getPath();
-		$sections = explode('/', $path, 4);
-		return '/' . $sections[3];
-	}
+    /** @var IManager */
+    private $shareManager;
+
+    public function __construct(IManager $shareManager) {
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * @param Node $node
+     * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
+     */
+    public function getPathsForAccessList(Node $node) {
+        $result = [
+            'users' => [],
+            'remotes' => [],
+        ];
+
+        $accessList = $this->shareManager->getAccessList($node, true, true);
+        if (!empty($accessList['users'])) {
+            $result['users'] = $this->getPathsForUsers($node, $accessList['users']);
+        }
+        if (!empty($accessList['remote'])) {
+            $result['remotes'] = $this->getPathsForRemotes($node, $accessList['remote']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Sample:
+     * $users = [
+     *   'test1' => ['node_id' => 16, 'node_path' => '/foo'],
+     *   'test2' => ['node_id' => 23, 'node_path' => '/bar'],
+     *   'test3' => ['node_id' => 42, 'node_path' => '/cat'],
+     *   'test4' => ['node_id' => 48, 'node_path' => '/dog'],
+     * ];
+     *
+     * Node tree:
+     * - SixTeen is the parent of TwentyThree
+     * - TwentyThree is the parent of FortyTwo
+     * - FortyEight does not exist
+     *
+     * $return = [
+     *   'test1' => '/foo/TwentyThree/FortyTwo',
+     *   'test2' => '/bar/FortyTwo',
+     *   'test3' => '/cat',
+     * ],
+     *
+     * @param Node $node
+     * @param array[] $users
+     * @return array
+     */
+    protected function getPathsForUsers(Node $node, array $users) {
+        /** @var array[] $byId */
+        $byId = [];
+        /** @var array[] $results */
+        $results = [];
+
+        foreach ($users as $uid => $info) {
+            if (!isset($byId[$info['node_id']])) {
+                $byId[$info['node_id']] = [];
+            }
+            $byId[$info['node_id']][$uid] = $info['node_path'];
+        }
+
+        try {
+            if (isset($byId[$node->getId()])) {
+                foreach ($byId[$node->getId()] as $uid => $path) {
+                    $results[$uid] = $path;
+                }
+                unset($byId[$node->getId()]);
+            }
+        } catch (NotFoundException $e) {
+            return $results;
+        } catch (InvalidPathException $e) {
+            return $results;
+        }
+
+        if (empty($byId)) {
+            return $results;
+        }
+
+        $item = $node;
+        $appendix = '/' . $node->getName();
+        while (!empty($byId)) {
+            try {
+                /** @var Node $item */
+                $item = $item->getParent();
+
+                if (!empty($byId[$item->getId()])) {
+                    foreach ($byId[$item->getId()] as $uid => $path) {
+                        $results[$uid] = $path . $appendix;
+                    }
+                    unset($byId[$item->getId()]);
+                }
+
+                $appendix = '/' . $item->getName() . $appendix;
+            } catch (NotFoundException $e) {
+                return $results;
+            } catch (InvalidPathException $e) {
+                return $results;
+            } catch (NotPermittedException $e) {
+                return $results;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Sample:
+     * $remotes = [
+     *   'test1' => ['node_id' => 16, 'token' => 't1'],
+     *   'test2' => ['node_id' => 23, 'token' => 't2'],
+     *   'test3' => ['node_id' => 42, 'token' => 't3'],
+     *   'test4' => ['node_id' => 48, 'token' => 't4'],
+     * ];
+     *
+     * Node tree:
+     * - SixTeen is the parent of TwentyThree
+     * - TwentyThree is the parent of FortyTwo
+     * - FortyEight does not exist
+     *
+     * $return = [
+     *   'test1' => ['token' => 't1', 'node_path' => '/SixTeen'],
+     *   'test2' => ['token' => 't2', 'node_path' => '/SixTeen/TwentyThree'],
+     *   'test3' => ['token' => 't3', 'node_path' => '/SixTeen/TwentyThree/FortyTwo'],
+     * ],
+     *
+     * @param Node $node
+     * @param array[] $remotes
+     * @return array
+     */
+    protected function getPathsForRemotes(Node $node, array $remotes) {
+        /** @var array[] $byId */
+        $byId = [];
+        /** @var array[] $results */
+        $results = [];
+
+        foreach ($remotes as $cloudId => $info) {
+            if (!isset($byId[$info['node_id']])) {
+                $byId[$info['node_id']] = [];
+            }
+            $byId[$info['node_id']][$cloudId] = $info['token'];
+        }
+
+        $item = $node;
+        while (!empty($byId)) {
+            try {
+                if (!empty($byId[$item->getId()])) {
+                    $path = $this->getMountedPath($item);
+                    foreach ($byId[$item->getId()] as $uid => $token) {
+                        $results[$uid] = [
+                            'node_path' => $path,
+                            'token' => $token,
+                        ];
+                    }
+                    unset($byId[$item->getId()]);
+                }
+
+                /** @var Node $item */
+                $item = $item->getParent();
+            } catch (NotFoundException $e) {
+                return $results;
+            } catch (InvalidPathException $e) {
+                return $results;
+            } catch (NotPermittedException $e) {
+                return $results;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * @param Node $node
+     * @return string
+     */
+    protected function getMountedPath(Node $node) {
+        $path = $node->getPath();
+        $sections = explode('/', $path, 4);
+        return '/' . $sections[3];
+    }
 }

apps/sharebymail/lib/Settings/SettingsManager.php

Indentation +30 added lines, -30 removed lines

@@ -27,35 +27,35 @@
 
 class SettingsManager {
 
-	/** @var IConfig */
-	private $config;
-
-	private $sendPasswordByMailDefault = 'yes';
-
-	private $enforcePasswordProtectionDefault = 'no';
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
-
-	/**
-	 * should the password for a mail share be send to the recipient
-	 *
-	 * @return bool
-	 */
-	public function sendPasswordByMail() {
-		$sendPasswordByMail = $this->config->getAppValue('sharebymail', 'sendpasswordmail', $this->sendPasswordByMailDefault);
-		return $sendPasswordByMail === 'yes';
-	}
-
-	/**
-	 * do we require a share by mail to be password protected
-	 *
-	 * @return bool
-	 */
-	public function enforcePasswordProtection() {
-		$enforcePassword = $this->config->getAppValue('sharebymail', 'enforcePasswordProtection', $this->enforcePasswordProtectionDefault);
-		return $enforcePassword === 'yes';
-	}
+    /** @var IConfig */
+    private $config;
+
+    private $sendPasswordByMailDefault = 'yes';
+
+    private $enforcePasswordProtectionDefault = 'no';
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
+
+    /**
+     * should the password for a mail share be send to the recipient
+     *
+     * @return bool
+     */
+    public function sendPasswordByMail() {
+        $sendPasswordByMail = $this->config->getAppValue('sharebymail', 'sendpasswordmail', $this->sendPasswordByMailDefault);
+        return $sendPasswordByMail === 'yes';
+    }
+
+    /**
+     * do we require a share by mail to be password protected
+     *
+     * @return bool
+     */
+    public function enforcePasswordProtection() {
+        $enforcePassword = $this->config->getAppValue('sharebymail', 'enforcePasswordProtection', $this->enforcePasswordProtectionDefault);
+        return $enforcePassword === 'yes';
+    }
 
 }

apps/sharebymail/lib/Settings/Admin.php

Indentation +31 added lines, -31 removed lines

@@ -27,42 +27,42 @@
 
 class Admin implements ISettings {
 
-	/** @var SettingsManager */
-	private $settingsManager;
+    /** @var SettingsManager */
+    private $settingsManager;
 
-	public function __construct(SettingsManager $settingsManager) {
-		$this->settingsManager = $settingsManager;
-	}
+    public function __construct(SettingsManager $settingsManager) {
+        $this->settingsManager = $settingsManager;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
 
-		$parameters = [
-			'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(),
-			'enforcePasswordProtection' => $this->settingsManager->enforcePasswordProtection()
-		];
+        $parameters = [
+            'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(),
+            'enforcePasswordProtection' => $this->settingsManager->enforcePasswordProtection()
+        ];
 
-		return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @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/sharebymail/lib/Settings.php

Indentation +23 added lines, -23 removed lines

@@ -27,27 +27,27 @@
 
 class Settings {
 
-	/** @var SettingsManager */
-	private $settingsManager;
-
-	public function __construct(SettingsManager $settingsManager) {
-		$this->settingsManager = $settingsManager;
-	}
-
-	/**
-	 * announce that the share-by-mail share provider is enabled
-	 *
-	 * @param array $settings
-	 */
-	public function announceShareProvider(array $settings) {
-		$array = json_decode($settings['array']['oc_appconfig'], true);
-		$array['shareByMailEnabled'] = true;
-		$settings['array']['oc_appconfig'] = json_encode($array);
-	}
-
-	public function announceShareByMailSettings(array $settings) {
-		$array = json_decode($settings['array']['oc_appconfig'], true);
-		$array['shareByMail']['enforcePasswordProtection'] = $this->settingsManager->enforcePasswordProtection();
-		$settings['array']['oc_appconfig'] = json_encode($array);
-	}
+    /** @var SettingsManager */
+    private $settingsManager;
+
+    public function __construct(SettingsManager $settingsManager) {
+        $this->settingsManager = $settingsManager;
+    }
+
+    /**
+     * announce that the share-by-mail share provider is enabled
+     *
+     * @param array $settings
+     */
+    public function announceShareProvider(array $settings) {
+        $array = json_decode($settings['array']['oc_appconfig'], true);
+        $array['shareByMailEnabled'] = true;
+        $settings['array']['oc_appconfig'] = json_encode($array);
+    }
+
+    public function announceShareByMailSettings(array $settings) {
+        $array = json_decode($settings['array']['oc_appconfig'], true);
+        $array['shareByMail']['enforcePasswordProtection'] = $this->settingsManager->enforcePasswordProtection();
+        $settings['array']['oc_appconfig'] = json_encode($array);
+    }
 }

apps/user_ldap/lib/LogWrapper.php

Indentation +8 added lines, -8 removed lines

@@ -28,13 +28,13 @@
  * @brief wraps around static Nextcloud core methods
  */
 class LogWrapper {
-	protected $app = 'user_ldap';
+    protected $app = 'user_ldap';
 
-	/**
-	 * @brief states whether the filesystem was loaded
-	 * @return bool
-	 */
-	public function log($msg, $level) {
-		\OCP\Util::writeLog($this->app, $msg, $level);
-	}
+    /**
+     * @brief states whether the filesystem was loaded
+     * @return bool
+     */
+    public function log($msg, $level) {
+        \OCP\Util::writeLog($this->app, $msg, $level);
+    }
 }

apps/user_ldap/lib/FilesystemHelper.php

Indentation +14 added lines, -14 removed lines

@@ -29,19 +29,19 @@
  */
 class FilesystemHelper {
 
-	/**
-	 * @brief states whether the filesystem was loaded
-	 * @return bool
-	 */
-	public function isLoaded() {
-		return \OC\Files\Filesystem::$loaded;
-	}
+    /**
+     * @brief states whether the filesystem was loaded
+     * @return bool
+     */
+    public function isLoaded() {
+        return \OC\Files\Filesystem::$loaded;
+    }
 
-	/**
-	 * @brief initializes the filesystem for the given user
-	 * @param string $uid the Nextcloud username of the user
-	 */
-	public function setup($uid) {
-		\OC_Util::setupFS($uid);
-	}
+    /**
+     * @brief initializes the filesystem for the given user
+     * @param string $uid the Nextcloud username of the user
+     */
+    public function setup($uid) {
+        \OC_Util::setupFS($uid);
+    }
 }

apps/federation/lib/Controller/SettingsController.php

Indentation +86 added lines, -86 removed lines

@@ -34,91 +34,91 @@
 
 class SettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var  TrustedServers */
-	private $trustedServers;
-
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param TrustedServers $trustedServers
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IL10N $l10n,
-								TrustedServers $trustedServers
-	) {
-		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->trustedServers = $trustedServers;
-	}
-
-
-	/**
-	 * add server to the list of trusted Nextclouds
-	 *
-	 * @param string $url
-	 * @return DataResponse
-	 * @throws HintException
-	 */
-	public function addServer($url) {
-		$this->checkServer($url);
-		$id = $this->trustedServers->addServer($url);
-
-		return new DataResponse(
-			[
-				'url' => $url,
-				'id' => $id,
-				'message' => (string) $this->l->t('Added to the list of trusted servers')
-			]
-		);
-	}
-
-	/**
-	 * add server to the list of trusted Nextclouds
-	 *
-	 * @param int $id
-	 * @return DataResponse
-	 */
-	public function removeServer($id) {
-		$this->trustedServers->removeServer($id);
-		return new DataResponse();
-	}
-
-	/**
-	 * enable/disable to automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @param bool $autoAddServers
-	 */
-	public function autoAddServers($autoAddServers) {
-		$this->trustedServers->setAutoAddServers($autoAddServers);
-	}
-
-	/**
-	 * check if the server should be added to the list of trusted servers or not
-	 *
-	 * @param string $url
-	 * @return bool
-	 * @throws HintException
-	 */
-	protected function checkServer($url) {
-		if ($this->trustedServers->isTrustedServer($url) === true) {
-			$message = 'Server is already in the list of trusted servers.';
-			$hint = $this->l->t('Server is already in the list of trusted servers.');
-			throw new HintException($message, $hint);
-		}
-
-		if ($this->trustedServers->isOwnCloudServer($url) === false) {
-			$message = 'No server to federate with found';
-			$hint = $this->l->t('No server to federate with found');
-			throw new HintException($message, $hint);
-		}
-
-		return true;
-	}
+    /** @var IL10N */
+    private $l;
+
+    /** @var  TrustedServers */
+    private $trustedServers;
+
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param TrustedServers $trustedServers
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                TrustedServers $trustedServers
+    ) {
+        parent::__construct($AppName, $request);
+        $this->l = $l10n;
+        $this->trustedServers = $trustedServers;
+    }
+
+
+    /**
+     * add server to the list of trusted Nextclouds
+     *
+     * @param string $url
+     * @return DataResponse
+     * @throws HintException
+     */
+    public function addServer($url) {
+        $this->checkServer($url);
+        $id = $this->trustedServers->addServer($url);
+
+        return new DataResponse(
+            [
+                'url' => $url,
+                'id' => $id,
+                'message' => (string) $this->l->t('Added to the list of trusted servers')
+            ]
+        );
+    }
+
+    /**
+     * add server to the list of trusted Nextclouds
+     *
+     * @param int $id
+     * @return DataResponse
+     */
+    public function removeServer($id) {
+        $this->trustedServers->removeServer($id);
+        return new DataResponse();
+    }
+
+    /**
+     * enable/disable to automatically add servers to the list of trusted servers
+     * once a federated share was created and accepted successfully
+     *
+     * @param bool $autoAddServers
+     */
+    public function autoAddServers($autoAddServers) {
+        $this->trustedServers->setAutoAddServers($autoAddServers);
+    }
+
+    /**
+     * check if the server should be added to the list of trusted servers or not
+     *
+     * @param string $url
+     * @return bool
+     * @throws HintException
+     */
+    protected function checkServer($url) {
+        if ($this->trustedServers->isTrustedServer($url) === true) {
+            $message = 'Server is already in the list of trusted servers.';
+            $hint = $this->l->t('Server is already in the list of trusted servers.');
+            throw new HintException($message, $hint);
+        }
+
+        if ($this->trustedServers->isOwnCloudServer($url) === false) {
+            $message = 'No server to federate with found';
+            $hint = $this->l->t('No server to federate with found');
+            throw new HintException($message, $hint);
+        }
+
+        return true;
+    }
 
 }

apps/files_external/lib/Migration/StorageMigrator.php

Indentation +83 added lines, -83 removed lines

@@ -42,97 +42,97 @@
  * Migrate mount config from mount.json to the database
  */
 class StorageMigrator {
-	/**
-	 * @var BackendService
-	 */
-	private $backendService;
+    /**
+     * @var BackendService
+     */
+    private $backendService;
 
-	/**
-	 * @var DBConfigService
-	 */
-	private $dbConfig;
+    /**
+     * @var DBConfigService
+     */
+    private $dbConfig;
 
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
 
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
+    /**
+     * @var ILogger
+     */
+    private $logger;
 
-	/** @var IUserMountCache  */
-	private $userMountCache;
+    /** @var IUserMountCache  */
+    private $userMountCache;
 
-	/**
-	 * StorageMigrator constructor.
-	 *
-	 * @param BackendService $backendService
-	 * @param DBConfigService $dbConfig
-	 * @param IConfig $config
-	 * @param IDBConnection $connection
-	 * @param ILogger $logger
-	 * @param IUserMountCache $userMountCache
-	 */
-	public function __construct(
-		BackendService $backendService,
-		DBConfigService $dbConfig,
-		IConfig $config,
-		IDBConnection $connection,
-		ILogger $logger,
-		IUserMountCache $userMountCache
-	) {
-		$this->backendService = $backendService;
-		$this->dbConfig = $dbConfig;
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->logger = $logger;
-		$this->userMountCache = $userMountCache;
-	}
+    /**
+     * StorageMigrator constructor.
+     *
+     * @param BackendService $backendService
+     * @param DBConfigService $dbConfig
+     * @param IConfig $config
+     * @param IDBConnection $connection
+     * @param ILogger $logger
+     * @param IUserMountCache $userMountCache
+     */
+    public function __construct(
+        BackendService $backendService,
+        DBConfigService $dbConfig,
+        IConfig $config,
+        IDBConnection $connection,
+        ILogger $logger,
+        IUserMountCache $userMountCache
+    ) {
+        $this->backendService = $backendService;
+        $this->dbConfig = $dbConfig;
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->logger = $logger;
+        $this->userMountCache = $userMountCache;
+    }
 
-	private function migrate(LegacyStoragesService $legacyService, StoragesService $storageService) {
-		$existingStorage = $legacyService->getAllStorages();
+    private function migrate(LegacyStoragesService $legacyService, StoragesService $storageService) {
+        $existingStorage = $legacyService->getAllStorages();
 
-		$this->connection->beginTransaction();
-		try {
-			foreach ($existingStorage as $storage) {
-				$mountOptions = $storage->getMountOptions();
-				if (!empty($mountOptions) && !isset($mountOptions['enable_sharing'])) {
-					// existing mounts must have sharing enabled by default to avoid surprises
-					$mountOptions['enable_sharing'] = true;
-					$storage->setMountOptions($mountOptions);
-				}
-				$storageService->addStorage($storage);
-			}
-			$this->connection->commit();
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			$this->connection->rollBack();
-		}
-	}
+        $this->connection->beginTransaction();
+        try {
+            foreach ($existingStorage as $storage) {
+                $mountOptions = $storage->getMountOptions();
+                if (!empty($mountOptions) && !isset($mountOptions['enable_sharing'])) {
+                    // existing mounts must have sharing enabled by default to avoid surprises
+                    $mountOptions['enable_sharing'] = true;
+                    $storage->setMountOptions($mountOptions);
+                }
+                $storageService->addStorage($storage);
+            }
+            $this->connection->commit();
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            $this->connection->rollBack();
+        }
+    }
 
-	/**
-	 * Migrate personal storages configured by the current user
-	 *
-	 * @param IUser $user
-	 */
-	public function migrateUser(IUser $user) {
-		$dummySession = new DummyUserSession();
-		$dummySession->setUser($user);
-		$userId = $user->getUID();
-		$userVersion = $this->config->getUserValue($userId, 'files_external', 'config_version', '0.0.0');
-		if (version_compare($userVersion, '0.5.0', '<')) {
-			$this->config->setUserValue($userId, 'files_external', 'config_version', '0.5.0');
-			$legacyService = new UserLegacyStoragesService($this->backendService, $dummySession);
-			$storageService = new UserStoragesService($this->backendService, $this->dbConfig, $dummySession, $this->userMountCache);
+    /**
+     * Migrate personal storages configured by the current user
+     *
+     * @param IUser $user
+     */
+    public function migrateUser(IUser $user) {
+        $dummySession = new DummyUserSession();
+        $dummySession->setUser($user);
+        $userId = $user->getUID();
+        $userVersion = $this->config->getUserValue($userId, 'files_external', 'config_version', '0.0.0');
+        if (version_compare($userVersion, '0.5.0', '<')) {
+            $this->config->setUserValue($userId, 'files_external', 'config_version', '0.5.0');
+            $legacyService = new UserLegacyStoragesService($this->backendService, $dummySession);
+            $storageService = new UserStoragesService($this->backendService, $this->dbConfig, $dummySession, $this->userMountCache);
 
-			$this->migrate($legacyService, $storageService);
-		}
-	}
+            $this->migrate($legacyService, $storageService);
+        }
+    }
 }