Contacts: Fix name and carddav-url encoding

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index bd8535b4f60a2496dcd91c3887cee6397165602d..6f5602c211289953d54efb4835dd64ddc3dca29e 100644 (file)
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -77,7 +77,7 @@ Contacts={
                        }
                },
                showCardDAVUrl:function(username, bookname){
-                       $('#carddav_url').val(totalurl + '/' + username + '/' + bookname);
+                       $('#carddav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(bookname));
                        $('#carddav_url').show();
                        $('#carddav_url_close').show();
                },

diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
index 780920ea3c2b0d878af7c0d759ec3b27c056da96..2988bb44c5f257b29f9427ff6764a1dee647020a 100644 (file)
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
@@ -2,10 +2,10 @@
        <input id="active_<?php echo $_['addressbook']["id"]; ?>" type="checkbox" onClick="Contacts.UI.Addressbooks.activation(this, <?php echo $_['addressbook']["id"]; ?>)" <?php echo (OC_Contacts_Addressbook::isActive($_['addressbook']["id"]) ? ' checked="checked"' : ''); ?>>
 </td>
 <td>
-       <label for="active_<?php echo $_['addressbook']["id"]; ?>"><?php echo htmlspecialchars($_['addressbook']["displayname"]); ?></label>
+       <label for="active_<?php echo $_['addressbook']["id"]; ?>"><?php echo $_['addressbook']["displayname"]; ?></label>
 </td>
 <td width="20px">
-       <a onclick="Contacts.UI.showCardDAVUrl('<?php echo OCP\USER::getUser(); ?>', '<?php echo rawurlencode($_['addressbook']["uri"]); ?>');" title="<?php echo $l->t("CardDav Link"); ?>" class="svg action globe"></a>
+       <a onclick="Contacts.UI.showCardDAVUrl('<?php echo OCP\USER::getUser(); ?>', '<?php echo rawurlencode(html_entity_decode($_['addressbook']['uri'], ENT_QUOTES, 'UTF-8')); ?>');" title="<?php echo $l->t("CardDav Link"); ?>" class="svg action globe"></a>
 </td>
 <td width="20px">
        <a href="<?php echo OCP\Util::linkTo('contacts', 'export.php'); ?>?bookid=<?php echo $_['addressbook']["id"]; ?>" title="<?php echo $l->t("Download"); ?>" class="svg action download"></a>