Support HTML entities in addressbook names

Aleksander Machniak

2012-09-20 5802cfec95fc05f5ccab2c85ab225ffeaf1e5874

Support HTML entities in addressbook names

 program/steps/addressbook/func.inc

@@ -219,12 +219,13 @@
        if ($source['class_name'])
            $class_name .= ' ' . $source['class_name'];

        $name = !empty($source['name']) ? html_entity_decode($source['name'], ENT_COMPAT, 'UTF-8') : $id;
        $out .= sprintf($line_templ,
            html_identifier($id),
            $class_name,
            Q(rcmail_url(null, array('_source' => $id))),
            $source['id'],
            $js_id, (!empty($source['name']) ? Q($source['name']) : Q($id)));
            $js_id, Q($name));

        $groupdata = array('out' => $out, 'jsdata' => $jsdata, 'source' => $id);
        if ($source['groups'])

 program/steps/settings/func.inc

@@ -667,7 +667,7 @@
      $select_abook = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));

      foreach ($books as $book) {
        $select_abook->add($book['name'], $book['id']);
        $select_abook->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
      }

      $blocks['main']['options']['default_addressbook'] = array(