From 6f948d04673e5ca810be1afafc140d676626674a Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Fri, 17 Apr 2015 11:03:06 +0200
Subject: [PATCH] Finish contact audit trail (#4972) with full display and
 restoring of old revisions

---
 .../kolab_addressbook/kolab_addressbook.js    |  81 ++++++++++++++---
 .../kolab_addressbook/kolab_addressbook.php   |  85 ++++++++++++++++--
 .../lib/kolab_addressbook_ui.php              |   2 +
 .../lib/rcube_kolab_contacts.php              |  11 +++
 .../kolab_addressbook/localization/en_US.inc  |   3 +
 .../skins/larry/folder_icons.png              | Bin 1782 -> 2160 bytes
 .../skins/larry/kolab_addressbook.css         |   4 +
 7 files changed, 169 insertions(+), 17 deletions(-)

diff --git a/plugins/kolab_addressbook/kolab_addressbook.js b/plugins/kolab_addressbook/kolab_addressbook.js
index fb280b1d..314bc1e0 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.js
+++ b/plugins/kolab_addressbook/kolab_addressbook.js
@@ -364,18 +364,49 @@ rcube_webmail.prototype.contact_history_dialog = function()
         return false;
     }
 
+    if (this.contact_list && this.contact_list.data[rec.cid]) {
+        $.extend(rec, this.contact_list.data[rec.cid]);
+    }
+
     // render dialog
     $dialog = libkolab_audittrail.object_history_dialog({
-        module: 'kolab_addressbooks',
+        module: 'kolab_addressbook',
         container: '#contacthistory',
-        title: rcmail.gettext('objectchangelog','kolab_addressbook'),
+        title: rcmail.gettext('objectchangelog','kolab_addressbook') + ' - ' + rec.name,
 
         // callback function for list actions
         listfunc: function(action, rev) {
             var rec = $dialog.data('rec');
-            console.log(action, rev, rec)
-            //rcmail.loading_lock = rcmail.set_busy(true, 'loading', this.loading_lock);
-            //rcmail.http_post('action', { _do: action, _data: { uid: rec.uid, list:rec.list, rev: rev } }, saving_lock);
+
+            if (action == 'show') {
+                // open contact view in a dialog (iframe)
+                var dialog, iframe = $('<iframe>')
+                    .attr('id', 'contactshowrevframe')
+                    .attr('width', '100%')
+                    .attr('height', '98%')
+                    .attr('frameborder', '0')
+                    .attr('src', rcmail.url('show', { _cid: rec.cid, _source: rec.source, _rev: rev, _framed: 1 })),
+                    contentframe = $('#' + rcmail.env.contentframe)
+
+                // open jquery UI dialog
+                dialog = rcmail.show_popup_dialog(iframe, '', {}, {
+                    modal: false,
+                    resizable: true,
+                    closeOnEscape: true,
+                    title: rec.name + ' @ ' + rev,
+                    close: function() {
+                        dialog.dialog('destroy').attr('aria-hidden', 'true').remove();
+                    },
+                    minWidth: 400,
+                    width: contentframe.width() || 600,
+                    height: contentframe.height() || 400
+                });
+                dialog.css('padding', '0');
+            }
+            else {
+                rcmail.kab_loading_lock = rcmail.set_busy(true, 'loading', rcmail.kab_loading_lock);
+                rcmail.http_post('plugin.contact-' + action, { cid: rec.cid, source: rec.source, rev: rev }, rcmail.kab_loading_lock);
+            }
         },
 
         // callback function for comparing two object revisions
@@ -407,13 +438,10 @@ rcube_webmail.prototype.contact_render_changelog = function(data)
     }
 
     source = this.env.address_sources[rec.source] || {}
-    // source.editable = !source.readonly
+    source.editable = !source.readonly
 
     data.module = 'kolab_addressbook';
     libkolab_audittrail.render_changelog(data, rec, source);
-
-    // set dialog size according to content
-    // dialog_resize($dialog.get(0), $dialog.height(), 600);
 };
 
 // callback for rendering a diff view of two contact revisions
@@ -519,8 +547,24 @@ rcube_webmail.prototype.contact_show_diff = function(data)
         width: 480
     }).show();
 
-    // set dialog size according to content
-    // dialog_resize($dialog.get(0), $dialog.height(), rcmail.gui_containers.notedetailview.width() - 40);
+    // set dialog size according to content frame
+    libkolab_audittrail.dialog_resize($dialog.get(0), $dialog.height(), ($('#' + rcmail.env.contentframe).width() || 440) - 40);
+};
+
+
+// close the contact history dialog
+rcube_webmail.prototype.close_contact_history_dialog = function(refresh)
+{
+    $('#contacthistory, #contactdiff').each(function(i, elem) {
+        var $dialog = $(elem);
+        if ($dialog.is(':ui-dialog'))
+            $dialog.dialog('close');
+    });
+
+    // reload the contact content frame
+    if (refresh && this.get_single_cid() == refresh) {
+        this.load_contact(refresh, 'show', true);
+    }
 };
 
 
