nextcloud / server

apps/files_trashbin/ajax/list.php

Indentation +3 added lines, -3 removed lines

@@ -32,10 +32,10 @@
 
 // make filelist
 try {
-	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
+    $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
 } catch (Exception $e) {
-	header("HTTP/1.0 404 Not Found");
-	exit();
+    header("HTTP/1.0 404 Not Found");
+    exit();
 }
 
 $encodedDir = \OCP\Util::encodePath($dir);

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
 \OC::$server->getSession()->close();
 
 // Load the files
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
-$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
+$sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name';
 $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
 $data = array();
 

apps/files_trashbin/ajax/delete.php

Indentation +40 added lines, -40 removed lines

@@ -32,19 +32,19 @@ 
 
 // "empty trash" command
 if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
-	$deleteAll = true;
-	if ($folder === '/' || $folder === '') {
-		OCA\Files_Trashbin\Trashbin::deleteAll();
-		$list = array();
-	} else {
-		$list[] = $folder;
-		$folder = dirname($folder);
-	}
+    $deleteAll = true;
+    if ($folder === '/' || $folder === '') {
+        OCA\Files_Trashbin\Trashbin::deleteAll();
+        $list = array();
+    } else {
+        $list[] = $folder;
+        $folder = dirname($folder);
+    }
 }
 else {
-	$deleteAll = false;
-	$files = (string)$_POST['files'];
-	$list = json_decode($files);
+    $deleteAll = false;
+    $files = (string)$_POST['files'];
+    $list = json_decode($files);
 }
 
 $folder = rtrim($folder, '/') . '/';
@@ -53,38 +53,38 @@ 
 
 $i = 0;
 foreach ($list as $file) {
-	if ($folder === '/') {
-		$file = ltrim($file, '/');
-		$delimiter = strrpos($file, '.d');
-		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
-	} else {
-		$filename = $folder . '/' . $file;
-		$timestamp = null;
-	}
+    if ($folder === '/') {
+        $file = ltrim($file, '/');
+        $delimiter = strrpos($file, '.d');
+        $filename = substr($file, 0, $delimiter);
+        $timestamp =  substr($file, $delimiter+2);
+    } else {
+        $filename = $folder . '/' . $file;
+        $timestamp = null;
+    }
 
-	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
-	if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
-		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
-	}
-	// only list deleted files if not deleting everything
-	else if (!$deleteAll) {
-		$success[$i]['filename'] = $file;
-		$success[$i]['timestamp'] = $timestamp;
-		$i++;
-	}
+    OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
+    if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
+        $error[] = $filename;
+        \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
+    }
+    // only list deleted files if not deleting everything
+    else if (!$deleteAll) {
+        $success[$i]['filename'] = $file;
+        $success[$i]['timestamp'] = $timestamp;
+        $i++;
+    }
 }
 
 if ( $error ) {
-	$filelist = '';
-	foreach ( $error as $e ) {
-		$filelist .= $e.', ';
-	}
-	$l = \OC::$server->getL10N('files_trashbin');
-	$message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
-	OCP\JSON::error(array("data" => array("message" => $message,
-			                               "success" => $success, "error" => $error)));
+    $filelist = '';
+    foreach ( $error as $e ) {
+        $filelist .= $e.', ';
+    }
+    $l = \OC::$server->getL10N('files_trashbin');
+    $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
+    OCP\JSON::error(array("data" => array("message" => $message,
+                                            "success" => $success, "error" => $error)));
 } else {
-	OCP\JSON::success(array("data" => array("success" => $success)));
+    OCP\JSON::success(array("data" => array("success" => $success)));
 }

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 $folder = isset($_POST['dir']) ? $_POST['dir'] : '/';
 
 // "empty trash" command
-if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
+if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') {
 	$deleteAll = true;
 	if ($folder === '/' || $folder === '') {
 		OCA\Files_Trashbin\Trashbin::deleteAll();
@@ -43,11 +43,11 @@ 
 }
 else {
 	$deleteAll = false;
-	$files = (string)$_POST['files'];
+	$files = (string) $_POST['files'];
 	$list = json_decode($files);
 }
 
-$folder = rtrim($folder, '/') . '/';
+$folder = rtrim($folder, '/').'/';
 $error = array();
 $success = array();
 
