[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php, 1.71.2.33.2.14, 1.71.2.33.2.15 class.uicalendar.inc.php, 1.66.2.55.2.17, 1.66.2.55.2.18

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv23572

Modified Files:
      Tag: Version-0_9_16-branch
        class.bocalendar.inc.php class.uicalendar.inc.php 
Log Message:
adapted calendar-edit to use the new jsCalendar popup


Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.33.2.14
retrieving revision 1.71.2.33.2.15
diff -C2 -r1.71.2.33.2.14 -r1.71.2.33.2.15
*** class.bocalendar.inc.php    9 Aug 2003 14:06:28 -0000       1.71.2.33.2.14
--- class.bocalendar.inc.php    17 Aug 2003 23:02:37 -0000      1.71.2.33.2.15
***************
*** 762,765 ****
--- 762,769 ----
                                        $l_recur_enddate['mday'] = 0;
                                }
+                               elseif (isset($l_recur_enddate['str']))
+                               {
+                                       $l_recur_enddate = 
$this->jscal->input2date($l_recur_enddate['str'],False,'mday');
+                               }
  
                                switch(intval($l_cal['recur_type']))
***************
*** 1067,1070 ****
--- 1071,1083 ----
                function fix_update_time(&$time_param)
                {
+                       if (isset($time_param['str']))
+                       {
+                               if (!is_object($this->jscal))
+                               {
+                                       $this->jscal = 
CreateObject('phpgwapi.jscalendar');
+                               }
+                               $time_param += 
$this->jscal->input2date($time_param['str'],False,'mday');
+                               unset($time_param['str']);
+                       }
                        if ($this->prefs['common']['timeformat'] == '12')
                        {

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.55.2.17
retrieving revision 1.66.2.55.2.18
diff -C2 -r1.66.2.55.2.17 -r1.66.2.55.2.18
*** class.uicalendar.inc.php    9 Aug 2003 14:06:29 -0000       1.66.2.55.2.17
--- class.uicalendar.inc.php    17 Aug 2003 23:02:37 -0000      1.66.2.55.2.18
***************
*** 3538,3541 ****
--- 3538,3542 ----
                        // $sb = CreateObject('phpgwapi.sbox');
                        $sb = CreateObject('phpgwapi.sbox2');
+                       $jscal = CreateObject('phpgwapi.jscalendar');   // 
before phpgw_header() !!!
  
                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
***************
*** 3616,3627 ****
  
  // Date
                        $start = $this->bo->maketime($event['start']) - 
$GLOBALS['phpgw']->datetime->tz_offset;
                        $var['startdate'] = Array(
                                'field' => lang('Start Date'),
                                'data'  => 
$GLOBALS['phpgw']->common->dateformatorder(
                                   
$sb->getYears('start[year]',intval($GLOBALS['phpgw']->common->show_date($start,'Y'))),
                                   
$sb->getMonthText('start[month]',intval($GLOBALS['phpgw']->common->show_date($start,'n'))),
                                   
$sb->getDays('start[mday]',intval($GLOBALS['phpgw']->common->show_date($start,'d')))
!                          )
                        );
  
--- 3617,3632 ----
  
  // Date
+ 
                        $start = $this->bo->maketime($event['start']) - 
$GLOBALS['phpgw']->datetime->tz_offset;
                        $var['startdate'] = Array(
                                'field' => lang('Start Date'),
+ /*
                                'data'  => 
$GLOBALS['phpgw']->common->dateformatorder(
                                   
$sb->getYears('start[year]',intval($GLOBALS['phpgw']->common->show_date($start,'Y'))),
                                   
$sb->getMonthText('start[month]',intval($GLOBALS['phpgw']->common->show_date($start,'n'))),
                                   
$sb->getDays('start[mday]',intval($GLOBALS['phpgw']->common->show_date($start,'d')))
!                               )
! */
!                               'data' => $jscal->input('start[str]',$start)
                        );
  
***************
*** 3641,3644 ****
--- 3646,3650 ----
                        $var['enddate'] = Array(
                                'field' => lang('End Date'),
+ /*
                                'data'  => 
$GLOBALS['phpgw']->common->dateformatorder(
                                   
$sb->getYears('end[year]',intval($GLOBALS['phpgw']->common->show_date($end,'Y'))),
***************
*** 3646,3649 ****
--- 3652,3657 ----
                                   
$sb->getDays('end[mday]',intval($GLOBALS['phpgw']->common->show_date($end,'d')))
                                )
+ */
+                               'data' => $jscal->input('end[str]',$end)
                        );
  
***************
*** 3858,3861 ****
--- 3866,3870 ----
                                'field' => lang('Repeat End Date'),
                                'data'  => '<input type="checkbox" 
name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').'  '.
+ /*
                                        
$GLOBALS['phpgw']->common->dateformatorder(
                                                
$sb->getYears('recur_enddate[year]',intval($GLOBALS['phpgw']->common->show_date($recur_end,'Y'))),
***************
*** 3863,3866 ****
--- 3872,3877 ----
                                                
$sb->getDays('recur_enddate[mday]',intval($GLOBALS['phpgw']->common->show_date($recur_end,'d')))
                                        )
+ */
+                                       
$jscal->input('recur_enddate[str]',$recur_end)
                        );