CS fixes

6 files changed, 471 insertions, 421 deletions

diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index b5f51d883..f7f0c7100 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -5,7 +5,7 @@
  | program/steps/addressbook/edit.inc                                    |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2007, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -169,37 +169,56 @@ function rcmail_contact_editform($attrib)
 
 function rcmail_upload_photo_form($attrib)
 {
-  global $RCMAIL, $OUTPUT;
-
-  // set defaults
-  $attrib += array('id' => 'rcmUploadform', 'buttons' => 'yes');
-
-  // find max filesize value
-  $max_filesize = parse_bytes(ini_get('upload_max_filesize'));
-  $max_postsize = parse_bytes(ini_get('post_max_size'));
-  if ($max_postsize && $max_postsize < $max_filesize)
-    $max_filesize = $max_postsize;
-  $max_filesize = $RCMAIL->show_bytes($max_filesize);
-
-  $hidden = new html_hiddenfield(array('name' => '_cid', 'value' => $GLOBALS['cid']));
-  $input = new html_inputfield(array('type' => 'file', 'name' => '_photo', 'size' => $attrib['size']));
-  $button = new html_inputfield(array('type' => 'button'));
-
-  $out = html::div($attrib,
-    $OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
-      $hidden->show() .
-      html::div(null, $input->show()) .
-      html::div('hint', $RCMAIL->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
-      (rcube_utils::get_boolean($attrib['buttons']) ? html::div('buttons',
-        $button->show($RCMAIL->gettext('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
-        $button->show($RCMAIL->gettext('upload'), array('class' => 'button mainaction', 'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('upload-photo', this.form)"))
-      ) : '')
-    )
-  );
-
-  $OUTPUT->add_label('addphoto','replacephoto');
-  $OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
-  return $out;
+    global $RCMAIL, $OUTPUT;
+
+    // set defaults
+    $attrib += array('id' => 'rcmUploadform', 'buttons' => 'yes');
+
+    // find max filesize value
+    $max_filesize = parse_bytes(ini_get('upload_max_filesize'));
+    $max_postsize = parse_bytes(ini_get('post_max_size'));
+
+    if ($max_postsize && $max_postsize < $max_filesize) {
+        $max_filesize = $max_postsize;
+    }
+    $max_filesize = $RCMAIL->show_bytes($max_filesize);
+
+    $hidden = new html_hiddenfield(array('name' => '_cid', 'value' => $GLOBALS['cid']));
+    $input  = new html_inputfield(array('type' => 'file', 'name' => '_photo', 'size' => $attrib['size']));
+    $button = new html_inputfield(array('type' => 'button'));
+
+    $content = $hidden->show() . html::div(null, $input->show())
+        . html::div('hint', $RCMAIL->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))));
+
+    if (rcube_utils::get_boolean($attrib['buttons'])) {
+        $content .= html::div('buttons',
+            $button->show($RCMAIL->gettext('close'), array(
+                'class'   => 'button',
+                'onclick' => "$('#$attrib[id]').hide()"
+            ))
+            . ' ' .
+            $button->show($RCMAIL->gettext('upload'), array(
+                'class'   => 'button mainaction',
+                'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('upload-photo', this.form)"
+            ))
+        );
+    }
+
+    $out = html::div($attrib,
+        $OUTPUT->form_tag(array(
+                'id'      => $attrib['id'] . 'Frm',
+                'name'    => 'uploadform',
+                'method'  => 'post',
+                'enctype' => 'multipart/form-data'
+            ),
+            $content
+        )
+    );
+
+    $OUTPUT->add_label('addphoto','replacephoto');
+    $OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
+
+    return $out;
 }
 
 // similar function as in /steps/settings/edit_identity.inc
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index db21be290..8be721c0b 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -5,7 +5,7 @@
  | program/steps/addressbook/func.inc                                    |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,37 +23,37 @@ $SEARCH_MODS_DEFAULT = array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1
 
 // general definition of contact coltypes
 $CONTACT_COLTYPES = array(
-  'name'         => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('name'), 'category' => 'main'),
-  'firstname'    => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('firstname'), 'category' => 'main'),
-  'surname'      => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('surname'), 'category' => 'main'),
-  'email'        => array('type' => 'text', 'size' => 40, 'maxlength' => 254, 'label' => $RCMAIL->gettext('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'),
-  'middlename'   => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('middlename'), 'category' => 'main'),
-  'prefix'       => array('type' => 'text', 'size' => 8,  'maxlength' => 20, 'limit' => 1, 'label' => $RCMAIL->gettext('nameprefix'), 'category' => 'main'),
-  'suffix'       => array('type' => 'text', 'size' => 8,  'maxlength' => 20, 'limit' => 1, 'label' => $RCMAIL->gettext('namesuffix'), 'category' => 'main'),
-  'nickname'     => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('nickname'), 'category' => 'main'),
-  'jobtitle'     => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('jobtitle'), 'category' => 'main'),
-  'organization' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('organization'), 'category' => 'main'),
-  'department'   => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('department'), 'category' => 'main'),
-  'gender'       => array('type' => 'select', 'limit' => 1, 'label' => $RCMAIL->gettext('gender'), 'options' => array('male' => $RCMAIL->gettext('male'), 'female' => $RCMAIL->gettext('female')), 'category' => 'personal'),
-  'maidenname'   => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('maidenname'), 'category' => 'personal'),
-  'phone'        => array('type' => 'text', 'size' => 40, 'maxlength' => 20, 'label' => $RCMAIL->gettext('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other'), 'category' => 'main'),
-  'address'      => array('type' => 'composite', 'label' => $RCMAIL->gettext('address'), 'subtypes' => array('home','work','other'), 'childs' => array(
-    'street'     => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('street'), 'category' => 'main'),
-    'locality'   => array('type' => 'text', 'size' => 28, 'maxlength' => 50, 'label' => $RCMAIL->gettext('locality'), 'category' => 'main'),
-    'zipcode'    => array('type' => 'text', 'size' => 8,  'maxlength' => 15, 'label' => $RCMAIL->gettext('zipcode'), 'category' => 'main'),
-    'region'     => array('type' => 'text', 'size' => 12, 'maxlength' => 50, 'label' => $RCMAIL->gettext('region'), 'category' => 'main'),
-    'country'    => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('country'), 'category' => 'main'),
-  ), 'category' => 'main'),
-  'birthday'     => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => $RCMAIL->gettext('birthday'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
-  'anniversary'  => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => $RCMAIL->gettext('anniversary'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
-  'website'      => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('website'), 'subtypes' => array('homepage','work','blog','profile','other'), 'category' => 'main'),
-  'im'           => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('instantmessenger'), 'subtypes' => array('aim','icq','msn','yahoo','jabber','skype','other'), 'category' => 'main'),
-  'notes'        => array('type' => 'textarea', 'size' => 40, 'rows' => 15, 'maxlength' => 500, 'label' => $RCMAIL->gettext('notes'), 'limit' => 1),
-  'photo'        => array('type' => 'image', 'limit' => 1, 'category' => 'main'),
-  'assistant'    => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('assistant'), 'category' => 'personal'),
-  'manager'      => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('manager'), 'category' => 'personal'),
-  'spouse'       => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('spouse'), 'category' => 'personal'),
-  // TODO: define fields for vcards like GEO, KEY
+    'name'         => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('name'), 'category' => 'main'),
+    'firstname'    => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('firstname'), 'category' => 'main'),
+    'surname'      => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('surname'), 'category' => 'main'),
+    'email'        => array('type' => 'text', 'size' => 40, 'maxlength' => 254, 'label' => $RCMAIL->gettext('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'),
+    'middlename'   => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('middlename'), 'category' => 'main'),
+    'prefix'       => array('type' => 'text', 'size' => 8,  'maxlength' => 20, 'limit' => 1, 'label' => $RCMAIL->gettext('nameprefix'), 'category' => 'main'),
+    'suffix'       => array('type' => 'text', 'size' => 8,  'maxlength' => 20, 'limit' => 1, 'label' => $RCMAIL->gettext('namesuffix'), 'category' => 'main'),
+    'nickname'     => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('nickname'), 'category' => 'main'),
+    'jobtitle'     => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('jobtitle'), 'category' => 'main'),
+    'organization' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('organization'), 'category' => 'main'),
+    'department'   => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('department'), 'category' => 'main'),
+    'gender'       => array('type' => 'select', 'limit' => 1, 'label' => $RCMAIL->gettext('gender'), 'options' => array('male' => $RCMAIL->gettext('male'), 'female' => $RCMAIL->gettext('female')), 'category' => 'personal'),
+    'maidenname'   => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('maidenname'), 'category' => 'personal'),
+    'phone'        => array('type' => 'text', 'size' => 40, 'maxlength' => 20, 'label' => $RCMAIL->gettext('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other'), 'category' => 'main'),
+    'address'      => array('type' => 'composite', 'label' => $RCMAIL->gettext('address'), 'subtypes' => array('home','work','other'), 'childs' => array(
+        'street'     => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('street'), 'category' => 'main'),
+        'locality'   => array('type' => 'text', 'size' => 28, 'maxlength' => 50, 'label' => $RCMAIL->gettext('locality'), 'category' => 'main'),
+        'zipcode'    => array('type' => 'text', 'size' => 8,  'maxlength' => 15, 'label' => $RCMAIL->gettext('zipcode'), 'category' => 'main'),
+        'region'     => array('type' => 'text', 'size' => 12, 'maxlength' => 50, 'label' => $RCMAIL->gettext('region'), 'category' => 'main'),
+        'country'    => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('country'), 'category' => 'main'),
+        ), 'category' => 'main'),
+    'birthday'     => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => $RCMAIL->gettext('birthday'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
+    'anniversary'  => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => $RCMAIL->gettext('anniversary'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
+    'website'      => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('website'), 'subtypes' => array('homepage','work','blog','profile','other'), 'category' => 'main'),
+    'im'           => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('instantmessenger'), 'subtypes' => array('aim','icq','msn','yahoo','jabber','skype','other'), 'category' => 'main'),
+    'notes'        => array('type' => 'textarea', 'size' => 40, 'rows' => 15, 'maxlength' => 500, 'label' => $RCMAIL->gettext('notes'), 'limit' => 1),
+    'photo'        => array('type' => 'image', 'limit' => 1, 'category' => 'main'),
+    'assistant'    => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('assistant'), 'category' => 'personal'),
+    'manager'      => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('manager'), 'category' => 'personal'),
+    'spouse'       => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('spouse'), 'category' => 'personal'),
+    // TODO: define fields for vcards like GEO, KEY
 );
 
 $PAGE_SIZE = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));
