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

Rename a variable

Browse Source
This commit is contained in:
yflory
2019-11-29 14:32:40 +01:00
parent cc4e6d9a1e
commit 71d2f8388d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
www/common/outer/userObject.js
View File

@@ -769,18 +769,18 @@ define([
continue; continue;
} }
var href; var decryptedHref;
try { try {
href = el.href && ((el.href.indexOf('#') !== -1) ? el.href : exp.cryptor.decrypt(el.href)); decryptedHref = el.href && ((el.href.indexOf('#') !== -1) ? el.href : exp.cryptor.decrypt(el.href));
} catch (e) {} } catch (e) {}
if (href && href.indexOf('#') === -1) { if (decryptedHref && decryptedHref.indexOf('#') === -1) {
// If we can't decrypt the href, it means we don't have the correct secondaryKey and we're in readOnly mode: // If we can't decrypt the href, it means we don't have the correct secondaryKey and we're in readOnly mode:
// abort now, we won't be able to fix anything anyway // abort now, we won't be able to fix anything anyway
continue; continue;
} }
var parsed = Hash.parsePadUrl(href || el.roHref); var parsed = Hash.parsePadUrl(decryptedHref || el.roHref);
var secret; var secret;
// Clean invalid hash // Clean invalid hash
@@ -797,9 +797,9 @@ define([
} }
// If we have an edit link, check the view link // If we have an edit link, check the view link
if (href && parsed.hashData.type === "pad" && parsed.hashData.version) { if (decryptedHref && parsed.hashData.type === "pad" && parsed.hashData.version) {
if (parsed.hashData.mode === "view") { if (parsed.hashData.mode === "view") {
el.roHref = href; el.roHref = decryptedHref;
delete el.href; delete el.href;
} else if (!el.roHref) { } else if (!el.roHref) {
secret = Hash.getSecrets(parsed.type, parsed.hash, el.password); secret = Hash.getSecrets(parsed.type, parsed.hash, el.password);
@@ -818,7 +818,9 @@ define([
} }
// Fix href // Fix href
if (href && href.slice(0,1) !== '/') { el.href = exp.cryptor.encrypt(Hash.getRelativeHref(href)); } if (decryptedHref && decryptedHref.slice(0,1) !== '/') {
el.href = exp.cryptor.encrypt(Hash.getRelativeHref(decryptedHref));
}
// Fix creation time // Fix creation time
if (!el.ctime) { el.ctime = el.atime; } if (!el.ctime) { el.ctime = el.atime; }
// Fix title // Fix title