--- loncom/auth/lonroles.pm	2012/05/16 21:19:44	1.266
+++ loncom/auth/lonroles.pm	2012/08/16 17:02:46	1.274
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.266 2012/05/16 21:19:44 droeschl Exp $
+# $Id: lonroles.pm,v 1.274 2012/08/16 17:02:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -211,9 +211,17 @@ sub handler {
         $update = $then;
     }
 
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+
+# -------------------------------------------------- Check if setting hot list 
+    my $hotlist;
+    if ($env{'form.action'} eq 'verify_and_change_rolespref') {
+        $hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r);
+    }
+
 # -------------------------------------------------------- Check for new roles
     my $updateresult;
-    if ($env{'form.doupdate'}) {
+    if ($env{'form.state'} eq 'doupdate') {
         my $show_course=&Apache::loncommon::show_course();
         my $checkingtxt;
         if ($show_course) {
@@ -221,16 +229,22 @@ sub handler {
         } else {
             $checkingtxt = &mt('Checking for new roles ...');
         }
-        $updateresult = '<span class="LC_info">'.$checkingtxt.'</span>';
+        $updateresult = $checkingtxt;
         $updateresult .= &update_session_roles();
         &Apache::lonnet::appenv({'user.update.time'  => $now});
         $update = $now;
+        &Apache::loncoursequeueadmin::reqauthor_check();
+    }
+
+# -------------------------------------------------- Check for author requests
+    my $reqauthor;
+    if ($env{'form.state'} eq 'requestauthor') {
+       $reqauthor = &Apache::loncoursequeueadmin::process_reqauthor(\$update);
     }
 
     my $envkey;
     my %dcroles = ();
     my $numdc = &check_fordc(\%dcroles,$update,$then);
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
     my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'};
 
 # ================================================================== Roles Init
@@ -266,6 +280,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 +534,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);
@@ -645,15 +661,20 @@ ENDENTERKEY
         $recent = &mt('Recent Courses');
     }
     my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
+
+    my %roles_in_env;
+    my $showcount = &roles_from_env(\%roles_in_env,$update); 
+
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
+    my $funcs = &get_roles_functions($showcount);
     my $standby=&mt('Role selected. Please stand by.');
     $standby=~s/\n/\\n/g;
-    my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
+    my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
     $r->print(<<ENDHEADER);
 $start_page
-<br />
+$funcs
 <noscript>
 $noscript
 </noscript>
@@ -676,10 +697,17 @@ function enterrole (thisform,rolecode,bu
     }
 }
 
-function setToUpdate(thisform) {
-    thisform.doupdate.value='1';
-    thisform.selectrole.value='';
-    thisform.submit();
+function rolesView (caller) {
+    if ((caller == 'showall') || (caller == 'noshowall')) {
+        document.rolechoice.display.value = caller;
+    } else {
+        if ((caller == 'doupdate') || (caller == 'requestauthor') ||
+            (caller == 'queued')) { 
+            document.rolechoice.state.value = caller;
+        }
+    }
+    document.rolechoice.selectrole.value='';
+    document.rolechoice.submit();
 }
 
 // ]]>
@@ -748,55 +776,43 @@ ENDHEADER
 		  &Apache::loncommon::end_page());
 	return OK;
     } else {
-        $r->print($updateresult); 
+        if ($updateresult || $reqauthor || $hotlist) {
+            my $showresult = '<div>';
+            if ($updateresult) {
+                $showresult .= &Apache::lonhtmlcommon::confirm_success($updateresult);
+            }
+            if ($reqauthor) {
+                $showresult .= &Apache::lonhtmlcommon::confirm_success($reqauthor);
+            }
+            if ($hotlist) {
+                $showresult .= $hotlist;
+            } 
+            $showresult .= '</div>';
+            $r->print($showresult);
+        } elsif ($env{'form.state'} eq 'queued') {
+            $r->print(&get_queued());
+        }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
         }
+        my $display = ($env{'form.display'} =~ /^(showall)$/);
         $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
         $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
         $r->print('<input type="hidden" name="selectrole" value="1" />');
         $r->print('<input type="hidden" name="newrole" value="" />');
+        $r->print('<input type="hidden" name="display" value="'.$display.'" />');
+        $r->print('<input type="hidden" name="state" value="" />');
     }
     $r->rflush();
 
     my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
     my ($countactive,$countfuture,$inrole,$possiblerole) = 
