[Phpgroupware-cvs] property/inc class.bolocation.inc.php,1.30,1.31

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv18184/inc

Modified Files:
        class.bolocation.inc.php 
Log Message:
no message

Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** class.bolocation.inc.php    29 Sep 2003 17:53:51 -0000      1.30
--- class.bolocation.inc.php    3 Oct 2003 18:58:21 -0000       1.31
***************
*** 577,608 ****
  //    _debug_array($location_datatype);
  
! 
!                       for ($i=0;$i<count($location_datatype);$i++)
                        {
!                               
if($location_datatype[$i]['datatype']=='decimal' && 
$location[$location_datatype[$i]['input_name']])
                                {
!                                       
$location[$location_datatype[$i]['input_name']] = 
str_replace(",",".",$location[$location_datatype[$i]['input_name']]);
!                               }
  
!                               if($location_datatype[$i]['datatype']=='date' 
&& $location[$location_datatype[$i]['input_name']])
!                               {
!                                       $dateformat= 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
!                                       $dateformat = 
str_replace(".","",$dateformat);
!                                       $dateformat = 
str_replace("-","",$dateformat);
!                                       $dateformat = 
str_replace("/","",$dateformat);
!                                       $y=strpos($dateformat,'Y');
!                                       $d=strpos($dateformat,'d');
!                                       $m=strpos($dateformat,'m');
  
!                                       $dateparts = explode('/', 
$location[$location_datatype[$i]['input_name']]);
!                                       $day            = $dateparts[$d];
!                                       $month          = $dateparts[$m];
!                                       $year           = $dateparts[$y];
  
! //                                    
$location[$location_datatype[$i]['input_name']] = 
date($this->bocommon->dateformat,mktime(2,0,0,$month,$day,$year));
!                                       
$location[$location_datatype[$i]['input_name']] = 
mktime(0,0,0,$month,$day,$year);
  
                                }
                        }
  
  //    _debug_array($location);
--- 577,611 ----
  //    _debug_array($location_datatype);
  
!                       if(is_array($location_datatype))
                        {
!                               for ($i=0;$i<count($location_datatype);$i++)
                                {
!                                       
if($location_datatype[$i]['datatype']=='decimal' && 
$location[$location_datatype[$i]['input_name']])
!                                       {
!                                               
$location[$location_datatype[$i]['input_name']] = 
str_replace(",",".",$location[$location_datatype[$i]['input_name']]);
!                                       }
  
!                                       
if($location_datatype[$i]['datatype']=='date' && 
$location[$location_datatype[$i]['input_name']])
!                                       {
!                                               $dateformat= 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
!                                               $dateformat = 
str_replace(".","",$dateformat);
!                                               $dateformat = 
str_replace("-","",$dateformat);
!                                               $dateformat = 
str_replace("/","",$dateformat);
!                                               $y=strpos($dateformat,'Y');
!                                               $d=strpos($dateformat,'d');
!                                               $m=strpos($dateformat,'m');
  
!                                               $dateparts = explode('/', 
$location[$location_datatype[$i]['input_name']]);
!                                               $day            = 
$dateparts[$d];
!                                               $month          = 
$dateparts[$m];
!                                               $year           = 
$dateparts[$y];
  
! //                                            
$location[$location_datatype[$i]['input_name']] = 
date($this->bocommon->dateformat,mktime(2,0,0,$month,$day,$year));
!                                               
$location[$location_datatype[$i]['input_name']] = 
mktime(0,0,0,$month,$day,$year);
  
+                                       }
                                }
                        }
+ 
  
  //    _debug_array($location);