nextcloud / server

lib/public/SystemTag/ISystemTagManagerFactory.php

Indentation +22 added lines, -22 removed lines

@@ -34,28 +34,28 @@
  */
 interface ISystemTagManagerFactory {
 
-	/**
-	 * Constructor for the system tag manager factory
-	 *
-	 * @param IServerContainer $serverContainer server container
-	 * @since 9.0.0
-	 */
-	public function __construct(IServerContainer $serverContainer);
+    /**
+     * Constructor for the system tag manager factory
+     *
+     * @param IServerContainer $serverContainer server container
+     * @since 9.0.0
+     */
+    public function __construct(IServerContainer $serverContainer);
 
-	/**
-	 * creates and returns an instance of the system tag manager
-	 *
-	 * @return ISystemTagManager
-	 * @since 9.0.0
-	 */
-	public function getManager(): ISystemTagManager;
+    /**
+     * creates and returns an instance of the system tag manager
+     *
+     * @return ISystemTagManager
+     * @since 9.0.0
+     */
+    public function getManager(): ISystemTagManager;
 
-	/**
-	 * creates and returns an instance of the system tag object
-	 * mapper
-	 *
-	 * @return ISystemTagObjectMapper
-	 * @since 9.0.0
-	 */
-	public function getObjectMapper(): ISystemTagObjectMapper;
+    /**
+     * creates and returns an instance of the system tag object
+     * mapper
+     *
+     * @return ISystemTagObjectMapper
+     * @since 9.0.0
+     */
+    public function getObjectMapper(): ISystemTagObjectMapper;
 }

lib/public/SystemTag/ISystemTagManager.php

Indentation +120 added lines, -120 removed lines

