@@ -31,25 +31,25 @@ discard block |
||
31 | 31 | |
32 | 32 | $dir = '/'; |
33 | 33 | if (isset($_POST['dir'])) { |
34 | - $dir = rtrim((string)$_POST['dir'], '/'). '/'; |
|
34 | + $dir = rtrim((string)$_POST['dir'], '/'). '/'; |
|
35 | 35 | } |
36 | 36 | $allFiles = false; |
37 | 37 | if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') { |
38 | - $allFiles = true; |
|
39 | - $list = array(); |
|
40 | - $dirListing = true; |
|
41 | - if ($dir === '' || $dir === '/') { |
|
42 | - $dirListing = false; |
|
43 | - } |
|
44 | - foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) { |
|
45 | - $fileName = $file['name']; |
|
46 | - if (!$dirListing) { |
|
47 | - $fileName .= '.d' . $file['mtime']; |
|
48 | - } |
|
49 | - $list[] = $fileName; |
|
50 | - } |
|
38 | + $allFiles = true; |
|
39 | + $list = array(); |
|
40 | + $dirListing = true; |
|
41 | + if ($dir === '' || $dir === '/') { |
|
42 | + $dirListing = false; |
|
43 | + } |
|
44 | + foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) { |
|
45 | + $fileName = $file['name']; |
|
46 | + if (!$dirListing) { |
|
47 | + $fileName .= '.d' . $file['mtime']; |
|
48 | + } |
|
49 | + $list[] = $fileName; |
|
50 | + } |
|
51 | 51 | } else { |
52 | - $list = json_decode($_POST['files']); |
|
52 | + $list = json_decode($_POST['files']); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | $error = array(); |
@@ -57,38 +57,38 @@ discard block |
||
57 | 57 | |
58 | 58 | $i = 0; |
59 | 59 | foreach ($list as $file) { |
60 | - $path = $dir . '/' . $file; |
|
61 | - if ($dir === '/') { |
|
62 | - $file = ltrim($file, '/'); |
|
63 | - $delimiter = strrpos($file, '.d'); |
|
64 | - $filename = substr($file, 0, $delimiter); |
|
65 | - $timestamp = substr($file, $delimiter+2); |
|
66 | - } else { |
|
67 | - $path_parts = pathinfo($file); |
|
68 | - $filename = $path_parts['basename']; |
|
69 | - $timestamp = null; |
|
70 | - } |
|
60 | + $path = $dir . '/' . $file; |
|
61 | + if ($dir === '/') { |
|
62 | + $file = ltrim($file, '/'); |
|
63 | + $delimiter = strrpos($file, '.d'); |
|
64 | + $filename = substr($file, 0, $delimiter); |
|
65 | + $timestamp = substr($file, $delimiter+2); |
|
66 | + } else { |
|
67 | + $path_parts = pathinfo($file); |
|
68 | + $filename = $path_parts['basename']; |
|
69 | + $timestamp = null; |
|
70 | + } |
|
71 | 71 | |
72 | - if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) { |
|
73 | - $error[] = $filename; |
|
74 | - \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR); |
|
75 | - } else { |
|
76 | - $success[$i]['filename'] = $file; |
|
77 | - $success[$i]['timestamp'] = $timestamp; |
|
78 | - $i++; |
|
79 | - } |
|
72 | + if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) { |
|
73 | + $error[] = $filename; |
|
74 | + \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR); |
|
75 | + } else { |
|
76 | + $success[$i]['filename'] = $file; |
|
77 | + $success[$i]['timestamp'] = $timestamp; |
|
78 | + $i++; |
|
79 | + } |
|
80 | 80 | |
81 | 81 | } |
82 | 82 | |
83 | 83 | if ( $error ) { |
84 | - $filelist = ''; |
|
85 | - foreach ( $error as $e ) { |
|
86 | - $filelist .= $e.', '; |
|
87 | - } |
|
88 | - $l = OC::$server->getL10N('files_trashbin'); |
|
89 | - $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', '))); |
|
90 | - OCP\JSON::error(array("data" => array("message" => $message, |
|
91 | - "success" => $success, "error" => $error))); |
|
84 | + $filelist = ''; |
|
85 | + foreach ( $error as $e ) { |
|
86 | + $filelist .= $e.', '; |
|
87 | + } |
|
88 | + $l = OC::$server->getL10N('files_trashbin'); |
|
89 | + $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', '))); |
|
90 | + OCP\JSON::error(array("data" => array("message" => $message, |
|
91 | + "success" => $success, "error" => $error))); |
|
92 | 92 | } else { |
93 | - OCP\JSON::success(array("data" => array("success" => $success))); |
|
93 | + OCP\JSON::success(array("data" => array("success" => $success))); |
|
94 | 94 | } |
@@ -32,10 +32,10 @@ |
||
32 | 32 | |
33 | 33 | // make filelist |
34 | 34 | try { |
35 | - $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection); |
|
35 | + $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection); |
|
36 | 36 | } catch (Exception $e) { |
37 | - header("HTTP/1.0 404 Not Found"); |
|
38 | - exit(); |
|
37 | + header("HTTP/1.0 404 Not Found"); |
|
38 | + exit(); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | $encodedDir = \OCP\Util::encodePath($dir); |
@@ -32,19 +32,19 @@ discard block |
||
32 | 32 | |
33 | 33 | // "empty trash" command |
34 | 34 | if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){ |
35 | - $deleteAll = true; |
|
36 | - if ($folder === '/' || $folder === '') { |
|
37 | - OCA\Files_Trashbin\Trashbin::deleteAll(); |
|
38 | - $list = array(); |
|
39 | - } else { |
|
40 | - $list[] = $folder; |
|
41 | - $folder = dirname($folder); |
|
42 | - } |
|
35 | + $deleteAll = true; |
|
36 | + if ($folder === '/' || $folder === '') { |
|
37 | + OCA\Files_Trashbin\Trashbin::deleteAll(); |
|
38 | + $list = array(); |
|
39 | + } else { |
|
40 | + $list[] = $folder; |
|
41 | + $folder = dirname($folder); |
|
42 | + } |
|
43 | 43 | } |
44 | 44 | else { |
45 | - $deleteAll = false; |
|
46 | - $files = (string)$_POST['files']; |
|
47 | - $list = json_decode($files); |
|
45 | + $deleteAll = false; |
|
46 | + $files = (string)$_POST['files']; |
|
47 | + $list = json_decode($files); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | $folder = rtrim($folder, '/') . '/'; |
@@ -53,38 +53,38 @@ discard block |
||
53 | 53 | |
54 | 54 | $i = 0; |
55 | 55 | foreach ($list as $file) { |
56 | - if ($folder === '/') { |
|
57 | - $file = ltrim($file, '/'); |
|
58 | - $delimiter = strrpos($file, '.d'); |
|
59 | - $filename = substr($file, 0, $delimiter); |
|
60 | - $timestamp = substr($file, $delimiter+2); |
|
61 | - } else { |
|
62 | - $filename = $folder . '/' . $file; |
|
63 | - $timestamp = null; |
|
64 | - } |
|
56 | + if ($folder === '/') { |
|
57 | + $file = ltrim($file, '/'); |
|
58 | + $delimiter = strrpos($file, '.d'); |
|
59 | + $filename = substr($file, 0, $delimiter); |
|
60 | + $timestamp = substr($file, $delimiter+2); |
|
61 | + } else { |
|
62 | + $filename = $folder . '/' . $file; |
|
63 | + $timestamp = null; |
|
64 | + } |
|
65 | 65 | |
66 | - OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp); |
|
67 | - if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { |
|
68 | - $error[] = $filename; |
|
69 | - \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR); |
|
70 | - } |
|
71 | - // only list deleted files if not deleting everything |
|
72 | - else if (!$deleteAll) { |
|
73 | - $success[$i]['filename'] = $file; |
|
74 | - $success[$i]['timestamp'] = $timestamp; |
|
75 | - $i++; |
|
76 | - } |
|
66 | + OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp); |
|
67 | + if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { |
|
68 | + $error[] = $filename; |
|
69 | + \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR); |
|
70 | + } |
|
71 | + // only list deleted files if not deleting everything |
|
72 | + else if (!$deleteAll) { |
|
73 | + $success[$i]['filename'] = $file; |
|
74 | + $success[$i]['timestamp'] = $timestamp; |
|
75 | + $i++; |
|
76 | + } |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | if ( $error ) { |
80 | - $filelist = ''; |
|
81 | - foreach ( $error as $e ) { |
|
82 | - $filelist .= $e.', '; |
|
83 | - } |
|
84 | - $l = \OC::$server->getL10N('files_trashbin'); |
|
85 | - $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', '))); |
|
86 | - OCP\JSON::error(array("data" => array("message" => $message, |
|
87 | - "success" => $success, "error" => $error))); |
|
80 | + $filelist = ''; |
|
81 | + foreach ( $error as $e ) { |
|
82 | + $filelist .= $e.', '; |
|
83 | + } |
|
84 | + $l = \OC::$server->getL10N('files_trashbin'); |
|
85 | + $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', '))); |
|
86 | + OCP\JSON::error(array("data" => array("message" => $message, |
|
87 | + "success" => $success, "error" => $error))); |
|
88 | 88 | } else { |
89 | - OCP\JSON::success(array("data" => array("success" => $success))); |
|
89 | + OCP\JSON::success(array("data" => array("success" => $success))); |
|
90 | 90 | } |
@@ -27,23 +27,23 @@ |
||
27 | 27 | use OCA\Files_Trashbin\Expiration; |
28 | 28 | |
29 | 29 | class Application extends App { |
30 | - public function __construct (array $urlParams = []) { |
|
31 | - parent::__construct('files_trashbin', $urlParams); |
|
30 | + public function __construct (array $urlParams = []) { |
|
31 | + parent::__construct('files_trashbin', $urlParams); |
|
32 | 32 | |
33 | - $container = $this->getContainer(); |
|
34 | - /* |
|
33 | + $container = $this->getContainer(); |
|
34 | + /* |
|
35 | 35 | * Register capabilities |
36 | 36 | */ |
37 | - $container->registerCapability('OCA\Files_Trashbin\Capabilities'); |
|
37 | + $container->registerCapability('OCA\Files_Trashbin\Capabilities'); |
|
38 | 38 | |
39 | - /* |
|
39 | + /* |
|
40 | 40 | * Register expiration |
41 | 41 | */ |
42 | - $container->registerService('Expiration', function($c) { |
|
43 | - return new Expiration( |
|
44 | - $c->query('ServerContainer')->getConfig(), |
|
45 | - $c->query('OCP\AppFramework\Utility\ITimeFactory') |
|
46 | - ); |
|
47 | - }); |
|
48 | - } |
|
42 | + $container->registerService('Expiration', function($c) { |
|
43 | + return new Expiration( |
|
44 | + $c->query('ServerContainer')->getConfig(), |
|
45 | + $c->query('OCP\AppFramework\Utility\ITimeFactory') |
|
46 | + ); |
|
47 | + }); |
|
48 | + } |
|
49 | 49 | } |
@@ -31,30 +31,30 @@ |
||
31 | 31 | use OCP\Command\ICommand; |
32 | 32 | |
33 | 33 | class Expire implements ICommand { |
34 | - use FileAccess; |
|
34 | + use FileAccess; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @var string |
|
38 | - */ |
|
39 | - private $user; |
|
36 | + /** |
|
37 | + * @var string |
|
38 | + */ |
|
39 | + private $user; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param string $user |
|
43 | - */ |
|
44 | - function __construct($user) { |
|
45 | - $this->user = $user; |
|
46 | - } |
|
41 | + /** |
|
42 | + * @param string $user |
|
43 | + */ |
|
44 | + function __construct($user) { |
|
45 | + $this->user = $user; |
|
46 | + } |
|
47 | 47 | |
48 | - public function handle() { |
|
49 | - $userManager = \OC::$server->getUserManager(); |
|
50 | - if (!$userManager->userExists($this->user)) { |
|
51 | - // User has been deleted already |
|
52 | - return; |
|
53 | - } |
|
48 | + public function handle() { |
|
49 | + $userManager = \OC::$server->getUserManager(); |
|
50 | + if (!$userManager->userExists($this->user)) { |
|
51 | + // User has been deleted already |
|
52 | + return; |
|
53 | + } |
|
54 | 54 | |
55 | - \OC_Util::tearDownFS(); |
|
56 | - \OC_Util::setupFS($this->user); |
|
57 | - Trashbin::expire($this->user); |
|
58 | - \OC_Util::tearDownFS(); |
|
59 | - } |
|
55 | + \OC_Util::tearDownFS(); |
|
56 | + \OC_Util::setupFS($this->user); |
|
57 | + Trashbin::expire($this->user); |
|
58 | + \OC_Util::tearDownFS(); |
|
59 | + } |
|
60 | 60 | } |
@@ -34,94 +34,94 @@ |
||
34 | 34 | |
35 | 35 | class ExpireTrash extends Command { |
36 | 36 | |
37 | - /** |
|
38 | - * @var Expiration |
|
39 | - */ |
|
40 | - private $expiration; |
|
37 | + /** |
|
38 | + * @var Expiration |
|
39 | + */ |
|
40 | + private $expiration; |
|
41 | 41 | |
42 | - /** |
|
43 | - * @var IUserManager |
|
44 | - */ |
|
45 | - private $userManager; |
|
42 | + /** |
|
43 | + * @var IUserManager |
|
44 | + */ |
|
45 | + private $userManager; |
|
46 | 46 | |
47 | - /** |
|
48 | - * @param IUserManager|null $userManager |
|
49 | - * @param Expiration|null $expiration |
|
50 | - */ |
|
51 | - public function __construct(IUserManager $userManager = null, |
|
52 | - Expiration $expiration = null) { |
|
53 | - parent::__construct(); |
|
47 | + /** |
|
48 | + * @param IUserManager|null $userManager |
|
49 | + * @param Expiration|null $expiration |
|
50 | + */ |
|
51 | + public function __construct(IUserManager $userManager = null, |
|
52 | + Expiration $expiration = null) { |
|
53 | + parent::__construct(); |
|
54 | 54 | |
55 | - $this->userManager = $userManager; |
|
56 | - $this->expiration = $expiration; |
|
57 | - } |
|
55 | + $this->userManager = $userManager; |
|
56 | + $this->expiration = $expiration; |
|
57 | + } |
|
58 | 58 | |
59 | - protected function configure() { |
|
60 | - $this |
|
61 | - ->setName('trashbin:expire') |
|
62 | - ->setDescription('Expires the users trashbin') |
|
63 | - ->addArgument( |
|
64 | - 'user_id', |
|
65 | - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
66 | - 'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired' |
|
67 | - ); |
|
68 | - } |
|
59 | + protected function configure() { |
|
60 | + $this |
|
61 | + ->setName('trashbin:expire') |
|
62 | + ->setDescription('Expires the users trashbin') |
|
63 | + ->addArgument( |
|
64 | + 'user_id', |
|
65 | + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
66 | + 'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired' |
|
67 | + ); |
|
68 | + } |
|
69 | 69 | |
70 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
70 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
71 | 71 | |
72 | - $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
73 | - if (!$maxAge) { |
|
74 | - $output->writeln("No expiry configured."); |
|
75 | - return; |
|
76 | - } |
|
72 | + $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
73 | + if (!$maxAge) { |
|
74 | + $output->writeln("No expiry configured."); |
|
75 | + return; |
|
76 | + } |
|
77 | 77 | |
78 | - $users = $input->getArgument('user_id'); |
|
79 | - if (!empty($users)) { |
|
80 | - foreach ($users as $user) { |
|
81 | - if ($this->userManager->userExists($user)) { |
|
82 | - $output->writeln("Remove deleted files of <info>$user</info>"); |
|
83 | - $userObject = $this->userManager->get($user); |
|
84 | - $this->expireTrashForUser($userObject); |
|
85 | - } else { |
|
86 | - $output->writeln("<error>Unknown user $user</error>"); |
|
87 | - } |
|
88 | - } |
|
89 | - } else { |
|
90 | - $p = new ProgressBar($output); |
|
91 | - $p->start(); |
|
92 | - $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { |
|
93 | - $p->advance(); |
|
94 | - $this->expireTrashForUser($user); |
|
95 | - }); |
|
96 | - $p->finish(); |
|
97 | - $output->writeln(''); |
|
98 | - } |
|
99 | - } |
|
78 | + $users = $input->getArgument('user_id'); |
|
79 | + if (!empty($users)) { |
|
80 | + foreach ($users as $user) { |
|
81 | + if ($this->userManager->userExists($user)) { |
|
82 | + $output->writeln("Remove deleted files of <info>$user</info>"); |
|
83 | + $userObject = $this->userManager->get($user); |
|
84 | + $this->expireTrashForUser($userObject); |
|
85 | + } else { |
|
86 | + $output->writeln("<error>Unknown user $user</error>"); |
|
87 | + } |
|
88 | + } |
|
89 | + } else { |
|
90 | + $p = new ProgressBar($output); |
|
91 | + $p->start(); |
|
92 | + $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { |
|
93 | + $p->advance(); |
|
94 | + $this->expireTrashForUser($user); |
|
95 | + }); |
|
96 | + $p->finish(); |
|
97 | + $output->writeln(''); |
|
98 | + } |
|
99 | + } |
|
100 | 100 | |
101 | - function expireTrashForUser(IUser $user) { |
|
102 | - $uid = $user->getUID(); |
|
103 | - if (!$this->setupFS($uid)) { |
|
104 | - return; |
|
105 | - } |
|
106 | - $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
107 | - Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
108 | - } |
|
101 | + function expireTrashForUser(IUser $user) { |
|
102 | + $uid = $user->getUID(); |
|
103 | + if (!$this->setupFS($uid)) { |
|
104 | + return; |
|
105 | + } |
|
106 | + $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
107 | + Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
108 | + } |
|
109 | 109 | |
110 | - /** |
|
111 | - * Act on behalf on trash item owner |
|
112 | - * @param string $user |
|
113 | - * @return boolean |
|
114 | - */ |
|
115 | - protected function setupFS($user) { |
|
116 | - \OC_Util::tearDownFS(); |
|
117 | - \OC_Util::setupFS($user); |
|
110 | + /** |
|
111 | + * Act on behalf on trash item owner |
|
112 | + * @param string $user |
|
113 | + * @return boolean |
|
114 | + */ |
|
115 | + protected function setupFS($user) { |
|
116 | + \OC_Util::tearDownFS(); |
|
117 | + \OC_Util::setupFS($user); |
|
118 | 118 | |
119 | - // Check if this user has a trashbin directory |
|
120 | - $view = new \OC\Files\View('/' . $user); |
|
121 | - if (!$view->is_dir('/files_trashbin/files')) { |
|
122 | - return false; |
|
123 | - } |
|
119 | + // Check if this user has a trashbin directory |
|
120 | + $view = new \OC\Files\View('/' . $user); |
|
121 | + if (!$view->is_dir('/files_trashbin/files')) { |
|
122 | + return false; |
|
123 | + } |
|
124 | 124 | |
125 | - return true; |
|
126 | - } |
|
125 | + return true; |
|
126 | + } |
|
127 | 127 | } |
@@ -34,87 +34,87 @@ |
||
34 | 34 | |
35 | 35 | class CleanUp extends Command { |
36 | 36 | |
37 | - /** @var IUserManager */ |
|
38 | - protected $userManager; |
|
37 | + /** @var IUserManager */ |
|
38 | + protected $userManager; |
|
39 | 39 | |
40 | - /** @var IRootFolder */ |
|
41 | - protected $rootFolder; |
|
40 | + /** @var IRootFolder */ |
|
41 | + protected $rootFolder; |
|
42 | 42 | |
43 | - /** @var \OCP\IDBConnection */ |
|
44 | - protected $dbConnection; |
|
43 | + /** @var \OCP\IDBConnection */ |
|
44 | + protected $dbConnection; |
|
45 | 45 | |
46 | - /** |
|
47 | - * @param IRootFolder $rootFolder |
|
48 | - * @param IUserManager $userManager |
|
49 | - * @param IDBConnection $dbConnection |
|
50 | - */ |
|
51 | - function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) { |
|
52 | - parent::__construct(); |
|
53 | - $this->userManager = $userManager; |
|
54 | - $this->rootFolder = $rootFolder; |
|
55 | - $this->dbConnection = $dbConnection; |
|
56 | - } |
|
46 | + /** |
|
47 | + * @param IRootFolder $rootFolder |
|
48 | + * @param IUserManager $userManager |
|
49 | + * @param IDBConnection $dbConnection |
|
50 | + */ |
|
51 | + function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) { |
|
52 | + parent::__construct(); |
|
53 | + $this->userManager = $userManager; |
|
54 | + $this->rootFolder = $rootFolder; |
|
55 | + $this->dbConnection = $dbConnection; |
|
56 | + } |
|
57 | 57 | |
58 | - protected function configure() { |
|
59 | - $this |
|
60 | - ->setName('trashbin:cleanup') |
|
61 | - ->setDescription('Remove deleted files') |
|
62 | - ->addArgument( |
|
63 | - 'user_id', |
|
64 | - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
65 | - 'remove deleted files of the given user(s), if no user is given all deleted files will be removed' |
|
66 | - ); |
|
67 | - } |
|
58 | + protected function configure() { |
|
59 | + $this |
|
60 | + ->setName('trashbin:cleanup') |
|
61 | + ->setDescription('Remove deleted files') |
|
62 | + ->addArgument( |
|
63 | + 'user_id', |
|
64 | + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
65 | + 'remove deleted files of the given user(s), if no user is given all deleted files will be removed' |
|
66 | + ); |
|
67 | + } |
|
68 | 68 | |
69 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
70 | - $users = $input->getArgument('user_id'); |
|
71 | - if (!empty($users)) { |
|
72 | - foreach ($users as $user) { |
|
73 | - if ($this->userManager->userExists($user)) { |
|
74 | - $output->writeln("Remove deleted files of <info>$user</info>"); |
|
75 | - $this->removeDeletedFiles($user); |
|
76 | - } else { |
|
77 | - $output->writeln("<error>Unknown user $user</error>"); |
|
78 | - } |
|
79 | - } |
|
80 | - } else { |
|
81 | - $output->writeln('Remove all deleted files'); |
|
82 | - foreach ($this->userManager->getBackends() as $backend) { |
|
83 | - $name = get_class($backend); |
|
84 | - if ($backend instanceof IUserBackend) { |
|
85 | - $name = $backend->getBackendName(); |
|
86 | - } |
|
87 | - $output->writeln("Remove deleted files for users on backend <info>$name</info>"); |
|
88 | - $limit = 500; |
|
89 | - $offset = 0; |
|
90 | - do { |
|
91 | - $users = $backend->getUsers('', $limit, $offset); |
|
92 | - foreach ($users as $user) { |
|
93 | - $output->writeln(" <info>$user</info>"); |
|
94 | - $this->removeDeletedFiles($user); |
|
95 | - } |
|
96 | - $offset += $limit; |
|
97 | - } while (count($users) >= $limit); |
|
98 | - } |
|
99 | - } |
|
100 | - } |
|
69 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
70 | + $users = $input->getArgument('user_id'); |
|
71 | + if (!empty($users)) { |
|
72 | + foreach ($users as $user) { |
|
73 | + if ($this->userManager->userExists($user)) { |
|
74 | + $output->writeln("Remove deleted files of <info>$user</info>"); |
|
75 | + $this->removeDeletedFiles($user); |
|
76 | + } else { |
|
77 | + $output->writeln("<error>Unknown user $user</error>"); |
|
78 | + } |
|
79 | + } |
|
80 | + } else { |
|
81 | + $output->writeln('Remove all deleted files'); |
|
82 | + foreach ($this->userManager->getBackends() as $backend) { |
|
83 | + $name = get_class($backend); |
|
84 | + if ($backend instanceof IUserBackend) { |
|
85 | + $name = $backend->getBackendName(); |
|
86 | + } |
|
87 | + $output->writeln("Remove deleted files for users on backend <info>$name</info>"); |
|
88 | + $limit = 500; |
|
89 | + $offset = 0; |
|
90 | + do { |
|
91 | + $users = $backend->getUsers('', $limit, $offset); |
|
92 | + foreach ($users as $user) { |
|
93 | + $output->writeln(" <info>$user</info>"); |
|
94 | + $this->removeDeletedFiles($user); |
|
95 | + } |
|
96 | + $offset += $limit; |
|
97 | + } while (count($users) >= $limit); |
|
98 | + } |
|
99 | + } |
|
100 | + } |
|
101 | 101 | |
102 | - /** |
|
103 | - * remove deleted files for the given user |
|
104 | - * |
|
105 | - * @param string $uid |
|
106 | - */ |
|
107 | - protected function removeDeletedFiles($uid) { |
|
108 | - \OC_Util::tearDownFS(); |
|
109 | - \OC_Util::setupFS($uid); |
|
110 | - if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) { |
|
111 | - $this->rootFolder->get('/' . $uid . '/files_trashbin')->delete(); |
|
112 | - $query = $this->dbConnection->getQueryBuilder(); |
|
113 | - $query->delete('files_trash') |
|
114 | - ->where($query->expr()->eq('user', $query->createParameter('uid'))) |
|
115 | - ->setParameter('uid', $uid); |
|
116 | - $query->execute(); |
|
117 | - } |
|
118 | - } |
|
102 | + /** |
|
103 | + * remove deleted files for the given user |
|
104 | + * |
|
105 | + * @param string $uid |
|
106 | + */ |
|
107 | + protected function removeDeletedFiles($uid) { |
|
108 | + \OC_Util::tearDownFS(); |
|
109 | + \OC_Util::setupFS($uid); |
|
110 | + if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) { |
|
111 | + $this->rootFolder->get('/' . $uid . '/files_trashbin')->delete(); |
|
112 | + $query = $this->dbConnection->getQueryBuilder(); |
|
113 | + $query->delete('files_trash') |
|
114 | + ->where($query->expr()->eq('user', $query->createParameter('uid'))) |
|
115 | + ->setParameter('uid', $uid); |
|
116 | + $query->execute(); |
|
117 | + } |
|
118 | + } |
|
119 | 119 | |
120 | 120 | } |
@@ -33,17 +33,17 @@ |
||
33 | 33 | */ |
34 | 34 | class Capabilities implements ICapability { |
35 | 35 | |
36 | - /** |
|
37 | - * Return this classes capabilities |
|
38 | - * |
|
39 | - * @return array |
|
40 | - */ |
|
41 | - public function getCapabilities() { |
|
42 | - return [ |
|
43 | - 'files' => [ |
|
44 | - 'undelete' => true |
|
45 | - ] |
|
46 | - ]; |
|
47 | - } |
|
36 | + /** |
|
37 | + * Return this classes capabilities |
|
38 | + * |
|
39 | + * @return array |
|
40 | + */ |
|
41 | + public function getCapabilities() { |
|
42 | + return [ |
|
43 | + 'files' => [ |
|
44 | + 'undelete' => true |
|
45 | + ] |
|
46 | + ]; |
|
47 | + } |
|
48 | 48 | |
49 | 49 | } |
@@ -34,76 +34,76 @@ |
||
34 | 34 | |
35 | 35 | class ExpireTrash extends \OC\BackgroundJob\TimedJob { |
36 | 36 | |
37 | - /** |
|
38 | - * @var Expiration |
|
39 | - */ |
|
40 | - private $expiration; |
|
37 | + /** |
|
38 | + * @var Expiration |
|
39 | + */ |
|
40 | + private $expiration; |
|
41 | 41 | |
42 | - /** |
|
43 | - * @var IUserManager |
|
44 | - */ |
|
45 | - private $userManager; |
|
42 | + /** |
|
43 | + * @var IUserManager |
|
44 | + */ |
|
45 | + private $userManager; |
|
46 | 46 | |
47 | - /** |
|
48 | - * @param IUserManager|null $userManager |
|
49 | - * @param Expiration|null $expiration |
|
50 | - */ |
|
51 | - public function __construct(IUserManager $userManager = null, |
|
52 | - Expiration $expiration = null) { |
|
53 | - // Run once per 30 minutes |
|
54 | - $this->setInterval(60 * 30); |
|
47 | + /** |
|
48 | + * @param IUserManager|null $userManager |
|
49 | + * @param Expiration|null $expiration |
|
50 | + */ |
|
51 | + public function __construct(IUserManager $userManager = null, |
|
52 | + Expiration $expiration = null) { |
|
53 | + // Run once per 30 minutes |
|
54 | + $this->setInterval(60 * 30); |
|
55 | 55 | |
56 | - if (is_null($expiration) || is_null($userManager)) { |
|
57 | - $this->fixDIForJobs(); |
|
58 | - } else { |
|
59 | - $this->userManager = $userManager; |
|
60 | - $this->expiration = $expiration; |
|
61 | - } |
|
62 | - } |
|
56 | + if (is_null($expiration) || is_null($userManager)) { |
|
57 | + $this->fixDIForJobs(); |
|
58 | + } else { |
|
59 | + $this->userManager = $userManager; |
|
60 | + $this->expiration = $expiration; |
|
61 | + } |
|
62 | + } |
|
63 | 63 | |
64 | - protected function fixDIForJobs() { |
|
65 | - $application = new Application(); |
|
66 | - $this->userManager = \OC::$server->getUserManager(); |
|
67 | - $this->expiration = $application->getContainer()->query('Expiration'); |
|
68 | - } |
|
64 | + protected function fixDIForJobs() { |
|
65 | + $application = new Application(); |
|
66 | + $this->userManager = \OC::$server->getUserManager(); |
|
67 | + $this->expiration = $application->getContainer()->query('Expiration'); |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * @param $argument |
|
72 | - * @throws \Exception |
|
73 | - */ |
|
74 | - protected function run($argument) { |
|
75 | - $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
76 | - if (!$maxAge) { |
|
77 | - return; |
|
78 | - } |
|
70 | + /** |
|
71 | + * @param $argument |
|
72 | + * @throws \Exception |
|
73 | + */ |
|
74 | + protected function run($argument) { |
|
75 | + $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
76 | + if (!$maxAge) { |
|
77 | + return; |
|
78 | + } |
|
79 | 79 | |
80 | - $this->userManager->callForSeenUsers(function(IUser $user) { |
|
81 | - $uid = $user->getUID(); |
|
82 | - if (!$this->setupFS($uid)) { |
|
83 | - return; |
|
84 | - } |
|
85 | - $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
86 | - Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
87 | - }); |
|
80 | + $this->userManager->callForSeenUsers(function(IUser $user) { |
|
81 | + $uid = $user->getUID(); |
|
82 | + if (!$this->setupFS($uid)) { |
|
83 | + return; |
|
84 | + } |
|
85 | + $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
86 | + Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
87 | + }); |
|
88 | 88 | |
89 | - \OC_Util::tearDownFS(); |
|
90 | - } |
|
89 | + \OC_Util::tearDownFS(); |
|
90 | + } |
|
91 | 91 | |
92 | - /** |
|
93 | - * Act on behalf on trash item owner |
|
94 | - * @param string $user |
|
95 | - * @return boolean |
|
96 | - */ |
|
97 | - protected function setupFS($user) { |
|
98 | - \OC_Util::tearDownFS(); |
|
99 | - \OC_Util::setupFS($user); |
|
92 | + /** |
|
93 | + * Act on behalf on trash item owner |
|
94 | + * @param string $user |
|
95 | + * @return boolean |
|
96 | + */ |
|
97 | + protected function setupFS($user) { |
|
98 | + \OC_Util::tearDownFS(); |
|
99 | + \OC_Util::setupFS($user); |
|
100 | 100 | |
101 | - // Check if this user has a trashbin directory |
|
102 | - $view = new \OC\Files\View('/' . $user); |
|
103 | - if (!$view->is_dir('/files_trashbin/files')) { |
|
104 | - return false; |
|
105 | - } |
|
101 | + // Check if this user has a trashbin directory |
|
102 | + $view = new \OC\Files\View('/' . $user); |
|
103 | + if (!$view->is_dir('/files_trashbin/files')) { |
|
104 | + return false; |
|
105 | + } |
|
106 | 106 | |
107 | - return true; |
|
108 | - } |
|
107 | + return true; |
|
108 | + } |
|
109 | 109 | } |