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

Don't load expired or deleted shared folders

Browse Source
This commit is contained in:
yflory
2018-07-13 14:47:53 +02:00
parent 7d89026d83
commit 6a80f49fe0
4 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/proxy-manager.js
View File

@@ -2,8 +2,9 @@ define([
'/common/userObject.js',
'/common/common-util.js',
'/common/common-hash.js',
'/customize/messages.js',
'/bower_components/nthen/index.js',
], function (UserObject, Util, Hash, nThen) {
], function (UserObject, Util, Hash, Messages, nThen) {
var getConfig = function (Env) {
@@ -361,8 +362,8 @@ define([
// 2b. load the proxy
Env.loadSharedFolder(id, folderData, waitFor(function (rt, metadata) {
if (data.name && !rt.proxy.metadata) { // Creating a new shared folder
rt.proxy.metadata = {title: data.name};
if (!rt.proxy.metadata) { // Creating a new shared folder
rt.proxy.metadata = {title: data.name || Messages.fm_newFolder}; // XXX
}
// If we're importing a folder, check its serverside metadata
if (data.folderData && metadata) {