Request 2780 (accepted)

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.4.9.3.tar.gz/CHANGELOG -> roundcubemail-1.4.10.tar.gz/CHANGELOG Changed

roundcubemail-1.4.10.tar.gz/autogen.sh Added

roundcubemail-1.4.9.3.tar.gz/composer.json-dist -> roundcubemail-1.4.10.tar.gz/composer.json-dist Changed

roundcubemail-1.4.9.3.tar.gz/index.php -> roundcubemail-1.4.10.tar.gz/index.php Changed

roundcubemail-1.4.9.3.tar.gz/installer/index.php -> roundcubemail-1.4.10.tar.gz/installer/index.php Changed

roundcubemail-1.4.9.3.tar.gz/program/include/iniset.php -> roundcubemail-1.4.10.tar.gz/program/include/iniset.php Changed

roundcubemail-1.4.9.3.tar.gz/program/js/app.js -> roundcubemail-1.4.10.tar.gz/program/js/app.js Changed

@@ -7689,20 +7689,28 @@
 
   this.subscribe = function(folder)
   {
-    if (folder) {
-      var lock = this.display_message('foldersubscribing', 'loading');
-      this.http_post('subscribe', {_mbox: folder}, lock);
-    }
+    this.change_subscription_state(folder, true);
   };
 
   this.unsubscribe = function(folder)
   {
+    this.change_subscription_state(folder, false);
+  };
+
+  this.change_subscription_state = function(folder, state)
+  {
     if (folder) {
-      var lock = this.display_message('folderunsubscribing', 'loading');
-      this.http_post('unsubscribe', {_mbox: folder}, lock);
+      var prefix = state ? '' : 'un',
+        lock = this.display_message('folder' + prefix + 'subscribing', 'loading');
+
+      this.http_post(prefix + 'subscribe', {_mbox: folder}, lock);
+
+      // in case this was a list of search results, update also the main list
+      $(this.gui_objects.subscriptionlist).find('input[value="' + folder + '"]').prop('checked', state);
     }
   };
 
