--- loncom/interface/loncreateuser.pm	2012/08/14 15:45:06	1.362
+++ loncom/interface/loncreateuser.pm	2012/08/21 01:50:33	1.364
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.362 2012/08/14 15:45:06 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.364 2012/08/21 01:50:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1701,7 +1701,7 @@ sub display_existing_roles {
                     $allowed=1;
                 }
             }
-            if ($role_code eq 'ca' || $role_code eq 'au') {
+            if ($role_code eq 'ca' || $role_code eq 'au' || $role_code eq 'aa') {
                 $class='Construction Space';
             } elsif ($role_code eq 'su') {
                 $class='System';
@@ -4380,6 +4380,7 @@ sub handler {
                      bread_crumbs_component => $bread_crumbs_component};
             my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
             my $formname = 'studentform';
+            my $hidecall = "hide_searching();";
             if (($context eq 'domain') && (($env{'form.roletype'} eq 'course') ||
                 ($env{'form.roletype'} eq 'community'))) {
                 if ($env{'form.roletype'} eq 'course') {
@@ -4396,16 +4397,22 @@ sub handler {
                                    );
                     $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements);
                 }
-                $jscript .= &verify_user_display();
+                $jscript .= &verify_user_display($context)."\n".
+                            &Apache::loncommon::check_uncheck_jscript();
                 my $js = &add_script($jscript).$cb_jscript;
                 my $loadcode = 
                     &Apache::lonuserutils::course_selector_loadcode($formname);
                 if ($loadcode ne '') {
-                    $args->{add_entries} = {onload => $loadcode};
+                    $args->{add_entries} = {onload => "$loadcode;$hidecall"};
+                } else {
+                    $args->{add_entries} = {onload => $hidecall};
                 }
                 $r->print(&header($js,$args));
             } else {
-                $r->print(&header(&add_script(&verify_user_display()),$args));
+                $args->{add_entries} = {onload => $hidecall};
+                $jscript = &verify_user_display($context).
+                           &Apache::loncommon::check_uncheck_jscript(); 
+                $r->print(&header(&add_script($jscript),$args));
             }
             &Apache::lonuserutils::print_userlist($r,undef,$permission,$context,
                          $formname,$totcodes,$codetitles,$idlist,$idlist_titles);
@@ -4496,10 +4503,14 @@ sub handler {
                           $cdom,$cnum,$coursedesc));
         }
     } elsif ($env{'form.action'} eq 'changelogs') {
+        my $helpitem;
+        if ($context eq 'course') {
+            $helpitem = 'Course_User_Logs';
+        }
         push (@{$brcrum},
                  {href => '/adm/createuser?action=changelogs',
                   text => 'User Management Logs',
-                  help => 'Course_User_Logs'});
+                  help => $helpitem});
         $bread_crumbs_component = 'User Changes';
         $args = { bread_crumbs           => $brcrum,
                   bread_crumbs_component => $bread_crumbs_component};
@@ -4537,14 +4548,68 @@ sub add_script {
 }
 
 sub verify_user_display {
+    my ($context) = @_;
+    my $photos;
+    if (($context eq 'course') && $env{'request.course.id'}) {
+        $photos = $env{'course.'.$env{'request.course.id'}.'.internal.showphoto'};
+    }
     my $output = <<"END";
 
+function hide_searching() {
+    if (document.getElementById('searching')) {
+        document.getElementById('searching').style.display = 'none';
+    }
+    return;
+}
+
 function display_update() {
     document.studentform.action.value = 'listusers';
     document.studentform.phase.value = 'display';
     document.studentform.submit();
 }
 
+function updateCols(caller) {
+    var context = '$context';
+    var photos = '$photos';
+    if (caller == 'Status') {
+        if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value == 'Any') {
+            document.getElementById('showcolstatus').checked = true;
+            document.getElementById('showcolstatus').disabled = '';
+            document.getElementById('showcolstart').checked = true;
+            document.getElementById('showcolend').checked = true;
+        } else {
+            document.getElementById('showcolstatus').checked = false;
+            document.getElementById('showcolstatus').disabled = 'disabled';
+            document.getElementById('showcolstart').checked = false;
+            document.getElementById('showcolend').checked = false;
+        }
+    }
+    if (caller == 'output') {
+        if (photos == 1) {
+            if (document.getElementById('showcolphoto')) {
+                var photoitem = document.getElementById('showcolphoto');
+                if (document.studentform.output.options[document.studentform.output.selectedIndex].value == 'html') {
+                    photoitem.checked = true;
+                    photoitem.disabled = '';
+                } else {
+                    photoitem.checked = false;
+                    photoitem.disabled = 'disabled';
+                }
+            }
+        }
+    }
+    if (caller == 'showrole') {
+        if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any') {
+            document.getElementById('showcolrole').checked = true;
+            document.getElementById('showcolrole').disabled = '';
+        } else {
+            document.getElementById('showcolrole').checked = false;
+            document.getElementById('showcolrole').disabled = 'disabled';
+        }
+    }
+    return;
+}
+
 END
     return $output;
 