-        &gather_roles($update,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,\%roleclass,
-                      \%futureroles,\%timezones,$loncaparev);
+        &gather_roles($update,$refresh,$now,$reinit,$nochoose,\%roles_in_env,\%roletext,
+                      \%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev);
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
-    my $updatebutton = &mt('Check for role changes');
-    my $show_course=&Apache::loncommon::show_course();
-    if ($show_course) {
-        $updatebutton = &mt('Check for new courses');
-    }
-    my $do_update;
-    unless (($env{'form.source'} eq 'login') || ($env{'form.doupdate'})) {
-        $do_update = '<input type="hidden" name="doupdate" value="" />'.
-                     '<input type="button" name="update" value="'.
-                     $updatebutton.'" onclick="javascript:setToUpdate(this.form)" />';
-    }
-    if ($env{'user.adv'}) {
-        my $showall = '<label><input type="checkbox" name="showall"';
-        if ($env{'form.showall'}) { 
-            $showall .= ' checked="checked" ';
-        }
-        $showall .= ' />'.&mt('Show all roles').'</label>&nbsp;'.
-                    '<input type="submit" value="'.&mt('Update display').'" />';
-        if ($do_update) {
-            $r->print('<div class="LC_left_float"><fieldset>'.
-                      '<legend>'. &mt('Display').'</legend>'.
-                      $showall.'</fieldset></div>'.
-                      '<div class="LC_left_float"><fieldset><legend>'.
-                      &mt('Changes?').'</legend>'.
-                      $do_update.'</fieldset></div><br clear="all" />');
-        } else {
-            $r->print($showall);
-        }
-    } else {
-        $r->print('<p>'.$do_update.'</p>');
+    unless ($env{'user.adv'}) { 
         if ($countactive > 0) {
-            $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
             $r->print(
@@ -954,7 +970,12 @@ ENDHEADER
 	$r->print('<hr /><h2>'.&mt('Current Privileges').'</h2>');
 	$r->print(&privileges_info());
     }
-    $r->print(&Apache::lonnet::getannounce());
+    my $announcements = &Apache::lonnet::getannounce();
+    $r->print(
+        '<br />'.
+        '<h2>'.&mt('Announcements').'</h2>'.
+        $announcements
+    ) unless (!$announcements);
     if ($advanced) {
         my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
         $r->print('<p><small><i>'
@@ -969,19 +990,38 @@ ENDHEADER
     return OK;
 }
 
+sub roles_from_env {
+    my ($roleshash,$update) = @_;
+    my $count = 0;
+    if (ref($roleshash) eq 'HASH') {
+        foreach my $envkey (keys(%env)) {
+            if ($envkey =~ m{^user\.role\.(\w+)[./]}) {
+                next if ($1 eq 'gr');
+                $roleshash->{$envkey} = $env{$envkey};
+                my ($start,$end) = split(/\./,$env{$envkey});
+                unless ($end && $end<$update) {
+                    $count ++;
+                }
+            }
+        }
+    }
+    return $count;
+}
+
 sub gather_roles {
-    my ($update,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_;
+    my ($update,$refresh,$now,$reinit,$nochoose,$roles_in_env,$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);
+    if (ref($roles_in_env) eq 'HASH') {
+        foreach my $envkey (sort(keys(%{$roles_in_env}))) {
+            my $button = 1;
+            my $switchserver='';
+            my $switchwarning;
+            my ($role_text,$role_text_end,$sortkey,$role,$where,$trolecode,$tstart,
+                $tend,$tremark,$tstatus,$tpstart,$tpend);
             &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where,
                                          \$trolecode,\$tstatus,\$tstart,\$tend);
             next if (!defined($role) || $role eq '' || $role =~ /^gr/);
@@ -995,7 +1035,7 @@ sub gather_roles {
             if (($tstatus eq 'is')
                 || ($tstatus eq 'selected')
                 || ($tstatus eq 'future')
-                || ($env{'form.showall'})) {
+                || ($env{'form.display'} eq 'showall')) {
                 my $timezone = &role_timezone($where,$timezones);
                 if ($tstart) {
                     $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
@@ -1681,43 +1721,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
@@ -1919,7 +1922,7 @@ sub update_session_roles {
         }
         if ($env{$envkey} eq '') {
             my $status_in_db =
-                &curr_role_status($tstart,$tend,$refresh,$now);
+                &curr_role_status($tstart,$tend,$now,$now);
                 &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db);
             if (($role eq 'st') && ($env{'request.role'} =~ m{^\Q$role\E\.\Q/$udom/$uname\E})) {
                 if ($status_in_db eq 'active') {
@@ -1963,7 +1966,7 @@ sub update_session_roles {
                 my $status_in_env =
                     &curr_role_status($currstart,$currend,$refresh,$update);
                 my $status_in_db =
-                    &curr_role_status($tstart,$tend,$refresh,$now);
+                    &curr_role_status($tstart,$tend,$now,$now);
                 if ($status_in_env ne $status_in_db) {
                     if ($status_in_env eq 'active') {
                         if ($role eq 'st') {
@@ -2165,7 +2168,7 @@ sub update_session_roles {
     }
     if (($oldsec) && (@newsec > 0)) {
         if (@newsec > 1) {
-            $msg = '<div class="LC_warning">'.&mt('The section has changed for your current role. Log-out and log-in again to select a role for the new section.').'</div>';
+            $msg = '<p class="LC_warning">'.&mt('The section has changed for your current role. Log-out and log-in again to select a role for the new section.').'</p>';
         } else {
             my $newrole = $env{'request.role'};
             if ($newsec[0] eq 'none') {
@@ -2203,13 +2206,13 @@ sub update_session_roles {
             $msg .= '</form></p>';
         }
     } elsif ($currrole_expired) {
-        $msg .= '<div class="LC_warning">';
+        $msg .= '<p class="LC_warning">';
         if (&Apache::loncommon::show_course()) {
             $msg .= &mt('Your role in the current course has expired.');
         } else {
             $msg .= &mt('Your current role has expired.');
         }
-        $msg .= '<br />'.&mt('However you can continue to use this role until you logout, click the "Re-Select" button, or your session has been idle for more than 24 hours.').'</div>';
+        $msg .= '<br />'.&mt('However you can continue to use this role until you logout, click the "Re-Select" button, or your session has been idle for more than 24 hours.').'</p>';
     }
     if (!@changed_roles || !(keys(%changed_groups))) {
         my ($rolesmsg,$groupsmsg);
@@ -2234,7 +2237,7 @@ sub update_session_roles {
                 }
                 $msg .= '</ul>';
             } else {
-                $msg = '&nbsp;<span class="LC_cusr_emph">'.$rolesmsg.'</span><br /><br />';
+                $msg = '&nbsp;<span class="LC_cusr_emph">'.$rolesmsg.'</span><br />';
             }
             return $msg;
         }
@@ -2288,7 +2291,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>';
@@ -2491,6 +2494,131 @@ sub is_active_course {
     return $is_active;
 }
 
+sub get_roles_functions {
+    my ($rolescount) = @_;
+    my @links;
+    if ($env{'user.adv'}) {
+        if ($env{'form.display'} eq 'showall') {
+            push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired roles')]);
+        } else {
+            push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired roles')]);
+        }
+    }
+    push(@links,["javascript:rolesView('doupdate');",'start-here-22x22',&mt('Check for changes')]);
+    if ($env{'environment.canrequest.author'}) {
+        unless (&Apache::loncoursequeueadmin::is_active_author()) {
+            push(@links,["javascript:rolesView('requestauthor');",'list-add-22x22',&mt('Request author role')]);
+        }
+    }
+    if (&Apache::lonmenu::check_for_rcrs()) {
+        push(@links,['/adm/requestcourse','rcrs-22x22',&mt('Request course')]);
+    }
+    if ($env{'form.state'} eq 'queued') {
+        push(@links,["javascript:rolesView('noqueued');",'selfenrl-queue-22x22',&mt('Hide queued')]);
+    } else {
+        push(@links,["javascript:rolesView('queued');",'selfenrl-queue-22x22',&mt('Show queued')]);
+    }
+    if (($rolescount > 3) || ($env{'environment.recentroles'})) {
+        push(@links,['/adm/preferences?action=changerolespref&amp;returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]);
+    }
+    
+    my $funcs = &Apache::lonhtmlcommon::start_funclist();
+    foreach my $link (@links) {
+        $funcs .= &Apache::lonhtmlcommon::add_item_funclist(
+                      '<a href="'.$link->[0].'" class="LC_menubuttons_link">'.
+                      '<img src="/res/adm/pages/'.$link->[1].'.png" class="LC_icon" alt="'.$link->[2].'" />'.
+                      $link->[2].'</a>');
+    }
+    $funcs .= &Apache::lonhtmlcommon::end_funclist();
+    return &Apache::loncommon::head_subbox($funcs);
+}
+
+sub get_queued {
+    my ($output,%reqcrs);
+    my ($types,$typenames) = &Apache::loncommon::course_types();
+    my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
+                                           $env{'user.name'},'^status:');
+    foreach my $key (keys(%statusinfo)) {
+        next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending'));
+        (undef,my($cdom,$cnum)) = split(':',$key);
+        my $requestkey = $cdom.'_'.$cnum;
+        if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+            my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+                                                   $env{'user.domain'},$env{'user.name'});
+            next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
+            my $reqtime = $history{'reqtime'};
+            my $lastupdate = $history{'timestamp'};
+            my $showtype = $history{'crstype'};
+            if (defined($typenames->{$history{'crstype'}})) {
+                $showtype = $typenames->{$history{'crstype'}};
+            }
+            my $description;
+            if (ref($history{'details'}) eq 'HASH') {
+                $description = $history{details}{'cdescr'};
+            }
+            @{$reqcrs{$reqtime}} = ($description,$showtype); 
+        }
+    }
+    my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs));
+    if (@sortedtimes > 0) {
+        $output .= '<p><b>'.&mt('Course/Community requests').'</b><br />'.
+                   &Apache::loncommon::start_data_table().
+                   &Apache::loncommon::start_data_table_header_row().
+                   '<th>'.&mt('Date requested').'</th>'.
+                   '<th>'.&mt('Course title').'</th>'.
+                   '<th>'.&mt('Course type').'</th>';
+                   &Apache::loncommon::end_data_table_header_row();
+        foreach my $reqtime (@sortedtimes) {
+            next unless (ref($reqcrs{$reqtime}) eq 'ARRAY');
+            $output .= &Apache::loncommon::start_data_table_row().
+                       '<td>'.&Apache::lonlocal::locallocaltime($reqtime).'</td>'.
+                       '<td>'.join('</td><td>',@{$reqcrs{$reqtime}}).'</td>'.
+                       &Apache::loncommon::end_data_table_row();
+        }
+        $output .= &Apache::loncommon::end_data_table().
+                   '<br /></p>';
+    }
+    my $queuedselfenroll = &Apache::loncoursequeueadmin::queued_selfenrollment(1);
+    if ($queuedselfenroll) {
+        $output .= '<p><b>'.&mt('Enrollment requests').'</b><br />'.
+                   $queuedselfenroll.'<br /></p>';
+    }
+    if ($env{'environment.canrequest.author'}) {
+        unless (&Apache::loncoursequeueadmin::is_active_author()) {
+            my $requestauthor;
+            my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'});
+            if (($status eq 'approval') || ($status eq 'approved')) {
+                $output .= '<p><b>'.&mt('Author role request').'</b><br />';
+                if ($status eq 'approval') {
+                    $output .= &mt('A request for authoring space submitted on [_1] is awaiting approval',
+                                  &Apache::lonlocal::locallocaltime($timestamp));
+                } elsif ($status eq 'approved') {
+                    my %roleshash =
+                        &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
+                                                      ['active'],['au'],[$env{'user.domain'}]);
+                    if (keys(%roleshash)) {
+                        $output .= '<span class="LC_info">'.
+                                   &mt('Your request for an author role has been approved.').'<br />'.
+                                   &mt('Use the "Check for changes" link to update your list of roles.').
+                                   '</span>';
+                    }
+                }
+                $output .= '</p>';
+            }
+        }
+    }
+    unless ($output) {
+        if ($env{'environment.canrequest.author'} || $env{'environment.canrequest.official'} ||
+            $env{'environment.canrequest.unofficial'} || $env{'environment.canrequest.community'}) {
+            $output = &mt('No requests for courses, communities or authoring currently queued');
+        } else {
+            $output = &mt('No enrollment requests currently queued awaiting approval');
+        }
+    }
+    return '<div class="LC_left_float"><fieldset><legend>'.&mt('Queued requests').'</legend>'.
+           $output.'</fieldset></div><br clear="all" />';
+}
+
 1;
 __END__