diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/archive/archive.js | 9 | ||||
| -rw-r--r-- | plugins/help/skins/larry/templates/help.html | 1 | ||||
| -rw-r--r-- | plugins/http_authentication/http_authentication.php | 10 | ||||
| -rw-r--r-- | plugins/managesieve/skins/larry/templates/managesieve.html | 1 | ||||
| -rw-r--r-- | plugins/newmail_notifier/newmail_notifier.js | 2 | ||||
| -rw-r--r-- | plugins/password/drivers/ldap.php | 2 | ||||
| -rw-r--r-- | plugins/password/drivers/ldap_simple.php | 2 |
7 files changed, 13 insertions, 14 deletions
diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js index 2e5267425..6ed4f971a 100644 --- a/plugins/archive/archive.js +++ b/plugins/archive/archive.js @@ -8,7 +8,7 @@ function rcmail_archive(prop) if (!rcmail.env.uid && (!rcmail.message_list || !rcmail.message_list.get_selection().length)) return; - if (rcmail_is_archive()) { + if (!rcmail_is_archive()) { if (!rcmail.env.archive_type) { // simply move to archive folder (if no partition type is set) rcmail.command('move', rcmail.env.archive_folder); @@ -22,9 +22,6 @@ function rcmail_archive(prop) function rcmail_is_archive() { - if (!rcmail.env.archive_folder) - return false; - // check if current folder is an archive folder or one of its children if (rcmail.env.mailbox == rcmail.env.archive_folder || rcmail.env.mailbox.startsWith(rcmail.env.archive_folder + rcmail.env.delimiter) @@ -37,12 +34,12 @@ function rcmail_is_archive() if (window.rcmail) { rcmail.addEventListener('init', function(evt) { // register command (directly enable in message view mode) - rcmail.register_command('plugin.archive', rcmail_archive, rcmail.env.uid && rcmail_is_archive()); + rcmail.register_command('plugin.archive', rcmail_archive, rcmail.env.uid && !rcmail_is_archive()); // add event-listener to message list if (rcmail.message_list) rcmail.message_list.addEventListener('select', function(list) { - rcmail.enable_command('plugin.archive', list.get_selection().length > 0 && rcmail_is_archive()); + rcmail.enable_command('plugin.archive', list.get_selection().length > 0 && !rcmail_is_archive()); }); // set css style for archive folder diff --git a/plugins/help/skins/larry/templates/help.html b/plugins/help/skins/larry/templates/help.html index bfd3f1141..f1d1f232e 100644 --- a/plugins/help/skins/larry/templates/help.html +++ b/plugins/help/skins/larry/templates/help.html @@ -21,7 +21,6 @@ <div class="iframebox help_<roundcube:var name='env:action' />"> <roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" /> </div> - <roundcube:object name="message" id="message" class="statusbar" /> </div> </div> diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php index d86e1791c..83f29c84f 100644 --- a/plugins/http_authentication/http_authentication.php +++ b/plugins/http_authentication/http_authentication.php @@ -29,7 +29,7 @@ class http_authentication extends rcube_plugin function startup($args) { - if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) { + if (!empty($_SERVER['PHP_AUTH_USER'])) { $rcmail = rcmail::get_instance(); $rcmail->add_shutdown_function(array('http_authentication', 'shutdown')); @@ -38,7 +38,8 @@ class http_authentication extends rcube_plugin $args['action'] = 'login'; } // Set user password in session (see shutdown() method for more info) - else if (!empty($_SESSION['user_id']) && empty($_SESSION['password'])) { + else if (!empty($_SESSION['user_id']) && empty($_SESSION['password']) + && !empty($_SERVER['PHP_AUTH_PW'])) { $_SESSION['password'] = $rcmail->encrypt($_SERVER['PHP_AUTH_PW']); } } @@ -61,9 +62,10 @@ class http_authentication extends rcube_plugin return $args; } - if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) { + if (!empty($_SERVER['PHP_AUTH_USER'])) { $args['user'] = $_SERVER['PHP_AUTH_USER']; - $args['pass'] = $_SERVER['PHP_AUTH_PW']; + if (!empty($_SERVER['PHP_AUTH_PW'])) + $args['pass'] = $_SERVER['PHP_AUTH_PW']; } $args['cookiecheck'] = false; diff --git a/plugins/managesieve/skins/larry/templates/managesieve.html b/plugins/managesieve/skins/larry/templates/managesieve.html index 25bbbaf69..4fa5e2a84 100644 --- a/plugins/managesieve/skins/larry/templates/managesieve.html +++ b/plugins/managesieve/skins/larry/templates/managesieve.html @@ -40,7 +40,6 @@ <div class="iframebox"> <roundcube:object name="filterframe" id="filter-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" /> </div> - <roundcube:object name="message" id="message" class="statusbar" /> </div> </div> diff --git a/plugins/newmail_notifier/newmail_notifier.js b/plugins/newmail_notifier/newmail_notifier.js index 2beacf650..69f1867c9 100644 --- a/plugins/newmail_notifier/newmail_notifier.js +++ b/plugins/newmail_notifier/newmail_notifier.js @@ -108,7 +108,7 @@ function newmail_notifier_desktop(body) lang: "", body: body, tag: "newmail_notifier", - icon: "plugins/newmail_notifier/mail.png", + icon: "plugins/newmail_notifier/mail.png" }); popup.onclick = function() { this.close(); diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php index cf62debcf..739958ad7 100644 --- a/plugins/password/drivers/ldap.php +++ b/plugins/password/drivers/ldap.php @@ -146,7 +146,7 @@ class rcube_ldap_password return ''; } - $base = $rcmail->config->get('password_ldap_search_base'); + $base = self::substitute_vars($rcmail->config->get('password_ldap_search_base')); $filter = self::substitute_vars($rcmail->config->get('password_ldap_search_filter')); $options = array ( 'scope' => 'sub', diff --git a/plugins/password/drivers/ldap_simple.php b/plugins/password/drivers/ldap_simple.php index c5d828fab..47e3b07de 100644 --- a/plugins/password/drivers/ldap_simple.php +++ b/plugins/password/drivers/ldap_simple.php @@ -187,6 +187,8 @@ class rcube_ldap_simple_password $search_base = $rcmail->config->get('password_ldap_search_base'); $search_filter = $rcmail->config->get('password_ldap_search_filter'); + + $search_base = rcube_ldap_password::substitute_vars($search_base); $search_filter = rcube_ldap_password::substitute_vars($search_filter); $this->_debug("C: Search $search_base for $search_filter"); |