nextcloud / server

apps/files/ajax/getstoragestats.php

Indentation +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 $dir = '/';
 
 if (isset($_GET['dir'])) {
-	$dir = (string)$_GET['dir'];
+    $dir = (string)$_GET['dir'];
 }
 
 OCP\JSON::checkLoggedIn();
@@ -34,7 +34,7 @@ 
 
 // send back json
 try {
-	OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir)));
+    OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir)));
 } catch (\OCP\Files\NotFoundException $e) {
-	OCP\JSON::error(['data' => ['message' => 'Folder not found']]);
+    OCP\JSON::error(['data' => ['message' => 'Folder not found']]);
 }

apps/files/ajax/download.php

Indentation +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
 $files_list = json_decode($files);
 // in case we get only a single file
 if (!is_array($files_list)) {
-	$files_list = array($files);
+    $files_list = array($files);
 }
 
 /**
@@ -46,9 +46,9 @@ 
  * alphanumeric characters
  */
 if(isset($_GET['downloadStartSecret'])
-	&& !isset($_GET['downloadStartSecret'][32])
-	&& preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
-	setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
+    && !isset($_GET['downloadStartSecret'][32])
+    && preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
+    setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
 }
 
 $server_params = array( 'head' => \OC::$server->getRequest()->getMethod() == 'HEAD' );
@@ -57,7 +57,7 @@ 
  * Http range requests support
  */
 if (isset($_SERVER['HTTP_RANGE'])) {
-	$server_params['range'] = \OC::$server->getRequest()->getHeader('Range');
+    $server_params['range'] = \OC::$server->getRequest()->getHeader('Range');
 }
 
 OC_Files::get($dir, $files_list, $server_params);

apps/files/lib/App.php

Indentation +16 added lines, -16 removed lines

@@ -27,22 +27,22 @@
 namespace OCA\Files;
 
 class App {
-	/**
-	 * @var \OCP\INavigationManager
-	 */
-	private static $navigationManager;
+    /**
+     * @var \OCP\INavigationManager
+     */
+    private static $navigationManager;
 
-	/**
-	 * Returns the app's navigation manager
-	 *
-	 * @return \OCP\INavigationManager
-	 */
-	public static function getNavigationManager() {
-		// TODO: move this into a service in the Application class
-		if (self::$navigationManager === null) {
-			self::$navigationManager = new \OC\NavigationManager();
-		}
-		return self::$navigationManager;
-	}
+    /**
+     * Returns the app's navigation manager
+     *
+     * @return \OCP\INavigationManager
+     */
+    public static function getNavigationManager() {
+        // TODO: move this into a service in the Application class
+        if (self::$navigationManager === null) {
+            self::$navigationManager = new \OC\NavigationManager();
+        }
+        return self::$navigationManager;
+    }
 
 }

apps/files/lib/Controller/SettingsController.php

Indentation +17 added lines, -17 removed lines

@@ -29,23 +29,23 @@
 use OCP\Util;
 
 class SettingsController extends Controller {
-	public function __construct($appName, IRequest $request) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct($appName, IRequest $request) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @param string $maxUploadSize
-	 * @return JSONResponse
-	 */
-	public function setMaxUploadSize($maxUploadSize) {
-		$setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
+    /**
+     * @param string $maxUploadSize
+     * @return JSONResponse
+     */
+    public function setMaxUploadSize($maxUploadSize) {
+        $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
 
-		if ($setMaxSize === false) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		} else {
-			return new JSONResponse([
-				'maxUploadSize' => Util::humanFileSize($setMaxSize)
-			]);
-		}
-	}
+        if ($setMaxSize === false) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        } else {
+            return new JSONResponse([
+                'maxUploadSize' => Util::humanFileSize($setMaxSize)
+            ]);
+        }
+    }
 }

apps/files/lib/Command/DeleteOrphanedFiles.php

Indentation +38 added lines, -38 removed lines

