Completed
Pull Request — master (#8235)
by Robin
15:22
created
apps/files_versions/ajax/rollbackVersion.php 3 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,8 +34,8 @@
 block discarded – undo
34 34
 $revision=(int)$_GET['revision'];
35 35
 
36 36
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
37
-	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
37
+    OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
38 38
 }else{
39
-	$l = \OC::$server->getL10N('files_versions');
40
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
39
+    $l = \OC::$server->getL10N('files_versions');
40
+    OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
41 41
 }
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,12 +30,12 @@
 block discarded – undo
30 30
 OCP\JSON::checkAppEnabled('files_versions');
31 31
 OCP\JSON::callCheck();
32 32
 
33
-$file = (string)$_GET['file'];
34
-$revision=(int)$_GET['revision'];
33
+$file = (string) $_GET['file'];
34
+$revision = (int) $_GET['revision'];
35 35
 
36
-if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
37
-	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
38
-}else{
36
+if (OCA\Files_Versions\Storage::rollback($file, $revision)) {
37
+	OCP\JSON::success(array("data" => array("revision" => $revision, "file" => $file)));
38
+} else {
39 39
 	$l = \OC::$server->getL10N('files_versions');
40
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
40
+	OCP\JSON::error(array("data" => array("message" => $l->t("Could not revert: %s", array($file)))));
41 41
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
 
36 36
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
37 37
 	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
38
-}else{
38
+} else{
39 39
 	$l = \OC::$server->getL10N('files_versions');
40 40
 	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
41 41
 }
Please login to merge, or discard this patch.
apps/files_versions/lib/Controller/PreviewController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 		$y = 44,
79 79
 		$version = ''
80 80
 	) {
81
-		if($file === '' || $version === '' || $x === 0 || $y === 0) {
81
+		if ($file === '' || $version === '' || $x === 0 || $y === 0) {
82 82
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
83 83
 		}
84 84
 
Please login to merge, or discard this patch.
Indentation   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -36,66 +36,66 @@
 block discarded – undo
36 36
 
37 37
 class PreviewController extends Controller {
38 38
 
39
-	/** @var IRootFolder */
40
-	private $rootFolder;
39
+    /** @var IRootFolder */
40
+    private $rootFolder;
41 41
 
42
-	/** @var string */
43
-	private $userId;
42
+    /** @var string */
43
+    private $userId;
44 44
 
45
-	/** @var IMimeTypeDetector */
46
-	private $mimeTypeDetector;
45
+    /** @var IMimeTypeDetector */
46
+    private $mimeTypeDetector;
47 47
 
48
-	/** @var IPreview */
49
-	private $previewManager;
48
+    /** @var IPreview */
49
+    private $previewManager;
50 50
 
51
-	public function __construct($appName,
52
-								IRequest $request,
53
-								IRootFolder $rootFolder,
54
-								$userId,
55
-								IMimeTypeDetector $mimeTypeDetector,
56
-								IPreview $previewManager) {
57
-		parent::__construct($appName, $request);
51
+    public function __construct($appName,
52
+                                IRequest $request,
53
+                                IRootFolder $rootFolder,
54
+                                $userId,
55
+                                IMimeTypeDetector $mimeTypeDetector,
56
+                                IPreview $previewManager) {
57
+        parent::__construct($appName, $request);
58 58
 
59
-		$this->rootFolder = $rootFolder;
60
-		$this->userId = $userId;
61
-		$this->mimeTypeDetector = $mimeTypeDetector;
62
-		$this->previewManager = $previewManager;
63
-	}
59
+        $this->rootFolder = $rootFolder;
60
+        $this->userId = $userId;
61
+        $this->mimeTypeDetector = $mimeTypeDetector;
62
+        $this->previewManager = $previewManager;
63
+    }
64 64
 
65
-	/**
66
-	 * @NoAdminRequired
67
-	 * @NoCSRFRequired
68
-	 *
69
-	 * @param string $file
70
-	 * @param int $x
71
-	 * @param int $y
72
-	 * @param string $version
73
-	 * @return DataResponse|FileDisplayResponse
74
-	 */
75
-	public function getPreview(
76
-		$file = '',
77
-		$x = 44,
78
-		$y = 44,
79
-		$version = ''
80
-	) {
81
-		if($file === '' || $version === '' || $x === 0 || $y === 0) {
82
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
83
-		}
65
+    /**
66
+     * @NoAdminRequired
67
+     * @NoCSRFRequired
68
+     *
69
+     * @param string $file
70
+     * @param int $x
71
+     * @param int $y
72
+     * @param string $version
73
+     * @return DataResponse|FileDisplayResponse
74
+     */
75
+    public function getPreview(
76
+        $file = '',
77
+        $x = 44,
78
+        $y = 44,
79
+        $version = ''
80
+    ) {
81
+        if($file === '' || $version === '' || $x === 0 || $y === 0) {
82
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
83
+        }
84 84
 
85
-		try {
86
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
87
-			/** @var Folder $versionFolder */
88
-			$versionFolder = $userFolder->getParent()->get('files_versions');
89
-			$mimeType = $this->mimeTypeDetector->detectPath($file);
90
-			$file = $versionFolder->get($file.'.v'.$version);
85
+        try {
86
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
87
+            /** @var Folder $versionFolder */
88
+            $versionFolder = $userFolder->getParent()->get('files_versions');
89
+            $mimeType = $this->mimeTypeDetector->detectPath($file);
90
+            $file = $versionFolder->get($file.'.v'.$version);
91 91
 
92
-			/** @var File $file */
93
-			$f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
94
-			return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
95
-		} catch (NotFoundException $e) {
96
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
97
-		} catch (\InvalidArgumentException $e) {
98
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
99
-		}
100
-	}
92
+            /** @var File $file */
93
+            $f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
94
+            return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
95
+        } catch (NotFoundException $e) {
96
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
97
+        } catch (\InvalidArgumentException $e) {
98
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
99
+        }
100
+    }
101 101
 }
Please login to merge, or discard this patch.
apps/files_versions/lib/Command/ExpireVersions.php 2 patches
Indentation   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -33,93 +33,93 @@
 block discarded – undo
33 33
 
34 34
 class ExpireVersions extends Command {
35 35
 
36
-	/**
37
-	 * @var Expiration
38
-	 */
39
-	private $expiration;
36
+    /**
37
+     * @var Expiration
38
+     */
39
+    private $expiration;
40 40
 	
41
-	/**
42
-	 * @var IUserManager
43
-	 */
44
-	private $userManager;
41
+    /**
42
+     * @var IUserManager
43
+     */
44
+    private $userManager;
45 45
 
46
-	/**
47
-	 * @param IUserManager|null $userManager
48
-	 * @param Expiration|null $expiration
49
-	 */
50
-	public function __construct(IUserManager $userManager = null,
51
-								Expiration $expiration = null) {
52
-		parent::__construct();
46
+    /**
47
+     * @param IUserManager|null $userManager
48
+     * @param Expiration|null $expiration
49
+     */
50
+    public function __construct(IUserManager $userManager = null,
51
+                                Expiration $expiration = null) {
52
+        parent::__construct();
53 53
 
54
-		$this->userManager = $userManager;
55
-		$this->expiration = $expiration;
56
-	}
54
+        $this->userManager = $userManager;
55
+        $this->expiration = $expiration;
56
+    }
57 57
 
58
-	protected function configure() {
59
-		$this
60
-			->setName('versions:expire')
61
-			->setDescription('Expires the users file versions')
62
-			->addArgument(
63
-				'user_id',
64
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
65
-				'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
66
-			);
67
-	}
58
+    protected function configure() {
59
+        $this
60
+            ->setName('versions:expire')
61
+            ->setDescription('Expires the users file versions')
62
+            ->addArgument(
63
+                'user_id',
64
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
65
+                'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
66
+            );
67
+    }
68 68
 
69
-	protected function execute(InputInterface $input, OutputInterface $output) {
69
+    protected function execute(InputInterface $input, OutputInterface $output) {
70 70
 
71
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
72
-		if (!$maxAge) {
73
-			$output->writeln("No expiry configured.");
74
-			return;
75
-		}
71
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
72
+        if (!$maxAge) {
73
+            $output->writeln("No expiry configured.");
74
+            return;
75
+        }
76 76
 
77
-		$users = $input->getArgument('user_id');
78
-		if (!empty($users)) {
79
-			foreach ($users as $user) {
80
-				if ($this->userManager->userExists($user)) {
81
-					$output->writeln("Remove deleted files of   <info>$user</info>");
82
-					$userObject = $this->userManager->get($user);
83
-					$this->expireVersionsForUser($userObject);
84
-				} else {
85
-					$output->writeln("<error>Unknown user $user</error>");
86
-				}
87
-			}
88
-		} else {
89
-			$p = new ProgressBar($output);
90
-			$p->start();
91
-			$this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
92
-				$p->advance();
93
-				$this->expireVersionsForUser($user);
94
-			});
95
-			$p->finish();
96
-			$output->writeln('');
97
-		}
98
-	}
77
+        $users = $input->getArgument('user_id');
78
+        if (!empty($users)) {
79
+            foreach ($users as $user) {
80
+                if ($this->userManager->userExists($user)) {
81
+                    $output->writeln("Remove deleted files of   <info>$user</info>");
82
+                    $userObject = $this->userManager->get($user);
83
+                    $this->expireVersionsForUser($userObject);
84
+                } else {
85
+                    $output->writeln("<error>Unknown user $user</error>");
86
+                }
87
+            }
88
+        } else {
89
+            $p = new ProgressBar($output);
90
+            $p->start();
91
+            $this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
92
+                $p->advance();
93
+                $this->expireVersionsForUser($user);
94
+            });
95
+            $p->finish();
96
+            $output->writeln('');
97
+        }
98
+    }
99 99
 
