Nicely handle server-side modification of script names (#1489412)

1 files changed, 14 insertions, 14 deletions

diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index 22a50ba4d..4e810b1ae 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -21,7 +21,7 @@ if (window.rcmail) {
       rcmail.add_element(tab, 'tabs');
     }
 
-    if (rcmail.env.task == 'mail' || rcmail.env.action.indexOf('plugin.managesieve') != -1) {
+    if (rcmail.env.task == 'mail' || rcmail.env.action.startsWith('plugin.managesieve')) {
       // Create layer for form tips
       if (!rcmail.env.framed) {
         rcmail.env.ms_tip_layer = $('<div id="managesieve-tip" class="popupmenu"></div>');
@@ -40,7 +40,7 @@ if (window.rcmail) {
     rcmail.register_command('plugin.managesieve-setact', function() { rcmail.managesieve_setact() });
     rcmail.register_command('plugin.managesieve-setget', function() { rcmail.managesieve_setget() });
 
-    if (rcmail.env.action == 'plugin.managesieve' || rcmail.env.action == 'plugin.managesieve-save') {
+    if (rcmail.env.action.startsWith('plugin.managesieve')) {
       if (rcmail.gui_objects.sieveform) {
         rcmail.enable_command('plugin.managesieve-save', true);
 
@@ -122,7 +122,7 @@ rcube_webmail.prototype.managesieve_del = function()
   var id = this.filters_list.get_single_selection();
   if (confirm(this.get_label('managesieve.filterdeleteconfirm'))) {
     var lock = this.set_busy(true, 'loading');
-    this.http_post('plugin.managesieve',
+    this.http_post('plugin.managesieve-action',
       '_act=delete&_fid='+this.filters_list.rows[id].uid, lock);
   }
 };
@@ -132,7 +132,7 @@ rcube_webmail.prototype.managesieve_act = function()
   var id = this.filters_list.get_single_selection(),
     lock = this.set_busy(true, 'loading');
 
-  this.http_post('plugin.managesieve',
+  this.http_post('plugin.managesieve-action',
     '_act=act&_fid='+this.filters_list.rows[id].uid, lock);
 };
 
@@ -150,7 +150,7 @@ rcube_webmail.prototype.managesieve_setselect = function(list)
   this.show_contentframe(false);
   this.filters_list.clear(true);
   this.enable_command('plugin.managesieve-setdel', list.rowcount > 1);
-  this.enable_command( 'plugin.managesieve-setact', 'plugin.managesieve-setget', true);
+  this.enable_command('plugin.managesieve-setact', 'plugin.managesieve-setget', true);
 
   var id = list.get_single_selection();
   if (id != null)
@@ -179,7 +179,7 @@ rcube_webmail.prototype.managesieve_list = function(script)
 {
   var lock = this.set_busy(true, 'loading');
 
-  this.http_post('plugin.managesieve', '_act=list&_set='+urlencode(script), lock);
+  this.http_post('plugin.managesieve-action', '_act=list&_set='+urlencode(script), lock);
 };
 
 // Script download request
@@ -188,7 +188,7 @@ rcube_webmail.prototype.managesieve_setget = function()
   var id = this.filtersets_list.get_single_selection(),
     script = this.env.filtersets[id];
 
-  location.href = this.env.comm_path+'&_action=plugin.managesieve&_act=setget&_set='+urlencode(script);
+  location.href = this.env.comm_path+'&_action=plugin.managesieve-action&_act=setget&_set='+urlencode(script);
 };
 
 // Set activate/deactivate request
@@ -199,7 +199,7 @@ rcube_webmail.prototype.managesieve_setact = function()
     script = this.env.filtersets[id],
     action = $('#rcmrow'+id).hasClass('disabled') ? 'setact' : 'deact';
 
-  this.http_post('plugin.managesieve', '_act='+action+'&_set='+urlencode(script), lock);
+  this.http_post('plugin.managesieve-action', '_act='+action+'&_set='+urlencode(script), lock);
 };
 
 // Set delete request
@@ -212,7 +212,7 @@ rcube_webmail.prototype.managesieve_setdel = function()
     lock = this.set_busy(true, 'loading'),
     script = this.env.filtersets[id];
 
-  this.http_post('plugin.managesieve', '_act=setdel&_set='+urlencode(script), lock);
+  this.http_post('plugin.managesieve-action', '_act=setdel&_set='+urlencode(script), lock);
 };
 
 // Set add request
@@ -224,7 +224,7 @@ rcube_webmail.prototype.managesieve_setadd = function()
   if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
     var lock = this.set_busy(true, 'loading');
     target = window.frames[this.env.contentframe];
-    target.location.href = this.env.comm_path+'&_action=plugin.managesieve&_framed=1&_newset=1&_unlock='+lock;
+    target.location.href = this.env.comm_path+'&_action=plugin.managesieve-action&_framed=1&_newset=1&_unlock='+lock;
   }
 };
 
@@ -384,7 +384,7 @@ rcube_webmail.prototype.load_managesieveframe = function(id)
   if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
     target = window.frames[this.env.contentframe];
     var msgid = this.set_busy(true, 'loading');
-    target.location.href = this.env.comm_path+'&_action=plugin.managesieve&_framed=1'
+    target.location.href = this.env.comm_path+'&_action=plugin.managesieve-action&_framed=1'
       +(has_id ? '&_fid='+id : '')+'&_unlock='+msgid;
   }
 };
@@ -405,7 +405,7 @@ rcube_webmail.prototype.managesieve_dragend = function(e)
       var lock = this.set_busy(true, 'loading');
 
       this.show_contentframe(false);
-      this.http_post('plugin.managesieve', '_act=move&_fid='+this.drag_filter
+      this.http_post('plugin.managesieve-action', '_act=move&_fid='+this.drag_filter
         +'&_to='+this.drag_filter_target, lock);
     }
     this.drag_active = false;
@@ -458,7 +458,7 @@ rcube_webmail.prototype.managesieve_save = function()
 // Operations on filters form
 rcube_webmail.prototype.managesieve_ruleadd = function(id)
 {
-  this.http_post('plugin.managesieve', '_act=ruleadd&_rid='+id);
+  this.http_post('plugin.managesieve-action', '_act=ruleadd&_rid='+id);
 };
 
 rcube_webmail.prototype.managesieve_rulefill = function(content, id, after)
@@ -497,7 +497,7 @@ rcube_webmail.prototype.managesieve_ruledel = function(id)
 
 rcube_webmail.prototype.managesieve_actionadd = function(id)
 {
-  this.http_post('plugin.managesieve', '_act=actionadd&_aid='+id);
+  this.http_post('plugin.managesieve-action', '_act=actionadd&_aid='+id);
 };
 
 rcube_webmail.prototype.managesieve_actionfill = function(content, id, after)