--- loncom/lond 2005/06/27 14:16:30 1.288 +++ loncom/lond 2005/06/28 19:06:10 1.290 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.288 2005/06/27 14:16:30 albertel Exp $ +# $Id: lond,v 1.290 2005/06/28 19:06:10 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -58,7 +58,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.288 $'; #' stupid emacs +my $VERSION='$Revision: 1.290 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -1367,8 +1367,8 @@ sub du_handler { # assurance double sure, # use execute_command to ensure that the command is not executed in # a shell that can screw us up. - - my $duout = execute_command("du -ks $ududir"); + my $file_list = execute_command("find $ududir -not -regex '.*\.[0-9]+\.[^\.]+' -not -name '*.meta' -print"); + my $duout = execute_command("du -ks $file_list"); $duout=~s/[^\d]//g; #preserve only the numbers &Reply($client,"$duout\n","$cmd:$ududir"); } else { @@ -5067,16 +5067,13 @@ sub is_author { # user - Name of the user for which the role is being put. # authtype - The authentication type associated with the user. # -sub manage_permissions -{ - - +sub manage_permissions { my ($request, $domain, $user, $authtype) = @_; &Debug("manage_permissions: $request $domain $user $authtype"); # See if the request is of the form /$domain/_au - if($request =~ /^(\/$domain\/_au)$/) { # It's an author rolesput... + if($request =~ /^(\/\Q$domain\E\/_au)$/) { # It's an author rolesput... my $execdir = $perlvar{'lonDaemons'}; my $userhome= "/home/$user" ; &logthis("system $execdir/lchtmldir $userhome $user $authtype");