nextcloud / server

lib/private/Security/Bruteforce/Capabilities.php

Indentation +22 added lines, -22 removed lines

@@ -24,29 +24,29 @@
 use OCP\IRequest;
 
 class Capabilities implements IPublicCapability {
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/** @var Throttler */
-	private $throttler;
+    /** @var Throttler */
+    private $throttler;
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 * @param IRequest $request
-	 * @param Throttler $throttler
-	 */
-	public function __construct(IRequest $request,
-								Throttler $throttler) {
-		$this->request = $request;
-		$this->throttler = $throttler;
-	}
+    /**
+     * Capabilities constructor.
+     *
+     * @param IRequest $request
+     * @param Throttler $throttler
+     */
+    public function __construct(IRequest $request,
+                                Throttler $throttler) {
+        $this->request = $request;
+        $this->throttler = $throttler;
+    }
 
-	public function getCapabilities() {
-		return [
-			'bruteforce' => [
-				'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
-			]
-		];
-	}
+    public function getCapabilities() {
+        return [
+            'bruteforce' => [
+                'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
+            ]
+        ];
+    }
 }

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

Indentation +118 added lines, -118 removed lines

@@ -37,122 +37,122 @@
  * Note that the read permissions can't be masked
  */
 class PermissionsMask extends Wrapper {
-	/**
-	 * @var int the permissions bits we want to keep
-	 */
-	private $mask;
-
-	/**
-	 * @param array $arguments ['storage' => $storage, 'mask' => $mask]
-	 *
-	 * $storage: The storage the permissions mask should be applied on
-	 * $mask: The permission bits that should be kept, a combination of the \OCP\Constant::PERMISSION_ constants
-	 */
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->mask = $arguments['mask'];
-	}
-
-	private function checkMask($permissions) {
-		return ($this->mask & $permissions) === $permissions;
-	}
-
-	public function isUpdatable($path) {
-		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::isUpdatable($path);
-	}
-
-	public function isCreatable($path) {
-		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::isCreatable($path);
-	}
-
-	public function isDeletable($path) {
-		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::isDeletable($path);
-	}
-
-	public function isSharable($path) {
-		return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($path);
-	}
-
-	public function getPermissions($path) {
-		return $this->storage->getPermissions($path) & $this->mask;
-	}
-
-	public function rename($path1, $path2) {
-		$p = strpos($path1, $path2);
-		if ($p === 0) {
-			$part = substr($path1, strlen($path2));
-			//This is a rename of the transfer file to the original file
-			if (strpos($part, '.ocTransferId') === 0) {
-				return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
-			}
-		}
-		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
-	}
-
-	public function copy($path1, $path2) {
-		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::copy($path1, $path2);
-	}
-
-	public function touch($path, $mtime = null) {
-		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-		return $this->checkMask($permissions) and parent::touch($path, $mtime);
-	}
-
-	public function mkdir($path) {
-		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::mkdir($path);
-	}
-
-	public function rmdir($path) {
-		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::rmdir($path);
-	}
-
-	public function unlink($path) {
-		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::unlink($path);
-	}
-
-	public function file_put_contents($path, $data) {
-		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-		return $this->checkMask($permissions) ? parent::file_put_contents($path, $data) : false;
-	}
-
-	public function fopen($path, $mode) {
-		if ($mode === 'r' or $mode === 'rb') {
-			return parent::fopen($path, $mode);
-		} else {
-			$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-			return $this->checkMask($permissions) ? parent::fopen($path, $mode) : false;
-		}
-	}
-
-	/**
-	 * 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;
-		}
-		$sourceCache = parent::getCache($path, $storage);
-		return new CachePermissionsMask($sourceCache, $this->mask);
-	}
-
-	public function getMetaData($path) {
-		$data = parent::getMetaData($path);
-
-		if ($data && isset($data['permissions'])) {
-			$data['scan_permissions'] = isset($data['scan_permissions']) ? $data['scan_permissions'] : $data['permissions'];
-			$data['permissions'] &= $this->mask;
-		}
-		return $data;
-	}
-
-	public function getScanner($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this->storage;
-		}
-		return parent::getScanner($path, $storage);
-	}
+    /**
+     * @var int the permissions bits we want to keep
+     */
+    private $mask;
+
+    /**
+     * @param array $arguments ['storage' => $storage, 'mask' => $mask]
+     *
+     * $storage: The storage the permissions mask should be applied on
+     * $mask: The permission bits that should be kept, a combination of the \OCP\Constant::PERMISSION_ constants
+     */
+    public function __construct($arguments) {
+        parent::__construct($arguments);
+        $this->mask = $arguments['mask'];
+    }
+
+    private function checkMask($permissions) {
+        return ($this->mask & $permissions) === $permissions;
+    }
+
+    public function isUpdatable($path) {
+        return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::isUpdatable($path);
+    }
+
+    public function isCreatable($path) {
+        return $this->checkMask(Constants::PERMISSION_CREATE) and parent::isCreatable($path);
+    }
+
+    public function isDeletable($path) {
+        return $this->checkMask(Constants::PERMISSION_DELETE) and parent::isDeletable($path);
+    }
+
+    public function isSharable($path) {
+        return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($path);
+    }
+
+    public function getPermissions($path) {
+        return $this->storage->getPermissions($path) & $this->mask;
+    }
+
+    public function rename($path1, $path2) {
+        $p = strpos($path1, $path2);
+        if ($p === 0) {
+            $part = substr($path1, strlen($path2));
+            //This is a rename of the transfer file to the original file
+            if (strpos($part, '.ocTransferId') === 0) {
+                return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
+            }
+        }
+        return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
+    }
+
+    public function copy($path1, $path2) {
+        return $this->checkMask(Constants::PERMISSION_CREATE) and parent::copy($path1, $path2);
+    }
+
+    public function touch($path, $mtime = null) {
+        $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
+        return $this->checkMask($permissions) and parent::touch($path, $mtime);
+    }
+
+    public function mkdir($path) {
+        return $this->checkMask(Constants::PERMISSION_CREATE) and parent::mkdir($path);
+    }
+
+    public function rmdir($path) {
+        return $this->checkMask(Constants::PERMISSION_DELETE) and parent::rmdir($path);
+    }
+
+    public function unlink($path) {
+        return $this->checkMask(Constants::PERMISSION_DELETE) and parent::unlink($path);
+    }
+
+    public function file_put_contents($path, $data) {
+        $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
+        return $this->checkMask($permissions) ? parent::file_put_contents($path, $data) : false;
+    }
+
+    public function fopen($path, $mode) {
+        if ($mode === 'r' or $mode === 'rb') {
+            return parent::fopen($path, $mode);
+        } else {
+            $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
+            return $this->checkMask($permissions) ? parent::fopen($path, $mode) : false;
+        }
+    }
+
+    /**
+     * 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;
+        }
+        $sourceCache = parent::getCache($path, $storage);
+        return new CachePermissionsMask($sourceCache, $this->mask);
+    }
+
+    public function getMetaData($path) {
+        $data = parent::getMetaData($path);
+
+        if ($data && isset($data['permissions'])) {
+            $data['scan_permissions'] = isset($data['scan_permissions']) ? $data['scan_permissions'] : $data['permissions'];
+            $data['permissions'] &= $this->mask;
+        }
+        return $data;
+    }
+
+    public function getScanner($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this->storage;
+        }
+        return parent::getScanner($path, $storage);
+    }
 }

lib/private/Diagnostics/QueryLogger.php

Indentation +55 added lines, -55 removed lines

@@ -29,68 +29,68 @@
 use OCP\Diagnostics\IQueryLogger;
 
 class QueryLogger implements IQueryLogger {
-	/**
-	 * @var \OC\Diagnostics\Query
-	 */
-	protected $activeQuery;
+    /**
+     * @var \OC\Diagnostics\Query
+     */
+    protected $activeQuery;
 