@@ -33,133 +33,133 @@
  */
 interface ISystemTagManager {
 
-	/**
-	 * Returns the tag objects matching the given tag ids.
-	 *
-	 * @param array|string $tagIds id or array of unique ids of the tag to retrieve
-	 *
-	 * @return ISystemTag[] array of system tags with tag id as key
-	 *
-	 * @throws \InvalidArgumentException if at least one given tag ids is invalid (string instead of integer, etc.)
-	 * @throws TagNotFoundException if at least one given tag ids did no exist
-	 * 			The message contains a json_encoded array of the ids that could not be found
-	 *
-	 * @since 9.0.0
-	 */
-	public function getTagsByIds($tagIds): array;
+    /**
+     * Returns the tag objects matching the given tag ids.
+     *
+     * @param array|string $tagIds id or array of unique ids of the tag to retrieve
+     *
+     * @return ISystemTag[] array of system tags with tag id as key
+     *
+     * @throws \InvalidArgumentException if at least one given tag ids is invalid (string instead of integer, etc.)
+     * @throws TagNotFoundException if at least one given tag ids did no exist
+     * 			The message contains a json_encoded array of the ids that could not be found
+     *
+     * @since 9.0.0
+     */
+    public function getTagsByIds($tagIds): array;
 
-	/**
-	 * Returns the tag object matching the given attributes.
-	 *
-	 * @param string $tagName tag name
-	 * @param bool $userVisible whether the tag is visible by users
-	 * @param bool $userAssignable whether the tag is assignable by users
-	 *
-	 * @return ISystemTag system tag
-	 *
-	 * @throws TagNotFoundException if tag does not exist
-	 *
-	 * @since 9.0.0
-	 */
-	public function getTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag;
+    /**
+     * Returns the tag object matching the given attributes.
+     *
+     * @param string $tagName tag name
+     * @param bool $userVisible whether the tag is visible by users
+     * @param bool $userAssignable whether the tag is assignable by users
+     *
+     * @return ISystemTag system tag
+     *
+     * @throws TagNotFoundException if tag does not exist
+     *
+     * @since 9.0.0
+     */
+    public function getTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag;
 
-	/**
-	 * Creates the tag object using the given attributes.
-	 *
-	 * @param string $tagName tag name
-	 * @param bool $userVisible whether the tag is visible by users
-	 * @param bool $userAssignable whether the tag is assignable by users
-	 *
-	 * @return ISystemTag system tag
-	 *
-	 * @throws TagAlreadyExistsException if tag already exists
-	 *
-	 * @since 9.0.0
-	 */
-	public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag;
+    /**
+     * Creates the tag object using the given attributes.
+     *
+     * @param string $tagName tag name
+     * @param bool $userVisible whether the tag is visible by users
+     * @param bool $userAssignable whether the tag is assignable by users
+     *
+     * @return ISystemTag system tag
+     *
+     * @throws TagAlreadyExistsException if tag already exists
+     *
+     * @since 9.0.0
+     */
+    public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag;
 
-	/**
-	 * Returns all known tags, optionally filtered by visibility.
-	 *
-	 * @param bool|null $visibilityFilter filter by visibility if non-null
-	 * @param string $nameSearchPattern optional search pattern for the tag name
-	 *
-	 * @return ISystemTag[] array of system tags or empty array if none found
-	 *
-	 * @since 9.0.0
-	 */
-	public function getAllTags($visibilityFilter = null, $nameSearchPattern = null): array;
+    /**
+     * Returns all known tags, optionally filtered by visibility.
+     *
+     * @param bool|null $visibilityFilter filter by visibility if non-null
+     * @param string $nameSearchPattern optional search pattern for the tag name
+     *
+     * @return ISystemTag[] array of system tags or empty array if none found
+     *
+     * @since 9.0.0
+     */
+    public function getAllTags($visibilityFilter = null, $nameSearchPattern = null): array;
 
-	/**
-	 * Updates the given tag
-	 *
-	 * @param string $tagId tag id
-	 * @param string $newName the new tag name
-	 * @param bool $userVisible whether the tag is visible by users
-	 * @param bool $userAssignable whether the tag is assignable by users
-	 *
-	 * @throws TagNotFoundException if tag with the given id does not exist
-	 * @throws TagAlreadyExistsException if there is already another tag
-	 * with the same attributes
-	 *
-	 * @since 9.0.0
-	 */
-	public function updateTag(string $tagId, string $newName, bool $userVisible, bool $userAssignable);
+    /**
+     * Updates the given tag
+     *
+     * @param string $tagId tag id
+     * @param string $newName the new tag name
+     * @param bool $userVisible whether the tag is visible by users
+     * @param bool $userAssignable whether the tag is assignable by users
+     *
+     * @throws TagNotFoundException if tag with the given id does not exist
+     * @throws TagAlreadyExistsException if there is already another tag
+     * with the same attributes
+     *
+     * @since 9.0.0
+     */
+    public function updateTag(string $tagId, string $newName, bool $userVisible, bool $userAssignable);
 
-	/**
-	 * Delete the given tags from the database and all their relationships.
-	 *
-	 * @param string|array $tagIds array of tag ids
-	 *
-	 * @throws TagNotFoundException if at least one tag did not exist
-	 *
-	 * @since 9.0.0
-	 */
-	public function deleteTags($tagIds);
+    /**
+     * Delete the given tags from the database and all their relationships.
+     *
+     * @param string|array $tagIds array of tag ids
+     *
+     * @throws TagNotFoundException if at least one tag did not exist
+     *
+     * @since 9.0.0
+     */
+    public function deleteTags($tagIds);
 
-	/**
-	 * Checks whether the given user is allowed to assign/unassign the tag with the
-	 * given id.
-	 *
-	 * @param ISystemTag $tag tag to check permission for
-	 * @param IUser $user user to check permission for
-	 *
-	 * @return true if the user is allowed to assign/unassign the tag, false otherwise
-	 *
-	 * @since 9.1.0
-	 */
-	public function canUserAssignTag(ISystemTag $tag, IUser $user): bool;
+    /**
+     * Checks whether the given user is allowed to assign/unassign the tag with the
+     * given id.
+     *
+     * @param ISystemTag $tag tag to check permission for
+     * @param IUser $user user to check permission for
+     *
+     * @return true if the user is allowed to assign/unassign the tag, false otherwise
+     *
+     * @since 9.1.0
+     */
+    public function canUserAssignTag(ISystemTag $tag, IUser $user): bool;
 
-	/**
-	 * Checks whether the given user is allowed to see the tag with the given id.
-	 *
-	 * @param ISystemTag $tag tag to check permission for
-	 * @param IUser $user user to check permission for
-	 *
-	 * @return true if the user can see the tag, false otherwise
-	 *
-	 * @since 9.1.0
-	 */
-	public function canUserSeeTag(ISystemTag $tag, IUser $user): bool;
+    /**
+     * Checks whether the given user is allowed to see the tag with the given id.
+     *
+     * @param ISystemTag $tag tag to check permission for
+     * @param IUser $user user to check permission for
+     *
+     * @return true if the user can see the tag, false otherwise
+     *
+     * @since 9.1.0
+     */
+    public function canUserSeeTag(ISystemTag $tag, IUser $user): bool;
 
-	/**
-	 * Set groups that can assign a given tag.
-	 *
-	 * @param ISystemTag $tag tag for group assignment
-	 * @param string[] $groupIds group ids of groups that can assign/unassign the tag
-	 *
-	 * @since 9.1.0
-	 */
-	public function setTagGroups(ISystemTag $tag, array $groupIds);
+    /**
+     * Set groups that can assign a given tag.
+     *
+     * @param ISystemTag $tag tag for group assignment
+     * @param string[] $groupIds group ids of groups that can assign/unassign the tag
+     *
+     * @since 9.1.0
+     */
+    public function setTagGroups(ISystemTag $tag, array $groupIds);
 
-	/**
-	 * Get groups that can assign a given tag.
-	 *
-	 * @param ISystemTag $tag tag for group assignment
-	 *
-	 * @return string[] group ids of groups that can assign/unassign the tag
-	 *
-	 * @since 9.1.0
-	 */
-	public function getTagGroups(ISystemTag $tag): array;
+    /**
+     * Get groups that can assign a given tag.
+     *
+     * @param ISystemTag $tag tag for group assignment
+     *
+     * @return string[] group ids of groups that can assign/unassign the tag
+     *
+     * @since 9.1.0
+     */
+    public function getTagGroups(ISystemTag $tag): array;
 }