diff --git a/program/steps/addressbook/groups.inc b/program/steps/addressbook/groups.inc
index 900e7ff9f..aef93f2c7 100644
--- a/program/steps/addressbook/groups.inc
+++ b/program/steps/addressbook/groups.inc
@@ -5,7 +5,7 @@
  | program/steps/addressbook/groups.inc                                  |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2010, The Roundcube Dev Team                            |
+ | Copyright (C) 2010-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -19,117 +19,136 @@
  +-----------------------------------------------------------------------+
 */
 
-$source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
+$source   = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
 $CONTACTS = rcmail_contact_source($source);
 
 if ($CONTACTS->readonly || !$CONTACTS->groups) {
-  $OUTPUT->show_message('sourceisreadonly', 'warning');
-  $OUTPUT->send();
+    $OUTPUT->show_message('sourceisreadonly', 'warning');
+    $OUTPUT->send();
 }
 
 if ($RCMAIL->action == 'group-addmembers') {
-  if (($gid = rcube_utils::get_input_value('_gid', rcube_utils::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($plugin['ids']);
-
-    if (!$plugin['abort']) {
-      if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + $num2add > $maxnum)) {
-        $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
-        $OUTPUT->send();
-      }
-      $result = $CONTACTS->add_to_group($gid, $plugin['ids']);
+    if (($gid = rcube_utils::get_input_value('_gid', rcube_utils::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($plugin['ids']);
+
+        if (!$plugin['abort']) {
+            if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + $num2add > $maxnum)) {
+                $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
+                $OUTPUT->send();
+            }
+
+            $result = $CONTACTS->add_to_group($gid, $plugin['ids']);
+        }
+        else {
+            $result = $plugin['result'];
+        }
+
+        if ($result)
+            $OUTPUT->show_message('contactaddedtogroup');
+        else if ($plugin['abort'] || $CONTACTS->get_error())
+            $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
+        else
+            $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'nogroupassignmentschanged');
     }
-    else {
-      $result = $plugin['result'];
-    }
-
-    if ($result)
-      $OUTPUT->show_message('contactaddedtogroup');
-    else if ($plugin['abort'] || $CONTACTS->get_error())
-      $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
-    else
-      $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'nogroupassignmentschanged');
-  }
 }