100
-	function expireVersionsForUser(IUser $user) {
101
-		$uid = $user->getUID();
102
-		if (!$this->setupFS($uid)) {
103
-			return;
104
-		}
105
-		Storage::expireOlderThanMaxForUser($uid);
106
-	}
100
+    function expireVersionsForUser(IUser $user) {
101
+        $uid = $user->getUID();
102
+        if (!$this->setupFS($uid)) {
103
+            return;
104
+        }
105
+        Storage::expireOlderThanMaxForUser($uid);
106
+    }
107 107
 
108
-	/**
109
-	 * Act on behalf on versions item owner
110
-	 * @param string $user
111
-	 * @return boolean
112
-	 */
113
-	protected function setupFS($user) {
114
-		\OC_Util::tearDownFS();
115
-		\OC_Util::setupFS($user);
108
+    /**
109
+     * Act on behalf on versions item owner
110
+     * @param string $user
111
+     * @return boolean
112
+     */
113
+    protected function setupFS($user) {
114
+        \OC_Util::tearDownFS();
115
+        \OC_Util::setupFS($user);
116 116
 
117
-		// Check if this user has a version directory
118
-		$view = new \OC\Files\View('/' . $user);
119
-		if (!$view->is_dir('/files_versions')) {
120
-			return false;
121
-		}
117
+        // Check if this user has a version directory
118
+        $view = new \OC\Files\View('/' . $user);
119
+        if (!$view->is_dir('/files_versions')) {
120
+            return false;
121
+        }
122 122
 
123
-		return true;
124
-	}
123
+        return true;
124
+    }
125 125
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@
 block discarded – undo
