Merge branch 'staging' into support

CHANGELOG.md

@@ -1,3 +1,79 @@
+# Yak release (v2.24.0)
+
+## Goals
+
+We've recently had an intern join our team, so this release and those until the end of summer are likely to feature a lot of small usability fixes.
+Otherwise, we've continued to develop team-centric features, particularly the way that registered users share pads with friends.
+Finally, we prioritized the ability to archive files for a period instead of deleting them, which we've been planning for a while.
+
+## Update notes
+
+* There are some important steps in this release:
+    * **make sure you read the full update notes before proceeding!**
+* [@zimbatm](https://github.com/zimbatm) added the ability to configure the location of your configuration file via environment variables when launching the server:
+  * `CRYPTPAD_CONFIG=/home/cryptpad/cryptpad/cryptpad-config/config.js /home/cryptpad/cryptpad/server.js`
+* We discovered a bug in our Xenops release which resulted in the server's list of pads stored for each user to be incorrect.
+  * if you're running CryptPad 2.23.0, we recommend that you disable any scripts configured to delete inactive pads
+  * updating to 2.24.0 will fix the issue in the client, but each user's list of "pinned pads" won't be corrected until they visit your instance and run the latest code
+* This release introduces the ability to archive some data instead of deleting it, since it can be scary to remove user data when you can't easily inspect it to see what it is
+  * to take advantage of this new functionality you'll need to update your configuration file with three new configuration points:
+    * set `retainData` to `true` if you want to archive channels instead of deleting them
+      * either by user command or due to inactivity
+      * the server will fall back to its default deletion behaviour if this value is `false` or not set at all
+    * set `archiveRetentionTime` to the number of days that an archived pad should be stored in the archive directory before being deleted permanently
+    * set `archivePath` to the path where you'd like archives to be stored
+      * it should not be publicly accessible in order to respect the users' wishes
+* We've introduced some new scripts to work with the database, some of which were needed to diagnose problems stemming from the pinning bug
+  * `evict-inactive.js` identifies channels which are unpinned and inactive and archives them
+    * unlike `delete-inactive.js` it only handles channels, not files or any other kind of data
+    * ...but it's much safer, since nothing is removed permanently
+    * in the coming releases we'll implement archival for other types of data so that we can fully remove unsafe scripts
+  * `diagnose-archive-conflicts.js` checks all the files in your archive and identifies whether they can be restored safely or if they conflict with newer files in the production database
+  * `restore-archived.js` restores any channels archived by the server or evict-inactive.js, excluding those which would conflict with the database
+* This release depends on updates to some serverside dependencies. Run `npm update`:
+  * `ws` addresses a potential vulnerability, so if possible anyone running earlier versions of CryptPad should update
+  * `chainpad-server` handles users' websocket connections and we needed to make a few changes to deal with changes in the `ws` API
+  * `heapdump` is no longer a default dependency, though you can install it if you want its functionality
+* This release also features a **Clientside migration** which modifies users' CryptDrives. Any clients which are running both the latest code after the update as well as an older version in another browser or device risk creating conflicts in their account data. To prevent this, update in the following manner:
+  1. ensure that you've added the configuration values listed above
+  2. shut down the server and ensure that it doesn't restart until you've completed the following steps
+  3. pull the latest clientside and serverside code via git
+  4. `npm update` to get the latest serverside dependencies
+  5. update the cache-busting string if you are handling the cache manually, otherwise allow the server to handle this as per its default
+  5. restart the server: clients with open tabs should be prompted to reload instead of reconnecting because the server's version has changed
+* We recommend that you test a local version of CryptPad before deploying this latest code, as aspects of the above-mentioned migrations are not backwards-compatible.
+  * you can roll back, but users' CryptDrives might have errors coping with data introduced by newer features.
+
+## Features
+
+* As mentioned above, CryptPad instances can be configured to temporarily archive files instead of deleting them permanently.
+  * as a user this means if you accidentally delete a file you have the option of contacting your administrator and asking them to help
+  * if they're really nice and have the spare time to help you, they might actually recover your data!
+* A contributor is working on translating CryptPad into the Catalan language.
+  * if your preferred language isn't supported, you can do the same on https://weblate.cryptpad.fr
+* We added the ability to add colors to folders in users CryptDrives, along with support for arbitrary folder metadata which we aren't using yet.
+* Users with existing friends on the platform will run a migration to allow them to share pads with friends directly instead of sending them a link.
+  * they'll receive a notification indicating the title of the pad and who shared it
+  * if you've already added friends on the platform, you can send them pads from the usual "sharing menu"
+* Our code editor already offered the ability to set their color theme and highlighting mode, but now those values will be previewed when mousing over the the option in the dropdown.
+  * Our slide editor now offers the same theme selection as the code editor
+* It's now possible to view the history of a shared folder by clicking the history button while viewing the shared folder's contents.
+
+## Bug fixes
+
+* The CryptDrive received a number of usability fixes this time around:
+  * better styles when hovering over interactive elements in the drive (cursors, shading, etc)
+  * clicking the history button in the drive a second time will exit history mode
+  * after being resized, the tree pane now correctly responds to mobile layout styles
+  * the path indicator also adapts to very narrow layouts
+  * the user's current location is preserved when renaming the current folder or its ancestors
+  * you can right-click on elements in the tree and expand or collapse all of their children
+* A user noticed that one-on-one chats did not seem to be deleted, as their messages were still available after a reload.
+  * they were deleted but our usage of the sharedWorker API incorrectly preserved a local cache of those message until you closed all of your browser tabs
+* We've also fixed some elements of the chat UI, notably the position of the chat's scrollbar when first loading older messages and how the interface scrolls to keep up with new messages.
+* We've noticed some cases of tooltips getting stuck in the UI and implemented some measures to prevent this from happening.
+* After "unfriending" another user it was possible that they would be automatically re-added as friends.
+
 # Xenops release (v2.23.0)
 
 ## Goals

www/assert/main.js

@@ -371,6 +371,20 @@ define([
         return cb(true);
     }, "version 2 hash failed to parse correctly");
 
+    assert(function (cb) {
+        var x;
+        var set_x = function (v) {
+            x = v;
+        };
+
+        Util.mkAsync(set_x)(7);
+        set_x(5);
+
+        Util.mkAsync(function (expected) {
+            cb(x === expected);
+        })(7);
+    }, "test mkAsync");
+
     assert(function (cb) {
         Wire.create({
             constructor: function (cb) {

www/common/common-ui-elements.js

@@ -162,7 +162,7 @@ define([
             }
 
             var parsed = Hash.parsePadUrl(data.href || data.roHref);
-            if (!data.noEditPassword && owned && parsed.hashData.type === 'pad') {
+            if (!data.noEditPassword && owned && parsed.hashData.type === 'pad' && parsed.type !== "sheet") { // FIXME SHEET fix password change for sheets
                 var sframeChan = common.getSframeChannel();
                 var changePwTitle = Messages.properties_changePassword;
                 var changePwConfirm = Messages.properties_confirmChange;
@@ -412,6 +412,7 @@ define([
                         if (!friend.notifications || !friend.curvePublic) { return; }
                         common.mailbox.sendTo("SHARE_PAD", {
                             href: href,
+                            password: config.password,
                             name: myName,
                             title: title
                         }, {
@@ -1737,16 +1738,20 @@ define([
             var pressed = '';
             var to;
             $container.keydown(function (e) {
-                var $value = $innerblock.find('[data-value].cp-dropdown-element-active');
+                var $value = $innerblock.find('[data-value].cp-dropdown-element-active:visible');
                 if (e.which === 38) { // Up
                     if ($value.length) {
+                        $value.mouseleave();
                         var $prev = $value.prev();
+                        $prev.mouseenter();
                         setActive($prev);
                     }
                 }
                 if (e.which === 40) { // Down
                     if ($value.length) {
+                        $value.mouseleave();
                         var $next = $value.next();
+                        $next.mouseenter();
                         setActive($next);
                     }
                 }
@@ -1757,6 +1762,7 @@ define([
                     }
                 }
                 if (e.which === 27) { // Esc
+                    $value.mouseleave();
                     hide();
                 }
             });

www/common/common-util.js

@@ -2,6 +2,15 @@
 define([], function () {
     var Util = window.CryptPad_Util = {};
 
+    Util.mkAsync = function (f) {
+        return function () {
+            var args = Array.prototype.slice.call(arguments);
+            setTimeout(function () {
+                f.apply(null, args);
+            });
+        };
+    };
+
     // If once is true, after the event has been fired, any further handlers which are
     // registered will fire immediately, and this type of event cannot be fired twice.
     Util.mkEvent = function (once) {

www/common/diffMarked.js

@@ -84,6 +84,12 @@ define([
         }
     };
 
+    var stripTags = function (text) {
+        var div = document.createElement("div");
+        div.innerHTML = text;
+        return div.innerText;
+    };
+
     renderer.heading = function (text, level) {
         var i = 0;
         var safeText = text.toLowerCase().replace(/[^\w]+/g, '-');
@@ -99,7 +105,7 @@ define([
         toc.push({
             level: level,
             id: id,
-            title: text
+            title: stripTags(text)
         });
         return "<h" + level + " id=\"" + id + "\"><a href=\"#" + id + "\" class=\"anchor\"></a>" + text + "</h" + level + ">";
     };
@@ -122,10 +128,10 @@ define([
         }
         if (!isCheckedTaskItem && !isUncheckedTaskItem && hasBogusInput) {
             if (/checked/.test(text)) {
-                text = text.replace(bogusCheckPtn, 
+                text = text.replace(bogusCheckPtn,
                 '<i class="fa fa-check-square" aria-hidden="true"></i>') + '\n';
             } else if (/disabled/.test(text)) {
-                text = text.replace(bogusCheckPtn, 
+                text = text.replace(bogusCheckPtn,
                 '<i class="fa fa-square-o" aria-hidden="true"></i>') + '\n';
             }
         }

www/common/notifications.js

@@ -57,7 +57,12 @@ define([
             .html(Messages._getKey(key, [msg.content.name || Messages.anonymous, msg.content.title]));
         $(el).find('.cp-notification-content').addClass("cp-clickable")
             .click(function () {
-                common.openURL(msg.content.href);
+                var todo = function () { common.openURL(msg.content.href); };
+                if (!msg.content.password) { return void todo(); }
+                common.getSframeChannel().query('Q_SESSIONSTORAGE_PUT', {
+                    key: 'newPadPassword',
+                    value: msg.content.password
+                }, todo);
             });
         $(el).find('.cp-notification-dismiss').css('display', 'flex');
     };

www/common/onlyoffice/main.js

@@ -102,9 +102,12 @@ define([
             Cryptpad.onlyoffice.onEvent.reg(function (obj) {
                 if (obj.ev === 'MESSAGE' && !/^cp\|/.test(obj.data)) {
                     try {
+                        var validateKey = obj.data.validateKey || true;
+                        var skipCheck = validateKey === true;
+                        var msg = obj.data.msg;
                         obj.data = {
-                            msg: JSON.parse(Utils.crypto.decrypt(obj.data, Utils.secret.keys.validateKey)),
-                            hash: obj.data.slice(0,64)
+                            msg: JSON.parse(Utils.crypto.decrypt(msg, validateKey, skipCheck)),
+                            hash: msg.slice(0,64)
                         };
                     } catch (e) {
                         console.error(e);

www/common/outer/mailbox-handlers.js

@@ -1,6 +1,7 @@
 define([
     '/common/common-messaging.js',
-], function (Messaging) {
+    '/common/common-hash.js',
+], function (Messaging, Hash) {
 
     var getRandomTimeout = function (ctx) {
         var lag = ctx.store.realtime.getLag().lag || 0;
@@ -156,6 +157,50 @@ define([
         cb(true);
     };
 
+    // Hide duplicates when receiving a SHARE_PAD notification:
+    // Keep only one notification per channel: the stronger and more recent one
+    var channels = {};
+    handlers['SHARE_PAD'] = function (ctx, box, data, cb) {
+        var msg = data.msg;
+        var hash = data.hash;
+        var content = msg.content;
+        // content.name, content.title, content.href, content.password
+
+        var channel = Hash.hrefToHexChannelId(content.href, content.password);
+        var parsed = Hash.parsePadUrl(content.href);
+        var mode = parsed.hashData && parsed.hashData.mode || 'n/a';
+
+        var old = channels[channel];
+        var toRemove;
+        if (old) {
+            // New hash is weaker, ignore
+            if (old.mode === 'edit' && mode === 'view') {
+                return void cb(true);
+            }
+            // New hash is not weaker, clear the old one
+            toRemove = old.data;
+        }
+
+        // Update the data
+        channels[channel] = {
+            mode: mode,
+            data: {
+                type: box.type,
+                hash: hash
+            }
+        };
+
+        cb(false, toRemove);
+    };
+    removeHandlers['SHARE_PAD'] = function (ctx, box, data, hash) {
+        var content = data.content;
+        var channel = Hash.hrefToHexChannelId(content.href, content.password);
+        var old = channels[channel];
+        if (old && old.data && old.data.hash === hash) {
+            delete channels[channel];
+        }
+    };
+
     return {
         add: function (ctx, box, data, cb) {
             /**

www/common/outer/mailbox.js

@@ -187,6 +187,7 @@ proxy.mailboxes = {
     var openChannel = function (ctx, type, m, onReady) {
         var box = ctx.boxes[type] = {
             channel: m.channel,
+            type: type,
             queue: [], // Store the messages to send when the channel is ready
             history: [], // All the hashes loaded from the server in corretc order
             content: {}, // Content of the messages that should be displayed
@@ -259,8 +260,8 @@ proxy.mailboxes = {
                     msg: msg,
                     hash: hash
                 };
-                Handlers.add(ctx, box, message, function (toDismiss) {
-                    if (toDismiss) {
+                Handlers.add(ctx, box, message, function (dismissed, toDismiss) {
+                    if (dismissed) { // This message should be removed
                         dismiss(ctx, {
                             type: type,
                             hash: hash
@@ -269,6 +270,11 @@ proxy.mailboxes = {
                         });
                         return;
                     }
+                    if (toDismiss) { // List of other messages to remove
+                        dismiss(ctx, toDismiss, '', function () {
+                            console.log('Notification handled automatically');
+                        });
+                    }
                     box.content[hash] = msg;
                     showMessage(ctx, type, message);
                 });

www/common/outer/onlyoffice.js

@@ -26,7 +26,10 @@ define([
             if (!c.id) { c.id = chan.wc.myID + '-' + client; }
 
             chan.history.forEach(function (msg) {
-                ctx.emit('MESSAGE', msg, [client]);
+                ctx.emit('MESSAGE', {
+                    msg: msg,
+                    validateKey: chan.validateKey
+                }, [client]);
             });
 
             // ==> And push the new tab to the list
@@ -37,7 +40,8 @@ define([
         var onOpen = function (wc) {
 
             ctx.channels[channel] = ctx.channels[channel] || {
-                history: []
+                history: [],
+                validateKey: obj.validateKey
             };
 
             chan = ctx.channels[channel];
@@ -61,7 +65,10 @@ define([
             });
             wc.on('message', function (msg) {
                 chan.history.push(msg);
-                ctx.emit('MESSAGE', msg, chan.clients);
+                ctx.emit('MESSAGE', {
+                    msg: msg,
+                    validateKey: chan.validateKey
+                }, chan.clients);
             });
 
             chan.wc = wc;
@@ -101,6 +108,7 @@ define([
         };
 
         network.on('message', function (msg, sender) {
+            if (!ctx.channels[channel]) { return; }
             var hk = network.historyKeeper;
             if (sender !== hk) { return; }
 
@@ -115,7 +123,12 @@ define([
             // Keep only metadata messages for the current channel
             if (parsed.channel && parsed.channel !== channel) { return; }
             // Ignore the metadata message
-            if (parsed.validateKey && parsed.channel) { return; }
+            if (parsed.validateKey && parsed.channel) {
+                if (!chan.validateKey) {
+                    chan.validateKey = parsed.validateKey;
+                }
+                return;
+            }
             // End of history: emit READY
             if (parsed.state && parsed.state === 1 && parsed.channel) {
                 ctx.emit('READY', '', chan.clients);
@@ -132,7 +145,9 @@ define([
             if (hash === chan.lastKnownHash || hash === chan.lastCpHash) { return; }
 
             chan.lastKnownHash = hash;
-            ctx.emit('MESSAGE', msg, chan.clients);
+            ctx.emit('MESSAGE', {
+                msg: msg,
+            }, chan.clients);
             chan.history.push(msg);
         });
 
@@ -176,7 +191,9 @@ define([
             return void chan.sendMsg(data.isCp, cb);
         }
         chan.sendMsg(data.msg, cb);
-        ctx.emit('MESSAGE', data.msg, chan.clients.filter(function (cl) {
+        ctx.emit('MESSAGE', {
+            msg: data.msg
+        }, chan.clients.filter(function (cl) {
             return cl !== clientId;
         }));
     };

www/common/outer/userObject.js

@@ -625,6 +625,11 @@ define([
                 var root = exp.find([ROOT]);
                 var toClean = [];
                 for (var id in fd) {
+                    if (String(id) !== String(Number(id))) {
+                        debug("Invalid file ID in filesData.", id);
+                        toClean.push(id);
+                        continue;
+                    }
                     id = Number(id);
                     var el = fd[id];
 

www/common/proxy-manager.js

@@ -342,7 +342,7 @@ define([
                         });
 
                         // Remove the elements from the old location (without unpinning)
-                        Env.user.userObject.delete(resolved.main, waitFor());
+                        Env.user.userObject.delete(resolved.main, waitFor()); // FIXME waitFor() is called synchronously
                     }
                 }
             }
@@ -369,7 +369,7 @@ define([
                         if (copy) { return; }
 
                         // Remove the elements from the old location (without unpinning)
-                        uoFrom.delete(paths, waitFor());
+                        uoFrom.delete(paths, waitFor()); // FIXME waitFor() is called synchronously
                     }
                 });
             }
@@ -707,6 +707,7 @@ define([
             if (type === 'expirable') {
                 return function (fileId) {
                     var data = userObject.getFileData(fileId);
+                    if (!data) { return; }
                     // Don't push duplicates
                     if (result.indexOf(data.channel) !== -1) { return; }
                     // Return pads owned by someone else or expired by time
@@ -718,6 +719,7 @@ define([
             if (type === 'owned') {
                 return function (fileId) {
                     var data = userObject.getFileData(fileId);
+                    if (!data) { return; }
                     // Don't push duplicates
                     if (result.indexOf(data.channel) !== -1) { return; }
                     // Return owned pads
@@ -729,6 +731,7 @@ define([
             if (type === "pin") {
                 return function (fileId) {
                     var data = userObject.getFileData(fileId);
+                    if (!data) { return; }
                     // Don't pin pads owned by someone else
                     if (_ownedByOther(Env, data.owners)) { return; }
                     // Don't push duplicates

www/common/sframe-common-codemirror.js

@@ -231,7 +231,7 @@ define([
             };
             var $block = exp.$language = UIElements.createDropdown(dropdownConfig);
             $block.find('button').attr('title', Messages.languageButtonTitle);
-            
+
             var isHovering = false;
             var $aLanguages = $block.find('a');
             $aLanguages.mouseenter(function () {
@@ -304,7 +304,7 @@ define([
                     setTheme(theme, $block);
                     Common.setAttribute(themeKey, theme);
                 });
-                
+
                 if ($drawer) { $drawer.append($block); }
                 if (cb) { cb(); }
             };

www/common/sframe-common-outer.js

@@ -223,6 +223,11 @@ define([
                             sframeChan.event("EV_PAD_PASSWORD");
                         };
 
+                        if (!val && sessionStorage.newPadPassword) {
+                            val = sessionStorage.newPadPassword;
+                            delete sessionStorage.newPadPassword;
+                        }
+
                         if (val) {
                             password = val;
                             Cryptpad.getFileSize(window.location.href, password, waitFor(function (e, size) {

www/common/toolbar3.js

@@ -832,11 +832,17 @@ MessengerUI, Messages) {
         return $spin;
     };
 
-    var createLimit = function (toolbar) {
+    var createLimit = function (toolbar, config) {
         var $limitIcon = $('<span>', {'class': 'fa fa-exclamation-triangle'});
         var $limit = toolbar.$userAdmin.find('.'+LIMIT_CLS).attr({
             'title': Messages.pinLimitReached
         }).append($limitIcon).hide();
+
+        var priv = config.metadataMgr.getPrivateData();
+        var origin = priv.origin;
+        var l = document.createElement("a");
+        l.href = origin;
+
         var todo = function (e, overLimit) {
             if (e) { return void console.error("Unable to get the pinned usage", e); }
             if (overLimit) {
@@ -845,7 +851,7 @@ MessengerUI, Messages) {
                     key = 'pinLimitReachedAlertNoAccounts';
                 }
                 $limit.show().click(function () {
-                    UI.alert(Messages._getKey(key, [encodeURIComponent(window.location.hostname)]), null, true);
+                    UI.alert(Messages._getKey(key, [encodeURIComponent(l.hostname)]), null, true);
                 });
             }
         };

www/common/translations/messages.de.json

@@ -565,7 +565,7 @@
     "download_step1": "Laden...",
     "download_step2": "Entschlüsselung...",
     "todo_title": "CryptTodo",
-    "todo_newTodoNamePlaceholder": "Beschreibe deine Aufgabe...",
+    "todo_newTodoNamePlaceholder": "Beschreibe deine Aufgabe…",
     "todo_newTodoNameTitle": "Diese Aufgabe zu deiner ToDo-Liste hinzufügen",
     "todo_markAsCompleteTitle": "Diese Aufgabe als erledigt markieren",
     "todo_markAsIncompleteTitle": "Diese Aufgabe als nicht erledigt markieren",
@@ -830,7 +830,7 @@
         "generic": {
             "more": "Erfahre mehr über die Nutzung von CryptPad, indem du unsere <a href=\"/faq.html\" target=\"_blank\">FAQ</a> liest",
             "share": "Benutze das Teilen-Menü (<span class=\"fa fa-share-alt\"></span>), um Links zu generieren, die Mitarbeiter zum Lesen oder Bearbeiten einladen",
-            "save": "Alle Änderungen werden automatisch synchronisiert. Du misst sie also nicht speichern"
+            "save": "Alle Änderungen werden automatisch synchronisiert. Du musst sie also nicht selbst speichern"
         },
         "text": {
             "formatting": "Du kannst die Werkzeugleiste anzeigen oder verbergen, indem du auf <span class=\"fa fa-caret-down\"></span> oder <span class=\"fa fa-caret-up\"></span> klickst",

www/common/translations/messages.json

@@ -1075,5 +1075,33 @@
     "share_withFriends": "Share",
     "notifications_dismiss": "Dismiss",
     "fm_info_sharedFolderHistory": "This is only the history of your shared folder: <b>{0}</b><br/>Your CryptDrive will stay in read-only mode while you navigate.",
-    "share_description": "Choose what you'd like to share and either get the link or send it directly to your CryptPad friends."
+    "share_description": "Choose what you'd like to share and either get the link or send it directly to your CryptPad friends.",
+    "supportPage": "Support",
+    "admin_cat_support": "Support",
+    "admin_supportInitHelp": "Your server is not yet configured to have a support mailbox. If you want a support mailbox to receive messages from your users, you should ask your server administrator to run the script located in \"./scripts/generate-admin-keys.js\", then store the public key in the \"config.js\" file and send you the private key.",
+    "admin_supportInitPrivate": "Your CryptPad instance is configured to use a support mailbox but your account doesn't have the correct private key to access it. Please use the following form to add or update the private key to your account.",
+    "admin_supportAddKey": "Add private key",
+    "admin_supportAddError": "Invalid private key",
+    "admin_supportInitTitle": "Support mailbox initialization",
+    "admin_supportInitHint": "You can configure a support mailbox in order to give users of your CryptPad instance a way to contact you securely if they have an issue with their account.",
+    "admin_supportListTitle": "Support mailbox",
+    "admin_supportListHint": "Here is the list of tickets sent by the users to the support mailbox. All the administrators can see the messages and the answers. A closed ticket cannot be reopened. You can only remove (hide) closed tickets, and the removed tickets are still visible by the other administrators.",
+    "support_disabledTitle": "Support is not enabled",
+    "support_disabledHint": "This CryptPad instance is not yet configured to use a support form.",
+    "support_cat_new": "New ticket",
+    "support_formTitle": "Ticket title",
+    "support_formHint": "This form can be used to create a new support ticket. Using this form, you can contact the administrators to solve issues or ask any question in a secure way. Please don't create a new ticket if you already have an open ticket about the same issue, but use reply button to provide more information.",
+    "support_formButton": "Send",
+    "support_formTitleError": "Error: title is empty",
+    "support_formContentError": "Error: content is empty",
+    "support_formMessage": "Type your message...",
+    "support_cat_tickets": "Existing tickets",
+    "support_listTitle": "Support tickets",
+    "support_listHint": "Here is the list of tickets sent to the administrators and their answers. A closed ticket cannot be re-opened, you have to make a new one. You can hide tickets that have been closed but they will still be visible by the administrators.",
+    "support_answer": "Reply",
+    "support_close": "Close the ticket",
+    "support_remove": "Remove the ticket",
+    "support_showData": "Show/hide user data",
+    "support_from": "<b>From:</b> {0}",
+    "support_closed": "This ticket has been closed"
 }

www/common/userObject.js

@@ -311,12 +311,12 @@ define([
         _getFiles[FILES_DATA] = function () {
             var ret = [];
             if (!files[FILES_DATA]) { return ret; }
-            return Object.keys(files[FILES_DATA]).map(Number);
+            return Object.keys(files[FILES_DATA]).map(Number).filter(Boolean);
         };
         _getFiles[SHARED_FOLDERS] = function () {
             var ret = [];
             if (!files[SHARED_FOLDERS]) { return ret; }
-            return Object.keys(files[SHARED_FOLDERS]).map(Number);
+            return Object.keys(files[SHARED_FOLDERS]).map(Number).filter(Boolean);
         };
         var getFiles = exp.getFiles = function (categories) {
             var ret = [];

www/drive/inner.js

@@ -2173,6 +2173,7 @@ define([
                 pathname: "/drive/",
                 friends: friends,
                 title: data.title,
+                password: data.password,
                 common: common,
                 hashes: {
                     editHash: parsed.hash
@@ -3510,6 +3511,7 @@ define([
                         friends: friends,
                         title: data.title,
                         common: common,
+                        password: data.password,
                         hashes: {
                             editHash: parsed.hash
                         }
@@ -3523,6 +3525,7 @@ define([
                         origin: APP.origin,
                         pathname: "/" + padType + "/",
                         friends: friends,
+                        password: data.password,
                         hashes: {
                             editHash: parsed.hash,
                             viewHash: roParsed.hash,

www/share/inner.js

@@ -42,6 +42,7 @@ define([
             var modal = f({
                 origin: origin,
                 pathname: pathname,
+                password: priv.password,
                 hashes: hashes,
                 common: common,
                 title: data.title,