[Openfirst-cvscommit] base/config/functions browserid.php,1.3,1.4

[<xt...@us...>]

Update of /cvsroot/openfirst/base/config/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv8231

Modified Files:
	browserid.php 
Log Message:
Fix issues encountered with browscap on systems not posessing a browscap.ini.  Unfortunately, browscap may not be modified using set_ini.

Index: browserid.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/functions/browserid.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** browserid.php	23 Nov 2003 23:39:07 -0000	1.3
--- browserid.php	22 Dec 2003 18:33:53 -0000	1.4
***************
*** 30,43 ****
  
    function identify_platform($useragent="") {
-     //(This prevents PHP from displaying an error if use of browscap.ini is not enabled)
-     //only report critical errors
-     $err_prev=error_reporting(E_ERROR);
-     //get OS info from browscap.ini
-     $browser=get_browser($useragent);
-     //restore error reporting level
-     error_reporting($err_prev);
-     
      $return="";
!     if($browser!=null){
        $return=$browser->platform;
        if ($return==""){
--- 30,38 ----
  
    function identify_platform($useragent="") {
      $return="";
!     if((bool) ini_get("browscap")){
!       //get OS info from browscap.ini
!       $browser=get_browser($useragent);
!       //restore error reporting level
        $return=$browser->platform;
        if ($return==""){
***************
*** 55,68 ****
  
    function identify_browser($useragent="") {
!     //(This prevents PHP from displaying an error if use of browscap.ini is not enabled)
!     //only report critical errors
!     $err_prev=error_reporting(E_ERROR);
!     //get browser info from browscap.ini
!     $browser=get_browser($useragent);
!     //restore error reporting level
!     error_reporting($err_prev);
      
!     $return="";
!     if($browser!=null){
        //Get browser name
        $browsername=$browser->browser;
--- 50,62 ----
  
    function identify_browser($useragent="") {
!     if((bool) ini_get("browscap")){
!       $err_prev=error_reporting(E_ERROR);
!       //get browser info from browscap.ini
!       $browser=get_browser($useragent);
!       //restore error reporting level
!       error_reporting($err_prev);
      
!       $return="";
! 
        //Get browser name
        $browsername=$browser->browser;