Allow remote resources "from my contacts" and"from trusted senders" mixed up

[Player701]

In the settings form, "from my contacts" is 3 and "from trusted senders" is 1:

roundcubemail/program/actions/settings/index.php

Lines 614 to 617 in 0d4a395

	$input->add($rcmail->gettext('never'), 0);
	$input->add($rcmail->gettext('frommycontacts'), 3);
	$input->add($rcmail->gettext('fromtrustedsenders'), 1);
	$input->add($rcmail->gettext('always'), 2);

However, in function check_safe, "from my contacts" is assumed to be 1 and "from trusted senders" is assumed to be 3. This creates confusing behavior.

roundcubemail/program/actions/mail/index.php

Lines 866 to 879 in 766189f

	switch ($show_images) {
	case 1: // all my contacts
	case 3: // trusted senders only
	if (!empty($message->sender['mailto'])) {
	$type = rcube_addressbook::TYPE_TRUSTED_SENDER;
	if ($show_images == 1) {
	$type |= rcube_addressbook::TYPE_RECIPIENT | rcube_addressbook::TYPE_WRITEABLE;
	}
	if ($rcmail->contact_exists($message->sender['mailto'], $type)) {
	$message->set_safe(true);
	}
	}

In addition to the above, it appears that a contact cannot be added to the trusted senders list if the same address is already present in the main addressbook (it says that the address already exists). This should probably be resolved somehow (I can file a separate issue on this matter, if necessary).

[alecpl]

Fixed.