Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks
Check whether the user exists before trying to set up his file system
This commit is contained in:
commit
9899e10a04
|
@ -49,6 +49,12 @@ class Expire implements ICommand {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function handle() {
|
public function handle() {
|
||||||
|
$userManager = \OC::$server->getUserManager();
|
||||||
|
if (!$userManager->userExists($this->user)) {
|
||||||
|
// User has been deleted already
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
\OC_Util::tearDownFS();
|
\OC_Util::tearDownFS();
|
||||||
\OC_Util::setupFS($this->user);
|
\OC_Util::setupFS($this->user);
|
||||||
Trashbin::expire($this->trashBinSize, $this->user);
|
Trashbin::expire($this->trashBinSize, $this->user);
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @author Joas Schilling <nickvergessen@owncloud.com>
|
||||||
|
*
|
||||||
|
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||||
|
* @license AGPL-3.0
|
||||||
|
*
|
||||||
|
* This code is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3,
|
||||||
|
* as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\Files_Trashbin\Tests\Command;
|
||||||
|
|
||||||
|
use OCA\Files_Trashbin\Command\Expire;
|
||||||
|
use Test\TestCase;
|
||||||
|
|
||||||
|
class ExpireTest extends TestCase {
|
||||||
|
public function testExpireNonExistingUser() {
|
||||||
|
$command = new Expire('test', 0);
|
||||||
|
$command->handle();
|
||||||
|
|
||||||
|
$this->assertTrue(true);
|
||||||
|
}
|
||||||
|
}
|
|
@ -50,6 +50,12 @@ class Expire implements ICommand {
|
||||||
|
|
||||||
|
|
||||||
public function handle() {
|
public function handle() {
|
||||||
|
$userManager = \OC::$server->getUserManager();
|
||||||
|
if (!$userManager->userExists($this->user)) {
|
||||||
|
// User has been deleted already
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
\OC_Util::setupFS($this->user);
|
\OC_Util::setupFS($this->user);
|
||||||
Storage::expire($this->fileName, $this->versionsSize, $this->neededSpace);
|
Storage::expire($this->fileName, $this->versionsSize, $this->neededSpace);
|
||||||
\OC_Util::tearDownFS();
|
\OC_Util::tearDownFS();
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @author Joas Schilling <nickvergessen@owncloud.com>
|
||||||
|
*
|
||||||
|
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||||
|
* @license AGPL-3.0
|
||||||
|
*
|
||||||
|
* This code is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3,
|
||||||
|
* as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\Files_Versions\Tests\Command;
|
||||||
|
|
||||||
|
use OCA\Files_Versions\Command\Expire;
|
||||||
|
use Test\TestCase;
|
||||||
|
|
||||||
|
class ExpireTest extends TestCase {
|
||||||
|
public function testExpireNonExistingUser() {
|
||||||
|
$command = new Expire('test', '');
|
||||||
|
$command->handle();
|
||||||
|
|
||||||
|
$this->assertTrue(true);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue