--- loncom/auth/lonroles.pm	2009/05/22 17:57:03	1.225
+++ loncom/auth/lonroles.pm	2009/08/05 13:39:56	1.231
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.225 2009/05/22 17:57:03 bisitz Exp $
+# $Id: lonroles.pm,v 1.231 2009/08/05 13:39:56 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -157,8 +157,13 @@ sub redirect_user {
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
+
+    # Breadcrumbs
+    my $brcrum = [{'href' => $url,
+                   'text' => 'Switching Role'},];
     my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
-						    {'redirect' => [1,$url],});
+                                                    {'redirect' => [1,$url],
+                                                     'bread_crumbs' => $brcrum,});
     my $end_page   = &Apache::loncommon::end_page();
 
 # Note to style police: 
@@ -184,16 +189,25 @@ sub error_page {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
-    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization').
+    # Breadcrumbs
+    my $brcrum = [{'href' => $dest,
+                   'text' => 'Problems during Course Initialization'},];
+    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization',
+                                             undef,
+                                             {'bread_crumbs' => $brcrum,})
+    );
+    $r->print(
         '<script type="text/javascript">'.
         '// <![CDATA['.
         &Apache::lonmenu::rawconfig().
         '// ]]>'.
         '</script>'.
 	      '<p class="LC_error">'.&mt('The following problems occurred:').
+          '<br />'.
 	      $error.
-	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
-	      &Apache::loncommon::end_page());
+	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'
+    );
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub handler {
@@ -202,6 +216,10 @@ sub handler {
 
     my $now=time;
     my $then=$env{'user.login.time'};
+    my $refresh=$env{'user.refresh.time'};
+    if (!$refresh) {
+        $refresh = $then;
+    }
     my $envkey;
     my %dcroles = ();
     my $numdc = &check_fordc(\%dcroles,$then);
@@ -242,7 +260,7 @@ sub handler {
 		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
                     if ($dcroles{$domain}) {
                         &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
-                                                           $then,$now,'cc');
+                                                           $then,$refresh,$now,'cc');
                     }
                     last;
                 }
