- Fixed issues related to creating contacts in source which isn't currently...

alecpl

2011-07-06 1a3c911d925ae0dd19c35c29f8f1a0c164015a69

- Fixed issues related to creating contacts in source which isn't currently selected (#1487990)

 program/js/app.js

@@ -637,7 +637,7 @@
          }
          // contacts/identities
          else {
            //
            // reload form
            if (props == 'reload') {
              form.action += '?_reload=1';
            }
@@ -647,7 +647,7 @@
              break;
            }
            else if (this.task == 'settings' && (this.env.identities_level % 2) == 0  &&
              (input = $("input[name='_email']", form)) && input.length&& !rcube_check_email(input.val())
              (input = $("input[name='_email']", form)) && input.length && !rcube_check_email(input.val())
            ) {
              alert(this.get_label('noemailwarning'));
              input.focus();
@@ -657,6 +657,10 @@
            // clear empty input fields
            $('input.placeholder').each(function(){ if (this.value == this._placeholder) this.value = ''; });
          }

          // add selected source (on the list)
          if (parent.rcmail && parent.rcmail.env.source)
            form.action = this.add_url(form.action, '_orig_source', parent.rcmail.env.source);

          form.submit();
        }
@@ -3803,6 +3807,13 @@
      add_url = '&_framed=1';
      target = window.frames[this.env.contentframe];
      this.show_contentframe(true);

      // load dummy content
      if (!cid) {
        // unselect selected row(s)
        this.contact_list.clear_selection();
        this.enable_command('delete', 'compose', false);
      }
    }
    else if (framed)
      return false;

 program/steps/addressbook/save.inc

@@ -216,6 +216,8 @@

// insert a new contact
else {
  $source = get_input_value('_source', RCUBE_INPUT_GPC);

  // show notice if existing contacts with same e-mail are found
  $existing = false;
  foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) {
@@ -226,7 +228,7 @@
  }

  $plugin = $RCMAIL->plugins->exec_hook('contact_create', array(
    'record' => $a_record, 'source' => get_input_value('_source', RCUBE_INPUT_GPC)));
    'record' => $a_record, 'source' => $source));
  $a_record = $plugin['record'];

  // insert record and send response
@@ -235,11 +237,11 @@
  else
    $insert_id = $plugin['result'];


  if ($insert_id) {
    // add new contact to the specified group
    if ($CONTACTS->groups && $CONTACTS->group_id) {
      $plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array('group_id' => $CONTACTS->group_id, 'ids' => $insert_id, 'source' => $source));
      $plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array(
        'group_id' => $CONTACTS->group_id, 'ids' => $insert_id, 'source' => $source));

      if (!$plugin['abort']) {
        if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + 1 > $maxnum))
@@ -249,16 +251,25 @@
      }
    }

    // add contact row or jump to the page where it should appear
    $CONTACTS->reset();
    $result = $CONTACTS->search($CONTACTS->primary_key, $insert_id);
    // Name of the addressbook already selected on the list
    $orig_source = get_input_value('_orig_source', RCUBE_INPUT_GPC);

    rcmail_js_contacts_list($result, 'parent.');
    $OUTPUT->command('parent.contact_list.select', html_identifier($insert_id));
    if ((string)$source === (string)$orig_source) {
      // add contact row or jump to the page where it should appear
      $CONTACTS->reset();
      $result = $CONTACTS->search($CONTACTS->primary_key, $insert_id);

    // update record count display
    $CONTACTS->reset();
    $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text());
      rcmail_js_contacts_list($result, 'parent.');
      $OUTPUT->command('parent.contact_list.select', html_identifier($insert_id));

      // update record count display
      $CONTACTS->reset();
      $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text());
    }
    else {
      // re-set iframe
      $OUTPUT->command('parent.show_contentframe');
    }

    // show confirmation
    $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);