lib/public/SystemTag/TagNotFoundException.php

Indentation +22 added lines, -22 removed lines

@@ -32,28 +32,28 @@
  */
 class TagNotFoundException extends \RuntimeException {
 
-	/** @var string[] */
-	protected $tags;
+    /** @var string[] */
+    protected $tags;
 
-	/**
-	 * TagNotFoundException constructor.
-	 *
-	 * @param string $message
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 * @param string[] $tags
-	 * @since 9.0.0
-	 */
-	public function __construct(string $message = '', int $code = 0, \Exception $previous = null, array $tags = []) {
-		parent::__construct($message, $code, $previous);
-		$this->tags = $tags;
-	}
+    /**
+     * TagNotFoundException constructor.
+     *
+     * @param string $message
+     * @param int $code
+     * @param \Exception|null $previous
+     * @param string[] $tags
+     * @since 9.0.0
+     */
+    public function __construct(string $message = '', int $code = 0, \Exception $previous = null, array $tags = []) {
+        parent::__construct($message, $code, $previous);
+        $this->tags = $tags;
+    }
 
-	/**
-	 * @return string[]
-	 * @since 9.0.0
-	 */
-	public function getMissingTags(): array {
-		return $this->tags;
-	}
+    /**
+     * @return string[]
+     * @since 9.0.0
+     */
+    public function getMissingTags(): array {
+        return $this->tags;
+    }
 }

lib/private/SystemTag/ManagerFactory.php

Indentation +41 added lines, -41 removed lines

@@ -36,48 +36,48 @@
  */
 class ManagerFactory implements ISystemTagManagerFactory {
 
-	/**
-	 * Server container
-	 *
-	 * @var IServerContainer
-	 */
-	private $serverContainer;
+    /**
+     * Server container
+     *
+     * @var IServerContainer
+     */
+    private $serverContainer;
 
-	/**
-	 * Constructor for the system tag manager factory
-	 *
-	 * @param IServerContainer $serverContainer server container
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
+    /**
+     * Constructor for the system tag manager factory
+     *
+     * @param IServerContainer $serverContainer server container
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
 
-	/**
-	 * Creates and returns an instance of the system tag manager
-	 *
-	 * @return ISystemTagManager
-	 * @since 9.0.0
-	 */
-	public function getManager(): ISystemTagManager {
-		return new SystemTagManager(
-			$this->serverContainer->getDatabaseConnection(),
-			$this->serverContainer->getGroupManager(),
-			$this->serverContainer->getEventDispatcher()
-		);
-	}
+    /**
+     * Creates and returns an instance of the system tag manager
+     *
+     * @return ISystemTagManager
+     * @since 9.0.0
+     */
+    public function getManager(): ISystemTagManager {
+        return new SystemTagManager(
+            $this->serverContainer->getDatabaseConnection(),
+            $this->serverContainer->getGroupManager(),
+            $this->serverContainer->getEventDispatcher()
+        );
+    }
 
-	/**
-	 * Creates and returns an instance of the system tag object
-	 * mapper
-	 *
-	 * @return ISystemTagObjectMapper
-	 * @since 9.0.0
-	 */
-	public function getObjectMapper(): ISystemTagObjectMapper {
-		return new SystemTagObjectMapper(
-			$this->serverContainer->getDatabaseConnection(),
-			$this->getManager(),
-			$this->serverContainer->getEventDispatcher()
-		);
-	}
+    /**
+     * Creates and returns an instance of the system tag object
+     * mapper
+     *
+     * @return ISystemTagObjectMapper
+     * @since 9.0.0
+     */
+    public function getObjectMapper(): ISystemTagObjectMapper {
+        return new SystemTagObjectMapper(
+            $this->serverContainer->getDatabaseConnection(),
+            $this->getManager(),
+            $this->serverContainer->getEventDispatcher()
+        );
+    }
 }