-	/**
-	 * @var CappedMemoryCache
-	 */
-	protected $queries;
+    /**
+     * @var CappedMemoryCache
+     */
+    protected $queries;
 
-	/**
-	 * QueryLogger constructor.
-	 */
-	public function __construct() {
-		$this->queries = new CappedMemoryCache(1024);
-	}
+    /**
+     * QueryLogger constructor.
+     */
+    public function __construct() {
+        $this->queries = new CappedMemoryCache(1024);
+    }
 
 
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function startQuery($sql, array $params = null, array $types = null) {
-		if ($this->activated) {
-			$this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function startQuery($sql, array $params = null, array $types = null) {
+        if ($this->activated) {
+            $this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
+        }
+    }
 
-	private function getStack() {
-		$stack = debug_backtrace();
-		array_shift($stack);
-		array_shift($stack);
-		array_shift($stack);
-		return $stack;
-	}
+    private function getStack() {
+        $stack = debug_backtrace();
+        array_shift($stack);
+        array_shift($stack);
+        array_shift($stack);
+        return $stack;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function stopQuery() {
-		if ($this->activated && $this->activeQuery) {
-			$this->activeQuery->end(microtime(true));
-			$this->queries[] = $this->activeQuery;
-			$this->activeQuery = null;
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function stopQuery() {
+        if ($this->activated && $this->activeQuery) {
+            $this->activeQuery->end(microtime(true));
+            $this->queries[] = $this->activeQuery;
+            $this->activeQuery = null;
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getQueries() {
-		return $this->queries->getData();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getQueries() {
+        return $this->queries->getData();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }

apps/files/lib/Activity/Settings/FileDeleted.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class FileDeleted implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'file_deleted';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'file_deleted';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder has been <strong>deleted</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder has been <strong>deleted</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 3;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 3;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/files/lib/Activity/Settings/FileRestored.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class FileRestored implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'file_restored';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'file_restored';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder has been <strong>restored</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder has been <strong>restored</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 4;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 4;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

lib/private/DB/QueryBuilder/QuoteHelper.php

Indentation +41 added lines, -41 removed lines

@@ -27,55 +27,55 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class QuoteHelper {
-	/**
-	 * @param array|string|ILiteral|IParameter|IQueryFunction $strings string, Literal or Parameter
-	 * @return array|string
-	 */
-	public function quoteColumnNames($strings) {
-		if (!is_array($strings)) {
-			return $this->quoteColumnName($strings);
-		}
+    /**
+     * @param array|string|ILiteral|IParameter|IQueryFunction $strings string, Literal or Parameter
+     * @return array|string
+     */
+    public function quoteColumnNames($strings) {
+        if (!is_array($strings)) {
+            return $this->quoteColumnName($strings);
+        }
 
-		$return = [];
-		foreach ($strings as $string) {
-			$return[] = $this->quoteColumnName($string);
-		}
+        $return = [];
+        foreach ($strings as $string) {
+            $return[] = $this->quoteColumnName($string);
+        }
 
-		return $return;
-	}
+        return $return;
+    }
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $string string, Literal or Parameter
-	 * @return string
-	 */
-	public function quoteColumnName($string) {
-		if ($string instanceof IParameter || $string instanceof ILiteral || $string instanceof IQueryFunction) {
-			return (string) $string;
-		}
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $string string, Literal or Parameter
+     * @return string
+     */
+    public function quoteColumnName($string) {
+        if ($string instanceof IParameter || $string instanceof ILiteral || $string instanceof IQueryFunction) {
+            return (string) $string;
+        }
 
-		if ($string === null || $string === 'null' || $string === '*') {
-			return $string;
-		}
+        if ($string === null || $string === 'null' || $string === '*') {
+            return $string;
+        }
 
-		if (!is_string($string)) {
-			throw new \InvalidArgumentException('Only strings, Literals and Parameters are allowed');
-		}
+        if (!is_string($string)) {
+            throw new \InvalidArgumentException('Only strings, Literals and Parameters are allowed');
+        }
 
-		$string = str_replace(' AS ', ' as ', $string);
-		if (substr_count($string, ' as ')) {
-			return implode(' as ', array_map([$this, 'quoteColumnName'], explode(' as ', $string, 2)));
-		}
+        $string = str_replace(' AS ', ' as ', $string);
+        if (substr_count($string, ' as ')) {
+            return implode(' as ', array_map([$this, 'quoteColumnName'], explode(' as ', $string, 2)));
+        }
 
-		if (substr_count($string, '.')) {
-			list($alias, $columnName) = explode('.', $string, 2);
+        if (substr_count($string, '.')) {
+            list($alias, $columnName) = explode('.', $string, 2);
 
-			if ($columnName === '*') {
-				return '`' . $alias . '`.*';
-			}
+            if ($columnName === '*') {
+                return '`' . $alias . '`.*';
+            }
 
-			return '`' . $alias . '`.`' . $columnName . '`';
-		}
+            return '`' . $alias . '`.`' . $columnName . '`';
+        }
 
-		return '`' . $string . '`';
-	}
+        return '`' . $string . '`';
+    }
 }

lib/private/Repair/OldGroupMembershipShares.php

Indentation +85 added lines, -85 removed lines

@@ -31,89 +31,89 @@
 
 class OldGroupMembershipShares implements IRepairStep {
 
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * @var array [gid => [uid => (bool)]]
-	 */
-	protected $memberships;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return 'Remove shares of old group memberships';
-	}
-
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @throws \Exception in case of failure
-	 * @suppress SqlInjectionChecker
-	 */
-	public function run(IOutput $output) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				// \OC\Share\Constant::$shareTypeGroupUserUnique === 2
-				->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
-				->andWhere($query->expr()->isNotNull('s2.id'))
-				->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(Share::SHARE_TYPE_GROUP)))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			if (!$this->isMember($row['group'], $row['user'])) {
-				$deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
-					->execute();
-			}
-		}
-		$result->closeCursor();
-
-		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
-		}
-	}
-
-	/**
-	 * @param string $gid
-	 * @param string $uid
-	 * @return bool
-	 */
-	protected function isMember($gid, $uid) {
-		if (isset($this->memberships[$gid][$uid])) {
-			return $this->memberships[$gid][$uid];
-		}
-
-		$isMember = $this->groupManager->isInGroup($uid, $gid);
-		if (!isset($this->memberships[$gid])) {
-			$this->memberships[$gid] = [];
-		}
-		$this->memberships[$gid][$uid] = $isMember;
-
-		return $isMember;
-	}
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\IGroupManager */
+    protected $groupManager;
+
+    /**
+     * @var array [gid => [uid => (bool)]]
+     */
+    protected $memberships;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
+        $this->connection = $connection;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     */
+    public function getName() {
+        return 'Remove shares of old group memberships';
+    }
+
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @throws \Exception in case of failure
+     * @suppress SqlInjectionChecker
+     */
+    public function run(IOutput $output) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                // \OC\Share\Constant::$shareTypeGroupUserUnique === 2
+                ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
+                ->andWhere($query->expr()->isNotNull('s2.id'))
+                ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(Share::SHARE_TYPE_GROUP)))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            if (!$this->isMember($row['group'], $row['user'])) {
+                $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
+                    ->execute();
+            }
+        }
+        $result->closeCursor();
+
+        if ($deletedEntries) {
+            $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
+        }
+    }
+
+    /**
+     * @param string $gid
+     * @param string $uid
+     * @return bool
+     */
+    protected function isMember($gid, $uid) {
+        if (isset($this->memberships[$gid][$uid])) {
+            return $this->memberships[$gid][$uid];
+        }
+
+        $isMember = $this->groupManager->isInGroup($uid, $gid);
+        if (!isset($this->memberships[$gid])) {
+            $this->memberships[$gid] = [];
+        }
+        $this->memberships[$gid][$uid] = $isMember;
+
+        return $isMember;
+    }
 }