@@ -541,6 +585,21 @@ function kolab_addressbook_contextmenu()
                     }
                 });
             }
+            else if (menu.menu_name == 'contactlist' && rcmail.env.kolab_audit_trail) {
+                // add "Show History" item to context menu
+                menu.menu_source.push({
+                    label: rcmail.get_label('kolab_addressbook.showhistory'),
+                    command: 'contact_history_dialog',
+                    classes: 'history'
+                });
+                // enable history item if the contact source supports it
+                menu.addEventListener('activate', function(p) {
+                    if (p.command == 'contact_history_dialog') {
+                        var source = rcmail.env.address_sources ? rcmail.env.address_sources[rcmail.env.source] : {};
+                        return !!source.audittrail;
+                    }
+                });
+            }
         });
     }
 
diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index 35908bbf..93215e40 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -63,6 +63,7 @@ class kolab_addressbook extends rcube_plugin
         if ($this->rc->task == 'addressbook') {
             $this->add_texts('localization');
             $this->add_hook('contact_form', array($this, 'contact_form'));
+            $this->add_hook('contact_photo', array($this, 'contact_photo'));
             $this->add_hook('template_object_directorylist', array($this, 'directorylist_html'));
 
             // Plugin actions
@@ -73,7 +74,7 @@ class kolab_addressbook extends rcube_plugin
 
             $this->register_action('plugin.contact-changelog', array($this, 'contact_changelog'));
             $this->register_action('plugin.contact-diff', array($this, 'contact_diff'));
-            $this->register_action('plugin.contact-show', array($this, 'contact_show'));
+            $this->register_action('plugin.contact-restore', array($this, 'contact_restore'));
 
             // get configuration for the Bonnie API
             if ($bonnie_config = $this->rc->config->get('kolab_bonnie_api', false)) {
@@ -509,13 +510,26 @@ class kolab_addressbook extends rcube_plugin
             */
         }
 
-        if ($this->bonnie_api && $this->rc->action == 'show') {
+        if ($this->bonnie_api && $this->rc->action == 'show' && empty($p['record']['rev'])) {
             $this->rc->output->set_env('kolab_audit_trail', true);
         }
 
         return $p;
     }
 
+    /**
+     * Plugin hook for the contact photo image
+     */
+    public function contact_photo($p)
+    {
+        // add photo data from old revision inline as data url
+        if (!empty($p['record']['rev']) && !empty($p['data'])) {
+            $p['url'] = 'data:image/gif;base64,' . base64_encode($p['data']);
+        }
+
+        return $p;
+    }
+
     /**
      * Handler for contact audit trail changelog requests
      */
@@ -677,21 +691,80 @@ class kolab_addressbook extends rcube_plugin
     }
 
     /**
-     * Handler for audit trail revision view requests
+     * Handler for audit trail revision restore requests
      */
-    public function contact_show()
+    public function contact_restore()
     {
-        
+        if (empty($this->bonnie_api)) {
+            return false;
+        }
+
+        $success = false;
+        $contact = rcube_utils::get_input_value('cid', rcube_utils::INPUT_POST, true);
+        $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_POST);
+        $rev = rcube_utils::get_input_value('rev', rcube_utils::INPUT_POST);
+
+        list($uid, $mailbox, $msguid) = $this->_resolve_contact_identity($contact, $source, $folder);
+
+        if ($folder && ($raw_msg = $this->bonnie_api->rawdata('contact', $uid, $rev, $mailbox))) {
+            $imap = $this->rc->get_storage();
+
+            // insert $raw_msg as new message
+            if ($imap->save_message($folder->name, $raw_msg, null, false)) {
+                $success = true;
+
+                // delete old revision from imap and cache
+                $imap->delete_message($msguid, $folder->name);
+                $folder->cache->set($msguid, false);
+                $this->cache = array();
+            }
+        }
+
+        if ($success) {
+            $this->rc->output->command('display_message', $this->gettext(array('name' => 'objectrestoresuccess', 'vars' => array('rev' => $rev))), 'confirmation');
+            $this->rc->output->command('close_contact_history_dialog', $contact);
+        }
+        else {
+            $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
+        }
+
         $this->rc->output->send();
     }
 
