extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-12 05:58:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for bug #438809.

Browse Source
This commit is contained in:
skeeter 2001-07-07 21:29:21 +00:00
parent 4f67d9b6b0
commit 040859b6ab
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/edit_entry.php
View File

@ -370,13 +370,13 @@ echo "Owner = ".$users[$owner]."<br>\n";
display_item($p,lang('Repeat End Date'),$str); display_item($p,lang('Repeat End Date'),$str);
$str = '<input type="checkbox" name="cal[rpt_sun]" value="'.MCAL_SUNDAY.'"'.(($event->recur_data & MCAL_SUNDAY) ?' checked':'').'> '.lang('Sunday').' '; $str = '<input type="checkbox" name="cal[rpt_sun]" value="'.MCAL_M_SUNDAY.'"'.(($event->recur_data & MCAL_M_SUNDAY) ?' checked':'').'> '.lang('Sunday').' ';
$str .= '<input type="checkbox" name="cal[rpt_mon]" value="'.MCAL_MONDAY.'"'.(($event->recur_data & MCAL_MONDAY) ?' checked':'').'> '.lang('Monday').' '; $str .= '<input type="checkbox" name="cal[rpt_mon]" value="'.MCAL_M_MONDAY.'"'.(($event->recur_data & MCAL_M_MONDAY) ?' checked':'').'> '.lang('Monday').' ';
$str .= '<input type="checkbox" name="cal[rpt_tue]" value="'.MCAL_TUESDAY.'"'.(($event->recur_data & MCAL_TUESDAY) ?' checked':'').'> '.lang('Tuesday').' '; $str .= '<input type="checkbox" name="cal[rpt_tue]" value="'.MCAL_M_TUESDAY.'"'.(($event->recur_data & MCAL_M_TUESDAY) ?' checked':'').'> '.lang('Tuesday').' ';
$str .= '<input type="checkbox" name="cal[rpt_wed]" value="'.MCAL_WEDNESDAY.'"'.(($event->recur_data & MCAL_WEDNESDAY) ?' checked':'').'> '.lang('Wednesday').' <br>'; $str .= '<input type="checkbox" name="cal[rpt_wed]" value="'.MCAL_M_WEDNESDAY.'"'.(($event->recur_data & MCAL_M_WEDNESDAY) ?' checked':'').'> '.lang('Wednesday').' <br>';
$str .= '<input type="checkbox" name="cal[rpt_thu]" value="'.MCAL_THURSDAY.'"'.(($event->recur_data & MCAL_THURSDAY) ?' checked':'').'> '.lang('Thursday').' '; $str .= '<input type="checkbox" name="cal[rpt_thu]" value="'.MCAL_M_THURSDAY.'"'.(($event->recur_data & MCAL_M_THURSDAY) ?' checked':'').'> '.lang('Thursday').' ';
$str .= '<input type="checkbox" name="cal[rpt_fri]" value="'.MCAL_FRIDAY.'"'.(($event->recur_data & MCAL_FRIDAY) ?' checked':'').'> '.lang('Friday').' '; $str .= '<input type="checkbox" name="cal[rpt_fri]" value="'.MCAL_M_FRIDAY.'"'.(($event->recur_data & MCAL_M_FRIDAY) ?' checked':'').'> '.lang('Friday').' ';
$str .= '<input type="checkbox" name="cal[rpt_sat]" value="'.MCAL_SATURDAY.'"'.(($event->recur_data & MCAL_SATURDAY) ?' checked':'').'> '.lang('Saturday').' '; $str .= '<input type="checkbox" name="cal[rpt_sat]" value="'.MCAL_M_SATURDAY.'"'.(($event->recur_data & MCAL_M_SATURDAY) ?' checked':'').'> '.lang('Saturday').' ';
display_item($p,lang('Repeat Day').'<br>'.lang('(for weekly)'),$str); display_item($p,lang('Repeat Day').'<br>'.lang('(for weekly)'),$str);

30
calendar/inc/class.calendar.inc.php
View File

