Request 2389 (accepted)

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.4-beta136.tar.gz/autogen.sh Deleted

roundcubemail-1.4-beta136.tar.gz/CHANGELOG -> roundcubemail-1.4-beta151.tar.gz/CHANGELOG Changed

@@ -12,6 +12,7 @@
 - Update to TinyMCE 4.8.2
 - Plugin API: Added 'raise_error' hook (#6199)
 - Plugin API: Added 'common_headers' hook (#6385)
+- Plugin API: Added 'ldap_connected' hook
 - Enigma: Update to OpenPGPjs 4.2.1 - fixes user name encoding issues in key generation (#6524)
 - Managesieve: Added support for 'editheader' extension - RFC5293 (#5954)
 - Markasjunk: Integrate markasjunk2 features into markasjunk - marking as non-junk + learning engine (#6504)
@@ -23,6 +24,7 @@
 - Passowrd: Allow drivers to define password strength rules displayed to the user
 - Password: Allow separate password saving and strength drivers for use of strength checking services (#5040)
 - Password: Add zxcvbn driver for checking password strength (#6479)
+- Elastic: Improved datepicker displayed always in parent window
 - Elastic: On touch devices display attachment icons on messages list (#6296)
 - Elastic: Make menu button inactive if all subactions are inactive (#6444)
 - Elastic: On mobile/tablet jump to the list on folder selection (#6415)
@@ -41,6 +43,7 @@
 - Fix custom logo size in Elastic (#6424)
 - Fix listing the same attachment multiple times on forwarded messages
 - Fix bug where a message/rfc822 part without a filename wasn't listed on the attachments list (#6494)
+- Fix inconsistent offset for various time zones - always display Standard Time offset (#6531)
 
 RELEASE 1.4-beta
 ----------------
@@ -141,7 +144,7 @@
 - Enigma: Fix deleting keys with authentication subkeys (#6381)
 - Fix invalid regular expressions that throw warnings on PHP 7.3 (#6398)
 - Fix so Classic skin splitter does not escape out of window (#6397)
-- Fix XSS issue in handling invalid style tag content (#6410)
+- Fix XSS issue in handling invalid style tag content [CVE-2018-19206] (#6410)
 - Fix compatibility with MySQL 8 - error on 'system' table use
 - Managesieve: Fix bug where show_real_foldernames setting wasn't respected (#6422)
 - New_user_identity: Fix %fu/%u vars substitution in user specific LDAP params (#6419)

roundcubemail-1.4-beta136.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php -> roundcubemail-1.4-beta151.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php Changed

@@ -2021,7 +2021,7 @@
 
         if (!$compact) {
             $out .= '<td class="advbutton">';
-            $out .= sprintf('<a href="#" id="ruleadv%s" title="%s" onclick="rule_adv_switch(%s, this)" class="show">'
+            $out .= sprintf('<a href="#" id="ruleadv%s" title="%s" onclick="rule_adv_switch(%s, this); return false" class="show">'
                 . '<span class="inner">%s</span></a>', $id, $adv_title, $id, $adv_title);
             $out .= '</td>';
         }
@@ -2032,12 +2032,12 @@
         $out .= '</td>';
         $out .= '<td class="rowbuttons">';
         if ($compact) {
-            $out .= sprintf('<a href="#" id="ruleadv%s" title="%s" onclick="rule_adv_switch(%s, this)" class="advanced show">'
+            $out .= sprintf('<a href="#" id="ruleadv%s" title="%s" onclick="rule_adv_switch(%s, this); return false" class="advanced show">'
                 . '<span class="inner">%s</span></a>', $id, $adv_title, $id, $adv_title);
         }
-        $out .= sprintf('<a href="#" id="ruleadd%s" title="%s" onclick="rcmail.managesieve_ruleadd(\'%s\')" class="button create add">'
+        $out .= sprintf('<a href="#" id="ruleadd%s" title="%s" onclick="rcmail.managesieve_ruleadd(\'%s\'); return false" class="button create add">'
             . '<span class="inner">%s</span></a>', $id, $add_title, $id, $add_title);
-        $out .= sprintf('<a href="#" id="ruledel%s" title="%s" onclick="rcmail.managesieve_ruledel(\'%s\')" class="button delete del%s">'
+        $out .= sprintf('<a href="#" id="ruledel%s" title="%s" onclick="rcmail.managesieve_ruledel(\'%s\'); return false" class="button delete del%s">'
             . '<span class="inner">%s</span></a>', $id, $del_title, $id, ($rows_num < 2 ? ' disabled' : ''), $del_title);
         $out .= '</td>';

roundcubemail-1.4-beta136.tar.gz/program/include/rcmail_output_html.php -> roundcubemail-1.4-beta151.tar.gz/program/include/rcmail_output_html.php Changed

@@ -651,12 +651,6 @@
                 $plugin_skin_paths[] = $this->app->plugins->url . $plugin . '/' . $skin_path;
             }
 
-            // add fallback to default skin
-            if (is_dir($this->app->plugins->dir . $plugin . '/skins/default')) {
-                $skin_dir = $plugin . '/skins/default';
-                $plugin_skin_paths[] = $this->app->plugins->url . $skin_dir;
-            }
-
             // prepend plugin skin paths to search list
             $this->skin_paths = array_merge($plugin_skin_paths, $this->skin_paths);
         }
@@ -664,6 +658,11 @@
         // find skin template
         $path = false;
         foreach ($this->skin_paths as $skin_path) {
+            // when requesting a plugin template ignore global skin path(s)
+            if ($plugin && strpos($skin_path, $this->app->plugins->url) !== 0) {
+                continue;
+            }
+
             $path = RCUBE_INSTALL_PATH . "$skin_path/templates/$name.html";
 
             // fallback to deprecated template names

roundcubemail-1.4-beta136.tar.gz/program/lib/Roundcube/rcube_imap_generic.php -> roundcubemail-1.4-beta151.tar.gz/program/lib/Roundcube/rcube_imap_generic.php Changed

@@ -978,6 +978,14 @@
             $this->prefs['timeout'] = max(0, intval(ini_get('default_socket_timeout')));
         }
 
+        if ($this->debug) {
+            // set connection identifier for debug output
+            $this->resourceid = strtoupper(substr(md5(microtime() . $host . $this->user), 0, 4));
+
+            $_host = ($this->prefs['ssl_mode'] == 'tls' ? 'tls://' : '') . $host . ':' . $this->prefs['port'];
+            $this->debug("Connecting to $_host...");
+        }
+
         if (!empty($this->prefs['socket_options'])) {
             $context  = stream_context_create($this->prefs['socket_options']);
             $this->fp = stream_socket_client($host . ':' . $this->prefs['port'], $errno, $errstr,
@@ -1000,14 +1008,8 @@
 
         $line = trim(fgets($this->fp, 8192));
 
-        if ($this->debug) {
-            // set connection identifier for debug output
-            preg_match('/#([0-9]+)/', (string) $this->fp, $m);
-            $this->resourceid = strtoupper(substr(md5($m[1].$this->user.microtime()), 0, 4));
-
-            if ($line) {
-                $this->debug('S: '. $line);
-            }
+        if ($this->debug && $line) {
+            $this->debug('S: '. $line);
         }
 
         // Connected to wrong port or connection error?

roundcubemail-1.4-beta136.tar.gz/program/lib/Roundcube/rcube_ldap.php -> roundcubemail-1.4-beta151.tar.gz/program/lib/Roundcube/rcube_ldap.php Changed

@@ -284,23 +284,27 @@
                 $this->readonly = false;
             }
 
-            $bind_pass   = $this->prop['bind_pass'];
-            $bind_user   = $this->prop['bind_user'];
-            $bind_dn     = $this->prop['bind_dn'];
-            $auth_method = $this->prop['auth_method'];
+            // trigger post-connect hook
+            $rcube = rcube::get_instance();
+            $conf  = $rcube->plugins->exec_hook('ldap_connected', $this->prop + array('host' => $host));
 
-            $this->base_dn        = $this->prop['base_dn'];
-            $this->groups_base_dn = $this->prop['groups']['base_dn'] ?: $this->base_dn;
+            $bind_pass   = $conf['bind_pass'];
+            $bind_user   = $conf['bind_user'];
+            $bind_dn     = $conf['bind_dn'];
+            $auth_method = $conf['auth_method'];
+
+            $this->base_dn        = $conf['base_dn'];
+            $this->groups_base_dn = $conf['groups']['base_dn'] ?: $this->base_dn;
 
             // User specific access, generate the proper values to use.
-            if ($this->prop['user_specific']) {
+            if ($conf['user_specific']) {
                 // No password set, use the session password
                 if (empty($bind_pass)) {
                     $bind_pass = $rcube->get_user_password();
                 }
 
                 // Get the pieces needed for variable replacement.
-                if ($fu = ($rcube->get_user_email() ?: $this->prop['username'])) {
+                if ($fu = ($rcube->get_user_email() ?: $conf['username'])) {
                     list($u, $d) = explode('@', $fu);
                 }
                 else {
@@ -310,50 +314,49 @@
                 $dc = 'dc='.strtr($d, array('.' => ',dc=')); // hierarchal domain string
 
                 // resolve $dc through LDAP
-                if (!empty($this->prop['domain_filter']) && !empty($this->prop['search_bind_dn']) &&
+                if (!empty($conf['domain_filter']) && !empty($conf['search_bind_dn']) &&
                         method_exists($this->ldap, 'domain_root_dn')) {
-                    $this->ldap->bind($this->prop['search_bind_dn'], $this->prop['search_bind_pw']);
+                    $this->ldap->bind($conf['search_bind_dn'], $conf['search_bind_pw']);
                     $dc = $this->ldap->domain_root_dn($d);
                 }
 
                 $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
 
                 // Search for the dn to use to authenticate
-                if ($this->prop['search_base_dn'] && $this->prop['search_filter']
+                if ($conf['search_base_dn'] && $conf['search_filter']
                     && (strstr($bind_dn, '%dn') || strstr($this->base_dn, '%dn') || strstr($this->groups_base_dn, '%dn'))
                 ) {
                     $search_attribs = array('uid');
-                     if ($search_bind_attrib = (array)$this->prop['search_bind_attrib']) {
-                         foreach ($search_bind_attrib as $r => $attr) {
-                             $search_attribs[] = $attr;
-                             $replaces[$r] = '';
-                         }
-                     }
+                    if ($search_bind_attrib = (array) $conf['search_bind_attrib']) {
+                        foreach ($search_bind_attrib as $r => $attr) {
+                            $search_attribs[] = $attr;
+                            $replaces[$r] = '';
+                        }
+                    }
 
-                    $search_bind_dn = strtr($this->prop['search_bind_dn'], $replaces);
-                    $search_base_dn = strtr($this->prop['search_base_dn'], $replaces);
-                    $search_filter  = strtr($this->prop['search_filter'], $replaces);
+                    $search_bind_dn = strtr($conf['search_bind_dn'], $replaces);
+                    $search_base_dn = strtr($conf['search_base_dn'], $replaces);
+                    $search_filter  = strtr($conf['search_filter'], $replaces);
 
-                    $cache_key = 'DN.' . md5("$host:$search_bind_dn:$search_base_dn:$search_filter:"
-                        .$this->prop['search_bind_pw']);
+                    $cache_key = 'DN.' . md5("$host:$search_bind_dn:$search_base_dn:$search_filter:" . $conf['search_bind_pw']);
 
                     if ($this->cache && ($dn = $this->cache->get($cache_key))) {
                         $replaces['%dn'] = $dn;
                     }
                     else {
                         $ldap = $this->ldap;
-                        if (!empty($search_bind_dn) && !empty($this->prop['search_bind_pw'])) {
+                        if (!empty($search_bind_dn) && !empty($conf['search_bind_pw'])) {
                             // To protect from "Critical extension is unavailable" error
                             // we need to use a separate LDAP connection
-                            if (!empty($this->prop['vlv'])) {
-                                $ldap = new rcube_ldap_generic($this->prop);
+                            if (!empty($conf['vlv'])) {
+                                $ldap = new rcube_ldap_generic($conf);
                                 $ldap->config_set(array('cache' => $this->cache, 'debug' => $this->debug));
                                 if (!$ldap->connect($host)) {
                                     continue;
                                 }
                             }
 
-                            if (!$ldap->bind($search_bind_dn, $this->prop['search_bind_pw'])) {
+                            if (!$ldap->bind($search_bind_dn, $conf['search_bind_pw'])) {
                                 continue;  // bind failed, try next host
                             }
                         }
@@ -379,8 +382,8 @@
 
                     // DN not found
                     if (empty($replaces['%dn'])) {
-                        if (!empty($this->prop['search_dn_default']))
-                            $replaces['%dn'] = $this->prop['search_dn_default'];
+                        if (!empty($conf['search_dn_default']))
+                            $replaces['%dn'] = $conf['search_dn_default'];
                         else {
                             rcube::raise_error(array(
                                 'code' => 100, 'type' => 'ldap',
@@ -401,20 +404,24 @@
                 $this->groups_base_dn = strtr($this->groups_base_dn, $replaces);
 
                 // replace placeholders in filter settings
-                if (!empty($this->prop['filter']))
-                    $this->prop['filter'] = strtr($this->prop['filter'], $replaces);
+                if (!empty($conf['filter'])) {
+                    $this->prop['filter'] = strtr($conf['filter'], $replaces);
+                }
 
                 foreach (array('base_dn','filter','member_filter') as $k) {
-                    if (!empty($this->prop['groups'][$k]))
-                        $this->prop['groups'][$k] = strtr($this->prop['groups'][$k], $replaces);
+                    if (!empty($conf['groups'][$k])) {
+                        $this->prop['groups'][$k] = strtr($conf['groups'][$k], $replaces);
+                    }
                 }
 
-                if (is_array($this->prop['group_filters'])) {
-                    foreach ($this->prop['group_filters'] as $i => $gf) {
-                        if (!empty($gf['base_dn']))
+                if (is_array($conf['group_filters'])) {
+                    foreach ($conf['group_filters'] as $i => $gf) {
+                        if (!empty($gf['base_dn'])) {
                             $this->prop['group_filters'][$i]['base_dn'] = strtr($gf['base_dn'], $replaces);
-                        if (!empty($gf['filter']))
+                        }
+                        if (!empty($gf['filter'])) {
                             $this->prop['group_filters'][$i]['filter'] = strtr($gf['filter'], $replaces);
+                        }
                     }
                 }
 
@@ -427,11 +434,11 @@
                 $this->ready = true;
             }
             else {
-                if (!empty($bind_dn)) {
-                    $this->ready = $this->ldap->bind($bind_dn, $bind_pass);
+                if (!empty($conf['auth_cid'])) {
+                    $this->ready = $this->ldap->sasl_bind($conf['auth_cid'], $bind_pass, $bind_dn);
                 }
-                else if (!empty($this->prop['auth_cid'])) {
-                    $this->ready = $this->ldap->sasl_bind($this->prop['auth_cid'], $bind_pass, $bind_user);
+                else if (!empty($bind_dn)) {
+                    $this->ready = $this->ldap->bind($bind_dn, $bind_pass);
                 }
                 else {
                     $this->ready = $this->ldap->sasl_bind($bind_user, $bind_pass);

roundcubemail-1.4-beta136.tar.gz/program/lib/Roundcube/rcube_session.php -> roundcubemail-1.4-beta151.tar.gz/program/lib/Roundcube/rcube_session.php Changed

roundcubemail-1.4-beta136.tar.gz/program/lib/Roundcube/rcube_smtp.php -> roundcubemail-1.4-beta151.tar.gz/program/lib/Roundcube/rcube_smtp.php Changed

roundcubemail-1.4-beta136.tar.gz/program/steps/settings/func.inc -> roundcubemail-1.4-beta151.tar.gz/program/steps/settings/func.inc Changed

@@ -207,14 +207,9 @@
 
                 $zones = array();
                 foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
-                    try {
-                        $tz      = new DateTimeZone($tzs);
-                        $date    = new DateTime(date('Y') . '-12-21', $tz);
-                        $offset  = $date->format('Z') + 45000;
-                        $sortkey = sprintf('%06d.%s', $offset, $tzs);
-                        $zones[$sortkey] = array($tzs, $date->format('P'));
+                    if ($data = rcmail_timezone_standard_time_data($tzs)) {
+                        $zones[$data['key']] = array($tzs, $data['offset']);
                     }
-                    catch (Exception $e) {}
                 }
 
                 ksort($zones);
@@ -1479,3 +1474,30 @@
 
     return implode('/', $tokens);
 }
+
+/**
+ * Returns timezone offset in standard time
+ */
+function rcmail_timezone_standard_time_data($tzname)
+{
+    try {
+        $tz    = new DateTimeZone($tzname);
+        $date  = new DateTime(null, $tz);
+        $count = 12;
+
+        // Move back for a month (up to 12 times) until non-DST date is found
+        while ($count > 0 && $date->format('I')) {
+            $date->sub(new DateInterval('P1M'));
+            $count--;
+        }
+
+        $offset  = $date->format('Z') + 45000;
+        $sortkey = sprintf('%06d.%s', $offset, $tzname);
+
+        return array(
+            'key'    => $sortkey,
+            'offset' => $date->format('P'),
+        );
+    }
+    catch (Exception $e) {}
+}

roundcubemail-1.4-beta136.tar.gz/skins/classic/templates/mail.html -> roundcubemail-1.4-beta151.tar.gz/skins/classic/templates/mail.html Changed

roundcubemail-1.4-beta136.tar.gz/skins/elastic/styles/widgets/jqueryui.less -> roundcubemail-1.4-beta151.tar.gz/skins/elastic/styles/widgets/jqueryui.less Changed

@@ -14,6 +14,10 @@
 .ui-widget-overlay {
     background-color: @color-dialog-overlay-background;
     opacity: 1 !important; // override jQuery-UI opacity, the color above is semi-transparent
+
+    &.datepicker {
+        z-index: 119; // above Bootstrap's form controls, below datepicker
+    }
 }
 
 .ui-widget {
@@ -286,11 +290,11 @@
 
 .ui-datepicker {
     // Always display datepicker centered, overwriting widgets position
-    position: fixed !important;
-    top: 50% !important;
-    left: 50% !important;
-    transform: translate(-50%, -50%);
-    box-shadow: 10px 10px 10px 1000px @color-dialog-overlay-background;
+    margin: ~"calc(50vh - 10em) calc(50vw - 10em) !important";
+    top: 0 !important;
+    left: 0 !important;
+    box-shadow: none;
+    user-select: none;
 
     &:not(.ui-datepicker-inline) {
         z-index: 120 !important; // fixes datepicker over input-group and dialogs
@@ -314,6 +318,7 @@
             display: inline-block;
         }
     }
+
     .ui-icon {
         background-image: none !important;
         background-position: none !important;
@@ -354,6 +359,8 @@
         color: @color-datepicker-font;
     }
 
+    .ui-datepicker-days-cell-over a,
+    .ui-datepicker-days-cell-over a.ui-state-default,
     .ui-state-highlight,
     &.ui-widget-content .ui-state-highlight {
         background: @color-datepicker-highlight-background;
@@ -366,15 +373,13 @@
         color: @color-datepicker-active;
         font-weight: bold;
     }
-}
-
-html.touch {
-    .ui-datepicker {
-        min-width: (@screen-width-mini - 20px);
 
-        td a {
-            font-size: 1.2em;
-            line-height: 2.2em;
+    html.touch {
+        & {
+            td a {
+                font-size: 1.2em;
+                line-height: 2.2em;
+            }
         }
     }
 }

roundcubemail-1.4-beta136.tar.gz/skins/elastic/templates/mail.html -> roundcubemail-1.4-beta151.tar.gz/skins/elastic/templates/mail.html Changed

roundcubemail-1.4-beta136.tar.gz/skins/elastic/ui.js -> roundcubemail-1.4-beta151.tar.gz/skins/elastic/ui.js Changed

@@ -78,6 +78,8 @@
     this.searchbar_init = searchbar_init;
     this.pretty_checkbox = pretty_checkbox;
     this.pretty_select = pretty_select;
+    this.datepicker_init = datepicker_init;
+    this.bootstrap_style = bootstrap_style;
 
 
     // Detect screen size/mode
@@ -373,7 +375,7 @@
     /**
      * Create a button clone for use in toolbar
      */
-    function create_cloned_button(target, menu_button, add_class)
+    function create_cloned_button(target, menu_button, add_class, always_active)
     {
         var popup, click = true,
             button = $('<a>'),
@@ -383,7 +385,7 @@
 
         if (!menu_button) {
             btn_class = $.trim(btn_class.replace('btn-primary', 'primary').replace(/(btn[a-z-]*|button|disabled)/g, ''))
-            btn_class += ' button disabled';
+            btn_class += ' button' + (!always_active ? ' disabled' : '');
         }
         else if (popup = target.data('popup')) {
             button.data({popup: popup, 'toggle-button': target.data('toggle-button')});
@@ -626,7 +628,7 @@
                 if ((task == '*' || task == rcmail.task)
                     && (action == '*' || action == rcmail.env.action || (action == 'none' && !rcmail.env.action))
                 ) {
-                    fabuttons.push(create_cloned_button(button));
+                    fabuttons.push(create_cloned_button(button, false, false, true));
                 }
             });
 
@@ -727,8 +729,8 @@
         }
 
         // Add date format placeholder to datepicker inputs
-        var func, format;
-        if (format = rcmail.env.date_format_localized) {
+        var func, format = rcmail.env.date_format_localized;
+        if (format) {
             func = function(input) { $(input).filter('.datepicker').attr('placeholder', format); };
             $('input.datepicker').each(function() { func(this); });
             rcmail.addEventListener('insert-edit-field', func);
@@ -987,11 +989,6 @@
             $('a', this).addClass('btn btn-primary');
         });
 
-        // Style calendar widget (we use setTimeout() because there's no widget event we could bind to)
-        $('input.datepicker', context).focus(function() {
-            setTimeout(function() { bootstrap_style($('.ui-datepicker')); }, 5);
-        });
-
         // Form validation errors (managesieve plugin)
         $('.error', context).addClass('is-invalid');
 
@@ -1345,6 +1342,68 @@
         }
     };
 
+    function datepicker_init(datepicker)
+    {
+        // Datepicker widget improvements: overlay element, styling updates on calendar element update
+        // The widget does not provide any event system, so we use MutationObserver
+        if (window.MutationObserver) {
+            $(datepicker).not('[data-observed]').each(function() {
+                var overlay, hidden = true,
+                    win = is_framed ? parent : window,
+                    callback = function(data) {
+                        $.each(data, function(i, v) {
+                            // add/remove overlay on widget show/hide
+                            if (v.type == 'attributes') {
+                                var is_hidden = $(v.target).attr('aria-hidden') == 'true';
+                                if (is_hidden != hidden) {
+                                    if (!is_hidden) {
+                                        overlay = $('<div>').attr('class', 'ui-widget-overlay datepicker')
+                                            .appendTo(win.document.body)
+                                            .click(function(e) {
+                                                $(this).remove();
+                                                if (is_framed) {
+                                                    $.datepicker._hideDatepicker();
+                                                }
+                                            });
+                                    }
+                                    else if (overlay) {
+                                        overlay.remove();
+                                    }
+                                    hidden = is_hidden;
+                                }
+                            }
+                            else if (v.addedNodes.length) {
+                                // apply styles when widget content changed
+                                win.UI.bootstrap_style(v.target);
+
+                                // Month/Year change handlers do not work from parent, fix it
+                                if (is_framed) {
+                                    win.$('select.ui-datepicker-month', v.target).on('change', function() {
+                                        $.datepicker._selectMonthYear($.datepicker._lastInput, this, "M");
+                                    });
+                                    win.$('select.ui-datepicker-year', v.target).on('change', function() {
+                                        $.datepicker._selectMonthYear($.datepicker._lastInput, this, "Y");
+                                    });
+                                }
+                            }
+                        });
+                    };
+
+                $(this).attr('data-observed', '1');
+
+                if (is_framed) {
+                    // move the datepicker to parent window
+                    $(this).detach().appendTo(parent.document.body);
+
+                    // create fake element, so the valid one is not removed by datepicker code
+                    $('<div id="ui-datepicker-div" class="hidden">').appendTo(document.body);
+                }
+
+                (new MutationObserver(callback)).observe(this, {childList: true, subtree: false, attributes: true, attributeFilter: ['aria-hidden']});
+            });
+        }
+    };
+
     /**
      * Handler for some Roundcube core popups
      */
@@ -3329,7 +3388,7 @@
                 .append(items)
                 .on('click', 'a.active', function() {
                     // first close the list, then update the select, the order is important
-                    //for cases when the select might be removed in change event (datepicker)
+                    // for cases when the select might be removed in change event (datepicker)
                     var val = $(this).data('value'), ret = close_func();
                     select.val(val).change();
                     return ret;
@@ -3367,7 +3426,7 @@
                 .popover({
                     // because of focus issues we can't always use body,
                     // if select is in a dialog, popover has to be a child of this dialog
-                    container: dialog || 'body',
+                    container: dialog || document.body,
                     content: list[0],
                     placement: 'bottom',
                     trigger: 'manual',
@@ -3393,6 +3452,9 @@
                     if (rcube_event.is_keyboard(e)) {
                         list.find('a.active:first').focus();
                     }
+
+                    // don't propagate mousedown event
+                    list.on('mousedown', function(e) { e.stopPropagation(); });
                 })
                 .popover('show');
         };
@@ -3817,9 +3879,26 @@
 else {
     // rcmail does not exists e.g. on the error template inside a frame
     // we fake the engine a little
-    var rcmail = parent.rcmail;
-    var rcube_webmail = parent.rcube_webmail;
-    var bw = {};
+    var rcmail = parent.rcmail,
+        rcube_webmail = parent.rcube_webmail,
+        bw = {};
 }
 
 var UI = new rcube_elastic_ui();
+
+// Improve non-inline datepickers
+if ($ && $.datepicker) {
+    var __newInst = $.datepicker._newInst;
+
+    $.extend($.datepicker, {
+        _newInst: function(target, inline) {
+            var inst = __newInst.call(this, target, inline);
+
+            if (!inst.inline) {
+                UI.datepicker_init(inst.dpDiv);
+            }
+
+            return inst;
+        }
+    });
+}

roundcubemail-1.4-beta136.tar.gz/skins/larry/templates/mail.html -> roundcubemail-1.4-beta151.tar.gz/skins/larry/templates/mail.html Changed

roundcubemail-1.4-beta136.tar.gz/temp/js_cache/tinymce-langs-4.8.2.zip -> roundcubemail-1.4-beta151.tar.gz/temp/js_cache/tinymce-langs-4.8.2.zip Changed

roundcubemail.dsc Changed

Overview

Request 2389 (accepted)

Request History