115 115
 		\OC_Util::setupFS($user);
116 116
 
117 117
 		// Check if this user has a version directory
118
-		$view = new \OC\Files\View('/' . $user);
118
+		$view = new \OC\Files\View('/'.$user);
119 119
 		if (!$view->is_dir('/files_versions')) {
120 120
 			return false;
121 121
 		}
Please login to merge, or discard this patch.
apps/files_versions/lib/Command/CleanUp.php 2 patches
Indentation   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -33,83 +33,83 @@
 block discarded – undo
33 33
 
34 34
 class CleanUp extends Command {
35 35
 
36
-	/** @var IUserManager */
37
-	protected $userManager;
38
-
39
-	/** @var IRootFolder */
40
-	protected $rootFolder;
41
-
42
-	/**
43
-	 * @param IRootFolder $rootFolder
44
-	 * @param IUserManager $userManager
45
-	 */
46
-	function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
47
-		parent::__construct();
48
-		$this->userManager = $userManager;
49
-		$this->rootFolder = $rootFolder;
50
-	}
51
-
52
-	protected function configure() {
53
-		$this
54
-			->setName('versions:cleanup')
55
-			->setDescription('Delete versions')
56
-			->addArgument(
57
-				'user_id',
58
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
59
-				'delete versions of the given user(s), if no user is given all versions will be deleted'
60
-			);
61
-	}
62
-
63
-
64
-	protected function execute(InputInterface $input, OutputInterface $output) {
65
-
66
-		$users = $input->getArgument('user_id');
67
-		if (!empty($users)) {
68
-			foreach ($users as $user) {
69
-				if ($this->userManager->userExists($user)) {
70
-					$output->writeln("Delete versions of   <info>$user</info>");
71
-					$this->deleteVersions($user);
72
-				} else {
73
-					$output->writeln("<error>Unknown user $user</error>");
74
-				}
75
-			}
76
-		} else {
77
-			$output->writeln('Delete all versions');
78
-			foreach ($this->userManager->getBackends() as $backend) {
79
-				$name = get_class($backend);
80
-
81
-				if ($backend instanceof IUserBackend) {
82
-					$name = $backend->getBackendName();
83
-				}
84
-
85
-				$output->writeln("Delete versions for users on backend <info>$name</info>");
86
-
87
-				$limit = 500;
88
-				$offset = 0;
89
-				do {
90
-					$users = $backend->getUsers('', $limit, $offset);
91
-					foreach ($users as $user) {
92
-						$output->writeln("   <info>$user</info>");
93
-						$this->deleteVersions($user);
94
-					}
95
-					$offset += $limit;
96
-				} while (count($users) >= $limit);
97
-			}
98
-		}
99
-	}
100
-
101
-
102
-	/**
103
-	 * delete versions for the given user
104
-	 *
105
-	 * @param string $user
106
-	 */
107
-	protected function deleteVersions($user) {
108
-		\OC_Util::tearDownFS();
109
-		\OC_Util::setupFS($user);
110
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
111
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
112
-		}
113
-	}
36
+    /** @var IUserManager */
37
+    protected $userManager;
38
+
39
+    /** @var IRootFolder */
40
+    protected $rootFolder;
41
+
42
+    /**
43
+     * @param IRootFolder $rootFolder
44
+     * @param IUserManager $userManager
45
+     */
46
+    function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
47
+        parent::__construct();
48
+        $this->userManager = $userManager;
49
+        $this->rootFolder = $rootFolder;
50
+    }
51
+
52
+    protected function configure() {
53
+        $this
54
+            ->setName('versions:cleanup')
55
+            ->setDescription('Delete versions')
56
+            ->addArgument(
57
+                'user_id',
58
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
59
+                'delete versions of the given user(s), if no user is given all versions will be deleted'
60
+            );
61
+    }
62
+
63
+
64
+    protected function execute(InputInterface $input, OutputInterface $output) {
65
+
66
+        $users = $input->getArgument('user_id');
67
+        if (!empty($users)) {
68
+            foreach ($users as $user) {
69
+                if ($this->userManager->userExists($user)) {
70
+                    $output->writeln("Delete versions of   <info>$user</info>");
71
+                    $this->deleteVersions($user);
72
+                } else {
73
+                    $output->writeln("<error>Unknown user $user</error>");
74
+                }
75
+            }
76
+        } else {
77
+            $output->writeln('Delete all versions');
78
+            foreach ($this->userManager->getBackends() as $backend) {
79
+                $name = get_class($backend);
80
+
81
+                if ($backend instanceof IUserBackend) {
82
+                    $name = $backend->getBackendName();
83
+                }
84
+
85
+                $output->writeln("Delete versions for users on backend <info>$name</info>");
86
+
87
+                $limit = 500;
88
+                $offset = 0;
89
+                do {
90
+                    $users = $backend->getUsers('', $limit, $offset);
91
+                    foreach ($users as $user) {
92
+                        $output->writeln("   <info>$user</info>");
93
+                        $this->deleteVersions($user);
94
+                    }
95
+                    $offset += $limit;
96
+                } while (count($users) >= $limit);
97
+            }
98
+        }
99
+    }
100
+
101
+
102
+    /**
103
+     * delete versions for the given user
104
+     *
105
+     * @param string $user
106
+     */
107
+    protected function deleteVersions($user) {
108
+        \OC_Util::tearDownFS();
109
+        \OC_Util::setupFS($user);
110
+        if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
111
+            $this->rootFolder->get('/' . $user . '/files_versions')->delete();
112
+        }
113
+    }
114 114
 
