diff options
| author |  wodim | 2017-08-29 22:29:10 +0200 |
|---|---|---|
| committer | wodim | 2017-08-29 22:29:10 +0200 |
| commit | d09814dd9f625f9d0bf146a52395cc1105e31e8f (patch) | |
| tree | 31dfb2af0116830ed568fa30c7c01edb545110b0 | |
| parent | Make the "window list type" selector a combobox instead of a checkbox. (diff) | |
| download | KVIrc-d09814dd9f625f9d0bf146a52395cc1105e31e8f.tar.gz KVIrc-d09814dd9f625f9d0bf146a52395cc1105e31e8f.tar.bz2 KVIrc-d09814dd9f625f9d0bf146a52395cc1105e31e8f.zip | |
Handle ftpes:// links too.
| -rw-r--r-- | src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp | 3 | ||||
| -rw-r--r-- | src/kvirc/ui/KviIrcView_getTextLine.cpp | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp index 81e5778d2..11f86a66f 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp @@ -390,7 +390,8 @@ namespace KviKvsCoreSimpleCommands { szCommand = KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand); } - else if(KviQString::equalCIN(szUrl, "ftp", 3) || KviQString::equalCIN(szUrl, "sftp", 4) || KviQString::equalCIN(szUrl, "ftps", 4)) + else if(KviQString::equalCIN(szUrl, "ftp", 3) || KviQString::equalCIN(szUrl, "sftp", 4) || + KviQString::equalCIN(szUrl, "ftps", 4) || KviQString::equalCIN(szUrl, "ftpes", 4)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlFtpCommand); if(KviQString::equalCIN(szUrl, "ftp.", 4)) diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp index 9057844f8..040c408d1 100644 --- a/src/kvirc/ui/KviIrcView_getTextLine.cpp +++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp @@ -845,6 +845,14 @@ check_file_or_ftp_url: goto got_url; } + static kvi_wchar_t aFtpesUrl[] = { 'f', 't', 'p', 'e', 's', ':', '/', '/' }; + + if(url_compare_helper(p, aFtpesUrl, 8)) + { + partLen = 8; + goto got_url; + } + static kvi_wchar_t aFtp2Url[] = { 'f', 't', 'p', '.' }; if(url_compare_helper(p, aFtp2Url, 4)) |