From raeburn at source.lon-capa.org  Mon Mar 20 09:53:23 2017
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 20 Mar 2017 13:53:23 -0000
Subject: [LON-CAPA-cvs] cvs: loncom / lond
Message-ID: <cvsraeburn1490018003@cvsserver>

raeburn		Mon Mar 20 13:53:23 2017 EDT

  Modified files:              
    /loncom	lond 
  Log:
  - Domain Trust Settings
  
  
Index: loncom/lond
diff -u loncom/lond:1.534 loncom/lond:1.535
--- loncom/lond:1.534	Mon Mar 20 03:19:37 2017
+++ loncom/lond	Mon Mar 20 13:53:22 2017
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.534 2017/03/20 03:19:37 raeburn Exp $
+# $Id: lond,v 1.535 2017/03/20 13:53:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.534 $'; #' stupid emacs
+my $VERSION='$Revision: 1.535 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -265,6 +265,17 @@
                putstore => {remote => 1, enroll => 1},
                queryreply => {anywhere => 1},
                querysend => {anywhere => 1},
+               querysend_activitylog => {remote => 1},
+               querysend_allusers => {remote => 1, domroles => 1},
+               querysend_courselog => {remote => 1},
+               querysend_fetchenrollment => {remote => 1},
+               querysend_getinstuser => {remote => 1},
+               querysend_getmultinstusers => {remote => 1},
+               querysend_instdirsearch => {remote => 1, domroles => 1, coaurem => 1},
+               querysend_institutionalphotos => {remote => 1},
+               querysend_portfolio_metadata => {remote => 1, content => 1},
+               querysend_userlog => {remote => 1, domroles => 1},
+               querysend_usersearch => {remote => 1, enroll => 1, coaurem => 1},
                quit => {anywhere => 1},
                readlonnetglobal => {institutiononly => 1},
                reinit => {manageronly => 1}, #not used currently
@@ -3954,7 +3965,7 @@
 #  serviced.
 #
 #  Parameters:
-#     $cmd       - COmmand keyword that initiated the request.
+#     $cmd       - Command keyword that initiated the request.
 #     $tail      - Remainder of the command after the keyword.
 #                  For this function, this consists of a query and
 #                  3 arguments that are self-documentingly labelled
@@ -3968,7 +3979,6 @@
 sub send_query_handler {
     my ($cmd, $tail, $client) = @_;
 
-
     my $userinput = "$cmd:$tail";
 
     my ($query,$arg1,$arg2,$arg3)=split(/\:/,$tail);
@@ -6542,6 +6552,18 @@
 	    $ok = 0;
 	}
         if ($ok) {
+            my $realcommand = $command;
+            if ($command eq 'querysend') {
+                my ($query,$rest)=split(/\:/,$tail,2);
+                $query=~s/\n*$//g;
+                my @possqueries = 
+                    qw(userlog courselog fetchenrollment institutionalphotos usersearch instdirsearch getinstuser getmultinstusers);
+                if (grep(/^\Q$query\E$/, at possqueries)) {
+                    $command .= '_'.$query;
+                } elsif ($query eq 'prepare activity log') {
+                    $command .= '_activitylog';
+                }
+            }
             if (ref($trust{$command}) eq 'HASH') {
                 my $donechecks;
                 if ($trust{$command}{'anywhere'}) {
@@ -6583,6 +6605,7 @@
                     }
                 }
             }
