Merge branch 'master' of https://github.com/roundcube/roundcubemail

1 files changed, 6 insertions, 6 deletions

diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
index e7f7d5f1f..4905b373e 100644
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ b/plugins/vcard_attachments/vcard_attachments.php
@@ -90,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('" . JQ($part.':'.$idx) . "')",
+                        'onclick' => "return plugin_vcard_save_contact('" . rcube::JQ($part.':'.$idx) . "')",
                         'title' => $this->gettext('addvcardmsg'),
                         ),
-                        html::span(null, Q($display)))
+                        html::span(null, rcube::Q($display)))
                     );
             }
 
@@ -115,9 +115,9 @@ class vcard_attachments extends rcube_plugin
     {
         $this->add_texts('localization', true);
 
-        $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);
+        $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);
 
         $rcmail  = rcmail::get_instance();
         $storage = $rcmail->get_storage();
@@ -144,7 +144,7 @@ class vcard_attachments extends rcube_plugin
             }
             else {
                 // We're using UTF8 internally
-                $email = rcube_idn_to_utf8($email);
+                $email = rcube_utils::idn_to_utf8($email);
 
                 // compare e-mail address
                 $existing = $CONTACTS->search('email', $email, 1, false);