@ -520,25 +520,25 @@ class calendar extends calendar_
switch($search_date_dow) switch($search_date_dow)
{ {
case 0: case 0:
$check = MCAL_SUNDAY; $check = MCAL_M_SUNDAY;
break; break;
case 1: case 1:
$check = MCAL_MONDAY; $check = MCAL_M_MONDAY;
break; break;
case 2: case 2:
$check = MCAL_TUESDAY; $check = MCAL_M_TUESDAY;
break; break;
case 3: case 3:
$check = MCAL_WEDNESDAY; $check = MCAL_M_WEDNESDAY;
break; break;
case 4: case 4:
$check = MCAL_THURSDAY; $check = MCAL_M_THURSDAY;
break; break;
case 5: case 5:
$check = MCAL_FRIDAY; $check = MCAL_M_FRIDAY;
break; break;
case 6: case 6:
$check = MCAL_SATURDAY; $check = MCAL_M_SATURDAY;
break; break;
} }
if ($rep_events->recur_data & $check) if ($rep_events->recur_data & $check)
@ -1767,38 +1767,38 @@ class calendar extends calendar_
$repeat_days = ''; $repeat_days = '';
if($phpgw_info['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday') if($phpgw_info['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday')
{ {
if (!!($event->recur_data & MCAL_SUNDAY) == True) if (!!($event->recur_data & MCAL_M_SUNDAY) == True)
{ {
$this->view_add_day(lang('Sunday'),$repeat_days); $this->view_add_day(lang('Sunday'),$repeat_days);
} }
} }
if (!!($event->recur_data & MCAL_MONDAY) == True) if (!!($event->recur_data & MCAL_M_MONDAY) == True)
{ {
$this->view_add_day(lang('Monday'),$repeat_days); $this->view_add_day(lang('Monday'),$repeat_days);
} }
if (!!($event->recur_data & MCAL_TUESDAY) == True) if (!!($event->recur_data & MCAL_M_TUESDAY) == True)
{ {
$this->view_add_day(lang('Tuesday'),$repeat_days); $this->view_add_day(lang('Tuesday'),$repeat_days);
} }
if (!!($event->recur_data & MCAL_WEDNESDAY) == True) if (!!($event->recur_data & MCAL_M_WEDNESDAY) == True)
{ {
$this->view_add_day(lang('Wednesday'),$repeat_days); $this->view_add_day(lang('Wednesday'),$repeat_days);
} }
if (!!($event->recur_data & MCAL_THURSDAY) == True) if (!!($event->recur_data & MCAL_M_THURSDAY) == True)
{ {
$this->view_add_day(lang('Thursday'),$repeat_days); $this->view_add_day(lang('Thursday'),$repeat_days);
} }
if (!!($event->recur_data & MCAL_FRIDAY) == True) if (!!($event->recur_data & MCAL_M_FRIDAY) == True)
{ {
$this->view_add_day(lang('Friday'),$repeat_days); $this->view_add_day(lang('Friday'),$repeat_days);
} }
if (!!($event->recur_data & MCAL_SATURDAY) == True) if (!!($event->recur_data & MCAL_M_SATURDAY) == True)
{ {
$this->view_add_day(lang('Saturday'),$repeat_days); $this->view_add_day(lang('Saturday'),$repeat_days);
} }
if($phpgw_info['user']['preferences']['calendar']['weekdaystarts'] == 'Monday') if($phpgw_info['user']['preferences']['calendar']['weekdaystarts'] == 'Monday')
{ {
if (!!($event->recur_data & MCAL_SUNDAY) == True) if (!!($event->recur_data & MCAL_M_SUNDAY) == True)
{ {
$this->view_add_day(lang('Sunday'),$repeat_days); $this->view_add_day(lang('Sunday'),$repeat_days);
} }

20
calendar/inc/class.calendar__.inc.php
View File

@ -25,17 +25,17 @@ if(extension_loaded('mcal') == False)
define('MCAL_RECUR_MONTHLY_WDAY',4); define('MCAL_RECUR_MONTHLY_WDAY',4);
define('MCAL_RECUR_YEARLY',5); define('MCAL_RECUR_YEARLY',5);
define('MCAL_SUNDAY',1); define('MCAL_M_SUNDAY',1);
define('MCAL_MONDAY',2); define('MCAL_M_MONDAY',2);
define('MCAL_TUESDAY',4); define('MCAL_M_TUESDAY',4);
define('MCAL_WEDNESDAY',8); define('MCAL_M_WEDNESDAY',8);
define('MCAL_THURSDAY',16); define('MCAL_M_THURSDAY',16);
define('MCAL_FRIDAY',32); define('MCAL_M_FRIDAY',32);
define('MCAL_SATURDAY',64); define('MCAL_M_SATURDAY',64);
define('MCAL_WEEKDAYS',63); define('MCAL_M_WEEKDAYS',63);
define('MCAL_WEEKEND',65); define('MCAL_M_WEEKEND',65);
define('MCAL_ALLDAYS',127); define('MCAL_M_ALLDAYS',127);
} }
define('MSG_DELETED',0); define('MSG_DELETED',0);