Update of /cvs/scoop/scoop/lib/Scoop/Calendar
In directory lithium.sabren.com:/tmp/cvs-serv22652/lib/Scoop/Calendar
Modified Files:
EditCalendar.pm
Log Message:
Committing janra's calender ISE fix.
-j
Index: EditCalendar.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Calendar/EditCalendar.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EditCalendar.pm 21 Jan 2005 14:14:30 -0000 1.1
--- EditCalendar.pm 11 May 2005 23:26:23 -0000 1.2
***************
*** 439,455 ****
$keys->{id} = $id;
! # save any changes ($action contains which list (submit/view) was changed)
! if ( $action =~ /_add$/ ) {
! my $uid = $S->get_uid_from_nick($S->cgi->param('nick'));
! my ($list,$act) = split(/_/,$action);
! warn " (_invitation_list) adding uid $uid to $type $id $list" if $DEBUG;
! my $rv = $S->_save_pref($S->user_data($uid),"${type}_${id}_$list",'on');
! $keys->{msg} .= "Added " . $S->cgi->param('nick') . " to $list list" if ( $rv =~ /saved/i );
! } elsif ( $action =~ /_remove$/ ) {
! my $uid = $S->get_uid_from_nick($S->cgi->param('nick'));
! my ($list,$act) = split(/_/,$action);
! warn " (_invitation_list) adding uid $uid to $type $id $list" if $DEBUG;
! my $rv = $S->_save_pref($S->user_data($uid),"${type}_${id}_$list",'off');
! $keys->{msg} .= "Removed " . $S->cgi->param('nick') . " from $list list" if ( $rv =~ /saved/i );
}
--- 439,469 ----
$keys->{id} = $id;
! my $uid = $S->get_uid_from_nick($S->cgi->param('nick'));
! if ($uid) {
! warn " (_invitation_list) handling invitations for uid $uid" if $DEBUG;
! # save any changes ($action contains which list (submit/view) was changed)
! if ( $action =~ /_add$/ ) {
! my ($list,$act) = split(/_/,$action);
! warn " (_invitation_list) adding uid $uid to $type $id $list" if $DEBUG;
! my $rv = $S->_save_pref($S->user_data($uid),"${type}_${id}_$list",'on');
! warn " (_invitation_list) added to $type $id $list" if $DEBUG;
! if ( $rv =~ /saved/i ) {
! $keys->{msg} .= "Added " . $S->cgi->param('nick') . " to $list list";
! } else {
! $keys->{msg} .= $rv;
! }
! } elsif ( $action =~ /_remove$/ ) {
! my ($list,$act) = split(/_/,$action);
! warn " (_invitation_list) removing uid $uid from $type $id $list" if $DEBUG;
! my $rv = $S->_save_pref($S->user_data($uid),"${type}_${id}_$list",'off');
! warn " (_invitation_list) removed from $type $id $list" if $DEBUG;
! if ( $rv =~ /saved/i ) {
! $keys->{msg} .= "Removed " . $S->cgi->param('nick') . " from $list list";
! } else {
! $keys->{msg} .= $rv;
! }
! }
! } else {
! $keys->{msg} .= "No such user " . $S->cgi->param('nick');
}
***************
*** 482,491 ****
} else {
# list of invitees
! while ( my ($uid) = $sth->fetchrow_array() ) {
my $user_keys;
$user_keys->{op} = 'editcalendar';
my $item = $S->{UI}->{BLOCKS}->{calendar_invitations_item};
! $user_keys->{uid} = $uid;
! $user_keys->{nickname} = $S->get_nick_from_uid($uid);
$user_keys->{urlnick} = $S->urlify($user_keys->{nickname});
$user_keys->{list} = 'invite';
--- 496,505 ----
} else {
# list of invitees
! while ( my ($u) = $sth->fetchrow_array() ) {
my $user_keys;
$user_keys->{op} = 'editcalendar';
my $item = $S->{UI}->{BLOCKS}->{calendar_invitations_item};
! $user_keys->{uid} = $u;
! $user_keys->{nickname} = $S->get_nick_from_uid($u);
$user_keys->{urlnick} = $S->urlify($user_keys->{nickname});
$user_keys->{list} = 'invite';
***************
*** 519,528 ****
} else {
# list of invitees
! while ( my ($uid) = $sth->fetchrow_array() ) {
my $user_keys;
$user_keys->{op} = 'editcalendar';
my $item = $S->{UI}->{BLOCKS}->{calendar_invitations_item};
! $user_keys->{uid} = $uid;
! $user_keys->{nickname} = $S->get_nick_from_uid($uid);
$user_keys->{urlnick} = $S->urlify($user_keys->{nickname});
$user_keys->{list} = 'submit';
--- 533,542 ----
} else {
# list of invitees
! while ( my ($u) = $sth->fetchrow_array() ) {
my $user_keys;
$user_keys->{op} = 'editcalendar';
my $item = $S->{UI}->{BLOCKS}->{calendar_invitations_item};
! $user_keys->{uid} = $u;
! $user_keys->{nickname} = $S->get_nick_from_uid($u);
$user_keys->{urlnick} = $S->urlify($user_keys->{nickname});
$user_keys->{list} = 'submit';
***************
*** 558,567 ****
} else {
# list of invitees
! while ( my ($uid) = $sth->fetchrow_array() ) {
my $user_keys;
$user_keys->{op} = 'submitevent';
my $item = $S->{UI}->{BLOCKS}->{calendar_invitations_item};
! $user_keys->{uid} = $uid;
! $user_keys->{nickname} = $S->get_nick_from_uid($uid);
$user_keys->{urlnick} = $S->urlify($user_keys->{nickname});
$user_keys->{list} = 'invite';
--- 572,581 ----
} else {
# list of invitees
! while ( my ($u) = $sth->fetchrow_array() ) {
my $user_keys;
$user_keys->{op} = 'submitevent';
my $item = $S->{UI}->{BLOCKS}->{calendar_invitations_item};
! $user_keys->{uid} = $u;
! $user_keys->{nickname} = $S->get_nick_from_uid($u);
$user_keys->{urlnick} = $S->urlify($user_keys->{nickname});
$user_keys->{list} = 'invite';
***************
*** 594,603 ****
} else {
# list of invitees
! while ( my ($uid) = $sth->fetchrow_array() ) {
my $user_keys;
$user_keys->{op} = 'submitevent';
my $item = $S->{UI}->{BLOCKS}->{calendar_invitations_item};
! $user_keys->{uid} = $uid;
! $user_keys->{nickname} = $S->get_nick_from_uid($uid);
$user_keys->{urlnick} = $S->urlify($user_keys->{nickname});
$user_keys->{list} = 'submit';
--- 608,617 ----
} else {
# list of invitees
! while ( my ($u) = $sth->fetchrow_array() ) {
my $user_keys;
$user_keys->{op} = 'submitevent';
my $item = $S->{UI}->{BLOCKS}->{calendar_invitations_item};
! $user_keys->{uid} = $u;
! $user_keys->{nickname} = $S->get_nick_from_uid($u);
$user_keys->{urlnick} = $S->urlify($user_keys->{nickname});
$user_keys->{list} = 'submit';