banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix contact copy/add-to-group operations on search result (#1488862)

Browse Source
pull/50/merge
Aleksander Machniak 12 years ago
parent 5c421d9927
commit ff4a92c8e2
4 changed files with 79 additions and 51 deletions
Show Stats Download Patch File Download Diff File

1
CHANGELOG
Unescape Escape View File

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Fix contact copy/add-to-group operations on search result (#1488862)
- Use matching identity in MDN response (#1488864)
- Fix unwanted horizontal scrollbar in message preview header (#1488866)
- Fix handling of signatures on draft edit (#1488798)

88
program/js/app.js
Unescape Escape View File

@ -1386,8 +1386,8 @@ function rcube_webmail()
// over the folders
for (k in this.env.folder_coords) {
pos = this.env.folder_coords[k];
if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2){
if ((check = this.check_droptarget(k))) {
if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2) {
if (check = this.check_droptarget(k)) {
li = this.get_folder_li(k);
div = $(li.getElementsByTagName('div')[0]);
@ -1401,7 +1401,8 @@ function rcube_webmail()
rcmail.command('collapse-folder', rcmail.folder_auto_expand);
rcmail.drag_start(null);
}, 1000);
} else if (this.folder_auto_timer) {
}
else if (this.folder_auto_timer) {
clearTimeout(this.folder_auto_timer);
this.folder_auto_timer = null;
this.folder_auto_expand = null;
@ -1411,9 +1412,10 @@ function rcube_webmail()
this.env.folder_coords[k].on = 1;
this.env.last_folder_target = k;
layerclass = 'draglayer' + (check > 1 ? 'copy' : 'normal');
} else { // Clear target, otherwise drag end will trigger move into last valid droptarget
this.env.last_folder_target = null;
}
// Clear target, otherwise drag end will trigger move into last valid droptarget
else
this.env.last_folder_target = null;
}
else if (pos.on) {
$(this.get_folder_li(k)).removeClass('droptarget');
@ -1640,27 +1642,31 @@ function rcube_webmail()
this.check_droptarget = function(id)
{
var allow = false, copy = false;
if (this.task == 'mail')
allow = (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
else if (this.task == 'settings')
allow = (id != this.env.mailbox);
else if (this.task == 'addressbook') {
return (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual) ? 1 : 0;
if (this.task == 'settings')
return id != this.env.mailbox ? 1 : 0;
if (this.task == 'addressbook') {
if (id != this.env.source && this.env.contactfolders[id]) {
// droptarget is a group - contact add to group action
if (this.env.contactfolders[id].type == 'group') {
var target_abook = this.env.contactfolders[id].source;
allow = this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly;
copy = target_abook != this.env.source;
if (this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly) {
// search result may contain contacts from many sources
return (this.env.selection_sources.length > 1 || $.inArray(target_abook, this.env.selection_sources) == -1) ? 2 : 1;
}
}
else {
allow = !this.env.contactfolders[id].readonly;
copy = true;
// droptarget is a (writable) addressbook - contact copy action
else if (!this.env.contactfolders[id].readonly) {
// search result may contain contacts from many sources
return (this.env.selection_sources.length > 1 || $.inArray(id, this.env.selection_sources) == -1) ? 2 : 0;
}
}
}
return allow ? (copy ? 2 : 1) : 0;
return 0;
};
this.open_window = function(url, width, height)
@ -4082,19 +4088,24 @@ function rcube_webmail()
else if (this.env.contentframe)
this.show_contentframe(false);
// no source = search result, we'll need to detect if any of
// selected contacts are in writable addressbook to enable edit/delete
if (list.selection.length) {
// no source = search result, we'll need to detect if any of
// selected contacts are in writable addressbook to enable edit/delete
// we'll also need to know sources used in selection for copy
// and group-addmember operations (drag&drop)
this.env.selection_sources = [];
if (!source) {
for (n in list.selection) {
sid = String(list.selection[n]).replace(/^[^-]+-/, '');
if (sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly) {
writable = true;
break;
if (sid && this.env.address_sources[sid]) {
writable = writable || !this.env.address_sources[sid].readonly;
this.env.selection_sources.push(sid);
}
}
this.env.selection_sources = $.unique(this.env.selection_sources);
}
else {
this.env.selection_sources.push(this.env.source);
writable = !source.readonly;
}
}
@ -4245,22 +4256,35 @@ function rcube_webmail()
// copy a contact to the specified target (group or directory)
this.copy_contact = function(cid, to)
{
var n, dest = to.type == 'group' ? to.source : to.id,
source = this.env.source,
group = this.env.group ? this.env.group : '';
if (!cid)
cid = this.contact_list.get_selection().join(',');
if (to.type == 'group' && to.source == this.env.source)
this.group_member_change('add', cid, to.source, to.id);
else if (to.type == 'group' && !this.env.address_sources[to.source].readonly) {
var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
post_data = {_cid: cid, _source: this.env.source, _to: to.source, _togid: to.id,
_gid: (this.env.group ? this.env.group : '')};
if (!cid || !this.env.address_sources[dest] || this.env.address_sources[dest].readonly)
return;
this.http_post('copy', post_data, lock);
// search result may contain contacts from many sources, but if there is only one...
if (source == '' && this.env.selection_sources.length == 1)
source = this.env.selection_sources[0];
// tagret is a group
if (to.type == 'group') {
if (dest == source)
this.group_member_change('add', cid, dest, to.id);
else {
var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
post_data = {_cid: cid, _source: source, _to: dest, _togid: to.id, _gid: group};
this.http_post('copy', post_data, lock);
}
}
else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly) {
// target is an addressbook
else if (to.id != source) {
var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
post_data = {_cid: cid, _source: this.env.source, _to: to.id,
_gid: (this.env.group ? this.env.group : '')};
post_data = {_cid: cid, _source: source, _to: to.id, _gid: group};
this.http_post('copy', post_data, lock);
}

28
program/steps/addressbook/func.inc
Unescape Escape View File

@ -756,7 +756,7 @@ function rcmail_contact_key($row, $sort_col)
*
* @return array List of contact IDs per-source
*/
function rcmail_get_cids()
function rcmail_get_cids($filter = null)
{
// contact ID (or comma-separated list of IDs) is provided in two
// forms. If _source is an empty string then the ID is a string
@ -765,24 +765,25 @@ function rcmail_get_cids()
$cid = get_input_value('_cid', RCUBE_INPUT_GPC);
$source = (string) get_input_value('_source', RCUBE_INPUT_GPC);
if (is_array($cid)) {
return $cid;
}
if (!preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid)) {
return array();
}
$cid = explode(',', $cid);
$got_source = strlen($source);
$result = array();
$cid = explode(',', $cid);
$result = array();
// create per-source contact IDs array
foreach ($cid as $id) {
// if _source is not specified we'll find it from decoded ID
if (!$got_source) {
if ($sep = strrpos($id, '-')) {
$contact_id = substr($id, 0, $sep);
$source_id = substr($id, $sep+1);
if (strlen($source_id)) {
$result[(string)$source_id][] = $contact_id;
}
// get source from decoded ID
if ($sep = strrpos($id, '-')) {
$contact_id = substr($id, 0, $sep);
$source_id = substr($id, $sep+1);
if (strlen($source_id)) {
$result[(string)$source_id][] = $contact_id;
}
}
else {
@ -790,9 +791,10 @@ function rcmail_get_cids()
}
}
return $result;
return $filter !== null ? $result[$filter] : $result;
}
// register UI objects
$OUTPUT->add_handlers(array(
'directorylist' => 'rcmail_directory_list',

13
program/steps/addressbook/groups.inc
Unescape Escape View File

@ -20,7 +20,7 @@
*/
$source = get_input_value('_source', RCUBE_INPUT_GPC);
$CONTACTS = rcmail_contact_source($source, true);
$CONTACTS = rcmail_contact_source($source);
if ($CONTACTS->readonly || !$CONTACTS->groups) {
$OUTPUT->show_message('sourceisreadonly', 'warning');
@ -28,11 +28,11 @@ if ($CONTACTS->readonly || !$CONTACTS->groups) {
}
if ($RCMAIL->action == 'group-addmembers') {
if (($gid = get_input_value('_gid', RCUBE_INPUT_POST)) && ($ids = get_input_value('_cid', RCUBE_INPUT_POST))) {
if (($gid = get_input_value('_gid', RCUBE_INPUT_POST)) && ($ids = rcmail_get_cids($source))) {
$plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array('group_id' => $gid, 'ids' => $ids, 'source' => $source));
$CONTACTS->set_group($gid);
$num2add = count(explode(',', $plugin['ids']));
$num2add = count($plugin['ids']);
if (!$plugin['abort']) {
if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + $num2add > $maxnum)) {
@ -55,7 +55,7 @@ if ($RCMAIL->action == 'group-addmembers') {
}
else if ($RCMAIL->action == 'group-delmembers') {
if (($gid = get_input_value('_gid', RCUBE_INPUT_POST)) && ($ids = get_input_value('_cid', RCUBE_INPUT_POST))) {
if (($gid = get_input_value('_gid', RCUBE_INPUT_POST)) && ($ids = rcmail_get_cids($source))) {
$plugin = $RCMAIL->plugins->exec_hook('group_delmembers', array('group_id' => $gid, 'ids' => $ids, 'source' => $source));
if (!$plugin['abort'])
@ -63,10 +63,11 @@ else if ($RCMAIL->action == 'group-delmembers') {
else
$result = $plugin['result'];
if ($result){
if ($result) {
$OUTPUT->show_message('contactremovedfromgroup');
$OUTPUT->command('remove_group_contacts',array('source' => $source, 'gid' => $gid));
}else{
}
else {
$OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
}
}

Write Preview
Loading…
Cancel
Save