--- loncom/imspackages/imsimport.pm	2009/05/04 16:45:51	1.30
+++ loncom/imspackages/imsimport.pm	2010/09/26 02:10:49	1.33
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 # 
-# $Id: imsimport.pm,v 1.30 2009/05/04 16:45:51 bisitz Exp $
+# $Id: imsimport.pm,v 1.33 2010/09/26 02:10:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -299,7 +299,7 @@ sub display_one {
          <option value="-1" selected="selected">Please select</option>
          <option value="bb5">Blackboard 5</option>
          <option value="bb6">Blackboard 6</option>
-         <option value="angel">ANGEL</option>
+         <option value="angel5">ANGEL 5.5</option>
          <option value="webctce4">WebCT 4 Campus Edition</option>
          <option value="webctvista4">WebCT Vista 4</option>
         </select><br />'."\n".
@@ -380,7 +380,7 @@ sub display_two {
                             $count{$area} ++;
                         }
                     }
-                } elsif ($cms eq 'angel') {
+                } elsif ($cms eq 'angel5') {
                     foreach my $area (keys %{$$cmsmap{$cms}}) {
                         if ($area eq 'doc') {
                             if (grep/^$resources{$res}{type}$/,@{$$cmsmap{$cms}{doc}}) {
@@ -526,7 +526,7 @@ sub display_three {
 
     foreach my $area (@{$areas}) {
         if (defined($env{"form.$area"}) ) {
-            if ($cms eq 'angel' && $area eq 'doc') {
+            if ($cms eq 'angel5' && $area eq 'doc') {
                 foreach (@{$$cmsmap{$cms}{$area}}) {
                     $importareas{$_} = 1;
                 }
@@ -599,7 +599,7 @@ sub display_three {
 
         $r->print("<h3>IMS import completed</h3>");
 
-        if ($cms eq 'angel') {
+        if ($cms eq 'angel5') {
             $r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], and [quant,_3,bulletin board] have been created, and [quant,_4,file] copied.',$total{seq},$total{page},$total{board},$total{file})."\n");
         } else {
             $r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], [quant,_3,bulletin board], [quant,_4,quiz,quizzes], [quant,_5,survey], and [quant,_6,problem] have been created, and [quant,_7,file] copied.',$total{seq},$total{page},$total{board},$total{quiz},$total{surv},$total{prob},$total{file})."\n");
@@ -616,63 +616,42 @@ sub display_three {
 # ---------------------------------------------------------------- Get LON-CAPA Course Coordinator roles for this user
 sub get_ccroles {
     my ($user,$dom,$crsentry,$crslist) = @_;
-    my %roles = ();
+    my %roles;
     unless ($user eq '') {
-        %roles = &Apache::lonnet::dump('roles',$dom,$user);
+        my $ccrole = 'cc';
+        %roles = &Apache::lonnet::get_my_roles($user,$dom,'userroles',undef,[$ccrole]);
     }
     my $iter = 0;
     my @codes = ();
     my %courses = ();
     my @crslist = ();
     my %descrip =();
-    foreach my $key (keys %roles ) {
+    foreach my $key (keys(%roles)) {
         if ($key =~ m{^/($LONCAPA::domain_re)/($LONCAPA::username_re)_cc$}) {
             my $cdom = $1;
             my $crs = $2;
-            my $role_end = 0;
-            my $role_start = 0;
-            my $active_chk = 1;
-            if ( $roles{$key} =~ m/^cc_(\d+)/ ) {
-                $role_end = $1;
-                if ( $roles{$key} =~ m/^cc_($role_end)_(\d+)$/ )
-                {
-                    $role_start = $2;
-                }
-            }
-            if ($role_start > 0) {
-                if (time < $role_start) {
-                    $active_chk = 0;
-                }
-            }
-            if ($role_end > 0) {
-                if (time > $role_end) {
-                    $active_chk = 0;
-                }
+            my $currcode = '';
+            my %settings = &Apache::lonnet::get('environment',['internal.coursecode','description'],$cdom,$crs);
+            if (defined($settings{'description'}) ) {
+                $descrip{$crs} = $settings{'description'};
+            } else {
+                $descrip{$crs} = 'Unknown';
             }
-            if ($active_chk) {
-                my $currcode = '';
-                my %settings = &Apache::lonnet::get('environment',['internal.coursecode','description'],$cdom,$crs);
-                if (defined($settings{'description'}) ) {
-                    $descrip{$crs} = $settings{'description'};
-                } else {
-                    $descrip{$crs} = 'Unknown';
-                }
-                if (defined($settings{'internal.coursecode'}) ) {
-                    $currcode = $settings{'internal.coursecode'};
-                    if ($currcode eq '') {
-                        $currcode = "____".$iter;
-                        $iter ++;
-                    }
-                } else {
+            if (defined($settings{'internal.coursecode'}) ) {
+                $currcode = $settings{'internal.coursecode'};
+                if ($currcode eq '') {
                     $currcode = "____".$iter;
                     $iter ++;
                 }
-                unless (grep/^$currcode$/,@codes) {
-                    push @codes,$currcode;
-                    @{$courses{$currcode}} = ();
-                }
-                push @{$courses{$currcode}}, $cdom.'/'.$crs;
+            } else {
+                $currcode = "____".$iter;
+                $iter ++;
+            }
+            unless (grep/^$currcode$/,@codes) {
+                push @codes,$currcode;
+                @{$courses{$currcode}} = ();
             }
+            push @{$courses{$currcode}}, $cdom.'/'.$crs;
         }
     }
     foreach my $code (sort @codes) {
@@ -762,9 +741,9 @@ sub handler {
     $r->print(&Apache::loncommon::start_page($title, $javascript));
 
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-        $r->print('<h3><span class="LC_warning">'
-                  .&mt('Co-Author [_1]:[_2]',$uname,$udom)
-                  .'</span></h3>'
+        $r->print('<p><span class="LC_warning">'
+                  .&mt('Co-Author [_1]',$uname.':'.$udom)
+                  .'</span></p>'
         );
     }   
     if ($env{'form.phase'} eq 'two') {