@@ -4659,6 +4724,14 @@ sub print_main_menu {
              permission => $permission->{'cusr'},
              linktitle => 'Approve or reject author role requests',
             },
+            {
+             linktext => 'Change Log',
+             icon => 'document-properties.png',
+             #help => 'Course_User_Logs',
+             url => '/adm/createuser?action=changelogs',
+             permission => $permission->{'cusr'},
+             linktitle => 'View change log.',
+            },
         );
         
     }elsif ($context eq 'course'){
@@ -4775,8 +4848,17 @@ sub print_main_menu {
                 },
             );
         }
-    };
-return Apache::lonhtmlcommon::generate_menu(@menu);
+    } elsif ($context eq 'author') {
+            {
+             linktext => 'Change Log',
+             icon => 'document-properties.png',
+             #help => 'Course_User_Logs',
+             url => '/adm/createuser?action=changelogs',
+             permission => $permission->{'cusr'},
+             linktitle => 'View change log.',
+            },
+    }
+    return Apache::lonhtmlcommon::generate_menu(@menu);
 #               { text => 'View Log-in History',
 #                 help => 'Course_User_Logins',
 #                 action => 'logins',
@@ -5466,18 +5548,35 @@ sub selfenroll_date_forms {
 
 sub print_userchangelogs_display {
     my ($r,$context,$permission) = @_;
-    my $formname = 'roleslog';
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $crstype = &Apache::loncommon::course_type();
-    my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
+    my $formname = 'rolelog';
+    my ($username,$domain,$crstype,%roleslog);
+    if ($context eq 'domain') {
+        $domain = $env{'request.role.domain'};
+        %roleslog=&Apache::lonnet::dump_dom('nohist_rolelog',$domain);
+    } else {
+        if ($context eq 'course') { 
+            $domain = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            $username = $env{'course.'.$env{'request.course.id'}.'.num'};
+            $crstype = &Apache::loncommon::course_type();
+            my %saveable_parameters = ('show' => 'scalar',);
+            &Apache::loncommon::store_course_settings('roles_log',
+                                                      \%saveable_parameters);
+            &Apache::loncommon::restore_course_settings('roles_log',
+                                                        \%saveable_parameters);
+        } elsif ($context eq 'author') {
+            $domain = $env{'user.domain'}; 
+            if ($env{'request.role'} =~ m{^au\./\Q$domain\E/$}) {
+                $username = $env{'user.name'};
+            } else {
+                undef($domain);
+            }
+        }
+        if ($domain ne '' && $username ne '') { 
+            %roleslog=&Apache::lonnet::dump('nohist_rolelog',$domain,$username);
+        }
+    }
     if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
 
-    my %saveable_parameters = ('show' => 'scalar',);
-    &Apache::loncommon::store_course_settings('roles_log',
-                                              \%saveable_parameters);
-    &Apache::loncommon::restore_course_settings('roles_log',
-                                                \%saveable_parameters);
     # set defaults
     my $now = time();
     my $defstart = $now - (7*24*3600); #7 days ago 
@@ -5519,7 +5618,8 @@ sub print_userchangelogs_display {
 
     # Form Header
     $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'.
-              &role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype));
+              &role_display_filter($context,$formname,$domain,$username,\%curr,
+                                   $version,$crstype));
 
     # Create navigation
     my ($nav_script,$nav_links) = &userlogdisplay_nav($formname,\%curr,$more_records);