apps/user_ldap/templates/part.wizard-userfilter.php

Spacing +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <fieldset id="ldapWizard2">
 	<div>
 		<p>
-			<?php p($l->t('Listing and searching for users is constrained by these criteria:'));?>
+			<?php p($l->t('Listing and searching for users is constrained by these criteria:')); ?>
 		</p>
 		<p>
 			<label for="ldap_userfilter_objectclass">
-				<?php p($l->t('Only these object classes:'));?>
+				<?php p($l->t('Only these object classes:')); ?>
 			</label>
 
 			<select id="ldap_userfilter_objectclass" multiple="multiple"
@@ -14,14 +14,14 @@ 
 		</p>
 		<p>
 			<label></label>
-			<span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.'));?></span>
+			<span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.')); ?></span>
 		</p>
 		<p>
 			<label for="ldap_userfilter_groups">
-				<?php p($l->t('Only from these groups:'));?>
+				<?php p($l->t('Only from these groups:')); ?>
 			</label>
 
-			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" />
+			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" />
 
 			<select id="ldap_userfilter_groups" multiple="multiple"
 			 name="ldap_userfilter_groups" class="multiSelectPlugin">
@@ -30,26 +30,26 @@ 
 		<p class="ldapManyGroupsSupport hidden">
 			<label></label>
 			<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
-					title="<?php p($l->t('Available groups'));?>"></select>
+					title="<?php p($l->t('Available groups')); ?>"></select>
 			<span class="buttonSpan">
 				<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
 				<button class="ldapGroupListDeselect" type="button">&lt;</button>
 			</span>
 			<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
-					title="<?php p($l->t('Selected groups'));?>"></select>
+					title="<?php p($l->t('Selected groups')); ?>"></select>
 		</p>
 		<p>
-			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
+			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
 		</p>
 		<p id="ldapReadOnlyUserFilterContainer" class="hidden ldapReadOnlyFilterContainer">
-			<label><?php p($l->t('LDAP Filter:'));?></label>
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
 		</p>
 		<p id="rawUserFilterContainer">
 			<textarea type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
 				class="ldapFilterInputElement"
-				placeholder="<?php p($l->t('Edit LDAP Query'));?>"
-				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()]));?>">
+				placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
+				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()])); ?>">
 			</textarea>
 		</p>
 		<p>
@@ -57,7 +57,7 @@ 
 		</p>
 		<p class="ldap_count">
 			<button class="ldapGetEntryCount ldapGetUserCount" name="ldapGetEntryCount" type="button">
-				<?php p($l->t('Verify settings and count users'));?>
+				<?php p($l->t('Verify settings and count users')); ?>
 			</button>
 			<span id="ldap_user_count"></span>
 		</p>

apps/user_ldap/templates/part.wizard-groupfilter.php

Spacing +11 added lines, -11 removed lines

@@ -1,11 +1,11 @@ 
 <fieldset id="ldapWizard4">
 	<div>
 		<p>
-			<?php p($l->t('Groups meeting these criteria are available in %s:', [$theme->getName()]));?>
+			<?php p($l->t('Groups meeting these criteria are available in %s:', [$theme->getName()])); ?>
 		</p>
 		<p>
 			<label for="ldap_groupfilter_objectclass">
-				<?php p($l->t('Only these object classes:'));?>
+				<?php p($l->t('Only these object classes:')); ?>
 			</label>
 
 			<select id="ldap_groupfilter_objectclass" multiple="multiple"
@@ -14,10 +14,10 @@ 
 		</p>
 		<p>
 			<label for="ldap_groupfilter_groups">
-				<?php p($l->t('Only from these groups:'));?>
+				<?php p($l->t('Only from these groups:')); ?>
 			</label>
 