@@ -35,51 +35,51 @@
  */
 class DeleteOrphanedFiles extends Command {
 
-	const CHUNK_SIZE = 200;
+    const CHUNK_SIZE = 200;
 
-	/**
-	 * @var IDBConnection
-	 */
-	protected $connection;
+    /**
+     * @var IDBConnection
+     */
+    protected $connection;
 
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		parent::__construct();
-	}
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('files:cleanup')
-			->setDescription('cleanup filecache');
-	}
+    protected function configure() {
+        $this
+            ->setName('files:cleanup')
+            ->setDescription('cleanup filecache');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output) {
-		$deletedEntries = 0;
+    public function execute(InputInterface $input, OutputInterface $output) {
+        $deletedEntries = 0;
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('fc.fileid')
-			->from('filecache', 'fc')
-			->where($query->expr()->isNull('s.numeric_id'))
-			->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
-			->setMaxResults(self::CHUNK_SIZE);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('fc.fileid')
+            ->from('filecache', 'fc')
+            ->where($query->expr()->isNull('s.numeric_id'))
+            ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
+            ->setMaxResults(self::CHUNK_SIZE);
 
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('filecache')
-			->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('filecache')
+            ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
 
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
 
-		$output->writeln("$deletedEntries orphaned file cache entries deleted");
-	}
+        $output->writeln("$deletedEntries orphaned file cache entries deleted");
+    }
 
 }

apps/files/lib/Command/Scan.php

Indentation +276 added lines, -276 removed lines

@@ -42,305 +42,305 @@
 
 class Scan extends Base {
 
-	/** @var IUserManager $userManager */
-	private $userManager;
-	/** @var float */
-	protected $execTime = 0;
-	/** @var int */
-	protected $foldersCounter = 0;
-	/** @var int */
-	protected $filesCounter = 0;
+    /** @var IUserManager $userManager */
+    private $userManager;
+    /** @var float */
+    protected $execTime = 0;
+    /** @var int */
+    protected $foldersCounter = 0;
+    /** @var int */
+    protected $filesCounter = 0;
 
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('files:scan')
-			->setDescription('rescan filesystem')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'will rescan all files of the given user(s)'
-			)
-			->addOption(
-				'path',
-				'p',
-				InputArgument::OPTIONAL,
-				'limit rescan to this path, eg. --path="/alice/files/Music", the user_id is determined by the path and the user_id parameter and --all are ignored'
-			)
-			->addOption(
-				'quiet',
-				'q',
-				InputOption::VALUE_NONE,
-				'suppress any output'
-			)
-			->addOption(
-				'verbose',
-				'-v|vv|vvv',
-				InputOption::VALUE_NONE,
-				'verbose the output'
-			)
-			->addOption(
-				'all',
-				null,
-				InputOption::VALUE_NONE,
-				'will rescan all files of all known users'
-			)->addOption(
-				'unscanned',
-				null,
-				InputOption::VALUE_NONE,
-				'only scan files which are marked as not fully scanned'
-			);
-	}
+        $this
+            ->setName('files:scan')
+            ->setDescription('rescan filesystem')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'will rescan all files of the given user(s)'
+            )
+            ->addOption(
+                'path',
+                'p',
+                InputArgument::OPTIONAL,
+                'limit rescan to this path, eg. --path="/alice/files/Music", the user_id is determined by the path and the user_id parameter and --all are ignored'
+            )
+            ->addOption(
+                'quiet',
+                'q',
+                InputOption::VALUE_NONE,
+                'suppress any output'
+            )
+            ->addOption(
+                'verbose',
+                '-v|vv|vvv',
+                InputOption::VALUE_NONE,
+                'verbose the output'
+            )
+            ->addOption(
+                'all',
+                null,
+                InputOption::VALUE_NONE,
+                'will rescan all files of all known users'
+            )->addOption(
+                'unscanned',
+                null,
+                InputOption::VALUE_NONE,
+                'only scan files which are marked as not fully scanned'
+            );
+    }
 
