nextcloud / server

apps/files_versions/ajax/getVersions.php

Indentation +11 added lines, -11 removed lines

@@ -35,22 +35,22 @@
 $versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $source);
 if( $versions ) {
 
-	$endReached = false;
-	if (count($versions) <= $start+$count) {
-		$endReached = true;
-	}
+    $endReached = false;
+    if (count($versions) <= $start+$count) {
+        $endReached = true;
+    }
 
-	$versions = array_slice($versions, $start, $count);
+    $versions = array_slice($versions, $start, $count);
 
-	// remove owner path from request to not disclose it to the recipient
-	foreach ($versions as $version) {
-		unset($version['path']);
-	}
+    // remove owner path from request to not disclose it to the recipient
+    foreach ($versions as $version) {
+        unset($version['path']);
+    }
 
-	\OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
+    \OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
 
 } else {
 
-	\OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
+    \OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
 
 }

Spacing +4 added lines, -4 removed lines

@@ -28,15 +28,15 @@
 OCP\JSON::callCheck();
 OCP\JSON::checkAppEnabled('files_versions');
 
-$source = (string)$_GET['source'];
-$start = (int)$_GET['start'];
+$source = (string) $_GET['source'];
+$start = (int) $_GET['start'];
 list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($source);
 $count = 5; //show the newest revisions
 $versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $source);