+            $command = $realcommand;
         }
 
 	if($ok) {



From raeburn at source.lon-capa.org  Sun Mar 26 18:24:04 2017
From: raeburn at source.lon-capa.org (raeburn)
Date: Sun, 26 Mar 2017 22:24:04 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm
Message-ID: <cvsraeburn1490567044@cvsserver>

raeburn		Sun Mar 26 22:24:04 2017 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Fix typo in log message
  - Include role extent in user's activity log when logging use of an ad hoc
    co-author role by a Domain Coordinator.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1341 loncom/lonnet/perl/lonnet.pm:1.1342
--- loncom/lonnet/perl/lonnet.pm:1.1341	Mon Mar 13 18:48:48 2017
+++ loncom/lonnet/perl/lonnet.pm	Sun Mar 26 22:24:03 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1341 2017/03/13 18:48:48 raeburn Exp $
+# $Id: lonnet.pm,v 1.1342 2017/03/26 22:24:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1986,7 +1986,7 @@
 			   &escape($srch->{'srchtype'}),$homeserver);
 	my $host=&hostname($homeserver);
 	if ($queryid !~/^\Q$host\E\_/) {
-	    &logthis('instituional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.'in domain '.$udom);
+	    &logthis('institutional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.'in domain '.$udom);
 	    return;
 	}
 	my $response = &get_query_reply($queryid);
@@ -6039,7 +6039,7 @@
                             my ($author,$adv,$rar)= &set_userprivs(\%userroles,\%allroles,\%allgroups,
                                                                    \%groups_roles);
                             &appenv(\%userroles,\@rolecodes);
-                            &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role);
+                            &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec);
                         }
                     }
                     $$tstatus = 'is';
@@ -6160,7 +6160,7 @@
     }
     my ($author,$adv,$rar)= &set_userprivs(\%userroles,\%rolehash);
     &appenv(\%userroles,[$role,'cm']);
-    &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role);
+    &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec);
     unless ($caller eq 'constructaccess' && $env{'request.course.id'}) {
         &appenv( {'request.role'        => $spec,
                   'request.role.domain' => $dcdom,



From raeburn at source.lon-capa.org  Sun Mar 26 19:53:31 2017
From: raeburn at source.lon-capa.org (raeburn)
Date: Sun, 26 Mar 2017 23:53:31 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /lonnet/perl lonnet.pm
Message-ID: <cvsraeburn1490572411@cvsserver>

raeburn		Sun Mar 26 23:53:31 2017 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - For 2.11
    - Backport 1.1342
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1172.2.91 loncom/lonnet/perl/lonnet.pm:1.1172.2.92
--- loncom/lonnet/perl/lonnet.pm:1.1172.2.91	Mon Mar 13 20:59:59 2017
+++ loncom/lonnet/perl/lonnet.pm	Sun Mar 26 23:53:30 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.91 2017/03/13 20:59:59 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.92 2017/03/26 23:53:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1829,7 +1829,7 @@
 			   &escape($srch->{'srchtype'}),$homeserver);
 	my $host=&hostname($homeserver);
 	if ($queryid !~/^\Q$host\E\_/) {
-	    &logthis('instituional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.'in domain '.$udom);
+	    &logthis('institutional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.'in domain '.$udom);
 	    return;
 	}
 	my $response = &get_query_reply($queryid);
@@ -5908,7 +5908,7 @@
                             my ($author,$adv,$rar)= &set_userprivs(\%userroles,\%allroles,\%allgroups,
                                                                    \%groups_roles);
                             &appenv(\%userroles,\@rolecodes);
-                            &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role);
+                            &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec);
                         }
                     }
                     $$tstatus = 'is';
@@ -6029,7 +6029,7 @@
     }
     my ($author,$adv,$rar)= &set_userprivs(\%userroles,\%rolehash);
     &appenv(\%userroles,[$role,'cm']);