-	public function checkScanWarning($fullPath, OutputInterface $output) {
-		$normalizedPath = basename(\OC\Files\Filesystem::normalizePath($fullPath));
-		$path = basename($fullPath);
+    public function checkScanWarning($fullPath, OutputInterface $output) {
+        $normalizedPath = basename(\OC\Files\Filesystem::normalizePath($fullPath));
+        $path = basename($fullPath);
 
-		if ($normalizedPath !== $path) {
-			$output->writeln("\t<error>Entry \"" . $fullPath . '" will not be accessible due to incompatible encoding</error>');
-		}
-	}
+        if ($normalizedPath !== $path) {
+            $output->writeln("\t<error>Entry \"" . $fullPath . '" will not be accessible due to incompatible encoding</error>');
+        }
+    }
 
-	protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false) {
-		$connection = $this->reconnectToDatabase($output);
-		$scanner = new \OC\Files\Utils\Scanner($user, $connection, \OC::$server->getLogger());
-		# check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
-		# printout and count
-		if ($verbose) {
-			$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output) {
-				$output->writeln("\tFile   <info>$path</info>");
-				$this->filesCounter += 1;
-				if ($this->hasBeenInterrupted()) {
-					throw new \Exception('ctrl-c');
-				}
-			});
-			$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output) {
-				$output->writeln("\tFolder <info>$path</info>");
-				$this->foldersCounter += 1;
-				if ($this->hasBeenInterrupted()) {
-					throw new \Exception('ctrl-c');
-				}
-			});
-			$scanner->listen('\OC\Files\Utils\Scanner', 'StorageNotAvailable', function (StorageNotAvailableException $e) use ($output) {
-				$output->writeln("Error while scanning, storage not available (" . $e->getMessage() . ")");
-			});
-		# count only
-		} else {
-			$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function () use ($output) {
-				$this->filesCounter += 1;
-				if ($this->hasBeenInterrupted()) {
-					throw new \Exception('ctrl-c');
-				}
-			});
-			$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function () use ($output) {
-				$this->foldersCounter += 1;
-				if ($this->hasBeenInterrupted()) {
-					throw new \Exception('ctrl-c');
-				}
-			});
-		}
-		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
-			$this->checkScanWarning($path, $output);
-		});
-		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) {
-			$this->checkScanWarning($path, $output);
-		});
+    protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false) {
+        $connection = $this->reconnectToDatabase($output);
+        $scanner = new \OC\Files\Utils\Scanner($user, $connection, \OC::$server->getLogger());
+        # check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
+        # printout and count
+        if ($verbose) {
+            $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output) {
+                $output->writeln("\tFile   <info>$path</info>");
+                $this->filesCounter += 1;
+                if ($this->hasBeenInterrupted()) {
+                    throw new \Exception('ctrl-c');
+                }
+            });
+            $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output) {
+                $output->writeln("\tFolder <info>$path</info>");
+                $this->foldersCounter += 1;
+                if ($this->hasBeenInterrupted()) {
+                    throw new \Exception('ctrl-c');
+                }
+            });
+            $scanner->listen('\OC\Files\Utils\Scanner', 'StorageNotAvailable', function (StorageNotAvailableException $e) use ($output) {
+                $output->writeln("Error while scanning, storage not available (" . $e->getMessage() . ")");
+            });
+        # count only
+        } else {
+            $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function () use ($output) {
+                $this->filesCounter += 1;
+                if ($this->hasBeenInterrupted()) {
+                    throw new \Exception('ctrl-c');
+                }
+            });
+            $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function () use ($output) {
+                $this->foldersCounter += 1;
+                if ($this->hasBeenInterrupted()) {
+                    throw new \Exception('ctrl-c');
+                }
+            });
+        }
+        $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
+            $this->checkScanWarning($path, $output);
+        });
+        $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) {
+            $this->checkScanWarning($path, $output);
+        });
 
