', {'class': 'cp-app-drive-toolbar-filler'}).appendTo($toolbar);
var $rightside = $('
', {'class': 'cp-app-drive-toolbar-rightside'})
.appendTo($toolbar);
- var $hist = common.createButton('history', true, {histConfig: APP.histConfig});
- $rightside.append($hist);
+ if (APP.loggedIn || !APP.newSharedFolder) {
+ // ANON_SHARED_FOLDER
+ var $hist = common.createButton('history', true, {histConfig: APP.histConfig});
+ $rightside.append($hist);
+ }
if (APP.$burnThisDrive) {
$rightside.append(APP.$burnThisDrive);
}
@@ -2520,6 +2542,39 @@ define([
$(h('li.cp-app-drive-tags-list', h('table', lines))).appendTo($container);
};
+ // ANON_SHARED_FOLDER
+ // Display a shared folder for anon users (read-only)
+ var displaySharedFolder = function ($list) {
+ if (currentPath.length === 1) {
+ currentPath.push(ROOT);
+ }
+ var fId = APP.newSharedFolder;
+ var data = folders[fId];
+ var $folderHeader = getFolderListHeader();
+ var $fileHeader = getFileListHeader(true);
+ var path = currentPath.slice(1);
+ var root = Util.find(data, path);
+
+ if (manager.hasSubfolder(root)) { $list.append($folderHeader); }
+ // display sub directories
+ var keys = Object.keys(root);
+ var sortedFolders = sortElements(true, currentPath, keys, null, !getSortFolderDesc());
+ var sortedFiles = sortElements(false, currentPath, keys, APP.store[SORT_FILE_BY], !getSortFileDesc());
+ sortedFolders.forEach(function (key) {
+ if (manager.isFile(root[key])) { return; }
+ var $element = createElement(currentPath, key, root, true);
+ $element.appendTo($list);
+ });
+ if (manager.hasFile(root)) { $list.append($fileHeader); }
+ // display files
+ sortedFiles.forEach(function (key) {
+ if (manager.isFolder(root[key])) { return; }
+ var $element = createElement(currentPath, key, root, false);
+ if (!$element) { return; }
+ $element.appendTo($list);
+ });
+ };
+
// Display the selected directory into the content part (rightside)
// NOTE: Elements in the trash are not using the same storage structure as the others
var _displayDirectory = function (path, force) {
@@ -2551,9 +2606,12 @@ define([
var isVirtual = virtualCategories.indexOf(path[0]) !== -1;
var isSearch = path[0] === SEARCH;
var isTags = path[0] === TAGS;
+ // ANON_SHARED_FOLDER
+ var isSharedFolder = path[0] === SHARED_FOLDER && APP.newSharedFolder;
var root = isVirtual ? undefined : manager.find(path);
if (manager.isSharedFolder(root)) {
+ // ANON_SHARED_FOLDER
path.push(manager.user.userObject.ROOT);
root = manager.find(path);
if (!root) { return; }
@@ -2664,6 +2722,9 @@ define([
displayOwned($list);
} else if (isTags) {
displayTags($list);
+ } else if (isSharedFolder) {
+ // ANON_SHARED_FOLDER
+ displaySharedFolder($list);
} else {
$dirContent.contextmenu(openContextMenu('content'));
if (manager.hasSubfolder(root)) { $list.append($folderHeader); }
@@ -3071,6 +3132,10 @@ define([
else if ($(this).hasClass('cp-app-drive-context-openro')) {
paths.forEach(function (p) {
var el = manager.find(p.path);
+ if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
+ // ANON_SHARED_FOLDER
+ el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
+ }
var href;
if (manager.isPathIn(p.path, [FILES_DATA])) {
href = el.roHref;
@@ -3159,6 +3224,10 @@ define([
}
if (paths.length !== 1) { return; }
el = manager.find(paths[0].path);
+ if (paths[0].path[0] === SHARED_FOLDER && APP.newSharedFolder) {
+ // ANON_SHARED_FOLDER
+ el = manager.find(paths[0].path.slice(1), APP.newSharedFolder);
+ }
getProperties(el, function (e, $prop) {
if (e) { return void logError(e); }
UI.alert($prop[0], undefined, true);
@@ -3309,6 +3378,11 @@ define([
var path = data.path.slice();
var originalPath = data.path.slice();
+ if (!APP.loggedIn && APP.newSharedFolder && data.id === APP.newSharedFolder) {
+ // ANON_SHARED_FOLDER
+ return void onRefresh.refresh();
+ }
+
// Fix the path if this is about a shared folder
if (data.id && manager.folders[data.id]) {
var uoPath = manager.getUserObjectPath(manager.folders[data.id].userObject);
@@ -3339,6 +3413,11 @@ define([
var path = data.path.slice();
+ if (!APP.loggedIn && APP.newSharedFolder && data.id === APP.newSharedFolder) {
+ // ANON_SHARED_FOLDER
+ return void onRefresh.refresh();
+ }
+
// Fix the path if this is about a shared folder
if (data.id && manager.folders[data.id]) {
var uoPath = manager.getUserObjectPath(manager.folders[data.id].userObject);
@@ -3447,6 +3526,11 @@ define([
common: common,
logging: false
};*/
+ var metadataMgr = common.getMetadataMgr();
+ var privateData = metadataMgr.getPrivateData();
+ if (privateData.newSharedFolder) {
+ APP.newSharedFolder = privateData.newSharedFolder;
+ }
var sframeChan = common.getSframeChannel();
updateObject(sframeChan, proxy, waitFor(function () {
@@ -3457,14 +3541,23 @@ define([
var metadataMgr = common.getMetadataMgr();
var privateData = metadataMgr.getPrivateData();
- if (privateData.newSharedFolder) {
- APP.newSharedFolder = privateData.newSharedFolder;
- }
APP.disableSF = !privateData.enableSF && AppConfig.disableSharedFolders;
+ if (APP.newSharedFolder && !APP.loggedIn) {
+ readOnly = APP.readOnly = true;
+ var data = folders[APP.newSharedFolder];
+ if (data) {
+ sframeChan.query('Q_SET_PAD_TITLE_IN_DRIVE', {
+ title: data.metadata && data.metadata.title,
+ }, function () {});
+ }
+ }
+
+ // ANON_SHARED_FOLDER
+ var pageTitle = (!APP.loggedIn && APP.newSharedFolder) ? SHARED_FOLDER_NAME : Messages.type.drive;
var configTb = {
displayed: ['useradmin', 'pageTitle', 'newpad', 'limit'],
- pageTitle: Messages.type.drive,
+ pageTitle: pageTitle,
metadataMgr: metadataMgr,
readOnly: readOnly,
sfCommon: common,
diff --git a/www/drive/main.js b/www/drive/main.js
index 2ace94441..aff51b5ec 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -39,7 +39,7 @@ define([
var getSecrets = function (Cryptpad, Utils, cb) {
var hash = window.location.hash.slice(1);
var secret = Utils.Hash.getSecrets('drive', hash);
- if (hash) {
+ if (hash && Utils.LocalStore.isLoggedIn()) {
// Add a shared folder!
// TODO password?
Cryptpad.addSharedFolder(secret, function (id) {
@@ -53,6 +53,16 @@ define([
cb(null, secret);
});
return;
+ } else if (hash) {
+ var id = Utils.Util.createRandomInteger();
+ window.CryptPad_newSharedFolder = id;
+ var data = {
+ href: Utils.Hash.getRelativeHref(window.location.href),
+ };
+ Cryptpad.loadSharedFolder(id, data, function () {
+ cb(null, secret);
+ });
+ return;
}
// No password for drive
cb(null, secret);
@@ -89,6 +99,7 @@ define([
});
sframeChan.on('EV_DRIVE_SET_HASH', function (hash) {
// Update the hash in the address bar
+ if (!Utils.LocalStore.isLoggedIn()) { return; }
var ohc = window.onhashchange;
window.onhashchange = function () {};
window.location.hash = hash || '';