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

[raeburn]

raeburn		Wed Mar 24 03:29:12 2010 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Logging modifystudent() call.
     - use $showcandelete for string containing deletable fields in place of
       $candelete (which is an array ref).
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1058 loncom/lonnet/perl/lonnet.pm:1.1059
--- loncom/lonnet/perl/lonnet.pm:1.1058	Sun Mar 21 21:05:51 2010
+++ loncom/lonnet/perl/lonnet.pm	Wed Mar 24 03:29:11 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1058 2010/03/21 21:05:51 raeburn Exp $
+# $Id: lonnet.pm,v 1.1059 2010/03/24 03:29:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6234,7 +6234,6 @@
                     if ($role eq 'cc' || $role eq 'co') {
                         %crsenv = &userenvironment($cdom,$cnum,('internal.courseowner'));
                         if (($role eq 'cc') && ($cnum !~ /^$match_community$/)) {
-
                             if ($env{'request.role'} eq 'cc./'.$cdom.'/'.$cnum) {
                                 if ($crsenv{'internal.courseowner'} eq 
                                     $env{'user.name'}.':'.$env{'user.domain'}) {
@@ -6443,9 +6442,15 @@
         $forceid, $desiredhome, $email, $inststatus, $candelete)=@_;
     $udom= &LONCAPA::clean_domain($udom);
     $uname=&LONCAPA::clean_username($uname);
+    my $showcandelete = 'none';
+    if (ref($candelete) eq 'ARRAY') {
+        if (@{$candelete} > 0) {
+            $showcandelete = join(', ',@{$candelete});
+        }
+    }
     &logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '.
              $umode.', '.$first.', '.$middle.', '.
-	     $last.', '.$gene.'(forceid: '.$forceid.'; candelete: '.$candelete.')'.
+	     $last.', '.$gene.'(forceid: '.$forceid.'; candelete: '.$showcandelete.')'.
              (defined($desiredhome) ? ' desiredhome = '.$desiredhome :
                                      ' desiredhome not specified'). 
              ' by '.$env{'user.name'}.' at '.$env{'user.domain'}.