-		try {
-			if ($backgroundScan) {
-				$scanner->backgroundScan($path);
-			}else {
-				$scanner->scan($path);
-			}
-		} catch (ForbiddenException $e) {
-			$output->writeln("<error>Home storage for user $user not writable</error>");
-			$output->writeln("Make sure you're running the scan command only as the user the web server runs as");
-		} catch (\Exception $e) {
-			if ($e->getMessage() !== 'ctrl-c') {
-				$output->writeln('<error>Exception while scanning: ' . $e->getMessage() . "\n" . $e->getTraceAsString() . '</error>');
-			}
-			return;
-		}
-	}
+        try {
+            if ($backgroundScan) {
+                $scanner->backgroundScan($path);
+            }else {
+                $scanner->scan($path);
+            }
+        } catch (ForbiddenException $e) {
+            $output->writeln("<error>Home storage for user $user not writable</error>");
+            $output->writeln("Make sure you're running the scan command only as the user the web server runs as");
+        } catch (\Exception $e) {
+            if ($e->getMessage() !== 'ctrl-c') {
+                $output->writeln('<error>Exception while scanning: ' . $e->getMessage() . "\n" . $e->getTraceAsString() . '</error>');
+            }
+            return;
+        }
+    }
 
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$inputPath = $input->getOption('path');
-		if ($inputPath) {
-			$inputPath = '/' . trim($inputPath, '/');
-			list (, $user,) = explode('/', $inputPath, 3);
-			$users = array($user);
-		} else if ($input->getOption('all')) {
-			$users = $this->userManager->search('');
-		} else {
-			$users = $input->getArgument('user_id');
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $inputPath = $input->getOption('path');
+        if ($inputPath) {
+            $inputPath = '/' . trim($inputPath, '/');
+            list (, $user,) = explode('/', $inputPath, 3);
+            $users = array($user);
+        } else if ($input->getOption('all')) {
+            $users = $this->userManager->search('');
+        } else {
+            $users = $input->getArgument('user_id');
+        }
 
-		# no messaging level option means: no full printout but statistics
-		# $quiet   means no print at all
-		# $verbose means full printout including statistics
-		# -q	-v	full	stat
-		#  0	 0	no	yes
-		#  0	 1	yes	yes
-		#  1	--	no	no  (quiet overrules verbose)
-		$verbose = $input->getOption('verbose');
-		$quiet = $input->getOption('quiet');
-		# restrict the verbosity level to VERBOSITY_VERBOSE
-		if ($output->getVerbosity()>OutputInterface::VERBOSITY_VERBOSE) {
-			$output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
-		}
-		if ($quiet) {
-			$verbose = false;
-		}
+        # no messaging level option means: no full printout but statistics
+        # $quiet   means no print at all
+        # $verbose means full printout including statistics
+        # -q	-v	full	stat
+        #  0	 0	no	yes
+        #  0	 1	yes	yes
+        #  1	--	no	no  (quiet overrules verbose)
+        $verbose = $input->getOption('verbose');
+        $quiet = $input->getOption('quiet');
+        # restrict the verbosity level to VERBOSITY_VERBOSE
+        if ($output->getVerbosity()>OutputInterface::VERBOSITY_VERBOSE) {
+            $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
+        }
+        if ($quiet) {
+            $verbose = false;
+        }
 
-		# check quantity of users to be process and show it on the command line
-		$users_total = count($users);
-		if ($users_total === 0) {
-			$output->writeln("<error>Please specify the user id to scan, \"--all\" to scan for all users or \"--path=...\"</error>");
-			return;
-		} else {
-			if ($users_total > 1) {
-				$output->writeln("\nScanning files for $users_total users");
-			}
-		}
+        # check quantity of users to be process and show it on the command line
+        $users_total = count($users);
+        if ($users_total === 0) {
+            $output->writeln("<error>Please specify the user id to scan, \"--all\" to scan for all users or \"--path=...\"</error>");
+            return;
+        } else {
+            if ($users_total > 1) {
+                $output->writeln("\nScanning files for $users_total users");
+            }
+        }
 
-		$this->initTools();
+        $this->initTools();
 
-		$user_count = 0;
-		foreach ($users as $user) {
-			if (is_object($user)) {
-				$user = $user->getUID();
-			}
-			$path = $inputPath ? $inputPath : '/' . $user;
-			$user_count += 1;
-			if ($this->userManager->userExists($user)) {
-				# add an extra line when verbose is set to optical separate users
-				if ($verbose) {$output->writeln(""); }
-				$output->writeln("Starting scan for user $user_count out of $users_total ($user)");
-				# full: printout data if $verbose was set
-				$this->scanFiles($user, $path, $verbose, $output, $input->getOption('unscanned'));
-			} else {
-				$output->writeln("<error>Unknown user $user_count $user</error>");
-			}
-			# check on each user if there was a user interrupt (ctrl-c) and exit foreach
-			if ($this->hasBeenInterrupted()) {
-				break;
-			}
-		}
+        $user_count = 0;
+        foreach ($users as $user) {
+            if (is_object($user)) {
+                $user = $user->getUID();
+            }
+            $path = $inputPath ? $inputPath : '/' . $user;
+            $user_count += 1;
+            if ($this->userManager->userExists($user)) {
+                # add an extra line when verbose is set to optical separate users
+                if ($verbose) {$output->writeln(""); }
+                $output->writeln("Starting scan for user $user_count out of $users_total ($user)");
+                # full: printout data if $verbose was set
+                $this->scanFiles($user, $path, $verbose, $output, $input->getOption('unscanned'));
+            } else {
+                $output->writeln("<error>Unknown user $user_count $user</error>");
+            }
+            # check on each user if there was a user interrupt (ctrl-c) and exit foreach
+            if ($this->hasBeenInterrupted()) {
+                break;
+            }
+        }
 
-		# stat: printout statistics if $quiet was not set
-		if (!$quiet) {
-			$this->presentStats($output);
-		}
-	}
+        # stat: printout statistics if $quiet was not set
+        if (!$quiet) {
+            $this->presentStats($output);
+        }
+    }
 