@@ -57,16 +57,16 @@ 
 		$file = ltrim($file, '/');
 		$delimiter = strrpos($file, '.d');
 		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
+		$timestamp = substr($file, $delimiter + 2);
 	} else {
-		$filename = $folder . '/' . $file;
+		$filename = $folder.'/'.$file;
 		$timestamp = null;
 	}
 
 	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
 	if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
 		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
+		\OCP\Util::writeLog('trashbin', 'can\'t delete '.$filename.' permanently.', \OCP\Util::ERROR);
 	}
 	// only list deleted files if not deleting everything
 	else if (!$deleteAll) {
@@ -76,9 +76,9 @@ 
 	}
 }
 
-if ( $error ) {
+if ($error) {
 	$filelist = '';
-	foreach ( $error as $e ) {
+	foreach ($error as $e) {
 		$filelist .= $e.', ';
 	}
 	$l = \OC::$server->getL10N('files_trashbin');

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
 		$list[] = $folder;
 		$folder = dirname($folder);
 	}
-}
-else {
+} else {
 	$deleteAll = false;
 	$files = (string)$_POST['files'];
 	$list = json_decode($files);

apps/files_trashbin/lib/AppInfo/Application.php

Indentation +13 added lines, -13 removed lines

@@ -27,23 +27,23 @@
 use OCA\Files_Trashbin\Expiration;
 
 class Application extends App {
-	public function __construct (array $urlParams = []) {
-		parent::__construct('files_trashbin', $urlParams);
+    public function __construct (array $urlParams = []) {
+        parent::__construct('files_trashbin', $urlParams);
 
-		$container = $this->getContainer();
-		/*
+        $container = $this->getContainer();
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability('OCA\Files_Trashbin\Capabilities');
+        $container->registerCapability('OCA\Files_Trashbin\Capabilities');
 
-		/*
+        /*
 		 * Register expiration
 		 */
-		$container->registerService('Expiration', function($c) {
-			return  new Expiration(
-				$c->query('ServerContainer')->getConfig(),
-				$c->query('OCP\AppFramework\Utility\ITimeFactory')
-			);
-		});
-	}
+        $container->registerService('Expiration', function($c) {
+            return  new Expiration(
+                $c->query('ServerContainer')->getConfig(),
+                $c->query('OCP\AppFramework\Utility\ITimeFactory')
+            );
+        });
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 use OCA\Files_Trashbin\Expiration;
 
 class Application extends App {
-	public function __construct (array $urlParams = []) {
+	public function __construct(array $urlParams = []) {
 		parent::__construct('files_trashbin', $urlParams);
 
 		$container = $this->getContainer();

apps/files_trashbin/lib/Helper.php

Indentation +81 added lines, -81 removed lines

@@ -30,92 +30,92 @@
 use OCP\Files\Cache\ICacheEntry;
 
 class Helper {
-	/**
-	 * Retrieves the contents of a trash bin directory.
-	 *
-	 * @param string $dir path to the directory inside the trashbin
-	 * or empty to retrieve the root of the trashbin
-	 * @param string $user
-	 * @param string $sortAttribute attribute to sort on or empty to disable sorting
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @return \OCP\Files\FileInfo[]
-	 */
-	public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false) {
-		$result = array();
-		$timestamp = null;
+    /**
+     * Retrieves the contents of a trash bin directory.
+     *
+     * @param string $dir path to the directory inside the trashbin
+     * or empty to retrieve the root of the trashbin
+     * @param string $user
+     * @param string $sortAttribute attribute to sort on or empty to disable sorting
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @return \OCP\Files\FileInfo[]
+     */
+    public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false) {
+        $result = array();
+        $timestamp = null;
 
-		$view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
+        $view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
 
-		if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
-			throw new \Exception('Directory does not exists');
-		}
+        if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
+            throw new \Exception('Directory does not exists');
+        }
 
-		$mount = $view->getMount($dir);
-		$storage = $mount->getStorage();
-		$absoluteDir = $view->getAbsolutePath($dir);
-		$internalPath = $mount->getInternalPath($absoluteDir);
+        $mount = $view->getMount($dir);
+        $storage = $mount->getStorage();
+        $absoluteDir = $view->getAbsolutePath($dir);
+        $internalPath = $mount->getInternalPath($absoluteDir);
 
-		$originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user);
-		$dirContent = $storage->getCache()->getFolderContents($mount->getInternalPath($view->getAbsolutePath($dir)));
-		foreach ($dirContent as $entry) {
-			$entryName = $entry->getName();
-			$id = $entry->getId();
-			$name = $entryName;
-			if ($dir === '' || $dir === '/') {
-				$pathparts = pathinfo($entryName);
-				$timestamp = substr($pathparts['extension'], 1);
-				$name = $pathparts['filename'];
+        $originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user);
+        $dirContent = $storage->getCache()->getFolderContents($mount->getInternalPath($view->getAbsolutePath($dir)));
+        foreach ($dirContent as $entry) {
+            $entryName = $entry->getName();
+            $id = $entry->getId();
+            $name = $entryName;
+            if ($dir === '' || $dir === '/') {
+                $pathparts = pathinfo($entryName);
+                $timestamp = substr($pathparts['extension'], 1);
+                $name = $pathparts['filename'];
 
-			} else if ($timestamp === null) {
-				// for subfolders we need to calculate the timestamp only once
-				$parts = explode('/', ltrim($dir, '/'));
-				$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
-			}
-			$originalPath = '';
-			if (isset($originalLocations[$id][$timestamp])) {
-				$originalPath = $originalLocations[$id][$timestamp];
-				if (substr($originalPath, -1) === '/') {
-					$originalPath = substr($originalPath, 0, -1);
-				}
-			}
-			$type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
-			$i = array(
-				'name' => $name,
-				'mtime' => $timestamp,
-				'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
-				'type' => $type,
-				'directory' => ($dir === '/') ? '' : $dir,
-				'size' => $entry->getSize(),
-				'etag' => '',
-				'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE
-			);
-			if ($originalPath) {
-				$i['extraData'] = $originalPath . '/' . $id;
-			}
-			$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
-		}
+            } else if ($timestamp === null) {
+                // for subfolders we need to calculate the timestamp only once
+                $parts = explode('/', ltrim($dir, '/'));
+                $timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
+            }
+            $originalPath = '';
+            if (isset($originalLocations[$id][$timestamp])) {
+                $originalPath = $originalLocations[$id][$timestamp];
+                if (substr($originalPath, -1) === '/') {
+                    $originalPath = substr($originalPath, 0, -1);
+                }
+            }
+            $type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
+            $i = array(
+                'name' => $name,
+                'mtime' => $timestamp,
+                'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
+                'type' => $type,
+                'directory' => ($dir === '/') ? '' : $dir,
+                'size' => $entry->getSize(),
+                'etag' => '',
+                'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE
+            );
+            if ($originalPath) {
+                $i['extraData'] = $originalPath . '/' . $id;
+            }
+            $result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
+        }
 
-		if ($sortAttribute !== '') {
-			return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
-		}
-		return $result;
-	}
+        if ($sortAttribute !== '') {
+            return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
+        }
+        return $result;
+    }
 
-	/**
-	 * Format file infos for JSON
-	 *
-	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
-	 */
-	public static function formatFileInfos($fileInfos) {
-		$files = array();
-		$id = 0;
-		foreach ($fileInfos as $i) {
-			$entry = \OCA\Files\Helper::formatFileInfo($i);
-			$entry['id'] = $id++;
-			$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
-			$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
-			$files[] = $entry;
-		}
-		return $files;
-	}
+    /**
+     * Format file infos for JSON
+     *
+     * @param \OCP\Files\FileInfo[] $fileInfos file infos
+     */
+    public static function formatFileInfos($fileInfos) {
+        $files = array();
+        $id = 0;
+        foreach ($fileInfos as $i) {
+            $entry = \OCA\Files\Helper::formatFileInfo($i);
+            $entry['id'] = $id++;
+            $entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
+            $entry['permissions'] = \OCP\Constants::PERMISSION_READ;
+            $files[] = $entry;
+        }
+        return $files;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 		$result = array();
 		$timestamp = null;
 
-		$view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
+		$view = new \OC\Files\View('/'.$user.'/files_trashbin/files');
 
 		if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
 			throw new \Exception('Directory does not exists');
@@ -90,9 +90,9 @@ 
 				'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE
 			);
 			if ($originalPath) {
-				$i['extraData'] = $originalPath . '/' . $id;
+				$i['extraData'] = $originalPath.'/'.$id;
 			}
-			$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
+			$result[] = new FileInfo($absoluteDir.'/'.$i['name'], $storage, $internalPath.'/'.$i['name'], $i, $mount);
 		}
 
 		if ($sortAttribute !== '') {

apps/files_trashbin/lib/Command/Expire.php

Indentation +22 added lines, -22 removed lines

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

apps/files_trashbin/lib/Command/CleanUp.php

Indentation +76 added lines, -76 removed lines

@@ -34,87 +34,87 @@
 
 class CleanUp extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IRootFolder */
-	protected $rootFolder;
+    /** @var IRootFolder */
+    protected $rootFolder;
 
-	/** @var \OCP\IDBConnection */
-	protected $dbConnection;
+    /** @var \OCP\IDBConnection */
+    protected $dbConnection;
 
-	/**
-	 * @param IRootFolder $rootFolder
-	 * @param IUserManager $userManager
-	 * @param IDBConnection $dbConnection
-	 */
-	function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->dbConnection = $dbConnection;
-	}
+    /**
+     * @param IRootFolder $rootFolder
+     * @param IUserManager $userManager
+     * @param IDBConnection $dbConnection
+     */
+    function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->dbConnection = $dbConnection;
+    }
 