-if( $versions ) {
+if ($versions) {
 
 	$endReached = false;
-	if (count($versions) <= $start+$count) {
+	if (count($versions) <= $start + $count) {
 		$endReached = true;
 	}
 

apps/files_versions/ajax/rollbackVersion.php

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@
 $revision=(int)$_GET['revision'];
 
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
-	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
+    OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
 }else{
-	$l = \OC::$server->getL10N('files_versions');
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
+    $l = \OC::$server->getL10N('files_versions');
+    OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
 }

Spacing +6 added lines, -6 removed lines

@@ -30,12 +30,12 @@
 OCP\JSON::checkAppEnabled('files_versions');
 OCP\JSON::callCheck();
 
-$file = (string)$_GET['file'];
-$revision=(int)$_GET['revision'];
+$file = (string) $_GET['file'];
+$revision = (int) $_GET['revision'];
 
-if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
-	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
-}else{
+if (OCA\Files_Versions\Storage::rollback($file, $revision)) {
+	OCP\JSON::success(array("data" => array("revision" => $revision, "file" => $file)));
+} else {
 	$l = \OC::$server->getL10N('files_versions');
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
+	OCP\JSON::error(array("data" => array("message" => $l->t("Could not revert: %s", array($file)))));
 }

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
 	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
-}else{
+} else{
 	$l = \OC::$server->getL10N('files_versions');
 	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
 }

apps/files_versions/lib/Controller/PreviewController.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 		$y = 44,
 		$version = ''
 	) {
-		if($file === '' || $version === '' || $x === 0 || $y === 0) {
+		if ($file === '' || $version === '' || $x === 0 || $y === 0) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 

Indentation +54 added lines, -54 removed lines

@@ -36,66 +36,66 @@
 
 class PreviewController extends Controller {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var string */
-	private $userId;
+    /** @var string */
+    private $userId;
 
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
 
-	/** @var IPreview */
-	private $previewManager;
+    /** @var IPreview */
+    private $previewManager;
 
-	public function __construct($appName,
-								IRequest $request,
-								IRootFolder $rootFolder,
-								$userId,
-								IMimeTypeDetector $mimeTypeDetector,
-								IPreview $previewManager) {
-		parent::__construct($appName, $request);
+    public function __construct($appName,
+                                IRequest $request,
+                                IRootFolder $rootFolder,
+                                $userId,
+                                IMimeTypeDetector $mimeTypeDetector,
+                                IPreview $previewManager) {
+        parent::__construct($appName, $request);
 
-		$this->rootFolder = $rootFolder;
-		$this->userId = $userId;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->previewManager = $previewManager;
-	}
+        $this->rootFolder = $rootFolder;
+        $this->userId = $userId;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->previewManager = $previewManager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @param string $version
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getPreview(
-		$file = '',
-		$x = 44,
-		$y = 44,
-		$version = ''
-	) {
-		if($file === '' || $version === '' || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @param string $version
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getPreview(
+        $file = '',
+        $x = 44,
+        $y = 44,
+        $version = ''
+    ) {
+        if($file === '' || $version === '' || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			/** @var Folder $versionFolder */
-			$versionFolder = $userFolder->getParent()->get('files_versions');
-			$mimeType = $this->mimeTypeDetector->detectPath($file);
-			$file = $versionFolder->get($file.'.v'.$version);
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            /** @var Folder $versionFolder */
+            $versionFolder = $userFolder->getParent()->get('files_versions');
+            $mimeType = $this->mimeTypeDetector->detectPath($file);
+            $file = $versionFolder->get($file.'.v'.$version);
 
-			/** @var File $file */
-			$f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
-			return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
+            /** @var File $file */
+            $f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
+            return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }

apps/files_versions/lib/AppInfo/Application.php

Indentation +13 added lines, -13 removed lines

@@ -27,24 +27,24 @@
 use OCA\Files_Versions\Expiration;
 
 class Application extends App {
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('files_versions', $urlParams);
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('files_versions', $urlParams);
 
-		$container = $this->getContainer();
+        $container = $this->getContainer();
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability('OCA\Files_Versions\Capabilities');
+        $container->registerCapability('OCA\Files_Versions\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')
+            );
+        });
+    }
 }

apps/files_versions/lib/Command/ExpireVersions.php

Indentation +78 added lines, -78 removed lines

@@ -33,93 +33,93 @@
 
 class ExpireVersions extends Command {
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @param IUserManager|null $userManager
-	 * @param Expiration|null $expiration
-	 */
-	public function __construct(IUserManager $userManager = null,
-								Expiration $expiration = null) {
-		parent::__construct();
+    /**
+     * @param IUserManager|null $userManager
+     * @param Expiration|null $expiration
+     */
+    public function __construct(IUserManager $userManager = null,
+                                Expiration $expiration = null) {
+        parent::__construct();
 
-		$this->userManager = $userManager;
-		$this->expiration = $expiration;
-	}
+        $this->userManager = $userManager;
+        $this->expiration = $expiration;
+    }
 
-	protected function configure() {
-		$this
-			->setName('versions:expire')
-			->setDescription('Expires the users file versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('versions:expire')
+            ->setDescription('Expires the users file versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output) {
 
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			$output->writeln("No expiry configured.");
-			return;
-		}
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            $output->writeln("No expiry configured.");
+            return;
+        }
 
-		$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>");
-					$userObject = $this->userManager->get($user);
-					$this->expireVersionsForUser($userObject);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$p = new ProgressBar($output);
-			$p->start();
-			$this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
-				$p->advance();
-				$this->expireVersionsForUser($user);
-			});
-			$p->finish();
-			$output->writeln('');
-		}
-	}
+        $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>");
+                    $userObject = $this->userManager->get($user);
+                    $this->expireVersionsForUser($userObject);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $p = new ProgressBar($output);
+            $p->start();
+            $this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
+                $p->advance();
+                $this->expireVersionsForUser($user);
+            });
+            $p->finish();
+            $output->writeln('');
+        }
+    }
 
-	function expireVersionsForUser(IUser $user) {
-		$uid = $user->getUID();
-		if (!$this->setupFS($uid)) {
-			return;
-		}
-		Storage::expireOlderThanMaxForUser($uid);
-	}
+    function expireVersionsForUser(IUser $user) {
+        $uid = $user->getUID();
+        if (!$this->setupFS($uid)) {
+            return;
+        }
+        Storage::expireOlderThanMaxForUser($uid);
+    }
 
