From 892f5b4483a6e27fc52254421eae80aceab365c8 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sun, 4 Aug 2002 04:03:19 +0000
Subject: [PATCH] You can now choose to delete just a single event, or all of
 its recurrences.

---
 docs/install.txt                      |  3 +--
 docs/upgrades/upgrade_4.4.1-4.5.0.sql |  7 ++++++-
 lib/WebGUI/Wobject/EventsCalendar.pm  | 19 +++++++++----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/docs/install.txt b/docs/install.txt
index 1118111ef..ef5e028d7 100644
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -17,12 +17,11 @@ QnD INSTALL INSTRUCTIONS:
    LWP
    Tie::IxHash
    DBI
-   Mysql (or some other DB driver)
+   Mysql
    Digest::MD5
    Net::LDAP
    Tie::CPHash
    Date::Calc
-   HTML::CalendarMonthSimple
    Image::Magick
    HTML::Parser
 
diff --git a/docs/upgrades/upgrade_4.4.1-4.5.0.sql b/docs/upgrades/upgrade_4.4.1-4.5.0.sql
index ccb70941f..2ca5dd4eb 100644
--- a/docs/upgrades/upgrade_4.4.1-4.5.0.sql
+++ b/docs/upgrades/upgrade_4.4.1-4.5.0.sql
@@ -20,7 +20,12 @@ update international set message='Year(s)' where internationalId=703 and languag
 insert into international values (704,'WebGUI',1,'Second(s)');
 insert into international values (705,'WebGUI',1,'Minute(s)');
 insert into international values (706,'WebGUI',1,'Hours(s)');
-
+delete from international where namespace='EventsCalendar' and internationalId=10;
+delete from international where namespace='EventsCalendar' and internationalId=11;
+insert into international values (75,'EventsCalendar',1,'Which do you wish to do?');
+insert into international values (76,'EventsCalendar',1,'Delete only this event.');
+insert into international values (77,'EventsCalendar',1,'Delete this event <b>and</b> all of its recurring events.');
+insert into international values (78,'EventsCalendar',1,'Don\'t delete anything, I made a mistake.');
 
 
 
diff --git a/lib/WebGUI/Wobject/EventsCalendar.pm b/lib/WebGUI/Wobject/EventsCalendar.pm
index c44e9d62d..bbe9ed090 100644
--- a/lib/WebGUI/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Wobject/EventsCalendar.pm
@@ -132,16 +132,15 @@ sub www_deleteEvent {
 	my ($output);
         if (WebGUI::Privilege::canEditPage()) {
 		$output = '<h1>'.WebGUI::International::get(42).'</h1>';
-		$output .= WebGUI::International::get(10,$namespace);
-		if ($session{form}{rid} > 0) {
-			$output .= ' '.WebGUI::International::get(11,$namespace);
-		}
-		$output .= '?<p><div align="center"><a href="'.
-			WebGUI::URL::page('func=deleteEventConfirm&wid='.$session{form}{wid}.
-			'&eid='.$session{form}{eid}.'&rid='.$session{form}{rid}).'">'.
-			WebGUI::International::get(44).'</a> &nbsp; <a href="'.
-			WebGUI::URL::page('func=edit&wid='.$session{form}{wid}).'">'.
-			WebGUI::International::get(45).'</a></div>';
+		$output .= WebGUI::International::get(75,$namespace).'<p><blockquote>';
+		$output .= '<a href="'.WebGUI::URL::page('func=deleteEventConfirm&wid='.$session{form}{wid}.'&eid='
+			.$session{form}{eid}).'">'.WebGUI::International::get(76,$namespace).'</a><p>';
+		$output .= '<a href="'.WebGUI::URL::page('func=deleteEventConfirm&wid='.$session{form}{wid}.'&eid='
+			.$session{form}{eid}.'&rid='.$session{form}{rid}).'">'
+			.WebGUI::International::get(77,$namespace).'</a><p>'; 
+		$output .= '<a href="'.WebGUI::URL::page('func=edit&wid='.$session{form}{wid}).'">'
+			.WebGUI::International::get(78,$namespace).'</a>';
+		$output .= '</blockquote>';
                 return $output;
         } else {
                 return WebGUI::Privilege::insufficient();