-	protected function configure() {
-		$this
-			->setName('trashbin:cleanup')
-			->setDescription('Remove deleted files')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'remove deleted files of the given user(s), if no user is given all deleted files will be removed'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('trashbin:cleanup')
+            ->setDescription('Remove deleted files')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'remove deleted files of the given user(s), if no user is given all deleted files will be removed'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Remove deleted files of   <info>$user</info>");
-					$this->removeDeletedFiles($user);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$output->writeln('Remove all deleted files');
-			foreach ($this->userManager->getBackends() as $backend) {
-				$name = get_class($backend);
-				if ($backend instanceof IUserBackend) {
-					$name = $backend->getBackendName();
-				}
-				$output->writeln("Remove deleted files for users on backend <info>$name</info>");
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers('', $limit, $offset);
-					foreach ($users as $user) {
-						$output->writeln("   <info>$user</info>");
-						$this->removeDeletedFiles($user);
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-		}
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Remove deleted files of   <info>$user</info>");
+                    $this->removeDeletedFiles($user);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $output->writeln('Remove all deleted files');
+            foreach ($this->userManager->getBackends() as $backend) {
+                $name = get_class($backend);
+                if ($backend instanceof IUserBackend) {
+                    $name = $backend->getBackendName();
+                }
+                $output->writeln("Remove deleted files for users on backend <info>$name</info>");
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers('', $limit, $offset);
+                    foreach ($users as $user) {
+                        $output->writeln("   <info>$user</info>");
+                        $this->removeDeletedFiles($user);
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+        }
+    }
 
-	/**
-	 * remove deleted files for the given user
-	 *
-	 * @param string $uid
-	 */
-	protected function removeDeletedFiles($uid) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($uid);
-		if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) {
-			$this->rootFolder->get('/' . $uid . '/files_trashbin')->delete();
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->delete('files_trash')
-				->where($query->expr()->eq('user', $query->createParameter('uid')))
-				->setParameter('uid', $uid);
-			$query->execute();
-		}
-	}
+    /**
+     * remove deleted files for the given user
+     *
+     * @param string $uid
+     */
+    protected function removeDeletedFiles($uid) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($uid);
+        if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) {
+            $this->rootFolder->get('/' . $uid . '/files_trashbin')->delete();
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->delete('files_trash')
+                ->where($query->expr()->eq('user', $query->createParameter('uid')))
+                ->setParameter('uid', $uid);
+            $query->execute();
+        }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -107,8 +107,8 @@
 	protected function removeDeletedFiles($uid) {
 		\OC_Util::tearDownFS();
 		\OC_Util::setupFS($uid);
-		if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) {
-			$this->rootFolder->get('/' . $uid . '/files_trashbin')->delete();
+		if ($this->rootFolder->nodeExists('/'.$uid.'/files_trashbin')) {
+			$this->rootFolder->get('/'.$uid.'/files_trashbin')->delete();
 			$query = $this->dbConnection->getQueryBuilder();
 			$query->delete('files_trash')
 				->where($query->expr()->eq('user', $query->createParameter('uid')))

apps/files_trashbin/lib/Capabilities.php

Indentation +12 added lines, -12 removed lines

@@ -33,17 +33,17 @@
  */
 class Capabilities implements ICapability {
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'files' => [
-				'undelete' => true
-			]
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'files' => [
+                'undelete' => true
+            ]
+        ];
+    }
 	
 }

