add backticks around table names

diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 33abe608d8f35c96971710802c05182114e759f0..d68d157158b9fe89655cffe0c9dcccc653328c64 100644 (file)
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -64,7 +64,7 @@ class Trashbin {
                $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
 
                if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) {
-                       $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)");
+                       $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)");
                        $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user));
                        if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin.
                                $view->deleteAll('files_trashbin/files/'.$deleted.'.d'.$timestamp);
@@ -144,7 +144,7 @@ class Trashbin {
                        $trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
                }
                if ( $timestamp ) {
-                       $query = \OC_DB::prepare('SELECT `location`,`type` FROM *PREFIX*files_trash'
+                       $query = \OC_DB::prepare('SELECT `location`,`type` FROM `*PREFIX*files_trash`'
                                .' WHERE `user`=? AND `id`=? AND `timestamp`=?');
                        $result = $query->execute(array($user,$filename,$timestamp))->fetchAll();
                        if ( count($result) != 1 ) {
@@ -228,7 +228,7 @@ class Trashbin {
                        }
                        
                        if ( $timestamp ) {
-                               $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE `user`=? AND `id`=? AND `timestamp`=?');
+                               $query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
                                $query->execute(array($user,$filename,$timestamp));
                        }
 
@@ -259,7 +259,7 @@ class Trashbin {
                }
 
                if ( $timestamp ) {
-                       $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE `user`=? AND `id`=? AND `timestamp`=?');
+                       $query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
                        $query->execute(array($user,$filename,$timestamp));
                        $file = $filename.'.d'.$timestamp;
                } else {
@@ -344,7 +344,7 @@ class Trashbin {
                $view = new \OC\Files\View('/'.$user);
                $size = 0;
 
-               $query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM *PREFIX*files_trash WHERE `user`=?');
+               $query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash` WHERE `user`=?');
                $result = $query->execute(array($user))->fetchAll();
 
                $retention_obligation = \OC_Config::getValue('trashbin_retention_obligation',
@@ -362,7 +362,7 @@ class Trashbin {
                $availableSpace = $availableSpace + $size;
                // if size limit for trash bin reached, delete oldest files in trash bin
                if ($availableSpace < 0) {
-                       $query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM *PREFIX*files_trash'
+                       $query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash`'
                                .' WHERE `user`=? ORDER BY `timestamp` ASC');
                        $result = $query->execute(array($user))->fetchAll();
                        $length = count($result);
@@ -490,7 +490,7 @@ class Trashbin {
         * @return mixed trash bin size or false if no trash bin size is stored
         */
        private static function getTrashbinSize($user) {
-               $query = \OC_DB::prepare('SELECT `size` FROM *PREFIX*files_trashsize WHERE `user`=?');
+               $query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*files_trashsize` WHERE `user`=?');
                $result = $query->execute(array($user))->fetchAll();
 
                if ($result) {
@@ -507,9 +507,9 @@ class Trashbin {
         */
        private static function setTrashbinSize($user, $size) {
                if ( self::getTrashbinSize($user) === false) {
-                       $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_trashsize (`size`, `user`) VALUES (?, ?)');
+                       $query = \OC_DB::prepare('INSERT INTO `*PREFIX*files_trashsize` (`size`, `user`) VALUES (?, ?)');
                }else {
-                       $query = \OC_DB::prepare('UPDATE *PREFIX*files_trashsize SET `size`=? WHERE `user`=?');
+                       $query = \OC_DB::prepare('UPDATE `*PREFIX*files_trashsize` SET `size`=? WHERE `user`=?');
                }
                $query->execute(array($size, $user));
        }

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 6da0e43454114850b6cd0984d4bc5e2ddcb0bfec..5fc26fd090e92c94e6a81258228563d4c423a8de 100644 (file)
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -53,7 +53,7 @@ class Storage {
         * @return mixed versions size or false if no versions size is stored
         */
        private static function getVersionsSize($user) {
-               $query = \OC_DB::prepare('SELECT `size` FROM *PREFIX*files_versions WHERE `user`=?');
+               $query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*files_versions` WHERE `user`=?');
                $result = $query->execute(array($user))->fetchAll();
                
                if ($result) {
@@ -70,9 +70,9 @@ class Storage {
         */
        private static function setVersionsSize($user, $size) {
                if ( self::getVersionsSize($user) === false) {
-                       $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_versions (`size`, `user`) VALUES (?, ?)');
+                       $query = \OC_DB::prepare('INSERT INTO `*PREFIX*files_versions` (`size`, `user`) VALUES (?, ?)');
                }else {
-                       $query = \OC_DB::prepare('UPDATE *PREFIX*files_versions SET `size`=? WHERE `user`=?');
+                       $query = \OC_DB::prepare('UPDATE `*PREFIX*files_versions` SET `size`=? WHERE `user`=?');
                }
                $query->execute(array($size, $user));
        }