Merge branch 'master' into release-2.0

Author: johndoh

CHANGELOG

@@ -1,6 +1,15 @@
 Roundcube Webmail SieveRules
 ============================
 
+Version 2.1.2 (2014-03-30, rc-1.0)
+=================================================
+ * Update pear package name in composer requirements
+ * Update rule list row counting after change in core
+
+Version 2.1.1 (2013-12-29, rc-1.0)
+=================================================
+ * Correct skin folder structure for Roundcube packaging
+
 Version 2.1 (2013-12-01, rc-1.0)
 =================================================
  * add second argument (ruleset name) to import filter detect() function

README.md

@@ -42,7 +42,23 @@ folder for details on the skin license.
 
 Install
 -------
-* Place this plugin folder into plugins directory of Roundcube
+* For installation with Composer the pear repository must be included in the
+repositories section of the composer.json file in the Roundcube root. For
+example:
+```js
+"repositories": [
+	{
+	  "type": "composer",
+	  "url": "http://plugins.roundcube.net"
+	},
+	{
+	  "type": "pear",
+	  "url": "http://pear.php.net"
+	}
+]
+```
+* For direct download place this plugin folder into plugins directory of
+Roundcube
 * Add sieverules to $config['plugins'] in your Roundcube config
 
 **NB:** When downloading the plugin from GitHub you will need to create a

sieverules.php

@@ -1948,7 +1948,7 @@ private function _rule_row($ext, $rules_table, $rule, $predefined_rules, $attrib
 
 		// comparator select box
 		$field_id = 'rcmfd_comparator_'. $rowid;
-		$select_comparator = new html_select(array('id' => $field_id, 'name' => "_comparator[]") + (substr($defaults['op'], 0, 5) == 'count' || substr($defaults['op'], 0, 5) == 'value' ? array('disabled' => 'disabled') : array()));
+		$select_comparator = new html_select(array('id' => $field_id, 'name' => "_comparator[]") + (substr($defaults['op'], 0, 5) == 'count' || substr($defaults['op'], 0, 5) == 'value' ? array() : array('disabled' => 'disabled')));
 		foreach($this->comparators as $option) {
 			if (empty($option['ext']) || in_array($option['ext'], $ext))
 				$select_comparator->add($this->gettext($option['text']), $option['value']);