-
 else if ($RCMAIL->action == 'group-delmembers') {
-  if (($gid = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_POST)) && ($ids = rcmail_get_cids($source))) {
-    $plugin = $RCMAIL->plugins->exec_hook('group_delmembers', array('group_id' => $gid, 'ids' => $ids, 'source' => $source));
+    if (($gid = rcube_utils::get_input_value('_gid', rcube_utils::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'])
+            $result = $CONTACTS->remove_from_group($gid, $plugin['ids']);
+        else
+            $result = $plugin['result'];
+
+        if ($result) {
+            $OUTPUT->show_message('contactremovedfromgroup');
+            $OUTPUT->command('remove_group_contacts',array('source' => $source, 'gid' => $gid));
+        }
+        else {
+            $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
+        }
+    }
+}
+else if ($RCMAIL->action == 'group-create') {
+    if ($name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true))) {
+        $plugin = $RCMAIL->plugins->exec_hook('group_create', array(
+            'name'   => $name,
+            'source' => $source,
+        ));
+
+        if (!$plugin['abort'])
+            $created = $CONTACTS->create_group($plugin['name']);
+        else
+            $created = $plugin['result'];
+    }
 
-    if (!$plugin['abort'])
-      $result = $CONTACTS->remove_from_group($gid, $plugin['ids']);
-    else
-      $result = $plugin['result'];
+    if ($created && $OUTPUT->ajax_call) {
+        $created['name'] = rcube::Q($created['name']);
 
-    if ($result) {
-      $OUTPUT->show_message('contactremovedfromgroup');
-      $OUTPUT->command('remove_group_contacts',array('source' => $source, 'gid' => $gid));
+        $OUTPUT->show_message('groupcreated', 'confirmation');
+        $OUTPUT->command('insert_contact_group', array('source' => $source) + $created);
     }
-    else {
-      $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
+    else if (!$created) {
+        $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
     }
-  }
-}
-
-else if ($RCMAIL->action == 'group-create') {
-  if ($name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true))) {
-    $plugin = $RCMAIL->plugins->exec_hook('group_create', array('name' => $name, 'source' => $source));
-
-    if (!$plugin['abort'])
-      $created = $CONTACTS->create_group($plugin['name']);
-    else
-      $created = $plugin['result'];
-  }
-
-  if ($created && $OUTPUT->ajax_call) {
-    $created['name'] = rcube::Q($created['name']);
-    $OUTPUT->show_message('groupcreated', 'confirmation');
-    $OUTPUT->command('insert_contact_group', array('source' => $source) + $created);
-  }
-  else if (!$created) {
-    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
-  }
 }
