nextcloud / server

lib/public/LDAP/ILDAPProvider.php

Indentation +109 added lines, -109 removed lines

@@ -33,128 +33,128 @@
  * @since 11.0.0
  */
 interface ILDAPProvider {
-	/**
-	 * Translate a user id to LDAP DN.
-	 * @param string $uid user id
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getUserDN($uid);
+    /**
+     * Translate a user id to LDAP DN.
+     * @param string $uid user id
+     * @return string
+     * @since 11.0.0
+     */
+    public function getUserDN($uid);
 
-	/**
-	 * Translate a group id to LDAP DN.
-	 * @param string $gid group id
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getGroupDN($gid);
+    /**
+     * Translate a group id to LDAP DN.
+     * @param string $gid group id
+     * @return string
+     * @since 13.0.0
+     */
+    public function getGroupDN($gid);
 
-	/**
-	 * Translate a LDAP DN to an internal user name.
-	 * @param string $dn LDAP DN
-	 * @return string with the internal user name
-	 * @throws \Exception if translation was unsuccessful
-	 * @since 11.0.0
-	 */
-	public function getUserName($dn);
+    /**
+     * Translate a LDAP DN to an internal user name.
+     * @param string $dn LDAP DN
+     * @return string with the internal user name
+     * @throws \Exception if translation was unsuccessful
+     * @since 11.0.0
+     */
+    public function getUserName($dn);
 	
-	/**
-	 * Convert a stored DN so it can be used as base parameter for LDAP queries.
-	 * @param string $dn the DN
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function DNasBaseParameter($dn);
+    /**
+     * Convert a stored DN so it can be used as base parameter for LDAP queries.
+     * @param string $dn the DN
+     * @return string
+     * @since 11.0.0
+     */
+    public function DNasBaseParameter($dn);
 	
-	/**
-	 * Sanitize a DN received from the LDAP server.
-	 * @param array $dn the DN in question
-	 * @return array the sanitized DN
-	 * @since 11.0.0
-	 */
-	public function sanitizeDN($dn);
+    /**
+     * Sanitize a DN received from the LDAP server.
+     * @param array $dn the DN in question
+     * @return array the sanitized DN
+     * @since 11.0.0
+     */
+    public function sanitizeDN($dn);
 	
-	/**
-	 * Return a new LDAP connection resource for the specified user. 
-	 * @param string $uid user id
-	 * @return resource of the LDAP connection
-	 * @since 11.0.0
-	 */
-	public function getLDAPConnection($uid);
+    /**
+     * Return a new LDAP connection resource for the specified user. 
+     * @param string $uid user id
+     * @return resource of the LDAP connection
+     * @since 11.0.0
+     */
+    public function getLDAPConnection($uid);
 
-	/**
-	 * Return a new LDAP connection resource for the specified group.
-	 * @param string $gid group id
-	 * @return resource of the LDAP connection
-	 * @since 13.0.0
-	 */
-	public function getGroupLDAPConnection($gid);
+    /**
+     * Return a new LDAP connection resource for the specified group.
+     * @param string $gid group id
+     * @return resource of the LDAP connection
+     * @since 13.0.0
+     */
+    public function getGroupLDAPConnection($gid);
 	
-	/**
-	 * Get the LDAP base for users.
-	 * @param string $uid user id
-	 * @return string the base for users
-	 * @throws \Exception if user id was not found in LDAP
-	 * @since 11.0.0
-	 */
-	public function getLDAPBaseUsers($uid);
+    /**
+     * Get the LDAP base for users.
+     * @param string $uid user id
+     * @return string the base for users
+     * @throws \Exception if user id was not found in LDAP
+     * @since 11.0.0
+     */
+    public function getLDAPBaseUsers($uid);
 	
-	/**
-	 * Get the LDAP base for groups.
-	 * @param string $uid user id
-	 * @return string the base for groups
-	 * @throws \Exception if user id was not found in LDAP
-	 * @since 11.0.0
-	 */
-	public function getLDAPBaseGroups($uid);
+    /**
+     * Get the LDAP base for groups.
+     * @param string $uid user id
+     * @return string the base for groups
+     * @throws \Exception if user id was not found in LDAP
+     * @since 11.0.0
+     */
+    public function getLDAPBaseGroups($uid);
 	
-	/**
-	 * Check whether a LDAP DN exists
-	 * @param string $dn LDAP DN
-	 * @return bool whether the DN exists
-	 * @since 11.0.0
-	 */
-	public function dnExists($dn);
+    /**
+     * Check whether a LDAP DN exists
+     * @param string $dn LDAP DN
+     * @return bool whether the DN exists
+     * @since 11.0.0
+     */
+    public function dnExists($dn);
 	
-	/**
-	 * Clear the cache if a cache is used, otherwise do nothing.
-	 * @param string $uid user id
-	 * @since 11.0.0
-	 */
-	public function clearCache($uid);
+    /**
+     * Clear the cache if a cache is used, otherwise do nothing.
+     * @param string $uid user id
+     * @since 11.0.0
+     */
+    public function clearCache($uid);
 
-	/**
-	 * Clear the cache if a cache is used, otherwise do nothing.
-	 * @param string $gid group id
-	 * @since 13.0.0
-	 */
-	public function clearGroupCache($gid);
+    /**
+     * Clear the cache if a cache is used, otherwise do nothing.
+     * @param string $gid group id
+     * @since 13.0.0
+     */
+    public function clearGroupCache($gid);
 
-	/**
-	 * Get the LDAP attribute name for the user's display name
-	 * @param string $uid user id
-	 * @return string the display name field
-	 * @throws \Exception if user id was not found in LDAP
-	 * @since 12.0.0
-	 */
-	public function getLDAPDisplayNameField($uid);
+    /**
+     * Get the LDAP attribute name for the user's display name
+     * @param string $uid user id
+     * @return string the display name field
+     * @throws \Exception if user id was not found in LDAP
+     * @since 12.0.0
+     */
+    public function getLDAPDisplayNameField($uid);
 
-	/**
-	 * Get the LDAP attribute name for the email
-	 * @param string $uid user id
-	 * @return string the email field
-	 * @throws \Exception if user id was not found in LDAP
-	 * @since 12.0.0
-	 */
-	public function getLDAPEmailField($uid);
+    /**
+     * Get the LDAP attribute name for the email
+     * @param string $uid user id
+     * @return string the email field
+     * @throws \Exception if user id was not found in LDAP
+     * @since 12.0.0
+     */
+    public function getLDAPEmailField($uid);
 
-	/**
-	 * Get the LDAP attribute name for the type of association betweeen users and groups
-	 * @param string $gid group id
-	 * @return string the configuration, one of: 'memberUid', 'uniqueMember', 'member', 'gidNumber'
-	 * @throws \Exception if group id was not found in LDAP
-	 * @since 13.0.0
-	 */
-	public function getLDAPGroupMemberAssoc($gid);
+    /**
+     * Get the LDAP attribute name for the type of association betweeen users and groups
+     * @param string $gid group id
+     * @return string the configuration, one of: 'memberUid', 'uniqueMember', 'member', 'gidNumber'
+     * @throws \Exception if group id was not found in LDAP
+     * @since 13.0.0
+     */
+    public function getLDAPGroupMemberAssoc($gid);
 
 }

apps/user_ldap/lib/GroupPluginManager.php

Indentation +139 added lines, -139 removed lines

