--- loncom/auth/lonroles.pm	2010/06/02 14:55:37	1.248
+++ loncom/auth/lonroles.pm	2010/07/30 20:35:16	1.255
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.248 2010/06/02 14:55:37 raeburn Exp $
+# $Id: lonroles.pm,v 1.255 2010/07/30 20:35:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -210,6 +210,7 @@ sub handler {
     my %dcroles = ();
     my $numdc = &check_fordc(\%dcroles,$then);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+    my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'};
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
@@ -223,7 +224,16 @@ sub handler {
 	if ($env{'request.course.id'}) {
             # Check if user is CC trying to select a course role
             if ($env{'form.switchrole'}) {
-                if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
+                my $switch_is_active;
+                if (defined($env{'user.role.'.$env{'form.switchrole'}})) {
+                    my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
+                    if (!$end || $end > $now) {
+                        if (!$start || $start < $refresh) {
+                            $switch_is_active = 1;
+                        }
+                    }
+                }
+                unless ($switch_is_active) {
                     &adhoc_course_role($refresh,$then);
                 }
             }
@@ -314,6 +324,41 @@ sub handler {
 		if ($tstatus eq 'is') {
 		    $where=~s/^\///;
 		    my ($cdom,$cnum,$csec)=split(/\//,$where);
+                    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
+                        my $home = $env{'course.'.$cdom.'_'.$cnum.'.home'};
+                        my @ids = &Apache::lonnet::current_machine_ids();
+                        unless ($loncaparev eq '' && $home && grep(/^\Q$home\E$/,@ids)) {
+                            my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
+                            if ($curr_reqd_hash{'internal.releaserequired'} &&
+                                $curr_reqd_hash{'internal.releaserequired'} > $loncaparev) {
+                                my ($switchserver,$switchwarning) =
+                                    &check_release_required($loncaparev,$cdom.'_'.$cnum,$trolecode,$curr_reqd_hash{'internal.releaserequired'});
+                                &Apache::loncommon::content_type($r,'text/html');
+                                &Apache::loncommon::no_cache($r);
+                                $r->send_http_header;
+                                my $end_page=&Apache::loncommon::end_page();
+                                $r->print(&Apache::loncommon::start_page('Selected course unavailable on this server').
+                                '<p class="LC_warning">'); 
+                                if ($switchwarning) {
+                                    $r->print($switchwarning.'<br /><a href="/adm/roles">');
+                                    if (&Apache::loncommon::show_course()) {
+                                        $r->print(&mt('Display courses'));
+                                    } else {
+                                        $r->print(&mt('Display roles'));
+                                    }
+                                    $r->print('</a>');
+                                } elsif ($switchserver) {
+				    $r->print(&mt('This course requires a newer version of LON-CAPA than is installed on this server.').
+                                              '<br />'.
+                                              '<a href="/adm/switchserver?'.$switchserver.'">'.
+                                              &mt('Switch Server').
+                                              '</a>');
+                                }
+                                $r->print('</p>'.&Apache::loncommon::end_page());
+                                return OK;
+                            }
+                        }
+                    }
 # check for course groups
                     my %coursegroups = &Apache::lonnet::get_active_groups(
                           $env{'user.domain'},$env{'user.name'},$cdom, $cnum);
@@ -449,6 +494,12 @@ ENDENTERKEY
                             if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$dest);
 			    } else {
+                                if ($dest =~ m{^/adm/coursedocs\?folderpath}) {
+                                    if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { 
+                                        my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
+                                        &update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum);
+                                    }
+                                }
 				$r->internal_redirect($dest);
 			    }
 			    return OK;
@@ -682,7 +733,7 @@ ENDHEADER
     my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
     my ($countactive,$countfuture,$inrole,$possiblerole) = 
         &gather_roles($then,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,\%roleclass,
-                      \%futureroles,\%timezones);
+                      \%futureroles,\%timezones,$loncaparev);
 
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
@@ -780,17 +831,25 @@ ENDHEADER
 	    if (ref($roletext{'user.role.'.$role}) eq 'ARRAY') {
 		$output.= &Apache::loncommon::start_data_table_row().
                           $roletext{'user.role.'.$role}->[0].
-                          &Apache::loncommon::end_data_table_row().
-                          &Apache::loncommon::continue_data_table_row().
-                          $roletext{'user.role.'.$role}->[1].
                           &Apache::loncommon::end_data_table_row();
+                if ($roletext{'user.role.'.$role}->[1] ne '') {
+                    $output .= &Apache::loncommon::continue_data_table_row().
+                               $roletext{'user.role.'.$role}->[1].
+                               &Apache::loncommon::end_data_table_row();
+                }
                 if ($role =~ m{dc\./($match_domain)/} 
 		    && $dcroles{$1}) {
 		    $output .= &adhoc_roles_row($1,'recent');
                 }
 	    } elsif ($numdc > 0) {
                 unless ($role =~/^error\:/) {
-                    $output.=&display_cc_role('user.role.'.$_);
+                    my ($roletext,$role_text_end) = &display_cc_role('user.role.'.$role);
+                    $output.= &Apache::loncommon::start_data_table_row().
+                              $roletext.
+                              &Apache::loncommon::end_data_table_row().
+                              &Apache::loncommon::continue_data_table_row().
+                              $role_text_end.
+                              &Apache::loncommon::end_data_table_row();
                 }
             }
 	}
