Delete pads after 3 months of inactivity

www/common/common-interface.js

@@ -555,8 +555,11 @@ define([
             $loading = $('#' + LOADING); //.show();
             $loading.css('display', '');
             $loading.removeClass('cp-loading-hidden');
+            $('.cp-loading-spinner-container').show();
             if (loadingText) {
                 $('#' + LOADING).find('p').text(loadingText);
+            } else {
+                $('#' + LOADING).find('p').text('');
             }
             $container = $loading.find('.cp-loading-container');
         } else {
@@ -612,7 +615,10 @@ define([
         if (exitable) {
             $(window).focus();
             $(window).keydown(function (e) {
-                if (e.which === 27) { $('#' + LOADING).hide(); }
+                if (e.which === 27) {
+                    $('#' + LOADING).hide();
+                    if (typeof(exitable) === "function") { exitable(); }
+                }
             });
         }
     };

www/common/sframe-app-framework.js

@@ -426,15 +426,7 @@ define([
             common.getSframeChannel().onReady(waitFor());
         }).nThen(function (waitFor) {
             Test.registerInner(common.getSframeChannel());
-            if (!AppConfig.displayCreationScreen) { return; }
-            var priv = common.getMetadataMgr().getPrivateData();
-            if (priv.isNewFile) {
-                var c = (priv.settings.general && priv.settings.general.creation) || {};
-                if (c.skip && !priv.forceCreationScreen) {
-                    return void common.createPad(c, waitFor());
-                }
-                common.getPadCreationScreen(c, waitFor());
-            }
+            common.handleNewFile(waitFor);
         }).nThen(function (waitFor) {
             cpNfInner = common.startRealtime({
                 // really basic operational transform

www/common/sframe-common-outer.js

@@ -187,7 +187,7 @@ define([
                             upgradeURL: Cryptpad.upgradeURL
                         },
                         isNewFile: isNewFile,
-                        isDeleted: window.location.hash.length > 0,
+                        isDeleted: isNewFile && window.location.hash.length > 0,
                         forceCreationScreen: forceCreationScreen
                     };
                     for (var k in additionalPriv) { metaObj.priv[k] = additionalPriv[k]; }
@@ -666,8 +666,9 @@ define([
             Utils.Feedback.reportAppUsage();
 
             if (!realtime) { return; }
-            if (isNewFile && Utils.LocalStore.isLoggedIn()
-                && AppConfig.displayCreationScreen && cfg.useCreationScreen) { return; }
+            if (isNewFile && cfg.useCreationScreen) { return; }
+            //if (isNewFile && Utils.LocalStore.isLoggedIn()
+            //    && AppConfig.displayCreationScreen && cfg.useCreationScreen) { return; }
 
             startRealtime();
         });

www/common/sframe-common.js

@@ -167,6 +167,30 @@ define([
     };
 
     // Store
+    funcs.handleNewFile = function (waitFor) {
+        var priv = ctx.metadataMgr.getPrivateData();
+        if (priv.isNewFile) {
+            var c = (priv.settings.general && priv.settings.general.creation) || {};
+            var skip = !AppConfig.displayCreationScreen || (c.skip && !priv.forceCreationScreen);
+            // If this is a new file but we have a hash in the URL and pad creation screen is
+            // not displayed, then display an error...
+            if (priv.isDeleted && (!funcs.isLoggedIn() || skip)) {
+                UI.errorLoadingScreen(Messages.inactiveError, false, function () {
+                    UI.addLoadingScreen();
+                    return void funcs.createPad({}, waitFor());
+                });
+                return;
+            }
+            // Otherwise, if we don't display the screen, it means it is not a deleted pad
+            // so we can continue and start realtime...
+            if (!funcs.isLoggedIn() || skip) {
+                return void funcs.createPad(c, waitFor());
+            }
+            // If we display the pad creation screen, it will handle deleted pads directly
+            console.log('here');
+            funcs.getPadCreationScreen(c, waitFor());
+        }
+    };
     funcs.createPad = function (cfg, cb) {
         ctx.sframeChan.query("Q_CREATE_PAD", {
             owned: cfg.owned,

www/common/toolbar3.js

@@ -593,7 +593,7 @@ define([
     };
 
     var createUnpinnedWarning0 = function (toolbar, config) {
-        if (true) { return; } // stub this call since it won't make it into the next release
+        //if (true) { return; } // stub this call since it won't make it into the next release
         if (Common.isLoggedIn()) { return; }
         var pd = config.metadataMgr.getPrivateData();
         var o = pd.origin;