--- loncom/auth/lonroles.pm	2012/06/01 16:00:29	1.267
+++ loncom/auth/lonroles.pm	2012/08/03 17:35:39	1.269.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.267 2012/06/01 16:00:29 bisitz Exp $
+# $Id: lonroles.pm,v 1.269.2.1 2012/08/03 17:35:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,6 +149,7 @@ sub redirect_user {
     &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
+    my $swinfo=&Apache::lonmenu::rawconfig();
 
     # Breadcrumbs
     my $brcrum = [{'href' => $url,
@@ -163,6 +164,11 @@ sub redirect_user {
     $url=~s/ /\%20/g;
     $r->print(<<ENDREDIR);
 $start_page
+<script type="text/javascript">
+// <![CDATA[
+$swinfo
+// ]]>
+</script>
 <p>$msg</p>
 $end_page
 ENDREDIR
@@ -266,6 +272,7 @@ sub handler {
 			 	 "request.course.fn"   => '',
 				 "request.course.uri"  => '',
 				 "request.course.sec"  => '',
+                                 "request.course.tied" => '',
 				 "request.role"        => 'cm',
                                  "request.role.adv"    => $env{'user.adv'},
 				 "request.role.domain" => $env{'user.domain'}});
@@ -519,7 +526,8 @@ ENDENTERKEY
                                 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);
+                                        &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,
+                                                                                       $cdom.'_'.$cnum);
                                     }
                                 }
 				$r->internal_redirect($dest);
@@ -1686,43 +1694,6 @@ sub check_release_required {
     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
@@ -2293,7 +2264,7 @@ sub update_session_roles {
         }
         if (keys(%deletedroles) > 0) {
             $changemsg .= '<li>'.
-                          &mt('Existing roles deleted').'</li>'.
+                          &mt('Existing roles now expired').'</li>'.
                           '<ul>';
             foreach my $item (sort(keys(%deletedroles))) {
                 $changemsg .= '<li>'.$item.'</li>';