115 115
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,8 +107,8 @@
 block discarded – undo
107 107
 	protected function deleteVersions($user) {
108 108
 		\OC_Util::tearDownFS();
109 109
 		\OC_Util::setupFS($user);
110
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
111
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
110
+		if ($this->rootFolder->nodeExists('/'.$user.'/files_versions')) {
111
+			$this->rootFolder->get('/'.$user.'/files_versions')->delete();
112 112
 		}
113 113
 	}
114 114
 
Please login to merge, or discard this patch.
apps/files_versions/lib/Capabilities.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,16 +29,16 @@
 block discarded – undo
29 29
 
30 30
 class Capabilities implements ICapability {
31 31
 	
32
-	/**
33
-	 * Return this classes capabilities
34
-	 *
35
-	 * @return array
36
-	 */
37
-	public function getCapabilities() {
38
-		return [
39
-			'files' => [
40
-				'versioning' => true
41
-			]
42
-		];
43
-	}
32
+    /**
33
+     * Return this classes capabilities
34
+     *
35
+     * @return array
36
+     */
37
+    public function getCapabilities() {
38
+        return [
39
+            'files' => [
40
+                'versioning' => true
41
+            ]
42
+        ];
43
+    }
44 44
 }
Please login to merge, or discard this patch.
apps/files_versions/lib/BackgroundJob/ExpireVersions.php 2 patches
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -31,66 +31,66 @@
 block discarded – undo
