--- loncom/interface/lonrequestcourse.pm	2013/05/11 21:10:31	1.67
+++ loncom/interface/lonrequestcourse.pm	2013/12/25 20:43:46	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.67 2013/05/11 21:10:31 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.71 2013/12/25 20:43:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -136,7 +136,7 @@ sub handler {
     my (%states,%stored);
     my ($jscript,$uname,$udom,$result,$warning,$showcredits,$instcredits);
     my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
-    if ($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'}) {
+    if ($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'} || $domdefs{'textbookcredits'}) {
         $showcredits = 1;
     }
 
@@ -614,7 +614,7 @@ sub form_elements {
             if ($showcredits && $instcredits eq '') {
                 $extras{'coursecredits'} = 'text';
             }
-        } elsif ($env{'form.crstype'} eq 'unofficial') {
+        } elsif (($env{'form.crstype'} eq 'unofficial') || ($env{'form.crstype'} eq 'textbook')) {
             if ($showcredits) {
                 $extras{'coursecredits'} = 'text';
             }
@@ -721,7 +721,8 @@ $nextstate_setter
 function check_can_request(crschoice,actionchoice) {
     var official = '';
     var unofficial = '';
-    var community = '';    
+    var community = '';
+    var textbook = '';
 END
     if (ref($can_request) eq 'HASH') {
         foreach my $item (keys(%{$can_request})) {
@@ -733,7 +734,8 @@ END
     my %lt = &Apache::lonlocal::texthash(
         official => 'You are not permitted to request creation of an official course in this domain.',
         unofficial => 'You are not permitted to request creation of an unofficial course in this domain.',
-        community => 'You are not permitted to request creation of a community this domain.',
+        community => 'You are not permitted to request creation of a community in this domain.',
+        textbook => 'You are not permitted to request creation of a textbook course in this domain',
         all => 'You must choose a specific course type when making a new course request.',
         allt => '"All types" is not allowed.',
     ); 
@@ -756,10 +758,17 @@ END
                     return false;
                 }
             } else {
-                if (actionchoice == 'new') {
-                    alert('$lt{'all'}'+'\\n'+'$lt{'allt'}');
-                    return false;
-                }               
+                if (crschoice == 'textbook') {
+                    if (textbook != 1) {
+                        alert("$lt{'community'}");
+                        return false;
+                    }
+                } else {
+                    if (actionchoice == 'new') {
+                        alert('$lt{'all'}'+'\\n'+'$lt{'allt'}');
+                        return false;
+                    }
+                }
             }
         }
     }
@@ -768,7 +777,7 @@ END
 END
     my ($pagetitle,$pageinfo,$domaintitle);
     if (ref($can_request) eq 'HASH') {
-        if (($can_request->{'official'}) || ($can_request->{'unofficial'})) {
+        if (($can_request->{'official'}) || ($can_request->{'unofficial'}) || $can_request->{'textbook'}) {
             if ($can_request->{'community'}) {
                 $pagetitle = 'Course/Community Requests';
                 $pageinfo = &mt('Request creation of a new course or community, or review your pending requests.');
@@ -945,6 +954,8 @@ END
                 $title = &mt('Pending requests for official courses');
             } elsif ($env{'form.crstype'} eq 'unofficial') {
                 $title = &mt('Pending requests for unofficial courses');
+            } elsif ($env{'form.crstype'} eq 'textbook') {
+                $title = &mt('Pending requests for textbook courses');
             } else {
                 $title = &mt('Pending course/community requests'); 
             }
@@ -1771,7 +1782,7 @@ sub print_enrollment_menu {
                 $hascredits = 1;
             }
         }
-    } elsif ($env{'form.crstype'} eq 'unofficial') {
+    } elsif (($env{'form.crstype'} eq 'unofficial') || ($env{'form.crstype'} eq 'textbook')) {
         if ($showcredits) {
             $creditsrow = '<span class="LC_nobreak">'.
                           '<input type="text" size="3" name="coursecredits"'.
@@ -1976,6 +1987,7 @@ sub print_personnel_menu {
             official => 'Requestor is automatically assigned Course Coordinator role.',
         );
         $lt{'unofficial'} = $lt{'official'};
+        $lt{'textbook'} = $lt{'textbook'};
         $output .= &Apache::lonhtmlcommon::row_headline().
                   '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').'&nbsp;'.$lt{$crstype}.' '.&mt('Include other personnel?').'</h3>';
     }
@@ -2306,8 +2318,8 @@ ENDJS
 }
 
 sub viewcancel_javascript {
-    my $alert = &mt('Are you sure you want to cancel this request?\\n'.
-                    'Your request will be removed.');
+    my $alert = &mt('Are you sure you want to cancel this request?').'\\n'.
+                &mt('Your request will be removed.');
     return << "ENDJS";
 function nextPage(formname,nextstate) {
     if (confirm('$alert')) {
@@ -2514,7 +2526,7 @@ sub reqstatus_names {
                         rejected  => 'Request rejected',
                         cancelled => 'Request cancelled',
             );
-    if (($crstype eq 'official') || ($crstype eq 'unofficial')) {
+    if (($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook')) {
         $statusnames{'created'} = &mt('Course created');
     } elsif ($crstype eq 'community') {
         $statusnames{'created'} = &mt('Community created');
@@ -2731,7 +2743,7 @@ sub print_review {
             $section_values .= $xlistinfo;
         }
         $section_values .= '</table></td>';
-    } elsif ($env{'form.crstype'} eq 'unofficial') {
+    } elsif (($env{'form.crstype'} eq 'unofficial') || ($env{'form.crstype'} eq 'textbook')) {
         $inst_headers .= '<th>'.&mt('Credits').'</th>';
         $inst_values .= '<td>'.$env{'form.coursecredits'}.'</td>';
     }
@@ -2910,6 +2922,7 @@ sub courseinfo_form {
                 community => 'You must provide a (brief) community description.'
              );
     $lt{'unofficial'} = $lt{'official'};
+    $lt{'textbook'} = $lt{'official'};
     my $js_validate = <<"ENDJS";
 <script type="text/javascript">
 // <![CDATA['
@@ -3231,7 +3244,8 @@ sub display_navbuttons {
 sub print_request_outcome {
     my ($dom,$codetitles,$code_order,$instcredits) = @_;
     my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
-        %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig);
+        %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,
+        $uniquecode);
     my $sectotal = $env{'form.sectotal'};
     my $crosslisttotal = 0;
     $cnum = $env{'form.cnum'};
@@ -3245,6 +3259,7 @@ sub print_request_outcome {
         if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
             $req_notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'};
         }
+        $uniquecode = $domconfig{'requestcourses'}{'uniquecode'};
     }
     $now = time;
     $crstype = $env{'form.crstype'};
@@ -3454,6 +3469,7 @@ sub print_request_outcome {
                     crstype        => $env{'form.crstype'},
                     instcode       => $instcode,
                     defaultcredits => $credits, 
+                    uniquecode     => $uniquecode,
                     clonedom       => $clonedom,
                     clonecrs       => $clonecrs,
                     datemode       => $env{'form.datemode'},
@@ -3482,6 +3498,8 @@ sub print_request_outcome {
             $output = &mt('You are not permitted to request creation of unofficial courses.');
         } elsif ($crstype eq 'community') {
             $output = &mt('You are not permitted to request creation of communities');
+        } elsif ($crstype eq 'textbook') {
+            $output = &mt('You are not permitted to request creation of textbook courses');
         } else {
             $output = &mt('Unrecognized course type: [_1]',$crstype);
         }
@@ -3543,7 +3561,7 @@ sub print_request_outcome {
             $storeresult = 'rejected';
         } elsif ($disposition eq 'process') {
             my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
-            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
+            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles,$code);
             my $type = 'Course';
             if ($crstype eq 'community') {
                 $type = 'Community';
@@ -3554,7 +3572,7 @@ sub print_request_outcome {
             }
             my $result = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
                                    'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
-                                   \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles);
+                                   \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,\$code);
             if ($result eq 'created') {
                 $disposition = 'created';
                 $reqstatus = 'created';
@@ -3565,6 +3583,10 @@ sub print_request_outcome {
                 } else {
                     $output = '<p>'.&mt('Your course request has been processed and the course has been created.');
                 }
+                if ($code) {
+                    $output .= &notification_information($disposition,$env{'user.name'}.':'.$env{'user.domain'},
+                                                         $cnum,$now,$code);
+                }
                 $output .= '<br />'.$role_result.'</p>';
                 $creationresult = 'created';
             } else {
@@ -3788,7 +3810,7 @@ sub update_requestors_roles {
 }
 
 sub notification_information {
-    my ($disposition,$req_notifylist,$cnum,$now) = @_;
+    my ($disposition,$req_notifylist,$cnum,$now,$code) = @_;
     my %emails = &Apache::loncommon::getemails();
     my $address;
     if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
@@ -3816,6 +3838,24 @@ sub notification_information {
 &mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").'<br />'.
 &mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.').
                    '</div>';
+    } elsif (($disposition eq 'created') && ($code)) {
+        my $codemsg = [{
+                         mt   => 'Students can automatically select your course by entering this code: [_1]',
+                         args => [$code],
+                     }];
+        $output .= '<p>'.
+                   &mt('Students can automatically select your course by entering this code: [_1].','<b>'.$code.'</b>').
+                   '<br />'.
+                   &mt('A message has been sent to your LON-CAPA account with this information.');
+        if ($address ne '') {
+            $output.= '<br />'.&mt('And an e-mail has also been sent to: [_1] with this code.',$address);
+        }
+        $output .= '</p>';
+        my $sender = $env{'user.name'}.':'.$env{'user.domain'};
+        if ($code) {
+            &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,$codemsg,$cnum,$env{'form.cdescr'},
+                                                                      $now,'uniquecode',$sender);
+        }
     } else {
         $output .= '<div class="LC_warning">'.
                    &mt('Your request status is: [_1].',$disposition).
@@ -3838,7 +3878,7 @@ sub check_autolimit {
             if (($crstype eq 'community') && 
                 (exists($crsroles{$cnum.':'.$cdom.':co'}))) {
                 $count ++;
-            } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial')) &&
+            } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook')) &&
                      (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {
                 $count ++;
             }
@@ -3907,7 +3947,7 @@ sub retrieve_settings {
                         $env{'form.coursecredits'} = $reqinfo{'defaultcredits'};
                     }
                 }
-            } elsif ($reqinfo{'crstype'} eq 'unofficial') {
+            } elsif (($reqinfo{'crstype'} eq 'unofficial') || ($reqinfo{'crstype'} eq 'textbook')) {
                 $env{'form.coursecredits'} = $reqinfo{'defaultcredits'};
             }
             my @currsec;