web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Encrypted href

Browse Source
This commit is contained in:
yflory
2019-10-07 18:30:46 +02:00
parent cf0d0e8e4b
commit 5ab3f39fb8
13 changed files with 133 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/make-backup.js
View File

@@ -52,7 +52,8 @@ define([
var cancel = function () {
cancelled = true;
};
var parsed = Hash.parsePadUrl(fData.href || fData.roHref);
var href = (fData.href && fData.href.indexOf('#') !== -1) ? fData.href : fData.roHref;
var parsed = Hash.parsePadUrl(href);
var hash = parsed.hash;
var name = fData.filename || fData.title;
var secret = Hash.getSecrets('file', hash, fData.password);
@@ -88,7 +89,8 @@ define([
cancelled = true;
};
var parsed = Hash.parsePadUrl(pData.href || pData.roHref);
var href = (pData.href && pData.href.indexOf('#') !== -1) ? pData.href : pData.roHref;
var parsed = Hash.parsePadUrl(href);
var name = pData.filename || pData.title;
var opts = {
password: pData.password
@@ -137,7 +139,8 @@ define([
});
}
var parsed = Hash.parsePadUrl(fData.href || fData.roHref);
var href = (fData.href && fData.href.indexOf('#') !== -1) ? fData.href : fData.roHref;
var parsed = Hash.parsePadUrl(href);
if (['pad', 'file'].indexOf(parsed.hashData.type) === -1) { return; }
// waitFor is used to make sure all the pads and files are process before downloading the zip.