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

don't allow editing if pad type is wrong

Browse Source
This commit is contained in:
ansuz
2017-06-22 14:31:55 +02:00
parent eddfb936f2
commit 852c028822
8 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
www/whiteboard/main.js
View File

@@ -293,7 +293,7 @@ window.canvas = canvas;
Title = Cryptpad.createTitle({}, config.onLocal, Cryptpad);
Metadata = Cryptpad.createMetadata(UserList, Title, metadataCfg);
Metadata = Cryptpad.createMetadata(UserList, Title, metadataCfg, Cryptpad);
var configTb = {
displayed: ['title', 'useradmin', 'spinner', 'lag', 'state', 'share', 'userlist', 'newpad', 'limit', 'upgrade'],
@@ -384,7 +384,8 @@ window.canvas = canvas;
metadata: {
users: UserList.userData,
palette: palette,
defaultTitle: Title.defaultTitle
defaultTitle: Title.defaultTitle,
type: 'whiteboard',
}
};
if (!initializing) {
@@ -413,6 +414,14 @@ window.canvas = canvas;
var isNew = false;
var userDoc = module.realtime.getUserDoc();
if (userDoc === "" || userDoc === "{}") { isNew = true; }
else {
var hjson = JSON.parse(userDoc);
if (typeof(hjson) !== 'object' || Array.isArray(hjson) ||
(typeof(hjson.type) !== 'undefined' && hjson.type !== whiteboard)) {
Cryptpad.errorLoadingScreen(Messages.typeError);
throw new Error(Messages.typeError);
}
}
Cryptpad.removeLoadingScreen();
setEditable(true);