--- ConnorCalendar/calendar.pl	2013/05/30 14:38:50	1.7
+++ 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.7 2013/05/30 14:38:50 nick Exp $
+|	$Id: calendar.pl,v 1.13 2018/10/30 13:53:00 nick Exp $
 |
 +------------------------------------------------------------------------------
 =end comment
@@ -23,17 +23,17 @@ 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.7 2013/05/30 14:38:50 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',
@@ -42,8 +42,8 @@ my %holidays = (
 		 "Independence Day"	=> 'even',
 		 "Labor Day"		=> 'even',
 		 "Memorial Day"		=> 'odd',
-		 "New Year's Day"	=> 'even',
-		 "New Year's Eve"	=> 'even',
+		 "New Year's Day"	=> 'odd',
+		 "New Year's Eve"	=> 'odd',
 		 "Thanksgiving Day"	=> 'odd', 
 	       );
 
@@ -51,25 +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 );
+push @list, 'Easter Sunday' if ( $YEAR % 2 == 0 );
 
-print "Content-type: text/html\n\n";
-print &header( );
 print &css( );
-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( );
 
 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>";
+       "<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++ )
@@ -111,13 +115,13 @@ 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 "<table width=35% align=center border=0><tr><td>List of Special/Holidays " .
-      "I have Connor:<br /><p class=Legend>";
+      "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 />";
@@ -165,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 );
@@ -195,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 );