From 59478e06c25303a790a0840ab2ac30662c4ef781 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <root@paranoid>
Date: Tue, 5 Aug 2014 16:46:22 +0200
Subject:  c'est la merde..

---
 plugins/vcard_attachments/vcard_attachments.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'plugins/vcard_attachments/vcard_attachments.php')

diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
index cf7e22d3a..e7f7d5f1f 100644
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ b/plugins/vcard_attachments/vcard_attachments.php
@@ -45,7 +45,7 @@ class vcard_attachments extends rcube_plugin
             }
         }
         // the same with message bodies
-        foreach ((array)$this->message->parts as $part) {
+        foreach ((array)$this->message->parts as $idx => $part) {
             if ($this->is_vcard($part)) {
                 $this->vcard_parts[] = $part->mime_id;
                 $this->vcard_bodies[] = $part->mime_id;
@@ -63,6 +63,7 @@ class vcard_attachments extends rcube_plugin
     function html_output($p)
     {
         $attach_script = false;
+        $icon = 'plugins/vcard_attachments/' .$this->local_skin_path(). '/vcard_add_contact.png';
 
         foreach ($this->vcard_parts as $part) {
             $vcards = rcube_vcard::import($this->message->get_part_content($part, null, true));
@@ -89,10 +90,10 @@ class vcard_attachments extends rcube_plugin
                 $p['content'] .= html::p(array('class' => 'vcardattachment'),
                     html::a(array(
                         'href' => "#",
-                        'onclick' => "return plugin_vcard_save_contact('" . rcube::JQ($part.':'.$idx) . "')",
+                        'onclick' => "return plugin_vcard_save_contact('" . JQ($part.':'.$idx) . "')",
                         'title' => $this->gettext('addvcardmsg'),
                         ),
-                        html::span(null, rcube::Q($display)))
+                        html::span(null, Q($display)))
                     );
             }
 
@@ -114,9 +115,9 @@ class vcard_attachments extends rcube_plugin
     {
         $this->add_texts('localization', true);
 
-        $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
-        $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
-        $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
+        $uid = get_input_value('_uid', RCUBE_INPUT_POST);
+        $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+        $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
 
         $rcmail  = rcmail::get_instance();
         $storage = $rcmail->get_storage();
@@ -143,7 +144,7 @@ class vcard_attachments extends rcube_plugin
             }
             else {
                 // We're using UTF8 internally
-                $email = rcube_utils::idn_to_utf8($email);
+                $email = rcube_idn_to_utf8($email);
 
                 // compare e-mail address
                 $existing = $CONTACTS->search('email', $email, 1, false);
-- 
cgit v1.2.3