--- loncom/Attic/lcuseradd	2002/02/14 22:09:14	1.19
+++ loncom/Attic/lcuseradd	2002/09/16 13:27:40	1.22
@@ -9,8 +9,16 @@
 # 10/27,10/29,10/30 Scott Harrison
 # YEAR=2001
 # 10/21,11/13,11/15 Scott Harrison
+# YEAR=2002
+#   May 19, 2002 Ron Fox
+#      - Removed creation of the pulic_html directory.  This directory
+#        can now be added in two ways:
+#        o The user can add it themselves if they want some local web
+#          space which may or may not contain construction items.
+#        o LonCapa will add it if/when the user is granted an Author
+#          role.
 #
-# $Id: lcuseradd,v 1.19 2002/02/14 22:09:14 harris41 Exp $
+# $Id: lcuseradd,v 1.22 2002/09/16 13:27:40 foxr Exp $
 ###
 
 ###############################################################################
@@ -40,8 +48,7 @@ use strict;
 # ------------------------------------------------------- Description of script
 #
 # This script is a setuid script that should
-# be run by user 'www'.  It creates a /home/USERNAME directory
-# as well as a /home/USERNAME/public_html directory.
+# be run by user 'www'.  It creates a /home/USERNAME directory.
 # It adds a user to the unix system.
 # Passwords are set with lcpasswd.
 # www becomes a member of this user group.
@@ -155,10 +162,14 @@ else {
 }
 
 my ($username,$password1,$password2)=@input;
+print "Username = ".$username unless $noprint;
 $username=~/^(\w+)$/;
+print "Username after substitution - ".$username unless $noprint;
 my $safeusername=$1;
+print "Safe username = $safeusername" unless $noprint;
+
 if (($username ne $safeusername) or ($safeusername!~/^[A-Za-z]/)) {
-    print "Error. The user name specified has invalid characters.\n"
+    print "Error. The user name specified $username $safeusername  has invalid characters.\n"
 	unless $noprint;
     unlink('/tmp/lock_lcpasswd');
     exit 9;
@@ -231,10 +242,13 @@ if ($?) {
 ($>,$<)=($wwwid,0);
 &enable_root_capability;
 
+# -- Don't add public_html... that can be added either by the user
+#    or by lchtmldir when the user is granted an authorship role.
+
 # ------------------------------ Make final modifications to the user directory
 # -- Add a public_html file with a stand-in index.html file
 
-# system('/bin/chmod','-R','0660',"/home/$safeusername");
+ system('/bin/chmod','-R','0660',"/home/$safeusername");
 system('/bin/chmod','0710',"/home/$safeusername");
 mkdir "/home/$safeusername/public_html",0755;
 system('/bin/chmod','02770',"/home/$safeusername/public_html");
@@ -261,6 +275,7 @@ This area provides for:
 </html>
 END
 close OUT;
+
 system('/bin/chown','-R',"$safeusername:$safeusername","/home/$safeusername");
 
 # -------------------------------------------------------- Exit script