From de9d675de29c1c80e07818aa89ab4a6dc4b149be Mon Sep 17 00:00:00 2001
From: Yann Muller <yann@darkriver.net>
Date: Thu, 18 Oct 2018 05:34:29 +0100
Subject: [PATCH] Fix for FTP folder being saved to an unused setting. (#4274)

---
 frontend/apps/cloudstorage/cloudstorage.lua | 6 ++----
 frontend/apps/cloudstorage/ftp.lua          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/apps/cloudstorage/cloudstorage.lua b/frontend/apps/cloudstorage/cloudstorage.lua
index 1eb24d16e..6d66b53d6 100644
--- a/frontend/apps/cloudstorage/cloudstorage.lua
+++ b/frontend/apps/cloudstorage/cloudstorage.lua
@@ -311,9 +311,8 @@ function CloudStorage:configCloud(type)
                 address = fields[2],
                 username = fields[3],
                 password = fields[4],
-                folder = fields[5],
+                url = fields[5],
                 type = "ftp",
-                url = "/"
             })
         elseif type == "webdav" then
             table.insert(cs_servers,{
@@ -323,7 +322,6 @@ function CloudStorage:configCloud(type)
                 password = fields[4],
                 url = fields[5],
                 type = "webdav",
-                --url = "/"
             })
         end
         cs_settings:saveSetting("cs_servers", cs_servers)
@@ -361,7 +359,7 @@ function CloudStorage:editCloudServer(item)
                     server.address = fields[2]
                     server.username = fields[3]
                     server.password = fields[4]
-                    server.folder = fields[5]
+                    server.url = fields[5]
                     cs_servers[i] = server
                     break
                 end
diff --git a/frontend/apps/cloudstorage/ftp.lua b/frontend/apps/cloudstorage/ftp.lua
index 04a2195ed..2c4c7a7c4 100644
--- a/frontend/apps/cloudstorage/ftp.lua
+++ b/frontend/apps/cloudstorage/ftp.lua
@@ -65,7 +65,7 @@ function Ftp:config(item, callback)
         text_address = item.address
         text_username = item.username
         text_password = item.password
-        text_folder = item.folder
+        text_folder = item.url
     else
         title = _("Add FTP account")
     end