-	/**
-	 * Initialises some useful tools for the Command
-	 */
-	protected function initTools() {
-		// Start the timer
-		$this->execTime = -microtime(true);
-		// Convert PHP errors to exceptions
-		set_error_handler([$this, 'exceptionErrorHandler'], E_ALL);
-	}
+    /**
+     * Initialises some useful tools for the Command
+     */
+    protected function initTools() {
+        // Start the timer
+        $this->execTime = -microtime(true);
+        // Convert PHP errors to exceptions
+        set_error_handler([$this, 'exceptionErrorHandler'], E_ALL);
+    }
 
-	/**
-	 * Processes PHP errors as exceptions in order to be able to keep track of problems
-	 *
-	 * @see https://secure.php.net/manual/en/function.set-error-handler.php
-	 *
-	 * @param int $severity the level of the error raised
-	 * @param string $message
-	 * @param string $file the filename that the error was raised in
-	 * @param int $line the line number the error was raised
-	 *
-	 * @throws \ErrorException
-	 */
-	public function exceptionErrorHandler($severity, $message, $file, $line) {
-		if (!(error_reporting() & $severity)) {
-			// This error code is not included in error_reporting
-			return;
-		}
-		throw new \ErrorException($message, 0, $severity, $file, $line);
-	}
+    /**
+     * Processes PHP errors as exceptions in order to be able to keep track of problems
+     *
+     * @see https://secure.php.net/manual/en/function.set-error-handler.php
+     *
+     * @param int $severity the level of the error raised
+     * @param string $message
+     * @param string $file the filename that the error was raised in
+     * @param int $line the line number the error was raised
+     *
+     * @throws \ErrorException
+     */
+    public function exceptionErrorHandler($severity, $message, $file, $line) {
+        if (!(error_reporting() & $severity)) {
+            // This error code is not included in error_reporting
+            return;
+        }
+        throw new \ErrorException($message, 0, $severity, $file, $line);
+    }
 
