CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

fixed #656: Removed FTP ServerProtocol setting instead FTPAddress will use it automatically depending on protocol

Browse source
This commit is contained in:
Jaex 2015-05-02 13:57:33 +03:00
parent d06b1d96e3
commit 26712fd4da
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ShareX.UploadersLib/Enums.cs
View file

@ -219,14 +219,6 @@ public enum BrowserProtocol
file
}
public enum ServerProtocol
{
[Description("ftp://")]
ftp,
[Description("ftps://")]
ftps
}
public enum Privacy
{
Public,

24
ShareX.UploadersLib/FileUploaders/FTP/FTPAccount.cs
View file

@ -52,9 +52,6 @@ public class FTPAccount : ICloneable
[Category("FTP"), PasswordPropertyText(true)]
public string Password { get; set; }
[Category("FTP"), Description("Choose an appropriate protocol to be accessed by the server. This affects the server address."), DefaultValue(ServerProtocol.ftp)]
public ServerProtocol ServerProtocol { get; set; }
[Category("FTP"), Description("FTP sub folder path, example: Screenshots.\r\nYou can use name parsing: %y = year, %mo = month.")]
public string SubFolderPath { get; set; }
@ -73,7 +70,7 @@ public class FTPAccount : ICloneable
[Category("FTP"), Description("Set true for active or false for passive"), DefaultValue(false)]
public bool IsActive { get; set; }
[Category("FTP"), Description("ftp://Host:Port"), Browsable(false)]
[Category("FTP"), Description("Protocol://Host:Port"), Browsable(false)]
public string FTPAddress
{
get
@ -83,7 +80,23 @@ public string FTPAddress
return string.Empty;
}
return string.Format("{0}{1}:{2}", ServerProtocol.GetDescription(), Host, Port);
string serverProtocol;
switch (Protocol)
{
default:
case FTPProtocol.FTP:
serverProtocol = "ftp://";
break;
case FTPProtocol.FTPS:
serverProtocol = "ftps://";
break;
case FTPProtocol.SFTP:
serverProtocol = "sftp://";
break;
}
return string.Format("{0}{1}:{2}", serverProtocol, Host, Port);
}
}
@ -127,7 +140,6 @@ public FTPAccount()
Name = "New account";
Host = "host";
Port = 21;
ServerProtocol = ServerProtocol.ftp;
SubFolderPath = string.Empty;
BrowserProtocol = BrowserProtocol.http;
HttpHomePath = string.Empty;