[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php, 1.71.2.33
From: |
Dave Hall <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php, 1.71.2.33.2.16, 1.71.2.33.2.17 class.uicalendar.inc.php, 1.66.2.55.2.20, 1.66.2.55.2.21 |
Date: |
Sun, 07 Sep 2003 05:51:06 -0400 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv29248/inc
Modified Files:
Tag: Version-0_9_16-branch
class.bocalendar.inc.php class.uicalendar.inc.php
Log Message:
rollback jscal
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.33.2.16
retrieving revision 1.71.2.33.2.17
diff -C2 -r1.71.2.33.2.16 -r1.71.2.33.2.17
*** class.bocalendar.inc.php 20 Aug 2003 10:02:28 -0000 1.71.2.33.2.16
--- class.bocalendar.inc.php 7 Sep 2003 09:51:03 -0000 1.71.2.33.2.17
***************
*** 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']))
--- 762,765 ----
***************
*** 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')
{
--- 1067,1070 ----
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.55.2.20
retrieving revision 1.66.2.55.2.21
diff -C2 -r1.66.2.55.2.20 -r1.66.2.55.2.21
*** class.uicalendar.inc.php 20 Aug 2003 18:08:23 -0000 1.66.2.55.2.20
--- class.uicalendar.inc.php 7 Sep 2003 09:51:03 -0000 1.66.2.55.2.21
***************
*** 3529,3533 ****
// $sb = CreateObject('phpgwapi.sbox');
$sb = CreateObject('phpgwapi.sbox2');
- $jscal = CreateObject('phpgwapi.jscalendar'); //
before phpgw_header() !!!
unset($GLOBALS['phpgw_info']['flags']['noheader']);
--- 3529,3532 ----
***************
*** 3612,3616 ****
$var['startdate'] = Array(
'field' => lang('Start Date'),
- /*
'data' =>
$GLOBALS['phpgw']->common->dateformatorder(
$sb->getYears('start[year]',intval($GLOBALS['phpgw']->common->show_date($start,'Y'))),
--- 3611,3614 ----
***************
*** 3618,3623 ****
$sb->getDays('start[mday]',intval($GLOBALS['phpgw']->common->show_date($start,'d')))
)
- */
- 'data' => $jscal->input('start[str]',$start)
);
--- 3616,3619 ----
***************
*** 3637,3641 ****
$var['enddate'] = Array(
'field' => lang('End Date'),
- /*
'data' =>
$GLOBALS['phpgw']->common->dateformatorder(
$sb->getYears('end[year]',intval($GLOBALS['phpgw']->common->show_date($end,'Y'))),
--- 3633,3636 ----
***************
*** 3643,3648 ****
$sb->getDays('end[mday]',intval($GLOBALS['phpgw']->common->show_date($end,'d')))
)
- */
- 'data' => $jscal->input('end[str]',$end)
);
--- 3638,3641 ----
***************
*** 3857,3861 ****
'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'))),
--- 3850,3853 ----
***************
*** 3863,3868 ****
$sb->getDays('recur_enddate[mday]',intval($GLOBALS['phpgw']->common->show_date($recur_end,'d')))
)
- */
-
$jscal->input('recur_enddate[str]',$recur_end)
);
--- 3855,3858 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php, 1.71.2.33.2.16, 1.71.2.33.2.17 class.uicalendar.inc.php, 1.66.2.55.2.20, 1.66.2.55.2.21,
Dave Hall <address@hidden> <=