31 31
 
32 32
 class ExpireVersions extends \OC\BackgroundJob\TimedJob {
33 33
 
34
-	const ITEMS_PER_SESSION = 1000;
34
+    const ITEMS_PER_SESSION = 1000;
35 35
 
36
-	/**
37
-	 * @var Expiration
38
-	 */
39
-	private $expiration;
36
+    /**
37
+     * @var Expiration
38
+     */
39
+    private $expiration;
40 40
 	
41
-	/**
42
-	 * @var IUserManager
43
-	 */
44
-	private $userManager;
41
+    /**
42
+     * @var IUserManager
43
+     */
44
+    private $userManager;
45 45
 
46
-	public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
47
-		// Run once per 30 minutes
48
-		$this->setInterval(60 * 30);
46
+    public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
47
+        // Run once per 30 minutes
48
+        $this->setInterval(60 * 30);
49 49
 
50
-		if (is_null($expiration) || is_null($userManager)) {
51
-			$this->fixDIForJobs();
52
-		} else {
53
-			$this->expiration = $expiration;
54
-			$this->userManager = $userManager;
55
-		}
56
-	}
50
+        if (is_null($expiration) || is_null($userManager)) {
51
+            $this->fixDIForJobs();
52
+        } else {
53
+            $this->expiration = $expiration;
54
+            $this->userManager = $userManager;
55
+        }
56
+    }
57 57
 
58
-	protected function fixDIForJobs() {
59
-		$application = new Application();
60
-		$this->expiration = $application->getContainer()->query('Expiration');
61
-		$this->userManager = \OC::$server->getUserManager();
62
-	}
58
+    protected function fixDIForJobs() {
59
+        $application = new Application();
60
+        $this->expiration = $application->getContainer()->query('Expiration');
61
+        $this->userManager = \OC::$server->getUserManager();
62
+    }
63 63
 
64
-	protected function run($argument) {
65
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
66
-		if (!$maxAge) {
67
-			return;
68
-		}
64
+    protected function run($argument) {
65
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
66
+        if (!$maxAge) {
67
+            return;
68
+        }
69 69
 
70
-		$this->userManager->callForSeenUsers(function(IUser $user) {
71
-			$uid = $user->getUID();
72
-			if (!$this->setupFS($uid)) {
73
-				return;
74
-			}
75
-			Storage::expireOlderThanMaxForUser($uid);
76
-		});
77
-	}
70
+        $this->userManager->callForSeenUsers(function(IUser $user) {
71
+            $uid = $user->getUID();
72
+            if (!$this->setupFS($uid)) {
73
+                return;
74
+            }
75
+            Storage::expireOlderThanMaxForUser($uid);
76
+        });
77
+    }
78 78
 
