From fbe54043cf598b19a753dc2b21a7ed558d23fd15 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Aug 2011 13:40:07 -0400
Subject: [PATCH] Fix folders drop-down list: descend into root folder (e.g. INBOX) even if part of the exception list
---
program/include/rcube_browser.php | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index 56e6d3c..c89c389 100644
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/include/rcube_browser.php |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2007-2009, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2007-2009, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -15,7 +15,7 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: rcube_browser.php 328 2006-08-30 17:41:21Z thomasb $
+ $Id$
*/
@@ -30,40 +30,37 @@
{
function __construct()
{
- $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
+ $HTTP_USER_AGENT = strtolower($_SERVER['HTTP_USER_AGENT']);
$this->ver = 0;
- $this->win = stristr($HTTP_USER_AGENT, 'win');
- $this->mac = stristr($HTTP_USER_AGENT, 'mac');
- $this->linux = stristr($HTTP_USER_AGENT, 'linux');
- $this->unix = stristr($HTTP_USER_AGENT, 'unix');
+ $this->win = strstr($HTTP_USER_AGENT, 'win');
+ $this->mac = strstr($HTTP_USER_AGENT, 'mac');
+ $this->linux = strstr($HTTP_USER_AGENT, 'linux');
+ $this->unix = strstr($HTTP_USER_AGENT, 'unix');
- $this->opera = stristr($HTTP_USER_AGENT, 'opera');
- $this->ns4 = stristr($HTTP_USER_AGENT, 'mozilla/4') && !stristr($HTTP_USER_AGENT, 'msie');
- $this->ns = ($this->ns4 || stristr($HTTP_USER_AGENT, 'netscape'));
- $this->ie = stristr($HTTP_USER_AGENT, 'compatible; msie') && !$this->opera;
- $this->mz = stristr($HTTP_USER_AGENT, 'mozilla/5');
- $this->khtml = stristr($HTTP_USER_AGENT, 'khtml');
- $this->safari = ($this->khtml || stristr($HTTP_USER_AGENT, 'safari'));
+ $this->opera = strstr($HTTP_USER_AGENT, 'opera');
+ $this->ns4 = strstr($HTTP_USER_AGENT, 'mozilla/4') && !stristr($HTTP_USER_AGENT, 'msie');
+ $this->ns = ($this->ns4 || strstr($HTTP_USER_AGENT, 'netscape'));
+ $this->ie = !$this->opera && stristr($HTTP_USER_AGENT, 'compatible; msie');
+ $this->mz = !$this->ie && strstr($HTTP_USER_AGENT, 'mozilla/5');
+ $this->chrome = strstr($HTTP_USER_AGENT, 'chrome');
+ $this->khtml = strstr($HTTP_USER_AGENT, 'khtml');
+ $this->safari = !$this->chrome && ($this->khtml || strstr($HTTP_USER_AGENT, 'safari'));
- if ($this->ns) {
- $test = eregi("mozilla\/([0-9\.]+)", $HTTP_USER_AGENT, $regs);
+ if ($this->ns || $this->chrome) {
+ $test = preg_match('/(mozilla|chrome)\/([0-9.]+)/', $HTTP_USER_AGENT, $regs);
+ $this->ver = $test ? (float)$regs[2] : 0;
+ }
+ else if ($this->mz) {
+ $test = preg_match('/rv:([0-9.]+)/', $HTTP_USER_AGENT, $regs);
$this->ver = $test ? (float)$regs[1] : 0;
}
- if ($this->mz) {
- $test = ereg("rv:([0-9\.]+)", $HTTP_USER_AGENT, $regs);
- $this->ver = $test ? (float)$regs[1] : 0;
- }
- if($this->ie) {
- $test = eregi("msie ([0-9\.]+)", $HTTP_USER_AGENT, $regs);
- $this->ver = $test ? (float)$regs[1] : 0;
- }
- if ($this->opera) {
- $test = eregi("opera ([0-9\.]+)", $HTTP_USER_AGENT, $regs);
- $this->ver = $test ? (float)$regs[1] : 0;
+ else if ($this->ie || $this->opera) {
+ $test = preg_match('/(msie|opera) ([0-9.]+)/', $HTTP_USER_AGENT, $regs);
+ $this->ver = $test ? (float)$regs[2] : 0;
}
- if (eregi(" ([a-z]{2})-([a-z]{2})", $HTTP_USER_AGENT, $regs))
+ if (preg_match('/ ([a-z]{2})-([a-z]{2})/', $HTTP_USER_AGENT, $regs))
$this->lang = $regs[1];
else
$this->lang = 'en';
@@ -71,6 +68,7 @@
$this->dom = ($this->mz || $this->safari || ($this->ie && $this->ver>=5) || ($this->opera && $this->ver>=7));
$this->pngalpha = $this->mz || $this->safari || ($this->ie && $this->ver>=5.5) ||
($this->ie && $this->ver>=5 && $this->mac) || ($this->opera && $this->ver>=7) ? true : false;
+ $this->imgdata = !$this->ie;
}
- }
+}
--
Gitblit v1.9.1