--- loncom/interface/loncreateuser.pm	2006/11/21 21:03:06	1.133
+++ loncom/interface/loncreateuser.pm	2006/11/21 21:38:44	1.134
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.133 2006/11/21 21:03:06 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.134 2006/11/21 21:38:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,6 +116,20 @@ sub authorpriv {
     return 1;
 }
 
+# ====================================================
+
+sub portfolio_quota {
+    my ($ccuname,$ccdomain) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                   'disk' => "Disk space allocated to user's portfolio files",
+    );
+    my $output = '<h3>'.$lt{'disk'}.'</h3>'.
+                 '<input type="text" name="portfolioquota" size ="5" value="'.
+                 &Apache::loncommon::get_user_quota($ccuname,$ccdomain).
+                 '" />&nbsp;Mb';
+    return $output;
+}
+
 # =================================================================== Phase one
 
 sub print_username_entry_form {
@@ -501,6 +515,11 @@ ENDFORMINFO
                     'hs'   => "Home Server",
                     'lg'   => "Login Data"
 				       );
+        my $portfolioform;
+        if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+            # Current user has quota modification privileges
+            $portfolioform = &portfolio_quota($ccuname,$ccdomain);
+        }
 	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
         &initialize_authen_forms();
 	$r->print(<<ENDNEWUSER);
@@ -533,6 +552,8 @@ $lt{'hs'}: <select name="hserver" size="
 <p>$authformint </p>
 <p>$authformfsys</p>
 <p>$authformloc </p>
+<hr />
+$portfolioform
 ENDNEWUSER
     } else { # user already exists
 	my %lt=&Apache::lonlocal::texthash(
@@ -552,8 +573,8 @@ $forminfo
 ENDCHANGEUSER
         # Get the users information
         my %userenv = &Apache::lonnet::get('environment',
-                          ['firstname','middlename','lastname','generation'],
-                          $ccdomain,$ccuname);
+                          ['firstname','middlename','lastname','generation',
+                           'portfolioquota'],$ccdomain,$ccuname);
         my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
         $r->print(<<END);
 <hr />
@@ -875,6 +896,10 @@ $lt{'yodo'} $lt{'ifch'}: $ccdomain
 ENDNOPRIV
                 } 
             }
+            if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+                # Current user has quota modification privileges
+                $r->print(&portfolio_quota($ccuname,$ccdomain));
+            }
         }  ## End of "check for bad authentication type" logic
     } ## End of new user/old user logic
     $r->print('<hr /><h3>'.&mt('Add Roles').'</h3>');
@@ -1122,8 +1147,8 @@ ENDMODIFYUSERHEAD
     if (! $env{'form.makeuser'} ) {
         # Check for need to change
         my %userenv = &Apache::lonnet::get
-            ('environment',['firstname','middlename','lastname','generation'],
-             $env{'form.ccdomain'},$env{'form.ccuname'});
+            ('environment',['firstname','middlename','lastname','generation',
+             'portfolioquota'],$env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
             %userenv = ();
@@ -1133,13 +1158,31 @@ ENDMODIFYUSERHEAD
             # Strip leading and trailing whitespace
             $env{'form.c'.$_} =~ s/(\s+$|^\s+)//g; 
         }
+        my ($quotachanged,$namechanged,$oldportfolioquota);
+        my %changeHash;
+        if (exists($userenv{'portfolioquota'})) {
+            $oldportfolioquota = $userenv{'portfolioquota'};
+            if (exists($env{'form.portfolioquota'})) {
+                if ($env{'form.portfolioquota'} ne $userenv{'portfolioquota'}) {
+                    if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
+                        # Current user has quota modification privileges
+                        $quotachanged = 1;
+                        $changeHash{'portfolioquota'} = $env{'form.portfolioquota'};
+                    }
+                }
+            }
+        } else {
+            $oldportfolioquota = &default_quota($env{'form.ccdomain'});
+        }
         if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) && 
             ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
              $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
              $env{'form.clastname'}   ne $userenv{'lastname'}   ||
              $env{'form.cgeneration'} ne $userenv{'generation'} )) {
+            $namechanged = 1;
+        }
+        if ($namechanged) {
             # Make the change
-            my %changeHash;
             $changeHash{'firstname'}  = $env{'form.cfirstname'};
             $changeHash{'middlename'} = $env{'form.cmiddlename'};
             $changeHash{'lastname'}   = $env{'form.clastname'};
@@ -1155,6 +1198,7 @@ ENDMODIFYUSERHEAD
                              'mddl' => "middle",
                              'lst'  => "last",
 			     'gen'  => "generation",
+                             'disk' => "disk space allocated to portfolio files",
                              'prvs' => "Previous",
                              'chto' => "Changed To"
 						   );
@@ -1165,17 +1209,21 @@ ENDMODIFYUSERHEAD
     <th>$lt{'frst'}</th>
     <th>$lt{'mddl'}</th>
     <th>$lt{'lst'}</th>
-    <th>$lt{'gen'}</th></tr>
+    <th>$lt{'gen'}</th>
+    <th>$lt{'disk'}<th></tr>
 <tr><td>$lt{'prvs'}</td>
     <td>$userenv{'firstname'}  </td>
     <td>$userenv{'middlename'} </td>
     <td>$userenv{'lastname'}   </td>
-    <td>$userenv{'generation'} </td></tr>
+    <td>$userenv{'generation'} </td>
+    <td>$oldportfolioquota</td>
+</tr>
 <tr><td>$lt{'chto'}</td>
     <td>$env{'form.cfirstname'}  </td>
     <td>$env{'form.cmiddlename'} </td>
     <td>$env{'form.clastname'}   </td>
-    <td>$env{'form.cgeneration'} </td></tr>
+    <td>$env{'form.cgeneration'} </td>
+    <td>$env{'form.portfolioquota'} Mb</td></tr>
 </table>
 END
             } else { # error occurred
@@ -1184,18 +1232,30 @@ END
                       $env{'form.ccdomain'}."</h2>");
             }
         }  else { # End of if ($env ... ) logic
+            my $putresult;
+            if ($quotachanged) {
+                $putresult = &Apache::lonnet::put
+                                 ('environment',\%changeHash,
+                                  $env{'form.ccdomain'},$env{'form.ccuname'});
+            }
             # They did not want to change the users name but we can
             # still tell them what the name is
 	    my %lt=&Apache::lonlocal::texthash(
                            'usr'  => "User",                    
                            'id'   => "in domain",
-                           'gen'  => "Generation"
+                           'gen'  => "Generation",
+                           'disk' => "Disk space allocated to user's portfolio files",
 					       );
-                $r->print(<<"END");
+            $r->print(<<"END");
 <h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2>
 <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
 <h4>$lt{'gen'}: $userenv{'generation'}</h4>
 END
+            if ($putresult eq 'ok') {
+                if ($oldportfolioquota ne $env{'form.portfolioquota'}) {
+                    $r->print('<h4>'.$lt{'disk'}.': '.$env{'form.portfolioquota'}.' Mb</h4>');
+                }
+            }
         }
     }
     ##