@@ -283,7 +301,7 @@ sub handler {
                         my ($server_status,$home) = &check_author_homeserver($user,$domain);
                         if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
                             &Apache::lonnet::check_adhoc_privs($domain,$user,$then,
-                                                               $now,'ca');
+                                                               $refresh,$now,'ca');
                             if ($server_status eq 'switchserver') {
                                 my $trolecode = 'ca./'.$domain.'/'.$user; 
                                 my $switchserver = '/adm/switchserver?'
@@ -304,7 +322,7 @@ sub handler {
         foreach $envkey (keys %env) {
             next if ($envkey!~/^user\.role\./);
             my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
-            &Apache::lonnet::role_status($envkey,$then,$now,\$role,\$where,
+            &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where,
                                          \$trolecode,\$tstatus,\$tstart,\$tend);
             if ($env{'form.'.$trolecode}) {
 		if ($tstatus eq 'is') {
@@ -676,173 +694,14 @@ ENDHEADER
         $r->print('<input type="hidden" name="selectrole" value="1" />');
         $r->print('<input type="hidden" name="newrole" value="" />');
     }
-    my (%roletext,%sortrole,%roleclass);
-    my $countactive=0;
-    my $countfuture=0;
-    my $countwill=0;
-    my $inrole=0;
-    my $possiblerole='';
-    my %futureroles;
-    my %roles_nextlogin;
-    my %timezones;
-    foreach $envkey (sort keys %env) {
-        my $button = 1;
-        my $switchserver='';
-	my ($roletext,$roletext_end);
-	my $sortkey;
-        if ($envkey=~/^user\.role\./) {
-            my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
-            &Apache::lonnet::role_status($envkey,$then,$now,\$role,\$where,
-                                         \$trolecode,\$tstatus,\$tstart,\$tend);
-            next if (!defined($role) || $role eq '' || $role =~ /^gr/);
-            my $timezone = &role_timezone($where,\%timezones);
-            $tremark='';
-            $tpstart='&nbsp;';
-            $tpend='&nbsp;';
-            if ($tstart) {
-                $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
-            }
-            if ($tend) {
-                $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone);
-            }
-            if ($env{'request.role'} eq $trolecode) {
-		$tstatus='selected';
-            }
-            my $tbg;
-            if (($tstatus eq 'is') 
-		|| ($tstatus eq 'selected') 
-		|| ($tstatus eq 'will') 
-		|| ($tstatus eq 'future') 
-                || ($env{'form.showall'})) {
-                if ($tstatus eq 'is') {
-                    $tbg='LC_roles_is';
-		    $possiblerole=$trolecode;
-		    $countactive++;
-                } elsif ($tstatus eq 'future') {
-                    $tbg='LC_roles_future';
-                    $button=0;
-                    $futureroles{$trolecode} = $tstart.':'.$tend;
-                    $countfuture ++;
-                } elsif ($tstatus eq 'will') {
-                    $tbg='LC_roles_will';
-                    $tremark.=&mt('Active at next login.').' ';
-                    $roles_nextlogin{$trolecode} = $tstart.':'.$tend;
-                    $countwill ++;
-                } elsif ($tstatus eq 'expired') {
-                    $tbg='LC_roles_expired';
-                    $button=0;
-                } elsif ($tstatus eq 'will_not') {
-                    $tbg='LC_roles_will_not';
-                    $tremark.=&mt('Expired after logout.').' ';
-                } elsif ($tstatus eq 'selected') {
-                    $tbg='LC_roles_selected';
-		    $inrole=1;
-		    $countactive++;
-                    $tremark.=&mt('Currently selected.').' ';
-                }
-                my $trole;
-                if ($role =~ /^cr\//) {
-                    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-		    if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
-		}
-		$trole=Apache::lonnet::plaintext($role);
-                my $ttype;
-                my $twhere;
-                my ($tdom,$trest,$tsection)=
-                    split(/\//,Apache::lonnet::declutter($where));
-                # First, Co-Authorship 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;
-                        $switchserver='otherserver='.$home.'&role='.$trolecode;
-                    }
-                    #next if ($home eq 'no_host');
-                    $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
-                    $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
-			': '.$tdom.'<br />'.
-                        ' '.&mt('Server').':&nbsp;'.$home;
-                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
-		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
-		    $sortkey=$role."$trest:$tdom";
-                } elsif ($role eq 'au') {
-                    # Authors
-                    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;
-                        $switchserver='otherserver='.$home.'&role='.$trolecode;
-                    }
-                    #next if ($home eq 'no_host');
-                    $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
-                    $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
-			':&nbsp;'.$home;
-                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
-		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
-		    $sortkey=$role;
-                } elsif ($trest) {
-                    my $tcourseid=$tdom.'_'.$trest;
-                    $ttype = &Apache::loncommon::course_type($tcourseid);
-                    $trole = &Apache::lonnet::plaintext($role,$ttype);
-                    if ($env{'course.'.$tcourseid.'.description'}) {
-                        $twhere=$env{'course.'.$tcourseid.'.description'};
-			$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
-                        unless ($twhere eq &mt('Currently not available')) {
-			    $twhere.=' <span class="LC_fontsize_small">'.
-        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
-                                    '</span>';
-			}
-                    } else {
-                        my %newhash=&Apache::lonnet::coursedescription($tcourseid);
-                        if (%newhash) {
-			    $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
-				"\0".$envkey;
-                            $twhere=$newhash{'description'}.
-                              ' <span class="LC_fontsize_small">'.
-        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
-                              '</span>';
-                            $ttype = $newhash{'type'};
-                            $trole = &Apache::lonnet::plaintext($role,$ttype);
-                        } else {
-                            $twhere=&mt('Currently not available');
-                            $env{'course.'.$tcourseid.'.description'}=$twhere;
-			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
-                            $ttype = 'Unavailable';
-                        }
-                    }
-                    if ($tsection) {
-                        $twhere.='<br />'.&mt('Section').': '.$tsection;
-		    }
-		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
-                } elsif ($tdom) {
-                    $ttype='Domain';
-                    $twhere=$tdom;
-		    $sortkey=$role.$twhere;
-                } else {
-                    $ttype='System';
-                    $twhere=&mt('system wide');
-		    $sortkey=$role.$twhere;
-                }
-                ($roletext,$roletext_end) = 
-                    &build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,
-                                    $advanced,$tremark,$tbg,$trole,$twhere,$tpstart,
-                                    $tpend,$nochoose,$button,$switchserver,$reinit);
-		$roletext{$envkey}=[$roletext,$roletext_end];
-		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
-		$sortrole{$sortkey}=$envkey;
-		$roleclass{$envkey}=$ttype;
-	    }
-        }
-    }
+
+    my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
+    my ($countactive,$countfuture,$inrole,$possiblerole) = 
+        &gather_roles($then,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,\%roleclass,
+                      \%futureroles,\%timezones);
+
+    $refresh = $now;
+    &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
     if ($env{'user.adv'}) {
         $r->print(
               '<p><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
@@ -898,6 +757,14 @@ ENDHEADER
     unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
+    if ($env{'form.destinationurl'}) {
+        $r->print('<input type="hidden" name="destinationurl" value="'.
+                  $env{'form.destinationurl'}.'" />');
+        if ($env{'form.destsymb'} ne '') {
+            $r->print('<input type="hidden" name="destsymb" value="'.
+                      $env{'form.destsymb'}.'" />');
+        }
+    }
     my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose);
     if ($env{'environment.recentroles'}) {
         my %recent_roles =
@@ -976,10 +843,10 @@ ENDHEADER
     $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {
         my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
-	$r->print('<p><small><i>'
-                 .&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))
-		 .'</i><br />'
-		 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
+        $r->print('<p><small><i>'
+                 .&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion'))
+                 .'</i><br />'
+                 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
                  .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
                  .&mt('Course Catalog')
                  .'</a></small></p>');
@@ -988,6 +855,165 @@ ENDHEADER
     return OK;
 }
 
+sub gather_roles {
+    my ($then,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones) = @_;
+    my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,'');
+    my $advanced = $env{'user.adv'};
+    my $tryagain = $env{'form.tryagain'};
+    foreach my $envkey (sort(keys(%env))) {
+        my $button = 1;
+        my $switchserver='';
+        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,
+                                         \$trolecode,\$tstatus,\$tstart,\$tend);
+            next if (!defined($role) || $role eq '' || $role =~ /^gr/);
+            my $timezone = &role_timezone($where,$timezones);
+            $tremark='';
+            $tpstart='&nbsp;';
+            $tpend='&nbsp;';
+            if ($tstart) {
+                $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
+            }
+            if ($tend) {
+                $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone);
+            }
+            if ($env{'request.role'} eq $trolecode) {
+                $tstatus='selected';
+            }
+            my $tbg;
+            if (($tstatus eq 'is')
+                || ($tstatus eq 'selected')
+                || ($tstatus eq 'future')
+                || ($env{'form.showall'})) {
+                if ($tstatus eq 'is') {
+                    $tbg='LC_roles_is';
+                    $possiblerole=$trolecode;
+                    $countactive++;
+                } elsif ($tstatus eq 'future') {
+                    $tbg='LC_roles_future';
+                    $button=0;
+                    $futureroles->{$trolecode} = $tstart.':'.$tend;
+                    $countfuture ++;
+                } elsif ($tstatus eq 'expired') {
+                    $tbg='LC_roles_expired';
+                    $button=0;
+                } elsif ($tstatus eq 'will_not') {
+                    $tbg='LC_roles_will_not';
+                    $tremark.=&mt('Expired after logout.').' ';
+                } elsif ($tstatus eq 'selected') {
+                    $tbg='LC_roles_selected';
+                    $inrole=1;
+                    $countactive++;
+                    $tremark.=&mt('Currently selected.').' ';
+                }
+                my $trole;
+                if ($role =~ /^cr\//) {
+                    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
+                    if ($tremark) { $tremark.='<br />'; }
+                    $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
+                }
+                $trole=Apache::lonnet::plaintext($role);
+                my $ttype;
+                my $twhere;
+                my ($tdom,$trest,$tsection)=
+                    split(/\//,Apache::lonnet::declutter($where));
+                # First, Co-Authorship 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;
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
+                    }
+                    #next if ($home eq 'no_host');
+                    $home = &Apache::lonnet::hostname($home);
+                    $ttype='Construction Space';
+                    $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
+                        ': '.$tdom.'<br />'.
+                        ' '.&mt('Server').':&nbsp;'.$home;
+                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+                    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
+                    $sortkey=$role."$trest:$tdom";
+                } elsif ($role eq 'au') {
+                    # Authors
+                    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;
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
+                    }
+                    #next if ($home eq 'no_host');
+                    $home = &Apache::lonnet::hostname($home);
+                    $ttype='Construction Space';
+                    $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
+                        ':&nbsp;'.$home;
+                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+                    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
+                    $sortkey=$role;
+                } elsif ($trest) {
+                    my $tcourseid=$tdom.'_'.$trest;
+                    $ttype = &Apache::loncommon::course_type($tcourseid);
+                    $trole = &Apache::lonnet::plaintext($role,$ttype);
+                    if ($env{'course.'.$tcourseid.'.description'}) {
+                        $twhere=$env{'course.'.$tcourseid.'.description'};
+                        $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
+                        unless ($twhere eq &mt('Currently not available')) {
+                            $twhere.=' <span class="LC_fontsize_small">'.
+        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
+                                    '</span>';
+                        }
+                    } else {
+                        my %newhash=&Apache::lonnet::coursedescription($tcourseid);
+                        if (%newhash) {
+                            $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
+                                "\0".$envkey;
+                            $twhere=$newhash{'description'}.
+                              ' <span class="LC_fontsize_small">'.
+        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
+                              '</span>';
+                            $ttype = $newhash{'type'};
+                            $trole = &Apache::lonnet::plaintext($role,$ttype);
+                        } else {
+                            $twhere=&mt('Currently not available');
+                            $env{'course.'.$tcourseid.'.description'}=$twhere;
+                            $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
+                            $ttype = 'Unavailable';
+                        }
+                    }
+                    if ($tsection) {
+                        $twhere.='<br />'.&mt('Section').': '.$tsection;
+                    }
+                    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
+                } elsif ($tdom) {
+                    $ttype='Domain';
+                    $twhere=$tdom;
+                    $sortkey=$role.$twhere;
+                } else {
+                    $ttype='System';
+                    $twhere=&mt('system wide');
+                    $sortkey=$role.$twhere;
+                }
+                ($role_text,$role_text_end) =
+                    &build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,
+                                    $advanced,$tremark,$tbg,$trole,$twhere,$tpstart,
+                                    $tpend,$nochoose,$button,$switchserver,$reinit);
+                $roletext->{$envkey}=[$role_text,$role_text_end];
+                if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
+                $sortrole->{$sortkey}=$envkey;
+                $roleclass->{$envkey}=$ttype;
+            }
+        }
+    }
+    return ($countactive,$countfuture,$inrole,$possiblerole);
+}
+
 sub role_timezone {
     my ($where,$timezones) = @_;
     my $timezone;
@@ -1525,21 +1551,15 @@ sub adhoc_roles_row {
     my ($dcdom,$rowtype) = @_;
     my $output = &Apache::loncommon::continue_data_table_row()
                  .' <td colspan="5">'
-                 .'<table><tr><td>'
                  .&mt('[_1]Ad hoc[_2] roles in domain [_3] --'
                      ,'<span class="LC_cusr_emph">','</span>',$dcdom)
-                 .'</td>'
-                 .'<td>';
+                 .' ';
     my $selectcclink = &courselink($dcdom,$rowtype);
     my $ccrole = &Apache::lonnet::plaintext('cc');
     my $carole = &Apache::lonnet::plaintext('ca');
     my $selectcalink = &coauthorlink($dcdom,$rowtype);
-    $output.=&mt('[_1]: [_2]',$ccrole,$selectcclink)
-            .'<br /></td>'
-            .'<td>&nbsp;&nbsp;</td>'
-            .'<td>'.&mt('[_1]: [_2]',$carole,$selectcalink).'<br /></td>'
-            .'</tr></table>'
-            .'</td>'
+    $output.=$ccrole.': '.$selectcclink
+            .' | '.$carole.': '.$selectcalink
             .&Apache::loncommon::end_data_table_row();
     return $output;
 }