[Phpgroupware-cvs] CVS: infolog/inc class.uiinfolog.inc.php,1.30.2.8,1.30.2.9

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv27174

Modified Files:
      Tag: Version-0_9_14-branch
        class.uiinfolog.inc.php 
Log Message:
new defaults for start- and enddate:
- startdate is set to today for a newly created entry
- enddate is set to today if it was not set and status is done or billed
This is to prevent eg. undated phonecalls, because people missed to set the 
dates manually.

Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.30.2.8
retrieving revision 1.30.2.9
diff -C2 -r1.30.2.8 -r1.30.2.9
*** class.uiinfolog.inc.php     5 Nov 2002 15:57:13 -0000       1.30.2.8
--- class.uiinfolog.inc.php     17 Feb 2003 09:42:46 -0000      1.30.2.9
***************
*** 677,684 ****
                        }
  
                        // check wether to write dates or not
                        if ($selfortoday)
                        {
!                               $startdate = time();     // startdate is today 
(checkbox is clicked)
                        }
                        else
--- 677,686 ----
                        }
  
+                       $today = mktime(12,0,0,date('m'),date('d'),date('Y'));
+ 
                        // check wether to write dates or not
                        if ($selfortoday)
                        {
!                               $startdate = $today;     // startdate is today 
(checkbox is clicked)
                        }
                        else
***************
*** 728,732 ****
                                else
                                {
!                                       if (isset($eday)) $enddate = 0;
                                }
                        }
--- 730,739 ----
                                else
                                {
!                                       if (isset($eday)) $enddate = 0;         
     
! 
!                                       if ($status == 'done' || $status == 
'billed')
!                                       {
!                                               $enddate = $today;
!                                       }
                                }
                        }
***************
*** 922,926 ****
  
                        $t->set_var('lang_start_date',lang('Startdate'));
!                       if (!isset($startdate)) $startdate = 
$this->bo->so->data['info_startdate'];
                        $t->set_var('start_select_date',
                                                        
$sb->getDate('syear','smonth','sday',$startdate));
--- 929,934 ----
  
                        $t->set_var('lang_start_date',lang('Startdate'));
!                       if (!isset($startdate)) $startdate = 
!$this->bo->so->data['info_startdate'] && !$info_id ?
!                               $today : $this->bo->so->data['info_startdate'];
                        $t->set_var('start_select_date',
                                                        
$sb->getDate('syear','smonth','sday',$startdate));