-
 else if ($RCMAIL->action == 'group-rename') {
-  if (($gid = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_POST)) && ($name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true)))) {
-    $plugin = $RCMAIL->plugins->exec_hook('group_rename', array('group_id' => $gid, 'name' => $name, 'source' => $source));
-
-    if (!$plugin['abort'])
-      $newname = $CONTACTS->rename_group($gid, $plugin['name'], $newgid);
-    else
-      $newname = $plugin['result'];
-  }
-
-  if ($newname && $OUTPUT->ajax_call) {
-    $OUTPUT->show_message('grouprenamed', 'confirmation');
-    $OUTPUT->command('update_contact_group', array(
-      'source' => $source, 'id' => $gid, 'name' => rcube::Q($newname), 'newid' => $newgid));
-  }
-  else if (!$newname)
-    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
-}
+    if (($gid = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_POST))
+        && ($name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true)))
+    ) {
+        $plugin = $RCMAIL->plugins->exec_hook('group_rename', array(
+            'group_id' => $gid,
+            'name'     => $name,
+            'source'   => $source,
+        ));
+
+        if (!$plugin['abort'])
+            $newname = $CONTACTS->rename_group($gid, $plugin['name'], $newgid);
+        else
+            $newname = $plugin['result'];
+    }
 
+    if ($newname && $OUTPUT->ajax_call) {
+        $OUTPUT->show_message('grouprenamed', 'confirmation');
+        $OUTPUT->command('update_contact_group', array(
+            'source' => $source, 'id' => $gid, 'name' => rcube::Q($newname), 'newid' => $newgid));
+    }
+    else if (!$newname) {
+        $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
+    }
+}
 else if ($RCMAIL->action == 'group-delete') {
-  if ($gid = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_POST)) {
-    $plugin = $RCMAIL->plugins->exec_hook('group_delete', array('group_id' => $gid, 'source' => $source));
-
-    if (!$plugin['abort'])
-      $deleted = $CONTACTS->delete_group($gid);
-    else
-      $deleted = $plugin['result'];
-  }
-
-  if ($deleted) {
-    $OUTPUT->show_message('groupdeleted', 'confirmation');
-    $OUTPUT->command('remove_group_item', array('source' => $source, 'id' => $gid));
-  }
-  else
-    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
+    if ($gid = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_POST)) {
+        $plugin = $RCMAIL->plugins->exec_hook('group_delete', array(
+            'group_id' => $gid,
+            'source'   => $source,
+        ));
+
+        if (!$plugin['abort'])
+            $deleted = $CONTACTS->delete_group($gid);
+        else
+            $deleted = $plugin['result'];
+    }
+
+    if ($deleted) {
+        $OUTPUT->show_message('groupdeleted', 'confirmation');
+        $OUTPUT->command('remove_group_item', array('source' => $source, 'id' => $gid));
+    }
+    else {
+        $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
+    }
 }
 
 // send response
 $OUTPUT->send();
-
diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc
index c56ddf8f2..600ba8301 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -5,7 +5,7 @@
  | program/steps/addressbook/import.inc                                  |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2009, The Roundcube Dev Team                       |
+ | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -25,69 +25,70 @@
  */
 function rcmail_import_form($attrib)
 {
-  global $RCMAIL, $OUTPUT;
-  $target = rcube_utils::get_input_value('_target', rcube_utils::INPUT_GPC);
-
-  $attrib += array('id' => "rcmImportForm");
-
-  $writable_books = $RCMAIL->get_address_sources(true, true);
-
-  $upload = new html_inputfield(array(
-    'type' => 'file',
-    'name' => '_file[]',
-    'id' => 'rcmimportfile',
-    'size' => 40,
-    'multiple' => 'multiple',
-  ));
-  $form = html::p(null, html::label('rcmimportfile', $RCMAIL->gettext('importfromfile')) . $upload->show());
-  $table = new html_table(array('cols' => 2));
-
-  // addressbook selector
-  if (count($writable_books) > 1) {
-    $select = new html_select(array('name' => '_target', 'id' => 'rcmimporttarget', 'is_escaped' => true));
-
-    foreach ($writable_books as $book)
-        $select->add($book['name'], $book['id']);
-
-    $table->add('title', html::label('rcmimporttarget', $RCMAIL->gettext('importtarget')));
-    $table->add(null, $select->show($target));
-  }
-  else {
-    $abook = new html_hiddenfield(array('name' => '_target', 'value' => key($writable_books)));
-    $form .= $abook->show();
-  }
-
-  // selector for group import options
-  if (count($writable_books) >= 1 || $writable_books[0]->groups) {
-    $select = new html_select(array('name' => '_groups', 'id' => 'rcmimportgroups', 'is_escaped' => true));
-    $select->add($RCMAIL->gettext('none'), '0');
-    $select->add($RCMAIL->gettext('importgroupsall'), '1');
-    $select->add($RCMAIL->gettext('importgroupsexisting'), '2');
-
-    $table->add('title', html::label('rcmimportgroups', $RCMAIL->gettext('importgroups')));
-    $table->add(null, $select->show(rcube_utils::get_input_value('_groups', rcube_utils::INPUT_GPC)));
-  }
-
-  // checkbox to replace the entire address book
-  $check_replace = new html_checkbox(array('name' => '_replace', 'value' => 1, 'id' => 'rcmimportreplace'));
-  $table->add('title', html::label('rcmimportreplace', $RCMAIL->gettext('importreplace')));
-  $table->add(null, $check_replace->show(rcube_utils::get_input_value('_replace', rcube_utils::INPUT_GPC)));
-
-  $form .= $table->show(array('id' => null) + $attrib);
-
-  $OUTPUT->set_env('writable_source', !empty($writable_books));
-  $OUTPUT->add_label('selectimportfile','importwait');
-  $OUTPUT->add_gui_object('importform', $attrib['id']);
-
-  $out = html::p(null, rcube::Q($RCMAIL->gettext('importdesc'), 'show'));
-
-  $out .= $OUTPUT->form_tag(array(
-      'action' => $RCMAIL->url('import'),
-      'method' => 'post',
-      'enctype' => 'multipart/form-data') + $attrib,
-    $form);
-
-  return $out;
+    global $RCMAIL, $OUTPUT;
+
+    $target = rcube_utils::get_input_value('_target', rcube_utils::INPUT_GPC);
+
+    $attrib += array('id' => "rcmImportForm");
+
+    $writable_books = $RCMAIL->get_address_sources(true, true);
+
+    $upload = new html_inputfield(array(
+        'type'     => 'file',
+        'name'     => '_file[]',
+        'id'       => 'rcmimportfile',
+        'size'     => 40,
+        'multiple' => 'multiple',
+    ));
+    $form  = html::p(null, html::label('rcmimportfile', $RCMAIL->gettext('importfromfile')) . $upload->show());
+    $table = new html_table(array('cols' => 2));
+
+    // addressbook selector
+    if (count($writable_books) > 1) {
+        $select = new html_select(array('name' => '_target', 'id' => 'rcmimporttarget', 'is_escaped' => true));
+
+        foreach ($writable_books as $book) {
+            $select->add($book['name'], $book['id']);
+        }
+
+        $table->add('title', html::label('rcmimporttarget', $RCMAIL->gettext('importtarget')));
+        $table->add(null, $select->show($target));
+    }
+    else {
+        $abook = new html_hiddenfield(array('name' => '_target', 'value' => key($writable_books)));
+        $form .= $abook->show();
+    }
+
+    // selector for group import options
+    if (count($writable_books) >= 1 || $writable_books[0]->groups) {
+        $select = new html_select(array('name' => '_groups', 'id' => 'rcmimportgroups', 'is_escaped' => true));
+        $select->add($RCMAIL->gettext('none'), '0');
+        $select->add($RCMAIL->gettext('importgroupsall'), '1');
+        $select->add($RCMAIL->gettext('importgroupsexisting'), '2');
+
+        $table->add('title', html::label('rcmimportgroups', $RCMAIL->gettext('importgroups')));
+        $table->add(null, $select->show(rcube_utils::get_input_value('_groups', rcube_utils::INPUT_GPC)));
+    }
+
+    // checkbox to replace the entire address book
+    $check_replace = new html_checkbox(array('name' => '_replace', 'value' => 1, 'id' => 'rcmimportreplace'));
+    $table->add('title', html::label('rcmimportreplace', $RCMAIL->gettext('importreplace')));
+    $table->add(null, $check_replace->show(rcube_utils::get_input_value('_replace', rcube_utils::INPUT_GPC)));
+
+    $form .= $table->show(array('id' => null) + $attrib);
+
+    $OUTPUT->set_env('writable_source', !empty($writable_books));
+    $OUTPUT->add_label('selectimportfile','importwait');
+    $OUTPUT->add_gui_object('importform', $attrib['id']);
+
+    $out = html::p(null, rcube::Q($RCMAIL->gettext('importdesc'), 'show'))
+        . $OUTPUT->form_tag(array(
+            'action'  => $RCMAIL->url('import'),
+            'method'  => 'post',
+            'enctype' => 'multipart/form-data') + $attrib,
+            $form);
+
+    return $out;
 }
 
 
@@ -96,30 +97,31 @@ function rcmail_import_form($attrib)
  */
 function rcmail_import_confirm($attrib)
 {
-  global $IMPORT_STATS, $RCMAIL;
-
-  $vars = get_object_vars($IMPORT_STATS);
-  $vars['names'] = $vars['skipped_names'] = '';
-
-  $content = html::p(null, $RCMAIL->gettext(array(
-      'name' => 'importconfirm',
-      'nr' => $IMPORT_STATS->inserted,
-      'vars' => $vars,
-    )) . ($IMPORT_STATS->names ? ':' : '.'));
-
-  if ($IMPORT_STATS->names)
-    $content .= html::p('em', join(', ', array_map('Q', $IMPORT_STATS->names)));
-
-  if ($IMPORT_STATS->skipped) {
-      $content .= html::p(null, $RCMAIL->gettext(array(
-          'name' => 'importconfirmskipped',
-          'nr' => $IMPORT_STATS->skipped,
-          'vars' => $vars,
-        )) . ':');
-      $content .= html::p('em', join(', ', array_map('Q', $IMPORT_STATS->skipped_names)));
-  }
-
-  return html::div($attrib, $content);
+    global $IMPORT_STATS, $RCMAIL;
+
+    $vars = get_object_vars($IMPORT_STATS);
+    $vars['names'] = $vars['skipped_names'] = '';
+
+    $content = html::p(null, $RCMAIL->gettext(array(
+        'name' => 'importconfirm',
+        'nr'   => $IMPORT_STATS->inserted,
+        'vars' => $vars,
+        )) . ($IMPORT_STATS->names ? ':' : '.'));
+
+    if ($IMPORT_STATS->names) {
+        $content .= html::p('em', join(', ', array_map('Q', $IMPORT_STATS->names)));
+    }
+
+    if ($IMPORT_STATS->skipped) {
+        $content .= html::p(null, $RCMAIL->gettext(array(
+                'name' => 'importconfirmskipped',
+                'nr'   => $IMPORT_STATS->skipped,
+                'vars' => $vars,
+            )) . ':')
+            . html::p('em', join(', ', array_map('Q', $IMPORT_STATS->skipped_names)));
+    }
+
+    return html::div($attrib, $content);
 }
 
 
