infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

avoid bypassing guards against raw HTML in some dialogs

pull/1/head
ansuz 2021-08-12 19:02:25 +05:30
parent 975259f935
commit 7f41f8765e
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
www/common/common-ui-elements.js
View File

@ -3703,6 +3703,21 @@ define([
return false;
};
UIElements.fixInlineBRs = function (htmlString) {
if (!htmlString && typeof(htmlString) === 'string') { return; }
var lines = htmlString.split('<br>');
if (lines.length === 1) { return lines; }
var len = lines.length - 1;
var result = [];
for (var i = 0; i <= len; i++) {
result.push(lines[i]);
if (i < len) {
result.push(h('br'));
}
}
return result;
};
UIElements.openSnapshotsModal = function (common, load, make, remove) {
var modal;
var readOnly = common.getMetadataMgr().getPrivateData().readOnly;

4
www/common/inner/access.js
View File

@ -981,11 +981,11 @@ define([
common.gotoURL(_href);
}, {force: true});
}
return void UI.alert(Messages.properties_passwordSuccess, function () {
return void UI.alert(UIElements.fixInlineBRs(Messages.properties_passwordSuccess), function () {
if (!isSharedFolder) {
common.gotoURL(_href);
}
}, {force: true});
});
});
});
});

5
www/drive/inner.js
View File

@ -279,10 +279,11 @@ define([
tippy: Messages.fm_burnThisDriveButton,
drawer: false
}, function () {
UI.confirm(Messages.fm_burnThisDrive, function (yes) {
var confirmContent = UIElements.fixInlineBRs(Messages.fm_burnThisDrive);
UI.confirm(confirmContent, function (yes) {
if (!yes) { return; }
common.getSframeChannel().event('EV_BURN_ANON_DRIVE');
}, null, true);
});
});
}