-    &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role);
+    &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec);
     unless ($caller eq 'constructaccess' && $env{'request.course.id'}) {
         &appenv( {'request.role'        => $spec,
                   'request.role.domain' => $dcdom,



From raeburn at source.lon-capa.org  Sun Mar 26 19:47:29 2017
From: raeburn at source.lon-capa.org (raeburn)
Date: Sun, 26 Mar 2017 23:47:29 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm
Message-ID: <cvsraeburn1490572049@cvsserver>

raeburn		Sun Mar 26 23:47:29 2017 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1277, 1.1278
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.125 loncom/interface/loncommon.pm:1.1075.2.126
--- loncom/interface/loncommon.pm:1.1075.2.125	Wed Mar 15 03:39:49 2017
+++ loncom/interface/loncommon.pm	Sun Mar 26 23:47:28 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.125 2017/03/15 03:39:49 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.126 2017/03/26 23:47:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7897,6 +7897,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
 <meta name="apple-mobile-web-app-capable" content="yes" />';
     }
+    $result .= '<meta name="google" content="notranslate" />'."\n";
     return $result.'</head>';
 }
 
@@ -9639,10 +9640,12 @@
     &html_escape(\%html_lt);
     &js_escape(\%js_lt);
     my $domform;
+    my $allow_blank = 1;
     if ($fixeddom) {
-        $domform = &select_dom_form($currdom,'srchdomain',1,1,undef,[$currdom]);
+        $allow_blank = 0;
+        $domform = &select_dom_form($currdom,'srchdomain',$allow_blank,1,undef,[$currdom]);
     } else {
-        $domform = &select_dom_form($currdom,'srchdomain',1,1);
+        $domform = &select_dom_form($currdom,'srchdomain',$allow_blank,1);
     }
     my $srchinsel = ' <select name="srchin">';
 



From raeburn at source.lon-capa.org  Sun Mar 26 18:11:55 2017
From: raeburn at source.lon-capa.org (raeburn)
Date: Sun, 26 Mar 2017 22:11:55 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface loncreateuser.pm
Message-ID: <cvsraeburn1490566315@cvsserver>

raeburn		Sun Mar 26 22:11:55 2017 EDT

  Modified files:              
    /loncom/interface	loncreateuser.pm 
  Log:
  - coding style -- fixed domain for user access logs.
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.435 loncom/interface/loncreateuser.pm:1.436
--- loncom/interface/loncreateuser.pm:1.435	Sun Mar 19 18:06:23 2017
+++ loncom/interface/loncreateuser.pm	Sun Mar 26 22:11:54 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.435 2017/03/19 18:06:23 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.436 2017/03/26 22:11:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -755,6 +755,7 @@
         }
     } else {
         my $actiontext = $lt{'srad'};
+        my $fixeddom;
         if ($env{'form.action'} eq 'singlestudent') {
             if ($crstype eq 'Community') {
                 $actiontext = $lt{'srme'};
@@ -763,6 +764,7 @@
             }
         } elsif ($env{'form.action'} eq 'accesslogs') {
             $actiontext = $lt{'srva'};
+            $fixeddom = 1;
         } elsif (($env{'form.action'} eq 'singleuser') &&
                  ($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) {
             $actiontext = $lt{'srvu'};
@@ -774,7 +776,7 @@
                          '<br clear="all" />');
             }
         }
-        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));
+        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom));
     }
 }
 



From raeburn at source.lon-capa.org  Sun Mar 26 18:19:25 2017
From: raeburn at source.lon-capa.org (raeburn)
Date: Sun, 26 Mar 2017 22:19:25 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface loncreateuser.pm
Message-ID: <cvsraeburn1490566765@cvsserver>

raeburn		Sun Mar 26 22:19:25 2017 EDT

  Modified files:              
    /loncom/interface	loncreateuser.pm 
  Log:
  - User access logs for privileged users can only be displayed by other 
    priviliged users in the domain.
  - Client IP address for webDAV logins included in user access logs display.  
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.436 loncom/interface/loncreateuser.pm:1.437
--- loncom/interface/loncreateuser.pm:1.436	Sun Mar 26 22:11:54 2017
+++ loncom/interface/loncreateuser.pm	Sun Mar 26 22:19:24 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.436 2017/03/26 22:11:54 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.437 2017/03/26 22:19:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6767,6 +6767,24 @@
         return;
     }
 
+    if (&Apache::lonnet::privileged($uname,$udom,
+                                    [$env{'request.role.domain'}],['dc','su'])) {
+        unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'},
+                                            [$env{'request.role.domain'}],['dc','su'])) {
+            $r->print('<p class="LC_warning">'
+                 .&mt('You need to be a privileged user to display user access logs for [_1]',
+                      &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),
+                                                         $uname,$udom))
+                 .'</p>');
+            if ($env{'form.popup'}) {
+                $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
+            } else {
+                $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
+            }
+            return;
+        }
+    }
+
 # set defaults
     my $now = time();
     my $defstart = $now - (7*24*3600);
@@ -6853,7 +6871,7 @@
                 $showntableheader = 1;
             }
             my ($shown,$extra);