@@ -128,24 +130,25 @@ function rcmail_import_confirm($attrib)
  */
 function rcmail_import_buttons($attrib)
 {
-  global $IMPORT_STATS, $OUTPUT;
-  $target = rcube_utils::get_input_value('_target', rcube_utils::INPUT_GPC);
-
-  $attrib += array('type' => 'input');
-  unset($attrib['name']);
-
-  if (is_object($IMPORT_STATS)) {
-    $attrib['class'] = trim($attrib['class'] . ' mainaction');
-    $out = $OUTPUT->button(array('command' => 'list', 'prop' => $target, 'label' => 'done') + $attrib);
-  }
-  else {
-    $out = $OUTPUT->button(array('command' => 'list', 'label' => 'cancel') + $attrib);
-    $out .= '&nbsp;';
-    $attrib['class'] = trim($attrib['class'] . ' mainaction');
-    $out .= $OUTPUT->button(array('command' => 'import', 'label' => 'import') + $attrib);
-  }
-
-  return $out;
+    global $IMPORT_STATS, $OUTPUT;
+
+    $target = rcube_utils::get_input_value('_target', rcube_utils::INPUT_GPC);
+
+    $attrib += array('type' => 'input');
+    unset($attrib['name']);
+
+    if (is_object($IMPORT_STATS)) {
+        $attrib['class'] = trim($attrib['class'] . ' mainaction');
+        $out = $OUTPUT->button(array('command' => 'list', 'prop' => $target, 'label' => 'done') + $attrib);
+    }
+    else {
+        $out = $OUTPUT->button(array('command' => 'list', 'label' => 'cancel') + $attrib);
+        $out .= '&nbsp;';
+        $attrib['class'] = trim($attrib['class'] . ' mainaction');
+        $out .= $OUTPUT->button(array('command' => 'import', 'label' => 'import') + $attrib);
+    }
+
+    return $out;
 }
 
 