+    /**
+     * Get a previous revision of the given contact record from the Bonnie API
+     */
+    public function get_revision($cid, $source, $rev)
+    {
+        if (empty($this->bonnie_api)) {
+            return false;
+        }
+
+        list($uid, $mailbox, $msguid) = $this->_resolve_contact_identity($cid, $source);
+
+        // call Bonnie API
+        $result = $this->bonnie_api->get('contact', $uid, $rev, $mailbox, $msguid);
+        if (is_array($result) && $result['uid'] == $uid && !empty($result['xml'])) {
+            $format = kolab_format::factory('contact');
+            $format->load($result['xml']);
+            $rec = $format->to_array();
+
+            if ($format->is_valid()) {
+                $rec['rev'] = $result['rev'];
+                return $rec;
+            }
+        }
+
+        return false;
+    }
+
 
     /**
      * Helper method to resolved the given contact identifier into uid and mailbox
      *
      * @return array (uid,mailbox,msguid) tuple
      */
-    private function _resolve_contact_identity($id, $abook)
+    private function _resolve_contact_identity($id, $abook, &$folder = null)
     {
         $mailbox = $msguid = null;
 
diff --git a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
index e20cf14d..55fa6dd6 100644
--- a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
+++ b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
@@ -108,6 +108,7 @@ class kolab_addressbook_ui
 
 
             if ($this->plugin->bonnie_api) {
+                $this->rc->output->set_env('kolab_audit_trail', true);
                 $this->plugin->api->include_script('libkolab/js/audittrail.js');
 
                 $this->rc->output->add_label(
@@ -121,6 +122,7 @@ class kolab_addressbook_ui
                     'kolab_addressbook.actiondelete',
                     'kolab_addressbook.objectdiffnotavailable',
                     'kolab_addressbook.objectchangelognotavailable',
+                    'kolab_addressbook.revisionrestoreconfirm',
                     'close'
                 );
 
diff --git a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
index 9f117e42..c6dfd112 100644
--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
@@ -554,11 +554,22 @@ class rcube_kolab_contacts extends rcube_addressbook
     {
         $rec = null;
         $uid = $this->id2uid($id);
+        $rev = rcube_utils::get_input_value('_rev', rcube_utils::INPUT_GPC);
+
         if (strpos($uid, 'mailto:') === 0) {
             $this->_fetch_groups(true);
             $rec = $this->contacts[$id];
             $this->readonly = true;  // set source to read-only
         }
+        else if (!empty($rev)) {
+            $rcmail = rcube::get_instance();
+            $plugin = $rcmail->plugins->get_plugin('kolab_addressbook');
+            if ($plugin && ($object = $plugin->get_revision($id, kolab_storage::id_encode($this->imap_folder), $rev))) {
+                $rec = $this->_to_rcube_contact($object);
+                $rec['rev'] = $rev;
+            }
+            $this->readonly = true;  // set source to read-only
+        }
         else if ($object = $this->storagefolder->get_object($uid)) {
             $rec = $this->_to_rcube_contact($object);
         }
diff --git a/plugins/kolab_addressbook/localization/en_US.inc b/plugins/kolab_addressbook/localization/en_US.inc
index a65f46c9..2547de2a 100644
--- a/plugins/kolab_addressbook/localization/en_US.inc
+++ b/plugins/kolab_addressbook/localization/en_US.inc
@@ -61,9 +61,12 @@ $labels['actionmove'] = 'Moved';
 $labels['actiondelete'] = 'Deleted';
 $labels['showrevision'] = 'Show this version';
 $labels['restore'] = 'Restore this version';
+$labels['revisionrestoreconfirm'] = 'Do you really want to restore revision $rev of this contact? This will replace the current contact with the old version.';
 $labels['objectnotfound'] = 'Failed to load contact data';
 $labels['objectchangelognotavailable'] = 'Change history is not available for this contact';
 $labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
+$labels['objectrestoresuccess'] = 'Revision $rev successfully restored';
+$labels['objectrestoreerror'] = 'Failed to restore the old revision';
 
 $messages['bookdeleteconfirm']  = 'Do you really want to delete the selected address book and all contacts in it?';
 $messages['bookdeleting'] = 'Deleting address book...';
diff --git a/plugins/kolab_addressbook/skins/larry/folder_icons.png b/plugins/kolab_addressbook/skins/larry/folder_icons.png
index 19b8cfabac863973ccade78b67818db15e04f9fc..f5325cfc24917e90b85d7d50264e9e092d4dd815 100644
GIT binary patch
literal 2160
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

delta 1779
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
VVfk$h+gktt002ovPDHLkV1nQxSV;f?

diff --git a/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css b/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css
index 2d2d8795..11ca84e4 100644
--- a/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css
+++ b/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css
@@ -244,3 +244,7 @@
 	content: ")";
 }
 
+div.contextmenu.rcmmainmenu ul.iconized li a.history > span.icon {
+	background: url(folder_icons.png) 1px -214px no-repeat;
+}
+