[Phpgroupware-cvs] CVS: phpgwapi/inc class.vfs_sql.inc.php,1.15.2.1,1.15.2.2

[Jason Wies <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.vfs_sql.inc.php 
Log Message:
PHP3 fixes

Index: class.vfs_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.vfs_sql.inc.php,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -r1.15.2.1 -r1.15.2.2
*** class.vfs_sql.inc.php       16 Jan 2002 06:48:02 -0000      1.15.2.1
--- class.vfs_sql.inc.php       10 Feb 2002 04:38:27 -0000      1.15.2.2
***************
*** 182,186 ****
                function get_relative ()
                {
!                       if (isset ($this->relative))
                        {
                                return $this->relative;
--- 182,186 ----
                function get_relative ()
                {
!                       if (isset ($this->relative) && $this->relative)
                        {
                                return $this->relative;
***************
*** 1052,1056 ****
                        }
  
!                       $basedir = ereg_replace ($sep.'$', '', $basedir);
  
                        return $basedir;
--- 1052,1056 ----
                        }
  
!                       $basedir = ereg_replace ($sep . '$', '', $basedir);
  
                        return $basedir;
***************
*** 2686,2691 ****
                function get_ext_mime_type ($data)
                {
-                       static $mimetype = Array();
-                       
                        if (!is_array ($data))
                        {
--- 2686,2689 ----
***************
*** 2702,2710 ****
                        $ext=$parts[(sizeof($parts)-1)];
  
-                       if(isset($mimetype[$ext]))
-                       {
-                               return $mimetype[$ext];
-                       }
-  
                        for($i=0;$i<sizeof($contents);$i++)
                        {
--- 2700,2703 ----
***************
*** 2718,2723 ****
                                                        if($line[$j] == $ext)
                                                        {
!                                                               $mimetype[$ext] 
=  $line[0];
!                                                               return 
$mimetype[$ext];
                                                        }
                                                }
--- 2711,2715 ----
                                                        if($line[$j] == $ext)
                                                        {
!                                                               return $line[0];
                                                        }
                                                }
***************
*** 2726,2732 ****
                        }
  
!                       $mimetype[$ext] = '';
! 
!                       return $mimetype[$ext];
                }
   
--- 2718,2722 ----
                        }
  
!                       return '';
                }