[Phpgroupware-cvs] phpgwapi/inc class.browser.inc.php, 1.14.2.2.2.1, 1.14.2.2.2.2

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv20344

Modified Files:
      Tag: Version-0_9_16-branch
        class.browser.inc.php 
Log Message:
globals

Index: class.browser.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.browser.inc.php,v
retrieving revision 1.14.2.2.2.1
retrieving revision 1.14.2.2.2.2
diff -C2 -d -r1.14.2.2.2.1 -r1.14.2.2.2.2
*** class.browser.inc.php       16 Sep 2003 23:28:04 -0000      1.14.2.2.2.1
--- class.browser.inc.php       9 Oct 2003 06:17:45 -0000       1.14.2.2.2.2
***************
*** 40,67 ****
                                Determine browser and version
                        */
!                       if(ereg('MSIE 
([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version))
                        {
                                $this->BROWSER_VER = $log_version[1];
                                $this->BROWSER_AGENT = 'IE';
                        }
!                       elseif(ereg('Opera 
([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version) ||
!                               
ereg('Opera/([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version))
                        {
                                $this->BROWSER_VER   = $log_version[1];
                                $this->BROWSER_AGENT = 'OPERA';
                        }
!                       elseif(eregi('iCab 
([0-9].[0-9a-zA-Z]{1,4})',$HTTP_USER_AGENT,$log_version) ||
!                               
eregi('iCab/([0-9].[0-9a-zA-Z]{1,4})',$HTTP_USER_AGENT,$log_version))
                        {
                                $this->BROWSER_VER   = $log_version[1];
                                $this->BROWSER_AGENT = 'iCab';
                        } 
!                       elseif(ereg('Gecko',$HTTP_USER_AGENT,$log_version))
                        {
                                $this->BROWSER_VER   = $log_version[1];
                                $this->BROWSER_AGENT = 'MOZILLA';
                        }
!                       
elseif(ereg('Konqueror/([0-9].[0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version) 
||
!                               
ereg('Konqueror/([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version))
                        {
                                $this->BROWSER_VER=$log_version[1];
--- 40,67 ----
                                Determine browser and version
                        */
!                       if(ereg('MSIE 
([0-9].[0-9]{1,2})',$SERVER['HTTP_USER_AGENT'],$log_version))
                        {
                                $this->BROWSER_VER = $log_version[1];
                                $this->BROWSER_AGENT = 'IE';
                        }
!                       elseif(ereg('Opera 
([0-9].[0-9]{1,2})',$_SERVER['HTTP_USER_AGENT'],$log_version) ||
!                               
ereg('Opera/([0-9].[0-9]{1,2})',$_SERVER['HTTP_USER_AGENT'],$log_version))
                        {
                                $this->BROWSER_VER   = $log_version[1];
                                $this->BROWSER_AGENT = 'OPERA';
                        }
!                       elseif(eregi('iCab 
([0-9].[0-9a-zA-Z]{1,4})',$_SERVER['HTTP_USER_AGENT'],$log_version) ||
!                               
eregi('iCab/([0-9].[0-9a-zA-Z]{1,4})',$_SERVER['HTTP_USER_AGENT'],$log_version))
                        {
                                $this->BROWSER_VER   = $log_version[1];
                                $this->BROWSER_AGENT = 'iCab';
                        } 
!                       
elseif(ereg('Gecko',$_SERVER['HTTP_USER_AGENT'],$log_version))
                        {
                                $this->BROWSER_VER   = $log_version[1];
                                $this->BROWSER_AGENT = 'MOZILLA';
                        }
!                       
elseif(ereg('Konqueror/([0-9].[0-9].[0-9]{1,2})',$_SERVER['HTTP_USER_AGENT'],$log_version)
 ||
!                               
ereg('Konqueror/([0-9].[0-9]{1,2})',$_SERVER['HTTP_USER_AGENT'],$log_version))
                        {
                                $this->BROWSER_VER=$log_version[1];
***************
*** 77,97 ****
                                Determine platform
                        */
!                       if(strstr($HTTP_USER_AGENT,'Win'))
                        {
                                $this->BROWSER_PLATFORM='Win';
                        }
!                       elseif(strstr($HTTP_USER_AGENT,'Mac'))
                        {
                                $this->BROWSER_PLATFORM='Mac';
                        }
!                       elseif(strstr($HTTP_USER_AGENT,'Linux'))
                        {
                                $this->BROWSER_PLATFORM='Linux';
                        }
!                       elseif(strstr($HTTP_USER_AGENT,'Unix'))
                        {
                                $this->BROWSER_PLATFORM='Unix';
                        }
!                       elseif(strstr($HTTP_USER_AGENT,'Beos'))
                        {
                                $this->BROWSER_PLATFORM='Beos';
--- 77,97 ----
                                Determine platform
                        */
!                       if(strstr($_SERVER['HTTP_USER_AGENT'],'Win'))
                        {
                                $this->BROWSER_PLATFORM='Win';
                        }
!                       elseif(strstr($_SERVER['HTTP_USER_AGENT'],'Mac'))
                        {
                                $this->BROWSER_PLATFORM='Mac';
                        }
!                       elseif(strstr($_SERVER['HTTP_USER_AGENT'],'Linux'))
                        {
                                $this->BROWSER_PLATFORM='Linux';
                        }
!                       elseif(strstr($_SERVER['HTTP_USER_AGENT'],'Unix'))
                        {
                                $this->BROWSER_PLATFORM='Unix';
                        }
!                       elseif(strstr($_SERVER['HTTP_USER_AGENT'],'Beos'))
                        {
                                $this->BROWSER_PLATFORM='Beos';
***************
*** 103,107 ****
  
                        /*
!                       echo "\n\nAgent: $HTTP_USER_AGENT";
                        echo "\nIE: ".browser_is_ie();
                        echo "\nMac: ".browser_is_mac();
--- 103,107 ----
  
                        /*
!                       echo "\n\nAgent: " . $_SERVER['HTTP_USER_AGENT'];
                        echo "\nIE: ".browser_is_ie();
                        echo "\nMac: ".browser_is_mac();