diff -r -w -c calendar/calendar.php new-calendar/calendar.php
*** calendar/calendar.php	Sun Jul 13 08:51:53 2003
--- new-calendar/calendar.php	Sat Jan  3 00:18:47 2004
***************
*** 90,102 ****
                              )
                         ) . "\n".
                         html_tag( 'tr',
-                            html_tag( 'th', _("Sunday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
                             html_tag( 'th', _("Monday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
                             html_tag( 'th', _("Tuesday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
                             html_tag( 'th', _("Wednesday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
                             html_tag( 'th', _("Thursday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
                             html_tag( 'th', _("Friday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
!                            html_tag( 'th', _("Saturday"), '', $color[5], 'width="14%" width="90"' ) ."\n"
                         )
                 ) ,
             '', $color[0] ) ."\n";
--- 90,102 ----
                              )
                         ) . "\n".
                         html_tag( 'tr',
                             html_tag( 'th', _("Monday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
                             html_tag( 'th', _("Tuesday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
                             html_tag( 'th', _("Wednesday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
                             html_tag( 'th', _("Thursday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
                             html_tag( 'th', _("Friday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
!                            html_tag( 'th', _("Saturday"), '', $color[5], 'width="14%" width="90"' ) ."\n".
!                            html_tag( 'th', _("Sunday"), '', $color[5], 'width="14%" width="90"' ) ."\n" 
                         )
                 ) ,
             '', $color[0] ) ."\n";
***************
*** 106,112 ****
  //main logic for month view of calendar
  function drawmonthview() {
      global $year, $month, $day, $color, $calendardata, $todayis, $cal;
!     $aday = 1 - date('w', mktime(0, 0, 0, $month, 1, $year));
      $days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
      while ($aday <= $days_in_month) {
          echo html_tag( 'tr' );
--- 106,113 ----
  //main logic for month view of calendar
  function drawmonthview() {
      global $year, $month, $day, $color, $calendardata, $todayis, $cal;
!     $aday = 2 - date('w', mktime(0, 0, 0, $month, 1, $year));
! 	if($aday==2) $aday=-5;
      $days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
      while ($aday <= $days_in_month) {
          echo html_tag( 'tr' );
diff -r -w -c calendar/year.php new-calendar/year.php
*** calendar/year.php	Sun Jul 13 08:52:08 2003
--- new-calendar/year.php	Sat Jan  3 00:16:06 2004
***************
*** 113,119 ****
              html_tag( 'th', _("Friday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
              html_tag( 'th', _("Saturday"), '', $color[5], 'width="14%" width="90"' ) ."\n"
          );
!        $aday = 1 - date('w', mktime(0, 0, 0, $month, 1, $year));
         $days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
         while ($aday <= $days_in_month) {
             echo html_tag( 'tr' );
--- 113,120 ----
              html_tag( 'th', _("Friday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
              html_tag( 'th', _("Saturday"), '', $color[5], 'width="14%" width="90"' ) ."\n"
          );
! 		$aday = 2 - date('w', mktime(0, 0, 0, $month, 1, $year));
! 		if($aday==2) $aday=-5;
  		$days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
  		while ($aday <= $days_in_month) {
             echo html_tag( 'tr' );