-	/**
-	 * @param OutputInterface $output
-	 */
-	protected function presentStats(OutputInterface $output) {
-		// Stop the timer
-		$this->execTime += microtime(true);
-		$output->writeln("");
+    /**
+     * @param OutputInterface $output
+     */
+    protected function presentStats(OutputInterface $output) {
+        // Stop the timer
+        $this->execTime += microtime(true);
+        $output->writeln("");
 
-		$headers = [
-			'Folders', 'Files', 'Elapsed time'
-		];
+        $headers = [
+            'Folders', 'Files', 'Elapsed time'
+        ];
 
-		$this->showSummary($headers, null, $output);
-	}
+        $this->showSummary($headers, null, $output);
+    }
 
-	/**
-	 * Shows a summary of operations
-	 *
-	 * @param string[] $headers
-	 * @param string[] $rows
-	 * @param OutputInterface $output
-	 */
-	protected function showSummary($headers, $rows, OutputInterface $output) {
-		$niceDate = $this->formatExecTime();
-		if (!$rows) {
-			$rows = [
-				$this->foldersCounter,
-				$this->filesCounter,
-				$niceDate,
-			];
-		}
-		$table = new Table($output);
-		$table
-			->setHeaders($headers)
-			->setRows([$rows]);
-		$table->render();
-	}
+    /**
+     * Shows a summary of operations
+     *
+     * @param string[] $headers
+     * @param string[] $rows
+     * @param OutputInterface $output
+     */
+    protected function showSummary($headers, $rows, OutputInterface $output) {
+        $niceDate = $this->formatExecTime();
+        if (!$rows) {
+            $rows = [
+                $this->foldersCounter,
+                $this->filesCounter,
+                $niceDate,
+            ];
+        }
+        $table = new Table($output);
+        $table
+            ->setHeaders($headers)
+            ->setRows([$rows]);
+        $table->render();
+    }
 
 
-	/**
-	 * Formats microtime into a human readable format
-	 *
-	 * @return string
-	 */
-	protected function formatExecTime() {
-		list($secs, $tens) = explode('.', sprintf("%.1f", ($this->execTime)));
+    /**
+     * Formats microtime into a human readable format
+     *
+     * @return string
+     */
+    protected function formatExecTime() {
+        list($secs, $tens) = explode('.', sprintf("%.1f", ($this->execTime)));
 
-		# if you want to have microseconds add this:   . '.' . $tens;
-		return date('H:i:s', $secs);
-	}
+        # if you want to have microseconds add this:   . '.' . $tens;
+        return date('H:i:s', $secs);
+    }
 
-	/**
-	 * @return \OCP\IDBConnection
-	 */
-	protected function reconnectToDatabase(OutputInterface $output) {
-		/** @var Connection | IDBConnection $connection*/
-		$connection = \OC::$server->getDatabaseConnection();
-		try {
-			$connection->close();
-		} catch (\Exception $ex) {
-			$output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
-		}
-		while (!$connection->isConnected()) {
-			try {
-				$connection->connect();
-			} catch (\Exception $ex) {
-				$output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
-				sleep(60);
-			}
-		}
-		return $connection;
-	}
+    /**
+     * @return \OCP\IDBConnection
+     */
+    protected function reconnectToDatabase(OutputInterface $output) {
+        /** @var Connection | IDBConnection $connection*/
+        $connection = \OC::$server->getDatabaseConnection();
+        try {
+            $connection->close();
+        } catch (\Exception $ex) {
+            $output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
+        }
+        while (!$connection->isConnected()) {
+            try {
+                $connection->connect();
+            } catch (\Exception $ex) {
+                $output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
+                sleep(60);
+            }
+        }
+        return $connection;
+    }
 
 }

