List groups in address detail view and allow to subscribe/unsubscribe from there (#1486753)

6 files changed, 78 insertions, 6 deletions

diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index 16e39fc7e..e1dc7c535 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -355,6 +355,33 @@ class rcube_contacts extends rcube_addressbook
 
 
     /**
+     * Get group assignments of a specific contacr record
+     *
+     * @param mixed Record identifier
+     * @param array List of assigned groups as ID=>Name pairs
+     */
+    function get_record_groups($id)
+    {
+      $results = array();
+
+      if (!$this->groups)
+          return $results;
+
+      $sql_result = $this->db->query(
+        "SELECT cgm.contactgroup_id, cg.name FROM " . get_table_name($this->db_groupmembers) . " AS cgm" .
+        " LEFT JOIN " . get_table_name($this->db_groups) . " AS cg ON (cgm.contactgroup_id = cg.contactgroup_id AND cg.del<>1)" .
+        " WHERE cgm.contact_id=?",
+        $id
+      );
+      while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
+        $results[$sql_arr['contactgroup_id']] = $sql_arr['name'];
+      }
+
+      return $results;
+    }
+
+
+    /**
      * Create a new contact record
      *
      * @param array Assoziative array with save data
diff --git a/program/js/app.js b/program/js/app.js
index 45569ea95..4587ce898 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -306,8 +306,18 @@ function rcube_webmail()
           this.enable_command('group-create', this.env.address_sources[this.env.source].groups);
         }
 
-        if (this.env.cid)
+        if (this.env.cid) {
           this.enable_command('show', 'edit', true);
+          // register handlers for group assignment via checkboxes
+          if (this.gui_objects.editform) {
+            $('input.groupmember').change(function(){
+              var cmd = this.checked ? 'group-addmembers' : 'group-delmembers';
+              ref.http_post(cmd, '_cid='+urlencode(ref.env.cid)
+                + '&_source='+urlencode(ref.env.source)
+                + '&_gid='+urlencode(this.value));
+            });
+          }
+        }
 
         if ((this.env.action=='add' || this.env.action=='edit') && this.gui_objects.editform) {
           this.enable_command('save', true);
@@ -3713,7 +3723,7 @@ function rcube_webmail()
   {
     // exit if no mailbox specified or if selection is empty
     var selection = this.contact_list.get_selection();
-    if (!(selection.length || this.env.cid) || (!this.env.group && !confirm(this.get_label('deletecontactconfirm'))))
+    if (!(selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
       return;
 
     var id, a_cids = [], qs = '';
@@ -3737,10 +3747,7 @@ function rcube_webmail()
       qs += '&_search='+this.env.search_request;
 
     // send request to server
-    if (this.env.group)
-      this.http_post('group-delmembers', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+qs);
-    else
-      this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
+    this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
 
     return true;
   };
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 63d69db82..4a1a27a5c 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -201,6 +201,7 @@ $labels['firstname'] = 'Vorname';
 $labels['surname'] = 'Nachname';
 $labels['email'] = 'E-Mail';
 $labels['contacts'] = 'Kontakte';
+$labels['contactproperties'] = 'Kontaktdaten';
 $labels['addcontact'] = 'Kontakt hinzufügen';
 $labels['editcontact'] = 'Kontakt bearbeiten';
 $labels['edit'] = 'Bearbeiten';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index b3790d05a..d276a3340 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -204,6 +204,7 @@ $labels['email'] = 'E-Mail';
 $labels['addcontact'] = 'Kontakt hinzufügen';
 $labels['editcontact'] = 'Kontakt bearbeiten';
 $labels['contacts'] = 'Kontakte';
+$labels['contactproperties'] = 'Kontaktdaten';
 $labels['edit'] = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
 $labels['save'] = 'Speichern';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 9a06096e6..d209501d4 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -259,6 +259,7 @@ $labels['email']     = 'E-Mail';
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
 $labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
 
 $labels['edit']   = 'Edit';
 $labels['cancel'] = 'Cancel';
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index c714ce139..c5784d61d 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -25,6 +25,10 @@ if (($cid = get_input_value('_cid', RCUBE_INPUT_GPC)) && ($record = $CONTACTS->g
   $OUTPUT->set_env('cid', $record['ID']);
 }
 
+$GROUPS = $CONTACTS->list_groups();
+$OUTPUT->set_env('groups', !empty($GROUPS));
+
+
 function rcmail_contact_details($attrib)
 {
   global $CONTACTS, $OUTPUT;
@@ -69,6 +73,37 @@ function rcmail_contact_details($attrib)
 }
 
 
+function rcmail_contact_record_groups($attrib)
+{
+  global $RCMAIL, $CONTACTS, $GROUPS;
+  
+  // check if we have a valid result
+  if (!(($result = $CONTACTS->get_result()) && ($record = $result->first())))
+    return false;
+  
+  $table = new html_table(array('cols' => 2, 'cellspacing' => 0, 'border' => 0));
+  
+  $members = $CONTACTS->get_record_groups($record['ID']);
+  $checkbox = new html_checkbox(array('name' => '_gid[]', 'class' => 'groupmember', 'disabled' => $CONTACTS->readonly));
+  foreach ($GROUPS as $group) {
+    $gid = $group['ID'];
+    $table->add(null, $checkbox->show($members[$gid] ? $gid : null, array('value' => $gid, 'id' => 'ff_gid' . $gid)));
+    $table->add(null, html::label('ff_gid' . $gid, Q($group['name'])));
+  }
+  
+  $hiddenfields = new html_hiddenfield(array('name' => '_source', 'value' => get_input_value('_source', RCUBE_INPUT_GPC)));
+  $hiddenfields->add(array('name' => '_cid', 'value' => $record['ID']));
+  
+  $form_start = $RCMAIL->output->request_form(array('name' => "form", 'method' => "post", 'task' => $RCMAIL->task, 'action' => 'save', 'request' => 'save.'.intval($record['ID']), 'noclose' => true) + $attrib, $hiddenfields->show());
+  $form_end = !strlen($attrib['form']) ? '</form>' : '';
+
+  $RCMAIL->output->add_gui_object('editform', !empty($attrib['form']) ? $attrib['form'] : 'form');
+  
+  return $form_start . $table->show($attrib) . $form_end;
+}
+
+
 //$OUTPUT->framed = $_framed;
 $OUTPUT->add_handler('contactdetails', 'rcmail_contact_details');
+$OUTPUT->add_handler('contactgroups', 'rcmail_contact_record_groups');
 $OUTPUT->send('showcontact');