@@ -334,8 +337,8 @@ if (is_array($_FILES['_file'])) {
 $OUTPUT->set_pagetitle($RCMAIL->gettext('importcontacts'));
 
 $OUTPUT->add_handlers(array(
-  'importstep' => $importstep,
-  'importnav' => 'rcmail_import_buttons',
+    'importstep' => $importstep,
+    'importnav'  => 'rcmail_import_buttons',
 ));
 
 // render page
diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc
index fc6a38dc9..7116e55b7 100644
--- a/program/steps/addressbook/mailto.inc
+++ b/program/steps/addressbook/mailto.inc
@@ -39,10 +39,10 @@ if (!empty($_REQUEST['_gid']) && isset($_REQUEST['_source']))
 {
     $source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
     $CONTACTS = $RCMAIL->get_address_book($source);
-    
+
     $group_id = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC);
     $group_data = $CONTACTS->get_group($group_id);
-    
+
     // group has an email address assigned: use that
     if ($group_data['email']) {
         $mailto[] = format_email_recipient($group_data['email'][0], $group_data['name']);
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index c4935b7e7..94556f96b 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -5,7 +5,7 @@
  | program/steps/addressbook/save.inc                                    |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -19,80 +19,87 @@
  +-----------------------------------------------------------------------+
 */
 
-$CONTACTS = rcmail_contact_source(null, true, true);
-$cid      = rcube_utils::get_input_value('_cid', rcube_utils::INPUT_POST);
+$CONTACTS      = rcmail_contact_source(null, true, true);
+$cid           = rcube_utils::get_input_value('_cid', rcube_utils::INPUT_POST);
 $return_action = empty($cid) ? 'add' : 'edit';
 
 // Source changed, display the form again
 if (!empty($_GET['_reload'])) {
-   $RCMAIL->overwrite_action($return_action);
-   return;
+    $RCMAIL->overwrite_action($return_action);
+    return;
 }
 
 // cannot edit record
 if ($CONTACTS->readonly) {
-  $OUTPUT->show_message('contactreadonly', 'error');
-  $RCMAIL->overwrite_action($return_action);
-  return;
+    $OUTPUT->show_message('contactreadonly', 'error');
+    $RCMAIL->overwrite_action($return_action);
+    return;
 }
 
 // read POST values into hash array
 $a_record = array();
 foreach ($GLOBALS['CONTACT_COLTYPES'] as $col => $colprop) {
-  $fname = '_'.$col;
-  if ($colprop['composite'])
-    continue;
-  // gather form data of composite fields
-  if ($colprop['childs']) {
-    $values = array();
-    foreach ($colprop['childs'] as $childcol => $cp) {
-      $vals = rcube_utils::get_input_value('_'.$childcol, rcube_utils::INPUT_POST, true);
-      foreach ((array)$vals as $i => $val)
-        $values[$i][$childcol] = $val;
+    if ($colprop['composite']) {
+        continue;
     }
-    $subtypes = isset($_REQUEST['_subtype_' . $col]) ? (array)rcube_utils::get_input_value('_subtype_' . $col, rcube_utils::INPUT_POST) : array('');
-    foreach ($subtypes as $i => $subtype) {
-      $suffix = $subtype ? ':'.$subtype : '';
-      if ($values[$i])
-        $a_record[$col.$suffix][] = $values[$i];
-     }
-  }
-  // assign values and subtypes
-  else if (is_array($_POST[$fname])) {
-    $values   = rcube_utils::get_input_value($fname, rcube_utils::INPUT_POST, true);
-    $subtypes = rcube_utils::get_input_value('_subtype_' . $col, rcube_utils::INPUT_POST);
-
-    foreach ($values as $i => $val) {
-      if ($col == 'email') {
-        // extract email from full address specification, e.g. "Name" <addr@domain.tld>
-        $addr = rcube_mime::decode_address_list($val, 1, false);
-        if (!empty($addr) && ($addr = array_pop($addr)) && $addr['mailto']) {
-          $val = $addr['mailto'];
+
+    $fname = '_'.$col;
+
+    // gather form data of composite fields
+    if ($colprop['childs']) {
+        $values = array();
+        foreach ($colprop['childs'] as $childcol => $cp) {
+            $vals = rcube_utils::get_input_value('_'.$childcol, rcube_utils::INPUT_POST, true);
+            foreach ((array)$vals as $i => $val) {
+                $values[$i][$childcol] = $val;
+            }
         }
-      }
 
-      $subtype = $subtypes[$i] ? ':'.$subtypes[$i] : '';
-      $a_record[$col.$subtype][] = $val;
+        $subtypes = isset($_REQUEST['_subtype_' . $col]) ? (array)rcube_utils::get_input_value('_subtype_' . $col, rcube_utils::INPUT_POST) : array('');
+        foreach ($subtypes as $i => $subtype) {
+            $suffix = $subtype ? ':'.$subtype : '';
+            if ($values[$i]) {
+                $a_record[$col.$suffix][] = $values[$i];
+            }
+        }
     }
-  }
-  else if (isset($_POST[$fname])) {
-    $a_record[$col] = rcube_utils::get_input_value($fname, rcube_utils::INPUT_POST, true);
-
-    // normalize the submitted date strings
-    if ($colprop['type'] == 'date') {
-        if ($a_record[$col] && ($dt = rcube_utils::anytodatetime($a_record[$col]))) {
-            $a_record[$col] = $dt->format('Y-m-d');
+    // assign values and subtypes
+    else if (is_array($_POST[$fname])) {
+        $values   = rcube_utils::get_input_value($fname, rcube_utils::INPUT_POST, true);
+        $subtypes = rcube_utils::get_input_value('_subtype_' . $col, rcube_utils::INPUT_POST);
+
+        foreach ($values as $i => $val) {
+            if ($col == 'email') {
+                // extract email from full address specification, e.g. "Name" <addr@domain.tld>
+                $addr = rcube_mime::decode_address_list($val, 1, false);
+                if (!empty($addr) && ($addr = array_pop($addr)) && $addr['mailto']) {
+                    $val = $addr['mailto'];
+                }
+            }
+
+            $subtype = $subtypes[$i] ? ':'.$subtypes[$i] : '';
+            $a_record[$col.$subtype][] = $val;
         }
-        else {
-            unset($a_record[$col]);
+    }
+    else if (isset($_POST[$fname])) {
+        $a_record[$col] = rcube_utils::get_input_value($fname, rcube_utils::INPUT_POST, true);
+
+        // normalize the submitted date strings
+        if ($colprop['type'] == 'date') {
+            if ($a_record[$col] && ($dt = rcube_utils::anytodatetime($a_record[$col]))) {
+                $a_record[$col] = $dt->format('Y-m-d');
+            }
+            else {
+                unset($a_record[$col]);
+            }
         }
     }
-  }
 }
 
 // Generate contact's display name (must be before validation)
 if (empty($a_record['name'])) {
     $a_record['name'] = rcube_addressbook::compose_display_name($a_record, true);
+
     // Reset it if equals to email address (from compose_display_name())
     $email = rcube_addressbook::get_col_values('email', $a_record, true);
     if ($a_record['name'] == $email[0]) {
@@ -130,120 +137,122 @@ if (isset($a_record['photo'])) {
 $source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
 
 // update an existing contact
-if (!empty($cid))
-{
-  $plugin = $RCMAIL->plugins->exec_hook('contact_update',
-    array('id' => $cid, 'record' => $a_record, 'source' => $source));
-  $a_record = $plugin['record'];
-
-  if (!$plugin['abort'])
-    $result = $CONTACTS->update($cid, $a_record);
-  else
-    $result = $plugin['result'];
-
-  if ($result) {
-    // LDAP DN change
-    if (is_string($result) && strlen($result)>1) {
-      $newcid = $result;
-      // change cid in POST for 'show' action
-      $_POST['_cid'] = $newcid;
-    }
+if (!empty($cid)) {
+    $plugin = $RCMAIL->plugins->exec_hook('contact_update',
+        array('id' => $cid, 'record' => $a_record, 'source' => $source));
+    $a_record = $plugin['record'];
+
+    if (!$plugin['abort'])
+        $result = $CONTACTS->update($cid, $a_record);
+    else
+        $result = $plugin['result'];
+
+    if ($result) {
+        // LDAP DN change
+        if (is_string($result) && strlen($result)>1) {
+            $newcid = $result;
+            // change cid in POST for 'show' action
+            $_POST['_cid'] = $newcid;
+        }
+
+        // define list of cols to be displayed
+        $a_js_cols = array();
+        $record = $CONTACTS->get_record($newcid ? $newcid : $cid, true);
+        $record['email'] = reset($CONTACTS->get_col_values('email', $record, true));
+        $record['name']  = rcube_addressbook::compose_list_name($record);
 
-    // define list of cols to be displayed
-    $a_js_cols = array();
-    $record = $CONTACTS->get_record($newcid ? $newcid : $cid, true);
-    $record['email'] = reset($CONTACTS->get_col_values('email', $record, true));
-    $record['name']  = rcube_addressbook::compose_list_name($record);
-
-    foreach (array('name') as $col)
-      $a_js_cols[] = rcube::Q((string)$record[$col]);
-
-    // update the changed col in list
-    $OUTPUT->command('parent.update_contact_row', $cid, $a_js_cols, $newcid, $source, $record);
-
-    // show confirmation
-    $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
-    $RCMAIL->overwrite_action('show');
-  }
-  else {
-    // show error message
-    $err = $CONTACTS->get_error();
-    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($err['message'] ? $err['message'] : 'errorsaving'), 'error', null, false);
-    $RCMAIL->overwrite_action('show');
-  }
+        foreach (array('name') as $col) {
+            $a_js_cols[] = rcube::Q((string)$record[$col]);
+        }
+
+        // update the changed col in list
+        $OUTPUT->command('parent.update_contact_row', $cid, $a_js_cols, $newcid, $source, $record);
+
+        // show confirmation
+        $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
+        $RCMAIL->overwrite_action('show');
+    }
+    else {
+        // show error message
+        $err = $CONTACTS->get_error();
+        $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($err['message'] ? $err['message'] : 'errorsaving'), 'error', null, false);
+        $RCMAIL->overwrite_action('show');
+    }
 }
 
 // insert a new contact
 else {
-  // Name of the addressbook already selected on the list
-  $orig_source = rcube_utils::get_input_value('_orig_source', rcube_utils::INPUT_GPC);
-
-  if (!strlen($source))
-    $source = $orig_source;
-
-  // show notice if existing contacts with same e-mail are found
-  foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) {
-      if ($email && ($res = $CONTACTS->search('email', $email, 1, false, true)) && $res->count) {
-          $OUTPUT->show_message('contactexists', 'notice', null, false);
-          break;
-      }
-  }
-
-  $plugin = $RCMAIL->plugins->exec_hook('contact_create', array(
-    'record' => $a_record, 'source' => $source));
-  $a_record = $plugin['record'];
-
-  // insert record and send response
-  if (!$plugin['abort'])
-    $insert_id = $CONTACTS->insert($a_record);
-  else
-    $insert_id = $plugin['result'];
-
-  if ($insert_id) {
-    $CONTACTS->reset();
-
-    // 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));
-
-      $counts = $CONTACTS->count();
-
-      if (!$plugin['abort']) {
-        if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($counts->count + 1 > $maxnum))
-          $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
-
-        $CONTACTS->add_to_group($plugin['group_id'], $plugin['ids']);
-      }
+    // Name of the addressbook already selected on the list
+    $orig_source = rcube_utils::get_input_value('_orig_source', rcube_utils::INPUT_GPC);
+
+    if (!strlen($source)) {
+        $source = $orig_source;
+    }
+
+    // show notice if existing contacts with same e-mail are found
+    foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) {
+        if ($email && ($res = $CONTACTS->search('email', $email, 1, false, true)) && $res->count) {
+            $OUTPUT->show_message('contactexists', 'notice', null, false);
+            break;
+        }
     }
+
+    $plugin = $RCMAIL->plugins->exec_hook('contact_create', array(
+        'record' => $a_record, 'source' => $source));
+    $a_record = $plugin['record'];
+
+    // insert record and send response
+    if (!$plugin['abort'])
+        $insert_id = $CONTACTS->insert($a_record);
     else
-      $counts = $CONTACTS->count();
+        $insert_id = $plugin['result'];
+
+    if ($insert_id) {
+        $CONTACTS->reset();
+
+        // 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));
+
+            $counts = $CONTACTS->count();
 
-    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);
+            if (!$plugin['abort']) {
+                if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($counts->count + 1 > $maxnum))
+                    $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
 
-      rcmail_js_contacts_list($result, 'parent.');
-      $OUTPUT->command('parent.contact_list.select', rcube_utils::html_identifier($insert_id));
+                $CONTACTS->add_to_group($plugin['group_id'], $plugin['ids']);
+            }
+        }
+        else {
+            $counts = $CONTACTS->count();
+        }
+
+        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);
+
+            rcmail_js_contacts_list($result, 'parent.');
+            $OUTPUT->command('parent.contact_list.select', rcube_utils::html_identifier($insert_id));
 
-      // update record count display
-      $CONTACTS->reset();
-      $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text($counts));
+            // update record count display
+            $CONTACTS->reset();
+            $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text($counts));
+        }
+        else {
+            // re-set iframe
+            $OUTPUT->command('parent.show_contentframe');
+        }
+
+        // show confirmation
+        $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
+        $OUTPUT->send('iframe');
     }
     else {
-      // re-set iframe
-      $OUTPUT->command('parent.show_contentframe');
+        // show error message
+        $err = $CONTACTS->get_error();
+        $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($err['message'] ? $err['message'] : 'errorsaving'), 'error', null, false);
+        $RCMAIL->overwrite_action('add');
     }
-
-    // show confirmation
-    $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
-    $OUTPUT->send('iframe');
-  }
-  else {
-    // show error message
-    $err = $CONTACTS->get_error();
-    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($err['message'] ? $err['message'] : 'errorsaving'), 'error', null, false);
-    $RCMAIL->overwrite_action('add');
-  }
 }