mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix internet server protocol handling

Browse Source
This commit is contained in:
Martin 2021-03-23 17:26:44 +01:00
parent 0544ccdb28
commit 321d019932
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
urbackupserver/www/js/urbackup.js
View File

@ -3415,20 +3415,22 @@ function show_settings2(data)
g.curr_settings = data.settings;
data.settings = getCurrentSettings(data.settings);
data.settings.backup_dirs_optional=getCheckboxValue(data.settings.backup_dirs_optional);
var internet_server = data.settings.internet_server;
var internet_server = unescapeHTML(data.settings.internet_server);
if(internet_server.indexOf("ws://")!=0 &&
internet_server.indexOf("wss://")!=0 &&
internet_server.indexOf("urbackup://")!=0 )
{
if(data.settings.internet_server_port==55415)
{
data.settings.internet_server = "urbackup://" + internet_server;
internet_server = "urbackup://" + internet_server;
}
else
{
data.settings.internet_server = "urbackup://" + internet_server + ":" + data.settings.internet_server_port;
internet_server = "urbackup://" + internet_server + ":" + data.settings.internet_server_port;
}
}
data.settings.internet_server = internet_server;
var transfer_mode_params1=["raw", "hashed"];
var transfer_mode_params2=["raw", "hashed", "blockhash"];

2
urbackupserver/www/templates/settings_inv_row.htm
View File

@ -526,7 +526,7 @@
<div class="form-group">
<label class="col-sm-4 control-label" for="internet_server">{tServer URL clients connect to}:</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="internet_server" value="{internet_server|s}" placeholder="ws://example.com:55414/socket"/>
<input type="text" class="form-control" id="internet_server" value="{internet_server}" placeholder="ws://example.com:55414/socket"/>
</div>
</div>
<div class="form-group">