-			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" />
+			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" />
 
 			<select id="ldap_groupfilter_groups" multiple="multiple"
 			 name="ldap_groupfilter_groups" class="multiSelectPlugin">
@@ -27,25 +27,25 @@ 
 		<p class="ldapManyGroupsSupport hidden">
 			<label></label>
 			<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
-					title="<?php p($l->t('Available groups'));?>"></select>
+					title="<?php p($l->t('Available groups')); ?>"></select>
 			<span class="buttonSpan">
 				<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
 				<button class="ldapGroupListDeselect" type="button">&lt;</button>
 			</span>
 			<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
-					title="<?php p($l->t('Selected groups'));?>"></select>
+					title="<?php p($l->t('Selected groups')); ?>"></select>
 		</p>
 		<p>
-			<label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
+			<label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
 		</p>
 		<p id="ldapReadOnlyGroupFilterContainer" class="hidden ldapReadOnlyFilterContainer">
-			<label><?php p($l->t('LDAP Filter:'));?></label>
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
 		</p>
 		<p id="rawGroupFilterContainer" class="invisible">
 			<textarea type="text" id="ldap_group_filter" name="ldap_group_filter"
-					  placeholder="<?php p($l->t('Edit LDAP Query'));?>"
-					  title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', [$theme->getName()]));?>">
+					  placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
+					  title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', [$theme->getName()])); ?>">
 			</textarea>
 		</p>
 		<p>
@@ -53,7 +53,7 @@ 
 		</p>
 		<p class="ldap_count">
 			<button class="ldapGetEntryCount ldapGetGroupCount" name="ldapGetEntryCount" type="button">
-				<?php p($l->t('Verify settings and count the groups'));?>
+				<?php p($l->t('Verify settings and count the groups')); ?>
 			</button>
 			<span id="ldap_group_count"></span>
 		</p>

lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php

Indentation +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class NotAdminException extends SecurityException {
-	public function __construct(string $message) {
-		parent::__construct($message, Http::STATUS_FORBIDDEN);
-	}
+    public function __construct(string $message) {
+        parent::__construct($message, Http::STATUS_FORBIDDEN);
+    }
 }

apps/files_sharing/lib/Helper.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 		$dir = $pathinfo['dirname'];
 		$i = 2;
 		while ($view->file_exists($path) || in_array($path, $excludeList)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+			$path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext);
 			$i++;
 		}
 
@@ -82,7 +82,7 @@ 
 			$dir = '';
 			$subdirs = explode('/', $shareFolder);
 			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
+				$dir = $dir.'/'.$subdir;
 				if (!$view->is_dir($dir)) {
 					$view->mkdir($dir);
 				}

Indentation +67 added lines, -67 removed lines

