extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for protocol detection and problems converting absolute to relative paths, from Thomas Kurschel.

Browse Source
This commit is contained in:
Nathan Gray 2015-03-17 14:47:24 +00:00
parent 715bcbd92d
commit f078a2ae82
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpgwapi/js/jsapi/egw_files.js
View File

@ -90,9 +90,14 @@ egw.extend('files', egw.MODULE_WND_LOCAL, function(_app, _wnd)
var file = _urls[i];
// check if egw_url is only path and urls contains full url incl. protocol
// --> prefix it with our protocol and host, as eg. splitting by just '/' will fail!
var need_full_url = egw_url[0] == '/' && file.substr(4) == 'http' ? window.location.protocol+'://'+window.location.host : '';
var parts = file.split(need_full_url+egw_url,2);
if (parts.length == 2) _urls[i] = parts[1];
var need_full_url = egw_url[0] == '/' && file.substr(0,4) == 'http' ? window.location.protocol+'//'+window.location.host : '';
var parts = file.split(need_full_url+egw_url);
if (parts.length > 1)
{
// discard protocol and host
parts.shift();
_urls[i] = parts.join(need_full_url+egw_url);
}
}
return _urls;
}