From 27f0c2723bf8a5efb5a588c2603fbb0a65f0453d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 09 Dec 2013 05:40:03 -0500
Subject: [PATCH] Nicely handle server-side modification of script names (#1489412)
---
plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 16 +++++++++++++---
plugins/managesieve/Changelog | 2 ++
plugins/managesieve/managesieve.js | 28 ++++++++++++++--------------
plugins/managesieve/managesieve.php | 1 +
4 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index b7b9ecf..a5a231b 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,3 +1,5 @@
+- Nicely handle server-side modification of script names (#1489412)
+
* version 7.1 [2013-11-22]
-----------------------------------------------------------
- lib/Net Sieve.php moved to Roundcube /lib directory
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index e0f6ead..4a375d3 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -132,6 +132,11 @@
// Get list of scripts
$list = $this->list_scripts();
+ // reset current script when entering filters UI (#1489412)
+ if ($this->rc->action == 'plugin.managesieve') {
+ $this->rc->session->remove('managesieve_current');
+ }
+
if (!empty($_GET['_set']) || !empty($_POST['_set'])) {
$script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
}
@@ -179,15 +184,20 @@
case SIEVE_ERROR_CONNECTION:
case SIEVE_ERROR_LOGIN:
$this->rc->output->show_message('managesieve.filterconnerror', 'error');
+ rcube::raise_error(array('code' => 403, 'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Unable to connect to managesieve on $host:$port"), true, false);
break;
+
default:
$this->rc->output->show_message('managesieve.filterunknownerror', 'error');
break;
}
- rcube::raise_error(array('code' => 403, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Unable to connect to managesieve on $host:$port"), true, false);
+ // reload interface in case of possible error when specified script wasn't found (#1489412)
+ if ($script_name !== null && !empty($list) && !in_array($script_name, $list)) {
+ $this->rc->output->command('reload', 500);
+ }
// to disable 'Add filter' button set env variable
$this->rc->output->set_env('filterconnerror', true);
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index 22a50ba..4e810b1 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -21,7 +21,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
{
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
// 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_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)
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 6970193..46c4e2e 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -41,6 +41,7 @@
// register actions
$this->register_action('plugin.managesieve', array($this, 'managesieve_actions'));
+ $this->register_action('plugin.managesieve-action', array($this, 'managesieve_actions'));
$this->register_action('plugin.managesieve-save', array($this, 'managesieve_save'));
if ($this->rc->task == 'settings') {
--
Gitblit v1.9.1