@@ -32,81 +32,81 @@
 use OCA\Files_Sharing\AppInfo\Application;
 
 class Helper {
-	public static function registerHooks() {
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
+    public static function registerHooks() {
+        \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
 
-		\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
-	}
+        \OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
+    }
 
-	/**
-	 * check if file name already exists and generate unique target
-	 *
-	 * @param string $path
-	 * @param array $excludeList
-	 * @param View $view
-	 * @return string $path
-	 */
-	public static function generateUniqueTarget($path, $excludeList, $view) {
-		$pathinfo = pathinfo($path);
-		$ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '';
-		$name = $pathinfo['filename'];
-		$dir = $pathinfo['dirname'];
-		$i = 2;
-		while ($view->file_exists($path) || in_array($path, $excludeList)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
-			$i++;
-		}
+    /**
+     * check if file name already exists and generate unique target
+     *
+     * @param string $path
+     * @param array $excludeList
+     * @param View $view
+     * @return string $path
+     */
+    public static function generateUniqueTarget($path, $excludeList, $view) {
+        $pathinfo = pathinfo($path);
+        $ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '';
+        $name = $pathinfo['filename'];
+        $dir = $pathinfo['dirname'];
+        $i = 2;
+        while ($view->file_exists($path) || in_array($path, $excludeList)) {
+            $path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+            $i++;
+        }
 
-		return $path;
-	}
+        return $path;
+    }
 
-	/**
-	 * get default share folder
-	 *
-	 * @param \OC\Files\View|null $view
-	 * @param string|null $userId
-	 * @return string
-	 */
-	public static function getShareFolder(View $view = null, string $userId = null): string {
-		if ($view === null) {
-			$view = Filesystem::getView();
-		}
+    /**
+     * get default share folder
+     *
+     * @param \OC\Files\View|null $view
+     * @param string|null $userId
+     * @return string
+     */
+    public static function getShareFolder(View $view = null, string $userId = null): string {
+        if ($view === null) {
+            $view = Filesystem::getView();
+        }
 
-		$config = \OC::$server->getConfig();
-		$systemDefault = $config->getSystemValue('share_folder', '/');
-		$allowCustomShareFolder = $config->getSystemValueBool('sharing.allow_custom_share_folder', true);
+        $config = \OC::$server->getConfig();
+        $systemDefault = $config->getSystemValue('share_folder', '/');
+        $allowCustomShareFolder = $config->getSystemValueBool('sharing.allow_custom_share_folder', true);
 
-		// Init custom shareFolder
-		$shareFolder = $systemDefault;
-		if ($userId !== null && $allowCustomShareFolder) {
-			$shareFolder = $config->getUserValue($userId, Application::APP_ID, 'share_folder', $systemDefault);
-		}
+        // Init custom shareFolder
+        $shareFolder = $systemDefault;
+        if ($userId !== null && $allowCustomShareFolder) {
+            $shareFolder = $config->getUserValue($userId, Application::APP_ID, 'share_folder', $systemDefault);
+        }
 
-		// Verify and sanitize path
-		$shareFolder = Filesystem::normalizePath($shareFolder);
+        // Verify and sanitize path
+        $shareFolder = Filesystem::normalizePath($shareFolder);
 
-		// Init path if folder doesn't exists
-		if (!$view->file_exists($shareFolder)) {
-			$dir = '';
-			$subdirs = explode('/', $shareFolder);
-			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
-				if (!$view->is_dir($dir)) {
-					$view->mkdir($dir);
-				}
-			}
-		}
+        // Init path if folder doesn't exists
+        if (!$view->file_exists($shareFolder)) {
+            $dir = '';
+            $subdirs = explode('/', $shareFolder);
+            foreach ($subdirs as $subdir) {
+                $dir = $dir . '/' . $subdir;
+                if (!$view->is_dir($dir)) {
+                    $view->mkdir($dir);
+                }
+            }
+        }
 
-		return $shareFolder;
-	}
+        return $shareFolder;
+    }
 
-	/**
-	 * set default share folder
-	 *
-	 * @param string $shareFolder
-	 */
-	public static function setShareFolder($shareFolder) {
-		\OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
-	}
+    /**
+     * set default share folder
+     *
+     * @param string $shareFolder
+     */
+    public static function setShareFolder($shareFolder) {
+        \OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
+    }
 }

lib/private/Mail/Attachment.php

Indentation +38 added lines, -38 removed lines

@@ -34,48 +34,48 @@
  */
 class Attachment implements IAttachment {
 
-	/** @var \Swift_Mime_Attachment */
-	protected $swiftAttachment;
+    /** @var \Swift_Mime_Attachment */
+    protected $swiftAttachment;
 
-	public function __construct(\Swift_Mime_Attachment $attachment) {
-		$this->swiftAttachment = $attachment;
-	}
+    public function __construct(\Swift_Mime_Attachment $attachment) {
+        $this->swiftAttachment = $attachment;
+    }
 
-	/**
-	 * @param string $filename
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setFilename(string $filename): IAttachment {
-		$this->swiftAttachment->setFilename($filename);
-		return $this;
-	}
+    /**
+     * @param string $filename
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setFilename(string $filename): IAttachment {
+        $this->swiftAttachment->setFilename($filename);
+        return $this;
+    }
 
-	/**
-	 * @param string $contentType
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setContentType(string $contentType): IAttachment {
-		$this->swiftAttachment->setContentType($contentType);
-		return $this;
-	}
+    /**
+     * @param string $contentType
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setContentType(string $contentType): IAttachment {
+        $this->swiftAttachment->setContentType($contentType);
+        return $this;
+    }
 
-	/**
-	 * @param string $body
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setBody(string $body): IAttachment {
-		$this->swiftAttachment->setBody($body);
-		return $this;
-	}
+    /**
+     * @param string $body
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setBody(string $body): IAttachment {
+        $this->swiftAttachment->setBody($body);
+        return $this;
+    }
 
-	/**
-	 * @return \Swift_Mime_Attachment
-	 */
-	public function getSwiftAttachment(): \Swift_Mime_Attachment {
-		return $this->swiftAttachment;
-	}
+    /**
+     * @return \Swift_Mime_Attachment
+     */
+    public function getSwiftAttachment(): \Swift_Mime_Attachment {
+        return $this->swiftAttachment;
+    }
 
 }