--- ConnorCalendar/calendar.pl	2013/05/29 03:27:02	1.6
+++ ConnorCalendar/calendar.pl	2018/10/30 13:53:00	1.13
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!/usr/bin/perl -w
 
 =begin comment info
 +------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
 |
 |   Nicholas DeClario <nick@demandred.dyndns.org>
 |   March 2009
-|	$Id: calendar.pl,v 1.6 2013/05/29 03:27:02 nick Exp $
+|	$Id: calendar.pl,v 1.13 2018/10/30 13:53:00 nick Exp $
 |
 +------------------------------------------------------------------------------
 =end comment
@@ -23,25 +23,26 @@ use Getopt::Long;
 use Pod::Usage;
 use Data::Dumper;
 use Calendar::Simple;
-use Date::Calendar::Year qw( :all );
-use Date::Calendar::Profiles qw( $Profiles );
+use Date::Pcalendar::Year qw( :all );
+use Date::Pcalendar::Profiles qw( $Profiles );
 
-my $VERSION  = q/$Id: calendar.pl,v 1.6 2013/05/29 03:27:02 nick Exp $/;
+my $VERSION  = '$Id: calendar.pl,v 1.13 2018/10/30 13:53:00 nick Exp $';
 my $DEBUG    = "";
 my $URL	     = "http://demandred.dyndns.org/cgi-bin/ConnorCalendar/index.cgi";
 my %post_in  = ( );
 my %opts     = &fetchOptions( );
 my @list     = ( );
 my @months   = qw/ January February March April May June July 
-		   August September October November December /;
+                   August September October November December /;
 my %holidays = ( 
+		 "Easter Sunday"	=> 'even',
 		 "Christmas Day"	=> 'even',
 		 "Christmas Eve"	=> 'odd',
 		 "Father's Day"		=> 'all',
 		 "Independence Day"	=> 'even',
 		 "Labor Day"		=> 'even',
 		 "Memorial Day"		=> 'odd',
-		 "New Year's Day"	=> 'even',
+		 "New Year's Day"	=> 'odd',
 		 "New Year's Eve"	=> 'odd',
 		 "Thanksgiving Day"	=> 'odd', 
 	       );
@@ -50,28 +51,29 @@ my %specials = (
 		"11/28"			=> "even",
 		"5/6"			=> "odd",
 		);
-my @weekend  = qw/ 2011 8 12 /;
+
+print "Content-type: text/html\n\n";
+print &header( );
+
+
+## Change this @weekend to 'qw/ 2011 8 12 /' for original schedule
+my @weekend  = qw/ 2011 8 19 /;
 my %weekends = &calcWeekends( @weekend );
 
 &ReadParse( );
 
-my $yr =  sprintf( "%d", $post_in{'cy'} ) || ( ( localtime )[5] + 1900 );
+my $yr =  sprintf( "%d", $post_in{'cy'} || ( localtime )[5] + 1900 );
 my $YEAR = sprintf( "%d", $yr );
+push @list, 'Easter Sunday' if ( $YEAR % 2 == 0 );
 
-print "Content-type: text/html\n\n";
-print &header( );
 print &css( );
-print "<h1>Calendar for $YEAR</h1>\n";
-my $year_us = Date::Calendar::Year->new( $YEAR, $Profiles->{'US-FL'} );
+my $year_us = Date::Pcalendar::Year->new( $YEAR, $Profiles->{'US-FL'} );
 my @hdays = $year_us->labels( );
 
-#$DEBUG = "Holidays for $YEAR:\n";
-#foreach ( sort @hdays ) { $DEBUG .= $_ ."\n"; }
-
-
-print "<center><a href=\"$URL?cy=" . ( $YEAR - 1 ) .
-      "\">&lt;--</a> <b>$YEAR</b> " .
-       "<a href=\"$URL?cy=" . ( $YEAR + 1 ) . "\">--&gt;</a></center>";
+print "<h1><center><a href=\"$URL?cy=" . ( $YEAR - 1 ) .
+      "\">&lt;--</a> " .
+      "Calendar Days Connor Visits for $YEAR" .
+       "<a href=\"$URL?cy=" . ( $YEAR + 1 ) . "\"> --&gt;</a></h1>";
 my $row = 0;
 print "<table align=center border=0><tr>";
 for( my $month = 1; $month <= 12; $month++ )
@@ -113,15 +115,15 @@ for( my $month = 1; $month <= 12; $month
 	$row++;
 }
 print "</tr></table>";
-print "<p class=\"Legend\">Holidays I have Connor are in <font color=red>Red</font>\n</br>";
+print "<p class=\"Legend\">Holidays Connor visits are in <font color=red>Red</font>\n</br>";
 print "Today is <font color=blue>Blue</font>\n</br>";
-print "Weekends and special days I have Connor are in <font color=green>Green</font>\n</p>";
+print "Weekends and special days Connor visits are in <font color=green>Green</font>\n</p>";
 
 
-print "<br /><table width=35% align=center border=0><tr><td>List of Special/Holidays " .
-      "I have Connor:<br /><pre>";
-print map { $_ . "\n" } sort @list;
-print "</td></tr></table>\n";
+print "<table width=35% align=center border=0><tr><td>List of Special/Holidays " .
+      "Connor Visits:<br /><p class=Legend>";
+print map { $_ . "<br />\n" } sort @list;
+print "</p></td></tr></table>\n";
 print "</pre><p class=\"footer\">Version: <font color=green>$VERSION</font><br />";
 print "CVS: <a target=\"_new\" href=\"http://demandred.dyndns.org/cgi-bin/cvsweb/ConnorCalendar/\">http://demandred.dyndns.org/cgi-bin/cvsweb/ConnorCalendar/</a>";
 print "</center></p>";
@@ -167,8 +169,8 @@ sub isSpecial
 sub isWeekend
 {
 	my $y = shift || return 0;
-        my $m = shift || return 0;
-        my $d = shift || return 0;
+    my $m = shift || return 0;
+    my $d = shift || return 0;
 
 	$m--;
 	my $ds = sprintf( "$y/$months[$m]/%02d", $d );
@@ -197,7 +199,7 @@ sub calcWeekends
 	my $d = shift;
 	my %weekends = ( );
 
-	print "Weekends I have Connor:\n";
+	print "Weekends Connor Visits:\n";
 
 	use Calendar;
 	my $date = Calendar->new_from_Gregorian( $m, $d, $y );
@@ -306,7 +308,7 @@ padding-bottom: 0px;
  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
  #font-family: Geneva, Arial, Helvetica, sans-serif;
  font-size: 12pt;
- background:url(lowerright.jpg) no-repeat bottom right;
+ background: #eeeeee;
  color:#000000;
 
 
@@ -325,7 +327,7 @@ p.Legend {
  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
  font-size: 8pt;
  margin: auto;
- width: 28%;
+ width: 300px;
  background-color : transparent;
  border-top: 1px solid #888888;
  border-left: 1px solid #888888;
@@ -394,7 +396,7 @@ p.footer {
  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
  font-size: 8pt;
  margin: auto;
- width: 48%;
+ width: 500px;
  background-color : transparent;
  border-top: 1px solid #888888;
  padding-top: 3px;