@@ -27,143 +27,143 @@
 
 class GroupPluginManager {
 
-	private $respondToActions = 0;
-
-	private $which = array(
-		GroupInterface::CREATE_GROUP => null,
-		GroupInterface::DELETE_GROUP => null,
-		GroupInterface::ADD_TO_GROUP => null,
-		GroupInterface::REMOVE_FROM_GROUP => null,
-		GroupInterface::COUNT_USERS => null,
-		GroupInterface::GROUP_DETAILS => null
-	);
-
-	/**
-	 * @return int All implemented actions
-	 */
-	public function getImplementedActions() {
-		return $this->respondToActions;
-	}
-
-	/**
-	 * Registers a group plugin that may implement some actions, overriding User_LDAP's group actions.
-	 * @param ILDAPGroupPlugin $plugin
-	 */
-	public function register(ILDAPGroupPlugin $plugin) {
-		$respondToActions = $plugin->respondToActions();
-		$this->respondToActions |= $respondToActions;
-
-		foreach($this->which as $action => $v) {
-			if ((bool)($respondToActions & $action)) {
-				$this->which[$action] = $plugin;
-				\OC::$server->getLogger()->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']);
-			}
-		}
-	}
-
-	/**
-	 * Signal if there is a registered plugin that implements some given actions
-	 * @param int $actions Actions defined in \OCP\GroupInterface, like GroupInterface::REMOVE_FROM_GROUP
-	 * @return bool
-	 */
-	public function implementsActions($actions) {
-		return ($actions & $this->respondToActions) == $actions;
-	}
-
-	/**
-	 * Create a group
-	 * @param string $gid Group Id
-	 * @return string | null The group DN if group creation was successful.
-	 * @throws \Exception
-	 */
-	public function createGroup($gid) {
-		$plugin = $this->which[GroupInterface::CREATE_GROUP];
-
-		if ($plugin) {
-			return $plugin->createGroup($gid);
-		}
-		throw new \Exception('No plugin implements createGroup in this LDAP Backend.');
-	}
-
-	/**
-	 * Delete a group
-	 * @param string $gid Group Id of the group to delete
-	 * @return bool
-	 * @throws \Exception
-	 */
-	public function deleteGroup($gid) {
-		$plugin = $this->which[GroupInterface::DELETE_GROUP];
-
-		if ($plugin) {
-			return $plugin->deleteGroup($gid);
-		}
-		throw new \Exception('No plugin implements deleteGroup in this LDAP Backend.');
-	}
-
-	/**
-	 * Add a user to a group
-	 * @param string $uid ID of the user to add to group
-	 * @param string $gid ID of the group in which add the user
-	 * @return bool
-	 * @throws \Exception
-	 *
-	 * Adds a user to a group.
-	 */
-	public function addToGroup($uid, $gid) {
-		$plugin = $this->which[GroupInterface::ADD_TO_GROUP];
-
-		if ($plugin) {
-			return $plugin->addToGroup($uid, $gid);
-		}
-		throw new \Exception('No plugin implements addToGroup in this LDAP Backend.');
-	}
-
-	/**
-	 * Removes a user from a group
-	 * @param string $uid ID of the user to remove from group
-	 * @param string $gid ID of the group from which remove the user
-	 * @return bool
-	 * @throws \Exception
-	 *
-	 * removes the user from a group.
-	 */
-	public function removeFromGroup($uid, $gid) {
-		$plugin = $this->which[GroupInterface::REMOVE_FROM_GROUP];
-
-		if ($plugin) {
-			return $plugin->removeFromGroup($uid, $gid);
-		}
-		throw new \Exception('No plugin implements removeFromGroup in this LDAP Backend.');
-	}
-
-	/**
-	 * get the number of all users matching the search string in a group
-	 * @param string $gid ID of the group
-	 * @param string $search query string
-	 * @return int|false
-	 * @throws \Exception
-	 */
-	public function countUsersInGroup($gid, $search = '') {
-		$plugin = $this->which[GroupInterface::COUNT_USERS];
-
-		if ($plugin) {
-			return $plugin->countUsersInGroup($gid,$search);
-		}
-		throw new \Exception('No plugin implements countUsersInGroup in this LDAP Backend.');
-	}
-
-	/**
-	 * get an array with group details
-	 * @param string $gid
-	 * @return array|false
-	 * @throws \Exception
-	 */
-	public function getGroupDetails($gid) {
-		$plugin = $this->which[GroupInterface::GROUP_DETAILS];
-
-		if ($plugin) {
-			return $plugin->getGroupDetails($gid);
-		}
-		throw new \Exception('No plugin implements getGroupDetails in this LDAP Backend.');
-	}
+    private $respondToActions = 0;
+
+    private $which = array(
+        GroupInterface::CREATE_GROUP => null,
+        GroupInterface::DELETE_GROUP => null,
+        GroupInterface::ADD_TO_GROUP => null,
+        GroupInterface::REMOVE_FROM_GROUP => null,
+        GroupInterface::COUNT_USERS => null,
+        GroupInterface::GROUP_DETAILS => null
+    );
+
+    /**
+     * @return int All implemented actions
+     */
+    public function getImplementedActions() {
+        return $this->respondToActions;
+    }
+
+    /**
+     * Registers a group plugin that may implement some actions, overriding User_LDAP's group actions.
+     * @param ILDAPGroupPlugin $plugin
+     */
+    public function register(ILDAPGroupPlugin $plugin) {
+        $respondToActions = $plugin->respondToActions();
+        $this->respondToActions |= $respondToActions;
+
+        foreach($this->which as $action => $v) {
+            if ((bool)($respondToActions & $action)) {
+                $this->which[$action] = $plugin;
+                \OC::$server->getLogger()->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']);
+            }
+        }
+    }
+
+    /**
+     * Signal if there is a registered plugin that implements some given actions
+     * @param int $actions Actions defined in \OCP\GroupInterface, like GroupInterface::REMOVE_FROM_GROUP
+     * @return bool
+     */
+    public function implementsActions($actions) {
+        return ($actions & $this->respondToActions) == $actions;
+    }
+
+    /**
+     * Create a group
+     * @param string $gid Group Id
+     * @return string | null The group DN if group creation was successful.
+     * @throws \Exception
+     */
+    public function createGroup($gid) {
+        $plugin = $this->which[GroupInterface::CREATE_GROUP];
+
+        if ($plugin) {
+            return $plugin->createGroup($gid);
+        }
+        throw new \Exception('No plugin implements createGroup in this LDAP Backend.');
+    }
+
+    /**
+     * Delete a group
+     * @param string $gid Group Id of the group to delete
+     * @return bool
+     * @throws \Exception
+     */
+    public function deleteGroup($gid) {
+        $plugin = $this->which[GroupInterface::DELETE_GROUP];
+
+        if ($plugin) {
+            return $plugin->deleteGroup($gid);
+        }
+        throw new \Exception('No plugin implements deleteGroup in this LDAP Backend.');
+    }
+
+    /**
+     * Add a user to a group
+     * @param string $uid ID of the user to add to group
+     * @param string $gid ID of the group in which add the user
+     * @return bool
+     * @throws \Exception
+     *
+     * Adds a user to a group.
+     */
+    public function addToGroup($uid, $gid) {
+        $plugin = $this->which[GroupInterface::ADD_TO_GROUP];
+
+        if ($plugin) {
+            return $plugin->addToGroup($uid, $gid);
+        }
+        throw new \Exception('No plugin implements addToGroup in this LDAP Backend.');
+    }
+
+    /**
+     * Removes a user from a group
+     * @param string $uid ID of the user to remove from group
+     * @param string $gid ID of the group from which remove the user
+     * @return bool
+     * @throws \Exception
+     *
+     * removes the user from a group.
+     */
+    public function removeFromGroup($uid, $gid) {
+        $plugin = $this->which[GroupInterface::REMOVE_FROM_GROUP];
+
+        if ($plugin) {
+            return $plugin->removeFromGroup($uid, $gid);
+        }
+        throw new \Exception('No plugin implements removeFromGroup in this LDAP Backend.');
+    }
+
+    /**
+     * get the number of all users matching the search string in a group
+     * @param string $gid ID of the group
+     * @param string $search query string
+     * @return int|false
+     * @throws \Exception
+     */
+    public function countUsersInGroup($gid, $search = '') {
+        $plugin = $this->which[GroupInterface::COUNT_USERS];
+
+        if ($plugin) {
+            return $plugin->countUsersInGroup($gid,$search);
+        }
+        throw new \Exception('No plugin implements countUsersInGroup in this LDAP Backend.');
+    }
+
+    /**
+     * get an array with group details
+     * @param string $gid
+     * @return array|false
+     * @throws \Exception
+     */
+    public function getGroupDetails($gid) {
+        $plugin = $this->which[GroupInterface::GROUP_DETAILS];
+
+        if ($plugin) {
+            return $plugin->getGroupDetails($gid);
+        }
+        throw new \Exception('No plugin implements getGroupDetails in this LDAP Backend.');
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -53,8 +53,8 @@ 
 		$respondToActions = $plugin->respondToActions();
 		$this->respondToActions |= $respondToActions;
 
-		foreach($this->which as $action => $v) {
-			if ((bool)($respondToActions & $action)) {
+		foreach ($this->which as $action => $v) {
+			if ((bool) ($respondToActions & $action)) {
 				$this->which[$action] = $plugin;
 				\OC::$server->getLogger()->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']);
 			}
@@ -147,7 +147,7 @@ 
 		$plugin = $this->which[GroupInterface::COUNT_USERS];
 
 		if ($plugin) {
-			return $plugin->countUsersInGroup($gid,$search);
+			return $plugin->countUsersInGroup($gid, $search);
 		}
 		throw new \Exception('No plugin implements countUsersInGroup in this LDAP Backend.');
 	}

apps/files_versions/lib/Command/Expire.php

Indentation +25 added lines, -25 removed lines

@@ -30,35 +30,35 @@
 use OCP\Command\ICommand;
 
 class Expire implements ICommand {
-	use FileAccess;
+    use FileAccess;
 
-	/**
-	 * @var string
-	 */
-	private $fileName;
+    /**
+     * @var string
+     */
+    private $fileName;
 
-	/**
-	 * @var string
-	 */
-	private $user;
+    /**
+     * @var string
+     */
+    private $user;
 
-	/**
-	 * @param string $user
-	 * @param string $fileName
-	 */
-	function __construct($user, $fileName) {
-		$this->user = $user;
-		$this->fileName = $fileName;
-	}
+    /**
+     * @param string $user
+     * @param string $fileName
+     */
+    function __construct($user, $fileName) {
+        $this->user = $user;
+        $this->fileName = $fileName;
+    }
 
 
-	public function handle() {
-		$userManager = \OC::$server->getUserManager();
-		if (!$userManager->userExists($this->user)) {
-			// User has been deleted already
-			return;
-		}
+    public function handle() {
+        $userManager = \OC::$server->getUserManager();
+        if (!$userManager->userExists($this->user)) {
+            // User has been deleted already
+            return;
+        }
 
-		Storage::expire($this->fileName, $this->user);
-	}
+        Storage::expire($this->fileName, $this->user);
+    }
 }

lib/private/Contacts/ContactsMenu/Manager.php

Indentation +67 added lines, -67 removed lines

@@ -30,82 +30,82 @@
 
 class Manager {
 
-	/** @var ContactsStore */
-	private $store;
+    /** @var ContactsStore */
+    private $store;
 
-	/** @var ActionProviderStore */
-	private $actionProviderStore;
+    /** @var ActionProviderStore */
+    private $actionProviderStore;
 
-	/** @var IAppManager */
-	private $appManager;
+    /** @var IAppManager */
+    private $appManager;
 
-	/**
-	 * @param ContactsStore $store
-	 * @param ActionProviderStore $actionProviderStore
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(ContactsStore $store, ActionProviderStore $actionProviderStore, IAppManager $appManager) {
-		$this->store = $store;
-		$this->actionProviderStore = $actionProviderStore;
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param ContactsStore $store
+     * @param ActionProviderStore $actionProviderStore
+     * @param IAppManager $appManager
+     */
+    public function __construct(ContactsStore $store, ActionProviderStore $actionProviderStore, IAppManager $appManager) {
+        $this->store = $store;
+        $this->actionProviderStore = $actionProviderStore;
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @param IUser $user
-	 * @param string $filter
-	 * @return array
-	 */
-	public function getEntries(IUser $user, $filter) {
-		$entries = $this->store->getContacts($user, $filter);
+    /**
+     * @param IUser $user
+     * @param string $filter
+     * @return array
+     */
+    public function getEntries(IUser $user, $filter) {
+        $entries = $this->store->getContacts($user, $filter);
 
-		$sortedEntries = $this->sortEntries($entries);
-		$topEntries = array_slice($sortedEntries, 0, 25);
-		$this->processEntries($topEntries, $user);
+        $sortedEntries = $this->sortEntries($entries);
+        $topEntries = array_slice($sortedEntries, 0, 25);
+        $this->processEntries($topEntries, $user);
 
-		$contactsEnabled = $this->appManager->isEnabledForUser('contacts', $user);
-		return [
-			'contacts' => $topEntries,
-			'contactsAppEnabled' => $contactsEnabled,
-		];
-	}
+        $contactsEnabled = $this->appManager->isEnabledForUser('contacts', $user);
+        return [
+            'contacts' => $topEntries,
+            'contactsAppEnabled' => $contactsEnabled,
+        ];
+    }
 
-	/**
-	 * @param IUser $user
-	 * @param integer $shareType
-	 * @param string $shareWith
-	 * @return IEntry
-	 */
-	public function findOne(IUser $user, $shareType, $shareWith) {
-		$entry = $this->store->findOne($user, $shareType, $shareWith);
-		if ($entry) {
-			$this->processEntries([$entry], $user);
-		}
+    /**
+     * @param IUser $user
+     * @param integer $shareType
+     * @param string $shareWith
+     * @return IEntry
+     */
+    public function findOne(IUser $user, $shareType, $shareWith) {
+        $entry = $this->store->findOne($user, $shareType, $shareWith);
+        if ($entry) {
+            $this->processEntries([$entry], $user);
+        }
 
-		return $entry;
-	}
+        return $entry;
+    }
 
-	/**
-	 * @param IEntry[] $entries
-	 * @return IEntry[]
-	 */
-	private function sortEntries(array $entries) {
-		usort($entries, function(IEntry $entryA, IEntry $entryB) {
-			return strcasecmp($entryA->getFullName(), $entryB->getFullName());
-		});
-		return $entries;
-	}
+    /**
+     * @param IEntry[] $entries
+     * @return IEntry[]
+     */
+    private function sortEntries(array $entries) {
+        usort($entries, function(IEntry $entryA, IEntry $entryB) {
+            return strcasecmp($entryA->getFullName(), $entryB->getFullName());
+        });
+        return $entries;
+    }
 
-	/**
-	 * @param IEntry[] $entries
-	 * @param IUser $user
-	 */
-	private function processEntries(array $entries, IUser $user) {
-		$providers = $this->actionProviderStore->getProviders($user);
-		foreach ($entries as $entry) {
-			foreach ($providers as $provider) {
-				$provider->process($entry);
-			}
-		}
-	}
+    /**
+     * @param IEntry[] $entries
+     * @param IUser $user
+     */
+    private function processEntries(array $entries, IUser $user) {
+        $providers = $this->actionProviderStore->getProviders($user);
+        foreach ($entries as $entry) {
+            foreach ($providers as $provider) {
+                $provider->process($entry);
+            }
+        }
+    }
 
 }

lib/private/Calendar/Manager.php

Indentation +99 added lines, -99 removed lines

@@ -27,114 +27,114 @@
 
 class Manager implements \OCP\Calendar\IManager {
 
-	/**
-	 * @var ICalendar[] holds all registered calendars
-	 */
-	private $calendars=[];
+    /**
+     * @var ICalendar[] holds all registered calendars
+     */
+    private $calendars=[];
 
-	/**
-	 * @var \Closure[] to call to load/register calendar providers
-	 */
-	private $calendarLoaders=[];
+    /**
+     * @var \Closure[] to call to load/register calendar providers
+     */
+    private $calendarLoaders=[];
 
-	/**
-	 * This function is used to search and find objects within the user's calendars.
-	 * In case $pattern is empty all events/journals/todos will be returned.
-	 *
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - optional parameters:
-	 * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
-	 * @param integer|null $limit - limit number of search results
-	 * @param integer|null $offset - offset for paging of search results
-	 * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
-	 * @since 13.0.0
-	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
-		$this->loadCalendars();
-		$result = [];
-		foreach($this->calendars as $calendar) {
-			$r = $calendar->search($pattern, $searchProperties, $options, $limit, $offset);
-			foreach($r as $o) {
-				$o['calendar-key'] = $calendar->getKey();
-				$result[] = $o;
-			}
-		}
+    /**
+     * This function is used to search and find objects within the user's calendars.
+     * In case $pattern is empty all events/journals/todos will be returned.
+     *
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options - optional parameters:
+     * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
+     * @param integer|null $limit - limit number of search results
+     * @param integer|null $offset - offset for paging of search results
+     * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
+     * @since 13.0.0
+     */
+    public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
+        $this->loadCalendars();
+        $result = [];
+        foreach($this->calendars as $calendar) {
+            $r = $calendar->search($pattern, $searchProperties, $options, $limit, $offset);
+            foreach($r as $o) {
+                $o['calendar-key'] = $calendar->getKey();
+                $result[] = $o;
+            }
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Check if calendars are available
-	 *
-	 * @return bool true if enabled, false if not
-	 * @since 13.0.0
-	 */
-	public function isEnabled() {
-		return !empty($this->calendars) || !empty($this->calendarLoaders);
-	}
+    /**
+     * Check if calendars are available
+     *
+     * @return bool true if enabled, false if not
+     * @since 13.0.0
+     */
+    public function isEnabled() {
+        return !empty($this->calendars) || !empty($this->calendarLoaders);
+    }
 
-	/**
-	 * Registers a calendar
-	 *
-	 * @param ICalendar $calendar
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function registerCalendar(ICalendar $calendar) {
-		$this->calendars[$calendar->getKey()] = $calendar;
-	}
+    /**
+     * Registers a calendar
+     *
+     * @param ICalendar $calendar
+     * @return void
+     * @since 13.0.0
+     */
+    public function registerCalendar(ICalendar $calendar) {
+        $this->calendars[$calendar->getKey()] = $calendar;
+    }
 
-	/**
-	 * Unregisters a calendar
-	 *
-	 * @param ICalendar $calendar
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function unregisterCalendar(ICalendar $calendar) {
-		unset($this->calendars[$calendar->getKey()]);
-	}
+    /**
+     * Unregisters a calendar
+     *
+     * @param ICalendar $calendar
+     * @return void
+     * @since 13.0.0
+     */
+    public function unregisterCalendar(ICalendar $calendar) {
+        unset($this->calendars[$calendar->getKey()]);
+    }
 
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * calendars are actually requested
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function register(\Closure $callable) {
-		$this->calendarLoaders[] = $callable;
-	}
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * calendars are actually requested
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 13.0.0
+     */
+    public function register(\Closure $callable) {
+        $this->calendarLoaders[] = $callable;
+    }
 
-	/**
-	 * @return ICalendar[]
-	 * @since 13.0.0
-	 */
-	public function getCalendars() {
-		$this->loadCalendars();
+    /**
+     * @return ICalendar[]
+     * @since 13.0.0
+     */
+    public function getCalendars() {
+        $this->loadCalendars();
 
-		return array_values($this->calendars);
-	}
+        return array_values($this->calendars);
+    }
 
-	/**
-	 * removes all registered calendar instances
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function clear() {
-		$this->calendars = [];
-		$this->calendarLoaders = [];
-	}
+    /**
+     * removes all registered calendar instances
+     * @return void
+     * @since 13.0.0
+     */
+    public function clear() {
+        $this->calendars = [];
+        $this->calendarLoaders = [];
+    }
 
-	/**
-	 * loads all calendars
-	 */
-	private function loadCalendars() {
-		foreach($this->calendarLoaders as $callable) {
-			$callable($this);
-		}
-		$this->calendarLoaders = [];
-	}
+    /**
+     * loads all calendars
+     */
+    private function loadCalendars() {
+        foreach($this->calendarLoaders as $callable) {
+            $callable($this);
+        }
+        $this->calendarLoaders = [];
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -30,12 +30,12 @@ 
 	/**
 	 * @var ICalendar[] holds all registered calendars
 	 */
-	private $calendars=[];
+	private $calendars = [];
 
 	/**
 	 * @var \Closure[] to call to load/register calendar providers
 	 */
-	private $calendarLoaders=[];
+	private $calendarLoaders = [];
 
 	/**
 	 * This function is used to search and find objects within the user's calendars.
@@ -50,12 +50,12 @@ 
 	 * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
 	 * @since 13.0.0
 	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
+	public function search($pattern, array $searchProperties = [], array $options = [], $limit = null, $offset = null) {
 		$this->loadCalendars();
 		$result = [];
-		foreach($this->calendars as $calendar) {
+		foreach ($this->calendars as $calendar) {
 			$r = $calendar->search($pattern, $searchProperties, $options, $limit, $offset);
-			foreach($r as $o) {
+			foreach ($r as $o) {
 				$o['calendar-key'] = $calendar->getKey();
 				$result[] = $o;
 			}
@@ -132,7 +132,7 @@ 
 	 * loads all calendars
 	 */
 	private function loadCalendars() {
-		foreach($this->calendarLoaders as $callable) {
+		foreach ($this->calendarLoaders as $callable) {
 			$callable($this);
 		}
 		$this->calendarLoaders = [];

lib/private/SystemConfig.php

Indentation +131 added lines, -131 removed lines

@@ -36,135 +36,135 @@
  */
 class SystemConfig {
 
-	/** @var array */
-	protected $sensitiveValues = [
-		'instanceid' => true,
-		'datadirectory' => true,
-		'dbname' => true,
-		'dbhost' => true,
-		'dbpassword' => true,
-		'dbuser' => true,
-		'mail_from_address' => true,
-		'mail_domain' => true,
-		'mail_smtphost' => true,
-		'mail_smtpname' => true,
-		'mail_smtppassword' => true,
-		'passwordsalt' => true,
-		'secret' => true,
-		'updater.secret' => true,
-		'trusted_proxies' => true,
-		'proxyuserpwd' => true,
-		'log.condition' => [
-			'shared_secret' => true,
-		],
-		'license-key' => true,
-		'redis' => [
-			'host' => true,
-			'password' => true,
-		],
-		'objectstore' => [
-			'arguments' => [
-				'password' => true,
-				'options' => [
-					'credentials' => [
-						'key' => true,
-						'secret' => true,
-					]
-				]
-			],
-		],
-	];
-
-	/** @var Config */
-	private $config;
-
-	public function __construct(Config $config) {
-		$this->config = $config;
-	}
-
-	/**
-	 * Lists all available config keys
-	 * @return array an array of key names
-	 */
-	public function getKeys() {
-		return $this->config->getKeys();
-	}
-
-	/**
-	 * Sets a new system wide value
-	 *
-	 * @param string $key the key of the value, under which will be saved
-	 * @param mixed $value the value that should be stored
-	 */
-	public function setValue($key, $value) {
-		$this->config->setValue($key, $value);
-	}
-
-	/**
-	 * Sets and deletes values and writes the config.php
-	 *
-	 * @param array $configs Associative array with `key => value` pairs
-	 *                       If value is null, the config key will be deleted
-	 */
-	public function setValues(array $configs) {
-		$this->config->setValues($configs);
-	}
-
-	/**
-	 * Looks up a system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return mixed the value or $default
-	 */
-	public function getValue($key, $default = '') {
-		return $this->config->getValue($key, $default);
-	}
-
-	/**
-	 * Looks up a system wide defined value and filters out sensitive data
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return mixed the value or $default
-	 */
-	public function getFilteredValue($key, $default = '') {
-		$value = $this->getValue($key, $default);
-
-		if (isset($this->sensitiveValues[$key])) {
-			$value = $this->removeSensitiveValue($this->sensitiveValues[$key], $value);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Delete a system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 */
-	public function deleteValue($key) {
-		$this->config->deleteKey($key);
-	}
-
-	/**
-	 * @param bool|array $keysToRemove
-	 * @param mixed $value
-	 * @return mixed
-	 */
-	protected function removeSensitiveValue($keysToRemove, $value) {
-		if ($keysToRemove === true) {
-			return IConfig::SENSITIVE_VALUE;
-		}
-
-		if (is_array($value)) {
-			foreach ($keysToRemove as $keyToRemove => $valueToRemove) {
-				if (isset($value[$keyToRemove])) {
-					$value[$keyToRemove] = $this->removeSensitiveValue($valueToRemove, $value[$keyToRemove]);
-				}
-			}
-		}
-
-		return $value;
-	}
+    /** @var array */
+    protected $sensitiveValues = [
+        'instanceid' => true,
+        'datadirectory' => true,
+        'dbname' => true,
+        'dbhost' => true,
+        'dbpassword' => true,
+        'dbuser' => true,
+        'mail_from_address' => true,
+        'mail_domain' => true,
+        'mail_smtphost' => true,
+        'mail_smtpname' => true,
+        'mail_smtppassword' => true,
+        'passwordsalt' => true,
+        'secret' => true,
+        'updater.secret' => true,
+        'trusted_proxies' => true,
+        'proxyuserpwd' => true,
+        'log.condition' => [
+            'shared_secret' => true,
+        ],
+        'license-key' => true,
+        'redis' => [
+            'host' => true,
+            'password' => true,
+        ],
+        'objectstore' => [
+            'arguments' => [
+                'password' => true,
+                'options' => [
+                    'credentials' => [
+                        'key' => true,
+                        'secret' => true,
+                    ]
+                ]
+            ],
+        ],
+    ];
+
+    /** @var Config */
+    private $config;
+
+    public function __construct(Config $config) {
+        $this->config = $config;
+    }
+
+    /**
+     * Lists all available config keys
+     * @return array an array of key names
+     */
+    public function getKeys() {
+        return $this->config->getKeys();
+    }
+
+    /**
+     * Sets a new system wide value
+     *
+     * @param string $key the key of the value, under which will be saved
+     * @param mixed $value the value that should be stored
+     */
+    public function setValue($key, $value) {
+        $this->config->setValue($key, $value);
+    }
+
+    /**
+     * Sets and deletes values and writes the config.php
+     *
+     * @param array $configs Associative array with `key => value` pairs
+     *                       If value is null, the config key will be deleted
+     */
+    public function setValues(array $configs) {
+        $this->config->setValues($configs);
+    }
+
+    /**
+     * Looks up a system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return mixed the value or $default
+     */
+    public function getValue($key, $default = '') {
+        return $this->config->getValue($key, $default);
+    }
+
+    /**
+     * Looks up a system wide defined value and filters out sensitive data
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return mixed the value or $default
+     */
+    public function getFilteredValue($key, $default = '') {
+        $value = $this->getValue($key, $default);
+
+        if (isset($this->sensitiveValues[$key])) {
+            $value = $this->removeSensitiveValue($this->sensitiveValues[$key], $value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Delete a system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     */
+    public function deleteValue($key) {
+        $this->config->deleteKey($key);
+    }
+
+    /**
+     * @param bool|array $keysToRemove
+     * @param mixed $value
+     * @return mixed
+     */
+    protected function removeSensitiveValue($keysToRemove, $value) {
+        if ($keysToRemove === true) {
+            return IConfig::SENSITIVE_VALUE;
+        }
+
+        if (is_array($value)) {
+            foreach ($keysToRemove as $keyToRemove => $valueToRemove) {
+                if (isset($value[$keyToRemove])) {
+                    $value[$keyToRemove] = $this->removeSensitiveValue($valueToRemove, $value[$keyToRemove]);
+                }
+            }
+        }
+
+        return $value;
+    }
 }

apps/dav/lib/CalDAV/CalendarImpl.php

Indentation +79 added lines, -79 removed lines

@@ -28,92 +28,92 @@
 
 class CalendarImpl implements ICalendar {
 
-	/** @var CalDavBackend */
-	private $backend;
+    /** @var CalDavBackend */
+    private $backend;
 
-	/** @var Calendar */
-	private $calendar;
+    /** @var Calendar */
+    private $calendar;
 
-	/** @var array */
-	private $calendarInfo;
+    /** @var array */
+    private $calendarInfo;
 
-	/**
-	 * CalendarImpl constructor.
-	 *
-	 * @param Calendar $calendar
-	 * @param array $calendarInfo
-	 * @param CalDavBackend $backend
-	 */
-	public function __construct(Calendar $calendar, array $calendarInfo,
-								CalDavBackend $backend) {
-		$this->calendar = $calendar;
-		$this->calendarInfo = $calendarInfo;
-		$this->backend = $backend;
-	}
+    /**
+     * CalendarImpl constructor.
+     *
+     * @param Calendar $calendar
+     * @param array $calendarInfo
+     * @param CalDavBackend $backend
+     */
+    public function __construct(Calendar $calendar, array $calendarInfo,
+                                CalDavBackend $backend) {
+        $this->calendar = $calendar;
+        $this->calendarInfo = $calendarInfo;
+        $this->backend = $backend;
+    }
 	
-	/**
-	 * @return string defining the technical unique key
-	 * @since 13.0.0
-	 */
-	public function getKey() {
-		return $this->calendarInfo['id'];
-	}
+    /**
+     * @return string defining the technical unique key
+     * @since 13.0.0
+     */
+    public function getKey() {
+        return $this->calendarInfo['id'];
+    }
 
-	/**
-	 * In comparison to getKey() this function returns a human readable (maybe translated) name
-	 * @return null|string
-	 * @since 13.0.0
-	 */
-	public function getDisplayName() {
-		return $this->calendarInfo['{DAV:}displayname'];
-	}
+    /**
+     * In comparison to getKey() this function returns a human readable (maybe translated) name
+     * @return null|string
+     * @since 13.0.0
+     */
+    public function getDisplayName() {
+        return $this->calendarInfo['{DAV:}displayname'];
+    }
 
-	/**
-	 * Calendar color
-	 * @return null|string
-	 * @since 13.0.0
-	 */
-	public function getDisplayColor() {
-		return $this->calendarInfo['{http://apple.com/ns/ical/}calendar-color'];
-	}
+    /**
+     * Calendar color
+     * @return null|string
+     * @since 13.0.0
+     */
+    public function getDisplayColor() {
+        return $this->calendarInfo['{http://apple.com/ns/ical/}calendar-color'];
+    }
 
-	/**
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - optional parameters:
-	 * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
-	 * @param integer|null $limit - limit number of search results
-	 * @param integer|null $offset - offset for paging of search results
-	 * @return array an array of events/journals/todos which are arrays of key-value-pairs
-	 * @since 13.0.0
-	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
-		return $this->backend->search($this->calendarInfo, $pattern,
-			$searchProperties, $options, $limit, $offset);
-	}
+    /**
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options - optional parameters:
+     * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
+     * @param integer|null $limit - limit number of search results
+     * @param integer|null $offset - offset for paging of search results
+     * @return array an array of events/journals/todos which are arrays of key-value-pairs
+     * @since 13.0.0
+     */
+    public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
+        return $this->backend->search($this->calendarInfo, $pattern,
+            $searchProperties, $options, $limit, $offset);
+    }
 
-	/**
-	 * @return integer build up using \OCP\Constants
-	 * @since 13.0.0
-	 */
-	public function getPermissions() {
-		$permissions = $this->calendar->getACL();
-		$result = 0;
-		foreach ($permissions as $permission) {
-			switch($permission['privilege']) {
-				case '{DAV:}read':
-					$result |= Constants::PERMISSION_READ;
-					break;
-				case '{DAV:}write':
-					$result |= Constants::PERMISSION_CREATE;
-					$result |= Constants::PERMISSION_UPDATE;
-					break;
-				case '{DAV:}all':
-					$result |= Constants::PERMISSION_ALL;
-					break;
-			}
-		}
+    /**
+     * @return integer build up using \OCP\Constants
+     * @since 13.0.0
+     */
+    public function getPermissions() {
+        $permissions = $this->calendar->getACL();
+        $result = 0;
+        foreach ($permissions as $permission) {
+            switch($permission['privilege']) {
+                case '{DAV:}read':
+                    $result |= Constants::PERMISSION_READ;
+                    break;
+                case '{DAV:}write':
+                    $result |= Constants::PERMISSION_CREATE;
+                    $result |= Constants::PERMISSION_UPDATE;
+                    break;
+                case '{DAV:}all':
+                    $result |= Constants::PERMISSION_ALL;
+                    break;
+            }
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
 	 * @return array an array of events/journals/todos which are arrays of key-value-pairs
 	 * @since 13.0.0
 	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
+	public function search($pattern, array $searchProperties = [], array $options = [], $limit = null, $offset = null) {
 		return $this->backend->search($this->calendarInfo, $pattern,
 			$searchProperties, $options, $limit, $offset);
 	}
@@ -100,7 +100,7 @@ 
 		$permissions = $this->calendar->getACL();
 		$result = 0;
 		foreach ($permissions as $permission) {
-			switch($permission['privilege']) {
+			switch ($permission['privilege']) {
 				case '{DAV:}read':
 					$result |= Constants::PERMISSION_READ;
 					break;

lib/private/Files/Storage/Wrapper/Jail.php

Indentation +478 added lines, -478 removed lines

@@ -36,482 +36,482 @@
  * This restricts access to a subfolder of the wrapped storage with the subfolder becoming the root folder new storage
  */
 class Jail extends Wrapper {
-	/**
-	 * @var string
-	 */
-	protected $rootPath;
-
-	/**
-	 * @param array $arguments ['storage' => $storage, 'mask' => $root]
-	 *
-	 * $storage: The storage that will be wrapper
-	 * $root: The folder in the wrapped storage that will become the root folder of the wrapped storage
-	 */
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->rootPath = $arguments['root'];
-	}
-
-	public function getUnjailedPath($path) {
-		if ($path === '') {
-			return $this->rootPath;
-		} else {
-			return $this->rootPath . '/' . $path;
-		}
-	}
-
-	public function getJailedPath($path) {
-		$root = rtrim($this->rootPath, '/') . '/';
-
-		if (strpos($path, $root) !== 0) {
-			return null;
-		} else {
-			$path = substr($path, strlen($this->rootPath));
-			return trim($path, '/');
-		}
-	}
-
-	public function getId() {
-		return parent::getId();
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.mkdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function mkdir($path) {
-		return $this->getWrapperStorage()->mkdir($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.rmdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function rmdir($path) {
-		return $this->getWrapperStorage()->rmdir($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.opendir.php
-	 *
-	 * @param string $path
-	 * @return resource
-	 */
-	public function opendir($path) {
-		return $this->getWrapperStorage()->opendir($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.is_dir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_dir($path) {
-		return $this->getWrapperStorage()->is_dir($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.is_file.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_file($path) {
-		return $this->getWrapperStorage()->is_file($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.stat.php
-	 * only the following keys are required in the result: size and mtime
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function stat($path) {
-		return $this->getWrapperStorage()->stat($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.filetype.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function filetype($path) {
-		return $this->getWrapperStorage()->filetype($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.filesize.php
-	 * The result for filesize when called on a folder is required to be 0
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function filesize($path) {
-		return $this->getWrapperStorage()->filesize($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * check if a file can be created in $path
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isCreatable($path) {
-		return $this->getWrapperStorage()->isCreatable($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * check if a file can be read
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isReadable($path) {
-		return $this->getWrapperStorage()->isReadable($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * check if a file can be written to
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isUpdatable($path) {
-		return $this->getWrapperStorage()->isUpdatable($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * check if a file can be deleted
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isDeletable($path) {
-		return $this->getWrapperStorage()->isDeletable($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * check if a file can be shared
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isSharable($path) {
-		return $this->getWrapperStorage()->isSharable($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * get the full permissions of a path.
-	 * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function getPermissions($path) {
-		return $this->getWrapperStorage()->getPermissions($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_exists.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function file_exists($path) {
-		return $this->getWrapperStorage()->file_exists($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.filemtime.php
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function filemtime($path) {
-		return $this->getWrapperStorage()->filemtime($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_get_contents.php
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function file_get_contents($path) {
-		return $this->getWrapperStorage()->file_get_contents($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_put_contents.php
-	 *
-	 * @param string $path
-	 * @param string $data
-	 * @return bool
-	 */
-	public function file_put_contents($path, $data) {
-		return $this->getWrapperStorage()->file_put_contents($this->getUnjailedPath($path), $data);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.unlink.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function unlink($path) {
-		return $this->getWrapperStorage()->unlink($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.rename.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 */
-	public function rename($path1, $path2) {
-		return $this->getWrapperStorage()->rename($this->getUnjailedPath($path1), $this->getUnjailedPath($path2));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.copy.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 */
-	public function copy($path1, $path2) {
-		return $this->getWrapperStorage()->copy($this->getUnjailedPath($path1), $this->getUnjailedPath($path2));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.fopen.php
-	 *
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource
-	 */
-	public function fopen($path, $mode) {
-		return $this->getWrapperStorage()->fopen($this->getUnjailedPath($path), $mode);
-	}
-
-	/**
-	 * get the mimetype for a file or folder
-	 * The mimetype for a folder is required to be "httpd/unix-directory"
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getMimeType($path) {
-		return $this->getWrapperStorage()->getMimeType($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.hash.php
-	 *
-	 * @param string $type
-	 * @param string $path
-	 * @param bool $raw
-	 * @return string
-	 */
-	public function hash($type, $path, $raw = false) {
-		return $this->getWrapperStorage()->hash($type, $this->getUnjailedPath($path), $raw);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.free_space.php
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function free_space($path) {
-		return $this->getWrapperStorage()->free_space($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * search for occurrences of $query in file names
-	 *
-	 * @param string $query
-	 * @return array
-	 */
-	public function search($query) {
-		return $this->getWrapperStorage()->search($query);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.touch.php
-	 * If the backend does not support the operation, false should be returned
-	 *
-	 * @param string $path
-	 * @param int $mtime
-	 * @return bool
-	 */
-	public function touch($path, $mtime = null) {
-		return $this->getWrapperStorage()->touch($this->getUnjailedPath($path), $mtime);
-	}
-
-	/**
-	 * get the path to a local version of the file.
-	 * The local version of the file can be temporary and doesn't have to be persistent across requests
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getLocalFile($path) {
-		return $this->getWrapperStorage()->getLocalFile($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 *
-	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
-	 * returning true for other changes in the folder is optional
-	 */
-	public function hasUpdated($path, $time) {
-		return $this->getWrapperStorage()->hasUpdated($this->getUnjailedPath($path), $time);
-	}
-
-	/**
-	 * get a cache instance for the storage
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
-	 * @return \OC\Files\Cache\Cache
-	 */
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this->getWrapperStorage();
-		}
-		$sourceCache = $this->getWrapperStorage()->getCache($this->getUnjailedPath($path), $storage);
-		return new CacheJail($sourceCache, $this->rootPath);
-	}
-
-	/**
-	 * get the user id of the owner of a file or folder
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getOwner($path) {
-		return $this->getWrapperStorage()->getOwner($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * get a watcher instance for the cache
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Watcher
-	 */
-	public function getWatcher($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		return $this->getWrapperStorage()->getWatcher($this->getUnjailedPath($path), $storage);
-	}
-
-	/**
-	 * get the ETag for a file or folder
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getETag($path) {
-		return $this->getWrapperStorage()->getETag($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * @param string $path
-	 * @return array
-	 */
-	public function getMetaData($path) {
-		return $this->getWrapperStorage()->getMetaData($this->getUnjailedPath($path));
-	}
-
-	/**
-	 * @param string $path
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param \OCP\Lock\ILockingProvider $provider
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function acquireLock($path, $type, ILockingProvider $provider) {
-		$this->getWrapperStorage()->acquireLock($this->getUnjailedPath($path), $type, $provider);
-	}
-
-	/**
-	 * @param string $path
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param \OCP\Lock\ILockingProvider $provider
-	 */
-	public function releaseLock($path, $type, ILockingProvider $provider) {
-		$this->getWrapperStorage()->releaseLock($this->getUnjailedPath($path), $type, $provider);
-	}
-
-	/**
-	 * @param string $path
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param \OCP\Lock\ILockingProvider $provider
-	 */
-	public function changeLock($path, $type, ILockingProvider $provider) {
-		$this->getWrapperStorage()->changeLock($this->getUnjailedPath($path), $type, $provider);
-	}
-
-	/**
-	 * Resolve the path for the source of the share
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function resolvePath($path) {
-		return [$this->getWrapperStorage(), $this->getUnjailedPath($path)];
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @return bool
-	 */
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		if ($sourceStorage === $this) {
-			return $this->copy($sourceInternalPath, $targetInternalPath);
-		}
-		return $this->getWrapperStorage()->copyFromStorage($sourceStorage, $sourceInternalPath, $this->getUnjailedPath($targetInternalPath));
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @return bool
-	 */
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		if ($sourceStorage === $this) {
-			return $this->rename($sourceInternalPath, $targetInternalPath);
-		}
-		return $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $this->getUnjailedPath($targetInternalPath));
-	}
-
-	public function getPropagator($storage = null) {
-		if (isset($this->propagator)) {
-			return $this->propagator;
-		}
-
-		if (!$storage) {
-			$storage = $this;
-		}
-		$this->propagator = new JailPropagator($storage, \OC::$server->getDatabaseConnection());
-		return $this->propagator;
-	}
+    /**
+     * @var string
+     */
+    protected $rootPath;
+
+    /**
+     * @param array $arguments ['storage' => $storage, 'mask' => $root]
+     *
+     * $storage: The storage that will be wrapper
+     * $root: The folder in the wrapped storage that will become the root folder of the wrapped storage
+     */
+    public function __construct($arguments) {
+        parent::__construct($arguments);
+        $this->rootPath = $arguments['root'];
+    }
+
+    public function getUnjailedPath($path) {
+        if ($path === '') {
+            return $this->rootPath;
+        } else {
+            return $this->rootPath . '/' . $path;
+        }
+    }
+
+    public function getJailedPath($path) {
+        $root = rtrim($this->rootPath, '/') . '/';
+
+        if (strpos($path, $root) !== 0) {
+            return null;
+        } else {
+            $path = substr($path, strlen($this->rootPath));
+            return trim($path, '/');
+        }
+    }
+
+    public function getId() {
+        return parent::getId();
+    }
+
+    /**
+     * see http://php.net/manual/en/function.mkdir.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function mkdir($path) {
+        return $this->getWrapperStorage()->mkdir($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.rmdir.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function rmdir($path) {
+        return $this->getWrapperStorage()->rmdir($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.opendir.php
+     *
+     * @param string $path
+     * @return resource
+     */
+    public function opendir($path) {
+        return $this->getWrapperStorage()->opendir($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.is_dir.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function is_dir($path) {
+        return $this->getWrapperStorage()->is_dir($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.is_file.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function is_file($path) {
+        return $this->getWrapperStorage()->is_file($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.stat.php
+     * only the following keys are required in the result: size and mtime
+     *
+     * @param string $path
+     * @return array
+     */
+    public function stat($path) {
+        return $this->getWrapperStorage()->stat($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.filetype.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function filetype($path) {
+        return $this->getWrapperStorage()->filetype($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.filesize.php
+     * The result for filesize when called on a folder is required to be 0
+     *
+     * @param string $path
+     * @return int
+     */
+    public function filesize($path) {
+        return $this->getWrapperStorage()->filesize($this->getUnjailedPath($path));
+    }
+
+    /**
+     * check if a file can be created in $path
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isCreatable($path) {
+        return $this->getWrapperStorage()->isCreatable($this->getUnjailedPath($path));
+    }
+
+    /**
+     * check if a file can be read
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isReadable($path) {
+        return $this->getWrapperStorage()->isReadable($this->getUnjailedPath($path));
+    }
+
+    /**
+     * check if a file can be written to
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isUpdatable($path) {
+        return $this->getWrapperStorage()->isUpdatable($this->getUnjailedPath($path));
+    }
+
+    /**
+     * check if a file can be deleted
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isDeletable($path) {
+        return $this->getWrapperStorage()->isDeletable($this->getUnjailedPath($path));
+    }
+
+    /**
+     * check if a file can be shared
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isSharable($path) {
+        return $this->getWrapperStorage()->isSharable($this->getUnjailedPath($path));
+    }
+
+    /**
+     * get the full permissions of a path.
+     * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
+     *
+     * @param string $path
+     * @return int
+     */
+    public function getPermissions($path) {
+        return $this->getWrapperStorage()->getPermissions($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.file_exists.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function file_exists($path) {
+        return $this->getWrapperStorage()->file_exists($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.filemtime.php
+     *
+     * @param string $path
+     * @return int
+     */
+    public function filemtime($path) {
+        return $this->getWrapperStorage()->filemtime($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.file_get_contents.php
+     *
+     * @param string $path
+     * @return string
+     */
+    public function file_get_contents($path) {
+        return $this->getWrapperStorage()->file_get_contents($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.file_put_contents.php
+     *
+     * @param string $path
+     * @param string $data
+     * @return bool
+     */
+    public function file_put_contents($path, $data) {
+        return $this->getWrapperStorage()->file_put_contents($this->getUnjailedPath($path), $data);
+    }
+
+    /**
+     * see http://php.net/manual/en/function.unlink.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path) {
+        return $this->getWrapperStorage()->unlink($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.rename.php
+     *
+     * @param string $path1
+     * @param string $path2
+     * @return bool
+     */
+    public function rename($path1, $path2) {
+        return $this->getWrapperStorage()->rename($this->getUnjailedPath($path1), $this->getUnjailedPath($path2));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.copy.php
+     *
+     * @param string $path1
+     * @param string $path2
+     * @return bool
+     */
+    public function copy($path1, $path2) {
+        return $this->getWrapperStorage()->copy($this->getUnjailedPath($path1), $this->getUnjailedPath($path2));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.fopen.php
+     *
+     * @param string $path
+     * @param string $mode
+     * @return resource
+     */
+    public function fopen($path, $mode) {
+        return $this->getWrapperStorage()->fopen($this->getUnjailedPath($path), $mode);
+    }
+
+    /**
+     * get the mimetype for a file or folder
+     * The mimetype for a folder is required to be "httpd/unix-directory"
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getMimeType($path) {
+        return $this->getWrapperStorage()->getMimeType($this->getUnjailedPath($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.hash.php
+     *
+     * @param string $type
+     * @param string $path
+     * @param bool $raw
+     * @return string
+     */
+    public function hash($type, $path, $raw = false) {
+        return $this->getWrapperStorage()->hash($type, $this->getUnjailedPath($path), $raw);
+    }
+
+    /**
+     * see http://php.net/manual/en/function.free_space.php
+     *
+     * @param string $path
+     * @return int
+     */
+    public function free_space($path) {
+        return $this->getWrapperStorage()->free_space($this->getUnjailedPath($path));
+    }
+
+    /**
+     * search for occurrences of $query in file names
+     *
+     * @param string $query
+     * @return array
+     */
+    public function search($query) {
+        return $this->getWrapperStorage()->search($query);
+    }
+
+    /**
+     * see http://php.net/manual/en/function.touch.php
+     * If the backend does not support the operation, false should be returned
+     *
+     * @param string $path
+     * @param int $mtime
+     * @return bool
+     */
+    public function touch($path, $mtime = null) {
+        return $this->getWrapperStorage()->touch($this->getUnjailedPath($path), $mtime);
+    }
+
+    /**
+     * get the path to a local version of the file.
+     * The local version of the file can be temporary and doesn't have to be persistent across requests
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getLocalFile($path) {
+        return $this->getWrapperStorage()->getLocalFile($this->getUnjailedPath($path));
+    }
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @param string $path
+     * @param int $time
+     * @return bool
+     *
+     * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+     * returning true for other changes in the folder is optional
+     */
+    public function hasUpdated($path, $time) {
+        return $this->getWrapperStorage()->hasUpdated($this->getUnjailedPath($path), $time);
+    }
+
+    /**
+     * get a cache instance for the storage
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+     * @return \OC\Files\Cache\Cache
+     */
+    public function getCache($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this->getWrapperStorage();
+        }
+        $sourceCache = $this->getWrapperStorage()->getCache($this->getUnjailedPath($path), $storage);
+        return new CacheJail($sourceCache, $this->rootPath);
+    }
+
+    /**
+     * get the user id of the owner of a file or folder
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getOwner($path) {
+        return $this->getWrapperStorage()->getOwner($this->getUnjailedPath($path));
+    }
+
+    /**
+     * get a watcher instance for the cache
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Watcher
+     */
+    public function getWatcher($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        return $this->getWrapperStorage()->getWatcher($this->getUnjailedPath($path), $storage);
+    }
+
+    /**
+     * get the ETag for a file or folder
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getETag($path) {
+        return $this->getWrapperStorage()->getETag($this->getUnjailedPath($path));
+    }
+
+    /**
+     * @param string $path
+     * @return array
+     */
+    public function getMetaData($path) {
+        return $this->getWrapperStorage()->getMetaData($this->getUnjailedPath($path));
+    }
+
+    /**
+     * @param string $path
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param \OCP\Lock\ILockingProvider $provider
+     * @throws \OCP\Lock\LockedException
+     */
+    public function acquireLock($path, $type, ILockingProvider $provider) {
+        $this->getWrapperStorage()->acquireLock($this->getUnjailedPath($path), $type, $provider);
+    }
+
+    /**
+     * @param string $path
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param \OCP\Lock\ILockingProvider $provider
+     */
+    public function releaseLock($path, $type, ILockingProvider $provider) {
+        $this->getWrapperStorage()->releaseLock($this->getUnjailedPath($path), $type, $provider);
+    }
+
+    /**
+     * @param string $path
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param \OCP\Lock\ILockingProvider $provider
+     */
+    public function changeLock($path, $type, ILockingProvider $provider) {
+        $this->getWrapperStorage()->changeLock($this->getUnjailedPath($path), $type, $provider);
+    }
+
+    /**
+     * Resolve the path for the source of the share
+     *
+     * @param string $path
+     * @return array
+     */
+    public function resolvePath($path) {
+        return [$this->getWrapperStorage(), $this->getUnjailedPath($path)];
+    }
+
+    /**
+     * @param IStorage $sourceStorage
+     * @param string $sourceInternalPath
+     * @param string $targetInternalPath
+     * @return bool
+     */
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        if ($sourceStorage === $this) {
+            return $this->copy($sourceInternalPath, $targetInternalPath);
+        }
+        return $this->getWrapperStorage()->copyFromStorage($sourceStorage, $sourceInternalPath, $this->getUnjailedPath($targetInternalPath));
+    }
+
+    /**
+     * @param IStorage $sourceStorage
+     * @param string $sourceInternalPath
+     * @param string $targetInternalPath
+     * @return bool
+     */
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        if ($sourceStorage === $this) {
+            return $this->rename($sourceInternalPath, $targetInternalPath);
+        }
+        return $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $this->getUnjailedPath($targetInternalPath));
+    }
+
+    public function getPropagator($storage = null) {
+        if (isset($this->propagator)) {
+            return $this->propagator;
+        }
+
+        if (!$storage) {
+            $storage = $this;
+        }
+        $this->propagator = new JailPropagator($storage, \OC::$server->getDatabaseConnection());
+        return $this->propagator;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -56,12 +56,12 @@
 		if ($path === '') {
 			return $this->rootPath;
 		} else {
-			return $this->rootPath . '/' . $path;
+			return $this->rootPath.'/'.$path;
 		}
 	}
 
 	public function getJailedPath($path) {
-		$root = rtrim($this->rootPath, '/') . '/';
+		$root = rtrim($this->rootPath, '/').'/';
 
 		if (strpos($path, $root) !== 0) {
 			return null;

apps/dav/lib/CalDAV/PublicCalendarRoot.php

Indentation +38 added lines, -38 removed lines

@@ -30,49 +30,49 @@
 
 class PublicCalendarRoot extends Collection {
 
-	/** @var CalDavBackend */
-	protected $caldavBackend;
+    /** @var CalDavBackend */
+    protected $caldavBackend;
 
-	/** @var \OCP\IL10N */
-	protected $l10n;
+    /** @var \OCP\IL10N */
+    protected $l10n;
 
-	/** @var \OCP\IConfig */
-	protected $config;
+    /** @var \OCP\IConfig */
+    protected $config;
 
-	/**
-	 * PublicCalendarRoot constructor.
-	 *
-	 * @param CalDavBackend $caldavBackend
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 */
-	function __construct(CalDavBackend $caldavBackend, IL10N $l10n,
-						 IConfig $config) {
-		$this->caldavBackend = $caldavBackend;
-		$this->l10n = $l10n;
-		$this->config = $config;
+    /**
+     * PublicCalendarRoot constructor.
+     *
+     * @param CalDavBackend $caldavBackend
+     * @param IL10N $l10n
+     * @param IConfig $config
+     */
+    function __construct(CalDavBackend $caldavBackend, IL10N $l10n,
+                            IConfig $config) {
+        $this->caldavBackend = $caldavBackend;
+        $this->l10n = $l10n;
+        $this->config = $config;
 
-	}
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getName() {
-		return 'public-calendars';
-	}
+    /**
+     * @inheritdoc
+     */
+    function getName() {
+        return 'public-calendars';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChild($name) {
-		$calendar = $this->caldavBackend->getPublicCalendar($name);
-		return new PublicCalendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-	}
+    /**
+     * @inheritdoc
+     */
+    function getChild($name) {
+        $calendar = $this->caldavBackend->getPublicCalendar($name);
+        return new PublicCalendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChildren() {
-		return [];
-	}
+    /**
+     * @inheritdoc
+     */
+    function getChildren() {
+        return [];
+    }
 }