-            my ($event,$data) = split(/\s+/,&unescape($event));
+            my ($event,$data) = split(/\s+/,&unescape($event),2);
             if ($event eq 'Role') {
                 my ($rolecode,$extent) = split(/\./,$data,2);
                 next if ($extent eq '');
@@ -6905,8 +6923,17 @@
                 $shown = &mt('Role selection: [_1]',$rolename);
             } else {
                 $shown = &mt($event);
-                if ($data ne '') {
-                   $extra = &mt('Client IP address: [_1]',$data);
+                if ($data =~ /^webdav/) {
+                    my ($path,$clientip) = split(/\s+/,$data,2);
+                    $path =~ s/^webdav//;
+                    if ($clientip ne '') {
+                        $extra = &mt('Client IP address: [_1]',$clientip);
+                    }
+                    if ($path ne '') {
+                        $shown .= ' '.&mt('(WebDAV access to [_1])',$path);
+                    }
+                } elsif ($data ne '') {
+                    $extra = &mt('Client IP address: [_1]',$data);
                 }
             }
             $r->print(



From raeburn at source.lon-capa.org  Sun Mar 26 19:33:46 2017
From: raeburn at source.lon-capa.org (raeburn)
Date: Sun, 26 Mar 2017 23:33:46 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface
	loncreateuser.pm
Message-ID: <cvsraeburn1490571226@cvsserver>

raeburn		Sun Mar 26 23:33:46 2017 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncreateuser.pm 
  Log:
  - For 2.11
    - Backport 1.436, 1.437
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.406.2.12 loncom/interface/loncreateuser.pm:1.406.2.13
--- loncom/interface/loncreateuser.pm:1.406.2.12	Mon Jan 30 18:37:34 2017
+++ loncom/interface/loncreateuser.pm	Sun Mar 26 23:33:46 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.12 2017/01/30 18:37:34 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.406.2.13 2017/03/26 23:33:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -749,6 +749,7 @@
         }
     } else {
         my $actiontext = $lt{'srad'};
+        my $fixeddom;
         if ($env{'form.action'} eq 'singlestudent') {
             if ($crstype eq 'Community') {
                 $actiontext = $lt{'srme'};
@@ -757,6 +758,7 @@
             }
         } elsif ($env{'form.action'} eq 'accesslogs') {
             $actiontext = $lt{'srva'};
+            $fixeddom = 1;
         } elsif (($env{'form.action'} eq 'singleuser') &&
                  ($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) {
             $actiontext = $lt{'srvu'};
@@ -768,7 +770,7 @@
                          '<br clear="all" />');
             }
         }
-        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));
+        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom));
     }
 }
 
@@ -6753,6 +6755,24 @@
         return;
     }
 
+    if (&Apache::lonnet::privileged($uname,$udom,
+                                    [$env{'request.role.domain'}],['dc','su'])) {
+        unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'},
+                                            [$env{'request.role.domain'}],['dc','su'])) {
+            $r->print('<p class="LC_warning">'
+                 .&mt('You need to be a privileged user to display user access logs for [_1]',
+                      &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),
+                                                         $uname,$udom))
+                 .'</p>');
+            if ($env{'form.popup'}) {
+                $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
+            } else {
+                $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
+            }
+            return;
+        }
+    }
+
 # set defaults
     my $now = time();
     my $defstart = $now - (7*24*3600);
@@ -6839,7 +6859,7 @@
                 $showntableheader = 1;
             }
             my ($shown,$extra);
-            my ($event,$data) = split(/\s+/,&unescape($event));
+            my ($event,$data) = split(/\s+/,&unescape($event),2);
             if ($event eq 'Role') {
                 my ($rolecode,$extent) = split(/\./,$data,2);
                 next if ($extent eq '');
@@ -6891,8 +6911,17 @@
                 $shown = &mt('Role selection: [_1]',$rolename);
             } else {
                 $shown = &mt($event);
-                if ($data ne '') {
-                   $extra = &mt('Client IP address: [_1]',$data);
+                if ($data =~ /^webdav/) {
+                    my ($path,$clientip) = split(/\s+/,$data,2);
+                    $path =~ s/^webdav//;
+                    if ($clientip ne '') {
+                        $extra = &mt('Client IP address: [_1]',$clientip);
+                    }
+                    if ($path ne '') {
+                        $shown .= ' '.&mt('(WebDAV access to [_1])',$path);
+                    }
+                } elsif ($data ne '') {
+                    $extra = &mt('Client IP address: [_1]',$data);
                 }
             }
             $r->print(