--- loncom/interface/lonrequestcourse.pm	2009/09/10 03:00:31	1.34
+++ loncom/interface/lonrequestcourse.pm	2009/10/25 14:48:55	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.34 2009/09/10 03:00:31 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.38 2009/10/25 14:48:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,10 +52,6 @@ described at http://www.lon-capa.org.
 
 =item onload_action()
 
-=item check_can_request() 
-
-=item course_types()
-
 =item print_main_menu()
 
 =item request_administration()
@@ -134,7 +130,7 @@ sub handler {
     }
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['action','showdom','cnum','state']);
+        ['action','showdom','cnum','state','crstype']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $dom = &get_course_dom();
     my $action = $env{'form.action'};
@@ -178,7 +174,7 @@ sub handler {
         $trail{'enrollment'} = 'Enrollment';
     }
 
-    my ($page,$crumb,$newinstcode,$codechk,$checkedcode) = 
+    my ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description) = 
         &get_breadcrumbs($dom,$action,\$state,\%states,\%trail);
     if ($action eq 'display') {
         if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
@@ -239,7 +235,7 @@ sub handler {
                                         $crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item}; 
                                     }
                                     if ($crosslistcode ne '') { 
-                                         $codechk{$i} = 
+                                         ($codechk{$i}, my $rest) = 
                                             &Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode);
                                     }
                                     unless ($codechk{$i} eq 'valid') {
@@ -277,7 +273,7 @@ sub handler {
     my $loaditems = &onload_action($action,$state);
 
     my %can_request;
-    my $canreq = &check_can_request($dom,\%can_request);
+    my $canreq = &Apache::lonnet::check_can_request($dom,\%can_request);
     if ($action eq 'new') {
         if ($canreq) {
             if ($state eq 'crstype') {
@@ -286,7 +282,8 @@ sub handler {
             } else {
                 &request_administration($r,$action,$state,$page,\%states,$dom,
                                         $jscript,$loaditems,$crumb,$newinstcode,
-                                        $codechk,$checkedcode,\@invalidcrosslist);
+                                        $codechk,$checkedcode,$description,
+                                        \@invalidcrosslist);
             }
         } else {
             $r->print(&header('Course Requests').$crumb.
@@ -310,7 +307,7 @@ sub handler {
                       &close_popup_form());
         } else {
             &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
-                                    $loaditems,$crumb,'','','','',$uname,$udom);
+                                    $loaditems,$crumb,'','','','','',$uname,$udom);
         }
     } elsif ($action eq 'log') {
         &print_request_logs($jscript,$loaditems,$crumb);
@@ -346,7 +343,7 @@ END
 
 sub get_breadcrumbs {
     my ($dom,$action,$state,$states,$trail) = @_;
-    my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles);
+    my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description);
     my $page = 0;
     if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
         if (defined($action)) {
@@ -371,7 +368,7 @@ sub get_breadcrumbs {
                                     $$state = 'codepick';
                                     $page --;
                                 } else {
-                                    $codechk = 
+                                    ($codechk,$description) = 
                                         &Apache::lonnet::auto_validate_instcode('',
                                             $dom,$newinstcode);
                                     if ($codechk ne 'valid') {
@@ -416,7 +413,7 @@ sub get_breadcrumbs {
                 {text=>'Pick Action'});
         $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
     }
-    return ($page,$crumb,$newinstcode,$codechk,$checkedcode);
+    return ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description);
 }
 
 sub header {
@@ -593,52 +590,9 @@ sub onload_action {
     return \%loaditems;
 }
 
-sub check_can_request {
-    my ($dom,$can_request) = @_;
-    my $canreq = 0;
-    my ($types,$typename) = &course_types();
-    my @options = ('approval','validate','autolimit');
-    my $optregex = join('|',@options);
-    if ((ref($can_request) eq 'HASH') && (ref($types) eq 'ARRAY')) {
-        foreach my $type (@{$types}) {
-            if (&Apache::lonnet::usertools_access($env{'user.name'},
-                                                  $env{'user.domain'},
-                                                  $type,undef,'requestcourses')) {
-                $canreq ++;
-                if ($dom eq $env{'user.domain'}) {
-                    $can_request->{$type} = 1;
-                }
-            }
-            if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
-                my @curr = split(',',$env{'environment.reqcrsotherdom.'.$type});
-                if (@curr > 0) {
-                    $canreq ++;
-                    unless ($dom eq $env{'user.domain'}) {
-                        if (grep(/^\Q$dom\E:($optregex)(=?\d*)$/,@curr)) {
-                            $can_request->{$type} = 1;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return $canreq;
-}
-
-sub course_types {
-    my @types = ('official','unofficial','community');
-    my %typename = (
-                         official   => 'Official course',
-                         unofficial => 'Unofficial course',
-                         community  => 'Community',
-                    );
-    return (\@types,\%typename);
-}
-
-
 sub print_main_menu {
     my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb) = @_;
-    my ($types,$typename) = &course_types();
+    my ($types,$typename) = &Apache::loncommon::course_types();
     my $onchange;
     unless ($env{'form.interface'} eq 'textual') {
         $onchange = 1;
@@ -725,7 +679,7 @@ END
 END
 
     $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.
-             '<p>'.&mt('Request creation of a new course, or manage pending course requests.').'</p>'.
+             '<p>'.&mt('Request creation of a new course, or review your pending course requests.').'</p>'.
              '<div>'.
               &Apache::lonhtmlcommon::start_pick_box().
               &Apache::lonhtmlcommon::row_title(&mt('Course Domain')).
@@ -757,14 +711,14 @@ END
             if ($type eq 'official') {
                 $selected = ' selected="selected"';
             }
-            $r->print('<option value="'.$type.'"'.$selected.'>'.$typename->{$type}.
+            $r->print('<option value="'.$type.'"'.$selected.'>'.&mt($typename->{$type}).
                       '</option>'."\n");
         }
     }
     $r->print('</select></form>'."\n".
               &Apache::lonhtmlcommon::row_closure(1)."\n".
               &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
-              '<div><form name="'.$formname.'" method="post" action="">'."\n".
+              '<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
               '<input type="hidden" name="state" value="crstype" />'."\n".
               '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
               '<input type="hidden" name="crstype" value="" />'."\n".
@@ -778,7 +732,8 @@ END
 
 sub request_administration {
     my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb,
-        $newinstcode,$codechk,$checkedcode,$invalidcrosslist,$uname,$udom) = @_;
+        $newinstcode,$codechk,$checkedcode,$description,$invalidcrosslist,
+        $uname,$udom) = @_;
     my $js;
     if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) {
         $js =  <<END;
@@ -814,7 +769,7 @@ END
         }
         $r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
         &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
-                            $codechk,$checkedcode,$invalidcrosslist);
+                            $codechk,$checkedcode,$description,$invalidcrosslist);
     } elsif ($action eq 'view') {
         my $jsextra;
         my $formname = 'requestcrs';
@@ -1126,7 +1081,7 @@ sub get_instcode {
 
 sub print_request_form {
     my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode,
-        $invalidcrosslist) = @_;
+        $description,$invalidcrosslist) = @_;
     my $formname = 'requestcrs';
     my ($next,$prev,$message,$output,$codepicker,$crstype);
     $prev = $states->{$action}[$page-1];
@@ -1191,7 +1146,7 @@ sub print_request_form {
         if ($instcode eq '') {
             $prev = $states->{$action}[$page-2];
         }
-        $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
+        $r->print(&courseinfo_form($dom,$formname,$crstype,$next,$description));
     } elsif ($state eq 'enrollment') {
         if ($crstype eq 'official') {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
@@ -1748,14 +1703,8 @@ sub print_request_status {
     my ($dom) = @_;
     my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
                                            $env{'user.name'},'^status:'.$dom);
-    my ($output,$formname,%queue_by_date,%typenames);
-    if ($env{'form.crstype'} eq 'any') {
-        %typenames = &Apache::lonlocal::texthash (
-                                                   official   => 'Official course',
-                                                   unofficial => 'Unofficial course',
-                                                   community  => 'Community',
-                                                 );
-    }
+    my ($output,$formname,%queue_by_date);
+    my ($types,$typenames) = &Apache::loncommon::course_types();
     foreach my $key (keys(%statusinfo)) {
         if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) { 
             (undef,my($cdom,$cnum)) = split(':',$key);
@@ -1826,7 +1775,10 @@ sub print_request_status {
      '<td>'.&unescape($desc).'</td>'.
      '<td>'.$cdom.'</td>';
                     if ($env{'form.crstype'} eq 'any') {
-                        my $typename = $typenames{$type};
+                        my $typename;
+                        if (ref($typenames) eq 'HASH') {
+                            $typename = &mt($typenames->{$type});
+                        }
                         if ($typename eq '') {
                             $typename = &mt('Unknown type');
                         }
@@ -1874,7 +1826,7 @@ sub print_cancel_request {
             }
             $output = &mt('No further action will be taken');
         } elsif (ref($history{'details'}) eq 'HASH') {
-            my ($types,$typename) = &course_types();
+            my ($types,$typename) = &Apache::loncommon::course_types();
             my $showtype = $crstype;
             if (defined($typename->{$crstype})) {
                 $showtype = $typename->{$crstype}; 
@@ -1960,7 +1912,7 @@ sub print_request_logs {
 sub print_review {
     my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom,
         $disallowed,$disallowmsg) = @_;
-    my ($types,$typename) = &course_types();
+    my ($types,$typename) = &Apache::loncommon::course_types();
     my ($owner,$ownername,$owneremail);
     if ($uname eq '' || $udom eq '') {
         $uname = $env{'user.name'};
@@ -1979,7 +1931,7 @@ sub print_review {
     $crstypename = $env{'form.crstype'};
     if (ref($typename) eq 'HASH') {
         unless ($typename->{$env{'form.crstype'}} eq '') {
-            $crstypename = $typename->{$env{'form.crstype'}};
+            $crstypename = &mt($typename->{$env{'form.crstype'}});
         }
     }
     my $category = 'Course';
@@ -2241,7 +2193,7 @@ sub dates_from_form {
 }
 
 sub courseinfo_form {
-    my ($dom,$formname,$crstype,$next) = @_;
+    my ($dom,$formname,$crstype,$next,$description) = @_;
     my %lt = &Apache::lonlocal::texthash(
                 official => 'You must provide a (brief) course description.',
                 community => 'You must provide a (brief) community description.'
@@ -2271,7 +2223,7 @@ ENDJS
                   '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Description').'&nbsp;'.$title.'</h3>'.
                   &Apache::lonhtmlcommon::row_closure(1).
                   &Apache::lonhtmlcommon::row_title(&mt('Description')).
-                 '<input type="text" size="40" name="cdescr" />';
+                 '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
                                                   'default','hide');
@@ -2295,14 +2247,14 @@ sub clone_form {
     if ($crstype eq 'community') {
         $type = 'Community';
     }
-    my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').
+    my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').'&nbsp;'.
                     &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
     my %lt = &clone_text();
     my $output .= 
         &Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
         '<input type="text" size="25" name="clonecrs" value=""  />'.
-        '</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.
-        &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.
+        '</label>'.&Apache::lonhtmlcommon::row_closure(1).
+        &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'<label>'.
         $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
         '<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
@@ -2426,7 +2378,7 @@ sub get_course_dom {
         }
     }
     if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
-        my ($types,$typename) = &course_types();
+        my ($types,$typename) = &Apache::loncommon::course_types();
         if (ref($types) eq 'ARRAY') {
             foreach my $type (@{$types}) {
                 if (&Apache::lonnet::usertools_access($env{'user.name'},
@@ -2857,85 +2809,90 @@ sub update_requestors_roles {
     my $owner = $env{'user.name'}.':'.$env{'user.domain'};
     if (ref($details) eq 'HASH') {
         if (ref($details->{'personnel'}) eq 'HASH') {
-            if (ref($details->{'personnel'}{$owner}) eq 'HASH') {
-                my @roles;
-                if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
-                    @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
-                    unless (grep(/^cc$/,@roles)) {
-                        push(@roles,'cc');
-                    }
-                } else {
-                    @roles = ('cc');
+            unless (ref($details->{'personnel'}{$owner}) eq 'HASH') {
+                $details->{'personnel'}{$owner} = {
+                                                    'roles' => ['cc'],
+                                                    'cc'    => { 'usec' => [] },
+                                                  };
+            }
+            my @roles;
+            if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
+                @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
+                unless (grep(/^cc$/,@roles)) {
+                    push(@roles,'cc');
                 }
-                foreach my $role (@roles) {
-                    my $start = $now;
-                    my $end = '0';
-                    if ($role eq 'st') {
-                        if ($details->{'accessstart'} ne '') {
-                            $start = $details->{'accessstart'};
-                        }
-                        if ($details->{'accessend'} ne '') {
-                            $end = $details->{'accessend'};
-                        }
-                    }
-                    my @usecs;
-                    if ($role ne 'cc') {
-                        if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
-                            @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
-                        }
-                    } 
-                    if ($role eq 'st') {
-                        if (@usecs > 1) {
-                            my $firstsec = $usecs[0];
-                            @usecs = ($firstsec);
-                        }
-                    }
-                    if (@usecs == 0) {
-                        push(@usecs,'');
-                    }
-                    foreach my $usec (@usecs) {
-                        my (%userroles,%newrole,%newgroups,$spec,$area);
-                        my $area = '/'.$dom.'/'.$cnum;
-                        my $spec = $role.'.'.$area;
-                        if ($usec ne '') {
-                           $spec .= '/'.$usec;
-                           $area .= '/'.$usec;
-                        }
+            } else {
+                @roles = ('cc');
+            }
+            foreach my $role (@roles) {
+                my $start = $now;
+                my $end = '0';
+                if ($role eq 'st') {
+                    if ($details->{'accessstart'} ne '') {
+                        $start = $details->{'accessstart'};
+                    }
+                    if ($details->{'accessend'} ne '') {
+                        $end = $details->{'accessend'};
+                    }
+                }
+                my @usecs;
+                if ($role ne 'cc') {
+                    if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
+                        @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
+                    }
+                } 
+                if ($role eq 'st') {
+                    if (@usecs > 1) {
+                        my $firstsec = $usecs[0];
+                        @usecs = ($firstsec);
+                    }
+                }
+                if (@usecs == 0) {
+                    push(@usecs,'');
+                }
+                foreach my $usec (@usecs) {
+                    my (%userroles,%newrole,%newgroups,$spec,$area);
+                    my $area = '/'.$dom.'/'.$cnum;
+                    my $spec = $role.'.'.$area;
+                    if ($usec ne '') {
+                       $spec .= '/'.$usec;
+                       $area .= '/'.$usec;
+                    }
+                    if ($role =~ /^cr\//) {
+                        &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
+                                                          $cnum,$spec,$area);
+                    } else {
+                        &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
+                                                            $spec,$cnum,$area);
+                    }
+                    &Apache::lonnet::set_userprivs(\%userroles,\%newrole,
+                                                   \%newgroups);
+                    $userroles{'user.role.'.$spec} = $start.'.'.$end;
+                    &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
+                    if (($end == 0) || ($end > $now)) {
+                        my $showrole = $role;
                         if ($role =~ /^cr\//) {
-                            &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
-                                                              $cnum,$spec,$area);
-                        } else {
-                            &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
-                                                                $spec,$cnum,$area);
+                            $showrole = &Apache::lonnet::plaintext($role,$crstype);
+                        } elsif (ref($longroles) eq 'HASH') {
+                            if ($longroles->{$role} ne '') {
+                                $showrole = $longroles->{$role};
+                            }
                         }
-                        &Apache::lonnet::set_userprivs(\%userroles,\%newrole,
-                                                       \%newgroups);
-                        $userroles{'user.role.'.$spec} = $start.'.'.$end;
-                        &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
-                        if (($end == 0) || ($end > $now)) {
-                            my $showrole = $role;
-                            if ($role =~ /^cr\//) {
-                                $showrole = &Apache::lonnet::plaintext($role,$crstype);
-                            } elsif (ref($longroles) eq 'HASH') {
-                                if ($longroles->{$role} ne '') {
-                                    $showrole = $longroles->{$role};
-                                }
+                        if ($start <= $now) {
+                            $active .= '<li><a href="/adm/roles?selectrole=1&'.
+                                       $spec.'=1">'.$showrole;
+                            if ($usec ne '') {
+                                $active .= ' - '.&mt('section:').' '.$usec; 
                             }
-                            if ($start <= $now) {
-                                $active .= '<li><a href="/adm/roles?selectrole=1&'.                                             $spec.'=1">'.$showrole;
-                                if ($usec ne '') {
-                                    $active .= ' - '.&mt('section:').' '.$usec; 
-                                }
-                                $active .= '</a></li>';
-                                $numactive ++;
-                            } else { 
-                                $future .= '<li>'.$showrole;
-                                if ($usec ne '') {
-                                    $future .= ' - '.&mt('section:').' '.$usec;
-                                }
-                                $future .= '</li>';
-                                $numfuture ++;
+                            $active .= '</a></li>';
+                            $numactive ++;
+                        } else { 
+                            $future .= '<li>'.$showrole;
+                            if ($usec ne '') {
+                                $future .= ' - '.&mt('section:').' '.$usec;
                             }
+                            $future .= '</li>';
+                            $numfuture ++;
                         }
                     }
                 }
@@ -3086,7 +3043,7 @@ sub check_autolimit {
     my ($uname,$udom,$dom,$crstype,$limit,$message) = @_;
     my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},
                                         'userroles',['active','future'],['cc'],[$dom]);
-    my ($types,$typename) = &course_types();
+    my ($types,$typename) = &Apache::loncommon::course_types();
     my %requests = &Apache::lonnet::dumpstore('courserequests',$udom,$uname);
     my %count;
     if (ref($types) eq 'ARRAY') {