-	/**
-	 * Act on behalf on versions item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on versions item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a version directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a version directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a version directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_versions')) {
 			return false;
 		}

apps/files_versions/lib/Command/CleanUp.php

Indentation +78 added lines, -78 removed lines

@@ -33,83 +33,83 @@
 
 class CleanUp extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/**
-	 * @param IRootFolder $rootFolder
-	 * @param IUserManager $userManager
-	 */
-	function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-	}
-
-	protected function configure() {
-		$this
-			->setName('versions:cleanup')
-			->setDescription('Delete versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'delete versions of the given user(s), if no user is given all versions will be deleted'
-			);
-	}
-
-
-	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("Delete versions of   <info>$user</info>");
-					$this->deleteVersions($user);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$output->writeln('Delete all versions');
-			foreach ($this->userManager->getBackends() as $backend) {
-				$name = get_class($backend);
-
-				if ($backend instanceof IUserBackend) {
-					$name = $backend->getBackendName();
-				}
-
-				$output->writeln("Delete versions 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->deleteVersions($user);
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-		}
-	}
-
-
-	/**
-	 * delete versions for the given user
-	 *
-	 * @param string $user
-	 */
-	protected function deleteVersions($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
-		}
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /**
+     * @param IRootFolder $rootFolder
+     * @param IUserManager $userManager
+     */
+    function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('versions:cleanup')
+            ->setDescription('Delete versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'delete versions of the given user(s), if no user is given all versions will be deleted'
+            );
+    }
+
+
+    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("Delete versions of   <info>$user</info>");
+                    $this->deleteVersions($user);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $output->writeln('Delete all versions');
+            foreach ($this->userManager->getBackends() as $backend) {
+                $name = get_class($backend);
+
+                if ($backend instanceof IUserBackend) {
+                    $name = $backend->getBackendName();
+                }
+
+                $output->writeln("Delete versions 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->deleteVersions($user);
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+        }
+    }
+
+
+    /**
+     * delete versions for the given user
+     *
+     * @param string $user
+     */
+    protected function deleteVersions($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
+        if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
+            $this->rootFolder->get('/' . $user . '/files_versions')->delete();
+        }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -107,8 +107,8 @@
 	protected function deleteVersions($user) {
 		\OC_Util::tearDownFS();
 		\OC_Util::setupFS($user);
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
+		if ($this->rootFolder->nodeExists('/'.$user.'/files_versions')) {
+			$this->rootFolder->get('/'.$user.'/files_versions')->delete();
 		}
 	}
 

apps/files_versions/lib/Capabilities.php

Indentation +12 added lines, -12 removed lines

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

apps/files_versions/lib/BackgroundJob/ExpireVersions.php

Indentation +52 added lines, -52 removed lines

@@ -31,66 +31,66 @@
 
 class ExpireVersions extends \OC\BackgroundJob\TimedJob {
 
-	const ITEMS_PER_SESSION = 1000;
+    const ITEMS_PER_SESSION = 1000;
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
+    public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
 
-		if (is_null($expiration) || is_null($userManager)) {
-			$this->fixDIForJobs();
-		} else {
-			$this->expiration = $expiration;
-			$this->userManager = $userManager;
-		}
-	}
+        if (is_null($expiration) || is_null($userManager)) {
+            $this->fixDIForJobs();
+        } else {
+            $this->expiration = $expiration;
+            $this->userManager = $userManager;
+        }
+    }
 
-	protected function fixDIForJobs() {
-		$application = new Application();
-		$this->expiration = $application->getContainer()->query('Expiration');
-		$this->userManager = \OC::$server->getUserManager();
-	}
+    protected function fixDIForJobs() {
+        $application = new Application();
+        $this->expiration = $application->getContainer()->query('Expiration');
+        $this->userManager = \OC::$server->getUserManager();
+    }
 
-	protected function run($argument) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+    protected function run($argument) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$this->userManager->callForSeenUsers(function(IUser $user) {
-			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
-				return;
-			}
-			Storage::expireOlderThanMaxForUser($uid);
-		});
-	}
+        $this->userManager->callForSeenUsers(function(IUser $user) {
+            $uid = $user->getUID();
+            if (!$this->setupFS($uid)) {
+                return;
+            }
+            Storage::expireOlderThanMaxForUser($uid);
+        });
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a versions directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_versions')) {
 			return false;
 		}

apps/files_versions/lib/Hooks.php

Spacing +8 added lines, -8 removed lines

@@ -53,11 +53,11 @@ 
 	/**
 	 * listen to write event.
 	 */
