Merge branch 'master' into release-2.2

johndoh · Apr 18, 2015 · 3784e8f · 3784e8f
2 parents f692ad9 + feeb833
commit 3784e8f
Show file tree

Hide file tree

Showing 8 changed files with 236 additions and 137 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 Roundcube Webmail SieveRules
 ============================
 
+Version 2.2.1 (2015-04-18, rc-1.1)
+=================================================
  * Fix missing size_test function in vacation validation
  * Fix buggy display of auto reply rule
 

diff --git a/importFilters/avelsieve.php.ex b/importFilters/avelsieve.php.ex
@@ -10,6 +10,23 @@
  *   A pubic function called importer
  * The importer function can return either a string to be parsed by the SieveRules parser
  * or an array, similar to the one created by the SieveRules parser
+ *
+ * Copyright (C) 2009-2014 Philip Weir
+ *
+ * This import filter is part of the SieveRules plugin for Roundcube.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Roundcube. If not, see http://www.gnu.org/licenses/.
  */
 class srimport_avelsieve
 {

diff --git a/importFilters/ingo.php.ex b/importFilters/ingo.php.ex
@@ -10,6 +10,23 @@
  *   A pubic function called importer
  * The importer function can return either a string to be parsed by the SieveRules parser
  * or an array, similar to the one created by the SieveRules parser
+ *
+ * Copyright (C) 2009-2014 Philip Weir
+ *
+ * This import filter is part of the SieveRules plugin for Roundcube.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Roundcube. If not, see http://www.gnu.org/licenses/.
  */
 class srimport_ingo
 {

diff --git a/lib/Roundcube/rcube_sieve.php b/lib/Roundcube/rcube_sieve.php
@@ -1,15 +1,31 @@
 <?php
 
 /*
- +-----------------------------------------------------------------------+
- | rcube_sieve class for managesieve operations (using PEAR::Net_Sieve)  |
- |                                                                       |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- | Modifications by: Philip Weir                                         |
- |   * Make ruleset name configurable                                    |
- |   * Added import functions                                            |
- +-----------------------------------------------------------------------+
-*/
+ * rcube_sieve class for managesieve operations (using PEAR::Net_Sieve)
+ *
+ * @author Aleksander Machniak <alec@alec.pl>
+ * @modified by Philip Weir
+ *   * Make ruleset name configurable
+ *   * Added import functions
+ *
+ * Copyright (C) 2009-2014 Philip Weir
+ *
+ * This program is a Roundcube (http://www.roundcube.net) plugin.
+ * For configuration see config.inc.php.dist.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Roundcube. If not, see http://www.gnu.org/licenses/.
+ */
 
 define('SIEVE_ERROR_CONNECTION', 1);
 define('SIEVE_ERROR_LOGIN', 2);

diff --git a/lib/Roundcube/rcube_sieve_script.php b/lib/Roundcube/rcube_sieve_script.php
@@ -1,27 +1,43 @@
 <?php
 
 /*
- +-----------------------------------------------------------------------+
- | rcube_sieve_script class for sieverules script parsing                |
- |                                                                       |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- | Modifications by: Philip Weir                                         |
- |   * Changed name of keys in script array                              |
- |   * Added support for address and envelope                            |
- |   * Added support for vacation                                        |
- |   * Added support for disabled rules (written to file as comment)     |
- |   * Added support for regex tests                                     |
- |   * Added support for imapflags                                       |
- |   * Added support for relational operators and comparators            |
- |   * Added support for subaddress tests                                |
- |   * Added support for notify action                                   |
- |   * Added support for stop action                                     |
- |   * Added support for body and copy                                   |
- |   * Added support for spamtest and virustest                          |
- |   * Added support for date                                            |
- |   * Added support for editheader                                      |
- +-----------------------------------------------------------------------+
-*/
+ * rcube_sieve_script class for sieverules script parsing
+ *
+ * @author Aleksander Machniak <alec@alec.pl>
+ * @modified by Philip Weir
+ *   * Changed name of keys in script array
+ *   * Added support for address and envelope
+ *   * Added support for vacation
+ *   * Added support for disabled rules (written to file as comment)
+ *   * Added support for regex tests
+ *   * Added support for imapflags
+ *   * Added support for relational operators and comparators
+ *   * Added support for subaddress tests
+ *   * Added support for notify action
+ *   * Added support for stop action
+ *   * Added support for body and copy
+ *   * Added support for spamtest and virustest
+ *   * Added support for date
+ *   * Added support for editheader
+ *
+ * Copyright (C) 2009-2014 Philip Weir
+ *
+ * This program is a Roundcube (http://www.roundcube.net) plugin.
+ * For configuration see config.inc.php.dist.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Roundcube. If not, see http://www.gnu.org/licenses/.
+ */
 
 define('SIEVE_ERROR_BAD_ACTION', 1);
 define('SIEVE_ERROR_NOT_FOUND', 2);
@@ -921,7 +937,7 @@ private function _parse_list($content, $regex = false)
 		$result = array();
 
 		if ($regex) {
-			if (preg_match('/^"(.*)"$/', $content, $matches));
+			if (preg_match('/^"(.*)"$/', $content, $matches))
 				$content = $matches[1];
 
 			$content = str_replace('\"', '"', $content);

diff --git a/mail.js b/mail.js
@@ -1,5 +1,18 @@
 /**
  * SieveRules plugin script
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2014 Philip Weir
+ *
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
 
 function rcmail_sieverules() {

diff --git a/sieverules.js b/sieverules.js
@@ -1,5 +1,18 @@
 /**
  * SieveRules plugin script
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2009-2014 Philip Weir
+ *
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
 
 rcube_webmail.prototype.sieverules_select = function(list) {