79
-	/**
80
-	 * Act on behalf on trash item owner
81
-	 * @param string $user
82
-	 * @return boolean
83
-	 */
84
-	protected function setupFS($user) {
85
-		\OC_Util::tearDownFS();
86
-		\OC_Util::setupFS($user);
79
+    /**
80
+     * Act on behalf on trash item owner
81
+     * @param string $user
82
+     * @return boolean
83
+     */
84
+    protected function setupFS($user) {
85
+        \OC_Util::tearDownFS();
86
+        \OC_Util::setupFS($user);
87 87
 
88
-		// Check if this user has a versions directory
89
-		$view = new \OC\Files\View('/' . $user);
90
-		if (!$view->is_dir('/files_versions')) {
91
-			return false;
92
-		}
88
+        // Check if this user has a versions directory
89
+        $view = new \OC\Files\View('/' . $user);
90
+        if (!$view->is_dir('/files_versions')) {
91
+            return false;
92
+        }
93 93
 
94
-		return true;
95
-	}
94
+        return true;
95
+    }
96 96
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 		\OC_Util::setupFS($user);
87 87
 
88 88
 		// Check if this user has a versions directory
89
-		$view = new \OC\Files\View('/' . $user);
89
+		$view = new \OC\Files\View('/'.$user);
90 90
 		if (!$view->is_dir('/files_versions')) {
91 91
 			return false;
92 92
 		}
Please login to merge, or discard this patch.
apps/files_versions/download.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -32,13 +32,13 @@
 block discarded – undo
32 32
 $revision=(int)$_GET['revision'];
33 33
 
34 34
 try {
35
-	list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
35
+    list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
36 36
 } catch(\OCP\Files\NotFoundException $e) {
37
-	header("HTTP/1.1 404 Not Found");
38
-	$tmpl = new OCP\Template('', '404', 'guest');
39
-	$tmpl->assign('file', '');
40
-	$tmpl->printPage();
41
-	exit();
37
+    header("HTTP/1.1 404 Not Found");
38
+    $tmpl = new OCP\Template('', '404', 'guest');
39
+    $tmpl->assign('file', '');
40
+    $tmpl->printPage();
41
+    exit();
42 42
 }
43 43
 
44 44
 $versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@
 block discarded – undo
29 29
 OCP\JSON::checkLoggedIn();
30 30
 
31 31
 $file = $_GET['file'];
32
-$revision=(int)$_GET['revision'];
32
+$revision = (int) $_GET['revision'];
33 33
 
34 34
 try {
35 35
 	list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
36
-} catch(\OCP\Files\NotFoundException $e) {
36
+} catch (\OCP\Files\NotFoundException $e) {
37 37
 	header("HTTP/1.1 404 Not Found");
38 38
 	$tmpl = new OCP\Template('', '404', 'guest');
39 39
 	$tmpl->assign('file', '');
Please login to merge, or discard this patch.
apps/files_versions/appinfo/routes.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -31,20 +31,20 @@
 block discarded – undo
31 31
 
32 32
 $application = new Application();
33 33
 $application->registerRoutes($this, [
34
-	'routes' => [
35
-		[
36
-			'name' => 'Preview#getPreview',
37
-			'url' => '/preview',
38
-			'verb' => 'GET',
39
-		],
40
-	],
34
+    'routes' => [
35
+        [
36
+            'name' => 'Preview#getPreview',
37
+            'url' => '/preview',
38
+            'verb' => 'GET',
39
+        ],
40
+    ],
41 41
 ]);
42 42
 
43 43
 /** @var $this \OCP\Route\IRouter */
44 44
 $this->create('files_versions_download', 'download.php')
45
-	->actionInclude('files_versions/download.php');
45
+    ->actionInclude('files_versions/download.php');
46 46
 $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php')
47
-	->actionInclude('files_versions/ajax/getVersions.php');
47
+    ->actionInclude('files_versions/ajax/getVersions.php');
48 48
 $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php')
49
-	->actionInclude('files_versions/ajax/rollbackVersion.php');
49
+    ->actionInclude('files_versions/ajax/rollbackVersion.php');
50 50
 
Please login to merge, or discard this patch.
lib/public/Authentication/LoginCredentials/IStore.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
  */
32 32
 interface IStore {
33 33
 	
34
-	/**
35
-	 * Get login credentials of the currently logged in user
36
-	 *
37
-	 * @since 12
38
-	 *
39
-	 * @throws CredentialsUnavailableException
40
-	 * @return ICredentials the login credentials of the current user
41
-	 */
42
-	public function getLoginCredentials();
34
+    /**
35
+     * Get login credentials of the currently logged in user
36
+     *
37
+     * @since 12
38
+     *
39
+     * @throws CredentialsUnavailableException
40
+     * @return ICredentials the login credentials of the current user
41
+     */
42
+    public function getLoginCredentials();
43 43
 	
44 44
 }
Please login to merge, or discard this patch.