mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use query builder instead of OC_DB in trashbin 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-11-06 11:48:52 +01:00 committed by backportbot[bot]
parent bac92bb814
commit ef22580a32
1 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
apps/files_trashbin/lib/Trashbin.php
View File

@ -128,17 +128,20 @@ class Trashbin {
* @return array (filename => array (timestamp => original location)) * @return array (filename => array (timestamp => original location))
*/ */
public static function getLocations($user) { public static function getLocations($user) {
$query = \OC_DB::prepare('SELECT `id`, `timestamp`, `location`' $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
. ' FROM `*PREFIX*files_trash` WHERE `user`=?'); $query->select('id', 'timestamp', 'location')
$result = $query->execute([$user]); ->from('files_trash')
->where($query->expr()->eq('user', $query->createNamedParameter($user)));
$result = $query->execute();
$array = []; $array = [];
while ($row = $result->fetchRow()) { while ($row = $result->fetch()) {
if (isset($array[$row['id']])) { if (isset($array[$row['id']])) {
$array[$row['id']][$row['timestamp']] = $row['location']; $array[$row['id']][$row['timestamp']] = $row['location'];
} else { } else {
$array[$row['id']] = [$row['timestamp'] => $row['location']]; $array[$row['id']] = [$row['timestamp'] => $row['location']];
} }
} }
$result->closeCursor();
return $array; return $array;
} }
@ -151,11 +154,19 @@ class Trashbin {
* @return string original location * @return string original location
*/ */
public static function getLocation($user, $filename, $timestamp) { public static function getLocation($user, $filename, $timestamp) {
$query = \OC_DB::prepare('SELECT `location` FROM `*PREFIX*files_trash`' $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
. ' WHERE `user`=? AND `id`=? AND `timestamp`=?'); $query->select('location')
$result = $query->execute([$user, $filename, $timestamp])->fetchAll(); ->from('files_trash')
if (isset($result[0]['location'])) { ->where($query->expr()->eq('user', $query->createNamedParameter($user)))
return $result[0]['location']; ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
$result = $query->execute();
$row = $result->fetch();
$result->closeCursor();
if (isset($row['location'])) {
return $row['location'];
} else { } else {
return false; return false;
} }
@ -208,8 +219,13 @@ class Trashbin {
if ($view->file_exists($target)) { if ($view->file_exists($target)) {
$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)"); $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$result = $query->execute([$targetFilename, $timestamp, $targetLocation, $user]); $query->insert('files_trash')
->setValue('id', $query->createNamedParameter($targetFilename))
->setValue('timestamp', $query->createNamedParameter($timestamp))
->setValue('location', $query->createNamedParameter($targetLocation))
->setValue('user', $query->createNamedParameter($user));
$result = $query->execute();
if (!$result) { if (!$result) {
\OC::$server->getLogger()->error('trash bin database couldn\'t be updated for the files owner', ['app' => 'files_trashbin']); \OC::$server->getLogger()->error('trash bin database couldn\'t be updated for the files owner', ['app' => 'files_trashbin']);
} }
@ -322,8 +338,13 @@ class Trashbin {
} }
if ($moveSuccessful) { if ($moveSuccessful) {
$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)"); $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$result = $query->execute([$filename, $timestamp, $location, $owner]); $query->insert('files_trash')
->setValue('id', $query->createNamedParameter($filename))
->setValue('timestamp', $query->createNamedParameter($timestamp))
->setValue('location', $query->createNamedParameter($location))
->setValue('user', $query->createNamedParameter($owner));
$result = $query->execute();
if (!$result) { if (!$result) {
\OC::$server->getLogger()->error('trash bin database couldn\'t be updated', ['app' => 'files_trashbin']); \OC::$server->getLogger()->error('trash bin database couldn\'t be updated', ['app' => 'files_trashbin']);
} }
@ -481,8 +502,12 @@ class Trashbin {
self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp); self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
if ($timestamp) { if ($timestamp) {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?'); $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$query->execute([$user, $filename, $timestamp]); $query->delete('files_trash')
->where($query->expr()->eq('user', $query->createNamedParameter($user)))
->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
$query->execute();
} }
return true; return true;
@ -568,8 +593,11 @@ class Trashbin {
// actual file deletion // actual file deletion
$trash->delete(); $trash->delete();
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
$query->execute([$user]); $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$query->delete('files_trash')
->where($query->expr()->eq('user', $query->createNamedParameter($user)));
$query->execute();
// Bulk PostDelete-Hook // Bulk PostDelete-Hook
\OC_Hook::emit('\OCP\Trashbin', 'deleteAll', ['paths' => $filePaths]); \OC_Hook::emit('\OCP\Trashbin', 'deleteAll', ['paths' => $filePaths]);
@ -618,8 +646,13 @@ class Trashbin {
$size = 0; $size = 0;
if ($timestamp) { if ($timestamp) {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?'); $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$query->execute([$user, $filename, $timestamp]); $query->delete('files_trash')
->where($query->expr()->eq('user', $query->createNamedParameter($user)))
->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
$query->execute();
$file = $filename . '.d' . $timestamp; $file = $filename . '.d' . $timestamp;
} else { } else {
$file = $filename; $file = $filename;
@ -701,8 +734,10 @@ class Trashbin {
* @return bool result of db delete operation * @return bool result of db delete operation
*/ */
public static function deleteUser($uid) { public static function deleteUser($uid) {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?'); $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
return $query->execute([$uid]); $query->delete('files_trash')
->where($query->expr()->eq('user', $query->createNamedParameter($uid)));
return (bool) $query->execute();
} }
/** /**