@@ -5532,9 +5632,13 @@ sub print_userchangelogs_display {
        .'<th>'.&mt('When').'</th>'
        .'<th>'.&mt('Who made the change').'</th>'
        .'<th>'.&mt('Changed User').'</th>'
-       .'<th>'.&mt('Role').'</th>'
-       .'<th>'.&mt('Section').'</th>'
-       .'<th>'.&mt('Context').'</th>'
+       .'<th>'.&mt('Role').'</th>';
+
+    if ($context eq 'course') {
+        $tableheader .= '<th>'.&mt('Section').'</th>';
+    }
+    $tableheader .=
+        '<th>'.&mt('Context').'</th>'
        .'<th>'.&mt('Start').'</th>'
        .'<th>'.&mt('End').'</th>'
        .&Apache::loncommon::end_data_table_header_row();
@@ -5603,7 +5707,7 @@ sub print_userchangelogs_display {
         if ($roleslog{$id}{'logentry'}{'selfenroll'}) {
             $chgcontext = 'selfenroll';
         }
-        my %lt = &rolechg_contexts($crstype);
+        my %lt = &rolechg_contexts($context,$crstype);
         if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
             $chgcontext = $lt{$chgcontext};
         }
@@ -5613,9 +5717,12 @@ sub print_userchangelogs_display {
            .'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>'
            .'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>'
            .'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>'
-           .'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).'</td>'
-           .'<td>'.$sec.'</td>'
-           .'<td>'.$chgcontext.'</td>'
+           .'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).'</td>');
+        if ($context eq 'course') { 
+            $r->print('<td>'.$sec.'</td>');
+        }
+        $r->print(
+            '<td>'.$chgcontext.'</td>'
            .'<td>'.$rolestart.'</td>'
            .'<td>'.$roleend.'</td>'
            .&Apache::loncommon::end_data_table_row()."\n");
@@ -5683,9 +5790,11 @@ ENDSCRIPT
 }
 
 sub role_display_filter {
-    my ($formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
-    my $context = 'course';
-    my $lctype = lc($crstype);
+    my ($context,$formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
+    my $lctype;
+    if ($context eq 'course') {
+        $lctype = lc($crstype);
+    }
     my $nolink = 1;
     my $output = '<table><tr><td valign="top">'.
                  '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
@@ -5700,7 +5809,7 @@ sub role_display_filter {
         &Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date',
                                             $curr->{'rolelog_end_date'},undef,
                                             undef,undef,undef,undef,undef,undef,$nolink);
-    my %lt = &rolechg_contexts($crstype);
+    my %lt = &rolechg_contexts($context,$crstype);
     $output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br />'.
                '<table><tr><td>'.&mt('After:').
                '</td><td>'.$startform.'</td></tr>'.
@@ -5714,7 +5823,7 @@ sub role_display_filter {
         $output .= ' selected="selected"';
     }
     $output .=  '>'.&mt('Any').'</option>'."\n";
-    my @roles = &Apache::lonuserutils::course_roles($context,undef,1,$lctype);
+    my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype);
     foreach my $role (@roles) {
         my $plrole;
         if ($role eq 'cr') {
@@ -5732,13 +5841,23 @@ sub role_display_filter {
                '<td>&nbsp;&nbsp;</td>'.
                '<td valign="top"><b>'.
                &mt('Context:').'</b><br /><select name="chgcontext">';
-    foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll','requestcourses') {
+    my @posscontexts;
+    if ($context eq 'course') {
+        @posscontexts = ('any','auto','updatenow','createcourse','course','domain','selfenroll','requestcourses');
+    } elsif ($context eq 'domain') {
+        @posscontexts = ('any','domain','requestauthor','domconfig','server');
+    } else {
+        @posscontexts = ('any','author','domain');
+    } 
+    foreach my $chgtype (@posscontexts) {
         my $selstr = '';
         if ($curr->{'chgcontext'} eq $chgtype) {
             $selstr = ' selected="selected"';
         }
-        if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) {
-            next if (!&Apache::lonnet::auto_run($cnum,$cdom));
+        if ($context eq 'course') {
+            if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) {
+                next if (!&Apache::lonnet::auto_run($cnum,$cdom));
+            }
         }
         $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
     }
@@ -5751,9 +5870,14 @@ sub role_display_filter {
               .'</p>';
 
     # Server version info
+    my $needsrev = '2.11.0';
+    if ($context eq 'course') {
+        $needsrev = '2.7.0';
+    }
+    
     $output .= '<p class="LC_info">'
               .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
-                  ,'2.6.99.0');
+                  ,$needsrev);
     if ($version) {
         $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
     }
@@ -5762,8 +5886,10 @@ sub role_display_filter {
 }
 
 sub rolechg_contexts {
-    my ($crstype) = @_;
-    my %lt = &Apache::lonlocal::texthash (
+    my ($context,$crstype) = @_;
+    my %lt;
+    if ($context eq 'course') {
+        %lt = &Apache::lonlocal::texthash (
                                              any          => 'Any',
                                              auto         => 'Automated enrollment',
                                              updatenow    => 'Roster Update',
@@ -5773,11 +5899,26 @@ sub rolechg_contexts {
                                              selfenroll   => 'Self-enrolled',
                                              requestcourses => 'Course Request',
                                          );
-    if ($crstype eq 'Community') {
-        $lt{'createcourse'} = &mt('Community Creation');
-        $lt{'course'} = &mt('User Management in community');
-        $lt{'requestcourses'} = &mt('Community Request');
-    }
+        if ($crstype eq 'Community') {
+            $lt{'createcourse'} = &mt('Community Creation');
+            $lt{'course'} = &mt('User Management in community');
+            $lt{'requestcourses'} = &mt('Community Request');
+        }
+    } elsif ($context eq 'domain') {
+        %lt = &Apache::lonlocal::texthash (
+                                             any           => 'Any',
+                                             domain        => 'User Management in domain',
+                                             requestauthor => 'Authoring Request',
+                                             server        => 'Command line script (DC role)',
+                                             domconfig     => 'Self-enrolled',
+                                         );
+    } else {
+        %lt = &Apache::lonlocal::texthash (
+                                             any    => 'Any',
+                                             domain => 'User Management in domain',
+                                             author => 'User Management by author',
+                                         );
+    } 
     return %lt;
 }