Ticket #1483863: logout_purge.patch

config/main.inc.php.dist

@@ -241 +241 @@
 $rcmail_config['dont_override'] = array();
 
 // list of configuration option names that need to be available in Javascript.
-$rcmail_config['javascript_config'] = array('read_when_deleted', 'flag_for_deletion');
+$rcmail_config['javascript_config'] = array('read_when_deleted', 'flag_for_deletion', 'logout_purge');
 
 // try to load host-specific configuration
 $rcmail_config['include_host_config'] = false;
@@ -283 +283 @@
 // default setting if preview pane is enabled
 $rcmail_config['preview_pane'] = FALSE;
 
+// Empty trash folder on logout
+$rcmail_config['logout_purge'] = FALSE;
+
 // don't let users set pagesize to more than this value if set
 $rcmail_config['max_pagesize'] = 200;
 

program/js/app.js

@@ -488 +488 @@
         break;
 
       case 'logout':
-        this.goto_url('logout', '', true);
-        break;      
+        this.logout();
+        break;
 
       // commands to switch task
       case 'mail':
@@ -1190 +1190 @@
   };
 
 
+  this.logout = function()
+    {
+      var ref = this;
+      var func = function() { ref.goto_url('logout', '', true); };
+
+      if (this.env.logout_purge)
+        {
+          var url = '_mbox=' + urlencode(this.env.trash_mailbox) + '&_reload=1';
+          this.set_busy(true, 'loading');
+          this.http_post('purge', url, true, func);
+        }
+      else
+        func();
+    }
+
+
   /*********************************************************/
   /*********     (message) list functionality      *********/
   /*********************************************************/
@@ -3379 +3395 @@
   
 
   // send a http request to the server
-  this.http_request = function(action, querystring, lock)
+  this.http_request = function(action, querystring, lock, oncomplete)
     {
     var request_obj = this.get_request_obj();
     querystring += (querystring ? '&' : '') + '_remote=1';
@@ -3399 +3415 @@
       var rcm = this;
       request_obj.__lock = lock ? true : false;
       request_obj.__action = action;
-      request_obj.onerror = function(o){ ref.http_error(o); };
-      request_obj.oncomplete = function(o){ ref.http_response(o); };
+      request_obj.onerror = function(o){ rcm.http_error(o); };
+      if (oncomplete && typeof(oncomplete) == 'function')
+        request_obj.oncomplete = function(o){ rcm.http_response(o); oncomplete(); };
+      else
+        request_obj.oncomplete = function(o){ rcm.http_response(o); };
       request_obj.GET(this.env.comm_path+'&_action='+action+'&'+querystring);
       }
     };
 
     // send a http POST request to the server
-    this.http_post = function(action, postdata, lock)
+    this.http_post = function(action, postdata, lock, oncomplete)
       {
       var request_obj;
       if (postdata && typeof(postdata) == 'object')
@@ -3426 +3445 @@
         request_obj.__lock = lock ? true : false;
         request_obj.__action = action;
         request_obj.onerror = function(o){ rcm.http_error(o); };
-        request_obj.oncomplete = function(o){ rcm.http_response(o); };
-        request_obj.POST(this.env.comm_path+'&_action='+action, postdata);
+        if (oncomplete && typeof(oncomplete) == 'function')
+          request_obj.oncomplete = function(o){ rcm.http_response(o); oncomplete(); };
+        else
+          request_obj.oncomplete = function(o){ rcm.http_response(o); };
+        request_obj.POST(this.env.comm_path+'&_action='+action, postdata);
+
+        return request_obj;
         }
       };
 

program/localization/en_US/labels.inc

@@ -250 +250 @@
 $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlsignature'] = 'HTML signature';
 $labels['previewpane'] = 'Show preview pane';
+$labels['logoutpurge'] = 'Empty trash folder on logout';
 
 $labels['autosavedraft']  = 'Automatically save draft';
 $labels['everynminutes']  = 'every $n minutes';

program/steps/settings/func.inc

@@ -195 +195 @@
                     $select_autosave->show($CONFIG['draft_autosave']));
     }
 
+  // trash purge on logout
+  if (!isset($no_override['logout_purge']))
+    {
+    $field_id = 'rcmfd_logout_purge';
+    $input_purge = new checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('logoutpurge')),
+                    $input_purge->show($CONFIG['logout_purge']?1:0));
+    }
+
   $out .= "\n</table>$form_end";
 
   return $out;  

program/steps/settings/save_prefs.inc

@@ -27 +27 @@
   'prefer_html'  => isset($_POST['_prefer_html']) ? TRUE : FALSE,
   'htmleditor'   => isset($_POST['_htmleditor']) ? TRUE : FALSE,
   'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
-  'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0
+  'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE,
+  'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
   );
 
 // don't override these parameters