'); + if ($switchwarning) { + $r->print($switchwarning.''); + if (&Apache::loncommon::show_course()) { + $r->print(&mt('Display courses')); + } else { + $r->print(&mt('Display roles')); + } + $r->print(''); + } elsif ($switchserver) { + $r->print(&mt('This course requires a newer version of LON-CAPA than is installed on this server.'). + ''. + ''. + &mt('Switch Server'). + ''); + } + $r->print('
print(' checked="checked" '); } - $r->print(' />'.&mt('Show all roles').'' - .' ' - .'
'.$do_update.'
' @@ -874,7 +976,7 @@ ENDHEADER } sub gather_roles { - my ($then,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_; + my ($update,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_; my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,''); my $advanced = $env{'user.adv'}; my $tryagain = $env{'form.tryagain'}; @@ -886,19 +988,12 @@ sub gather_roles { my ($role_text,$role_text_end,$sortkey); if ($envkey=~/^user\.role\./) { my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend); - &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where, + &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where, \$trolecode,\$tstatus,\$tstart,\$tend); next if (!defined($role) || $role eq '' || $role =~ /^gr/); - my $timezone = &role_timezone($where,$timezones); $tremark=''; $tpstart=' '; $tpend=' '; - if ($tstart) { - $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone); - } - if ($tend) { - $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone); - } if ($env{'request.role'} eq $trolecode) { $tstatus='selected'; } @@ -907,6 +1002,13 @@ sub gather_roles { || ($tstatus eq 'selected') || ($tstatus eq 'future') || ($env{'form.showall'})) { + my $timezone = &role_timezone($where,$timezones); + if ($tstart) { + $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone); + } + if ($tend) { + $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone); + } if ($tstatus eq 'is') { $tbg='LC_roles_is'; $possiblerole=$trolecode; @@ -989,10 +1091,13 @@ sub gather_roles { &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). ''; unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') { - ($switchserver,$switchwarning) = - &check_release_required($loncaparev,$tcourseid,$trolecode); - if ($switchserver || $switchwarning) { - $button = 0; + my $required = $env{'course.'.$tcourseid.'.internal.releaserequired'}; + if ($required ne '') { + ($switchserver,$switchwarning) = + &check_release_required($loncaparev,$tcourseid,$trolecode,$required); + if ($switchserver || $switchwarning) { + $button = 0; + } } } } @@ -1009,10 +1114,13 @@ sub gather_roles { $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid); my $home = $newhash{'home'}; unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') { - ($switchserver,$switchwarning) = - &check_release_required($loncaparev,$tcourseid,$trolecode); - if ($switchserver || $switchwarning) { - $button = 0; + my $required = $newhash{'internal.releaserequired'}; + if ($required ne '') { + ($switchserver,$switchwarning) = + &check_release_required($loncaparev,$tcourseid,$trolecode,$required); + if ($switchserver || $switchwarning) { + $button = 0; + } } } } else { @@ -1058,9 +1166,15 @@ sub role_timezone { my $cnum = $2; if ($cdom && $cnum) { if (!exists($timezones->{$cdom.'_'.$cnum})) { - my %timehash = - &Apache::lonnet::get('environment',['timezone'],$cdom,$cnum); - if ($timehash{'timezone'} eq '') { + my $tz; + if ($env{'course.'.$cdom.'_'.$cnum.'.description'}) { + $tz = $env{'course.'.$cdom.'_'.$cnum.'.timezone'}; + } else { + my %timehash = + &Apache::lonnet::get('environment',['timezone'],$cdom,$cnum); + $tz = $timehash{'timezone'}; + } + if ($tz eq '') { if (!exists($timezones->{$cdom})) { my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); @@ -1073,7 +1187,7 @@ sub role_timezone { $timezones->{$cdom.'_'.$cnum} = $timezones->{$cdom}; } else { $timezones->{$cdom.'_'.$cnum} = - &Apache::lonlocal::gettimezone($timehash{'timezone'}); + &Apache::lonlocal::gettimezone($tz); } } $timezone = $timezones->{$cdom.'_'.$cnum}; @@ -1328,7 +1442,13 @@ sub build_roletext { } else { $roletext.=(' '); } - $tremark .= $switchwarning; + if ($switchwarning) { + if ($tremark eq '') { + $tremark = $switchwarning; + } else { + $tremark .= ''.$switchwarning; + } + } } elsif ($tstatus eq 'is') { $roletext.=''. ''. + ' '. &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). ''; $ttype = $newhash{'type'}; @@ -1650,7 +1776,7 @@ sub display_cc_role { $env{'course.'.$tcourseid.'.description'}=$twhere; } my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid); - $twhere.="".&mt('Domain').":".$1; + $twhere.="".&mt('Domain').":".$tdom; ($roletext,$roletext_end) = &build_roletext($trolecode,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,''); } } @@ -1696,6 +1822,644 @@ sub courseloadpage { return $startpage; } +sub update_session_roles { + my $then=$env{'user.login.time'}; + my $refresh=$env{'user.refresh.time'}; + if (!$refresh) { + $refresh = $then; + } + my $update = $env{'user.update.time'}; + if (!$update) { + $update = $then; + } + my $now = time; + my %roleshash = + &Apache::lonnet::get_my_roles('','','userroles', + ['active','future','previous'], + undef,undef,1); + my ($msg,@newsec,$oldsec,$currrole_expired,@changed_roles, + %changed_groups,%dbroles,%deletedroles,%allroles,%allgroups, + %userroles,%checkedgroup,%crprivs,$hasgroups,%rolechange, + %groupchange,%newrole,%newgroup,%customprivchg,%groups_roles, + @rolecodes); + my @possroles = ('cr','st','ta','ad','ep','in','co','cc'); + my %courseroles; + foreach my $item (keys(%roleshash)) { + my ($uname,$udom,$role,$remainder) = split(/:/,$item,4); + my ($tstart,$tend) = split(/:/,$roleshash{$item}); + my ($section,$group,@group_privs); + if ($role =~ m{^gr/(\w*)$}) { + $role = 'gr'; + my $priv = $1; + next if ($tstart eq '-1'); + if (&curr_role_status($tstart,$tend,$refresh,$now) eq 'active') { + if ($priv ne '') { + push(@group_privs,$priv); + } + } + if ($remainder =~ /:/) { + (my $additional_privs,$group) = + ($remainder =~ /^([\w:]+):([^:]+)$/); + if ($additional_privs ne '') { + if (&curr_role_status($tstart,$tend,$refresh,$now) eq 'active') { + push(@group_privs,split(/:/,$additional_privs)); + @group_privs = sort(@group_privs); + } + } + } else { + $group = $remainder; + } + } else { + $section = $remainder; + } + my $where = "/$udom/$uname"; + if ($section ne '') { + $where .= "/$section"; + } elsif ($group ne '') { + $where .= "/$group"; + } + my $rolekey = "$role.$where"; + my $envkey = "user.role.$rolekey"; + $dbroles{$envkey} = 1; + if (($env{'request.role'} eq $rolekey) && ($role ne 'st')) { + if (&curr_role_status($tstart,$tend,$refresh,$now) ne 'active') { + $currrole_expired = 1; + } + } + if ($env{$envkey} eq '') { + my $status_in_db = + &curr_role_status($tstart,$tend,$refresh,$now); + &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); + if (($role eq 'st') && ($env{'request.role'} =~ m{^\Q$role\E\.\Q/$udom/$uname\E})) { + if ($status_in_db eq 'active') { + if ($section eq '') { + push(@newsec,'none'); + } else { + push(@newsec,$section); + } + } + } else { + unless (grep(/^\Q$role\E$/,@changed_roles)) { + push(@changed_roles,$role); + } + if ($status_in_db ne 'previous') { + if ($role eq 'gr') { + $newgroup{$rolekey} = $status_in_db; + if ($status_in_db eq 'active') { + unless (ref($courseroles{$udom}) eq 'HASH') { + %{$courseroles{$udom}} = + &Apache::lonnet::get_my_roles('','','userroles', + ['active'],\@possroles, + [$udom],1); + } + &Apache::lonnet::get_groups_roles($udom,$uname, + $courseroles{$udom}, + \@rolecodes,\%groups_roles); + } + } else { + $newrole{$rolekey} = $status_in_db; + } + } + } + } else { + my ($currstart,$currend) = split(/\./,$env{$envkey}); + if ($role eq 'gr') { + if (&curr_role_status($currstart,$currend,$refresh,$update) ne 'previous') { + $hasgroups = 1; + } + } + if (($currstart ne $tstart) || ($currend ne $tend)) { + my $status_in_env = + &curr_role_status($currstart,$currend,$refresh,$update); + my $status_in_db = + &curr_role_status($tstart,$tend,$refresh,$now); + if ($status_in_env ne $status_in_db) { + if ($status_in_env eq 'active') { + if ($role eq 'st') { + if ($env{'request.role'} eq $rolekey) { + my $switchsection; + unless (ref($courseroles{$udom}) eq 'HASH') { + %{$courseroles{$udom}} = + &Apache::lonnet::get_my_roles('','','userroles', + ['active'], + \@possroles,[$udom],1); + } + foreach my $crsrole (keys(%{$courseroles{$udom}})) { + if ($crsrole =~ /^\Q$uname\E:\Q$udom\E:st/) { + $switchsection = 1; + last; + } + } + if ($switchsection) { + if ($section eq '') { + $oldsec = 'none'; + } else { + $oldsec = $section; + } + &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); + } else { + $currrole_expired = 1; + next; + } + } + } + unless ($rolekey eq $env{'request.role'}) { + if ($role eq 'gr') { + &Apache::lonnet::delete_env_groupprivs($where,\%courseroles,\@possroles); + } else { + &Apache::lonnet::delenv("user.priv.$rolekey",undef,[$role]); + &Apache::lonnet::delenv("user.priv.cm.$where",undef,['cm']); + } + &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); + } + } elsif ($status_in_db eq 'active') { + if (($role eq 'st') && + ($env{'request.role'} =~ m{^\Q$role\E\.\Q/$udom/$uname\E})) { + if ($section eq '') { + push(@newsec,'none'); + } else { + push(@newsec,$section); + } + } elsif ($role eq 'gr') { + unless (ref($courseroles{$udom}) eq 'HASH') { + %{$courseroles{$udom}} = + &Apache::lonnet::get_my_roles('','','userroles', + ['active'], + \@possroles,[$udom],1); + } + &Apache::lonnet::get_groups_roles($udom,$uname, + $courseroles{$udom}, + \@rolecodes,\%groups_roles); + } + &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); + } + unless (grep(/^\Q$role\E$/,@changed_roles)) { + push(@changed_roles,$role); + } + if ($role eq 'gr') { + $groupchange{"/$udom/$uname"}{$group} = $status_in_db; + } else { + $rolechange{$rolekey} = $status_in_db; + } + } + } else { + if ($role eq 'gr') { + unless ($checkedgroup{$where}) { + my $status_in_db = + &curr_role_status($tstart,$tend,$refresh,$now); + if ($tstart eq '-1') { + $status_in_db = 'deleted'; + } + unless (ref($courseroles{$udom}) eq 'HASH') { + %{$courseroles{$udom}} = + &Apache::lonnet::get_my_roles('','','userroles', + ['active'], + \@possroles,[$udom],1); + } + if (ref($courseroles{$udom}) eq 'HASH') { + foreach my $item (keys(%{$courseroles{$udom}})) { + next unless ($item =~ /^\Q$uname\E/); + my ($cnum,$cdom,$crsrole,$crssec) = split(/:/,$item); + my $area = '/'.$cdom.'/'.$cnum; + if ($crssec ne '') { + $area .= '/'.$crssec; + } + my $crsrolekey = $crsrole.'.'.$area; + my $currprivs = $env{'user.priv.'.$crsrole.'.'.$area.'.'.$where}; + $currprivs =~ s/^://; + $currprivs =~ s/\&F$//; + my @curr_grp_privs = split(/\&F:/,$currprivs); + @curr_grp_privs = sort(@curr_grp_privs); + my @diffs; + if (@group_privs > 0 || @curr_grp_privs > 0) { + @diffs = &Apache::loncommon::compare_arrays(\@group_privs,\@curr_grp_privs); + } + if (@diffs == 0) { + last; + } else { + unless(grep(/^\Qgr\E$/,@rolecodes)) { + push(@rolecodes,'gr'); + } + &gather_roleprivs(\%allroles,\%allgroups, + \%userroles,$where,$role, + $tstart,$tend,$status_in_db); + if ($status_in_db eq 'active') { + &Apache::lonnet::get_groups_roles($udom,$uname, + $courseroles{$udom}, + \@rolecodes,\%groups_roles); + } + $changed_groups{$udom.'_'.$uname}{$group} = $status_in_db; + last; + } + } + } + $checkedgroup{$where} = 1; + } + } elsif ($role =~ /^cr/) { + my $status_in_db = + &curr_role_status($tstart,$tend,$refresh,$now); + my ($rdummy,$rest) = split(/\//,$role,2); + my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); + my %currpriv; + unless (exists($crprivs{$rest})) { + my ($rdomain,$rauthor,$rrole)=split(/\//,$rest); + my $homsvr=&Apache::lonnet::homeserver($rauthor,$rdomain); + if (&Apache::lonnet::hostname($homsvr) ne '') { + my ($rdummy,$roledef)= + &Apache::lonnet::get('roles',["rolesdef_$rrole"], + $rdomain,$rauthor); + if (($rdummy ne 'con_lost') && ($roledef ne '')) { + my $i = 0; + my @scopes = ('sys','dom','crs'); + my @privs = split(/\_/,$roledef); + foreach my $priv (@privs) { + my ($blank,@prv) = split(/:/,$priv); + @prv = map { $_ .= (/\&\w+$/ ? '':'&F') } @prv; + if (@prv) { + $priv = ':'.join(':',sort(@prv)); + } + $crprivs{$rest}{$scopes[$i]} = $priv; + $i++; + } + } + } + } + $currpriv{sys} = $env{"user.priv.$rolekey./"}; + $currpriv{dom} = $env{"user.priv.$rolekey./$udom/"}; + $currpriv{crs} = $env{"user.priv.$rolekey.$where"}; + if (keys(%crprivs)) { + if (($crprivs{$rest}{sys} ne $currpriv{sys}) || + ($crprivs{$rest}{dom} ne $currpriv{dom}) + || + ($crprivs{$rest}{crs} ne $currpriv{crs})) { + &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); + unless (grep(/^\Q$role\E$/,@changed_roles)) { + push(@changed_roles,$role); + } + my $status_in_env = + &curr_role_status($currstart,$currend,$refresh,$update); + if ($status_in_env eq 'active') { + $customprivchg{$rolekey} = $status_in_env; + } + } + } + } + } + } + } + foreach my $envkey (keys(%env)) { + next unless ($envkey =~ /^user\.role\./); + next if ($dbroles{$envkey}); + next if ($envkey eq 'user.role.'.$env{'request.role'}); + my ($currstart,$currend) = split(/\./,$env{$envkey}); + my $status_in_env = + &curr_role_status($currstart,$currend,$refresh,$update); + my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/); + my ($role,$rest)=split(/\./,$rolekey,2); + if (&Apache::lonnet::delenv($envkey,undef,[$role])) { + if ($status_in_env eq 'active') { + if ($role eq 'gr') { + &Apache::lonnet::delete_env_groupprivs($rest,\%courseroles, + \@possroles); + } else { + &Apache::lonnet::delenv("user.priv.$rolekey",undef,[$role]); + &Apache::lonnet::delenv("user.priv.cm.$rest",undef,['cm']); + } + unless (grep(/^\Q$role\E$/,@changed_roles)) { + push(@changed_roles,$role); + } + $deletedroles{$rolekey} = 1; + } + } + } + if (($oldsec) && (@newsec > 0)) { + if (@newsec > 1) { + $msg = ''.&mt('The section has changed for your current role. Log-out and log-in again to select a role for the new section.').''; + } else { + my $newrole = $env{'request.role'}; + if ($newsec[0] eq 'none') { + $newrole =~ s{(/[^/])$}{}; + } elsif ($oldsec eq 'none') { + $newrole .= '/'.$newsec[0]; + } else { + $newrole =~ s{([^/]+)$}{$newsec[0]}; + } + my $coursedesc = $env{'course.'.$env{'request.course.id'}.'.description'}; + my ($curr_role) = ($env{'request.role'} =~ m{^(\w+)\./$match_domain/$match_courseid}); + my %temp=('logout_'.$env{'request.course.id'} => time); + &Apache::lonnet::put('email_status',\%temp); + &Apache::lonnet::delenv('user.state.'.$env{'request.course.id'}); + &Apache::lonnet::appenv({"request.course.id" => '', + "request.course.fn" => '', + "request.course.uri" => '', + "request.course.sec" => '', + "request.role" => 'cm', + "request.role.adv" => $env{'user.adv'}, + "request.role.domain" => $env{'user.domain'}}); + my $rolename = &Apache::loncommon::plainname($curr_role); + $msg = ''. + ''. + ''. + ''. + &mt('Your section has changed for your current [_1] role in [_2].',$rolename,$coursedesc).''; + my $button = ''; + if ($newsec[0] eq 'none') { + $msg .= &mt('[_1] to continue with your new section-less role.',$button); + } else { + $msg .= &mt('[_1] to continue with your new role in section ([_2]).',$button,$newsec[0]); + } + $msg .= '