apps/files/lib/Capabilities.php

Indentation +23 added lines, -23 removed lines

@@ -34,29 +34,29 @@
  * @package OCA\Files
  */
 class Capabilities implements ICapability {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * Capabilities constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'files' => [
-				'bigfilechunking' => true,
-				'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']),
-			],
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'files' => [
+                'bigfilechunking' => true,
+                'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']),
+            ],
+        ];
+    }
 }

apps/files/lib/BackgroundJob/CleanupFileLocks.php

Indentation +23 added lines, -23 removed lines

@@ -30,29 +30,29 @@
  */
 class CleanupFileLocks extends TimedJob {
 
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 5;
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 5;
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$lockingProvider = \OC::$server->getLockingProvider();
-		if($lockingProvider instanceof DBLockingProvider) {
-			$lockingProvider->cleanExpiredLocks();
-		}
-	}
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $lockingProvider = \OC::$server->getLockingProvider();
+        if($lockingProvider instanceof DBLockingProvider) {
+            $lockingProvider->cleanExpiredLocks();
+        }
+    }
 }

apps/files/lib/BackgroundJob/DeleteOrphanedItems.php

Indentation +118 added lines, -118 removed lines

@@ -32,123 +32,123 @@
  */
 class DeleteOrphanedItems extends TimedJob {
 
-	const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\ILogger */
-	protected $logger;
-
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 60;
-
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->logger = \OC::$server->getLogger();
-	}
-
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$this->cleanSystemTags();
-		$this->cleanUserTags();
-		$this->cleanComments();
-		$this->cleanCommentMarkers();
-	}
-
-	/**
-	 * Deleting orphaned system tag mappings
-	 *
-	 * @param string $table
-	 * @param string $idCol
-	 * @param string $typeCol
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanUp($table, $idCol, $typeCol) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('t1.' . $idCol)
-			->from($table, 't1')
-			->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
-			->andWhere($query->expr()->isNull('t2.fileid'))
-			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
-			->groupBy('t1.' . $idCol)
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete($table)
-			->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$result = $query->execute();
-			$deletedInLastChunk = 0;
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned system tag mappings
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanSystemTags() {
-		$deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype');
-		$this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned user tag mappings
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanUserTags() {
-		$deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type');
-		$this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned comments
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanComments() {
-		$deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type');
-		$this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned comment read markers
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanCommentMarkers() {
-		$deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type');
-		$this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
+    const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\ILogger */
+    protected $logger;
+
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 60;
+
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+        $this->connection = \OC::$server->getDatabaseConnection();
+        $this->logger = \OC::$server->getLogger();
+    }
+
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $this->cleanSystemTags();
+        $this->cleanUserTags();
+        $this->cleanComments();
+        $this->cleanCommentMarkers();
+    }
+
+    /**
+     * Deleting orphaned system tag mappings
+     *
+     * @param string $table
+     * @param string $idCol
+     * @param string $typeCol
+     * @return int Number of deleted entries
+     */
+    protected function cleanUp($table, $idCol, $typeCol) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('t1.' . $idCol)
+            ->from($table, 't1')
+            ->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
+            ->andWhere($query->expr()->isNull('t2.fileid'))
+            ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
+            ->groupBy('t1.' . $idCol)
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete($table)
+            ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $result = $query->execute();
+            $deletedInLastChunk = 0;
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned system tag mappings
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanSystemTags() {
+        $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype');
+        $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned user tag mappings
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanUserTags() {
+        $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type');
+        $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned comments
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanComments() {
+        $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type');
+        $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned comment read markers
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanCommentMarkers() {
+        $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type');
+        $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
 
 }