Fix handling of &, <, > characters in scripts/filter names (#1489208)

Aleksander Machniak

2013-06-26 357dc9722869e77323d2e02773da1b54bd1737c9

Fix handling of &, <, > characters in scripts/filter names (#1489208)

 plugins/managesieve/Changelog

@@ -1,3 +1,5 @@
- Fix handling of &, <, > characters in scripts/filter names (#1489208)

* version 6.2 [2013-02-17]
-----------------------------------------------------------
- Support tls:// prefix in managesieve_host option

 plugins/managesieve/managesieve.js

@@ -258,7 +258,7 @@
      var i, row = $('#rcmrow'+this.managesieve_rowid(o.id));

      if (o.name)
        $('td', row).html(o.name);
        $('td', row).text(o.name);
      if (o.disabled)
        row.addClass('disabled');
      else
@@ -273,7 +273,7 @@
      var list = this.filters_list,
        row = $('<tr><td class="name"></td></tr>');

      $('td', row).html(o.name);
      $('td', row).text(o.name);
      row.attr('id', 'rcmrow'+o.id);
      if (o.disabled)
        row.addClass('disabled');
@@ -297,7 +297,7 @@
        tr = document.createElement('TR');
        td = document.createElement('TD');

        td.innerHTML = el.name;
        $(td).text(el.name);
        td.className = 'name';
        tr.id = 'rcmrow' + el.id;
        if (el['class'])
@@ -346,7 +346,7 @@
        list = this.filtersets_list,
        row = $('<tr class="disabled"><td class="name"></td></tr>');

      $('td', row).html(o.name);
      $('td', row).text(o.name);
      row.attr('id', 'rcmrow'+id);

      this.env.filtersets[id] = o.name;

 plugins/managesieve/managesieve.php

@@ -967,7 +967,7 @@
                        $this->rc->output->command('parent.managesieve_updatelist',
                            isset($new) ? 'add' : 'update',
                            array(
                                'name' => Q($this->form['name']),
                                'name' => $this->form['name'],
                                'id' => $fid,
                                'disabled' => $this->form['disabled']
                        ));
@@ -1049,7 +1049,7 @@
                foreach ($list as $idx => $set) {
                    $scripts['S'.$idx] = $set;
                    $result[] = array(
                        'name' => Q($set),
                        'name' => $set,
                        'id' => 'S'.$idx,
                        'class' => !in_array($set, $this->active) ? 'disabled' : '',
                    );
@@ -2039,7 +2039,7 @@
            $fname = $filter['name'] ? $filter['name'] : "#$i";
            $result[] = array(
                'id'    => $idx,
                'name'  => Q($fname),
                'name'  => $fname,
                'class' => $filter['disabled'] ? 'disabled' : '',
            );
            $i++;