apps/testing/lib/Controller/ConfigController.php

Indentation +32 added lines, -32 removed lines

@@ -29,39 +29,39 @@
 
 class ConfigController extends OCSController {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IConfig $config) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IConfig $config) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+    }
 
-	/**
-	 * @param string $appid
-	 * @param string $configkey
-	 * @param string $value
-	 * @return DataResponse
-	 */
-	public function setAppValue($appid, $configkey, $value) {
-		$this->config->setAppValue($appid, $configkey, $value);
-		return new DataResponse();
-	}
+    /**
+     * @param string $appid
+     * @param string $configkey
+     * @param string $value
+     * @return DataResponse
+     */
+    public function setAppValue($appid, $configkey, $value) {
+        $this->config->setAppValue($appid, $configkey, $value);
+        return new DataResponse();
+    }
 
-	/**
-	 * @param string $appid
-	 * @param string $configkey
-	 * @return DataResponse
-	 */
-	public function deleteAppValue($appid, $configkey) {
-		$this->config->deleteAppValue($appid, $configkey);
-		return new DataResponse();
-	}
+    /**
+     * @param string $appid
+     * @param string $configkey
+     * @return DataResponse
+     */
+    public function deleteAppValue($appid, $configkey) {
+        $this->config->deleteAppValue($appid, $configkey);
+        return new DataResponse();
+    }
 }

lib/public/AppFramework/Http/ICallbackResponse.php

Indentation +7 added lines, -7 removed lines

@@ -33,12 +33,12 @@
  */
 interface ICallbackResponse {
 
-	/**
-	 * Outputs the content that should be printed
-	 *
-	 * @param IOutput $output a small wrapper that handles output
-	 * @since 8.1.0
-	 */
-	public function callback(IOutput $output);
+    /**
+     * Outputs the content that should be printed
+     *
+     * @param IOutput $output a small wrapper that handles output
+     * @since 8.1.0
+     */
+    public function callback(IOutput $output);
 
 }