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

Fix issues with channel ID when using a password

Browse Source
This commit is contained in:
yflory
2018-04-26 15:10:31 +02:00
parent 1879c1829c
commit b26ae67df5
18 changed files with 72 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/userObject.js
View File

@@ -78,6 +78,7 @@ define([
exp.isReadOnlyFile = function (element) {
if (!isFile(element)) { return false; }
var data = exp.getFileData(element);
// Password not needed
var parsed = Hash.parsePadUrl(data.href);
if (!parsed) { return false; }
var pHash = parsed.hashData;
@@ -387,7 +388,7 @@ define([
var channels64 = channels.slice().map(Util.hexToBase64);
return getFiles([FILES_DATA]).filter(function (k) {
var data = allFilesList[k];
var parsed = Hash.parsePadUrl(data.href);
var parsed = Hash.parsePadUrl(data.href, data.password);
return parsed.hashData && channels64.indexOf(parsed.hashData.channel) !== -1;
});
};