-	public static function write_hook( $params ) {
+	public static function write_hook($params) {
 
 		if (\OCP\App::isEnabled('files_versions')) {
 			$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
+			if ($path <> '') {
 				Storage::store($path);
 			}
 		}
@@ -75,7 +75,7 @@ 
 
 		if (\OCP\App::isEnabled('files_versions')) {
 			$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
+			if ($path <> '') {
 				Storage::delete($path);
 			}
 		}
@@ -87,7 +87,7 @@ 
 	 */
 	public static function pre_remove_hook($params) {
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
+			if ($path <> '') {
 				Storage::markDeletedFile($path);
 			}
 	}
@@ -104,7 +104,7 @@ 
 		if (\OCP\App::isEnabled('files_versions')) {
 			$oldpath = $params['oldpath'];
 			$newpath = $params['newpath'];
-			if($oldpath<>'' && $newpath<>'') {
+			if ($oldpath <> '' && $newpath <> '') {
 				Storage::renameOrCopy($oldpath, $newpath, 'rename');
 			}
 		}
@@ -122,7 +122,7 @@ 
 		if (\OCP\App::isEnabled('files_versions')) {
 			$oldpath = $params['oldpath'];
 			$newpath = $params['newpath'];
-			if($oldpath<>'' && $newpath<>'') {
+			if ($oldpath <> '' && $newpath <> '') {
 				Storage::renameOrCopy($oldpath, $newpath, 'copy');
 			}
 		}
@@ -141,7 +141,7 @@ 
 
 			// if we rename a movable mount point, then the versions don't have
 			// to be renamed
-			$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+			$absOldPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files'.$params['oldpath']);
 			$manager = \OC\Files\Filesystem::getMountManager();
 			$mount = $manager->find($absOldPath);
 			$internalPath = $mount->getInternalPath($absOldPath);
@@ -149,7 +149,7 @@ 
 				return;
 			}
 
-			$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
+			$view = new \OC\Files\View(\OCP\User::getUser().'/files');
 			if ($view->file_exists($params['newpath'])) {
 				Storage::store($params['newpath']);
 			} else {

Indentation +130 added lines, -130 removed lines

@@ -35,134 +35,134 @@
 
 class Hooks {
 
-	public static function connectHooks() {
-		// Listen to write signals
-		\OCP\Util::connectHook('OC_Filesystem', 'write', 'OCA\Files_Versions\Hooks', 'write_hook');
-		// Listen to delete and rename signals
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Files_Versions\Hooks', 'remove_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Versions\Hooks', 'pre_remove_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Versions\Hooks', 'rename_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
-
-		$eventDispatcher = \OC::$server->getEventDispatcher();
-		$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', ['OCA\Files_Versions\Hooks', 'onLoadFilesAppScripts']);
-	}
-
-	/**
-	 * listen to write event.
-	 */
-	public static function write_hook( $params ) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
-				Storage::store($path);
-			}
-		}
-	}
-
-
-	/**
-	 * Erase versions of deleted file
-	 * @param array $params
-	 *
-	 * This function is connected to the delete signal of OC_Filesystem
-	 * cleanup the versions directory if the actual file gets deleted
-	 */
-	public static function remove_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
-				Storage::delete($path);
-			}
-		}
-	}
-
-	/**
-	 * mark file as "deleted" so that we can clean up the versions if the file is gone
-	 * @param array $params
-	 */
-	public static function pre_remove_hook($params) {
-		$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
-				Storage::markDeletedFile($path);
-			}
-	}
-
-	/**
-	 * rename/move versions of renamed/moved files
-	 * @param array $params array with oldpath and newpath
-	 *
-	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
-	 * of the stored versions along the actual file
-	 */
-	public static function rename_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$oldpath = $params['oldpath'];
-			$newpath = $params['newpath'];
-			if($oldpath<>'' && $newpath<>'') {
-				Storage::renameOrCopy($oldpath, $newpath, 'rename');
-			}
-		}
-	}
-
-	/**
-	 * copy versions of copied files
-	 * @param array $params array with oldpath and newpath
-	 *
-	 * This function is connected to the copy signal of OC_Filesystem and copies the
-	 * the stored versions to the new location
-	 */
-	public static function copy_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$oldpath = $params['oldpath'];
-			$newpath = $params['newpath'];
-			if($oldpath<>'' && $newpath<>'') {
-				Storage::renameOrCopy($oldpath, $newpath, 'copy');
-			}
-		}
-	}
-
-	/**
-	 * Remember owner and the owner path of the source file.
-	 * If the file already exists, then it was a upload of a existing file
-	 * over the web interface and we call Storage::store() directly
-	 *
-	 * @param array $params array with oldpath and newpath
-	 *
-	 */
-	public static function pre_renameOrCopy_hook($params) {
-		if (\OCP\App::isEnabled('files_versions')) {
-
-			// if we rename a movable mount point, then the versions don't have
-			// to be renamed
-			$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$mount = $manager->find($absOldPath);
-			$internalPath = $mount->getInternalPath($absOldPath);
-			if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
-				return;
-			}
-
-			$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
-			if ($view->file_exists($params['newpath'])) {
-				Storage::store($params['newpath']);
-			} else {
-				Storage::setSourcePathAndUser($params['oldpath']);
-			}
-
-		}
-	}
-
-	/**
-	 * Load additional scripts when the files app is visible
-	 */
-	public static function onLoadFilesAppScripts() {
-		\OCP\Util::addScript('files_versions', 'merged');
-	}
+    public static function connectHooks() {
+        // Listen to write signals
+        \OCP\Util::connectHook('OC_Filesystem', 'write', 'OCA\Files_Versions\Hooks', 'write_hook');
+        // Listen to delete and rename signals
+        \OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Files_Versions\Hooks', 'remove_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Versions\Hooks', 'pre_remove_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Versions\Hooks', 'rename_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
+
+        $eventDispatcher = \OC::$server->getEventDispatcher();
+        $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', ['OCA\Files_Versions\Hooks', 'onLoadFilesAppScripts']);
+    }
+
+    /**
+     * listen to write event.
+     */
+    public static function write_hook( $params ) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $path = $params[\OC\Files\Filesystem::signal_param_path];
+            if($path<>'') {
+                Storage::store($path);
+            }
+        }
+    }
+
+
+    /**
+     * Erase versions of deleted file
+     * @param array $params
+     *
+     * This function is connected to the delete signal of OC_Filesystem
+     * cleanup the versions directory if the actual file gets deleted
+     */
+    public static function remove_hook($params) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $path = $params[\OC\Files\Filesystem::signal_param_path];
+            if($path<>'') {
+                Storage::delete($path);
+            }
+        }
+    }
+
+    /**
+     * mark file as "deleted" so that we can clean up the versions if the file is gone
+     * @param array $params
+     */
+    public static function pre_remove_hook($params) {
+        $path = $params[\OC\Files\Filesystem::signal_param_path];
+            if($path<>'') {
+                Storage::markDeletedFile($path);
+            }
+    }
+
+    /**
+     * rename/move versions of renamed/moved files
+     * @param array $params array with oldpath and newpath
+     *
+     * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+     * of the stored versions along the actual file
+     */
+    public static function rename_hook($params) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $oldpath = $params['oldpath'];
+            $newpath = $params['newpath'];
+            if($oldpath<>'' && $newpath<>'') {
+                Storage::renameOrCopy($oldpath, $newpath, 'rename');
+            }
+        }
+    }
+
+    /**
+     * copy versions of copied files
+     * @param array $params array with oldpath and newpath
+     *
+     * This function is connected to the copy signal of OC_Filesystem and copies the
+     * the stored versions to the new location
+     */
+    public static function copy_hook($params) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $oldpath = $params['oldpath'];
+            $newpath = $params['newpath'];
+            if($oldpath<>'' && $newpath<>'') {
+                Storage::renameOrCopy($oldpath, $newpath, 'copy');
+            }
+        }
+    }
+
+    /**
+     * Remember owner and the owner path of the source file.
+     * If the file already exists, then it was a upload of a existing file
+     * over the web interface and we call Storage::store() directly
+     *
+     * @param array $params array with oldpath and newpath
+     *
+     */
+    public static function pre_renameOrCopy_hook($params) {
+        if (\OCP\App::isEnabled('files_versions')) {
+
+            // if we rename a movable mount point, then the versions don't have
+            // to be renamed
+            $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $mount = $manager->find($absOldPath);
+            $internalPath = $mount->getInternalPath($absOldPath);
+            if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
+                return;
+            }
+
+            $view = new \OC\Files\View(\OCP\User::getUser() . '/files');
+            if ($view->file_exists($params['newpath'])) {
+                Storage::store($params['newpath']);
+            } else {
+                Storage::setSourcePathAndUser($params['oldpath']);
+            }
+
+        }
+    }
+
+    /**
+     * Load additional scripts when the files app is visible
+     */
+    public static function onLoadFilesAppScripts() {
+        \OCP\Util::addScript('files_versions', 'merged');
+    }
 }