+
   // when user select a folder in manager
   this.show_folder = function(folder, path, force)
   {

roundcubemail-1.4.9.3.tar.gz/program/js/treelist.js -> roundcubemail-1.4.10.tar.gz/program/js/treelist.js Changed

roundcubemail-1.4.9.3.tar.gz/program/lib/Roundcube/bootstrap.php -> roundcubemail-1.4.10.tar.gz/program/lib/Roundcube/bootstrap.php Changed

roundcubemail-1.4.9.3.tar.gz/program/lib/Roundcube/rcube_string_replacer.php -> roundcubemail-1.4.10.tar.gz/program/lib/Roundcube/rcube_string_replacer.php Changed

@@ -25,7 +25,7 @@
  */
 class rcube_string_replacer
 {
-    public static $pattern = '/##str_replacement_(\d+)##/';
+    public $pattern;
     public $mailto_pattern;
     public $link_pattern;
     public $linkref_index;
@@ -45,6 +45,10 @@
      */
     function __construct($options = array())
     {
+        // Create hard-to-guess replacement string
+        $uniq_ident    = sprintf('%010d%010d', mt_rand(), mt_rand());
+        $this->pattern = '/##' . $uniq_ident . '##(\d+)##/';
+
         // Simplified domain expression for UTF8 characters handling
         // Support unicode/punycode in top-level domain part
         $utf_domain = '[^?&@"\'\\/()<>\s\r\t\n]+\\.?([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})';
@@ -55,7 +59,7 @@
         $link_prefix = "([\w]+:\/\/|{$this->noword}[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)";
 
         $this->options         = $options;
-        $this->linkref_index   = '/\[([^\]#]+)\](:?\s*##str_replacement_(\d+)##)/';
+        $this->linkref_index   = '/\[([^\]#]+)\](:?\s*' . substr($this->pattern, 1, -1) . ')/';
         $this->linkref_pattern = '/\[([^\]#]+)\]/';
         $this->link_pattern    = "/$link_prefix($utf_domain([$url1]*[$url2]+)*)/";
         $this->mailto_pattern  = "/("
@@ -88,7 +92,7 @@
      */
     public function get_replacement($i)
     {
-        return '##str_replacement_' . $i . '##';
+        return str_replace('(\d+)', $i, substr($this->pattern, 1, -1));
     }
 
     /**
@@ -135,7 +139,7 @@
     public function linkref_addindex($matches)
     {
         $key = $matches[1];
-        $this->linkrefs[$key] = $this->urls[$matches[3]];
+        $this->linkrefs[$key] = isset($this->urls[$matches[3]]) ? $this->urls[$matches[3]] : null;
 
         return $this->get_replacement($this->add('['.$key.']')) . $matches[2];
     }
@@ -185,7 +189,7 @@
      */
     public function replace_callback($matches)
     {
-        return $this->values[$matches[1]];
+        return isset($this->values[$matches[1]]) ? $this->values[$matches[1]] : null;
     }
 
     /**
@@ -216,7 +220,7 @@
      */
     public function resolve($str)
     {
-        return preg_replace_callback(self::$pattern, array($this, 'replace_callback'), $str);
+        return preg_replace_callback($this->pattern, array($this, 'replace_callback'), $str);
     }
 
     /**

roundcubemail-1.4.9.3.tar.gz/program/lib/Roundcube/rcube_utils.php -> roundcubemail-1.4.10.tar.gz/program/lib/Roundcube/rcube_utils.php Changed

roundcubemail-1.4.9.3.tar.gz/public_html/index.php -> roundcubemail-1.4.10.tar.gz/public_html/index.php Changed

roundcubemail-1.4.9.3.tar.gz/tests/Framework/Text2Html.php -> roundcubemail-1.4.10.tar.gz/tests/Framework/Text2Html.php Changed

roundcubemail-1.4.9.3.tar.gz/0001-Fix-extra-angle-brackets-in-In-Reply-To-header-deriv.patch Deleted

@@ -1,40 +0,0 @@
-From 26b4dc3cf73da9c1b57bb78c98d9ce23efd0ed4d Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Mon, 5 Oct 2020 18:15:47 +0200
-Subject: [PATCH 1/3] Fix extra angle brackets in In-Reply-To header derived
- from mailto: params (#7655)
-
----
- CHANGELOG                      | 2 ++
- program/steps/mail/compose.inc | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 8a8d31d1e..30d881be9 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -1,6 +1,8 @@
- CHANGELOG Roundcube Webmail
- ===========================
- 
-+- Fix extra angle brackets in In-Reply-To header derived from mailto: params (#7655)
-+
- RELEASE 1.4.9
- -------------
- - Fix HTML editor in latest Chrome 85.0.4183.102, update to TinyMCE 4.9.11 (#7615)
-diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
-index 10cc78ae9..73be67b36 100644
---- a/program/steps/mail/compose.inc
-+++ b/program/steps/mail/compose.inc
-@@ -246,7 +246,7 @@ else {
- 
-     // apply mailto: URL parameters
-     if (!empty($COMPOSE['param']['in-reply-to'])) {
--        $COMPOSE['reply_msgid'] = '<' . $COMPOSE['param']['in-reply-to'] . '>';
-+        $COMPOSE['reply_msgid'] = '<' . trim($COMPOSE['param']['in-reply-to'], '<> ') . '>';
-     }
- 
-     if (!empty($COMPOSE['param']['references'])) {
--- 
-2.25.4
-

roundcubemail-1.4.9.3.tar.gz/0002-Fix-folder-list-issue-whan-special-folder-is-a-subfo.patch Deleted

@@ -1,132 +0,0 @@
-From e87ca843b8ee70116e5bf5d9aadce0b464771112 Mon Sep 17 00:00:00 2001
-From: Sebastian Abshoff <sebastian@abshoff.it>
-Date: Mon, 12 Oct 2020 20:28:11 +0200
-Subject: [PATCH 2/3] Fix folder list issue whan special folder is a subfolder 
- (#7647)
-
-* Fix incorrect folders settings
-
-If a special folder was located within some subfolder, then the folders settings view was broken. It added a virtual folder for an existing folder which itself was not displayed. This bugfix puts special folders at the root level and removes any parent folder.
----
- program/steps/settings/folders.inc | 45 +++++++++++++++---------------
- 1 file changed, 23 insertions(+), 22 deletions(-)
-
-diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
-index dd0198241..850fb60bf 100644
---- a/program/steps/settings/folders.inc
-+++ b/program/steps/settings/folders.inc
-@@ -224,8 +224,9 @@ function rcmail_folder_subscriptions($attrib)
-         $folder        = $STORAGE->mod_folder($folder);
-         $foldersplit   = explode($delimiter, $folder);
-         $name          = rcube_charset::convert(array_pop($foldersplit), 'UTF7-IMAP');
--        $parent_folder = join($delimiter, $foldersplit);
--        $level         = count($foldersplit);
-+        $is_special    = isset($special_folders[$folder_id]);
-+        $parent_folder = $is_special ? '' : join($delimiter, $foldersplit);
-+        $level         = $is_special ? 0 : count($foldersplit);
- 
-         // add any necessary "virtual" parent folders
-         if ($parent_folder && !isset($seen[$parent_folder])) {
-@@ -271,41 +272,41 @@ function rcmail_folder_subscriptions($attrib)
- 
-     // create list of available folders
-     foreach ($list_folders as $i => $folder) {
--        $sub_key    = array_search($folder['id'], $a_subscribed);
--        $subscribed = $sub_key !== false;
--        $special    = $folder['id'] == 'INBOX' || isset($special_folders[$folder['id']]);
--        $protected  = $folder['id'] == 'INBOX' || ($protect_default && $special);
--        $noselect   = false;
--        $classes    = array();
-+        $sub_key       = array_search($folder['id'], $a_subscribed);
-+        $is_subscribed = $sub_key !== false;
-+        $is_special    = isset($special_folders[$folder['id']]);
-+        $is_protected  = $folder['id'] == 'INBOX' || ($protect_default && $is_special);
-+        $noselect      = false;
-+        $classes       = array();
- 
-         $folder_utf8    = rcube_charset::convert($folder['id'], 'UTF7-IMAP');
--        $display_folder = rcube::Q($special ? $RCMAIL->localize_foldername($folder['id'], false, true) : $folder['name']);
-+        $display_folder = rcube::Q($is_special ? $RCMAIL->localize_foldername($folder['id'], false, true) : $folder['name']);
- 
-         if ($folder['virtual']) {
-             $classes[] = 'virtual';
-         }
- 
-         // Check \Noselect flag (of existing folder)
--        if (!$protected && in_array($folder['id'], $a_unsubscribed)) {
-+        if (!$is_protected && in_array($folder['id'], $a_unsubscribed)) {
-             $attrs = $STORAGE->folder_attributes($folder['id']);
-             $noselect = in_array_nocase('\\Noselect', $attrs);
-         }
- 
--        $disabled = (($protected && $subscribed) || $noselect);
-+        $is_disabled = (($is_protected && $is_subscribed) || $noselect);
- 
-         // Below we will disable subscription option for "virtual" folders
-         // according to namespaces, but only if they aren't already subscribed.
-         // User should be able to unsubscribe from the folder
-         // even if it doesn't exists or is not accessible (OTRS:1000059)
--        if (!$subscribed && !$disabled && !empty($namespace) && $folder['virtual']) {
-+        if (!$is_subscribed && !$is_disabled && !empty($namespace) && $folder['virtual']) {
-             // check if the folder is a namespace prefix, then disable subscription option on it
--            if (!$disabled && $folder['level'] == 0) {
-+            if (!$is_disabled && $folder['level'] == 0) {
-                 $fname = $folder['id'] . $delimiter;
-                 foreach ($namespace as $ns) {
-                     if (is_array($ns)) {
-                         foreach ($ns as $item) {
-                             if ($item[0] === $fname) {
--                                $disabled = true;
-+                                $is_disabled = true;
-                                 break 2;
-                             }
-                         }
-@@ -313,22 +314,22 @@ function rcmail_folder_subscriptions($attrib)
-                 }
-             }
-             // check if the folder is an other users virtual-root folder, then disable subscription option on it
--            if (!$disabled && $folder['level'] == 1 && !empty($namespace['other'])) {
-+            if (!$is_disabled && $folder['level'] == 1 && !empty($namespace['other'])) {
-                 $parts = explode($delimiter, $folder['id']);
-                 $fname = $parts[0] . $delimiter;
-                 foreach ($namespace['other'] as $item) {
-                     if ($item[0] === $fname) {
--                        $disabled = true;
-+                        $is_disabled = true;
-                         break;
-                     }
-                 }
-             }
-             // check if the folder is shared, then disable subscription option on it (if not subscribed already)
--            if (!$disabled) {
-+            if (!$is_disabled) {
-                 $tmp_ns = array_merge((array)$namespace['other'], (array)$namespace['shared']);
-                 foreach ($tmp_ns as $item) {
-                     if (strlen($item[0]) && strpos($folder['id'], $item[0]) === 0) {
--                        $disabled = true;
-+                        $is_disabled = true;
-                         break;
-                     }
-                 }
-@@ -347,14 +348,14 @@ function rcmail_folder_subscriptions($attrib)
-             'folder_imap' => $folder['id'],
-             'folder'      => $folder_utf8,
-             'display'     => $display_folder,
--            'protected'   => $protected || $folder['virtual'],
-+            'protected'   => $is_protected || $folder['virtual'],
-             'class'       => join(' ', $classes),
--            'subscribed'  => $subscribed,
-+            'subscribed'  => $is_subscribed,
-             'level'       => $folder['level'],
-             'collapsed'   => $is_collapsed,
-             'content'     => html::a(array('href' => '#'), $display_folder)
--                . $checkbox_subscribe->show(($subscribed ? $folder['id'] : ''),
--                    array('value' => $folder['id'], 'disabled' => $disabled ? 'disabled' : ''))
-+                . $checkbox_subscribe->show(($is_subscribed ? $folder['id'] : ''),
-+                    array('value' => $folder['id'], 'disabled' => $is_disabled ? 'disabled' : ''))
-         );
-     }
- 
--- 
-2.25.4
-

roundcubemail-1.4.9.3.tar.gz/0003-Update-changelog.patch Deleted

roundcubemail.dsc Changed

Overview

Request 2780 (accepted)

Request History