@@ -856,13 +915,15 @@ ENDHEADER
 }
 
 sub gather_roles {
-    my ($then,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones) = @_;
+    my ($then,$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'};
+    my @ids = &Apache::lonnet::current_machine_ids();
     foreach my $envkey (sort(keys(%env))) {
         my $button = 1;
         my $switchserver='';
+        my $switchwarning;
         my ($role_text,$role_text_end,$sortkey);
         if ($envkey=~/^user\.role\./) {
             my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
@@ -912,7 +973,7 @@ sub gather_roles {
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
                     if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
+                    $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
                 }
                 $trole=Apache::lonnet::plaintext($role);
                 my $ttype;
@@ -923,7 +984,6 @@ sub gather_roles {
                 if (($role eq 'ca') || ($role eq 'aa')) {
                     my $home = &Apache::lonnet::homeserver($trest,$tdom);
                     my $allowed=0;
-                    my @ids=&Apache::lonnet::current_machine_ids();
                     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
                         $button=0;
@@ -943,7 +1003,6 @@ sub gather_roles {
                     my $home = &Apache::lonnet::homeserver
                         ($env{'user.name'},$env{'user.domain'});
                     my $allowed=0;
-                    my @ids=&Apache::lonnet::current_machine_ids();
                     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
                         $button=0;
@@ -962,6 +1021,7 @@ sub gather_roles {
                     $ttype = &Apache::loncommon::course_type($tcourseid);
                     $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
                     if ($env{'course.'.$tcourseid.'.description'}) {
+                        my $home=$env{'course.'.$tcourseid.'.home'};
                         $twhere=$env{'course.'.$tcourseid.'.description'};
                         $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         $twhere = &HTML::Entities::encode($twhere,'"<>&');
@@ -969,6 +1029,14 @@ sub gather_roles {
                             $twhere.=' <span class="LC_fontsize_small">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
                                     '</span>';
+                            unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') {
+                                my $required = $env{'course.'.$tcourseid.'.internal.releaserequired'};
+                                ($switchserver,$switchwarning) = 
+                                    &check_release_required($loncaparev,$tcourseid,$trolecode,$required);
+                                if ($switchserver || $switchwarning) {
+                                    $button = 0;
+                                }
+                            }
                         }
                     } else {
                         my %newhash=&Apache::lonnet::coursedescription($tcourseid);
@@ -981,6 +1049,15 @@ sub gather_roles {
                                     '</span>';
                             $ttype = $newhash{'type'};
                             $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
+                            my $home = $newhash{'home'};
+                            unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') {
+                                my $required = $newhash{'internal.releaserequired'};
+                                ($switchserver,$switchwarning) =
+                                    &check_release_required($loncaparev,$tcourseid,$trolecode,$required);
+                                if ($switchserver || $switchwarning) {
+                                    $button = 0;
+                                }
+                            }
                         } else {
                             $twhere=&mt('Currently not available');
                             $env{'course.'.$tcourseid.'.description'}=$twhere;
@@ -1004,7 +1081,7 @@ sub gather_roles {
                 ($role_text,$role_text_end) =
                     &build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,
                                     $advanced,$tremark,$tbg,$trole,$twhere,$tpstart,
-                                    $tpend,$nochoose,$button,$switchserver,$reinit);
+                                    $tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning);
                 $roletext->{$envkey}=[$role_text,$role_text_end];
                 if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
                 $sortrole->{$sortkey}=$envkey;
@@ -1112,10 +1189,12 @@ sub print_rolerows {
                         if (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') {
                             $output.= &Apache::loncommon::start_data_table_row().
                                       $roletext->{$sortrole->{$which}}->[0].
-                                      &Apache::loncommon::end_data_table_row().
-                                      &Apache::loncommon::continue_data_table_row().
-                                      $roletext->{$sortrole->{$which}}->[1].
                                       &Apache::loncommon::end_data_table_row();
+                            if ($roletext->{$sortrole->{$which}}->[1] ne '') {
+                                $output .= &Apache::loncommon::continue_data_table_row().
+                                           $roletext->{$sortrole->{$which}}->[1].
+                                           &Apache::loncommon::end_data_table_row();
+                            }
                         }
                         if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) {
                             if (ref($dcroles) eq 'HASH') {
@@ -1274,7 +1353,7 @@ sub privileges_info {
 }
 
 sub build_roletext {
-    my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit) = @_;
+    my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning) = @_;
     my ($roletext,$roletext_end);
     my $is_dc=($trolecode =~ m/^dc\./);
     my $rowspan=($is_dc) ? ''
@@ -1292,6 +1371,13 @@ sub build_roletext {
             } else {
                 $roletext.=('<td'.$rowspan.' class="'.$tbg.'">&nbsp;</td>');
             }
+            if ($switchwarning) {
+                if ($tremark eq '') {
+                    $tremark = $switchwarning;
+                } else {
+                    $tremark .= '<br />'.$switchwarning;
+                }
+            }
         } elsif ($tstatus eq 'is') {
             $roletext.='<td'.$rowspan.' class="'.$tbg.'">'.
                         '<input name="'.$buttonname.'" type="button" value="'.
@@ -1472,6 +1558,95 @@ sub check_forcc {
     return $is_cc;
 }
 
+sub check_release_required {
+    my ($loncaparev,$tcourseid,$trolecode,$required) = @_;
+    my ($switchserver,$warning);
+    if ($required ne '') {
+        my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/);
+        my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\d.\-]+\'?$/);
+        if ($reqdmajor ne '' && $reqdminor ne '') {
+            my $otherserver;
+            if (($major eq '' && $minor eq '') || 
+                (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) {
+                my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'});
+                my $switchlcrev = 
+                    &Apache::lonnet::get_server_loncaparev($env{'user.domain'},
+                                                           $userdomserver);
+                my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\d.\-]+\'?$/);
+                if (($swmajor eq '' && $swminor eq '') || ($reqdmajor > $swmajor) || 
+                    (($reqdmajor == $swmajor) && ($reqdminor > $swminor))) {
+                    my $cdom = $env{'course.'.$tcourseid.'.domain'};
+                    if ($cdom ne $env{'user.domain'}) {
+                        my ($coursedomserver,$coursehostname) = &Apache::lonnet::choose_server($cdom); 
+                        my $serverhomeID = &Apache::lonnet::get_server_homeID($coursehostname);
+                        my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
+                        my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
+                        my %udomdefaults = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                        my $remoterev = &Apache::lonnet::get_server_loncaparev($serverhomedom,$coursedomserver);
+                        my $canhost =
+                            &Apache::lonnet::can_host_session($env{'user.domain'},
+                                                              $coursedomserver,
+                                                              $remoterev,
+                                                              $udomdefaults{'remotesessions'},
+                                                              $defdomdefaults{'hostedsessions'});
+
+                        if ($canhost) {
+                            $otherserver = $coursedomserver;
+                        } else {
+                            $warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$tcourseid.'.internal.releaserequired'}).'<br />'. &mt("No suitable server could be found amongst servers in either your own domain or in the course's domain.");
+                        }
+                    } else {
+                        $warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$tcourseid.'.internal.releaserequired'}).'<br />'.&mt("No suitable server could be found amongst servers in your own domain (which is also the course's domain).");
+                    }
+                } else {
+                    $otherserver = $userdomserver;
+                }
+            }
+            if ($otherserver ne '') {
+                $switchserver = 'otherserver='.$otherserver.'&amp;role='.$trolecode;
+            }
+        }
+    }
+    return ($switchserver,$warning);
+}
+
+sub update_content_constraints {
+    my ($cdom,$cnum,$chome,$cid) = @_;
+    my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
+    my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'}); 
+    my %checkresponsetypes;
+    foreach my $key (keys(%Apache::lonnet::needsrelease)) {
+        my ($item,$name,$value) = split(/:/,$key);
+        if ($item eq 'resourcetag') {
+            if ($name eq 'responsetype') {
+                $checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key}
+            }
+        }
+    }
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (defined($navmap)) {
+        my %allresponses;
+        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+            my %responses = $res->responseTypes();
+            foreach my $key (keys(%responses)) {
+                next unless(exists($checkresponsetypes{$key}));
+                $allresponses{$key} += $responses{$key};
+            }
+        }
+        foreach my $key (keys(%allresponses)) {
+            my ($major,$minor) = split(/\./,$checkresponsetypes{$key});
+            if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) { 
+                ($reqdmajor,$reqdminor) = ($major,$minor);
+            } 
+        }
+        undef($navmap);
+    }
+    unless (($reqdmajor eq '') && ($reqdminor eq '')) {
+        &Apache::lonnet::update_released_required($reqdmajor.'.'.$reqdminor,$cdom,$cnum,$chome,$cid);
+    }
+    return;
+}
+
 sub courselink {
     my ($dcdom,$rowtype) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
@@ -1542,8 +1717,10 @@ sub display_cc_role {
     unless ($rolekey =~/^error\:/) {
         if ($rolekey =~ m{^user\.role\.(cc|co)\./($match_domain)/($match_courseid)$}) {
             my $ccrole = $1;
-            my $tcourseid = $2.'_'.$3;
-            my $trolecode = $1.'./'.$2.'/'.$3;
+            my $tdom = $2;
+            my $trest = $3;
+            my $tcourseid = $tdom.'_'.$trest;
+            my $trolecode = $ccrole.'./'.$tdom.'/'.$trest;
             my $twhere;
             my $ttype;
             my $tbg='LC_roles_is';
@@ -1551,7 +1728,7 @@ sub display_cc_role {
             if (%newhash) {
                 $twhere=$newhash{'description'}.
                         ' <span style="LC_fontsize_small">'.
-                        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1).
+                        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
                         '</span>';
                 $ttype = $newhash{'type'};
             } else {
@@ -1560,7 +1737,7 @@ sub display_cc_role {
             }
             my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);
             $twhere.="<br />".&mt('Domain').":".$1;
-            ($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
+            ($roletext,$roletext_end) = &build_roletext($trolecode,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
         }
     }
     return ($roletext,$roletext_end);
@@ -1578,7 +1755,7 @@ sub adhoc_roles_row {
     my $carole = &Apache::lonnet::plaintext('ca');
     my $selectcalink = &coauthorlink($dcdom,$rowtype);
     $output.=$ccrole.': '.$selectcclink
-            .' | '.$carole.': '.$selectcalink
+            .' | '.$carole.': '.$selectcalink.'</td>'
             .&Apache::loncommon::end_data_table_row();
     return $output;
 }