nextcloud / server

apps/files_external/lib/Lib/Backend/FTP.php

Indentation +18 added lines, -18 removed lines

@@ -33,24 +33,24 @@
 
 class FTP extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, Password $legacyAuth) {
-		$this
-			->setIdentifier('ftp')
-			->addIdentifierAlias('\OC\Files\Storage\FTP') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\FTP')
-			->setText($l->t('FTP'))
-			->addParameters([
-				new DefinitionParameter('host', $l->t('Host')),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('secure', $l->t('Secure ftps://')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, Password $legacyAuth) {
+        $this
+            ->setIdentifier('ftp')
+            ->addIdentifierAlias('\OC\Files\Storage\FTP') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\FTP')
+            ->setText($l->t('FTP'))
+            ->addParameters([
+                new DefinitionParameter('host', $l->t('Host')),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('secure', $l->t('Secure ftps://')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

apps/files_external/lib/Lib/Backend/DAV.php

Indentation +18 added lines, -18 removed lines

@@ -33,24 +33,24 @@
 
 class DAV extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, Password $legacyAuth) {
-		$this
-			->setIdentifier('dav')
-			->addIdentifierAlias('\OC\Files\Storage\DAV') // legacy compat
-			->setStorageClass('\OC\Files\Storage\DAV')
-			->setText($l->t('WebDAV'))
-			->addParameters([
-				new DefinitionParameter('host', $l->t('URL')),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('secure', $l->t('Secure https://')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, Password $legacyAuth) {
+        $this
+            ->setIdentifier('dav')
+            ->addIdentifierAlias('\OC\Files\Storage\DAV') // legacy compat
+            ->setStorageClass('\OC\Files\Storage\DAV')
+            ->setText($l->t('WebDAV'))
+            ->addParameters([
+                new DefinitionParameter('host', $l->t('URL')),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('secure', $l->t('Secure https://')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

apps/files_external/lib/Lib/Backend/Local.php

Indentation +15 added lines, -15 removed lines

@@ -31,20 +31,20 @@
 
 class Local extends Backend {
 
-	public function __construct(IL10N $l, NullMechanism $legacyAuth) {
-		$this
-			->setIdentifier('local')
-			->addIdentifierAlias('\OC\Files\Storage\Local') // legacy compat
-			->setStorageClass('\OC\Files\Storage\Local')
-			->setText($l->t('Local'))
-			->addParameters([
-				new DefinitionParameter('datadir', $l->t('Location')),
-			])
-			->setAllowedVisibility(BackendService::VISIBILITY_ADMIN)
-			->setPriority(BackendService::PRIORITY_DEFAULT + 50)
-			->addAuthScheme(AuthMechanism::SCHEME_NULL)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, NullMechanism $legacyAuth) {
+        $this
+            ->setIdentifier('local')
+            ->addIdentifierAlias('\OC\Files\Storage\Local') // legacy compat
+            ->setStorageClass('\OC\Files\Storage\Local')
+            ->setText($l->t('Local'))
+            ->addParameters([
+                new DefinitionParameter('datadir', $l->t('Location')),
+            ])
+            ->setAllowedVisibility(BackendService::VISIBILITY_ADMIN)
+            ->setPriority(BackendService::PRIORITY_DEFAULT + 50)
+            ->addAuthScheme(AuthMechanism::SCHEME_NULL)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

apps/files_external/lib/Lib/Backend/AmazonS3.php

Indentation +26 added lines, -26 removed lines

@@ -33,32 +33,32 @@
 
 class AmazonS3 extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, AccessKey $legacyAuth) {
-		$this
-			->setIdentifier('amazons3')
-			->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3')
-			->setText($l->t('Amazon S3'))
-			->addParameters([
-				new DefinitionParameter('bucket', $l->t('Bucket')),
-				(new DefinitionParameter('hostname', $l->t('Hostname')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('port', $l->t('Port')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('region', $l->t('Region')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-				(new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-				(new DefinitionParameter('legacy_auth', $l->t('Legacy (v2) authentication')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-			])
-			->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, AccessKey $legacyAuth) {
+        $this
+            ->setIdentifier('amazons3')
+            ->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3')
+            ->setText($l->t('Amazon S3'))
+            ->addParameters([
+                new DefinitionParameter('bucket', $l->t('Bucket')),
+                (new DefinitionParameter('hostname', $l->t('Hostname')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('port', $l->t('Port')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('region', $l->t('Region')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+                (new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+                (new DefinitionParameter('legacy_auth', $l->t('Legacy (v2) authentication')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+            ])
+            ->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

apps/files_external/lib/Lib/Backend/SFTP.php

Indentation +16 added lines, -16 removed lines

@@ -29,21 +29,21 @@
 
 class SFTP extends Backend {
 
-	public function __construct(IL10N $l, Password $legacyAuth) {
-		$this
-			->setIdentifier('sftp')
-			->addIdentifierAlias('\OC\Files\Storage\SFTP') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
-			->setText($l->t('SFTP'))
-			->addParameters([
-				new DefinitionParameter('host', $l->t('Host')),
-				(new DefinitionParameter('root', $l->t('Root')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, Password $legacyAuth) {
+        $this
+            ->setIdentifier('sftp')
+            ->addIdentifierAlias('\OC\Files\Storage\SFTP') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
+            ->setText($l->t('SFTP'))
+            ->addParameters([
+                new DefinitionParameter('host', $l->t('Host')),
+                (new DefinitionParameter('root', $l->t('Root')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

lib/private/Memcache/ArrayCache.php

Indentation +117 added lines, -117 removed lines

@@ -27,133 +27,133 @@
 use OCP\IMemcache;
 
 class ArrayCache extends Cache implements IMemcache {
-	/** @var array Array with the cached data */
-	protected $cachedData = array();
+    /** @var array Array with the cached data */
+    protected $cachedData = array();
 
-	use CADTrait;
+    use CADTrait;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function get($key) {
-		if ($this->hasKey($key)) {
-			return $this->cachedData[$key];
-		}
-		return null;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function get($key) {
+        if ($this->hasKey($key)) {
+            return $this->cachedData[$key];
+        }
+        return null;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function set($key, $value, $ttl = 0) {
-		$this->cachedData[$key] = $value;
-		return true;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function set($key, $value, $ttl = 0) {
+        $this->cachedData[$key] = $value;
+        return true;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function hasKey($key) {
-		return isset($this->cachedData[$key]);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function hasKey($key) {
+        return isset($this->cachedData[$key]);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function remove($key) {
-		unset($this->cachedData[$key]);
-		return true;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function remove($key) {
+        unset($this->cachedData[$key]);
+        return true;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function clear($prefix = '') {
-		if ($prefix === '') {
-			$this->cachedData = [];
-			return true;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function clear($prefix = '') {
+        if ($prefix === '') {
+            $this->cachedData = [];
+            return true;
+        }
 
-		foreach ($this->cachedData as $key => $value) {
-			if (strpos($key, $prefix) === 0) {
-				$this->remove($key);
-			}
-		}
-		return true;
-	}
+        foreach ($this->cachedData as $key => $value) {
+            if (strpos($key, $prefix) === 0) {
+                $this->remove($key);
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		// since this cache is not shared race conditions aren't an issue
-		if ($this->hasKey($key)) {
-			return false;
-		} else {
-			return $this->set($key, $value, $ttl);
-		}
-	}
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        // since this cache is not shared race conditions aren't an issue
+        if ($this->hasKey($key)) {
+            return false;
+        } else {
+            return $this->set($key, $value, $ttl);
+        }
+    }
 
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$oldValue = $this->get($key);
-		if (is_int($oldValue)) {
-			$this->set($key, $oldValue + $step);
-			return $oldValue + $step;
-		} else {
-			$success = $this->add($key, $step);
-			return $success ? $step : false;
-		}
-	}
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $oldValue = $this->get($key);
+        if (is_int($oldValue)) {
+            $this->set($key, $oldValue + $step);
+            return $oldValue + $step;
+        } else {
+            $success = $this->add($key, $step);
+            return $success ? $step : false;
+        }
+    }
 
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		$oldValue = $this->get($key);
-		if (is_int($oldValue)) {
-			$this->set($key, $oldValue - $step);
-			return $oldValue - $step;
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        $oldValue = $this->get($key);
+        if (is_int($oldValue)) {
+            $this->set($key, $oldValue - $step);
+            return $oldValue - $step;
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		if ($this->get($key) === $old) {
-			return $this->set($key, $new);
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        if ($this->get($key) === $old) {
+            return $this->set($key, $new);
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	static public function isAvailable() {
-		return true;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    static public function isAvailable() {
+        return true;
+    }
 }

lib/private/Share/Helper.php

Indentation +232 added lines, -232 removed lines

@@ -33,263 +33,263 @@
 
 class Helper extends \OC\Share\Constants {
 
-	/**
-	 * Generate a unique target for the item
-	 * @param string $itemType
-	 * @param string $itemSource
-	 * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
-	 * @param string $shareWith User or group the item is being shared with
-	 * @param string $uidOwner User that is the owner of shared item
-	 * @param string $suggestedTarget The suggested target originating from a reshare (optional)
-	 * @param int $groupParent The id of the parent group share (optional)
-	 * @throws \Exception
-	 * @return string Item target
-	 */
-	public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedTarget = null, $groupParent = null) {
-		// FIXME: $uidOwner and $groupParent seems to be unused
-		$backend = \OC\Share\Share::getBackend($itemType);
-		if ($shareType === self::SHARE_TYPE_LINK || $shareType === self::SHARE_TYPE_REMOTE) {
-			if (isset($suggestedTarget)) {
-				return $suggestedTarget;
-			}
-			return $backend->generateTarget($itemSource, false);
-		} else {
-			if ($shareType == self::SHARE_TYPE_USER) {
-				// Share with is a user, so set share type to user and groups
-				$shareType = self::$shareTypeUserAndGroups;
-			}
+    /**
+     * Generate a unique target for the item
+     * @param string $itemType
+     * @param string $itemSource
+     * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+     * @param string $shareWith User or group the item is being shared with
+     * @param string $uidOwner User that is the owner of shared item
+     * @param string $suggestedTarget The suggested target originating from a reshare (optional)
+     * @param int $groupParent The id of the parent group share (optional)
+     * @throws \Exception
+     * @return string Item target
+     */
+    public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedTarget = null, $groupParent = null) {
+        // FIXME: $uidOwner and $groupParent seems to be unused
+        $backend = \OC\Share\Share::getBackend($itemType);
+        if ($shareType === self::SHARE_TYPE_LINK || $shareType === self::SHARE_TYPE_REMOTE) {
+            if (isset($suggestedTarget)) {
+                return $suggestedTarget;
+            }
+            return $backend->generateTarget($itemSource, false);
+        } else {
+            if ($shareType == self::SHARE_TYPE_USER) {
+                // Share with is a user, so set share type to user and groups
+                $shareType = self::$shareTypeUserAndGroups;
+            }
 
-			// Check if suggested target exists first
-			if (!isset($suggestedTarget)) {
-				$suggestedTarget = $itemSource;
-			}
-			if ($shareType == self::SHARE_TYPE_GROUP) {
-				$target = $backend->generateTarget($suggestedTarget, false);
-			} else {
-				$target = $backend->generateTarget($suggestedTarget, $shareWith);
-			}
+            // Check if suggested target exists first
+            if (!isset($suggestedTarget)) {
+                $suggestedTarget = $itemSource;
+            }
+            if ($shareType == self::SHARE_TYPE_GROUP) {
+                $target = $backend->generateTarget($suggestedTarget, false);
+            } else {
+                $target = $backend->generateTarget($suggestedTarget, $shareWith);
+            }
 
-			return $target;
-		}
-	}
+            return $target;
+        }
+    }
 
-	/**
-	 * Delete all reshares and group share children of an item
-	 * @param int $parent Id of item to delete
-	 * @param bool $excludeParent If true, exclude the parent from the delete (optional)
-	 * @param string $uidOwner The user that the parent was shared with (optional)
-	 * @param int $newParent new parent for the childrens
-	 * @param bool $excludeGroupChildren exclude group children elements
-	 */
-	public static function delete($parent, $excludeParent = false, $uidOwner = null, $newParent = null, $excludeGroupChildren = false) {
-		$ids = array($parent);
-		$deletedItems = array();
-		$changeParent = array();
-		$parents = array($parent);
-		while (!empty($parents)) {
-			$parents = "'".implode("','", $parents)."'";
-			// Check the owner on the first search of reshares, useful for
-			// finding and deleting the reshares by a single user of a group share
-			$params = array();
-			if (count($ids) == 1 && isset($uidOwner)) {
-				// FIXME: don't concat $parents, use Docrine's PARAM_INT_ARRAY approach
-				$queryString = 'SELECT `id`, `share_with`, `item_type`, `share_type`, ' .
-					'`item_target`, `file_target`, `parent` ' .
-					'FROM `*PREFIX*share` ' .
-					'WHERE `parent` IN ('.$parents.') AND `uid_owner` = ? ';
-				$params[] = $uidOwner;
-			} else {
-				$queryString = 'SELECT `id`, `share_with`, `item_type`, `share_type`, ' .
-					'`item_target`, `file_target`, `parent`, `uid_owner` ' .
-					'FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.') ';
-			}
-			if ($excludeGroupChildren) {
-				$queryString .= ' AND `share_type` != ?';
-				$params[] = self::$shareTypeGroupUserUnique;
-			}
-			$query = \OC_DB::prepare($queryString);
-			$result = $query->execute($params);
-			// Reset parents array, only go through loop again if items are found
-			$parents = array();
-			while ($item = $result->fetchRow()) {
-				$tmpItem = array(
-					'id' => $item['id'],
-					'shareWith' => $item['share_with'],
-					'itemTarget' => $item['item_target'],
-					'itemType' => $item['item_type'],
-					'shareType' => (int)$item['share_type'],
-				);
-				if (isset($item['file_target'])) {
-					$tmpItem['fileTarget'] = $item['file_target'];
-				}
-				// if we have a new parent for the child we remember the child
-				// to update the parent, if not we add it to the list of items
-				// which should be deleted
-				if ($newParent !== null) {
-					$changeParent[] = $item['id'];
-				} else {
-					$deletedItems[] = $tmpItem;
-					$ids[] = $item['id'];
-					$parents[] = $item['id'];
-				}
-			}
-		}
-		if ($excludeParent) {
-			unset($ids[0]);
-		}
+    /**
+     * Delete all reshares and group share children of an item
+     * @param int $parent Id of item to delete
+     * @param bool $excludeParent If true, exclude the parent from the delete (optional)
+     * @param string $uidOwner The user that the parent was shared with (optional)
+     * @param int $newParent new parent for the childrens
+     * @param bool $excludeGroupChildren exclude group children elements
+     */
+    public static function delete($parent, $excludeParent = false, $uidOwner = null, $newParent = null, $excludeGroupChildren = false) {
+        $ids = array($parent);
+        $deletedItems = array();
+        $changeParent = array();
+        $parents = array($parent);
+        while (!empty($parents)) {
+            $parents = "'".implode("','", $parents)."'";
+            // Check the owner on the first search of reshares, useful for
+            // finding and deleting the reshares by a single user of a group share
+            $params = array();
+            if (count($ids) == 1 && isset($uidOwner)) {
+                // FIXME: don't concat $parents, use Docrine's PARAM_INT_ARRAY approach
+                $queryString = 'SELECT `id`, `share_with`, `item_type`, `share_type`, ' .
+                    '`item_target`, `file_target`, `parent` ' .
+                    'FROM `*PREFIX*share` ' .
+                    'WHERE `parent` IN ('.$parents.') AND `uid_owner` = ? ';
+                $params[] = $uidOwner;
+            } else {
+                $queryString = 'SELECT `id`, `share_with`, `item_type`, `share_type`, ' .
+                    '`item_target`, `file_target`, `parent`, `uid_owner` ' .
+                    'FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.') ';
+            }
+            if ($excludeGroupChildren) {
+                $queryString .= ' AND `share_type` != ?';
+                $params[] = self::$shareTypeGroupUserUnique;
+            }
+            $query = \OC_DB::prepare($queryString);
+            $result = $query->execute($params);
+            // Reset parents array, only go through loop again if items are found
+            $parents = array();
+            while ($item = $result->fetchRow()) {
+                $tmpItem = array(
+                    'id' => $item['id'],
+                    'shareWith' => $item['share_with'],
+                    'itemTarget' => $item['item_target'],
+                    'itemType' => $item['item_type'],
+                    'shareType' => (int)$item['share_type'],
+                );
+                if (isset($item['file_target'])) {
+                    $tmpItem['fileTarget'] = $item['file_target'];
+                }
+                // if we have a new parent for the child we remember the child
+                // to update the parent, if not we add it to the list of items
+                // which should be deleted
+                if ($newParent !== null) {
+                    $changeParent[] = $item['id'];
+                } else {
+                    $deletedItems[] = $tmpItem;
+                    $ids[] = $item['id'];
+                    $parents[] = $item['id'];
+                }
+            }
+        }
+        if ($excludeParent) {
+            unset($ids[0]);
+        }
 
-		if (!empty($changeParent)) {
-			$idList = "'".implode("','", $changeParent)."'";
-			$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `parent` = ? WHERE `id` IN ('.$idList.')');
-			$query->execute(array($newParent));
-		}
+        if (!empty($changeParent)) {
+            $idList = "'".implode("','", $changeParent)."'";
+            $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `parent` = ? WHERE `id` IN ('.$idList.')');
+            $query->execute(array($newParent));
+        }
 
-		if (!empty($ids)) {
-			$idList = "'".implode("','", $ids)."'";
-			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` IN ('.$idList.')');
-			$query->execute();
-		}
+        if (!empty($ids)) {
+            $idList = "'".implode("','", $ids)."'";
+            $query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` IN ('.$idList.')');
+            $query->execute();
+        }
 
-		return $deletedItems;
-	}
+        return $deletedItems;
+    }
 
-	/**
-	 * get default expire settings defined by the admin
-	 * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
-	 */
-	public static function getDefaultExpireSetting() {
+    /**
+     * get default expire settings defined by the admin
+     * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
+     */
+    public static function getDefaultExpireSetting() {
 
-		$config = \OC::$server->getConfig();
+        $config = \OC::$server->getConfig();
 
-		$defaultExpireSettings = array('defaultExpireDateSet' => false);
+        $defaultExpireSettings = array('defaultExpireDateSet' => false);
 
-		// get default expire settings
-		$defaultExpireDate = $config->getAppValue('core', 'shareapi_default_expire_date', 'no');
-		if ($defaultExpireDate === 'yes') {
-			$enforceExpireDate = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
-			$defaultExpireSettings['defaultExpireDateSet'] = true;
-			$defaultExpireSettings['expireAfterDays'] = (int)$config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-			$defaultExpireSettings['enforceExpireDate'] = $enforceExpireDate === 'yes';
-		}
+        // get default expire settings
+        $defaultExpireDate = $config->getAppValue('core', 'shareapi_default_expire_date', 'no');
+        if ($defaultExpireDate === 'yes') {
+            $enforceExpireDate = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+            $defaultExpireSettings['defaultExpireDateSet'] = true;
+            $defaultExpireSettings['expireAfterDays'] = (int)$config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+            $defaultExpireSettings['enforceExpireDate'] = $enforceExpireDate === 'yes';
+        }
 
-		return $defaultExpireSettings;
-	}
+        return $defaultExpireSettings;
+    }
 
-	public static function calcExpireDate() {
-		$expireAfter = \OC\Share\Share::getExpireInterval() * 24 * 60 * 60;
-		$expireAt = time() + $expireAfter;
-		$date = new \DateTime();
-		$date->setTimestamp($expireAt);
-		$date->setTime(0, 0, 0);
-		//$dateString = $date->format('Y-m-d') . ' 00:00:00';
+    public static function calcExpireDate() {
+        $expireAfter = \OC\Share\Share::getExpireInterval() * 24 * 60 * 60;
+        $expireAt = time() + $expireAfter;
+        $date = new \DateTime();
+        $date->setTimestamp($expireAt);
+        $date->setTime(0, 0, 0);
+        //$dateString = $date->format('Y-m-d') . ' 00:00:00';
 
-		return $date;
+        return $date;
 
-	}
+    }
 
-	/**
-	 * calculate expire date
-	 * @param array $defaultExpireSettings contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
-	 * @param int $creationTime timestamp when the share was created
-	 * @param int $userExpireDate expire timestamp set by the user
-	 * @return mixed integer timestamp or False
-	 */
-	public static function calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate = null) {
+    /**
+     * calculate expire date
+     * @param array $defaultExpireSettings contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
+     * @param int $creationTime timestamp when the share was created
+     * @param int $userExpireDate expire timestamp set by the user
+     * @return mixed integer timestamp or False
+     */
+    public static function calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate = null) {
 
-		$expires = false;
-		$defaultExpires = null;
+        $expires = false;
+        $defaultExpires = null;
 
-		if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
-			$defaultExpires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
-		}
+        if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
+            $defaultExpires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
+        }
 
 
-		if (isset($userExpireDate)) {
-			// if the admin decided to enforce the default expire date then we only take
-			// the user defined expire date of it is before the default expire date
-			if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
-				$expires = min($userExpireDate, $defaultExpires);
-			} else {
-				$expires = $userExpireDate;
-			}
-		} else if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
-			$expires = $defaultExpires;
-		}
+        if (isset($userExpireDate)) {
+            // if the admin decided to enforce the default expire date then we only take
+            // the user defined expire date of it is before the default expire date
+            if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+                $expires = min($userExpireDate, $defaultExpires);
+            } else {
+                $expires = $userExpireDate;
+            }
+        } else if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+            $expires = $defaultExpires;
+        }
 
-		return $expires;
-	}
+        return $expires;
+    }
 
-	/**
-	 * Strips away a potential file names and trailing slashes:
-	 * - http://localhost
-	 * - http://localhost/
-	 * - http://localhost/index.php
-	 * - http://localhost/index.php/s/{shareToken}
-	 *
-	 * all return: http://localhost
-	 *
-	 * @param string $remote
-	 * @return string
-	 */
-	protected static function fixRemoteURL($remote) {
-		$remote = str_replace('\\', '/', $remote);
-		if ($fileNamePosition = strpos($remote, '/index.php')) {
-			$remote = substr($remote, 0, $fileNamePosition);
-		}
-		$remote = rtrim($remote, '/');
+    /**
+     * Strips away a potential file names and trailing slashes:
+     * - http://localhost
+     * - http://localhost/
+     * - http://localhost/index.php
+     * - http://localhost/index.php/s/{shareToken}
+     *
+     * all return: http://localhost
+     *
+     * @param string $remote
+     * @return string
+     */
+    protected static function fixRemoteURL($remote) {
+        $remote = str_replace('\\', '/', $remote);
+        if ($fileNamePosition = strpos($remote, '/index.php')) {
+            $remote = substr($remote, 0, $fileNamePosition);
+        }
+        $remote = rtrim($remote, '/');
 
-		return $remote;
-	}
+        return $remote;
+    }
 
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $id
-	 * @return string[]
-	 * @throws HintException
-	 */
-	public static function splitUserRemote($id) {
-		try {
-			$cloudId = \OC::$server->getCloudIdManager()->resolveCloudId($id);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			$l = \OC::$server->getL10N('core');
-			$hint = $l->t('Invalid Federated Cloud ID');
-			throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
-		}
-	}
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $id
+     * @return string[]
+     * @throws HintException
+     */
+    public static function splitUserRemote($id) {
+        try {
+            $cloudId = \OC::$server->getCloudIdManager()->resolveCloudId($id);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            $l = \OC::$server->getL10N('core');
+            $hint = $l->t('Invalid Federated Cloud ID');
+            throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
+        }
+    }
 
-	/**
-	 * check if two federated cloud IDs refer to the same user
-	 *
-	 * @param string $user1
-	 * @param string $server1
-	 * @param string $user2
-	 * @param string $server2
-	 * @return bool true if both users and servers are the same
-	 */
-	public static function isSameUserOnSameServer($user1, $server1, $user2, $server2) {
-		$normalizedServer1 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server1));
-		$normalizedServer2 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server2));
+    /**
+     * check if two federated cloud IDs refer to the same user
+     *
+     * @param string $user1
+     * @param string $server1
+     * @param string $user2
+     * @param string $server2
+     * @return bool true if both users and servers are the same
+     */
+    public static function isSameUserOnSameServer($user1, $server1, $user2, $server2) {
+        $normalizedServer1 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server1));
+        $normalizedServer2 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server2));
 
-		if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
-			// FIXME this should be a method in the user management instead
-			\OCP\Util::emitHook(
-					'\OCA\Files_Sharing\API\Server2Server',
-					'preLoginNameUsedAsUserName',
-					array('uid' => &$user1)
-			);
-			\OCP\Util::emitHook(
-					'\OCA\Files_Sharing\API\Server2Server',
-					'preLoginNameUsedAsUserName',
-					array('uid' => &$user2)
-			);
+        if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
+            // FIXME this should be a method in the user management instead
+            \OCP\Util::emitHook(
+                    '\OCA\Files_Sharing\API\Server2Server',
+                    'preLoginNameUsedAsUserName',
+                    array('uid' => &$user1)
+            );
+            \OCP\Util::emitHook(
+                    '\OCA\Files_Sharing\API\Server2Server',
+                    'preLoginNameUsedAsUserName',
+                    array('uid' => &$user2)
+            );
 
-			if ($user1 === $user2) {
-				return true;
-			}
-		}
+            if ($user1 === $user2) {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

core/Command/User/Info.php

Indentation +50 added lines, -50 removed lines

@@ -34,57 +34,57 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Info extends Base {
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:info')
-			->setDescription('show user info')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'user to show'
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:info')
+            ->setDescription('show user info')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'user to show'
+            )->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $this->userManager->get($input->getArgument('user'));
-		if (is_null($user)) {
-			$output->writeln('<error>user not found</error>');
-			return 1;
-		}
-		$groups = $this->groupManager->getUserGroupIds($user);
-		$data = [
-			'user_id' => $user->getUID(),
-			'display_name' => $user->getDisplayName(),
-			'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
-			'cloud_id' => $user->getCloudId(),
-			'enabled' => $user->isEnabled(),
-			'groups' => $groups,
-			'quota' => $user->getQuota(),
-			'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
-			'user_directory' => $user->getHome(),
-			'backend' => $user->getBackendClassName()
-		];
-		$this->writeArrayInOutputFormat($input, $output, $data);
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $this->userManager->get($input->getArgument('user'));
+        if (is_null($user)) {
+            $output->writeln('<error>user not found</error>');
+            return 1;
+        }
+        $groups = $this->groupManager->getUserGroupIds($user);
+        $data = [
+            'user_id' => $user->getUID(),
+            'display_name' => $user->getDisplayName(),
+            'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
+            'cloud_id' => $user->getCloudId(),
+            'enabled' => $user->isEnabled(),
+            'groups' => $groups,
+            'quota' => $user->getQuota(),
+            'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
+            'user_directory' => $user->getHome(),
+            'backend' => $user->getBackendClassName()
+        ];
+        $this->writeArrayInOutputFormat($input, $output, $data);
+    }
 }

core/Command/App/ListApps.php

Indentation +104 added lines, -104 removed lines

@@ -34,109 +34,109 @@
 
 class ListApps extends Base {
 
-	/** @var IAppManager */
-	protected $manager;
-
-	/**
-	 * @param IAppManager $manager
-	 */
-	public function __construct(IAppManager $manager) {
-		parent::__construct();
-		$this->manager = $manager;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('app:list')
-			->setDescription('List all available apps')
-			->addOption(
-				'shipped',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'true - limit to shipped apps only, false - limit to non-shipped apps only'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false'){
-			$shippedFilter = $input->getOption('shipped') === 'true';
-		} else {
-			$shippedFilter = null;
-		}
+    /** @var IAppManager */
+    protected $manager;
+
+    /**
+     * @param IAppManager $manager
+     */
+    public function __construct(IAppManager $manager) {
+        parent::__construct();
+        $this->manager = $manager;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('app:list')
+            ->setDescription('List all available apps')
+            ->addOption(
+                'shipped',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'true - limit to shipped apps only, false - limit to non-shipped apps only'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false'){
+            $shippedFilter = $input->getOption('shipped') === 'true';
+        } else {
+            $shippedFilter = null;
+        }
 		
-		$apps = \OC_App::getAllApps();
-		$enabledApps = $disabledApps = [];
-		$versions = \OC_App::getAppVersions();
-
-		//sort enabled apps above disabled apps
-		foreach ($apps as $app) {
-			if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter){
-				continue;
-			}
-			if ($this->manager->isInstalled($app)) {
-				$enabledApps[] = $app;
-			} else {
-				$disabledApps[] = $app;
-			}
-		}
-
-		$apps = ['enabled' => [], 'disabled' => []];
-
-		sort($enabledApps);
-		foreach ($enabledApps as $app) {
-			$apps['enabled'][$app] = isset($versions[$app]) ? $versions[$app] : true;
-		}
-
-		sort($disabledApps);
-		foreach ($disabledApps as $app) {
-			$apps['disabled'][$app] = null;
-		}
-
-		$this->writeAppList($input, $output, $apps);
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param array $items
-	 */
-	protected function writeAppList(InputInterface $input, OutputInterface $output, $items) {
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_PLAIN:
-				$output->writeln('Enabled:');
-				parent::writeArrayInOutputFormat($input, $output, $items['enabled']);
-
-				$output->writeln('Disabled:');
-				parent::writeArrayInOutputFormat($input, $output, $items['disabled']);
-			break;
-
-			default:
-				parent::writeArrayInOutputFormat($input, $output, $items);
-			break;
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $completionContext
-	 * @return array
-	 */
-	public function completeOptionValues($optionName, CompletionContext $completionContext) {
-		if ($optionName === 'shipped') {
-			return ['true', 'false'];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+        $apps = \OC_App::getAllApps();
+        $enabledApps = $disabledApps = [];
+        $versions = \OC_App::getAppVersions();
+
+        //sort enabled apps above disabled apps
+        foreach ($apps as $app) {
+            if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter){
+                continue;
+            }
+            if ($this->manager->isInstalled($app)) {
+                $enabledApps[] = $app;
+            } else {
+                $disabledApps[] = $app;
+            }
+        }
+
+        $apps = ['enabled' => [], 'disabled' => []];
+
+        sort($enabledApps);
+        foreach ($enabledApps as $app) {
+            $apps['enabled'][$app] = isset($versions[$app]) ? $versions[$app] : true;
+        }
+
+        sort($disabledApps);
+        foreach ($disabledApps as $app) {
+            $apps['disabled'][$app] = null;
+        }
+
+        $this->writeAppList($input, $output, $apps);
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param array $items
+     */
+    protected function writeAppList(InputInterface $input, OutputInterface $output, $items) {
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_PLAIN:
+                $output->writeln('Enabled:');
+                parent::writeArrayInOutputFormat($input, $output, $items['enabled']);
+
+                $output->writeln('Disabled:');
+                parent::writeArrayInOutputFormat($input, $output, $items['disabled']);
+            break;
+
+            default:
+                parent::writeArrayInOutputFormat($input, $output, $items);
+            break;
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $completionContext
+     * @return array
+     */
+    public function completeOptionValues($optionName, CompletionContext $completionContext) {
+        if ($optionName === 'shipped') {
+            return ['true', 'false'];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }