mailchimp_lists_user_sync is unsubscribing user $accounts that still have valid roles

I maintain a store where users can purchase roles that expire if they do not renew. However, unlike issue #630036: Automatic removal, my client would like them to stay on the email list even after expiration. Therefore we set our list preferences to allow this purchased role AND authenticated users to subscribe to the list. The problem is that the mailchimp_lists_user_sync doesn't check to see if a user still has a valid role. Instead, it checks to see if the removed role was in the allowable roles for the list (see code)

  if ($is_subscribed) {
    foreach ($removed_roles as $role_id => $role) {
      if (array_key_exists($role_id, $list->settings['roles'])) {
        // queue up for cron processing
        if ($list->settings['cron']) {
          $queue = DrupalQueue::get(MAILCHIMP_QUEUE_CRON);
          $queue->createQueue();
          $queue->createItem(array(
            'uid' => $account->uid,
            'list_id' => $list->id,
            'op' => 'remove',
          ));
        }
        // process immediately
        else {
          mailchimp_unsubscribe_user($list, $account->mail, FALSE, NULL, TRUE);
        }
      }
    }
  }

Instead of looping over the expired roles, the code should loop over the remaining roles and then only sending a request to remove if no valid roles are found.

This is major as we've already experienced a significant loss in our email list size as a result. Thankfully we keep weekly backups and will be able to restore a significant portion of this, but it's going to take a bit of time to make sure all their list preferences are in place!

Patch will be submitted in the next comment...