[LON-CAPA-cvs] cvs: loncom(GCI_3) /auth lonroles.pm

[raeburn]

raeburn		Mon Jan 18 16:48:21 2010 EDT

  Modified files:              (Branch: GCI_3)
    /loncom/auth	lonroles.pm 
  Log:
  - Customization for GCI_3 
    - Backport 1.242, 1.243.
      - Use replacement title for standard course roles if set in course's configuration.
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.240.2.11 loncom/auth/lonroles.pm:1.240.2.12
--- loncom/auth/lonroles.pm:1.240.2.11	Sat Jan 16 19:57:01 2010
+++ loncom/auth/lonroles.pm	Mon Jan 18 16:48:21 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.240.2.11 2010/01/16 19:57:01 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.12 2010/01/18 16:48:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1079,7 +1079,7 @@
                 } elsif ($trest) {
                     my $tcourseid=$tdom.'_'.$trest;
                     $ttype = &Apache::loncommon::course_type($tcourseid);
-                    $trole = &Apache::lonnet::plaintext($role,$ttype);
+                    $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid));
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
                         $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
@@ -1098,7 +1098,7 @@
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
                               '</span>';
                             $ttype = $newhash{'type'};
-                            $trole = &Apache::lonnet::plaintext($role,$ttype);
+                            $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
                         } else {
                             $twhere=&mt('Currently not available');
                             $env{'course.'.$tcourseid.'.description'}=$twhere;
@@ -1719,7 +1719,7 @@
                 $twhere=&mt('Currently not available');
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
-            my $trole = &Apache::lonnet::plaintext($ccrole,$ttype);
+            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,'');
         }