*** CalendarPlugin.pm.orig	Sat May 18 10:46:23 2002
--- CalendarPlugin.pm	Sat May 18 10:59:25 2002
***************
*** 175,187 ****
      my ($descr, $dd, $mm, $yy, $text) = 
         ('',     '',  '',  '',  ''   );
      my %months = (  Jan=>1, Feb=>2, Mar=>3, Apr=>4,  May=>5,  Jun=>6,
! 		    Lug=>7, Aug=>8, Sep=>9, Oct=>10, Nov=>11, Dec=>12);
      if ( defined $options{topic} ) {
          #FIXME: untaint web/topic name?
  	$text = &TWiki::Store::readWebTopic($options{web}, $options{topic});
  	# first collect all dates with year
! 	@days =	map  { s/^\s*\*\s+([0-9]?[0-9])\s+(Jan|Feb|Mar|Apr|May|Jun|Lug|Aug|Sep|Oct|Nov|Dec)\s+([12][0-9][0-9][0-9])\s+-\s+(.*)$/$1|$2|$3|$4/go ; $_ }
! 		grep {  /^\s*\*\s+[0-9]?[0-9]\s+(Jan|Feb|Mar|Apr|May|Jun|Lug|Aug|Sep|Oct|Nov|Dec)\s+[12][0-9][0-9][0-9]\s+-\s+.*$/ }
  		split( /\n/, $text);
  	foreach $d (@days) {
  	    ($dd, $mm, $yy, $descr) = split( /\|/, $d);
--- 175,187 ----
      my ($descr, $dd, $mm, $yy, $text) = 
         ('',     '',  '',  '',  ''   );
      my %months = (  Jan=>1, Feb=>2, Mar=>3, Apr=>4,  May=>5,  Jun=>6,
! 		    Jul=>7, Aug=>8, Sep=>9, Oct=>10, Nov=>11, Dec=>12);
      if ( defined $options{topic} ) {
          #FIXME: untaint web/topic name?
  	$text = &TWiki::Store::readWebTopic($options{web}, $options{topic});
  	# first collect all dates with year
! 	@days =	map  { s/^\s*\*\s+([0-9]?[0-9])\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+([12][0-9][0-9][0-9])\s+-\s+(.*)$/$1|$2|$3|$4/go ; $_ }
! 		grep {  /^\s*\*\s+[0-9]?[0-9]\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+[12][0-9][0-9][0-9]\s+-\s+.*$/ }
  		split( /\n/, $text);
  	foreach $d (@days) {
  	    ($dd, $mm, $yy, $descr) = split( /\|/, $d);
***************
*** 190,197 ****
  	    }
  	}
  	# then collect all dates without year
! 	@days =	map  { s/^\s*\*\s+([0-9]?[0-9])\s+(Jan|Feb|Mar|Apr|May|Jun|Lug|Aug|Sep|Oct|Nov|Dec)\s+-\s+(.*)$/$1|$2|$3/go ; $_ }
! 		grep {  /^\s*\*\s+[0-9]?[0-9]\s+(Jan|Feb|Mar|Apr|May|Jun|Lug|Aug|Sep|Oct|Nov|Dec)\s+-\s+.*$/ }
  		split( /\n/, $text);
  	foreach $d (@days) {
  	    ($dd, $mm, $descr) = split( /\|/, $d);
--- 190,197 ----
  	    }
  	}
  	# then collect all dates without year
! 	@days =	map  { s/^\s*\*\s+([0-9]?[0-9])\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+-\s+(.*)$/$1|$2|$3/go ; $_ }
! 		grep {  /^\s*\*\s+[0-9]?[0-9]\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+-\s+.*$/ }
  		split( /\n/, $text);
  	foreach $d (@days) {
  	    ($dd, $mm, $descr) = split( /\|/, $d);