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

Aleksander Machniak

2013-06-26 d6b592941da7017c86ecb8fb81f9ffc515995b4f

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

 plugins/managesieve/Changelog

@@ -3,6 +3,7 @@
- Support string list arguments in filter form (#1489018)
- Support date, currendate and index tests - RFC5260 (#1488120)
- Split plugin file into two files
- Fix handling of &, <, > characters in scripts/filter names (#1489208)

* version 6.2 [2013-02-17]
-----------------------------------------------------------

 plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

@@ -1014,7 +1014,7 @@
                foreach ($list as $idx => $set) {
                    $scripts['S'.$idx] = $set;
                    $result[] = array(
                        'name' => rcube::Q($set),
                        'name' => $set,
                        'id' => 'S'.$idx,
                        'class' => !in_array($set, $this->active) ? 'disabled' : '',
                    );
@@ -2111,7 +2111,7 @@
            $fname = $filter['name'] ? $filter['name'] : "#$i";
            $result[] = array(
                'id'    => $idx,
                'name'  => rcube::Q($fname),
                'name'  => $fname,
                'class' => $filter['disabled'] ? 'disabled' : '',
            );
            $i++;

 plugins/managesieve/managesieve.js

@@ -263,7 +263,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
@@ -278,7 +278,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');
@@ -302,7 +302,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'])
@@ -351,7 +351,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;