changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql...

more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html

diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index 1935a4df6ad5049a00522186cc0363899e57f9e9..ca149f0c69d5da8570a15f1d7f8cbd78d8138ca8 100644 (file)
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -21,7 +21,7 @@
                                <comments>What client-side / server-side configuration is used</comments>
                        </field>
                        <field>
-                               <name>recovery</name>
+                               <name>recovery_enabled</name>
                                <type>boolean</type>
                                <notnull>true</notnull>
                                <default>0</default>

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 4e32cf6da141639193c417f2337047dfa4141882..82f789c520287797c5f6d3f211c6cfe381ca6d7e 100644 (file)
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -228,7 +228,7 @@ class Util {
                if ( false === $this->recoveryEnabledForUser() ) {
                
                        // create database configuration
-                       $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery`) VALUES (?,?,?)';
+                       $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
                        $args = array( $this->userId, 'server-side', 0);
                        $query = \OCP\DB::prepare( $sql );
                        $query->execute( $args );
@@ -252,7 +252,7 @@ class Util {
        public function recoveryEnabledForUser() {
        
                $sql = 'SELECT 
-                               recovery 
+                               recovery_enabled
                        FROM 
                                `*PREFIX*encryption` 
                        WHERE 
@@ -268,7 +268,7 @@ class Util {
                
                while( $row = $result->fetchRow() ) {
                
-                       $recoveryEnabled[] = $row['recovery'];
+                       $recoveryEnabled[] = $row['recovery_enabled'];
                        
                }
                
@@ -299,7 +299,7 @@ class Util {
                if ( false === $recoveryStatus ) {
                
                        $sql = 'INSERT INTO `*PREFIX*encryption` 
-                                       (`uid`,`mode`,`recovery`) 
+                                       (`uid`,`mode`,`recovery_enabled`)
                                VALUES (?,?,?)';
                                
                        $args = array( $this->userId, 'server-side', $enabled );
@@ -310,7 +310,7 @@ class Util {
                        $sql = 'UPDATE 
                                        *PREFIX*encryption 
                                SET 
-                                       recovery = ? 
+                                       recovery_enabled = ?
                                WHERE 
                                        uid = ?';