apps/files_trashbin/lib/Hooks.php

Indentation +19 added lines, -19 removed lines

@@ -31,24 +31,24 @@
 
 class Hooks {
 
-	/**
-	 * clean up user specific settings if user gets deleted
-	 * @param array $params array with uid
-	 *
-	 * This function is connected to the pre_deleteUser signal of OC_Users
-	 * to remove the used space for the trash bin stored in the database
-	 */
-	public static function deleteUser_hook($params) {
-		if( \OCP\App::isEnabled('files_trashbin') ) {
-			$uid = $params['uid'];
-			Trashbin::deleteUser($uid);
-		}
-	}
+    /**
+     * clean up user specific settings if user gets deleted
+     * @param array $params array with uid
+     *
+     * This function is connected to the pre_deleteUser signal of OC_Users
+     * to remove the used space for the trash bin stored in the database
+     */
+    public static function deleteUser_hook($params) {
+        if( \OCP\App::isEnabled('files_trashbin') ) {
+            $uid = $params['uid'];
+            Trashbin::deleteUser($uid);
+        }
+    }
 
-	public static function post_write_hook($params) {
-		$user = \OCP\User::getUser();
-		if (!empty($user)) {
-			Trashbin::resizeTrash($user);
-		}
-	}
+    public static function post_write_hook($params) {
+        $user = \OCP\User::getUser();
+        if (!empty($user)) {
+            Trashbin::resizeTrash($user);
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	 * to remove the used space for the trash bin stored in the database
 	 */
 	public static function deleteUser_hook($params) {
-		if( \OCP\App::isEnabled('files_trashbin') ) {
+		if (\OCP\App::isEnabled('files_trashbin')) {
 			$uid = $params['uid'];
 			Trashbin::deleteUser($uid);
 		}

apps/files_trashbin/lib/Expiration.php

Indentation +135 added lines, -135 removed lines

@@ -28,139 +28,139 @@
 
 class Expiration {
 
-	// how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
-	const DEFAULT_RETENTION_OBLIGATION = 30;
-	const NO_OBLIGATION = -1;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var string */
-	private $retentionObligation;
-
-	/** @var int */
-	private $minAge;
-
-	/** @var int */
-	private $maxAge;
-
-	/** @var bool */
-	private $canPurgeToSaveSpace;
-
-	public function __construct(IConfig $config,ITimeFactory $timeFactory){
-		$this->timeFactory = $timeFactory;
-		$this->retentionObligation = $config->getSystemValue('trashbin_retention_obligation', 'auto');
-
-		if ($this->retentionObligation !== 'disabled') {
-			$this->parseRetentionObligation();
-		}
-	}
-
-	/**
-	 * Is trashbin expiration enabled
-	 * @return bool
-	 */
-	public function isEnabled(){
-		return $this->retentionObligation !== 'disabled';
-	}
-
-	/**
-	 * Check if given timestamp in expiration range
-	 * @param int $timestamp
-	 * @param bool $quotaExceeded
-	 * @return bool
-	 */
-	public function isExpired($timestamp, $quotaExceeded = false){
-		// No expiration if disabled
-		if (!$this->isEnabled()) {
-			return false;
-		}
-
-		// Purge to save space (if allowed)
-		if ($quotaExceeded && $this->canPurgeToSaveSpace) {
-			return true;
-		}
-
-		$time = $this->timeFactory->getTime();
-		// Never expire dates in future e.g. misconfiguration or negative time
-		// adjustment
-		if ($time<$timestamp) {
-			return false;
-		}
-
-		// Purge as too old
-		if ($this->maxAge !== self::NO_OBLIGATION) {
-			$maxTimestamp = $time - ($this->maxAge * 86400);
-			$isOlderThanMax = $timestamp < $maxTimestamp;
-		} else {
-			$isOlderThanMax = false;
-		}
-
-		if ($this->minAge !== self::NO_OBLIGATION) {
-			// older than Min obligation and we are running out of quota?
-			$minTimestamp = $time - ($this->minAge * 86400);
-			$isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
-		} else {
-			$isMinReached = false;
-		}
-
-		return $isOlderThanMax || $isMinReached;
-	}
-
-	/**
-	 * @return bool|int
-	 */
-	public function getMaxAgeAsTimestamp() {
-		$maxAge = false;
-		if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
-			$time = $this->timeFactory->getTime();
-			$maxAge = $time - ($this->maxAge * 86400);
-		}
-		return $maxAge;
-	}
-
-	private function parseRetentionObligation(){
-		$splitValues = explode(',', $this->retentionObligation);
-		if (!isset($splitValues[0])) {
-			$minValue = self::DEFAULT_RETENTION_OBLIGATION;
-		} else {
-			$minValue = trim($splitValues[0]);
-		}
-
-		if (!isset($splitValues[1]) && $minValue === 'auto') {
-			$maxValue = 'auto';
-		} elseif (!isset($splitValues[1])) {
-			$maxValue = self::DEFAULT_RETENTION_OBLIGATION;
-		} else {
-			$maxValue = trim($splitValues[1]);
-		}
-
-		if ($minValue === 'auto' && $maxValue === 'auto') {
-			// Default: Keep for 30 days but delete anytime if space needed
-			$this->minAge = self::DEFAULT_RETENTION_OBLIGATION;
-			$this->maxAge = self::NO_OBLIGATION;
-			$this->canPurgeToSaveSpace = true;
-		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
-			// Keep for X days but delete anytime if space needed
-			$this->minAge = intval($minValue);
-			$this->maxAge = self::NO_OBLIGATION;
-			$this->canPurgeToSaveSpace = true;
-		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
-			// Delete anytime if space needed, Delete all older than max automatically
-			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = intval($maxValue);
-			$this->canPurgeToSaveSpace = true;
-		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
-			// Delete all older than max OR older than min if space needed
-
-			// Max < Min as per https://github.com/owncloud/core/issues/16300
-			if ($maxValue < $minValue) {
-				$maxValue = $minValue;
-			}
-
-			$this->minAge = intval($minValue);
-			$this->maxAge = intval($maxValue);
-			$this->canPurgeToSaveSpace = false;
-		}
-	}
+    // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
+    const DEFAULT_RETENTION_OBLIGATION = 30;
+    const NO_OBLIGATION = -1;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var string */
+    private $retentionObligation;
+
+    /** @var int */
+    private $minAge;
+
+    /** @var int */
+    private $maxAge;
+
+    /** @var bool */
+    private $canPurgeToSaveSpace;
+
+    public function __construct(IConfig $config,ITimeFactory $timeFactory){
+        $this->timeFactory = $timeFactory;
+        $this->retentionObligation = $config->getSystemValue('trashbin_retention_obligation', 'auto');
+
+        if ($this->retentionObligation !== 'disabled') {
+            $this->parseRetentionObligation();
+        }
+    }
+
+    /**
+     * Is trashbin expiration enabled
+     * @return bool
+     */
+    public function isEnabled(){
+        return $this->retentionObligation !== 'disabled';
+    }
+
+    /**
+     * Check if given timestamp in expiration range
+     * @param int $timestamp
+     * @param bool $quotaExceeded
+     * @return bool
+     */
+    public function isExpired($timestamp, $quotaExceeded = false){
+        // No expiration if disabled
+        if (!$this->isEnabled()) {
+            return false;
+        }
+
+        // Purge to save space (if allowed)
+        if ($quotaExceeded && $this->canPurgeToSaveSpace) {
+            return true;
+        }
+
+        $time = $this->timeFactory->getTime();
+        // Never expire dates in future e.g. misconfiguration or negative time
+        // adjustment
+        if ($time<$timestamp) {
+            return false;
+        }
+
+        // Purge as too old
+        if ($this->maxAge !== self::NO_OBLIGATION) {
+            $maxTimestamp = $time - ($this->maxAge * 86400);
+            $isOlderThanMax = $timestamp < $maxTimestamp;
+        } else {
+            $isOlderThanMax = false;
+        }
+
+        if ($this->minAge !== self::NO_OBLIGATION) {
+            // older than Min obligation and we are running out of quota?
+            $minTimestamp = $time - ($this->minAge * 86400);
+            $isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
+        } else {
+            $isMinReached = false;
+        }
+
+        return $isOlderThanMax || $isMinReached;
+    }
+
+    /**
+     * @return bool|int
+     */
+    public function getMaxAgeAsTimestamp() {
+        $maxAge = false;
+        if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
+            $time = $this->timeFactory->getTime();
+            $maxAge = $time - ($this->maxAge * 86400);
+        }
+        return $maxAge;
+    }
+
+    private function parseRetentionObligation(){
+        $splitValues = explode(',', $this->retentionObligation);
+        if (!isset($splitValues[0])) {
+            $minValue = self::DEFAULT_RETENTION_OBLIGATION;
+        } else {
+            $minValue = trim($splitValues[0]);
+        }
+
+        if (!isset($splitValues[1]) && $minValue === 'auto') {
+            $maxValue = 'auto';
+        } elseif (!isset($splitValues[1])) {
+            $maxValue = self::DEFAULT_RETENTION_OBLIGATION;
+        } else {
+            $maxValue = trim($splitValues[1]);
+        }
+
+        if ($minValue === 'auto' && $maxValue === 'auto') {
+            // Default: Keep for 30 days but delete anytime if space needed
+            $this->minAge = self::DEFAULT_RETENTION_OBLIGATION;
+            $this->maxAge = self::NO_OBLIGATION;
+            $this->canPurgeToSaveSpace = true;
+        } elseif ($minValue !== 'auto' && $maxValue === 'auto') {
+            // Keep for X days but delete anytime if space needed
+            $this->minAge = intval($minValue);
+            $this->maxAge = self::NO_OBLIGATION;
+            $this->canPurgeToSaveSpace = true;
+        } elseif ($minValue === 'auto' && $maxValue !== 'auto') {
+            // Delete anytime if space needed, Delete all older than max automatically
+            $this->minAge = self::NO_OBLIGATION;
+            $this->maxAge = intval($maxValue);
+            $this->canPurgeToSaveSpace = true;
+        } elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
+            // Delete all older than max OR older than min if space needed
+
+            // Max < Min as per https://github.com/owncloud/core/issues/16300
+            if ($maxValue < $minValue) {
+                $maxValue = $minValue;
+            }
+
+            $this->minAge = intval($minValue);
+            $this->maxAge = intval($maxValue);
+            $this->canPurgeToSaveSpace = false;
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 	/** @var bool */
 	private $canPurgeToSaveSpace;
 
-	public function __construct(IConfig $config,ITimeFactory $timeFactory){
+	public function __construct(IConfig $config, ITimeFactory $timeFactory) {
 		$this->timeFactory = $timeFactory;
 		$this->retentionObligation = $config->getSystemValue('trashbin_retention_obligation', 'auto');
 
@@ -60,7 +60,7 @@ 
 	 * Is trashbin expiration enabled
 	 * @return bool
 	 */
-	public function isEnabled(){
+	public function isEnabled() {
 		return $this->retentionObligation !== 'disabled';
 	}
 
@@ -70,7 +70,7 @@ 
 	 * @param bool $quotaExceeded
 	 * @return bool
 	 */
-	public function isExpired($timestamp, $quotaExceeded = false){
+	public function isExpired($timestamp, $quotaExceeded = false) {
 		// No expiration if disabled
 		if (!$this->isEnabled()) {
 			return false;
@@ -84,7 +84,7 @@ 
 		$time = $this->timeFactory->getTime();
 		// Never expire dates in future e.g. misconfiguration or negative time
 		// adjustment
-		if ($time<$timestamp) {
+		if ($time < $timestamp) {
 			return false;
 		}
 
@@ -119,7 +119,7 @@ 
 		return $maxAge;
 	}
 
-	private function parseRetentionObligation(){
+	private function parseRetentionObligation() {
 		$splitValues = explode(',', $this->retentionObligation);
 		if (!isset($splitValues[0])) {
 			$minValue = self::DEFAULT_RETENTION_OBLIGATION;