[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /lonnet/perl lonnet.pm

[raeburn]

raeburn		Fri Dec 27 23:31:22 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - For 2.11
    - Backport 1.1246
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1172.2.36 loncom/lonnet/perl/lonnet.pm:1.1172.2.37
--- loncom/lonnet/perl/lonnet.pm:1.1172.2.36	Fri Dec 13 02:28:45 2013
+++ loncom/lonnet/perl/lonnet.pm	Fri Dec 27 23:31:21 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.36 2013/12/13 02:28:45 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.37 2013/12/27 23:31:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2027,7 +2027,7 @@
         }
     }
     if (ref($domconfig{'requestcourses'}) eq 'HASH') {
-        foreach my $item ('official','unofficial','community') {
+        foreach my $item ('official','unofficial','community','textbook') {
             $domdefaults{$item} = $domconfig{'requestcourses'}{$item};
         }
     }
@@ -2043,11 +2043,13 @@
         if (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
             $domdefaults{'officialcredits'} = $domconfig{'coursedefaults'}{'coursecredits'}{'official'};
             $domdefaults{'unofficialcredits'} = $domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'};
+            $domdefaults{'textbookcredits'} = $domconfig{'coursedefaults'}{'coursecredits'}{'textbook'};
         }
         if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
             $domdefaults{'officialquota'} = $domconfig{'coursedefaults'}{'uploadquota'}{'official'};
             $domdefaults{'unofficialquota'} = $domconfig{'coursedefaults'}{'uploadquota'}{'unofficial'};
             $domdefaults{'communityquota'} = $domconfig{'coursedefaults'}{'uploadquota'}{'community'};
+            $domdefaults{'textbookquota'} = $domconfig{'coursedefaults'}{'uploadquota'}{'textbook'};
         }
     }
     if (ref($domconfig{'usersessions'}) eq 'HASH') {
@@ -6274,6 +6276,7 @@
                       official   => 1,
                       unofficial => 1,
                       community  => 1,
+                      textbook   => 1,
                  );
     } elsif ($context eq 'requestauthor') {
         %tools = (
@@ -13332,7 +13335,7 @@
 =over
 
 =item
-official, unofficial, community
+official, unofficial, community, textbook
 
 =back
 
@@ -13353,7 +13356,7 @@
 =over
 
 =item
-canuse_pdfforms, officialcredits, unofficialcredits, officialquota, unofficialquota, communityquota
+canuse_pdfforms, officialcredits, unofficialcredits, textbookcredits, officialquota, unofficialquota, communityquota, textbookquota
 
 =back