Error
".$error.www_displayLogin(); } } @@ -252,7 +263,7 @@ sub www_recoverPasswordFinish { $encryptedPassword = Digest::MD5::md5_base64($password); WebGUI::SQL->write("update users set identifier='$encryptedPassword' where userId='$userId'",$session{dbh}); $flag = 1; - $message = 'Someone (probably you) requested your account information be sent. Your password has been reset. The following information represents your new account information:\nUser: '.$username.'\nPass: '.$password.'\n'; + $message = "Someone (probably you) requested your account information be sent. Your password has been reset. The following represents your new account information:\nUser: ".$username."\nPass: ".$password."\n"; WebGUI::Mail::send($session{form}{email},"Account Information",$message); } $sth->finish(); @@ -292,8 +303,10 @@ sub www_saveAccount { $auth = $ldap->bind(dn=>$connectDN, password=>$session{form}{ldapPassword}); if ($auth->code == 48 || $auth->code == 49) { $error .= "Either your ".$session{setting}{ldapIdName}." or ".$session{setting}{ldapPasswordName}." were invalid. "; + WebGUI::ErrorHandler::warn("Invalid LDAP information for registration of LDAP ID: ".$session{form}{ldapId}); } elsif ($auth->code > 0) { $error .= 'LDAP error "'.$ldapStatusCode{$auth->code}.'" occured. Please contact your system administrator for assistance. '; + WebGUI::ErrorHandler::warn("LDAP error: ".$ldapStatusCode{$auth->code}); } $ldap->unbind; } @@ -306,7 +319,6 @@ sub www_saveAccount { $output .= 'Account created successfully!'; $output .= www_displayAccount(); } else { - WebGUI::ErrorHandler::warn($error); $output = "
Error
".$error.www_createAccount(); } return $output; diff --git a/lib/WebGUI/Utility.pm b/lib/WebGUI/Utility.pm index 023f8cc26..bbfd89ffb 100644 --- a/lib/WebGUI/Utility.pm +++ b/lib/WebGUI/Utility.pm @@ -18,7 +18,7 @@ use WebGUI::Session; use WebGUI::SQL; our @ISA = qw(Exporter); -our @EXPORT = qw(&getNextId &saveAttachment &round &urlizeTitle "e); +our @EXPORT = qw(&randint &getNextId &saveAttachment &round &urlizeTitle "e); #------------------------------------------------------------------- sub getNextId { @@ -35,6 +35,15 @@ sub quote { return $session{dbh}->quote($value); } +#------------------------------------------------------------------- +sub randint { + my ($low, $high) = @_; + $low = 0 unless defined $low; + $high = 1 unless defined $high; + ($low, $high) = ($high,$low) if $low > $high; + return $low + int( rand( $high - $low + 1 ) ); +} + #------------------------------------------------------------------- sub round { return sprintf("%.0f", $_[0]); diff --git a/lib/WebGUI/Widget/EventsCalendar.pm b/lib/WebGUI/Widget/EventsCalendar.pm index 0a0615ed7..c264258da 100644 --- a/lib/WebGUI/Widget/EventsCalendar.pm +++ b/lib/WebGUI/Widget/EventsCalendar.pm @@ -65,7 +65,9 @@ sub www_addSave { #------------------------------------------------------------------- sub www_addEvent { - my ($output, $today); + my ($output, $today, %recursEvery); + tie %recursEvery, 'Tie::IxHash'; + %recursEvery = ('never'=>'Happens Only Once','day'=>'Day','week'=>'Week'); if (WebGUI::Privilege::canEditPage()) { ($today) = epochToSet(time()); $output = 'Add Event
'; return $output; @@ -87,10 +90,36 @@ sub www_addEvent { #------------------------------------------------------------------- sub www_addEventSave { - my ($eventId); + my ($i, $recurringEventId, @startDate, @endDate, @eventId, $until); if (WebGUI::Privilege::canEditPage()) { - $eventId = getNextId("eventId"); - WebGUI::SQL->write("insert into event values ($eventId, $session{form}{wid}, ".quote($session{form}{name}).", ".quote($session{form}{description}).", '".setToEpoch($session{form}{startDate})."', '".setToEpoch($session{form}{endDate})."')",$session{dbh}); + $startDate[0] = setToEpoch($session{form}{startDate}); + $endDate[0] = setToEpoch($session{form}{endDate}); + $until = setToEpoch($session{form}{until}); + $eventId[0] = getNextId("eventId"); + if ($session{form}{recursEvery} eq "never") { + $recurringEventId = 0; + } elsif ($session{form}{recursEvery} eq "day") { + $recurringEventId = getNextId("recurringEventId"); + while ($startDate[$i] < $until) { + $i++; + $eventId[$i] = getNextId("eventId"); + $startDate[$i] = $startDate[0] + (86400 * $i); + $endDate[$i] = $endDate[0] + (86400 * $i); + } + } elsif ($session{form}{recursEvery} eq "week") { + $recurringEventId = getNextId("recurringEventId"); + while ($startDate[$i] < $until) { + $i++; + $eventId[$i] = getNextId("eventId"); + $startDate[$i] = $startDate[0] + (604800 * $i); + $endDate[$i] = $endDate[0] + (604800 * $i); + } + } + $i = 0; + while ($eventId[$i] > 0) { + WebGUI::SQL->write("insert into event values ($eventId[$i], $session{form}{wid}, ".quote($session{form}{name}).", ".quote($session{form}{description}).", '".$startDate[$i]."', '".$endDate[$i]."', $recurringEventId)",$session{dbh}); + $i++; + } return www_edit(); } else { return WebGUI::Privilege::insufficient(); @@ -102,7 +131,11 @@ sub www_deleteEvent { my ($output); if (WebGUI::Privilege::canEditPage()) { $output = 'Please Confirm
'; - $output = 'Are you certain that you want to delete this event?'; + $output .= 'Are you certain that you want to delete this event'; + if ($session{form}{rid} > 0) { + $output .= ' and all of its recurring events'; + } + $output .= '?'; return $output; } else { return WebGUI::Privilege::insufficient(); @@ -113,7 +146,11 @@ sub www_deleteEvent { sub www_deleteEventConfirm { my ($output); if (WebGUI::Privilege::canEditPage()) { - WebGUI::SQL->write("delete from event where eventId=$session{form}{eid}",$session{dbh}); + if ($session{form}{rid} > 0) { + WebGUI::SQL->write("delete from event where recurringEventId=$session{form}{rid}",$session{dbh}); + } else { + WebGUI::SQL->write("delete from event where eventId=$session{form}{eid}",$session{dbh}); + } return www_edit(); } else { return WebGUI::Privilege::insufficient(); @@ -138,9 +175,9 @@ sub www_edit { $output .= ''; $output .= ''; $output .= '
  | '.$event[1].' |
| '.$event[1].' |